From nobody Mon Mar 17 00:48:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGGYw6Tgsz5rLDw; Mon, 17 Mar 2025 00:48: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGGYw3vnCz3tJT; Mon, 17 Mar 2025 00:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742172532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pf32pNP+jFdn53ehO3KR+HaqRpBs141vRdw7vuvTNZY=; b=dvi6GYYZr6F30jbmQrmZWxwUIJypbR4C34ihcjWnjbeGb1ObMWjJr+Fw5dCVjriIvb9mUY Z1p905K9XLy4EaNTL7znx2y4F6E6Llt2rCmj3HarJyDtdVp8yfAqs6BE6tQU1XqrTjQ+VI Oh+3o9VZH5GHjUmOb6LxXfqdGYVPETt5xvMtwug7ZYr8kGqsC8TQxPZoXV9jZaZqhVZuLC U5Y9QNvy8F96LRhtIkFfii/j+35KgVq2+xFyU/nDh3HvX2F12DsSAT3vN6kD9gxUg94LbE QymO9rvNkqv8SBdC/Jjl+EkO3Rbu+whID48rbapCRa51b/Ck1WUoCYl/2Ue7FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742172532; a=rsa-sha256; cv=none; b=GCoentyGecIIRC5XiezuD147VnbAiAva1q6AE/jfnNN8G8o1Q4ZZeHN2Pz5a/jMIRfaf/0 aJOWQmVlma9gEXrKTD1VQIDzxUb3VJ8daxu2cxq9gNOY+sL58VgalQyTRlQXUEpS18TD35 0Rf6ZUJxMrVqgFDv5CYT1s9uxt39CqpJxc+I9WEiuQVBbLLR3HOYETgMu3boTVWVvs2uZ1 v8cQlVUR3/e7ABAiRxQrRXWJLt+GaVa6VYlN7HYYAgTGhjFAxnAW0CPJVvM88eimXsBlKm 4OslqIGK1n/T/h825sGBxftS9rHrxBhPseABYe4CHQcpPaJhgqmYnoNDMEY81Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742172532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pf32pNP+jFdn53ehO3KR+HaqRpBs141vRdw7vuvTNZY=; b=M+c+Uv11vHWFvOEWjKBFNbLj/O5HtF1zao8Rch0lFTAfpQdPZRtgY/tk6HpL4R0WI1DzDn Urzsj1FM86qgve/wx5YCRmYS4/r0QgZX7WnXpByOdY2IICPZZE9zd6mXRKpEQUfi31vblz /rTjo8keHE2IecS1Ks3pSmL4LXA0HYAXQ/cHYm1my2kEx1SXzqKv2PVpqHkW14uKcJw95o zyba3CGjLDbQ+HVfv5lqSI0akfWXeB+NdcJObSpWMq9V8ACBx5xX8dWcrqLcuA0J9W7W4Q ERue1d6sW6FovXQejZkAoICp1xYKdpVpBbs+Rd4IQeewzAYzTh4PMAAQJn/0GQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGGYw3FFgz88Q; Mon, 17 Mar 2025 00:48:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52H0mqYG013292; Mon, 17 Mar 2025 00:48:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52H0mqLL013289; Mon, 17 Mar 2025 00:48:52 GMT (envelope-from git) Date: Mon, 17 Mar 2025 00:48:52 GMT Message-Id: <202503170048.52H0mqLL013289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: eae0129ba7d0 - stable/14 - mb_unmapped_to_ext(): fix m_free()/m_freem() use List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eae0129ba7d0d69acf541da28e58f8035c411f31 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eae0129ba7d0d69acf541da28e58f8035c411f31 commit eae0129ba7d0d69acf541da28e58f8035c411f31 Author: Konstantin Belousov AuthorDate: 2025-03-06 17:36:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-17 00:48:32 +0000 mb_unmapped_to_ext(): fix m_free()/m_freem() use (cherry picked from commit c5a96f09df32810319d39cb905662ad7504ecd7b) --- sys/kern/kern_mbuf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c index 0a9cb72222c2..a740c31789a1 100644 --- a/sys/kern/kern_mbuf.c +++ b/sys/kern/kern_mbuf.c @@ -950,7 +950,7 @@ _mb_unmapped_to_ext(struct mbuf *m, struct mbuf **mres) if (m->m_epg_tls != NULL) { /* can't convert TLS mbuf */ - m_freem(m); + m_free(m); *mres = NULL; return (EINVAL); } @@ -1098,7 +1098,7 @@ mb_unmapped_to_ext(struct mbuf *top, struct mbuf **mres) error = _mb_unmapped_to_ext(m, &m1); if (error != 0) { if (top != m) - m_free(top); + m_freem(top); m_freem(next); *mres = NULL; return (error); From nobody Mon Mar 17 00:48:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGGYy044vz5rL6x; Mon, 17 Mar 2025 00:48: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGGYx4GbWz3t9Q; Mon, 17 Mar 2025 00:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742172533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofBAgfILBjABL6D4GmsBm/vmrhJHa6jfxi0tTcBQ1J8=; b=EPDHszRBsvQIgq0+5O0xnsWdqpXmIWFeNnZpGNiiGJ9TrFhbHyyE0korbBiXC2XwoRLXsS RHFfj2kcev69h2+fJ74Jefwq7hgR/TZhr366503Ts8kdSc40bYY4SWMY1V9HiS7VITFmWg tmUyMyUyHdOCiYOeUS+jB9TRPHPd7bshA+3KNAXJbD5Nj6WUgP97DPKAQeMmYiqzpn/DQp s/TpNBnw9G26eObWB1aQLnZpLuKJmUhiWem2G0Uqe5BmpGW9uFJWgTXmR5/k9mVNexB7+L 15+PLyAwoSQQqhUMIwFRIZfyECMLkhJ2g3TXUcs8Bro/hMX7rWuKBjD1CekL/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742172533; a=rsa-sha256; cv=none; b=DOts06d4iBBfQPzJnLOYIHQRH4ZOMCC1PpeDfxgHhdPGr2CqbmNBnJQiN1aLKcmriHH5Fu SM4spb+RwRhFLaBdiDNyjKW29CGLZenFwfxV16nJYjehRabKghVVPDTqj5xQmjKJAAiOtt bmREyvG15Kc/Gp8MeK6wUAGGu/3sKb69RePM4AafizzlIyXKbtLsv4MIqyHvHu1LJY4XBY g4DDvzjMe6WAJKrzHcTFe37moomWSnXTIQZa/wArUoDUxzbgyg7USiQmE4yrlwfAkB9QuD zghAApBHvuEFKAdn61iZbDnFTrXTY+dol712OQFA2ErE8PXuNqTPa8WM+8JFCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742172533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ofBAgfILBjABL6D4GmsBm/vmrhJHa6jfxi0tTcBQ1J8=; b=eWXUVMru2EoNo0AOyZOi/w9qxm/XWu2EPOiGb2nkzM0M0UqMzVyckpNIWtxfZN+rFBsDuG M4vxaC0PP3nZkkjZ9Jjt3w0QKgvTv1KWAIxM6B+Ae8IiWRhoud1KVrWhkAkVe9Rauz/isA 6ALSVHSFNwblMh/5KKW+0hXVhmjBxT59u0FFJtqsme39PNbr9P5nrm2LZi493LtiEpUkN9 up+KQevAvAZQoATSYoGZ2kqrQh/o74JpmfaESuZjx4jCczDvGXGW593Q3kWhhhmSRzcxjj emOGF9sN8EOCiCfy+CvNMXAt5SFKM86nwVXmmicCTB6eSHFi2y65OQBkBTAW6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGGYx3tDmz8dM; Mon, 17 Mar 2025 00:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52H0mrP2013334; Mon, 17 Mar 2025 00:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52H0mrD7013331; Mon, 17 Mar 2025 00:48:53 GMT (envelope-from git) Date: Mon, 17 Mar 2025 00:48:53 GMT Message-Id: <202503170048.52H0mrD7013331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9de58ca100ca - stable/14 - ip_output(): if mb_unmapped_to_ext() failed, return directly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9de58ca100ca37a3ef544f5734a30256efec4333 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9de58ca100ca37a3ef544f5734a30256efec4333 commit 9de58ca100ca37a3ef544f5734a30256efec4333 Author: Konstantin Belousov AuthorDate: 2025-03-06 17:58:48 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-17 00:48:32 +0000 ip_output(): if mb_unmapped_to_ext() failed, return directly (cherry picked from commit edc1fba05e055a1943efd969d77c0acf0fbff587) --- sys/netinet/ip_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index e798431397f7..617719359ea5 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -752,7 +752,7 @@ no_ipsec:; error = ENOBUFS; } IPSTAT_INC(ips_odropped); - goto bad; + goto done; } else { m = m1; } From nobody Mon Mar 17 00:48:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGGYz2Krfz5rLH4; Mon, 17 Mar 2025 00:48: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGGYy5lvbz3tCR; Mon, 17 Mar 2025 00:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742172534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fbuiA5FPhu79cjAN1nG457BLDSYlq97wtvE5wIY+tJ0=; b=XQgYPFHTprJCbNwMPMXgNbaFFUg5UehJ5lYWx6mL+tuyE7jBccn/a3DO4KAEoZFxB2itNH SK7ce1I1axsIcgm9d2A8kjXl/Y5M+7DrD42hDmhFyXklUN3ecu/MLzDyBuMTLSWh9lJLbR 9HcX/+jYAMyrb64ptHVzm75VDB9qoD+F1yT/LAgt0FxzzPasoxn3OMFBZrlAdMRWZ1JgJa AH1iKtgwiq63C8v2ghqc0S6T5qKd1y1T6TpmTTjv3M8umzLqQCWX4huwjVsQhteQRXUSX2 4Q43xYV9Af3lgtGUl6q0gB1FbMrSO/wNDCAFYVilqUQrEDsb6L1xtdtJUADjCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742172534; a=rsa-sha256; cv=none; b=IlkiWBbIkWkcvMLq59v3H0spQseXsEjPfH/pR7ivVWZJgFWVhpUox4mIaX6BAH5znNPc3z XU+zYp4q+06T/wZEsseHIEbvjHa4w58WoUyowR3s2VmEa9iR7BrgMQz4N2YzW+XnTqho4a vf18nvEH3XDgz8BxoskIH1YkErVfUylKVOoxFmiCrrTGwgbaeV6XMhkExhPuWeTtEDEjkV QBBCyWb5Dusd9t5gyxbFd9xKVXmle6a0sfYOpfcJTNRR1gkq+C53Dp7WXFOrUkdn02aX3b KR3z/Htu7IUpoAZd+eHnD9h51l84Njrmoxe626Y2Q0JLu21MlDf271ziPVv7Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742172534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fbuiA5FPhu79cjAN1nG457BLDSYlq97wtvE5wIY+tJ0=; b=j2D2ZP0jn9+OrygV+t7tJCiI6TjrZnMMNli64C4014NmLHleaeEkB8ecKq+EwQPBWaGS/8 IvMnXndzLCkTzoDlExn9NzAwQp7wZJl33NrfLbUAFbgsyGlCLEV8ejvnSj4rb9rFVHZoai QBOPcB0KDZtuXhDnY1pHVWIz87lVWIn3T1BZlmtEipJF7EgeD3IEStSbL49Y51p5LpvRYr 5A76IMoWWHDxCe/TYtGctW0VSyARFP2TjE91+BG/csdeTAM08RJ/0Y3Jx6253xvoI4jJjJ whjchTyAGnrTPrHr6b8zeAYHh974kQY41Faxr3VzjeQXEwzyl9H/jpzDFt1yEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGGYy560cz8DC; Mon, 17 Mar 2025 00:48:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52H0msHd013368; Mon, 17 Mar 2025 00:48:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52H0msYr013365; Mon, 17 Mar 2025 00:48:54 GMT (envelope-from git) Date: Mon, 17 Mar 2025 00:48:54 GMT Message-Id: <202503170048.52H0msYr013365@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: be425fcdc63c - stable/14 - ip_output(): style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: be425fcdc63c208ba3ede7a9179529699e5e0e08 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=be425fcdc63c208ba3ede7a9179529699e5e0e08 commit be425fcdc63c208ba3ede7a9179529699e5e0e08 Author: Konstantin Belousov AuthorDate: 2025-03-06 17:59:44 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-17 00:48:33 +0000 ip_output(): style (cherry picked from commit 394605c057ade77775e1f9975e278dbb7693f44f) --- sys/netinet/ip_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c index 617719359ea5..66051c9c711c 100644 --- a/sys/netinet/ip_output.c +++ b/sys/netinet/ip_output.c @@ -860,7 +860,7 @@ no_ipsec:; done: return (error); - bad: +bad: m_freem(m); goto done; } From nobody Mon Mar 17 13:01:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGZqj5vKbz5qZgw; Mon, 17 Mar 2025 13:01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGZqj4xm5z3Q46; Mon, 17 Mar 2025 13:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742216513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hibCMuaOTE7+h5Rp9PglyHYtTcGVC3nJDESwFLcSFog=; b=ktIZiyTYw79RLc4dKM0ZKbAS59pBC8usxbrnGkfMGvYG68XSUD9hRpNOb5ctVl7tCb3j+l ex6fo4Q1wXU7mTdM1Wokq1ExoPa/tjNRr5wacb+JMFxo1ocJ6GQIpa6CVP5yr1PUoto0qO ehGO4g7GTbFKtrx2eVLcUlXbLqrtSpvqz7WTSFQqeV6y5N1G0CCCdNsXPaF3PEQbUvSe0b tXbtUWnMtmV7yRcSlAOmIyNTkZfaJXfMXIIRHJoj+ZGgRkzOsw1EGyVcFR2lceVoo83nqs QBCsiMviaB4qCZFb/2MpuP/cTIKWpOb+rSsRlTn/RId1N+IPG0sCNXr+FOuraQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742216513; a=rsa-sha256; cv=none; b=dglVKOn5a24ACJdeam/z8N3mtwMOuuXv7CUazSeyY2EGBB6RlNZN/rxNOIy6QSL5EIJRNR u2jkyqDnogA0R8h+Pf5Sq9eDFzxyDojPIKxjCBWcWRzWQ62m1USRG/dU4T7i6h6/6k9NkN m06WilmaA/AXzENkMm3+ntFc/9vHpfc/qfa4eSnmTjyljmuz5GJNVi1oLHBITNDvzbOP7x la60AMbGOg4ArTqKlcsoRadY4nBwsCekYhbyw4aomNoQKSNBjty2omI1n4T5U1ksFVtFml nXDaNV/wnZCeLuPUud9XAXz3GB3b5ZB6O6ycCycmVybkG03TGpybBgsuzuipBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742216513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hibCMuaOTE7+h5Rp9PglyHYtTcGVC3nJDESwFLcSFog=; b=cVmS4uywEzAHhrOhxN0OPnWE+KULkSNK8d/BlEcRPQxqiMQyiqAbKjYe/nbQxHqbDtY++E 3gyItn3BCAa6ngH0SAGpWZtfx7alR0rX9zMHiIlnycufTuXwCPfFgarsf5prdyefCKMf+W IsNAVTWtFueaz7O5CHLy9mPuY+GKSa6d4NoAQPwlGKfK9s1jmuZcPwIAb+t3PznqPtFw2n 843OROxtifPTUzhiSkIKI7jUywfcswdkXCEqjW7M58JwU+TT7Uodxw4P7YfL37n6DbMyo1 3JFMULcL0C24QTKFq4COD1WRp7C7OmOf8ipUXRAN18esXp96EO+OqQ1n44APJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGZqj494dzp9X; Mon, 17 Mar 2025 13:01:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HD1rwN093491; Mon, 17 Mar 2025 13:01:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HD1rpe093488; Mon, 17 Mar 2025 13:01:53 GMT (envelope-from git) Date: Mon, 17 Mar 2025 13:01:53 GMT Message-Id: <202503171301.52HD1rpe093488@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cheng Cui Subject: git: a8d2bccb87d0 - main - tcp cc: use tcp_compute_pipe() for pipe in xx_post_recovery() directly List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 Auto-Submitted: auto-generated The branch main has been updated by cc: URL: https://cgit.FreeBSD.org/src/commit/?id=a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 commit a8d2bccb87d0738c91f7e6a080375ae276e4c7d5 Author: Cheng Cui AuthorDate: 2025-03-05 16:35:20 +0000 Commit: Cheng Cui CommitDate: 2025-03-17 13:00:50 +0000 tcp cc: use tcp_compute_pipe() for pipe in xx_post_recovery() directly This follows up with commit 67787d200488, and obsoletes the non-default pipe calculation from commit 46f584823798 nearly 25 years ago. Reviewed by: rscheff Differential Revision: https://reviews.freebsd.org/D49247 --- sys/netinet/cc/cc.c | 7 +------ sys/netinet/cc/cc_cubic.c | 8 +------- sys/netinet/cc/cc_htcp.c | 8 +------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index a34eefcf0066..d85ad4e9f4fd 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -401,13 +401,8 @@ newreno_cc_post_recovery(struct cc_var *ccv) * approximately snd_ssthresh outstanding data. But in case we * would be inclined to send a burst, better to do it via the * slow start mechanism. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd does not collapse to 1 MSS under diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index 82b0d9b7fa99..a2e72130fa88 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -530,14 +530,8 @@ cubic_post_recovery(struct cc_var *ccv) * If inflight data is less than ssthresh, set cwnd * conservatively to avoid a burst of data, as suggested in * the NewReno RFC. Otherwise, use the CUBIC method. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; - + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd does not collapse to 1 MSS under diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index ab6165f2e720..569495144d50 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -375,14 +375,8 @@ htcp_post_recovery(struct cc_var *ccv) * If inflight data is less than ssthresh, set cwnd * conservatively to avoid a burst of data, as suggested in the * NewReno RFC. Otherwise, use the HTCP method. - * - * XXXLAS: Find a way to do this without needing curack */ - if (V_tcp_do_newsack) - pipe = tcp_compute_pipe(ccv->tp); - else - pipe = CCV(ccv, snd_max) - ccv->curack; - + pipe = tcp_compute_pipe(ccv->tp); if (pipe < CCV(ccv, snd_ssthresh)) /* * Ensure that cwnd down not collape to 1 MSS under From nobody Mon Mar 17 15:46:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGfV972jFz5qm6b; Mon, 17 Mar 2025 15:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfV925wHz473v; Mon, 17 Mar 2025 15:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7OH3P7d023+9GTazMpscWge/4aOXwjCRAKKwk+z7+g=; b=sOuZyGQZym8irR65tlB0XSIfSBqdkHQHXWmbN4hLHx1ptAewRdp2E61ExaGU4MVAkaaCAH Lfuc5s9E8KskNyzPlNKnlQeph6vl8MIt6EuaqVuk3fumWxtZ75uviCrsQQkWwvsBs4NzEZ ft3iEu0aUVpkWbOrlEA8YoRLgvfSIKFwtqArjRbx9Gk/n6R4bzg5vDn5c/H3lj3WXol06b HklStVxKDuDQEjC6zHoNqVYDkRIaXC1R/6X7kUqD4cjxfZqHAEZV7hxg68/uA5FJ7Pltqw wL134ncurOCTQ80dGLTenqec48qNX50a/b/ecuv5Rn/SZnxrPyqsh28j9D0z9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226417; a=rsa-sha256; cv=none; b=b/W8cl1RbClJaReXagdMbfQB04j4VDwNPL9hm+gejCLlsxJX/fHMh9uJXqKnUb8RSGr0gS izxomSSZ5dLf2D3q4TqgiKhS7XUsLF+QkzsAt0ls9X3Q4g1ji+PUR83djnFp3sniWN86a0 4HMUV/SXKEUa3qJnt5z0V/BDF4tTHjmquqExNN5WBKmabgRto4/kMCrrhEqAf8Aywupq4Y eDfT1NOgX2iGTNMhARcuwZD51gCwNCSHyXBUmzO8V4fTDPPd1rlbfBDJ6AxzbeM8/IZh0X 2YfUywk+xq/pluY+sruNU9sBgXEBfDt5ScszwFGy3ajIIB+EpHKiWegT7OmjUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U7OH3P7d023+9GTazMpscWge/4aOXwjCRAKKwk+z7+g=; b=sd8gqndrPwe4eZpvIcV5HZ3w2Xr0EhCIvIvkDR12KHPtoG1kM8AQNIZXPQfR6gTiGeWxIF KGcIE/s/zlPs83Ibuo7YOQounpymwotoFfjgBGqSBuM/iDm90V5sPd41J94xlUQqZQ5nJl thmtqcjrGjJ5Yd0j9ubEi4HMm8/urLXODuWrikGJsrs/gdvDABWQomQCCvRfUYdmsrKCSR Xf9F7l9Yqhv2Zd90j1HUXQT9/5nQ2ofh7tZhVc2CBZtiGUbBmfst+6pFtpU0E6jpp8llkL UxdFks5jw+6cqLArfXml9YyywCmLRzAi8l5ee1kDIT6XT/LftSK8U2dHuChZkA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfV91R93ztJ5; Mon, 17 Mar 2025 15:46:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFkvmC093669; Mon, 17 Mar 2025 15:46:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFkvl0093666; Mon, 17 Mar 2025 15:46:57 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:46:57 GMT Message-Id: <202503171546.52HFkvl0093666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 5e41194bfcc5 - main - acpi_asus_wmi(4): Add EVDEV support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e41194bfcc54fb506070f7a01d5bc00326cde66 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5e41194bfcc54fb506070f7a01d5bc00326cde66 commit 5e41194bfcc54fb506070f7a01d5bc00326cde66 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Add EVDEV support Use input event device to export hotkey events. Sponsored by: Future Crew LLC MFC after: 1 month Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48982 --- sys/dev/acpi_support/acpi_asus_wmi.c | 140 +++++++++++++++++++++++++++++++- sys/modules/acpi/acpi_asus_wmi/Makefile | 1 + 2 files changed, 140 insertions(+), 1 deletion(-) diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index 853696e67f84..80beee2fea7f 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -26,6 +26,7 @@ #include #include "opt_acpi.h" +#include "opt_evdev.h" #include #include #include @@ -41,6 +42,12 @@ #include #include "acpi_wmi_if.h" +#ifdef EVDEV_SUPPORT +#include +#include +#define NO_KEY KEY_RESERVED +#endif + #define _COMPONENT ACPI_OEM ACPI_MODULE_NAME("ASUS-WMI") @@ -110,6 +117,9 @@ struct acpi_asus_wmi_softc { struct sysctl_oid *sysctl_tree; int dsts_id; int handle_keys; +#ifdef EVDEV_SUPPORT + struct evdev_dev *evdev; +#endif }; static struct { @@ -253,6 +263,82 @@ static struct { { NULL, 0, NULL, 0 } }; +#ifdef EVDEV_SUPPORT +static const struct { + UINT32 notify; + uint16_t key; +} acpi_asus_wmi_evdev_map[] = { + { 0x20, KEY_BRIGHTNESSDOWN }, + { 0x2f, KEY_BRIGHTNESSUP }, + { 0x30, KEY_VOLUMEUP }, + { 0x31, KEY_VOLUMEDOWN }, + { 0x32, KEY_MUTE }, + { 0x35, KEY_SCREENLOCK }, + { 0x38, KEY_PROG3 }, /* Armoury Crate */ + { 0x40, KEY_PREVIOUSSONG }, + { 0x41, KEY_NEXTSONG }, + { 0x43, KEY_STOPCD }, /* Stop/Eject */ + { 0x45, KEY_PLAYPAUSE }, + { 0x4f, KEY_LEFTMETA }, /* Fn-locked "Windows" Key */ + { 0x4c, KEY_MEDIA }, /* WMP Key */ + { 0x50, KEY_EMAIL }, + { 0x51, KEY_WWW }, + { 0x55, KEY_CALC }, + { 0x57, NO_KEY }, /* Battery mode */ + { 0x58, NO_KEY }, /* AC mode */ + { 0x5C, KEY_F15 }, /* Power Gear key */ + { 0x5D, KEY_WLAN }, /* Wireless console Toggle */ + { 0x5E, KEY_WLAN }, /* Wireless console Enable */ + { 0x5F, KEY_WLAN }, /* Wireless console Disable */ + { 0x60, KEY_TOUCHPAD_ON }, + { 0x61, KEY_SWITCHVIDEOMODE }, /* SDSP LCD only */ + { 0x62, KEY_SWITCHVIDEOMODE }, /* SDSP CRT only */ + { 0x63, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT */ + { 0x64, KEY_SWITCHVIDEOMODE }, /* SDSP TV */ + { 0x65, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + TV */ + { 0x66, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + TV */ + { 0x67, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + TV */ + { 0x6B, KEY_TOUCHPAD_TOGGLE }, + { 0x6E, NO_KEY }, /* Low Battery notification */ + { 0x71, KEY_F13 }, /* General-purpose button */ + { 0x79, NO_KEY }, /* Charger type dectection notification */ + { 0x7a, KEY_ALS_TOGGLE }, /* Ambient Light Sensor Toggle */ + { 0x7c, KEY_MICMUTE }, + { 0x7D, KEY_BLUETOOTH }, /* Bluetooth Enable */ + { 0x7E, KEY_BLUETOOTH }, /* Bluetooth Disable */ + { 0x82, KEY_CAMERA }, + { 0x86, KEY_PROG1 }, /* MyASUS Key */ + { 0x88, KEY_RFKILL }, /* Radio Toggle Key */ + { 0x8A, KEY_PROG1 }, /* Color enhancement mode */ + { 0x8C, KEY_SWITCHVIDEOMODE }, /* SDSP DVI only */ + { 0x8D, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + DVI */ + { 0x8E, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + DVI */ + { 0x8F, KEY_SWITCHVIDEOMODE }, /* SDSP TV + DVI */ + { 0x90, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + DVI */ + { 0x91, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + TV + DVI */ + { 0x92, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + TV + DVI */ + { 0x93, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + TV + DVI */ + { 0x95, KEY_MEDIA }, + { 0x99, KEY_PHONE }, /* Conflicts with fan mode switch */ + { 0xA0, KEY_SWITCHVIDEOMODE }, /* SDSP HDMI only */ + { 0xA1, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + HDMI */ + { 0xA2, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + HDMI */ + { 0xA3, KEY_SWITCHVIDEOMODE }, /* SDSP TV + HDMI */ + { 0xA4, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + HDMI */ + { 0xA5, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + TV + HDMI */ + { 0xA6, KEY_SWITCHVIDEOMODE }, /* SDSP CRT + TV + HDMI */ + { 0xA7, KEY_SWITCHVIDEOMODE }, /* SDSP LCD + CRT + TV + HDMI */ + { 0xAE, KEY_FN_F5 }, /* Fn+F5 fan mode on 2020+ */ + { 0xB3, KEY_PROG4 }, /* AURA */ + { 0xB5, KEY_CALC }, + { 0xC4, KEY_KBDILLUMUP }, + { 0xC5, KEY_KBDILLUMDOWN }, + { 0xC6, NO_KEY }, /* Ambient Light Sensor notification */ + { 0xFA, KEY_PROG2 }, /* Lid flip action */ + { 0xBD, KEY_PROG2 }, /* Lid flip action on ROG xflow laptops */ +}; +#endif + ACPI_SERIAL_DECL(asus_wmi, "ASUS WMI device"); static void acpi_asus_wmi_identify(driver_t *driver, device_t parent); @@ -290,6 +376,9 @@ static driver_t acpi_asus_wmi_driver = { DRIVER_MODULE(acpi_asus_wmi, acpi_wmi, acpi_asus_wmi_driver, 0, 0); MODULE_DEPEND(acpi_asus_wmi, acpi_wmi, 1, 1, 1); MODULE_DEPEND(acpi_asus_wmi, acpi, 1, 1, 1); +#ifdef EVDEV_SUPPORT +MODULE_DEPEND(acpi_asus_wmi, evdev, 1, 1, 1); +#endif static void acpi_asus_wmi_identify(driver_t *driver, device_t parent) @@ -437,6 +526,27 @@ next: } ACPI_SERIAL_END(asus_wmi); +#ifdef EVDEV_SUPPORT + if (sc->notify_guid != NULL) { + sc->evdev = evdev_alloc(); + evdev_set_name(sc->evdev, device_get_desc(dev)); + evdev_set_phys(sc->evdev, device_get_nameunit(dev)); + evdev_set_id(sc->evdev, BUS_HOST, 0, 0, 1); + evdev_support_event(sc->evdev, EV_SYN); + evdev_support_event(sc->evdev, EV_KEY); + for (i = 0; i < nitems(acpi_asus_wmi_evdev_map); i++) { + if (acpi_asus_wmi_evdev_map[i].key != NO_KEY) + evdev_support_key(sc->evdev, + acpi_asus_wmi_evdev_map[i].key); + } + + if (evdev_register(sc->evdev) != 0) { + acpi_asus_wmi_detach(dev); + return (ENXIO); + } + } +#endif + return (0); } @@ -447,8 +557,12 @@ acpi_asus_wmi_detach(device_t dev) ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); - if (sc->notify_guid) + if (sc->notify_guid) { ACPI_WMI_REMOVE_EVENT_HANDLER(dev, sc->notify_guid); +#ifdef EVDEV_SUPPORT + evdev_free(sc->evdev); +#endif + } return (0); } @@ -540,6 +654,27 @@ acpi_asus_wmi_free_buffer(ACPI_BUFFER* buf) { } } +#ifdef EVDEV_SUPPORT +static void +acpi_asus_wmi_push_evdev_event(struct evdev_dev *evdev, UINT32 notify) +{ + int i; + uint16_t key; + + for (i = 0; i < nitems(acpi_asus_wmi_evdev_map); i++) { + if (acpi_asus_wmi_evdev_map[i].notify == notify && + acpi_asus_wmi_evdev_map[i].key != NO_KEY) { + key = acpi_asus_wmi_evdev_map[i].key; + evdev_push_key(evdev, key, 1); + evdev_sync(evdev); + evdev_push_key(evdev, key, 0); + evdev_sync(evdev); + break; + } + } +} +#endif + static void acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) { @@ -557,6 +692,9 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) code = obj->Integer.Value; acpi_UserNotify("ASUS", ACPI_ROOT_OBJECT, code); +#ifdef EVDEV_SUPPORT + acpi_asus_wmi_push_evdev_event(sc->evdev, code); +#endif } if (code && sc->handle_keys) { /* Keyboard backlight control. */ diff --git a/sys/modules/acpi/acpi_asus_wmi/Makefile b/sys/modules/acpi/acpi_asus_wmi/Makefile index c202ef8f0707..552eef2ac479 100644 --- a/sys/modules/acpi/acpi_asus_wmi/Makefile +++ b/sys/modules/acpi/acpi_asus_wmi/Makefile @@ -3,5 +3,6 @@ KMOD= acpi_asus_wmi CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_asus_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h +SRCS+= opt_evdev.h .include From nobody Mon Mar 17 15:46:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGfVB4qNGz5qmX7; Mon, 17 Mar 2025 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfVB305Sz46wY; Mon, 17 Mar 2025 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bNM3fRDzQjpVMGi/uXOW7+qdcEtQWxXfF0i2S13X8I=; b=Zg4xiEk4GfDRyloWPl4uuTe4S4ZXXFODbCK5+Vw8EihXy9gm/JlSCr36++hHtJy39HtkF/ YrAXvoEH1UKxvNXgXFE5OZOQkMi0uAJW/ywJOVrrEisYSw8bQ7s7uAlJnIKhO3cSzLDkmc C304m410/SIZuMpNi1Uuf8ZiV0R/lRnNY/fs51e3Q0Ntq2UPJGriszUjCB5MrSE1HkXmoQ 4xtW3Cbt4XE8P/7J+6mHaoGVLm2ugEXKoKgMggexuU0zNOQItNvY5GALef2B90z9Kcc84k C4lHYUCPVL8+yZl7MQkrgSjtO3X51SGhoCCbRoZv/mhUqeQawfFW1S0+1ti3FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226418; a=rsa-sha256; cv=none; b=FZ0JdcjYbzhqLe0HnpR9dv8oVznbol9jMVOzdVUDhBE1lDVx2vCQEQn32DASbbtIP3846j SECRL7I6GC7s50sR4kQHYF01oUQh2Y6687I3l/NByE3c/0ddUuDuMOrZ9Jz/Hd6InzHFYV M/cY1eILcU7UHqdMiMqU86wqSOUD3JwpHKXWUmZOq8fLKFQHkUCf6rIW+d/oIATuoU8dZZ Oc4offEi/m0y1XOtj3ZonUIIE+wYE2+rwfNmS2pfx5Ld30oZ8OM1LFf0wjPF9a4JP+ASkv W4D16eLfHJy7muoQCY8LC5eBo/dPtxRzCwTq0/iJCmwhCNzC8JcsbUqFkQrLEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1bNM3fRDzQjpVMGi/uXOW7+qdcEtQWxXfF0i2S13X8I=; b=JQQi9lShh3PA4sCrJjM2GhjVaM72q3t1EQ7pAV3/ymEHx30MUObrxMxKvRwa0m3U315CQn 7EPNcMreeIG06LQNmMxnvDhncn0PNyM1nAh9hD6UIGa5Pb45DRfCI+VFmcvjw+OBqWuQKw Yrdn4nJndTmAx6pUtA8sKEKTIpQ7n6/lgRf/xYFCFqHNQyTV88u8GwUkdsP5e91QbE6uSs lYj1qc5mE5JhABrCQEKOIe937s56qRtNNhQK5oOnd1mDGbwwjzFTLtdoC01SLD9AGoqaTK LyNKzPWYOREA3kdaaKimcs7/+G/dNMFyRv0unxoqVu6xVJ97tPxDhxw+4dsAzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfVB2QtWzt0N; Mon, 17 Mar 2025 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFkwZp093706; Mon, 17 Mar 2025 15:46:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFkwwb093703; Mon, 17 Mar 2025 15:46:58 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:46:58 GMT Message-Id: <202503171546.52HFkwwb093703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: f134662a1a57 - main - acpi_asus_wmi(4): Improve keyboard backlight support. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f134662a1a5726d78880385002a03b8fe68805f6 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=f134662a1a5726d78880385002a03b8fe68805f6 commit f134662a1a5726d78880385002a03b8fe68805f6 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Improve keyboard backlight support. - Fix maximal keyboard backlight level, Although Linux source code comment says that backlight level is encoded in 3 bits of data, actual code limits maximum level to 3. - Add backlight(9) support for keyboard - Turn off/on keyboard backlight on suspend/resume Sponsored by: Future Crew LLC MFC after: 1 month Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48983 --- share/man/man4/acpi_asus_wmi.4 | 10 ++- sys/dev/acpi_support/acpi_asus_wmi.c | 136 +++++++++++++++++++++++++++++++- sys/modules/acpi/acpi_asus_wmi/Makefile | 2 +- 3 files changed, 142 insertions(+), 6 deletions(-) diff --git a/share/man/man4/acpi_asus_wmi.4 b/share/man/man4/acpi_asus_wmi.4 index 7d6aeaca948b..721b73833484 100644 --- a/share/man/man4/acpi_asus_wmi.4 +++ b/share/man/man4/acpi_asus_wmi.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 2, 2012 +.Dd March 25, 2024 .Dt ACPI_ASUS_WMI 4 .Os .Sh NAME @@ -72,11 +72,19 @@ Number of other variables under the same sysctl branch are model-specific. Defaults for these variables can be set in .Xr sysctl.conf 5 , which is parsed at boot-time. +.Sh FILES +.Bl -tag -width "/dev/backlight/acpi_asus_wmi0" -compact +.It Pa /dev/backlight/acpi_asus_wmi0 +Keyboard +.Xr backlight 8 +device node. +.El .Sh SEE ALSO .Xr acpi 4 , .Xr acpi_asus 4 , .Xr acpi_video 4 , .Xr sysctl.conf 5 , +.Xr backlight 8 , .Xr devd 8 , .Xr sysctl 8 .Sh HISTORY diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index 80beee2fea7f..968de5fe5e87 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -42,6 +42,9 @@ #include #include "acpi_wmi_if.h" +#include +#include "backlight_if.h" + #ifdef EVDEV_SUPPORT #include #include @@ -117,6 +120,8 @@ struct acpi_asus_wmi_softc { struct sysctl_oid *sysctl_tree; int dsts_id; int handle_keys; + struct cdev *kbd_bkl; + uint32_t kbd_bkl_level; #ifdef EVDEV_SUPPORT struct evdev_dev *evdev; #endif @@ -345,6 +350,8 @@ static void acpi_asus_wmi_identify(driver_t *driver, device_t parent); static int acpi_asus_wmi_probe(device_t dev); static int acpi_asus_wmi_attach(device_t dev); static int acpi_asus_wmi_detach(device_t dev); +static int acpi_asus_wmi_suspend(device_t dev); +static int acpi_asus_wmi_resume(device_t dev); static int acpi_asus_wmi_sysctl(SYSCTL_HANDLER_ARGS); static int acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, @@ -357,12 +364,26 @@ static int acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, static int acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 ctrl_param, UINT32 *retval); static void acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context); +static int acpi_asus_wmi_backlight_update_status(device_t dev, + struct backlight_props *props); +static int acpi_asus_wmi_backlight_get_status(device_t dev, + struct backlight_props *props); +static int acpi_asus_wmi_backlight_get_info(device_t dev, + struct backlight_info *info); static device_method_t acpi_asus_wmi_methods[] = { + /* Device interface */ DEVMETHOD(device_identify, acpi_asus_wmi_identify), DEVMETHOD(device_probe, acpi_asus_wmi_probe), DEVMETHOD(device_attach, acpi_asus_wmi_attach), DEVMETHOD(device_detach, acpi_asus_wmi_detach), + DEVMETHOD(device_suspend, acpi_asus_wmi_suspend), + DEVMETHOD(device_resume, acpi_asus_wmi_resume), + + /* Backlight interface */ + DEVMETHOD(backlight_update_status, acpi_asus_wmi_backlight_update_status), + DEVMETHOD(backlight_get_status, acpi_asus_wmi_backlight_get_status), + DEVMETHOD(backlight_get_info, acpi_asus_wmi_backlight_get_info), DEVMETHOD_END }; @@ -376,10 +397,35 @@ static driver_t acpi_asus_wmi_driver = { DRIVER_MODULE(acpi_asus_wmi, acpi_wmi, acpi_asus_wmi_driver, 0, 0); MODULE_DEPEND(acpi_asus_wmi, acpi_wmi, 1, 1, 1); MODULE_DEPEND(acpi_asus_wmi, acpi, 1, 1, 1); +MODULE_DEPEND(acpi_asus_wmi, backlight, 1, 1, 1); #ifdef EVDEV_SUPPORT MODULE_DEPEND(acpi_asus_wmi, evdev, 1, 1, 1); #endif +static const uint32_t acpi_asus_wmi_backlight_levels[] = { 0, 33, 66, 100 }; + +static inline uint32_t +devstate_to_kbd_bkl_level(UINT32 val) +{ + return (acpi_asus_wmi_backlight_levels[val & 0x3]); +} + +static inline UINT32 +kbd_bkl_level_to_devstate(uint32_t bkl) +{ + UINT32 val; + int i; + + for (i = 0; i < nitems(acpi_asus_wmi_backlight_levels); i++) { + if (bkl < acpi_asus_wmi_backlight_levels[i]) + break; + } + val = (i - 1) & 0x3; + if (val != 0) + val |= 0x80; + return(val); +} + static void acpi_asus_wmi_identify(driver_t *driver, device_t parent) { @@ -418,6 +464,7 @@ acpi_asus_wmi_attach(device_t dev) struct acpi_asus_wmi_softc *sc; UINT32 val; int dev_id, i; + bool have_kbd_bkl = false; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); @@ -502,6 +549,10 @@ next: if (val == 0) continue; break; + case ASUS_WMI_DEVID_KBD_BACKLIGHT: + sc->kbd_bkl_level = devstate_to_kbd_bkl_level(val); + have_kbd_bkl = true; + /* FALLTHROUGH */ default: if ((val & ASUS_WMI_DSTS_PRESENCE_BIT) == 0) continue; @@ -541,12 +592,22 @@ next: } if (evdev_register(sc->evdev) != 0) { + device_printf(dev, "Can not register evdev\n"); acpi_asus_wmi_detach(dev); return (ENXIO); } } #endif + if (have_kbd_bkl) { + sc->kbd_bkl = backlight_register("acpi_asus_wmi", dev); + if (sc->kbd_bkl == NULL) { + device_printf(dev, "Can not register backlight\n"); + acpi_asus_wmi_detach(dev); + return (ENXIO); + } + } + return (0); } @@ -557,6 +618,9 @@ acpi_asus_wmi_detach(device_t dev) ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + if (sc->kbd_bkl != NULL) + backlight_destroy(sc->kbd_bkl); + if (sc->notify_guid) { ACPI_WMI_REMOVE_EVENT_HANDLER(dev, sc->notify_guid); #ifdef EVDEV_SUPPORT @@ -567,6 +631,34 @@ acpi_asus_wmi_detach(device_t dev) return (0); } +static int +acpi_asus_wmi_suspend(device_t dev) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + if (sc->kbd_bkl != NULL) { + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + acpi_wpi_asus_set_devstate(sc, + ASUS_WMI_DEVID_KBD_BACKLIGHT, 0, NULL); + } + + return (0); +} + +static int +acpi_asus_wmi_resume(device_t dev) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + if (sc->kbd_bkl != NULL) { + ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); + acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, + kbd_bkl_level_to_devstate(sc->kbd_bkl_level), NULL); + } + + return (0); +} + static int acpi_asus_wmi_sysctl(SYSCTL_HANDLER_ARGS) { @@ -615,7 +707,7 @@ acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id) val &= ASUS_WMI_DSTS_BRIGHTNESS_MASK; break; case ASUS_WMI_DEVID_KBD_BACKLIGHT: - val &= 0x7; + val &= 0x3; break; default: if (val & ASUS_WMI_DSTS_UNKNOWN_BIT) @@ -636,7 +728,7 @@ acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, in switch(dev_id) { case ASUS_WMI_DEVID_KBD_BACKLIGHT: - arg = min(0x7, arg); + arg = min(0x3, arg); if (arg != 0) arg |= 0x80; break; @@ -701,9 +793,9 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) if (code == 0xc4 || code == 0xc5) { acpi_wpi_asus_get_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, &val); - val &= 0x7; + val &= 0x3; if (code == 0xc4) { - if (val < 0x7) + if (val < 0x3) val++; } else if (val > 0) val--; @@ -711,6 +803,7 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) val |= 0x80; acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, val, NULL); + sc->kbd_bkl_level = devstate_to_kbd_bkl_level(val); } /* Touchpad control. */ if (code == 0x6b) { @@ -767,3 +860,38 @@ acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, retval)); } + +static int +acpi_asus_wmi_backlight_update_status(device_t dev, struct backlight_props + *props) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_KBD_BACKLIGHT, + kbd_bkl_level_to_devstate(props->brightness), NULL); + sc->kbd_bkl_level = props->brightness; + + return (0); +} + +static int +acpi_asus_wmi_backlight_get_status(device_t dev, struct backlight_props *props) +{ + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + + props->brightness = sc->kbd_bkl_level; + props->nlevels = nitems(acpi_asus_wmi_backlight_levels); + memcpy(props->levels, acpi_asus_wmi_backlight_levels, + sizeof(acpi_asus_wmi_backlight_levels)); + + return (0); +} + +static int +acpi_asus_wmi_backlight_get_info(device_t dev, struct backlight_info *info) +{ + info->type = BACKLIGHT_TYPE_KEYBOARD; + strlcpy(info->name, "ASUS Keyboard", BACKLIGHTMAXNAMELENGTH); + + return (0); +} diff --git a/sys/modules/acpi/acpi_asus_wmi/Makefile b/sys/modules/acpi/acpi_asus_wmi/Makefile index 552eef2ac479..3067bec099f5 100644 --- a/sys/modules/acpi/acpi_asus_wmi/Makefile +++ b/sys/modules/acpi/acpi_asus_wmi/Makefile @@ -3,6 +3,6 @@ KMOD= acpi_asus_wmi CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_asus_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h -SRCS+= opt_evdev.h +SRCS+= opt_evdev.h backlight_if.h .include From nobody Mon Mar 17 15:47:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGfVD70F0z5qmVV; Mon, 17 Mar 2025 15:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfVD4TRJz46yV; Mon, 17 Mar 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5rsZQf72qkLn9mdzbvJOo1fGFj/eW25C5EDwDYTth0=; b=ozFfaDZ/nc4UjTGnIypHQuZGMA3gfZ1l5fDHVIWvUvy9MTiWW1f8Jg59cJgwmt2y0+7QRm GWU+Y5rgQArf5lAV6TiIvIbJspCYuunpDFrSofIUopPIj7ywJ7VOyYJ2SUVCn9ZmK01vey IBmkZNwyNEphh+DVKYHtqEf3I36WgaI4UTSam9zcNk0aXVqNdQXf2/V6KY6EcqTshk5weI H+dNcCswxAKYGn9VC6t6vWWq3P+wfkapxmW2+dssNdYq1vDxl7vJh2lUDaiB7aZyexel8c ISP0XuzKmndlR6djHPlOyX+YUARzFDYLbOqOCS9JzgQar/bu3C+qLNMvUhHt7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226420; a=rsa-sha256; cv=none; b=M6ir90k7JEbb3qXEd4SSPlshzH6DNjVq8OuJ2k4kCM0LFuBy6a0p2fFaFN9ohm2W476RBx okMuJpVdDS/lFd9FewPUWMlaEovWKmO+5txLyoszOaD/0Y6w40mEj4EP/YHdgqmQMzi+qS pwT2p1hLsMHfo0c0jVgb8FHT2It+Ouc5yR/aLLelILCpn5RKSRKNNAL0o5RfiwRVdPkL3w 4OZ8j/6TmDlqu/CASluJHmOgtD3XWHMOl98o2sJpNCazr/1FVijnM/4qTRrpRbRr4DiU02 39+VYowe7KXQCdV/k70AD9cvzc3xdV7SzJm6OWpsXNoYShQeDhZeW1luh9z8Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y5rsZQf72qkLn9mdzbvJOo1fGFj/eW25C5EDwDYTth0=; b=xYoahbVsG5GmE3uZ2c7qosizV02UpIRHbCBkQO04eto7FBngLR/2fDcU2Y5ltIiDwyE5Qv GUXikdr9OU2fy6jTM/t84ACbeoTezN114pNvfCo0p6XT/iqOG0W7WrAjyz3J6SwqCCTqyz YTNIExKiUjLkx75mqWwwu/s4kJaX5eFyM1zgZE5asD8HlcbVAw5oyCdxrLaKU9y6IUzImd vQxZg4V18L+K7FCj5Lns2RLhp6g55rTKPUIQUOmfSEr2fkk7NxKJOjSxow1ylehjEwUGpw K/2sBk+7Fal1wm+5QEsn9rdJBqjZ5HXce37gFYKqRqVACPaT9jLWK1nQyZFOMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfVD3zw7zt1M; Mon, 17 Mar 2025 15:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFl0lG093781; Mon, 17 Mar 2025 15:47:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFl0Gf093778; Mon, 17 Mar 2025 15:47:00 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:47:00 GMT Message-Id: <202503171547.52HFl0Gf093778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 027b93c2f5e1 - main - acpi_asus_wmi(4): Handle TUF-specific hotkeys internally List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027b93c2f5e1b84d9e4569f127b632c704c53b73 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=027b93c2f5e1b84d9e4569f127b632c704c53b73 commit 027b93c2f5e1b84d9e4569f127b632c704c53b73 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Handle TUF-specific hotkeys internally - Cycle TUF laptop RGB mode on AURA key press - Switch TUF 'Throttle Thermal Policy' with 'Fan' key Sponsored by: Future Crew LLC MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D48985 --- sys/dev/acpi_support/acpi_asus_wmi.c | 62 +++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index e3d16b9345ee..0e9c35d42793 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -99,9 +99,11 @@ ACPI_MODULE_NAME("ASUS-WMI") #define ASUS_WMI_DEVID_CARDREADER 0x00080013 #define ASUS_WMI_DEVID_TOUCHPAD 0x00100011 #define ASUS_WMI_DEVID_TOUCHPAD_LED 0x00100012 +#define ASUS_WMI_DEVID_TUF_RGB_MODE 0x00100056 #define ASUS_WMI_DEVID_THERMAL_CTRL 0x00110011 #define ASUS_WMI_DEVID_FAN_CTRL 0x00110012 #define ASUS_WMI_DEVID_PROCESSOR_STATE 0x00120012 +#define ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY 0x00120075 /* DSTS masks */ #define ASUS_WMI_DSTS_STATUS_BIT 0x00000001 @@ -129,6 +131,8 @@ struct acpi_asus_wmi_softc { bool event_queue; struct cdev *kbd_bkl; uint32_t kbd_bkl_level; + uint32_t tuf_rgb_mode; + uint32_t ttp_mode; #ifdef EVDEV_SUPPORT struct evdev_dev *evdev; #endif @@ -272,6 +276,12 @@ static struct { .dev_id = ASUS_WMI_DEVID_PROCESSOR_STATE, .flag_rdonly = 1 }, + { + .name = "throttle_thermal_policy", + .dev_id = ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + .description = "Throttle Thermal Policy " + "(0 - default, 1 - overboost, 2 - silent)", + }, { NULL, 0, NULL, 0 } }; @@ -365,7 +375,7 @@ static int acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, int oldarg); static int acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id); static int acpi_asus_wmi_evaluate_method(device_t wmi_dev, int method, - UINT32 arg0, UINT32 arg1, UINT32 *retval); + UINT32 arg0, UINT32 arg1, UINT32 arg2, UINT32 *retval); static int acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 *retval); static int acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, @@ -528,14 +538,14 @@ next: /* Initialize. */ if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_INIT, 0, 0, &val) && bootverbose) + ASUS_WMI_METHODID_INIT, 0, 0, 0, &val) && bootverbose) device_printf(dev, "Initialization: %#x\n", val); if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_SPEC, 0, 0x9, &val) && bootverbose) + ASUS_WMI_METHODID_SPEC, 0, 0x9, 0, &val) && bootverbose) device_printf(dev, "WMI BIOS version: %d.%d\n", val >> 16, val & 0xFF); if (!acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_SFUN, 0, 0, &val) && bootverbose) + ASUS_WMI_METHODID_SFUN, 0, 0, 0, &val) && bootverbose) device_printf(dev, "SFUN value: %#x\n", val); ACPI_SERIAL_BEGIN(asus_wmi); @@ -720,6 +730,13 @@ acpi_asus_wmi_sysctl_get(struct acpi_asus_wmi_softc *sc, int dev_id) ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); ACPI_SERIAL_ASSERT(asus_wmi); + switch(dev_id) { + case ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY: + return (sc->ttp_mode); + default: + break; + } + acpi_wpi_asus_get_devstate(sc, dev_id, &val); switch(dev_id) { @@ -758,6 +775,10 @@ acpi_asus_wmi_sysctl_set(struct acpi_asus_wmi_softc *sc, int dev_id, int arg, in if (arg != 0) arg |= 0x80; break; + case ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY: + arg = min(0x2, arg); + sc->ttp_mode = arg; + break; } acpi_wpi_asus_set_devstate(sc, dev_id, arg, NULL); @@ -848,6 +869,31 @@ acpi_asus_wmi_handle_event(struct acpi_asus_wmi_softc *sc, int code) acpi_wpi_asus_set_devstate(sc, ASUS_WMI_DEVID_TOUCHPAD, val, NULL); } + /* Throttle thermal policy control. */ + if (code == 0xae) { + sc->ttp_mode++; + if (sc->ttp_mode > 2) + sc->ttp_mode = 0; + acpi_wpi_asus_set_devstate(sc, + ASUS_WMI_DEVID_THROTTLE_THERMAL_POLICY, + sc->ttp_mode, NULL); + } + /* TUF laptop RGB mode control. */ + if (code == 0xb3) { + const uint32_t cmd = 0xb4; /* Save to BIOS */ + const uint32_t r = 0xff, g = 0xff, b = 0xff; + const uint32_t speed = 0xeb; /* Medium */ + if (sc->tuf_rgb_mode < 2) + sc->tuf_rgb_mode++; + else if (sc->tuf_rgb_mode == 2) + sc->tuf_rgb_mode = 10; + else sc->tuf_rgb_mode = 0; + acpi_asus_wmi_evaluate_method(sc->wmi_dev, + ASUS_WMI_METHODID_DEVS, + ASUS_WMI_DEVID_TUF_RGB_MODE, + cmd | (sc->tuf_rgb_mode << 8) | (r << 16) | (g << 24), + b | (speed << 8), NULL); + } } } @@ -882,9 +928,9 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) static int acpi_asus_wmi_evaluate_method(device_t wmi_dev, int method, - UINT32 arg0, UINT32 arg1, UINT32 *retval) + UINT32 arg0, UINT32 arg1, UINT32 arg2, UINT32 *retval) { - UINT32 params[2] = { arg0, arg1 }; + UINT32 params[3] = { arg0, arg1, arg2 }; UINT32 result; ACPI_OBJECT *obj; ACPI_BUFFER in = { sizeof(params), ¶ms }; @@ -912,7 +958,7 @@ acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, { return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, - sc->dsts_id, dev_id, 0, retval)); + sc->dsts_id, dev_id, 0, 0, retval)); } static int @@ -921,7 +967,7 @@ acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, { return (acpi_asus_wmi_evaluate_method(sc->wmi_dev, - ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, retval)); + ASUS_WMI_METHODID_DEVS, dev_id, ctrl_param, 0, retval)); } static int From nobody Mon Mar 17 15:46:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGfVD1XwZz5qmG7; Mon, 17 Mar 2025 15:47: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGfVC3SMsz4742; Mon, 17 Mar 2025 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBb5c1JOj2DvMBtsc315G+PIl4yB3JgGl21bBLbtDQ0=; b=hdDfEx66uZ9c9NhqGZoOY4Qe/opN09hjKtAOzgRQzlbCCFi0BU11x5nCZJ/vJD9wRpEiv0 qbU2VtIvhanVpfGfKMNPiqoj0a7189N1AzF0ipmQPsIdVTDLY+hffvAL6EjAdww3YuNuGG Fvf7AXILhoeKjqnk4lMbfrXpi0KWi1zwuWiLS94hRbTwN+CDsaLXUq1NgcocJkati1nV33 d7hc9XWGPDGhcBefX6/RgU2WfohoxMpxT4DPPGYEGopq3O9eDzRyOAVB29F2CuGTAM5L0y oAyybAVsfPZln+vWJalv+GLYF6IoysJTFehWALEGuKrVHtQJgcHo6zQIIDmQ8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742226419; a=rsa-sha256; cv=none; b=hsDPzDJtPtoLWFv7sxgfn5VzxxNL6piPiHe31zaUHflashQaPwSex/MMT3qjRX6s+VE3QN 9rz1TakQMUUCscoswEJguyf8TRcDSm9a2kYxnEReNttu3pgp7z0oj/Mnww5hgCqh4N2wMB fBxKw0ro0GB3UlfKJyMS4gtskXoucsAds9/+8kzwZGiMsP/FwPy9iLKpp3Y/EkgXh0TR/f 84ik/Dg/LIjCSkXqvq/3KyC4RO5HO11YtRY5l+0mG1QchJooR3u89YB8152W68uYzzlKkI incnYVFY1qTwYegHeuHBhHr7keNKOANC54dO017bZvT+EA31BGL8S4QEqno8fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742226419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vBb5c1JOj2DvMBtsc315G+PIl4yB3JgGl21bBLbtDQ0=; b=euuxhYp27xEaj9oF3KhWAvJCvMDAX8a36u0n4RksesWFfDLQgglTzo/U7BfZQrwhlTQNSe xKvuZuQWHeE2KOwSIKK7dz8n4P0bGECYU2lw0A8PRyWhKxwU47NCXq/K208AL0g4RxFrMn MIYEJQFb88E8bloQz3fxAT1H2kcK1geZ5GE3pb2McETH8KoxQ5GY8il5/981t01r69LqXv +dNR8Mayoi6vla+dK3hM0VV1cJJaDM1cPJAZcUGg+vonffsZv0RG/Nj2hKugSsty/oXrGN J16sZ5pBy44dlmW7uJnPpySNFaYH7zF2MBMod9/UFM9lHaYbuzZdhj+XHS0lpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGfVC33vYztNl; Mon, 17 Mar 2025 15:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HFkxgC093741; Mon, 17 Mar 2025 15:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HFkx2d093738; Mon, 17 Mar 2025 15:46:59 GMT (envelope-from git) Date: Mon, 17 Mar 2025 15:46:59 GMT Message-Id: <202503171546.52HFkx2d093738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: d5bf6a7245cc - main - acpi_asus_wmi(4): Add support for WMI event queue List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5bf6a7245cc7825d17ebb00d1e7f07ae6dc32e6 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d5bf6a7245cc7825d17ebb00d1e7f07ae6dc32e6 commit d5bf6a7245cc7825d17ebb00d1e7f07ae6dc32e6 Author: Vladimir Kondratyev AuthorDate: 2025-03-17 15:45:14 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-03-17 15:45:14 +0000 acpi_asus_wmi(4): Add support for WMI event queue Event codes are expected to be retrieved from a queue on at least some models. Specifically, very likely the ACPI WMI devices with _UID ATK are queued whereas those with ASUSWMI are not. Sponsored by: Future Crew LLC MFC after: 1 month Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D48984 --- sys/dev/acpi_support/acpi_asus_wmi.c | 89 ++++++++++++++++++++++++++++++------ 1 file changed, 76 insertions(+), 13 deletions(-) diff --git a/sys/dev/acpi_support/acpi_asus_wmi.c b/sys/dev/acpi_support/acpi_asus_wmi.c index 968de5fe5e87..e3d16b9345ee 100644 --- a/sys/dev/acpi_support/acpi_asus_wmi.c +++ b/sys/dev/acpi_support/acpi_asus_wmi.c @@ -112,6 +112,12 @@ ACPI_MODULE_NAME("ASUS-WMI") #define ASUS_WMI_DSTS_BRIGHTNESS_MASK 0x000000FF #define ASUS_WMI_DSTS_MAX_BRIGTH_MASK 0x0000FF00 +/* Events */ +#define ASUS_WMI_EVENT_QUEUE_SIZE 0x10 +#define ASUS_WMI_EVENT_QUEUE_END 0x1 +#define ASUS_WMI_EVENT_MASK 0xFFFF +#define ASUS_WMI_EVENT_VALUE_ATK 0xFF + struct acpi_asus_wmi_softc { device_t dev; device_t wmi_dev; @@ -120,6 +126,7 @@ struct acpi_asus_wmi_softc { struct sysctl_oid *sysctl_tree; int dsts_id; int handle_keys; + bool event_queue; struct cdev *kbd_bkl; uint32_t kbd_bkl_level; #ifdef EVDEV_SUPPORT @@ -363,6 +370,8 @@ static int acpi_wpi_asus_get_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 *retval); static int acpi_wpi_asus_set_devstate(struct acpi_asus_wmi_softc *sc, UINT32 dev_id, UINT32 ctrl_param, UINT32 *retval); +static int acpi_asus_wmi_get_event_code(device_t wmi_dev, UINT32 notify, + int *code); static void acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context); static int acpi_asus_wmi_backlight_update_status(device_t dev, struct backlight_props *props); @@ -463,7 +472,7 @@ acpi_asus_wmi_attach(device_t dev) { struct acpi_asus_wmi_softc *sc; UINT32 val; - int dev_id, i; + int dev_id, i, code; bool have_kbd_bkl = false; ACPI_FUNCTION_TRACE((char *)(uintptr_t) __func__); @@ -577,6 +586,23 @@ next: } ACPI_SERIAL_END(asus_wmi); + /* Detect and flush event queue */ + if (sc->dsts_id == ASUS_WMI_METHODID_DSTS2) { + for (i = 0; i <= ASUS_WMI_EVENT_QUEUE_SIZE; i++) { + if (acpi_asus_wmi_get_event_code(sc->wmi_dev, + ASUS_WMI_EVENT_VALUE_ATK, &code) != 0) { + device_printf(dev, + "Can not flush event queue\n"); + break; + } + if (code == ASUS_WMI_EVENT_QUEUE_END || + code == ASUS_WMI_EVENT_MASK) { + sc->event_queue = true; + break; + } + } + } + #ifdef EVDEV_SUPPORT if (sc->notify_guid != NULL) { sc->evdev = evdev_alloc(); @@ -746,6 +772,24 @@ acpi_asus_wmi_free_buffer(ACPI_BUFFER* buf) { } } +static int +acpi_asus_wmi_get_event_code(device_t wmi_dev, UINT32 notify, int *code) +{ + ACPI_BUFFER response = { ACPI_ALLOCATE_BUFFER, NULL }; + ACPI_OBJECT *obj; + int error = 0; + + if (ACPI_FAILURE(ACPI_WMI_GET_EVENT_DATA(wmi_dev, notify, &response))) + return (EIO); + obj = (ACPI_OBJECT*) response.Pointer; + if (obj && obj->Type == ACPI_TYPE_INTEGER) + *code = obj->Integer.Value & ASUS_WMI_EVENT_MASK; + else + error = EINVAL; + acpi_asus_wmi_free_buffer(&response); + return (error); +} + #ifdef EVDEV_SUPPORT static void acpi_asus_wmi_push_evdev_event(struct evdev_dev *evdev, UINT32 notify) @@ -768,20 +812,11 @@ acpi_asus_wmi_push_evdev_event(struct evdev_dev *evdev, UINT32 notify) #endif static void -acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) +acpi_asus_wmi_handle_event(struct acpi_asus_wmi_softc *sc, int code) { - device_t dev = context; - ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); UINT32 val; - int code = 0; - struct acpi_asus_wmi_softc *sc = device_get_softc(dev); - ACPI_BUFFER response = { ACPI_ALLOCATE_BUFFER, NULL }; - ACPI_OBJECT *obj; - ACPI_WMI_GET_EVENT_DATA(sc->wmi_dev, notify, &response); - obj = (ACPI_OBJECT*) response.Pointer; - if (obj && obj->Type == ACPI_TYPE_INTEGER) { - code = obj->Integer.Value; + if (code != 0) { acpi_UserNotify("ASUS", ACPI_ROOT_OBJECT, code); #ifdef EVDEV_SUPPORT @@ -814,7 +849,35 @@ acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) ASUS_WMI_DEVID_TOUCHPAD, val, NULL); } } - acpi_asus_wmi_free_buffer(&response); +} + +static void +acpi_asus_wmi_notify(ACPI_HANDLE h, UINT32 notify, void *context) +{ + device_t dev = context; + struct acpi_asus_wmi_softc *sc = device_get_softc(dev); + int code = 0, i = 1; + + ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, notify); + + if (sc->event_queue) + i += ASUS_WMI_EVENT_QUEUE_SIZE; + do { + if (acpi_asus_wmi_get_event_code(sc->wmi_dev, notify, &code) + != 0) { + device_printf(dev, "Failed to get event code\n"); + return; + } + if (code == ASUS_WMI_EVENT_QUEUE_END || + code == ASUS_WMI_EVENT_MASK) + return; + acpi_asus_wmi_handle_event(sc, code); + if (notify != ASUS_WMI_EVENT_VALUE_ATK) + return; + } while (--i != 0); + if (sc->event_queue) + device_printf(dev, "Can not read event queue, " + "last code: 0x%x\n", code); } static int From nobody Mon Mar 17 18:36:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkG64JtSz5qVHf; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkG635LCz42vF; Mon, 17 Mar 2025 18:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=unL9yvMahTAxnoG0IvZ2+LEKwVN+rZ8LLVDfhivkS0Q=; b=t3RF/7SbwMHAsXtGbXsspV8vzDchq5N96nGReu+AOkM8uvF0Q/LKBPQxw/1yFvN23cgLy6 U+coIwt++PG5tp52pgoszXqk6dyDP+PpAwzzfIfdzbf17D7KuubenKHd3jBdktO1+AHKLa v++ir2GtRhflm1c2HuqGSgyaIHZMpD+wmCKkJG4XXtWA5vT2JDL3wEvht0RXLA48qBsKuH J11dCN9fZPuNDF0SSQWXbOojCR4LJYEn4SkBgYaPqBSbLSneApTkwvxoPtwEyT84T6qjaR uWPJpmXylkePUUSbXBJJdogcPoFW/lLjfXGwMyfuxdrKftDdq4WZuHFDcrGnLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236606; a=rsa-sha256; cv=none; b=OTvnG0T/8hya6+zcIrOHkByQWOHrMZBEeg81mMVHA4IoTYVWI7OeDeQTGXZmG6SR3UV/0x +uxcwK2UhJOgX+f+aILgaLTy4/Z6awqXhUvM4+uqL2s7OqlRPJ+7bFxl7ptNMShC1XYNyZ vYlDlTaj1W8IzmEEYti1ST37BXH5oS/BAHjxILlWWZ8bCnGttEz2GeTbRjLm/0XrTVf4hG vne653sM6ti8gIEM7q8uYNSboHk9Lcip64SYxrjQMMs4bRJhtYs0XgV9bBtIRREJB6P4p0 PBRp7lBDCJAca1Xm3K2lYvosObbw9OqAc9SMsOdeZPRPDmHudhlJu+LjqqTppQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=unL9yvMahTAxnoG0IvZ2+LEKwVN+rZ8LLVDfhivkS0Q=; b=GstMrWQIHUk6MXFBzdftwwGoGoUrFht0tIYuhdkOgqOzn6P8yw0p3GbGsmmkqZGQ3dsvvI 1zzs/RIMVjpqrjo+U860Ep4Jw7TEaX/iZ4/G+fFfl4weC0kYd+AXDVm5eMNynPWIfp0On9 mATE13iu8FynK22RpvX2xQiHxusmB+AQ2NBsgMvBpZnYMOyKj7rMoKeELEUyZAeiNPkDKT jgK7aUawTe8Uui5A5O/wzX0KEPLuaGHHc80znvsGAr24yeKNph7XPQSNBxDuSno15l2dLk KI/2VtygKhVtaYT/F/LCEaJpNDigZVWw1+6HDSIakVA59CLLB5ZMIA/gm41axw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkG6227hzyNf; Mon, 17 Mar 2025 18:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIajhT013003; Mon, 17 Mar 2025 18:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIajJU013000; Mon, 17 Mar 2025 18:36:45 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:45 GMT Message-Id: <202503171836.52HIajJU013000@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 33529d6ad44d - stable/14 - sound: Refactor the format conversion framework List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 33529d6ad44dd28bb29b17c76abf6ff2fea5844a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=33529d6ad44dd28bb29b17c76abf6ff2fea5844a commit 33529d6ad44dd28bb29b17c76abf6ff2fea5844a Author: Christos Margiolis AuthorDate: 2025-03-10 20:19:15 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +0000 sound: Refactor the format conversion framework Merge the PCM_READ|WRITE_* macros defined in pcm/pcm.h, as well as the intpcm_read|write_* macros defined in pcm/feeder_format.c, into six inline functions: pcm_sample_read|write[_norm|calc](). The absence of macro magic makes the code significantly easier to read, use and modify. Since these functions take the input/output format as a parameter, get rid of the read() and write() function pointers defined in struct feed_format_info, as well as the feeder_format_read|write_op() functions, and use the new read/write functions directly. Sponsored by: The FreeBSD Fondation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47932 (cherry picked from commit 433e270f341cf660b2fe125c2e0f733073829188) --- sys/dev/sound/pcm/feeder.h | 7 - sys/dev/sound/pcm/feeder_eq.c | 12 +- sys/dev/sound/pcm/feeder_format.c | 221 +-------------- sys/dev/sound/pcm/feeder_matrix.c | 43 ++- sys/dev/sound/pcm/feeder_mixer.c | 9 +- sys/dev/sound/pcm/feeder_rate.c | 18 +- sys/dev/sound/pcm/feeder_volume.c | 6 +- sys/dev/sound/pcm/pcm.h | 557 +++++++++++++++++--------------------- sys/dev/sound/pcm/sndstat.c | 1 - sys/dev/sound/pcm/sound.h | 1 - tests/sys/sound/pcm_read_write.c | 278 +------------------ 11 files changed, 303 insertions(+), 850 deletions(-) diff --git a/sys/dev/sound/pcm/feeder.h b/sys/dev/sound/pcm/feeder.h index bd0d9dcb8f9c..60b8280e59ef 100644 --- a/sys/dev/sound/pcm/feeder.h +++ b/sys/dev/sound/pcm/feeder.h @@ -161,13 +161,6 @@ int feeder_matrix_setup(struct pcm_feeder *, struct pcmchan_matrix *, struct pcmchan_matrix *); int feeder_matrix_compare(struct pcmchan_matrix *, struct pcmchan_matrix *); -/* feeder_format */ -typedef intpcm_t intpcm_read_t(uint8_t *); -typedef void intpcm_write_t(uint8_t *, intpcm_t); - -intpcm_read_t *feeder_format_read_op(uint32_t); -intpcm_write_t *feeder_format_write_op(uint32_t); - /* 4Front OSS stuffs */ int feeder_matrix_oss_get_channel_order(struct pcmchan_matrix *, unsigned long long *); diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 3c9d9cda9d62..df34ee44a2ab 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -158,9 +158,9 @@ feed_eq_biquad_##SIGN##BIT##ENDIAN(struct feed_eq_info *info, \ dst += j * PCM_##BIT##_BPS; \ do { \ dst -= PCM_##BIT##_BPS; \ - v = _PCM_READ_##SIGN##BIT##_##ENDIAN(dst); \ + v = pcm_sample_read(dst, AFMT_##SIGN##BIT##_##ENDIAN); \ v = ((intpcm64_t)pmul * v) >> pshift; \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v); \ + pcm_sample_write(dst, v, AFMT_##SIGN##BIT##_##ENDIAN); \ } while (--j != 0); \ \ return; \ @@ -173,8 +173,8 @@ feed_eq_biquad_##SIGN##BIT##ENDIAN(struct feed_eq_info *info, \ i = 0; \ j = info->channels; \ do { \ - v = _PCM_READ_##SIGN##BIT##_##ENDIAN(dst); \ - v <<= 32 - BIT; \ + v = pcm_sample_read_norm(dst, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ v = ((intpcm64_t)pmul * v) >> pshift; \ \ w = (intpcm64_t)v * treble->b0; \ @@ -203,8 +203,8 @@ feed_eq_biquad_##SIGN##BIT##ENDIAN(struct feed_eq_info *info, \ v = FEEDEQ_CLAMP(w); \ info->bass.o1[i] = v; \ \ - v >>= 32 - BIT; \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v); \ + pcm_sample_write_norm(dst, v, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ dst += PCM_##BIT##_BPS; \ i++; \ } while (--j != 0); \ diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 53c7d3768a32..5a8f260e1bae 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -36,7 +36,7 @@ #include "opt_snd.h" #endif #include -#include +#include #include "feeder_if.h" #define SND_USE_FXDIV @@ -48,202 +48,19 @@ struct feed_format_info { uint32_t ibps, obps; uint32_t ialign, oalign, channels; - intpcm_read_t *read; - intpcm_write_t *write; + uint32_t rdfmt, wrfmt; uint8_t reservoir[FEEDFORMAT_RESERVOIR]; }; -#define INTPCM_DECLARE_OP_WRITE(SIGN, BIT, ENDIAN, SHIFT) \ -static __inline void \ -intpcm_write_##SIGN##BIT##ENDIAN(uint8_t *dst, intpcm_t v) \ -{ \ - \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v >> SHIFT); \ -} - -#define INTPCM_DECLARE_OP_8(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##8##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##8##_##ENDIAN(src) << 24); \ -} \ -INTPCM_DECLARE_OP_WRITE(SIGN, 8, ENDIAN, 24) - -#define INTPCM_DECLARE_OP_16(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##16##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##16##_##ENDIAN(src) << 16); \ -} \ -INTPCM_DECLARE_OP_WRITE(SIGN, 16, ENDIAN, 16) - -#define INTPCM_DECLARE_OP_24(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##24##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##24##_##ENDIAN(src) << 8); \ -} \ -INTPCM_DECLARE_OP_WRITE(SIGN, 24, ENDIAN, 8) - -#define INTPCM_DECLARE_OP_32(SIGN, ENDIAN) \ -static __inline intpcm_t \ -intpcm_read_##SIGN##32##ENDIAN(uint8_t *src) \ -{ \ - \ - return (_PCM_READ_##SIGN##32##_##ENDIAN(src)); \ -} \ - \ -static __inline void \ -intpcm_write_##SIGN##32##ENDIAN(uint8_t *dst, intpcm_t v) \ -{ \ - \ - _PCM_WRITE_##SIGN##32##_##ENDIAN(dst, v); \ -} - -INTPCM_DECLARE_OP_8(S, NE) -INTPCM_DECLARE_OP_16(S, LE) -INTPCM_DECLARE_OP_16(S, BE) -INTPCM_DECLARE_OP_24(S, LE) -INTPCM_DECLARE_OP_24(S, BE) -INTPCM_DECLARE_OP_32(S, LE) -INTPCM_DECLARE_OP_32(S, BE) -INTPCM_DECLARE_OP_8(U, NE) -INTPCM_DECLARE_OP_16(U, LE) -INTPCM_DECLARE_OP_16(U, BE) -INTPCM_DECLARE_OP_24(U, LE) -INTPCM_DECLARE_OP_24(U, BE) -INTPCM_DECLARE_OP_32(U, LE) -INTPCM_DECLARE_OP_32(U, BE) - -static const struct { - const uint8_t ulaw_to_u8[G711_TABLE_SIZE]; - const uint8_t alaw_to_u8[G711_TABLE_SIZE]; - const uint8_t u8_to_ulaw[G711_TABLE_SIZE]; - const uint8_t u8_to_alaw[G711_TABLE_SIZE]; -} xlaw_conv_tables = { - ULAW_TO_U8, - ALAW_TO_U8, - U8_TO_ULAW, - U8_TO_ALAW -}; - -static __inline intpcm_t -intpcm_read_ulaw(uint8_t *src) -{ - return (_G711_TO_INTPCM(xlaw_conv_tables.ulaw_to_u8, *src) << 24); -} - -static __inline intpcm_t -intpcm_read_alaw(uint8_t *src) -{ - return (_G711_TO_INTPCM(xlaw_conv_tables.alaw_to_u8, *src) << 24); -} - -static __inline void -intpcm_write_ulaw(uint8_t *dst, intpcm_t v) -{ - *dst = _INTPCM_TO_G711(xlaw_conv_tables.u8_to_ulaw, v >> 24); -} - -static __inline void -intpcm_write_alaw(uint8_t *dst, intpcm_t v) -{ - *dst = _INTPCM_TO_G711(xlaw_conv_tables.u8_to_alaw, v >> 24); -} - -/* - * dummy ac3/dts passthrough, etc. - * XXX assume as s16le. - */ -static __inline intpcm_t -intpcm_read_null(uint8_t *src __unused) -{ - - return (0); -} - -static __inline void -intpcm_write_null(uint8_t *dst, intpcm_t v __unused) -{ - - _PCM_WRITE_S16_LE(dst, 0); -} - -#define FEEDFORMAT_ENTRY(SIGN, BIT, ENDIAN) \ - { \ - AFMT_##SIGN##BIT##_##ENDIAN, \ - intpcm_read_##SIGN##BIT##ENDIAN, \ - intpcm_write_##SIGN##BIT##ENDIAN \ - } - -static const struct { - uint32_t format; - intpcm_read_t *read; - intpcm_write_t *write; -} feed_format_ops[] = { - FEEDFORMAT_ENTRY(S, 8, NE), - FEEDFORMAT_ENTRY(S, 16, LE), - FEEDFORMAT_ENTRY(S, 24, LE), - FEEDFORMAT_ENTRY(S, 32, LE), - FEEDFORMAT_ENTRY(S, 16, BE), - FEEDFORMAT_ENTRY(S, 24, BE), - FEEDFORMAT_ENTRY(S, 32, BE), - FEEDFORMAT_ENTRY(U, 8, NE), - FEEDFORMAT_ENTRY(U, 16, LE), - FEEDFORMAT_ENTRY(U, 24, LE), - FEEDFORMAT_ENTRY(U, 32, LE), - FEEDFORMAT_ENTRY(U, 16, BE), - FEEDFORMAT_ENTRY(U, 24, BE), - FEEDFORMAT_ENTRY(U, 32, BE), - { - AFMT_MU_LAW, - intpcm_read_ulaw, intpcm_write_ulaw - }, - { - AFMT_A_LAW, - intpcm_read_alaw, intpcm_write_alaw - }, - { - AFMT_AC3, - intpcm_read_null, intpcm_write_null - } -}; - static int feed_format_init(struct pcm_feeder *f) { struct feed_format_info *info; - intpcm_read_t *rd_op; - intpcm_write_t *wr_op; - size_t i; if (f->desc->in == f->desc->out || AFMT_CHANNEL(f->desc->in) != AFMT_CHANNEL(f->desc->out)) return (EINVAL); - rd_op = NULL; - wr_op = NULL; - - for (i = 0; i < nitems(feed_format_ops) && - (rd_op == NULL || wr_op == NULL); i++) { - if (rd_op == NULL && - AFMT_ENCODING(f->desc->in) == feed_format_ops[i].format) - rd_op = feed_format_ops[i].read; - if (wr_op == NULL && - AFMT_ENCODING(f->desc->out) == feed_format_ops[i].format) - wr_op = feed_format_ops[i].write; - } - - if (rd_op == NULL || wr_op == NULL) { - printf("%s(): failed to initialize io ops " - "in=0x%08x out=0x%08x\n", - __func__, f->desc->in, f->desc->out); - return (EINVAL); - } - info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); @@ -252,11 +69,11 @@ feed_format_init(struct pcm_feeder *f) info->ibps = AFMT_BPS(f->desc->in); info->ialign = info->ibps * info->channels; - info->read = rd_op; + info->rdfmt = AFMT_ENCODING(f->desc->in); info->obps = AFMT_BPS(f->desc->out); info->oalign = info->obps * info->channels; - info->write = wr_op; + info->wrfmt = AFMT_ENCODING(f->desc->out); f->data = info; @@ -340,8 +157,8 @@ feed_format_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, count -= j * info->obps; do { - v = info->read(src); - info->write(dst, v); + v = pcm_sample_read_norm(src, info->rdfmt); + pcm_sample_write_norm(dst, v, info->wrfmt); dst += info->obps; src += info->ibps; } while (--j != 0); @@ -365,29 +182,3 @@ static kobj_method_t feeder_format_methods[] = { }; FEEDER_DECLARE(feeder_format, NULL); - -intpcm_read_t * -feeder_format_read_op(uint32_t format) -{ - size_t i; - - for (i = 0; i < nitems(feed_format_ops); i++) { - if (AFMT_ENCODING(format) == feed_format_ops[i].format) - return (feed_format_ops[i].read); - } - - return (NULL); -} - -intpcm_write_t * -feeder_format_write_op(uint32_t format) -{ - size_t i; - - for (i = 0; i < nitems(feed_format_ops); i++) { - if (AFMT_ENCODING(format) == feed_format_ops[i].format) - return (feed_format_ops[i].write); - } - - return (NULL); -} diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 97cf86585636..b63b5841ff7f 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -70,10 +70,6 @@ struct feed_matrix_info { uint32_t ialign, oalign; uint32_t in, out; feed_matrix_t apply; -#ifdef FEEDMATRIX_GENERIC - intpcm_read_t *rd; - intpcm_write_t *wr; -#endif struct { int chn[SND_CHN_T_MAX + 1]; int mul, shift; @@ -132,16 +128,17 @@ feed_matrix_##SIGN##BIT##ENDIAN(struct feed_matrix_info *info, \ for (i = 0; info->matrix[i].chn[0] != SND_CHN_T_EOF; \ i++) { \ if (info->matrix[i].chn[0] == SND_CHN_T_NULL) { \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, \ - 0); \ + pcm_sample_write(dst, 0, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ dst += PCM_##BIT##_BPS; \ continue; \ } else if (info->matrix[i].chn[1] == \ SND_CHN_T_EOF) { \ - v = _PCM_READ_##SIGN##BIT##_##ENDIAN( \ - src + info->matrix[i].chn[0]); \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, \ - v); \ + v = pcm_sample_read( \ + src + info->matrix[i].chn[0], \ + AFMT_##SIGN##BIT##_##ENDIAN); \ + pcm_sample_write(dst, v, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ dst += PCM_##BIT##_BPS; \ continue; \ } \ @@ -150,8 +147,9 @@ feed_matrix_##SIGN##BIT##ENDIAN(struct feed_matrix_info *info, \ for (j = 0; \ info->matrix[i].chn[j] != SND_CHN_T_EOF; \ j++) { \ - v = _PCM_READ_##SIGN##BIT##_##ENDIAN( \ - src + info->matrix[i].chn[j]); \ + v = pcm_sample_read( \ + src + info->matrix[i].chn[j], \ + AFMT_##SIGN##BIT##_##ENDIAN); \ accum += v; \ } \ \ @@ -165,7 +163,8 @@ feed_matrix_##SIGN##BIT##ENDIAN(struct feed_matrix_info *info, \ ((accum < PCM_S##BIT##_MIN) ? \ PCM_S##BIT##_MIN : \ accum); \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, v); \ + pcm_sample_write(dst, v, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ dst += PCM_##BIT##_BPS; \ } \ src += info->ialign; \ @@ -254,13 +253,14 @@ feed_matrix_apply_generic(struct feed_matrix_info *info, for (i = 0; info->matrix[i].chn[0] != SND_CHN_T_EOF; i++) { if (info->matrix[i].chn[0] == SND_CHN_T_NULL) { - info->wr(dst, 0); + pcm_sample_write_norm(dst, 0, info->out); dst += info->bps; continue; } else if (info->matrix[i].chn[1] == SND_CHN_T_EOF) { - v = info->rd(src + info->matrix[i].chn[0]); - info->wr(dst, v); + v = pcm_sample_read_norm(src + + info->matrix[i].chn[0], info->in); + pcm_sample_write_norm(dst, v, info->out); dst += info->bps; continue; } @@ -269,7 +269,8 @@ feed_matrix_apply_generic(struct feed_matrix_info *info, for (j = 0; info->matrix[i].chn[j] != SND_CHN_T_EOF; j++) { - v = info->rd(src + info->matrix[i].chn[j]); + v = pcm_sample_read_norm(src + + info->matrix[i].chn[j], info->in); accum += v; } @@ -280,7 +281,7 @@ feed_matrix_apply_generic(struct feed_matrix_info *info, v = (accum > PCM_S32_MAX) ? PCM_S32_MAX : ((accum < PCM_S32_MIN) ? PCM_S32_MIN : accum); - info->wr(dst, v); + pcm_sample_write_norm(dst, v, info->out); dst += info->bps; } src += info->ialign; @@ -421,12 +422,6 @@ feed_matrix_init(struct pcm_feeder *f) if (info->apply == NULL) { #ifdef FEEDMATRIX_GENERIC - info->rd = feeder_format_read_op(info->in); - info->wr = feeder_format_write_op(info->out); - if (info->rd == NULL || info->wr == NULL) { - free(info, M_DEVBUF); - return (EINVAL); - } info->apply = feed_matrix_apply_generic; #else free(info, M_DEVBUF); diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 9f6b653effa3..7640b09400ed 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -59,11 +59,14 @@ feed_mixer_##SIGN##BIT##ENDIAN(uint8_t *src, uint8_t *dst, \ src -= PCM_##BIT##_BPS; \ dst -= PCM_##BIT##_BPS; \ count -= PCM_##BIT##_BPS; \ - x = PCM_READ_##SIGN##BIT##_##ENDIAN(src); \ - y = PCM_READ_##SIGN##BIT##_##ENDIAN(dst); \ + x = pcm_sample_read_calc(src, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ + y = pcm_sample_read_calc(dst, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ z = INTPCM##BIT##_T(x) + y; \ x = PCM_CLAMP_##SIGN##BIT(z); \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, x); \ + pcm_sample_write(dst, x, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ } while (count != 0); \ } diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 40e5d3018ab4..e1b4076e248e 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -471,10 +471,10 @@ z_feed_linear_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ ch = info->channels; \ \ do { \ - x = _PCM_READ_##SIGN##BIT##_##ENDIAN(sx); \ - y = _PCM_READ_##SIGN##BIT##_##ENDIAN(sy); \ + x = pcm_sample_read(sx, AFMT_##SIGN##BIT##_##ENDIAN); \ + y = pcm_sample_read(sy, AFMT_##SIGN##BIT##_##ENDIAN); \ x = Z_LINEAR_INTERPOLATE_##BIT(z, x, y); \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, x); \ + pcm_sample_write(dst, x, AFMT_##SIGN##BIT##_##ENDIAN); \ sx += PCM_##BIT##_BPS; \ sy += PCM_##BIT##_BPS; \ dst += PCM_##BIT##_BPS; \ @@ -516,7 +516,7 @@ z_feed_linear_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ c += z >> Z_SHIFT; \ z &= Z_MASK; \ coeff = Z_COEFF_INTERPOLATE(z, z_coeff[c], z_dcoeff[c]); \ - x = _PCM_READ_##SIGN##BIT##_##ENDIAN(p); \ + x = pcm_sample_read(p, AFMT_##SIGN##BIT##_##ENDIAN); \ v += Z_NORM_##BIT((intpcm64_t)x * coeff); \ z += info->z_dy; \ p adv##= info->channels * PCM_##BIT##_BPS @@ -574,7 +574,8 @@ z_feed_sinc_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ else \ v >>= Z_COEFF_SHIFT - Z_GUARD_BIT_##BIT; \ Z_CLIP_CHECK(v, BIT); \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, Z_CLAMP(v, BIT)); \ + pcm_sample_write(dst, Z_CLAMP(v, BIT), \ + AFMT_##SIGN##BIT##_##ENDIAN); \ } while (ch != 0); \ } @@ -599,11 +600,11 @@ z_feed_sinc_polyphase_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ z_pcoeff = info->z_pcoeff + \ ((info->z_alpha * info->z_size) << 1); \ for (i = info->z_size; i != 0; i--) { \ - x = _PCM_READ_##SIGN##BIT##_##ENDIAN(p); \ + x = pcm_sample_read(p, AFMT_##SIGN##BIT##_##ENDIAN); \ v += Z_NORM_##BIT((intpcm64_t)x * *z_pcoeff); \ z_pcoeff++; \ p += info->channels * PCM_##BIT##_BPS; \ - x = _PCM_READ_##SIGN##BIT##_##ENDIAN(p); \ + x = pcm_sample_read(p, AFMT_##SIGN##BIT##_##ENDIAN); \ v += Z_NORM_##BIT((intpcm64_t)x * *z_pcoeff); \ z_pcoeff++; \ p += info->channels * PCM_##BIT##_BPS; \ @@ -613,7 +614,8 @@ z_feed_sinc_polyphase_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ else \ v >>= Z_COEFF_SHIFT - Z_GUARD_BIT_##BIT; \ Z_CLIP_CHECK(v, BIT); \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, Z_CLAMP(v, BIT)); \ + pcm_sample_write(dst, Z_CLAMP(v, BIT), \ + AFMT_##SIGN##BIT##_##ENDIAN); \ } while (ch != 0); \ } diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 7e600c131afe..572bc980ffe3 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -63,10 +63,12 @@ feed_volume_##SIGN##BIT##ENDIAN(int *vol, int *matrix, \ do { \ dst -= PCM_##BIT##_BPS; \ i--; \ - x = PCM_READ_##SIGN##BIT##_##ENDIAN(dst); \ + x = pcm_sample_read_calc(dst, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ v = FEEDVOLUME_CALC##BIT(x, vol[matrix[i]]); \ x = PCM_CLAMP_##SIGN##BIT(v); \ - _PCM_WRITE_##SIGN##BIT##_##ENDIAN(dst, x); \ + pcm_sample_write(dst, x, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ } while (i != 0); \ } while (--count != 0); \ } diff --git a/sys/dev/sound/pcm/pcm.h b/sys/dev/sound/pcm/pcm.h index 3165822e3c85..f18d28b3b196 100644 --- a/sys/dev/sound/pcm/pcm.h +++ b/sys/dev/sound/pcm/pcm.h @@ -31,14 +31,11 @@ #include -/* - * Macros for reading/writing PCM sample / int values from bytes array. - * Since every process is done using signed integer (and to make our life - * less miserable), unsigned sample will be converted to its signed - * counterpart and restored during writing back. To avoid overflow, - * we truncate 32bit (and only 32bit) samples down to 24bit (see below - * for the reason), unless SND_PCM_64 is defined. - */ +#include + +#ifndef _KERNEL +#include /* for __assert_unreachable() */ +#endif /* * Automatically turn on 64bit arithmetic on suitable archs @@ -106,309 +103,6 @@ typedef uint64_t uintpcm64_t; #define INTPCM24_T(v) ((intpcm24_t)(v)) #define INTPCM32_T(v) ((intpcm32_t)(v)) -#if BYTE_ORDER == LITTLE_ENDIAN -#define _PCM_READ_S16_LE(b8) INTPCM_T(*((int16_t *)(b8))) -#define _PCM_READ_S32_LE(b8) INTPCM_T(*((int32_t *)(b8))) -#define _PCM_READ_S16_BE(b8) \ - INTPCM_T((b8)[1] | (((int8_t)((b8)[0])) << 8)) -#define _PCM_READ_S32_BE(b8) \ - INTPCM_T((b8)[3] | ((b8)[2] << 8) | ((b8)[1] << 16) | \ - (((int8_t)((b8)[0])) << 24)) - -#define _PCM_WRITE_S16_LE(b8, val) do { \ - *((int16_t *)(b8)) = (val); \ -} while (0) -#define _PCM_WRITE_S32_LE(b8, val) do { \ - *((int32_t *)(b8)) = (val); \ -} while (0) -#define _PCM_WRITE_S16_BE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[1] = val; \ - b8[0] = val >> 8; \ -} while (0) -#define _PCM_WRITE_S32_BE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[3] = val; \ - b8[2] = val >> 8; \ - b8[1] = val >> 16; \ - b8[0] = val >> 24; \ -} while (0) - -#define _PCM_READ_U16_LE(b8) \ - INTPCM_T((int16_t)(*((uint16_t *)(b8)) ^ 0x8000)) -#define _PCM_READ_U32_LE(b8) \ - INTPCM_T((int32_t)(*((uint32_t *)(b8)) ^ 0x80000000)) -#define _PCM_READ_U16_BE(b8) \ - INTPCM_T((b8)[1] | (((int8_t)((b8)[0] ^ 0x80)) << 8)) -#define _PCM_READ_U32_BE(b8) \ - INTPCM_T((b8)[3] | ((b8)[2] << 8) | ((b8)[1] << 16) | \ - (((int8_t)((b8)[0] ^ 0x80)) << 24)) - -#define _PCM_WRITE_U16_LE(b8, val) do { \ - *((uint16_t *)(b8)) = (val) ^ 0x8000; \ -} while (0) -#define _PCM_WRITE_U32_LE(b8, val) do { \ - *((uint32_t *)(b8)) = (val) ^ 0x80000000; \ -} while (0) -#define _PCM_WRITE_U16_BE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[1] = val; \ - b8[0] = (val >> 8) ^ 0x80; \ -} while (0) -#define _PCM_WRITE_U32_BE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[3] = val; \ - b8[2] = val >> 8; \ - b8[1] = val >> 16; \ - b8[0] = (val >> 24) ^ 0x80; \ -} while (0) - -#define _PCM_READ_S16_NE(b8) _PCM_READ_S16_LE(b8) -#define _PCM_READ_U16_NE(b8) _PCM_READ_U16_LE(b8) -#define _PCM_READ_S32_NE(b8) _PCM_READ_S32_LE(b8) -#define _PCM_READ_U32_NE(b8) _PCM_READ_U32_LE(b8) -#define _PCM_WRITE_S16_NE(b6) _PCM_WRITE_S16_LE(b8) -#define _PCM_WRITE_U16_NE(b6) _PCM_WRITE_U16_LE(b8) -#define _PCM_WRITE_S32_NE(b6) _PCM_WRITE_S32_LE(b8) -#define _PCM_WRITE_U32_NE(b6) _PCM_WRITE_U32_LE(b8) -#else /* !LITTLE_ENDIAN */ -#define _PCM_READ_S16_LE(b8) \ - INTPCM_T((b8)[0] | (((int8_t)((b8)[1])) << 8)) -#define _PCM_READ_S32_LE(b8) \ - INTPCM_T((b8)[0] | ((b8)[1] << 8) | ((b8)[2] << 16) | \ - (((int8_t)((b8)[3])) << 24)) -#define _PCM_READ_S16_BE(b8) INTPCM_T(*((int16_t *)(b8))) -#define _PCM_READ_S32_BE(b8) INTPCM_T(*((int32_t *)(b8))) - -#define _PCM_WRITE_S16_LE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[0] = val; \ - b8[1] = val >> 8; \ -} while (0) -#define _PCM_WRITE_S32_LE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[0] = val; \ - b8[1] = val >> 8; \ - b8[2] = val >> 16; \ - b8[3] = val >> 24; \ -} while (0) -#define _PCM_WRITE_S16_BE(b8, val) do { \ - *((int16_t *)(b8)) = (val); \ -} while (0) -#define _PCM_WRITE_S32_BE(b8, val) do { \ - *((int32_t *)(b8)) = (val); \ -} while (0) - -#define _PCM_READ_U16_LE(b8) \ - INTPCM_T((b8)[0] | (((int8_t)((b8)[1] ^ 0x80)) << 8)) -#define _PCM_READ_U32_LE(b8) \ - INTPCM_T((b8)[0] | ((b8)[1] << 8) | ((b8)[2] << 16) | \ - (((int8_t)((b8)[3] ^ 0x80)) << 24)) -#define _PCM_READ_U16_BE(b8) \ - INTPCM_T((int16_t)(*((uint16_t *)(b8)) ^ 0x8000)) -#define _PCM_READ_U32_BE(b8) \ - INTPCM_T((int32_t)(*((uint32_t *)(b8)) ^ 0x80000000)) - -#define _PCM_WRITE_U16_LE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[0] = val; \ - b8[1] = (val >> 8) ^ 0x80; \ -} while (0) -#define _PCM_WRITE_U32_LE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[0] = val; \ - b8[1] = val >> 8; \ - b8[2] = val >> 16; \ - b8[3] = (val >> 24) ^ 0x80; \ -} while (0) -#define _PCM_WRITE_U16_BE(b8, val) do { \ - *((uint16_t *)(b8)) = (val) ^ 0x8000; \ -} while (0) -#define _PCM_WRITE_U32_BE(b8, val) do { \ - *((uint32_t *)(b8)) = (val) ^ 0x80000000; \ -} while (0) - -#define _PCM_READ_S16_NE(b8) _PCM_READ_S16_BE(b8) -#define _PCM_READ_U16_NE(b8) _PCM_READ_U16_BE(b8) -#define _PCM_READ_S32_NE(b8) _PCM_READ_S32_BE(b8) -#define _PCM_READ_U32_NE(b8) _PCM_READ_U32_BE(b8) -#define _PCM_WRITE_S16_NE(b6) _PCM_WRITE_S16_BE(b8) -#define _PCM_WRITE_U16_NE(b6) _PCM_WRITE_U16_BE(b8) -#define _PCM_WRITE_S32_NE(b6) _PCM_WRITE_S32_BE(b8) -#define _PCM_WRITE_U32_NE(b6) _PCM_WRITE_U32_BE(b8) -#endif /* LITTLE_ENDIAN */ - -#define _PCM_READ_S24_LE(b8) \ - INTPCM_T((b8)[0] | ((b8)[1] << 8) | (((int8_t)((b8)[2])) << 16)) -#define _PCM_READ_S24_BE(b8) \ - INTPCM_T((b8)[2] | ((b8)[1] << 8) | (((int8_t)((b8)[0])) << 16)) - -#define _PCM_WRITE_S24_LE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[0] = val; \ - b8[1] = val >> 8; \ - b8[2] = val >> 16; \ -} while (0) -#define _PCM_WRITE_S24_BE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[2] = val; \ - b8[1] = val >> 8; \ - b8[0] = val >> 16; \ -} while (0) - -#define _PCM_READ_U24_LE(b8) \ - INTPCM_T((b8)[0] | ((b8)[1] << 8) | \ - (((int8_t)((b8)[2] ^ 0x80)) << 16)) -#define _PCM_READ_U24_BE(b8) \ - INTPCM_T((b8)[2] | ((b8)[1] << 8) | \ - (((int8_t)((b8)[0] ^ 0x80)) << 16)) - -#define _PCM_WRITE_U24_LE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[0] = val; \ - b8[1] = val >> 8; \ - b8[2] = (val >> 16) ^ 0x80; \ -} while (0) -#define _PCM_WRITE_U24_BE(bb8, vval) do { \ - intpcm_t val = (vval); \ - uint8_t *b8 = (bb8); \ - b8[2] = val; \ - b8[1] = val >> 8; \ - b8[0] = (val >> 16) ^ 0x80; \ -} while (0) - -#if BYTE_ORDER == LITTLE_ENDIAN -#define _PCM_READ_S24_NE(b8) _PCM_READ_S24_LE(b8) -#define _PCM_READ_U24_NE(b8) _PCM_READ_U24_LE(b8) -#define _PCM_WRITE_S24_NE(b6) _PCM_WRITE_S24_LE(b8) -#define _PCM_WRITE_U24_NE(b6) _PCM_WRITE_U24_LE(b8) -#else /* !LITTLE_ENDIAN */ -#define _PCM_READ_S24_NE(b8) _PCM_READ_S24_BE(b8) -#define _PCM_READ_U24_NE(b8) _PCM_READ_U24_BE(b8) -#define _PCM_WRITE_S24_NE(b6) _PCM_WRITE_S24_BE(b8) -#define _PCM_WRITE_U24_NE(b6) _PCM_WRITE_U24_BE(b8) -#endif /* LITTLE_ENDIAN */ -/* - * 8bit sample is pretty much useless since it doesn't provide - * sufficient dynamic range throughout our filtering process. - * For the sake of completeness, declare it anyway. - */ -#define _PCM_READ_S8_NE(b8) INTPCM_T(*((int8_t *)(b8))) -#define _PCM_READ_U8_NE(b8) \ - INTPCM_T((int8_t)(*((uint8_t *)(b8)) ^ 0x80)) - -#define _PCM_WRITE_S8_NE(b8, val) do { \ - *((int8_t *)(b8)) = (val); \ -} while (0) -#define _PCM_WRITE_U8_NE(b8, val) do { \ - *((uint8_t *)(b8)) = (val) ^ 0x80; \ -} while (0) - -/* - * Common macross. Use this instead of "_", unless we want - * the real sample value. - */ - -/* 8bit */ -#define PCM_READ_S8_NE(b8) _PCM_READ_S8_NE(b8) -#define PCM_READ_U8_NE(b8) _PCM_READ_U8_NE(b8) -#define PCM_WRITE_S8_NE(b8, val) _PCM_WRITE_S8_NE(b8, val) -#define PCM_WRITE_U8_NE(b8, val) _PCM_WRITE_U8_NE(b8, val) - -/* 16bit */ -#define PCM_READ_S16_LE(b8) _PCM_READ_S16_LE(b8) -#define PCM_READ_S16_BE(b8) _PCM_READ_S16_BE(b8) -#define PCM_READ_U16_LE(b8) _PCM_READ_U16_LE(b8) -#define PCM_READ_U16_BE(b8) _PCM_READ_U16_BE(b8) - -#define PCM_WRITE_S16_LE(b8, val) _PCM_WRITE_S16_LE(b8, val) -#define PCM_WRITE_S16_BE(b8, val) _PCM_WRITE_S16_BE(b8, val) -#define PCM_WRITE_U16_LE(b8, val) _PCM_WRITE_U16_LE(b8, val) -#define PCM_WRITE_U16_BE(b8, val) _PCM_WRITE_U16_BE(b8, val) - -#define PCM_READ_S16_NE(b8) _PCM_READ_S16_NE(b8) -#define PCM_READ_U16_NE(b8) _PCM_READ_U16_NE(b8) -#define PCM_WRITE_S16_NE(b8) _PCM_WRITE_S16_NE(b8) -#define PCM_WRITE_U16_NE(b8) _PCM_WRITE_U16_NE(b8) - -/* 24bit */ -#define PCM_READ_S24_LE(b8) _PCM_READ_S24_LE(b8) -#define PCM_READ_S24_BE(b8) _PCM_READ_S24_BE(b8) -#define PCM_READ_U24_LE(b8) _PCM_READ_U24_LE(b8) -#define PCM_READ_U24_BE(b8) _PCM_READ_U24_BE(b8) - -#define PCM_WRITE_S24_LE(b8, val) _PCM_WRITE_S24_LE(b8, val) -#define PCM_WRITE_S24_BE(b8, val) _PCM_WRITE_S24_BE(b8, val) -#define PCM_WRITE_U24_LE(b8, val) _PCM_WRITE_U24_LE(b8, val) -#define PCM_WRITE_U24_BE(b8, val) _PCM_WRITE_U24_BE(b8, val) - -#define PCM_READ_S24_NE(b8) _PCM_READ_S24_NE(b8) -#define PCM_READ_U24_NE(b8) _PCM_READ_U24_NE(b8) -#define PCM_WRITE_S24_NE(b8) _PCM_WRITE_S24_NE(b8) -#define PCM_WRITE_U24_NE(b8) _PCM_WRITE_U24_NE(b8) - -/* 32bit */ -#ifdef SND_PCM_64 -#define PCM_READ_S32_LE(b8) _PCM_READ_S32_LE(b8) -#define PCM_READ_S32_BE(b8) _PCM_READ_S32_BE(b8) -#define PCM_READ_U32_LE(b8) _PCM_READ_U32_LE(b8) -#define PCM_READ_U32_BE(b8) _PCM_READ_U32_BE(b8) - -#define PCM_WRITE_S32_LE(b8, val) _PCM_WRITE_S32_LE(b8, val) -#define PCM_WRITE_S32_BE(b8, val) _PCM_WRITE_S32_BE(b8, val) -#define PCM_WRITE_U32_LE(b8, val) _PCM_WRITE_U32_LE(b8, val) -#define PCM_WRITE_U32_BE(b8, val) _PCM_WRITE_U32_BE(b8, val) - -#define PCM_READ_S32_NE(b8) _PCM_READ_S32_NE(b8) -#define PCM_READ_U32_NE(b8) _PCM_READ_U32_NE(b8) -#define PCM_WRITE_S32_NE(b8) _PCM_WRITE_S32_NE(b8) -#define PCM_WRITE_U32_NE(b8) _PCM_WRITE_U32_NE(b8) -#else /* !SND_PCM_64 */ -/* - * 24bit integer ?!? This is quite unfortunate, eh? Get the fact straight: - * Dynamic range for: - * 1) Human =~ 140db - * 2) 16bit = 96db (close enough) - * 3) 24bit = 144db (perfect) - * 4) 32bit = 196db (way too much) - * 5) Bugs Bunny = Gazillion!@%$Erbzzztt-EINVAL db - * Since we're not Bugs Bunny ..uh..err.. avoiding 64bit arithmetic, 24bit - * is pretty much sufficient for our signed integer processing. - */ -#define PCM_READ_S32_LE(b8) (_PCM_READ_S32_LE(b8) >> PCM_FXSHIFT) -#define PCM_READ_S32_BE(b8) (_PCM_READ_S32_BE(b8) >> PCM_FXSHIFT) -#define PCM_READ_U32_LE(b8) (_PCM_READ_U32_LE(b8) >> PCM_FXSHIFT) -#define PCM_READ_U32_BE(b8) (_PCM_READ_U32_BE(b8) >> PCM_FXSHIFT) - -#define PCM_READ_S32_NE(b8) (_PCM_READ_S32_NE(b8) >> PCM_FXSHIFT) -#define PCM_READ_U32_NE(b8) (_PCM_READ_U32_NE(b8) >> PCM_FXSHIFT) - -#define PCM_WRITE_S32_LE(b8, val) \ - _PCM_WRITE_S32_LE(b8, (val) << PCM_FXSHIFT) -#define PCM_WRITE_S32_BE(b8, val) \ - _PCM_WRITE_S32_BE(b8, (val) << PCM_FXSHIFT) -#define PCM_WRITE_U32_LE(b8, val) \ - _PCM_WRITE_U32_LE(b8, (val) << PCM_FXSHIFT) -#define PCM_WRITE_U32_BE(b8, val) \ - _PCM_WRITE_U32_BE(b8, (val) << PCM_FXSHIFT) - -#define PCM_WRITE_S32_NE(b8, val) \ - _PCM_WRITE_S32_NE(b8, (val) << PCM_FXSHIFT) -#define PCM_WRITE_U32_NE(b8, val) \ - _PCM_WRITE_U32_NE(b8, (val) << PCM_FXSHIFT) -#endif /* SND_PCM_64 */ - #define PCM_CLAMP_S8(val) \ (((val) > PCM_S8_MAX) ? PCM_S8_MAX : \ (((val) < PCM_S8_MIN) ? PCM_S8_MIN : (val))) @@ -435,4 +129,245 @@ typedef uint64_t uintpcm64_t; #define PCM_CLAMP_U24(val) PCM_CLAMP_S24(val) #define PCM_CLAMP_U32(val) PCM_CLAMP_S32(val) +static const struct { + const uint8_t ulaw_to_u8[G711_TABLE_SIZE]; + const uint8_t alaw_to_u8[G711_TABLE_SIZE]; + const uint8_t u8_to_ulaw[G711_TABLE_SIZE]; + const uint8_t u8_to_alaw[G711_TABLE_SIZE]; +} xlaw_conv_tables = { + ULAW_TO_U8, + ALAW_TO_U8, + U8_TO_ULAW, + U8_TO_ALAW +}; + +/* + * Functions for reading/writing PCM integer sample values from bytes array. + * Since every process is done using signed integer (and to make our life less + * miserable), unsigned sample will be converted to its signed counterpart and + * restored during writing back. + */ +static __always_inline __unused intpcm_t +pcm_sample_read(const uint8_t *src, uint32_t fmt) +{ + intpcm_t v; + + fmt = AFMT_ENCODING(fmt); + + switch (fmt) { + case AFMT_AC3: + v = 0; + break; + case AFMT_MU_LAW: + v = _G711_TO_INTPCM(xlaw_conv_tables.ulaw_to_u8, *src); + break; + case AFMT_A_LAW: + v = _G711_TO_INTPCM(xlaw_conv_tables.alaw_to_u8, *src); + break; + case AFMT_S8: + v = INTPCM_T((int8_t)*src); + break; + case AFMT_U8: + v = INTPCM_T((int8_t)(*src ^ 0x80)); + break; + case AFMT_S16_LE: + v = INTPCM_T(src[0] | (int8_t)src[1] << 8); + break; + case AFMT_S16_BE: + v = INTPCM_T(src[1] | (int8_t)src[0] << 8); + break; + case AFMT_U16_LE: + v = INTPCM_T(src[0] | (int8_t)(src[1] ^ 0x80) << 8); + break; + case AFMT_U16_BE: + v = INTPCM_T(src[1] | (int8_t)(src[0] ^ 0x80) << 8); + break; + case AFMT_S24_LE: + v = INTPCM_T(src[0] | src[1] << 8 | (int8_t)src[2] << 16); + break; + case AFMT_S24_BE: + v = INTPCM_T(src[2] | src[1] << 8 | (int8_t)src[0] << 16); + break; + case AFMT_U24_LE: + v = INTPCM_T(src[0] | src[1] << 8 | + (int8_t)(src[2] ^ 0x80) << 16); + break; + case AFMT_U24_BE: + v = INTPCM_T(src[2] | src[1] << 8 | *** 530 LINES SKIPPED *** From nobody Mon Mar 17 18:36:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkG748fvz5qVTH; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkG71WfDz42vM; Mon, 17 Mar 2025 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJ++enFxxnWu+0Rv9gCPKMGPcJHePwwJHWPyIvThNgw=; b=Zv83hcx85Zl8IU09Arc8sXqeFs2VYWOS+dksuPllJHkttxvS1vXjVMnnU9GKBranhah0uR dY2nUilavQrm0XKzHvk4NzujMRHKwTrjguv++AHBNA05P1zpAC98XNohSq105QApc+a+iR CITb2EH758vLI7Ae6eNGKfWiwI1ggaSVVOGTmGi1DZtGTU4LZY9Wow3TXTVJIhIuiVH6qm r1Iv8UPWWSPA96+jB4xMc7z8qFEa3bVlP2p6BD0/8ZGBStgKcf8Ugi446/TLf6/GHiddaG eWhRweMNryPPdswMcUhLYy2onhfxsUajR/wG4iwJ8ysXvr5LFeipNZKjJctlAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236607; a=rsa-sha256; cv=none; b=f2Xq5VS7gZOEBJ8GaAQnlYSiXaqz0AJGU8gjyBn5TnjBo0eA1D5EeLMXDqAbcQXN4DdGzt +ADhIeaHlYNYsY2aNmFhPAUixSAb7mWAczgJmn/XMUw5majYKsi/2ytseaN4h0ohC5Vo2L hBT9ABB3NqSpj01RT88JWC2lkuvoIM3/YAT9b9Gj1GicN2AZYMI0bVGZg7CG+7Y4MdDptb H7nSXjFXpNATm2af3vwPb6LELZqO7a+xJ7576v6c7Kp7Uzvu1Y4zeAJr4ZLyqAvUFDnyTt l908xX25jsAh8eIe/quKo/qypjFYhXxKv5o/QL9f68VJsU61lEzw7qGr+OgX0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJ++enFxxnWu+0Rv9gCPKMGPcJHePwwJHWPyIvThNgw=; b=lcdegtg1O9jCL0NA+vPnEyHL/kWRVT90eyeMC2OtM28GK8Z2yNAzuXNTD1cztxOie/Zg+q 5AlcvHtQVffRrl5BrUaIiNzNeZ3xrKI4aXYcLMeS2BDCsILltyOB9Xhf20KZ6DKVADvZnG AZnfApArpt+p8HD0qb65lonIlhKV88cAIyvwLob8X8s0SFhd27bQUbsHADk+a2lyhrTDdg 7Db4WPqCjj//15cI8huDv4Vh3ZMXGBSs2bBErGvObHt6yu5mG/4LabpPIZ9Z1M9g8CRXQy /ENCqSPLI6/FmU2h4lqudAUMf+xHf5VWXMXzVJku6cFEGPX8Rrgng+/YEE3Oig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkG70hpczyR6; Mon, 17 Mar 2025 18:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIalZb013036; Mon, 17 Mar 2025 18:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIak4x013033; Mon, 17 Mar 2025 18:36:46 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:46 GMT Message-Id: <202503171836.52HIak4x013033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d8c3c6752bf8 - stable/14 - sound: Turn clamp macros into a function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d8c3c6752bf874bb193ed7948e17946430912c23 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d8c3c6752bf874bb193ed7948e17946430912c23 commit d8c3c6752bf874bb193ed7948e17946430912c23 Author: Christos Margiolis AuthorDate: 2025-03-10 20:19:27 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +0000 sound: Turn clamp macros into a function This makes some subsequent feeder refactors easier to implement. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48421 (cherry picked from commit 4918fc2e238b581aaf1f63e20003d5fa957f0b09) --- sys/dev/sound/pcm/feeder_eq.c | 8 ++--- sys/dev/sound/pcm/feeder_mixer.c | 2 +- sys/dev/sound/pcm/feeder_rate.c | 8 ++--- sys/dev/sound/pcm/feeder_volume.c | 3 +- sys/dev/sound/pcm/pcm.h | 64 +++++++++++++++++++++++---------------- 5 files changed, 45 insertions(+), 40 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index df34ee44a2ab..c5f82a2f18fc 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -135,10 +135,6 @@ struct feed_eq_info { #define FEEDEQ_ERR_CLIP_CHECK(...) #endif -#define FEEDEQ_CLAMP(v) (((v) > PCM_S32_MAX) ? PCM_S32_MAX : \ - (((v) < PCM_S32_MIN) ? PCM_S32_MIN : \ - (v))) - #define FEEDEQ_DECLARE(SIGN, BIT, ENDIAN) \ static void \ feed_eq_biquad_##SIGN##BIT##ENDIAN(struct feed_eq_info *info, \ @@ -187,7 +183,7 @@ feed_eq_biquad_##SIGN##BIT##ENDIAN(struct feed_eq_info *info, \ info->treble.o2[i] = info->treble.o1[i]; \ w >>= FEEDEQ_COEFF_SHIFT; \ FEEDEQ_ERR_CLIP_CHECK(treble, w); \ - v = FEEDEQ_CLAMP(w); \ + v = pcm_clamp(w, AFMT_S32_NE); \ info->treble.o1[i] = v; \ \ w = (intpcm64_t)v * bass->b0; \ @@ -200,7 +196,7 @@ feed_eq_biquad_##SIGN##BIT##ENDIAN(struct feed_eq_info *info, \ info->bass.o2[i] = info->bass.o1[i]; \ w >>= FEEDEQ_COEFF_SHIFT; \ FEEDEQ_ERR_CLIP_CHECK(bass, w); \ - v = FEEDEQ_CLAMP(w); \ + v = pcm_clamp(w, AFMT_S32_NE); \ info->bass.o1[i] = v; \ \ pcm_sample_write_norm(dst, v, \ diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 7640b09400ed..9a7d75198692 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -64,7 +64,7 @@ feed_mixer_##SIGN##BIT##ENDIAN(uint8_t *src, uint8_t *dst, \ y = pcm_sample_read_calc(dst, \ AFMT_##SIGN##BIT##_##ENDIAN); \ z = INTPCM##BIT##_T(x) + y; \ - x = PCM_CLAMP_##SIGN##BIT(z); \ + x = pcm_clamp_calc(z, AFMT_##SIGN##BIT##_##ENDIAN); \ pcm_sample_write(dst, x, \ AFMT_##SIGN##BIT##_##ENDIAN); \ } while (count != 0); \ diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index e1b4076e248e..1610211ff5f5 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -502,10 +502,6 @@ z_feed_linear_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ #define Z_CLIP_CHECK(...) #endif -#define Z_CLAMP(v, BIT) \ - (((v) > PCM_S##BIT##_MAX) ? PCM_S##BIT##_MAX : \ - (((v) < PCM_S##BIT##_MIN) ? PCM_S##BIT##_MIN : (v))) - /* * Sine Cardinal (SINC) Interpolation. Scaling is done in 64 bit, so * there's no point to hold the plate any longer. All samples will be @@ -574,7 +570,7 @@ z_feed_sinc_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ else \ v >>= Z_COEFF_SHIFT - Z_GUARD_BIT_##BIT; \ Z_CLIP_CHECK(v, BIT); \ - pcm_sample_write(dst, Z_CLAMP(v, BIT), \ + pcm_sample_write(dst, pcm_clamp(v, AFMT_##SIGN##BIT##_##ENDIAN),\ AFMT_##SIGN##BIT##_##ENDIAN); \ } while (ch != 0); \ } @@ -614,7 +610,7 @@ z_feed_sinc_polyphase_##SIGN##BIT##ENDIAN(struct z_info *info, uint8_t *dst) \ else \ v >>= Z_COEFF_SHIFT - Z_GUARD_BIT_##BIT; \ Z_CLIP_CHECK(v, BIT); \ - pcm_sample_write(dst, Z_CLAMP(v, BIT), \ + pcm_sample_write(dst, pcm_clamp(v, AFMT_##SIGN##BIT##_##ENDIAN),\ AFMT_##SIGN##BIT##_##ENDIAN); \ } while (ch != 0); \ } diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 572bc980ffe3..f72c6aa7ef4f 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -66,7 +66,8 @@ feed_volume_##SIGN##BIT##ENDIAN(int *vol, int *matrix, \ x = pcm_sample_read_calc(dst, \ AFMT_##SIGN##BIT##_##ENDIAN); \ v = FEEDVOLUME_CALC##BIT(x, vol[matrix[i]]); \ - x = PCM_CLAMP_##SIGN##BIT(v); \ + x = pcm_clamp_calc(v, \ + AFMT_##SIGN##BIT##_##ENDIAN); \ pcm_sample_write(dst, x, \ AFMT_##SIGN##BIT##_##ENDIAN); \ } while (i != 0); \ diff --git a/sys/dev/sound/pcm/pcm.h b/sys/dev/sound/pcm/pcm.h index f18d28b3b196..3b3b083457ee 100644 --- a/sys/dev/sound/pcm/pcm.h +++ b/sys/dev/sound/pcm/pcm.h @@ -103,32 +103,6 @@ typedef uint64_t uintpcm64_t; #define INTPCM24_T(v) ((intpcm24_t)(v)) #define INTPCM32_T(v) ((intpcm32_t)(v)) -#define PCM_CLAMP_S8(val) \ - (((val) > PCM_S8_MAX) ? PCM_S8_MAX : \ - (((val) < PCM_S8_MIN) ? PCM_S8_MIN : (val))) -#define PCM_CLAMP_S16(val) \ - (((val) > PCM_S16_MAX) ? PCM_S16_MAX : \ - (((val) < PCM_S16_MIN) ? PCM_S16_MIN : (val))) -#define PCM_CLAMP_S24(val) \ - (((val) > PCM_S24_MAX) ? PCM_S24_MAX : \ - (((val) < PCM_S24_MIN) ? PCM_S24_MIN : (val))) - -#ifdef SND_PCM_64 -#define PCM_CLAMP_S32(val) \ - (((val) > PCM_S32_MAX) ? PCM_S32_MAX : \ - (((val) < PCM_S32_MIN) ? PCM_S32_MIN : (val))) -#else /* !SND_PCM_64 */ -#define PCM_CLAMP_S32(val) \ - (((val) > PCM_S24_MAX) ? PCM_S32_MAX : \ - (((val) < PCM_S24_MIN) ? PCM_S32_MIN : \ - ((val) << PCM_FXSHIFT))) -#endif /* SND_PCM_64 */ - -#define PCM_CLAMP_U8(val) PCM_CLAMP_S8(val) -#define PCM_CLAMP_U16(val) PCM_CLAMP_S16(val) -#define PCM_CLAMP_U24(val) PCM_CLAMP_S24(val) -#define PCM_CLAMP_U32(val) PCM_CLAMP_S32(val) - static const struct { const uint8_t ulaw_to_u8[G711_TABLE_SIZE]; const uint8_t alaw_to_u8[G711_TABLE_SIZE]; @@ -370,4 +344,42 @@ pcm_sample_write_calc(uint8_t *dst, intpcm_t v, uint32_t fmt) pcm_sample_write(dst, v, fmt); } +static __always_inline __unused intpcm_t +pcm_clamp(intpcm32_t sample, uint32_t fmt) +{ + fmt = AFMT_ENCODING(fmt); + + switch (AFMT_BIT(fmt)) { + case 8: + return ((sample > PCM_S8_MAX) ? PCM_S8_MAX : + ((sample < PCM_S8_MIN) ? PCM_S8_MIN : sample)); + case 16: + return ((sample > PCM_S16_MAX) ? PCM_S16_MAX : + ((sample < PCM_S16_MIN) ? PCM_S16_MIN : sample)); + case 24: + return ((sample > PCM_S24_MAX) ? PCM_S24_MAX : + ((sample < PCM_S24_MIN) ? PCM_S24_MIN : sample)); + case 32: + return ((sample > PCM_S32_MAX) ? PCM_S32_MAX : + ((sample < PCM_S32_MIN) ? PCM_S32_MIN : sample)); + default: + printf("%s(): unknown format: 0x%08x\n", __func__, fmt); + __assert_unreachable(); + } +} + +static __always_inline __unused intpcm_t +pcm_clamp_calc(intpcm32_t sample, uint32_t fmt) +{ +#ifndef SND_PCM_64 + if (fmt & AFMT_32BIT) { + return ((sample > PCM_S24_MAX) ? PCM_S32_MAX : + ((sample < PCM_S24_MIN) ? PCM_S32_MIN : + sample << PCM_FXSHIFT)); + } +#endif + + return (pcm_clamp(sample, fmt)); +} + #endif /* !_SND_PCM_H_ */ From nobody Mon Mar 17 18:36:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkG854qWz5qVYv; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkG82XrNz431N; Mon, 17 Mar 2025 18:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9QO8AZ/g5AJCitJidWLZNHp3iwdDZhExChdvCPqVjqI=; b=wlRcDfUsNSeHV/nB9fSBcOMgokiTGxwqguzi+/i0rvADe34WfFx7UKxhn/88bXqyoDy/s6 pbAY3T0XkEqYYaOZ+mnz9pUL/xroPiRNiBVZ+YXhIEefBLqYbQbB1Yh0a5zpgoJFzZti2i tcXK0be8oZq+5wO3ufFlbibBZKvdQi7JjID2ax5BE6uyEDnmGD6dseKVpcB6EH432LEBX/ 1SFd3Y+DRKyXoImK/tm2h7U++EQ1b0elObr6Rqws8DyRrtYWGRnswuinPvwMgJE+DkLG3h lJrYl9j0MRB+7BuchMmyzXFCYuopEZcrN6OtxtngjPzm5x9gK1jQJ2daGN3d0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236608; a=rsa-sha256; cv=none; b=o5NOA0vzW6buI+PZzVCyY4Y/4Jky1bZps4PzCHQ54MscCVnb7fYcjBF2oFhn6L1hUvHvmn MISzuNU0qBUQadiIAblieXQ/lPW4gvWLUGhzG6z5Nm3/u34VnFMVUodpbsB8fuSEXzRqiz GPR/jgpRIkz9Am9Qq0slk5HwGE9ccL7XpVgPr4xJ2D2B2ymWjf6Z2ONsdaVKcHx4FwsJPS XJ5BrW8GfUs/Nmti34BuA6vkmrT3AO2clH689WMHHESRnbIgJauE2mR8Sv46fQHd6bk381 AuLO1z1HDBhzFycMXJ1X3CzB0GuRkZTvYhQ96kRuk8Kl274/lZHzoxjoiGFV9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9QO8AZ/g5AJCitJidWLZNHp3iwdDZhExChdvCPqVjqI=; b=e1PMUnE70JEYD5Ggfxt7GhkoIkjpWhbSIsxcK27N1bWNSEiAJD57l6WSAWAoHGEq3I4yfB TDasagXvFbBN5ggBc6KJOTKZLGdGt1zF7GhoIJJRr170lp27gUFpHNFLgEvPH7s+wvBIKF ne4APYj9MALTVzA/Lltz26SPal1sP6OKcItEMVRv26CfcpCEq4KbrrsD153oaZIn5AGuro r9+bCUexj0YhKe9ROU/lfgcYYrEExyleNPwXkFbvSdyOC2A27Ufedly1eCgN60YVECvw71 PaLYfEP06+jZR5DCNiratFZ9SvVFYPxkcMGsO1sdenirQjLrCo1p2tsYXmxGKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkG81GQLzyk3; Mon, 17 Mar 2025 18:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIameu013074; Mon, 17 Mar 2025 18:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIamdC013069; Mon, 17 Mar 2025 18:36:48 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:48 GMT Message-Id: <202503171836.52HIamdC013069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b2adb71308af - stable/14 - sound: Remove macro magic from pcm/feeder_eq.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: b2adb71308af7bdbcfe95504525bb9c26b73d153 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b2adb71308af7bdbcfe95504525bb9c26b73d153 commit b2adb71308af7bdbcfe95504525bb9c26b73d153 Author: Christos Margiolis AuthorDate: 2025-03-10 20:19:35 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +0000 sound: Remove macro magic from pcm/feeder_eq.c Turn the FEEDEQ_DECLARE macro into a single inline function (feed_eq_biquad()). There is no reason to have this as a macro, and it only complicates the code. An advantage of this patch is that, because we no longer call the functions created by the macro through function pointers (biquad_op), we can call feed_eq_biquad() directly in feed_eq_feed(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48032 (cherry picked from commit e18d66d9c515abc729f5c4740b9b999d28abc333) --- sys/dev/sound/pcm/feeder_eq.c | 226 +++++++++++++++--------------------------- 1 file changed, 82 insertions(+), 144 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index c5f82a2f18fc..4ed5fa57a485 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -101,10 +101,6 @@ SYSCTL_INT(_hw_snd, OID_AUTO, feeder_eq_exact_rate, CTLFLAG_RWTUN, &feeder_eq_exact_rate, 0, "force exact rate validation"); #endif -struct feed_eq_info; - -typedef void (*feed_eq_t)(struct feed_eq_info *, uint8_t *, uint32_t); - struct feed_eq_tone { intpcm_t o1[SND_CHN_MAX]; intpcm_t o2[SND_CHN_MAX]; @@ -117,7 +113,7 @@ struct feed_eq_info { struct feed_eq_tone treble; struct feed_eq_tone bass; struct feed_eq_coeff *coeff; - feed_eq_t biquad; + uint32_t fmt; uint32_t channels; uint32_t rate; uint32_t align; @@ -135,133 +131,74 @@ struct feed_eq_info { #define FEEDEQ_ERR_CLIP_CHECK(...) #endif -#define FEEDEQ_DECLARE(SIGN, BIT, ENDIAN) \ -static void \ -feed_eq_biquad_##SIGN##BIT##ENDIAN(struct feed_eq_info *info, \ - uint8_t *dst, uint32_t count) \ -{ \ - struct feed_eq_coeff_tone *treble, *bass; \ - intpcm64_t w; \ - intpcm_t v; \ - uint32_t i, j; \ - int32_t pmul, pshift; \ - \ - pmul = feed_eq_preamp[info->preamp].mul; \ - pshift = feed_eq_preamp[info->preamp].shift; \ - \ - if (info->state == FEEDEQ_DISABLE) { \ - j = count * info->channels; \ - dst += j * PCM_##BIT##_BPS; \ - do { \ - dst -= PCM_##BIT##_BPS; \ - v = pcm_sample_read(dst, AFMT_##SIGN##BIT##_##ENDIAN); \ - v = ((intpcm64_t)pmul * v) >> pshift; \ - pcm_sample_write(dst, v, AFMT_##SIGN##BIT##_##ENDIAN); \ - } while (--j != 0); \ - \ - return; \ - } \ - \ - treble = &(info->coeff[info->treble.gain].treble); \ - bass = &(info->coeff[info->bass.gain].bass); \ - \ - do { \ - i = 0; \ - j = info->channels; \ - do { \ - v = pcm_sample_read_norm(dst, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - v = ((intpcm64_t)pmul * v) >> pshift; \ - \ - w = (intpcm64_t)v * treble->b0; \ - w += (intpcm64_t)info->treble.i1[i] * treble->b1; \ - w += (intpcm64_t)info->treble.i2[i] * treble->b2; \ - w -= (intpcm64_t)info->treble.o1[i] * treble->a1; \ - w -= (intpcm64_t)info->treble.o2[i] * treble->a2; \ - info->treble.i2[i] = info->treble.i1[i]; \ - info->treble.i1[i] = v; \ - info->treble.o2[i] = info->treble.o1[i]; \ - w >>= FEEDEQ_COEFF_SHIFT; \ - FEEDEQ_ERR_CLIP_CHECK(treble, w); \ - v = pcm_clamp(w, AFMT_S32_NE); \ - info->treble.o1[i] = v; \ - \ - w = (intpcm64_t)v * bass->b0; \ - w += (intpcm64_t)info->bass.i1[i] * bass->b1; \ - w += (intpcm64_t)info->bass.i2[i] * bass->b2; \ - w -= (intpcm64_t)info->bass.o1[i] * bass->a1; \ - w -= (intpcm64_t)info->bass.o2[i] * bass->a2; \ - info->bass.i2[i] = info->bass.i1[i]; \ - info->bass.i1[i] = v; \ - info->bass.o2[i] = info->bass.o1[i]; \ - w >>= FEEDEQ_COEFF_SHIFT; \ - FEEDEQ_ERR_CLIP_CHECK(bass, w); \ - v = pcm_clamp(w, AFMT_S32_NE); \ - info->bass.o1[i] = v; \ - \ - pcm_sample_write_norm(dst, v, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - dst += PCM_##BIT##_BPS; \ - i++; \ - } while (--j != 0); \ - } while (--count != 0); \ -} - -#if BYTE_ORDER == LITTLE_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) -FEEDEQ_DECLARE(S, 16, LE) -FEEDEQ_DECLARE(S, 32, LE) -#endif -#if BYTE_ORDER == BIG_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) -FEEDEQ_DECLARE(S, 16, BE) -FEEDEQ_DECLARE(S, 32, BE) -#endif -#ifdef SND_FEEDER_MULTIFORMAT -FEEDEQ_DECLARE(S, 8, NE) -FEEDEQ_DECLARE(S, 24, LE) -FEEDEQ_DECLARE(S, 24, BE) -FEEDEQ_DECLARE(U, 8, NE) -FEEDEQ_DECLARE(U, 16, LE) -FEEDEQ_DECLARE(U, 24, LE) -FEEDEQ_DECLARE(U, 32, LE) -FEEDEQ_DECLARE(U, 16, BE) -FEEDEQ_DECLARE(U, 24, BE) -FEEDEQ_DECLARE(U, 32, BE) -#endif - -#define FEEDEQ_ENTRY(SIGN, BIT, ENDIAN) \ - { \ - AFMT_##SIGN##BIT##_##ENDIAN, \ - feed_eq_biquad_##SIGN##BIT##ENDIAN \ +__always_inline static void +feed_eq_biquad(struct feed_eq_info *info, uint8_t *dst, uint32_t count, + const uint32_t fmt) +{ + struct feed_eq_coeff_tone *treble, *bass; + intpcm64_t w; + intpcm_t v; + uint32_t i, j; + int32_t pmul, pshift; + + pmul = feed_eq_preamp[info->preamp].mul; + pshift = feed_eq_preamp[info->preamp].shift; + + if (info->state == FEEDEQ_DISABLE) { + j = count * info->channels; + dst += j * AFMT_BPS(fmt); + do { + dst -= AFMT_BPS(fmt); + v = pcm_sample_read(dst, fmt); + v = ((intpcm64_t)pmul * v) >> pshift; + pcm_sample_write(dst, v, fmt); + } while (--j != 0); + + return; } -static const struct { - uint32_t format; - feed_eq_t biquad; -} feed_eq_biquad_tab[] = { -#if BYTE_ORDER == LITTLE_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) - FEEDEQ_ENTRY(S, 16, LE), - FEEDEQ_ENTRY(S, 32, LE), -#endif -#if BYTE_ORDER == BIG_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) - FEEDEQ_ENTRY(S, 16, BE), - FEEDEQ_ENTRY(S, 32, BE), -#endif -#ifdef SND_FEEDER_MULTIFORMAT - FEEDEQ_ENTRY(S, 8, NE), - FEEDEQ_ENTRY(S, 24, LE), - FEEDEQ_ENTRY(S, 24, BE), - FEEDEQ_ENTRY(U, 8, NE), - FEEDEQ_ENTRY(U, 16, LE), - FEEDEQ_ENTRY(U, 24, LE), - FEEDEQ_ENTRY(U, 32, LE), - FEEDEQ_ENTRY(U, 16, BE), - FEEDEQ_ENTRY(U, 24, BE), - FEEDEQ_ENTRY(U, 32, BE) -#endif -}; + treble = &(info->coeff[info->treble.gain].treble); + bass = &(info->coeff[info->bass.gain].bass); -#define FEEDEQ_BIQUAD_TAB_SIZE \ - ((int32_t)(sizeof(feed_eq_biquad_tab) / sizeof(feed_eq_biquad_tab[0]))) + do { + i = 0; + j = info->channels; + do { + v = pcm_sample_read_norm(dst, fmt); + v = ((intpcm64_t)pmul * v) >> pshift; + + w = (intpcm64_t)v * treble->b0; + w += (intpcm64_t)info->treble.i1[i] * treble->b1; + w += (intpcm64_t)info->treble.i2[i] * treble->b2; + w -= (intpcm64_t)info->treble.o1[i] * treble->a1; + w -= (intpcm64_t)info->treble.o2[i] * treble->a2; + info->treble.i2[i] = info->treble.i1[i]; + info->treble.i1[i] = v; + info->treble.o2[i] = info->treble.o1[i]; + w >>= FEEDEQ_COEFF_SHIFT; + FEEDEQ_ERR_CLIP_CHECK(treble, w); + v = pcm_clamp(w, AFMT_S32_NE); + info->treble.o1[i] = v; + + w = (intpcm64_t)v * bass->b0; + w += (intpcm64_t)info->bass.i1[i] * bass->b1; + w += (intpcm64_t)info->bass.i2[i] * bass->b2; + w -= (intpcm64_t)info->bass.o1[i] * bass->a1; + w -= (intpcm64_t)info->bass.o2[i] * bass->a2; + info->bass.i2[i] = info->bass.i1[i]; + info->bass.i1[i] = v; + info->bass.o2[i] = info->bass.o1[i]; + w >>= FEEDEQ_COEFF_SHIFT; + FEEDEQ_ERR_CLIP_CHECK(bass, w); + v = pcm_clamp(w, AFMT_S32_NE); + info->bass.o1[i] = v; + + pcm_sample_write_norm(dst, v, fmt); + dst += AFMT_BPS(fmt); + i++; + } while (--j != 0); + } while (--count != 0); +} static struct feed_eq_coeff * feed_eq_coeff_rate(uint32_t rate) @@ -333,26 +270,15 @@ static int feed_eq_init(struct pcm_feeder *f) { struct feed_eq_info *info; - feed_eq_t biquad_op; - int i; if (f->desc->in != f->desc->out) return (EINVAL); - biquad_op = NULL; - - for (i = 0; i < FEEDEQ_BIQUAD_TAB_SIZE && biquad_op == NULL; i++) { - if (AFMT_ENCODING(f->desc->in) == feed_eq_biquad_tab[i].format) - biquad_op = feed_eq_biquad_tab[i].biquad; - } - - if (biquad_op == NULL) - return (EINVAL); - info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); if (info == NULL) return (ENOMEM); + info->fmt = AFMT_ENCODING(f->desc->in); info->channels = AFMT_CHANNEL(f->desc->in); info->align = info->channels * AFMT_BPS(f->desc->in); @@ -362,8 +288,6 @@ feed_eq_init(struct pcm_feeder *f) info->preamp = FEEDEQ_PREAMP2IDX(FEEDEQ_PREAMP_DEFAULT); info->state = FEEDEQ_UNKNOWN; - info->biquad = biquad_op; - f->data = info; return (feed_eq_setup(info)); @@ -466,7 +390,21 @@ feed_eq_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, if (j == 0) break; - info->biquad(info, dst, j); + /* Optimize some common formats. */ + switch (info->fmt) { + case AFMT_S16_NE: + feed_eq_biquad(info, dst, j, AFMT_S16_NE); + break; + case AFMT_S24_NE: + feed_eq_biquad(info, dst, j, AFMT_S24_NE); + break; + case AFMT_S32_NE: + feed_eq_biquad(info, dst, j, AFMT_S32_NE); + break; + default: + feed_eq_biquad(info, dst, j, info->fmt); + break; + } j *= info->align; dst += j; From nobody Mon Mar 17 18:36:49 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkG95D4Yz5qVhk; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkG93KmMz437p; Mon, 17 Mar 2025 18:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLQjRJ2kxvmpKvbLNw+yHSeTb1jhJO06aJzYMC8qA5Q=; b=rOGpID6Pbkg1CdP/mawFXqS7ftueTK0JXNxWN+Vn2wPDDokXFon1tuBLTh92ZvgXH+MRAy nk1ZQ3PIsgQaqcKzEDkOhuJQqEVEvpjK+de9pYnKM2ulibW1iKb4g6uRAMgbDZUZuLGCiY cZcAPFBKS3DdQPq6kZOzWcffl9mQH2EraYBVqUOE/Q4KWS2czhVpO5IKwlt2/6ji1wxGyb Jc9To3MyNfzbCdKA8jZohS+WhgY0uk5MJCs1EF4i/zI1xviBs7yJPotzcEFHbzYdcPmcVV cX6B2sXAg5mzheB1PmvuIWX9IPw+ORKtU+iTRPd446KSyL6RBCWEeE1nUzMubA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236609; a=rsa-sha256; cv=none; b=Og1sQ1N/3LX8XIec/JUh61bqWz97s8NrGw2H5bj1qf2/glLJ+VWUSHwRoinfvmz/+XY5Tp FlOUbFO4rI2BpyoO2mlcFfEofGB4QWG5Rc0wftQdkgvE6+p0SzwpLQqWChTSwxqOC+bk4H q2ByLLpNMCfFGpScnOgfjDA7LNkdLQsnQJ/49GLgDZl368eCdfDuTC0VHV5ASNok8mtbKD tiv/JGdj8UecW9AkmZyXCHhbN6nrt82lfaCJPaLkX+pPc7YRmO990BpsERUSIMwZxMSWoZ Th31hqT6xHbDQe1ZuIFL7mXd47tLpxx/Tpj9Iy1FXX+vG91CM3zJdohsGNwiAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KLQjRJ2kxvmpKvbLNw+yHSeTb1jhJO06aJzYMC8qA5Q=; b=INLe7PuBomsBRqVG6019aSbDFsawDTCsEDEPbIqTkZT8uO1dG8NpTBuWWKFhhinB/1+Pzf S+3IqLOfYFJIwdS9zVZiwWrFJu2eieYxdVS05MP2ZJVMjM8sfKIVTN8RAkyxI57UHK1cD9 cadbEZX31ODClNShNcAkD++ZrL+Bv6RBcpuV86xHonTFpIN37F98wZqPXGgaTNZcKSGIbe PIBPuBLW4ST46RK8jcOJWtduW9+l7+Ch3GZW2Tq5DvVfqPZY7TMCDa/EQo2n9sfbTsGPLt 7ILcnljmFshNbjeTlJWuZfrLbOSVJOY+q32uFLXlNCietUp9UValPc/kelFw9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkG91hMmzyR7; Mon, 17 Mar 2025 18:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIannU013110; Mon, 17 Mar 2025 18:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIanQ9013105; Mon, 17 Mar 2025 18:36:49 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:49 GMT Message-Id: <202503171836.52HIanQ9013105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a25f84cf0910 - stable/14 - sound: Remove macro magic from pcm/feeder_matrix.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: a25f84cf091042fa528706099b41c8994a0637a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a25f84cf091042fa528706099b41c8994a0637a4 commit a25f84cf091042fa528706099b41c8994a0637a4 Author: Christos Margiolis AuthorDate: 2025-03-10 20:19:41 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +0000 sound: Remove macro magic from pcm/feeder_matrix.c Turn the FEEDMATRIX_DECLARE macro into a single inline function (feed_matrix_apply()). There is no reason to have this as a macro, it only complicated the code. An advantage of this patch is that, because we no longer call the functions created by the macro through function pointers (apply field of feed_matrix_info), we can call feed_matrix_apply() directly in feed_matrix_feed(). Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48035 (cherry picked from commit ac24c9da8bb7af731646dd7924841a28e2ad7ad7) --- sys/dev/sound/pcm/feeder_matrix.c | 185 ++++++++++++-------------------------- 1 file changed, 56 insertions(+), 129 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index b63b5841ff7f..ab7922179867 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -60,16 +60,11 @@ #define SND_CHN_T_EOF 0x00e0fe0f #define SND_CHN_T_NULL 0x0e0e0e0e -struct feed_matrix_info; - -typedef void (*feed_matrix_t)(struct feed_matrix_info *, uint8_t *, - uint8_t *, uint32_t); - struct feed_matrix_info { + uint32_t fmt; uint32_t bps; uint32_t ialign, oalign; uint32_t in, out; - feed_matrix_t apply; struct { int chn[SND_CHN_T_MAX + 1]; int mul, shift; @@ -115,114 +110,48 @@ static int feeder_matrix_default_ids[9] = { } while (0) #endif -#define FEEDMATRIX_DECLARE(SIGN, BIT, ENDIAN) \ -static void \ -feed_matrix_##SIGN##BIT##ENDIAN(struct feed_matrix_info *info, \ - uint8_t *src, uint8_t *dst, uint32_t count) \ -{ \ - intpcm64_t accum; \ - intpcm_t v; \ - int i, j; \ - \ - do { \ - for (i = 0; info->matrix[i].chn[0] != SND_CHN_T_EOF; \ - i++) { \ - if (info->matrix[i].chn[0] == SND_CHN_T_NULL) { \ - pcm_sample_write(dst, 0, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - dst += PCM_##BIT##_BPS; \ - continue; \ - } else if (info->matrix[i].chn[1] == \ - SND_CHN_T_EOF) { \ - v = pcm_sample_read( \ - src + info->matrix[i].chn[0], \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - pcm_sample_write(dst, v, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - dst += PCM_##BIT##_BPS; \ - continue; \ - } \ - \ - accum = 0; \ - for (j = 0; \ - info->matrix[i].chn[j] != SND_CHN_T_EOF; \ - j++) { \ - v = pcm_sample_read( \ - src + info->matrix[i].chn[j], \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - accum += v; \ - } \ - \ - accum = (accum * info->matrix[i].mul) >> \ - info->matrix[i].shift; \ - \ - FEEDMATRIX_CLIP_CHECK(accum, BIT); \ - \ - v = (accum > PCM_S##BIT##_MAX) ? \ - PCM_S##BIT##_MAX : \ - ((accum < PCM_S##BIT##_MIN) ? \ - PCM_S##BIT##_MIN : \ - accum); \ - pcm_sample_write(dst, v, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - dst += PCM_##BIT##_BPS; \ - } \ - src += info->ialign; \ - } while (--count != 0); \ -} +__always_inline static void +feed_matrix_apply(struct feed_matrix_info *info, uint8_t *src, uint8_t *dst, + uint32_t count, const uint32_t fmt) +{ + intpcm64_t accum; + intpcm_t v; + int i, j; -#if BYTE_ORDER == LITTLE_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) -FEEDMATRIX_DECLARE(S, 16, LE) -FEEDMATRIX_DECLARE(S, 32, LE) -#endif -#if BYTE_ORDER == BIG_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) -FEEDMATRIX_DECLARE(S, 16, BE) -FEEDMATRIX_DECLARE(S, 32, BE) -#endif -#ifdef SND_FEEDER_MULTIFORMAT -FEEDMATRIX_DECLARE(S, 8, NE) -FEEDMATRIX_DECLARE(S, 24, LE) -FEEDMATRIX_DECLARE(S, 24, BE) -FEEDMATRIX_DECLARE(U, 8, NE) -FEEDMATRIX_DECLARE(U, 16, LE) -FEEDMATRIX_DECLARE(U, 24, LE) -FEEDMATRIX_DECLARE(U, 32, LE) -FEEDMATRIX_DECLARE(U, 16, BE) -FEEDMATRIX_DECLARE(U, 24, BE) -FEEDMATRIX_DECLARE(U, 32, BE) -#endif + do { + for (i = 0; info->matrix[i].chn[0] != SND_CHN_T_EOF; i++) { + if (info->matrix[i].chn[0] == SND_CHN_T_NULL) { + pcm_sample_write(dst, 0, fmt); + dst += info->bps; + continue; + } else if (info->matrix[i].chn[1] == SND_CHN_T_EOF) { + v = pcm_sample_read(src + + info->matrix[i].chn[0], fmt); + pcm_sample_write(dst, v, fmt); + dst += info->bps; + continue; + } -#define FEEDMATRIX_ENTRY(SIGN, BIT, ENDIAN) \ - { \ - AFMT_##SIGN##BIT##_##ENDIAN, \ - feed_matrix_##SIGN##BIT##ENDIAN \ - } + accum = 0; + for (j = 0; info->matrix[i].chn[j] != SND_CHN_T_EOF; + j++) { + v = pcm_sample_read(src + + info->matrix[i].chn[j], fmt); + accum += v; + } -static const struct { - uint32_t format; - feed_matrix_t apply; -} feed_matrix_tab[] = { -#if BYTE_ORDER == LITTLE_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) - FEEDMATRIX_ENTRY(S, 16, LE), - FEEDMATRIX_ENTRY(S, 32, LE), -#endif -#if BYTE_ORDER == BIG_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) - FEEDMATRIX_ENTRY(S, 16, BE), - FEEDMATRIX_ENTRY(S, 32, BE), -#endif -#ifdef SND_FEEDER_MULTIFORMAT - FEEDMATRIX_ENTRY(S, 8, NE), - FEEDMATRIX_ENTRY(S, 24, LE), - FEEDMATRIX_ENTRY(S, 24, BE), - FEEDMATRIX_ENTRY(U, 8, NE), - FEEDMATRIX_ENTRY(U, 16, LE), - FEEDMATRIX_ENTRY(U, 24, LE), - FEEDMATRIX_ENTRY(U, 32, LE), - FEEDMATRIX_ENTRY(U, 16, BE), - FEEDMATRIX_ENTRY(U, 24, BE), - FEEDMATRIX_ENTRY(U, 32, BE) -#endif -}; + accum = (accum * info->matrix[i].mul) >> + info->matrix[i].shift; + + FEEDMATRIX_CLIP_CHECK(accum, AFMT_BIT(fmt)); + + v = pcm_clamp(accum, fmt); + pcm_sample_write(dst, v, fmt); + dst += info->bps; + } + src += info->ialign; + } while (--count != 0); +} static void feed_matrix_reset(struct feed_matrix_info *info) @@ -397,7 +326,6 @@ feed_matrix_init(struct pcm_feeder *f) { struct feed_matrix_info *info; struct pcmchan_matrix *m_in, *m_out; - uint32_t i; int ret; if (AFMT_ENCODING(f->desc->in) != AFMT_ENCODING(f->desc->out)) @@ -409,25 +337,10 @@ feed_matrix_init(struct pcm_feeder *f) info->in = f->desc->in; info->out = f->desc->out; + info->fmt = AFMT_ENCODING(info->in); info->bps = AFMT_BPS(info->in); info->ialign = AFMT_ALIGN(info->in); info->oalign = AFMT_ALIGN(info->out); - info->apply = NULL; - - for (i = 0; info->apply == NULL && - i < (sizeof(feed_matrix_tab) / sizeof(feed_matrix_tab[0])); i++) { - if (AFMT_ENCODING(info->in) == feed_matrix_tab[i].format) - info->apply = feed_matrix_tab[i].apply; - } - - if (info->apply == NULL) { -#ifdef FEEDMATRIX_GENERIC - info->apply = feed_matrix_apply_generic; -#else - free(info, M_DEVBUF); - return (EINVAL); -#endif - } m_in = feeder_matrix_format_map(info->in); m_out = feeder_matrix_format_map(info->out); @@ -505,7 +418,21 @@ feed_matrix_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, if (j == 0) break; - info->apply(info, src, dst, j); + /* Optimize some common formats. */ + switch (info->fmt) { + case AFMT_S16_NE: + feed_matrix_apply(info, src, dst, j, AFMT_S16_NE); + break; + case AFMT_S24_NE: + feed_matrix_apply(info, src, dst, j, AFMT_S24_NE); + break; + case AFMT_S32_NE: + feed_matrix_apply(info, src, dst, j, AFMT_S32_NE); + break; + default: + feed_matrix_apply(info, src, dst, j, info->fmt); + break; + } j *= info->oalign; dst += j; From nobody Mon Mar 17 18:36:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGC1NQzz5qVhl; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGB4dspz43BF; Mon, 17 Mar 2025 18:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBQN0wBoZPYhwHmLNObvwPjQm8oF+XkP1PEczloeDMo=; b=cz5EUkoLKdPT+2/AcNQfSMOL6HUYZgQmrH5ruLaPzJu1v+YSCn67RID1QLAzVBJd1KQWOT t2dyBaFtzmpKFDld69OxNEyepah1kR7efSuYs7jDe8/qdvFjc87AtNWbeYOXDb6qzoRD3V 0r58963HPTjBAvfbTEHs8zpmtb05Jb1Lhd/gG9ys2XzDcs+xfbhv7Fp4roO8Ey84eU/rU+ gX30+tN3bD+KG6HeRKGIHrYWB/fuMAaFqnbl7w8ydQQmlN7IAT2ikt4N3wOzebE9hR14mX EklyNUPT91zPg8Pg14AppF/A8q0MsGcXnKpVMI/dD7SrJXWHSX6w+0FuT21JXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236610; a=rsa-sha256; cv=none; b=NnlHUPrzkWjV3ffshcFOEd0GcR/JOiP7v5afTgeFcBKhgdxtvOZsymu8FrXvA26Gb+D2gB 5cwcgKT0wZZ/Y6m7ROjFUHKJXygHeZ75j158i5zTCYjDgdg3xmhlylQfH54PzGix46GLnN CpBEx/JLiGS0GT7xD2qvoB674ZIvHzLRv0SLog+GPUqKcIXoJKkw6ONjc7wI8PgjHBGCQV V1HPBusLTI6B7J3anYpASecMV37yurjlTiN9/sy6VyPUnt0ivVtZqPGEVC6oBLbFgSUGl5 K58OcOJUsj+1r2W4D3hfefKsOHeFoR1VzjNqo+3nWQhAVAzZwTF45PMWY633wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DBQN0wBoZPYhwHmLNObvwPjQm8oF+XkP1PEczloeDMo=; b=oJCRt4QVMvhg0nsVexPO116EZTrRE7VpB7GMwWcOW6zh1sEjGMLl/HUSNpqAELty/0ht9l FvTH7HTbvlnuxnZqStksy5B1ZQfAVZetV9yqeBe3FjH+8jCY5475jn3Zx/7Gyj+VaYVBPZ rUP2TKn0klGHWg1HwGoR1DWEQ1LQigj4guvgp5eGxIkkcYzv/U9GgGRdnWt4y6lGWFg/sN f0EkT8BVMZhxxIGBbz8BoumfbItE4UEQ819vdCQcDE5PrxJhgufuzXwebfEOFo/xio11sM dIlBGFOcv0sp/BA3vD1bb/MIy+prhVzU4v6Tz1/X65eiDWlPS0VPxaiBOZt1xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGB2rRjzyR8; Mon, 17 Mar 2025 18:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIaobx013150; Mon, 17 Mar 2025 18:36:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIao6f013147; Mon, 17 Mar 2025 18:36:50 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:50 GMT Message-Id: <202503171836.52HIao6f013147@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 15dc84ba5f50 - stable/14 - sound: Remove feed_matrix_apply_generic() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 15dc84ba5f509a3aba0a3454c13207926b8ba2c5 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=15dc84ba5f509a3aba0a3454c13207926b8ba2c5 commit 15dc84ba5f509a3aba0a3454c13207926b8ba2c5 Author: Christos Margiolis AuthorDate: 2025-03-10 20:19:46 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +0000 sound: Remove feed_matrix_apply_generic() It does what feed_matrix_apply() already does, so it is redundant. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48036 (cherry picked from commit b73b5f70e9f6be951e66531f6f57249eea4ba4dc) --- sys/dev/sound/pcm/feeder_matrix.c | 49 --------------------------------------- 1 file changed, 49 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index ab7922179867..2fee2be8bf5b 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -169,55 +169,6 @@ feed_matrix_reset(struct feed_matrix_info *info) } } -#ifdef FEEDMATRIX_GENERIC -static void -feed_matrix_apply_generic(struct feed_matrix_info *info, - uint8_t *src, uint8_t *dst, uint32_t count) -{ - intpcm64_t accum; - intpcm_t v; - int i, j; - - do { - for (i = 0; info->matrix[i].chn[0] != SND_CHN_T_EOF; - i++) { - if (info->matrix[i].chn[0] == SND_CHN_T_NULL) { - pcm_sample_write_norm(dst, 0, info->out); - dst += info->bps; - continue; - } else if (info->matrix[i].chn[1] == - SND_CHN_T_EOF) { - v = pcm_sample_read_norm(src + - info->matrix[i].chn[0], info->in); - pcm_sample_write_norm(dst, v, info->out); - dst += info->bps; - continue; - } - - accum = 0; - for (j = 0; - info->matrix[i].chn[j] != SND_CHN_T_EOF; - j++) { - v = pcm_sample_read_norm(src + - info->matrix[i].chn[j], info->in); - accum += v; - } - - accum = (accum * info->matrix[i].mul) >> - info->matrix[i].shift; - - FEEDMATRIX_CLIP_CHECK(accum, 32); - - v = (accum > PCM_S32_MAX) ? PCM_S32_MAX : - ((accum < PCM_S32_MIN) ? PCM_S32_MIN : accum); - pcm_sample_write_norm(dst, v, info->out); - dst += info->bps; - } - src += info->ialign; - } while (--count != 0); -} -#endif - static int feed_matrix_setup(struct feed_matrix_info *info, struct pcmchan_matrix *m_in, struct pcmchan_matrix *m_out) From nobody Mon Mar 17 18:36:52 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGF0Jdxz5qVHJ; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGD5NVcz43BV; Mon, 17 Mar 2025 18:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=957+f8ikEtgdms+Zb8UNF6OVYJQmS+numRWJnHduWbI=; b=E/1FBVk7K5T8mkLLcKvDm123Ud79eBoo/R8gUHIVvaLErqy7fIm49w1MNnNeEhMkDIWNGo QfbrLQa+7wiprP7ppYJpphcch69/EWSm49gCc6xGRi7bPQME8lYFsB4sz143sAplnOfmXN KJpODh93dQulZACyPVtD3oiSFKEYldCH+jO29qKGexMIIjDsk0QmTR3ymYpARYTrHJQGn0 cTV5A3rGSE7q2SrEXrEAIrNeqlzF4en1ZbrtNM1j98os0eO/gn8L4Fvcmu8RzwXxeRxIC1 o7SqwGH8soPBxa75LNCSTTcZClZIrAyAiqwFKgwm/PMwn0ekCabDH6m/16ozaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236612; a=rsa-sha256; cv=none; b=aWVcnqHVvyNHmaW+GAAHTF0jgIiYwR1W2ra1vmTqFeMt875jkygtYkxqz/PjKT+EkzBu0n d9pkQZ7SM5EwaLM2YoB3nDpqTFQn7LCej8s0SNeZJ4Lk2ZoA3KuCxp+lSKStg6IeSvbgnF NpuSNTc5XEmZEyJTpxRa8jH1LDm0D9EQtkWfvNE0uzZMnUN6BxeEGloY+MJXvNXG0mD0Q2 o6E0eMp12dSN5teGgKCBNHs0xXnoAhIw26/IqN7dh5d6nZDnHSjPVMK0klngaj1trynIbL SnSfWPbom+1JfrqHpE+wulwO7kFWvmL+GRmSd7DW16rTtRMfK5WKL/ToZSBqLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=957+f8ikEtgdms+Zb8UNF6OVYJQmS+numRWJnHduWbI=; b=EqLIhkBE3mPruMFe9RdKveOtw1UqltOuS2kJBqP6n1yihaDLtv/5w/eyZZ+4dlEV0XktiQ a+9T81h1AxDA2PE/KQVLGySnxrZnGY7PiaKQPkRK2gSdk/p+qkvnAJvTFC92nC52V7MYMp wlN5UJpsvxGZnrlH4YdmujBWlSBrzHpMHQX6vlF4gjbWjKjHrn3Mmc3fnLjL0OkoZ/vDnT QXnbMZq+/0e9MqTB3MS5VSx674YpVRcclrIEMOCZK31rEqX0MMDa1zWFtVIk7ojcfLFEZ2 2MnGEBLaW0g+E5RLUyd7zPjKzCyrU3T5pV/j0KuQuJAzlQvEs/ZSuuKFKC+OZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGD4JLvzxym; Mon, 17 Mar 2025 18:36:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIaqrB013227; Mon, 17 Mar 2025 18:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIaqWf013224; Mon, 17 Mar 2025 18:36:52 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:52 GMT Message-Id: <202503171836.52HIaqWf013224@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 42889e8e2f1a - stable/14 - sound: Take dsp_cdevsw out of header file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 42889e8e2f1a6d0892923ab87ea59f3cf6ec9a48 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=42889e8e2f1a6d0892923ab87ea59f3cf6ec9a48 commit 42889e8e2f1a6d0892923ab87ea59f3cf6ec9a48 Author: Christos Margiolis AuthorDate: 2025-03-10 20:47:28 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +0000 sound: Take dsp_cdevsw out of header file Not used outside of pcm/dsp.c. MFC after: 1 week Sponsored by: The FreeBSD Foundation Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D49217 (cherry picked from commit 2fda8597116e760c32f07af43d260041f975b650) --- sys/dev/sound/pcm/dsp.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h index 1eab42ca91c8..8a4f5f869acc 100644 --- a/sys/dev/sound/pcm/dsp.h +++ b/sys/dev/sound/pcm/dsp.h @@ -31,8 +31,6 @@ #ifndef _PCMDSP_H_ #define _PCMDSP_H_ -extern struct cdevsw dsp_cdevsw; - int dsp_make_dev(device_t); void dsp_destroy_dev(device_t); int dsp_oss_audioinfo(struct cdev *, oss_audioinfo *, bool); From nobody Mon Mar 17 18:36:51 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGC72mpz5qVhm; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGC49XLz4361; Mon, 17 Mar 2025 18:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62KJygXHWp02nTOLXZjK7OiJfBcDdDBMs+qdyTpaGUo=; b=K4kvqQckNtMc+BV3+8Rf2Q5sjqqCgUIunnNC3zOY4aNY8lcim4GEEFc6eU/MSCcD2li2/l gV88ATiZpWgy1Gn562PNgVh7clFiMhilUS9Gpb+/cDi30eLukr8mqyzmnLUcUxd4IKqolZ WK7QaocORY/V779sRujcvGuKbshm6TjqgNh+forCVuAczPBmFBhAMg1lNzNugWXs2S/dpa fpzuT7KsZLuQ0JA7S18+DLtHCG8x6QTxocXKvjRb841rEZDMKHoNchJIusEpvMRhIFPp08 TMMqgM0vPoIpUgTLfVckDbiZWiX0sOfMGJip8JLreyP0LQfzWxPBqKxWuh89DQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236611; a=rsa-sha256; cv=none; b=wnMObKuz0ffaiEQAjx55xnOfUsAxnijsRHzJHbbty0WFaus0ZgZte4QIVp1H4GTUDTKcVH nxs8/59GXpt3ILuY+pNKQ7jBysh3llElynnJQ8AJcYlbtMoL1v2SLVg2pTn5yE+UMdcbkb l2px2HQuqfLxlaMXA0S2X6TVufwpK2uWaTa0LdvPCPN2uHxhwsf89xIKVvTMPqtbZwOXjy ImrSmdkX4nJSGOKk2gQd/XFWiSyXwXO/T3fZEBiZ9ZSpqspJxuYu1lLaPrgYkCOjuckFks qfyn55m/nYPWquiyPpY5lLeqdD6VI9ZBg8NmbqaMah8ePkKgFiCe21G6juFeXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62KJygXHWp02nTOLXZjK7OiJfBcDdDBMs+qdyTpaGUo=; b=Q0XQJSsKXULtOZNFUsGcT8P8DE/EcaGh067j4CCmQhj6sZHNwSuO32s0zUxNtmkbsDESHU JuKzvvgLeFFXzB2Llgc7iqJe/TXeVFaSMJRulsgILlNI/Mh0rKvTKYUw/HBNM3lSTCe1mp 6K3c7MeSQ4z7VNGwkTcguwOVSXpoonEFQw2i0c/JBD3WSWKPwTWDrhhEAOgViwaakmTRMm RvL5TmihXUGVAqBJMFo8x1PBxBQEDhXoHraLhg5OZuHWlPld1zFqH7w7BdxKZsmF+8jOdB hCk0QfD1GlpMyxOjorQU+V76Z4jcKk33NSVVibk3Hg5Ougqg489rC7ollGCD7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGC3mZQzxk9; Mon, 17 Mar 2025 18:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIapHj013190; Mon, 17 Mar 2025 18:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIapt6013187; Mon, 17 Mar 2025 18:36:51 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:51 GMT Message-Id: <202503171836.52HIapt6013187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: a33356100b85 - stable/14 - sound: Simplify pcm/feeder_mixer.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org 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/14 X-Git-Reftype: branch X-Git-Commit: a33356100b850d79d11b3630fda2b421f1ccba8d Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a33356100b850d79d11b3630fda2b421f1ccba8d commit a33356100b850d79d11b3630fda2b421f1ccba8d Author: Christos Margiolis AuthorDate: 2025-03-10 20:38:23 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:28:54 +0000 sound: Simplify pcm/feeder_mixer.c - Get rid of macro magic. - Make feed_mixer_info handling similar to most feeders. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48394 (cherry picked from commit 4021fa32d92d656d3d43186cc231695c7ad53d33) --- sys/dev/sound/pcm/feeder_mixer.c | 173 +++++++++++++++------------------------ 1 file changed, 68 insertions(+), 105 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 9a7d75198692..f5f2b9bc9c36 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -42,136 +42,83 @@ #undef SND_FEEDER_MULTIFORMAT #define SND_FEEDER_MULTIFORMAT 1 -typedef void (*feed_mixer_t)(uint8_t *, uint8_t *, uint32_t); - -#define FEEDMIXER_DECLARE(SIGN, BIT, ENDIAN) \ -static void \ -feed_mixer_##SIGN##BIT##ENDIAN(uint8_t *src, uint8_t *dst, \ - uint32_t count) \ -{ \ - intpcm##BIT##_t z; \ - intpcm_t x, y; \ - \ - src += count; \ - dst += count; \ - \ - do { \ - src -= PCM_##BIT##_BPS; \ - dst -= PCM_##BIT##_BPS; \ - count -= PCM_##BIT##_BPS; \ - x = pcm_sample_read_calc(src, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - y = pcm_sample_read_calc(dst, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - z = INTPCM##BIT##_T(x) + y; \ - x = pcm_clamp_calc(z, AFMT_##SIGN##BIT##_##ENDIAN); \ - pcm_sample_write(dst, x, \ - AFMT_##SIGN##BIT##_##ENDIAN); \ - } while (count != 0); \ -} - -#if BYTE_ORDER == LITTLE_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) -FEEDMIXER_DECLARE(S, 16, LE) -FEEDMIXER_DECLARE(S, 32, LE) -#endif -#if BYTE_ORDER == BIG_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) -FEEDMIXER_DECLARE(S, 16, BE) -FEEDMIXER_DECLARE(S, 32, BE) -#endif -#ifdef SND_FEEDER_MULTIFORMAT -FEEDMIXER_DECLARE(S, 8, NE) -FEEDMIXER_DECLARE(S, 24, LE) -FEEDMIXER_DECLARE(S, 24, BE) -FEEDMIXER_DECLARE(U, 8, NE) -FEEDMIXER_DECLARE(U, 16, LE) -FEEDMIXER_DECLARE(U, 24, LE) -FEEDMIXER_DECLARE(U, 32, LE) -FEEDMIXER_DECLARE(U, 16, BE) -FEEDMIXER_DECLARE(U, 24, BE) -FEEDMIXER_DECLARE(U, 32, BE) -#endif - struct feed_mixer_info { uint32_t format; + uint32_t channels; int bps; - feed_mixer_t mix; }; -#define FEEDMIXER_ENTRY(SIGN, BIT, ENDIAN) \ - { \ - AFMT_##SIGN##BIT##_##ENDIAN, PCM_##BIT##_BPS, \ - feed_mixer_##SIGN##BIT##ENDIAN \ - } - -static struct feed_mixer_info feed_mixer_info_tab[] = { - FEEDMIXER_ENTRY(S, 8, NE), -#if BYTE_ORDER == LITTLE_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) - FEEDMIXER_ENTRY(S, 16, LE), - FEEDMIXER_ENTRY(S, 32, LE), -#endif -#if BYTE_ORDER == BIG_ENDIAN || defined(SND_FEEDER_MULTIFORMAT) - FEEDMIXER_ENTRY(S, 16, BE), - FEEDMIXER_ENTRY(S, 32, BE), -#endif -#ifdef SND_FEEDER_MULTIFORMAT - FEEDMIXER_ENTRY(S, 24, LE), - FEEDMIXER_ENTRY(S, 24, BE), - FEEDMIXER_ENTRY(U, 8, NE), - FEEDMIXER_ENTRY(U, 16, LE), - FEEDMIXER_ENTRY(U, 24, LE), - FEEDMIXER_ENTRY(U, 32, LE), - FEEDMIXER_ENTRY(U, 16, BE), - FEEDMIXER_ENTRY(U, 24, BE), - FEEDMIXER_ENTRY(U, 32, BE), -#endif - { AFMT_AC3, PCM_16_BPS, NULL }, - { AFMT_MU_LAW, PCM_8_BPS, feed_mixer_U8NE }, /* dummy */ - { AFMT_A_LAW, PCM_8_BPS, feed_mixer_U8NE } /* dummy */ -}; +static void +feed_mixer_apply(uint8_t *src, uint8_t *dst, uint32_t count, const uint32_t fmt) +{ + intpcm32_t z; + intpcm_t x, y; -#define FEEDMIXER_TAB_SIZE ((int32_t) \ - (sizeof(feed_mixer_info_tab) / \ - sizeof(feed_mixer_info_tab[0]))) + src += count; + dst += count; -#define FEEDMIXER_DATA(i, c) ((void *) \ - ((uintptr_t)((((i) & 0x1f) << 7) | \ - ((c) & 0x7f)))) -#define FEEDMIXER_INFOIDX(d) ((uint32_t)((uintptr_t)(d) >> 7) & 0x1f) -#define FEEDMIXER_CHANNELS(d) ((uint32_t)((uintptr_t)(d)) & 0x7f) + do { + src -= AFMT_BPS(fmt); + dst -= AFMT_BPS(fmt); + count -= AFMT_BPS(fmt); + x = pcm_sample_read_calc(src, fmt); + y = pcm_sample_read_calc(dst, fmt); + z = INTPCM_T(x) + y; + x = pcm_clamp_calc(z, fmt); + pcm_sample_write(dst, x, fmt); + } while (count != 0); +} static int feed_mixer_init(struct pcm_feeder *f) { - int i; + struct feed_mixer_info *info; if (f->desc->in != f->desc->out) return (EINVAL); - for (i = 0; i < FEEDMIXER_TAB_SIZE; i++) { - if (AFMT_ENCODING(f->desc->in) == - feed_mixer_info_tab[i].format) { - f->data = - FEEDMIXER_DATA(i, AFMT_CHANNEL(f->desc->in)); - return (0); - } - } + info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT | M_ZERO); + if (info == NULL) + return (ENOMEM); + + info->format = AFMT_ENCODING(f->desc->in); + info->channels = AFMT_CHANNEL(f->desc->in); + info->bps = AFMT_BPS(f->desc->in); + + f->data = info; - return (EINVAL); + return (0); +} + +static int +feed_mixer_free(struct pcm_feeder *f) +{ + struct feed_mixer_info *info; + + info = f->data; + if (info != NULL) + free(info, M_DEVBUF); + + f->data = NULL; + + return (0); } static int feed_mixer_set(struct pcm_feeder *f, int what, int value) { + struct feed_mixer_info *info; + + info = f->data; switch (what) { case FEEDMIXER_CHANNELS: if (value < SND_CHN_MIN || value > SND_CHN_MAX) return (EINVAL); - f->data = FEEDMIXER_DATA(FEEDMIXER_INFOIDX(f->data), value); + info->channels = (uint32_t)value; break; default: return (EINVAL); - break; } return (0); @@ -297,8 +244,8 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, if (sz < count) count = sz; - info = &feed_mixer_info_tab[FEEDMIXER_INFOIDX(f->data)]; - sz = info->bps * FEEDMIXER_CHANNELS(f->data); + info = f->data; + sz = info->bps * info->channels; count = SND_FXROUND(count, sz); if (count < sz) return (0); @@ -331,7 +278,7 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, if ((ch->flags & CHN_F_MMAP) && !(ch->flags & CHN_F_CLOSING)) sndbuf_acquire(ch->bufsoft, NULL, sndbuf_getfree(ch->bufsoft)); - if (info->mix == NULL) { + if (c->flags & CHN_F_PASSTHROUGH) { /* * Passthrough. Dump the first digital/passthrough * channel into destination buffer, and the rest into @@ -373,7 +320,22 @@ feed_mixer_feed(struct pcm_feeder *f, struct pcm_channel *c, uint8_t *b, f->desc->out), mcnt); mcnt = 0; } - info->mix(tmp, b, cnt); + switch (info->format) { + case AFMT_S16_NE: + feed_mixer_apply(tmp, b, cnt, + AFMT_S16_NE); + break; + case AFMT_S24_NE: + feed_mixer_apply(tmp, b, cnt, + AFMT_S24_NE); + break; + case AFMT_S32_NE: + feed_mixer_apply(tmp, b, cnt, + AFMT_S32_NE); + break; + } + feed_mixer_apply(tmp, b, cnt, + info->format); if (cnt > rcnt) rcnt = cnt; } @@ -397,6 +359,7 @@ static struct pcm_feederdesc feeder_mixer_desc[] = { static kobj_method_t feeder_mixer_methods[] = { KOBJMETHOD(feeder_init, feed_mixer_init), + KOBJMETHOD(feeder_free, feed_mixer_free), KOBJMETHOD(feeder_set, feed_mixer_set), KOBJMETHOD(feeder_feed, feed_mixer_feed), KOBJMETHOD_END From nobody Mon Mar 17 18:36:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGG2HY9z5qVch; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGF6ThJz43Mj; Mon, 17 Mar 2025 18:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5DYAun6evAFJpjXmRl7kS1UiYQx1vyU8DKcb1UVrwQ=; b=ivUzUP59m/khuP8FxeHCx9xoHujx+4DUGPi83Zzr5kbAJT+owZlD5dcqU1ENrZCI6D3bz1 Hym1kVgEPnWGak53mbTU70RTk9sm4MdbW6LViMVW4B2kAIK97zXlksVHFmluAfvZXeZanO p0EWpk77b+IwBDT/cXgSLJwgxRDsnls/kqZpnRuElsbnRTtEYg4gLMqOol3PCrzMPELRan Lm0YfX8OwxeMizlFzlmdE/WD0cY1tCR1Gn5MI6Q7S4oe+R6G6t8tu6z+ab3LM3+K4Y+p6E be+NPcaZckKNhixGgl537KpbLAzwtk+BtmzS2w5ZXqNuAkyL0Y3K8iLsJKl6sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236614; a=rsa-sha256; cv=none; b=WPDPdanLwPyG/DqvuPekDjKp4lWACFSkePYrhvddpUhH65PURA2+cnhZY4+qZBnfPbfJAN OakuPaawJ0w+7uYtwhh5u6sezvyxjuli/SXPdeSBW0ronFPEsa++lo6EdBJnd8oMzKi60Z yZLohBi+4432t7FjRp3JWTQYyZO3p8RfUVP5cl89rWsjaPnYVu/UGfiuy2MgsCbsKkMM5n 0+L5gZu2WeLyI5EY+jmr5XgUi2m8LRQMjR70ZWLE/x55ntmezVj/tAiew1Ol1qRqkD8Ijl Wzz1qQYyqV96ioJtd5xCgzpbt+xzdRKRs7PgFRhRsrypkk52QEncgiWbYGS1Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5DYAun6evAFJpjXmRl7kS1UiYQx1vyU8DKcb1UVrwQ=; b=kv9vRzKh5/K4DrQQcxMV1rQ0TdiYY7cpKXSrVzyxIPFLunhiY38EETjmB2E15aXVYOLQVv RE3gEynjwwyER33BxBFIYI4j8pIybH7Tn69gZd2d0cjjwtU3yt5qEjQNywVKFIE1cyjLe4 w1enzjznQPopD82z+gDhUQzoZw5IleX4lk/PHTm/CsNg1IMhcjs31GGOynbkmc+QGhIMV1 5S9WvNqA6IaBGmpKvYuHcY0gAfzSKRU9QVibgjoBwnaP/XgAQ2QUt0J9BF18M9oC5oK2eX bT0zpVoCeEYwKQ5COybAZO5VjhDWyW8gBAT2wIeWbB9UEyAXOKZBx7XrPJi7fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGF5Ft6zxyn; Mon, 17 Mar 2025 18:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIarxw013262; Mon, 17 Mar 2025 18:36:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIarcu013259; Mon, 17 Mar 2025 18:36:53 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:53 GMT Message-Id: <202503171836.52HIarcu013259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 31ddfe9d9cf4 - stable/14 - sound: Retire SD_F_AUTOVCHAN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 31ddfe9d9cf4a7bdd724ffc6c0efe88587759186 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=31ddfe9d9cf4a7bdd724ffc6c0efe88587759186 commit 31ddfe9d9cf4a7bdd724ffc6c0efe88587759186 Author: Christos Margiolis AuthorDate: 2025-03-10 20:47:35 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:29:15 +0000 sound: Retire SD_F_AUTOVCHAN This flag is redundant and essentially a no-op, as it is set when the device supports at least playback or recording, which is almost always the case. But even if the device is mixer-only (i.e., 0 channels), there is no reason to keep this flag; it is only used to bail out of the vchan sysctl handlers, but we already bail out anyway if we try to use the sysctl in a vchan direction that is not supported. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49021 (cherry picked from commit b768f2c7773b6e306fb43687657414f9f42a27d4) --- sys/dev/sound/pcm/sound.c | 7 +------ sys/dev/sound/pcm/sound.h | 4 ++-- sys/dev/sound/pcm/vchan.c | 8 ++++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 9459b207bba0..ac5d11b83ea3 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -242,10 +242,6 @@ pcm_setstatus(device_t dev, char *str) if (d->playcount == 0 || d->reccount == 0) d->flags |= SD_F_SIMPLEX; - - if (d->playcount > 0 || d->reccount > 0) - d->flags |= SD_F_AUTOVCHAN; - if (d->playcount > 0) d->flags |= SD_F_PVCHANS; if (d->reccount > 0) @@ -412,8 +408,7 @@ pcm_sysinit(device_t dev) OID_AUTO, "mode", CTLFLAG_RD, NULL, mode, "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " "one mode is supported)"); - if (d->flags & SD_F_AUTOVCHAN) - vchan_initsys(dev); + vchan_initsys(dev); if (d->flags & SD_F_EQ) feeder_eq_initsys(dev); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 2a5ea4711146..b47d6dfeecf8 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -99,7 +99,7 @@ struct snd_mixer; #define SOUND_MAXVER SOUND_MODVER #define SD_F_SIMPLEX 0x00000001 -#define SD_F_AUTOVCHAN 0x00000002 +/* unused 0x00000002 */ #define SD_F_SOFTPCMVOL 0x00000004 #define SD_F_BUSY 0x00000008 #define SD_F_MPSAFE 0x00000010 @@ -122,7 +122,7 @@ struct snd_mixer; #define SD_F_BITS "\020" \ "\001SIMPLEX" \ - "\002AUTOVCHAN" \ + /* "\002 */ \ "\003SOFTPCMVOL" \ "\004BUSY" \ "\005MPSAFE" \ diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 27739fe68852..2b300e90ea4d 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -260,7 +260,7 @@ sysctl_dev_pcm_vchans(SYSCTL_HANDLER_ARGS) int err, enabled, flag; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d); @@ -318,7 +318,7 @@ sysctl_dev_pcm_vchanmode(SYSCTL_HANDLER_ARGS) char dtype[16]; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d); @@ -409,7 +409,7 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS) int *vchanrate, direction, ret, newspd, restart; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d); @@ -508,7 +508,7 @@ sysctl_dev_pcm_vchanformat(SYSCTL_HANDLER_ARGS) char fmtstr[AFMTSTR_LEN]; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d); From nobody Mon Mar 17 18:36:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGH46rvz5qVHV; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGG75GKz43Bs; Mon, 17 Mar 2025 18:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MS5F4j72B+mAka65esJwP4FPsa3+NVkDcWm8PaxbfwQ=; b=Y4lkDnzYI5LSNxT2LjMU3UyXH8/w+8C9xcq/XGvv7AQJqbSU6Al9wJF0CYdNk78UIvNG58 Ljenx774hHT/PZMQmOERgiPHcwRCe5/2YZ1ZnFeUfy7PzORUNxce//ZDRUOfLX2jtDmhRw lulzdQjRrps6qCRH85tvl+vLh5C0MTdScyU5LKTsGqMphXJT9EJDcQLjhgE/liNqU9HYlF hEPiT7eWuaDtEpGNNrYuSUPBRbPnWtNRN2AHfVRVT1fOpzO/pWRghlnhF5AlQNJofD0tpC EwobFga8vXK1fTj4bSZu1aBFrG0e5dG2Ng/c+hFwwGhJ+afDeSmkE7o9pN2K4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236615; a=rsa-sha256; cv=none; b=WcF2Nqh5YqbncSHzlUjxplBX7mjNI2x++AdLtXhC4duAJ2UULmEDj2aDV9uRPUjocEhHU6 JSQj3eOHZOkttY5DfmS1nqTtAVGGq3LCSba3A26mrQ7YG+a3+qoZ6qo8ZsA1q63LIBXOfm gwUkXsAr2RI66zl8F2pSatjSzwV3pTsgOCf/dxoHGrcOHibsj/0OboQ0gbpSwd/j0zaVYq mzSVxQieLBVFTicfYInryR1Mp7K8h2E6Vi7mDvzBS4S9G+olC+Coux3YUdjodLPskV/VSf RT2hJvpIVwX05mwMSUIHxliSGy83lUdVPnk9Xvj1Su8Usfm1YmSHeF2lr6vVzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MS5F4j72B+mAka65esJwP4FPsa3+NVkDcWm8PaxbfwQ=; b=rVuNVjmdOjTiuGu1usYf+Ju1feGYLXHhR6zqVu7f1XxjkWWFvH3uf3dHeDjuj39xDOzXq7 7d1/8dmVITIIkNzLFsjZc+CsXY/Mj0JblLtfb6zYdM1dJ9sw7gelPoLBiUeWQf9P/B5Pf/ WNoOC3Nsmzd6CcS79i45gnHj770FQp9doflcijyiSPQpAsR8FLkJI23GBA9iA/SEiGkSiC qXhegdD5t1KTHvHi2FsV8bgr+p2mvXQqnSuwEpcYJSepYYPXLcWQ26BHsN3Wmg6kkQWP5M bUaPO1Ff9sivt1fDnT8PGp/wSQormT099rJ8bXRxpIdrkHTpXsNZpBMm5AKTMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGG5z6Vzxyp; Mon, 17 Mar 2025 18:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIaseA013296; Mon, 17 Mar 2025 18:36:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIascK013293; Mon, 17 Mar 2025 18:36:54 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:54 GMT Message-Id: <202503171836.52HIascK013293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 65dec169468c - stable/14 - sound: Make dev.pcm.X.mode dynamic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 65dec169468cef17fcda8e7e72a460c1df2a630f Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=65dec169468cef17fcda8e7e72a460c1df2a630f commit 65dec169468cef17fcda8e7e72a460c1df2a630f Author: Christos Margiolis AuthorDate: 2025-03-10 20:47:39 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:29:17 +0000 sound: Make dev.pcm.X.mode dynamic Currently dev.pcm.X.mode is calculated only once in pcm_sysinit(), which is called by pcm_register() during attach, but this can result in inconsistencies. For some context, what pcm_mode_init() does is, it checks if "playcount" is positive, in which case we assume the device supports playback. The same is done for "reccount" for recording, and if "mixer_dev" is not NULL, we know the device has a mixer. The "playcount" and "reccount" variables correspond to the number of _primary_ playback/recording channels, so we can assume that the primary channels have been created before reaching pcm_mode_init(). However, for the mixer that's not always the case. If the mixer is created _after_ pcm_register(), as is the case for snd_dummy(4) for example, pcm_mode_init() will see that "mixer_dev" is NULL, and report that the device does not have a mixer, whereas in reality we just created it afterwards. While this could be fixed by simply creating the mixers always before pcm_register(), it is better to be robust and calculate the mode dynamically. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49024 (cherry picked from commit ab95710f30f7255d3a6be22a1a2c375ee0f96868) --- sys/dev/sound/pcm/sound.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index ac5d11b83ea3..bbb6c8dff0de 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -361,28 +361,32 @@ sysctl_dev_pcm_bitperfect(SYSCTL_HANDLER_ARGS) return (err); } -static u_int8_t -pcm_mode_init(struct snddev_info *d) +static int +sysctl_dev_pcm_mode(SYSCTL_HANDLER_ARGS) { - u_int8_t mode = 0; + struct snddev_info *d; + int mode = 0; + d = oidp->oid_arg1; + if (!PCM_REGISTERED(d)) + return (ENODEV); + + PCM_LOCK(d); if (d->playcount > 0) mode |= PCM_MODE_PLAY; if (d->reccount > 0) mode |= PCM_MODE_REC; if (d->mixer_dev != NULL) mode |= PCM_MODE_MIXER; + PCM_UNLOCK(d); - return (mode); + return (sysctl_handle_int(oidp, &mode, 0, req)); } static void pcm_sysinit(device_t dev) { struct snddev_info *d = device_get_softc(dev); - u_int8_t mode; - - mode = pcm_mode_init(d); sysctl_ctx_init(&d->play_sysctl_ctx); d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, @@ -403,9 +407,10 @@ pcm_sysinit(device_t dev) "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, sizeof(d), sysctl_dev_pcm_bitperfect, "I", "bit-perfect playback/recording (0=disable, 1=enable)"); - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "mode", CTLFLAG_RD, NULL, mode, + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "mode", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, d, sizeof(d), + sysctl_dev_pcm_mode, "I", "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " "one mode is supported)"); vchan_initsys(dev); From nobody Mon Mar 17 18:36:55 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGJ1zs8z5qVLV; Mon, 17 Mar 2025 18:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGJ0tHnz434B; Mon, 17 Mar 2025 18:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1hQFCcHZ16x4uzCOoxjZ5jZl+eHzy2U62JgdECIXtU=; b=rLcCx6Bj2oDLsFR+BLy7bKzRoPlhhgtC6r5TcQ18wCHNkX3eDBw28DmVF0S3ll+1LyQdgk VJNHQHF66biMEP8oEPMYJOteTVV0tfI8MUXB/so6WLUsV05HEhGMeFCJSzUYQxiQ0Ps3N6 GAHzI8Gk3EZ+QV7Fq7tShK4wsVwvrrdMMuJd2kT22Rp6X48eB2BtFsGjxaRxvkkN07xDJ1 DUuA837yOHsjz82WxdD6RSto0dtBhz0Rn+0nq2utHrsRsqITVXsB5n2CM8/9FeqdcaSJ1I oIfbZwJR5EjJvq3BTNMiG+aGcqFjQ9b9FRayOnFYeRi88Jv4hho5PJWQgoq7Mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236616; a=rsa-sha256; cv=none; b=U3kNpmKGjOcllxLozgjcJmnUphagax/pKtDy1y3SA/pr8XION19Z1a5K8tNZkhV8afj1KQ ILrPvrj8XM+9aLBLfJhyzHVr51JZJTtbM3Oy2NQYQ4BiidG4GvC+rUSlEkwhkOEKVOlaD1 96D8vq8AffeWPgvrkZ+uTLaRg0/6bEr3sDL2vHcFiWz/r2nz27TMs0ktk7jjv0z/Juv+3L phPP20OXZTUA3NPX1+C6SSrH6EG1ZN3KZEHORq+jy6wbWls7GNBsRzPksjdLs40TQBabI/ 8w/gh72SSfYQf/M/i7WLqR0a+6KKH00imaaN5AiJob0ePryePdqo2xCB64gpCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1hQFCcHZ16x4uzCOoxjZ5jZl+eHzy2U62JgdECIXtU=; b=gN7Hrn+0VxsGpyWU1NbJ/v9JW/iAgoQMjNtGQmLYuXvuonZEFEUjudvO9LNy8erk7cuLE8 f7zZcaE3eiI2AtHslVnQnoPriirajwb8ZOQHgvezIma9V+TuwX1E0652v1PFJI6xjX4O+T Li/FuwV/9WkgDYWpSMBzZRoBfRfIQp7INpz16U03hXp2Tdkkdkccjli2f3gdpZxT+ikkUK I3aTvEyS49kE2+q6WQIVNZQSMSCW2+EC6i1xYF/FOX1uWVkP6xfuf6cSxkGyVomSAoC950 pN0IoEQKl7XqjOA+FM5c/fZvBR+wAcV8nQwyrIqmRFP6LWamseHg2WEzTAB7fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGJ0Dgqzxyq; Mon, 17 Mar 2025 18:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIatRp013331; Mon, 17 Mar 2025 18:36:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIatdu013328; Mon, 17 Mar 2025 18:36:55 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:55 GMT Message-Id: <202503171836.52HIatdu013328@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: caa06360e655 - stable/14 - sound: Update COPYRIGHT notices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: caa06360e6553881f695d47de21b7f73b5be1d98 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=caa06360e6553881f695d47de21b7f73b5be1d98 commit caa06360e6553881f695d47de21b7f73b5be1d98 Author: Christos Margiolis AuthorDate: 2025-03-10 20:47:44 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:29:17 +0000 sound: Update COPYRIGHT notices Only to files I've currently made significant contributions to. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit c824383b269d8abe175ea4751194660716d5600e) --- sys/dev/sound/dummy.c | 2 +- sys/dev/sound/pcm/channel.c | 4 ++++ sys/dev/sound/pcm/channel.h | 4 ++++ sys/dev/sound/pcm/dsp.c | 2 +- sys/dev/sound/pcm/dsp.h | 4 ++++ sys/dev/sound/pcm/feeder.c | 4 ++++ sys/dev/sound/pcm/feeder_eq.c | 4 ++++ sys/dev/sound/pcm/feeder_format.c | 4 ++++ sys/dev/sound/pcm/feeder_matrix.c | 4 ++++ sys/dev/sound/pcm/feeder_mixer.c | 4 ++++ sys/dev/sound/pcm/pcm.h | 4 ++++ sys/dev/sound/pcm/sndstat.c | 2 +- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/pcm/sound.h | 4 ++++ sys/dev/sound/pcm/vchan.c | 2 +- sys/dev/sound/pcm/vchan.h | 4 ++++ 16 files changed, 49 insertions(+), 5 deletions(-) diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c index 1584c489b5af..89e22a5ceb44 100644 --- a/sys/dev/sound/dummy.c +++ b/sys/dev/sound/dummy.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2024-2025 The FreeBSD Foundation * * This software was developed by Christos Margiolis * under sponsorship from the FreeBSD Foundation. diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 0a0059411399..287e2f07d8a1 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -6,6 +6,10 @@ * Copyright (c) 1999 Cameron Grant * Portions Copyright (c) Luigi Rizzo - 1997-99 * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 31c617a6df78..fab182b22774 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -5,6 +5,10 @@ * Portions Copyright (c) Ryan Beasley - GSoC 2006 * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 88e0580c5c45..422c64c1b880 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -5,7 +5,7 @@ * Portions Copyright (c) Ryan Beasley - GSoC 2006 * Copyright (c) 1999 Cameron Grant * All rights reserved. - * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2024-2025 The FreeBSD Foundation * * Portions of this software were developed by Christos Margiolis * under sponsorship from the FreeBSD Foundation. diff --git a/sys/dev/sound/pcm/dsp.h b/sys/dev/sound/pcm/dsp.h index 8a4f5f869acc..8c0786aad474 100644 --- a/sys/dev/sound/pcm/dsp.h +++ b/sys/dev/sound/pcm/dsp.h @@ -5,6 +5,10 @@ * Portions Copyright (c) Ryan Beasley - GSoC 2006 * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 6a6d8c80a34a..af3ada441e48 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -4,6 +4,10 @@ * Copyright (c) 2005-2009 Ariff Abdullah * Copyright (c) 1999 Cameron Grant * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 4ed5fa57a485..23e27b922486 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -3,6 +3,10 @@ * * Copyright (c) 2008-2009 Ariff Abdullah * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 5a8f260e1bae..0feac43374b8 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -3,6 +3,10 @@ * * Copyright (c) 2008-2009 Ariff Abdullah * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 2fee2be8bf5b..43258a311d82 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -3,6 +3,10 @@ * * Copyright (c) 2008-2009 Ariff Abdullah * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index f5f2b9bc9c36..935ef933004b 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -3,6 +3,10 @@ * * Copyright (c) 2008-2009 Ariff Abdullah * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/pcm.h b/sys/dev/sound/pcm/pcm.h index 3b3b083457ee..1de686b04097 100644 --- a/sys/dev/sound/pcm/pcm.h +++ b/sys/dev/sound/pcm/pcm.h @@ -3,6 +3,10 @@ * * Copyright (c) 2006-2009 Ariff Abdullah * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 46d86c624bdc..33cde235e070 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -5,7 +5,7 @@ * Copyright (c) 2001 Cameron Grant * Copyright (c) 2020 The FreeBSD Foundation * All rights reserved. - * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2024-2025 The FreeBSD Foundation * * Portions of this software were developed by Christos Margiolis * under sponsorship from the FreeBSD Foundation. diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index bbb6c8dff0de..99d8065c765d 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -6,7 +6,7 @@ * Copyright (c) 1999 Cameron Grant * Copyright (c) 1997 Luigi Rizzo * All rights reserved. - * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2024-2025 The FreeBSD Foundation * * Portions of this software were developed by Christos Margiolis * under sponsorship from the FreeBSD Foundation. diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index b47d6dfeecf8..74c710f6f843 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -5,6 +5,10 @@ * Copyright (c) 1999 Cameron Grant * Copyright (c) 1995 Hannu Savolainen * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 2b300e90ea4d..7064f1e51125 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -4,7 +4,7 @@ * Copyright (c) 2006-2009 Ariff Abdullah * Copyright (c) 2001 Cameron Grant * All rights reserved. - * Copyright (c) 2024 The FreeBSD Foundation + * Copyright (c) 2024-2025 The FreeBSD Foundation * * Portions of this software were developed by Christos Margiolis * under sponsorship from the FreeBSD Foundation. diff --git a/sys/dev/sound/pcm/vchan.h b/sys/dev/sound/pcm/vchan.h index 6f3df200db43..8c1de9496ef3 100644 --- a/sys/dev/sound/pcm/vchan.h +++ b/sys/dev/sound/pcm/vchan.h @@ -4,6 +4,10 @@ * Copyright (c) 2005-2009 Ariff Abdullah * Copyright (c) 2001 Cameron Grant * All rights reserved. + * Copyright (c) 2024-2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From nobody Mon Mar 17 18:36:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGL0YkVz5qVHb; Mon, 17 Mar 2025 18:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGK3BHYz43Px; Mon, 17 Mar 2025 18:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoIziOGezOrnq6Qc5PcmXlZGawoNd1HjjBeqS+RWU/A=; b=kFBIvWBMAby5Ex3PnziLlg8zz0QdxyLKEcxxHCOn2h7KNHpj/40fGPlfpv8iWXHZmr9hck tYJQNcjgKz3dL/HG5ndGopil10iUyKLL9TN892sj4kxgPoQmOlL5rWrtAyqdrkcM7/ryCN nJbZ6bsXo4ER9Kojkujw7o4oS9JaOC1WqyiKxPeFx0OjonTQAFwu8x3X2MZAJjdzrMBs9L 9ebxOz3DAi5yCy5lLODbApORAnWgPmX8TvWPcApsJmvj7pWBIxK3XU3EpRkryk1QKiv+FZ O8LBDbrD4HFCj6Ybu/qR9r69WZxiCRWkY9jLDPx0pbTjk77mzUfL91+jjnfn1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236617; a=rsa-sha256; cv=none; b=JDZo2ml/NivBcLwjf7GMvM6K4ivhim7vnLsmZNE0BOCGTMpIV1J1vQX7LBtqOcdnAqUtVp FcUErJpy9DWyqpmZux8H1eleGpEVVQMyezpzGMLSdmbFT9Ho8ljcKI/nmwA+axQAhC4bJI H903SvspP9ZyLLH6sY+m635EgX1wIMiI4WGDfpVXpF7TmHA3uonlc+0Y6VyKb4eA7jarWE QPTUiYT2Qt6z6XDys5zxuHf5+/M/6bmdJG39+QZn1e9ohJheDeqTki1+voWipGWzjZlild l9lVjDl3h+8lpaAON4zWSfkqFtQCHWOpbXRmxo4GZcxMLkYljWRNRvFBYbhhSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoIziOGezOrnq6Qc5PcmXlZGawoNd1HjjBeqS+RWU/A=; b=tq73WtiA3ilIsgQuOsRdfM8uOhN5gxaIWMmuorElNjArXpS4V7ZEs8mXF8kxVcOOGhSrq9 9dKl5Cdnj7jc5vmoa0JhvoJe2ILo5HLK7w+B9dgik/xWEN5hvSzciCWr4fwXjPX84mfwm4 oBwFF4H805CnkeP6sTqARVVMBVbExSnzz6IdUQBeg0dmLtp84c5cSTo0F7FIeDsKoicnRC RwEU/W+oZGhwXPRIvErdAFacZyrGohwPChXUTE4JUF/t8/Jw6dTqbz6qa3JGfv7ZjJWKVw fbp5tsdA3Ctyg0vPxJlvGeynHM6oMGSwx1gdAd/lf4C6u7CD/V7s8Zad8mK4Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGK1GVgzy2J; Mon, 17 Mar 2025 18:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIavoY013372; Mon, 17 Mar 2025 18:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIavYW013369; Mon, 17 Mar 2025 18:36:57 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:57 GMT Message-Id: <202503171836.52HIavYW013369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 4ed0ca91a309 - stable/14 - sound: Make feed_mixer_apply() __always_inline List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ed0ca91a309bcddb38881d038836bb21fbd8ca7 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=4ed0ca91a309bcddb38881d038836bb21fbd8ca7 commit 4ed0ca91a309bcddb38881d038836bb21fbd8ca7 Author: Christos Margiolis AuthorDate: 2025-03-10 21:16:08 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:29:17 +0000 sound: Make feed_mixer_apply() __always_inline Reported by: mav Fixes: 4021fa32d92d ("sound: Simplify pcm/feeder_mixer.c") MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 717adecbbb5293d8386caa866c21421ef9eeb22c) --- sys/dev/sound/pcm/feeder_mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 935ef933004b..1d3b7e31d055 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -52,7 +52,7 @@ struct feed_mixer_info { int bps; }; -static void +__always_inline static void feed_mixer_apply(uint8_t *src, uint8_t *dst, uint32_t count, const uint32_t fmt) { intpcm32_t z; From nobody Mon Mar 17 19:14:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGl5C0wNnz5qY3m; Mon, 17 Mar 2025 19:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGl5C0C8jz3XQM; Mon, 17 Mar 2025 19:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742238847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=muDiRR6Nop93bWnl+3gsSMkJ19wXIGYT+3s96meBisQ=; b=sDvm+7L8XDj4i+dd2hC12wlv3ZvyIKOqXkLa0Uc3qkI47Vq9hYXFbBwWlasLsuHLbDszKL BsV8zeOIw3SiuphnwZ+IUh39ePsjPwMeqLCgJprtBgJqAQCz5JSgNOkt0pzz8S+CCOBjZJ aMRlf86FEoiZ/NDrXV6Ry6TiMOOKxV95kHwS2QORbj3c7q+RPE6Z/6csRgup3Gl7ZAPaAv SvXuEL7AeOYsRIC2LLehPafuo86LJVCJjn2b6wKRcNahr62nWjw5+XIzcoE02HyaJl++MM 7NMuehhy3wTAw1iQnlXbVpSBjXgO3bIvr8ClniWmF+txxJVAom3/yGBOfIQOdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742238847; a=rsa-sha256; cv=none; b=BVB1WK9D8+W0R7wEG42689dgzoIh2jPRqcZBQyG6CjMfabKp5zaDZVLe2UTdp5ZmydZSHm y8wMybnIq8YPzu7GlIn2XgN/kXmF0MVtKPcEqAt3ER/jDGGofPHMO/BvJ7hGZxDUEPJ9+1 /vTLEChUWpuiEHjulCJYGY1B5li552xJ1A9VudEpdbL25ybWi83rNyyOnWYCjZjPs2Sdva +oV2g9jgliLCdoXKNioZAg2MkONTLPwlRMveM784NM7CwqoUJk5592jBnNovCqY+oZPkfO ipTdMS+lQR9jXyr/66DL7OXB41j4ucNN6ykzF3/jLwaw0YdxyKoIeokhHgq0fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742238847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=muDiRR6Nop93bWnl+3gsSMkJ19wXIGYT+3s96meBisQ=; b=j2s02azA26pApQlbvbnIa8mJTqwPzbhuCKOx1wvh6u1PREPhBlKw4gQY0KsnF4flSjeDFD tXvwNdc4vxUAVCYcs2lGa/p8p5xsvzZDBEJG64zLnYEbCe6DLGnftZEIMDFzgemOKcq650 BBgYxsufzNv/UqM4ckYAANvg3aRHoysMdTI5DNdsKtNJuSHUxxbxB3exEgCzBbVvLx57We BPADA56PvWTZTpKFZxTVfi8paBWDSL6Hm1oy+uobMt75qWTNGiQtOzc/0wPhKnWBaXqvPG TmRXfOzoKP0nGRy22HsvaqviEyky46jE6SsXO3vGRMDU76VCLXJDc/lsmfnYWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGl5B6nPhz10T2; Mon, 17 Mar 2025 19:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HJE6nl088375; Mon, 17 Mar 2025 19:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HJE69T088372; Mon, 17 Mar 2025 19:14:06 GMT (envelope-from git) Date: Mon, 17 Mar 2025 19:14:06 GMT Message-Id: <202503171914.52HJE69T088372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f506d5af50fc - main - uma: Avoid excessive per-CPU draining List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f506d5af50fccc37f5aa9fe090e9a0d5f05506c8 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f506d5af50fccc37f5aa9fe090e9a0d5f05506c8 commit f506d5af50fccc37f5aa9fe090e9a0d5f05506c8 Author: Mark Johnston AuthorDate: 2025-03-17 19:12:58 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-03-17 19:12:58 +0000 uma: Avoid excessive per-CPU draining After commit 389a3fa693ef, uma_reclaim_domain(UMA_RECLAIM_DRAIN_CPU) calls uma_zone_reclaim_domain(UMA_RECLAIM_DRAIN_CPU) twice on each zone in addition to globally draining per-CPU caches. This was unintended and is unnecessarily slow; in particular, draining per-CPU caches requires binding to each CPU. Stop draining per-CPU caches when visiting each zone, just do it once in pcpu_cache_drain_safe() to minimize the amount of expensive sched_bind() calls. Fixes: 389a3fa693ef ("uma: Add UMA_ZONE_UNMANAGED") MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: gallatin, kib Differential Revision: https://reviews.freebsd.org/D49349 --- sys/vm/uma_core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 4de850afcb66..35eede04171f 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -5339,6 +5339,13 @@ uma_reclaim_domain(int req, int domain) zone_foreach(uma_reclaim_domain_cb, &args); break; case UMA_RECLAIM_DRAIN_CPU: + /* + * Reclaim globally visible free items from all zones, then drain + * per-CPU buckets, then reclaim items freed while draining. + * This approach minimizes expensive context switching needed to + * drain each zone's per-CPU buckets. + */ + args.req = UMA_RECLAIM_DRAIN; zone_foreach(uma_reclaim_domain_cb, &args); pcpu_cache_drain_safe(NULL); zone_foreach(uma_reclaim_domain_cb, &args); From nobody Mon Mar 17 23:14:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGrQd1cZhz5qrlR; Mon, 17 Mar 2025 23:14:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGrQc6rg0z40s6; Mon, 17 Mar 2025 23:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742253273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpFpkHCy4uJHWz5p09uzGFoq4Oep9CFMHwRl4UtoHzI=; b=jYIze+FqHSsYSSdGcBemM+VFsJ2eL0vVDcbNyv+IxI4djjBTEFByORCO4JT8kW+xGRe9sx TKoN+EE2AUm40Jn8hQlM6muBizRrnbPG8wEZZwvQ6WYBiPw0QKrcG54iTXR4U/+hxhd9sE Q+g1ROOFPl+R9H/1STTawQJLc+rOm5glOPp/IZdKs1agABJb6zTEeUhsTs+i7rC5F0CJEv IujjzkApETKTDlyLqZBo3PbH8KGVXxTnEhzV+0V8cS8cJ08ojUlpPWWybvFb0t8Vv6Dgqb BLZoic5xkquF/JAzQDH4Yq7vDU6mTdafqxXjW2ajiy7/NpN42GxgnBsLo/Dqsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742253273; a=rsa-sha256; cv=none; b=YHkt50QUHWX9WIoQ9076vqjml5rV6+JgStmzOBKj9AmGGAs8H1TyvwTc9HryMoThzMZp0c GQYKyI4732YPtmMugSFK+y1vWDEoFyZK39EwNlti2nomRxZ/Ux9xcSlwLn+763w5UH0V+3 HMNETjPhE8c8UDCqnxVhBzOUx0PhctDj6OMf7VpoxiSoYqh/ojlDgUlV3M+uqNmG1fn7cJ Pg5i9Fyrw1XaYJlFTxvdmtj85cT74PuabtWucuilGibp3lhJhD1RRaywgh7xrJ/gUkkCUU 7ZMQQZbTdxSrxtlqEo8x33ISU3zN8T+G0NCgKntsYSS5IbIATNvk7inUTqKvuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742253273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xpFpkHCy4uJHWz5p09uzGFoq4Oep9CFMHwRl4UtoHzI=; b=SxeTg4GGNsiGM/+9gMLq5Qv4W4JOH9aIW5VQJCZ2/yXYXBvWNXJtp/UvVDynL6eSUL6UMy g2ivKLMdvos46Prw9s8gr38P/khCi9snvjdvTq7awEMutnPcQBDDYJ3CcwDrfZncOrwr4r wrI2H0P2fo+IIDi2WBMUkcXSq6/OxfDqIQYvRhr1W0P9O2jT0eS7vKfG8rgA0wqlz002lx NhzmsaCNRAhnORhvdjD3/Vl+reLhRHU5GRoUZ4GldiK5ONHYcFe/bfIJRZYYriwh1/kWKX QdAE8zZSo0TvNLLMg0J21rEQ9aZxT530t6EcxBZrwaxHi1zLFm+lHv86MlGFDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGrQc6SCFz16R4; Mon, 17 Mar 2025 23:14:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HNEWUw036324; Mon, 17 Mar 2025 23:14:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HNEW8U036321; Mon, 17 Mar 2025 23:14:32 GMT (envelope-from git) Date: Mon, 17 Mar 2025 23:14:32 GMT Message-Id: <202503172314.52HNEW8U036321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 6460c327f6f3 - main - libifconfig: Fix nits in the descriptions of active 100G cables. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6460c327f6f3fdf2d1cd4db648baf6cb7d74828e Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=6460c327f6f3fdf2d1cd4db648baf6cb7d74828e commit 6460c327f6f3fdf2d1cd4db648baf6cb7d74828e Author: Navdeep Parhar AuthorDate: 2025-02-25 20:29:42 +0000 Commit: Navdeep Parhar CommitDate: 2025-03-17 23:05:25 +0000 libifconfig: Fix nits in the descriptions of active 100G cables. This is a cosmetic change affecting the "plugged: ..." line in the output of ifconfig -v. Both the 100G active cables were missing a closing parenthesis. MFC after: 1 week Sponsored by: Chelsio Communications --- lib/libifconfig/sfp.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libifconfig/sfp.lua b/lib/libifconfig/sfp.lua index de738648451a..4a43b2ed780b 100644 --- a/lib/libifconfig/sfp.lua +++ b/lib/libifconfig/sfp.lua @@ -330,7 +330,7 @@ enums = { {0x0A, "RESERVED_0A", "Reserved"}, {0x09, "OBSOLETE", "Obsolete"}, {0x08, "100G_25GAUI_C2M_ACC_1", - "100G ACC (Active Copper Cable"}, + "100G ACC (Active Copper Cable)"}, {0x07, "100G_PSM4_P_SMF", "100G PSM4 Parallel SMF"}, {0x06, "100G_CWDM4", "100G CWDM4"}, {0x05, "100GBASE_SR10", "100GBASE-SR10"}, @@ -338,7 +338,7 @@ enums = { {0x03, "100GBASE_LR4_25GBASE_LR", "100GBASE-LR4 or 25GBASE-LR"}, {0x02, "100GBASE_SR4_25GBASE_SR", "100GBASE-SR4 or 25GBASE-SR"}, {0x01, "100G_25GAUI_C2M_AOC_1", - "100G AOC (Active Optical Cable"}, + "100G AOC (Active Optical Cable)"}, {0x00, "UNSPECIFIED", "Unspecified"}, }, }, From nobody Tue Mar 18 01:35:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGvXw589xz5r30Q; Tue, 18 Mar 2025 01:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGvXw1WTFz3tX4; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFsBhdFhv11IDL/fhy5qSc3fqPYO3WiAMHc2O/d3Yyk=; b=eRa5FaJpM7aSBotHmDEo4N1mDgGZkPo5QFuSy2FRiufHEQMGM02OqOJ0FMO5NU4ZXkR5iv d4LFsN4R/vBJSBtb+qOcOXkGD/QGTPhF2giMG+dWcl/69yCc0irdboePOQMo1tAKd45yTB QcmfuMmeFb8dyNoUC1r7AHEgZx2tcqcnTRTuz6ZMMICWrhCAZOuDgweKFsEnGOBqpVXHjN 7llipY9Qnj/hTWa83cuwAdX7plIbzRb+A6osecM1gbSC6sx72hzYHwjx/lil1SdXCQN0mY NJ0ywdV1kE9NwZ1hCoJkiN/b8HdMPb4dXp738lhK951i68lVEFurX41V3dnabA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742261712; a=rsa-sha256; cv=none; b=TewCwHMUGSf/FViKW3V3ySav5maS09JSFZ2bpruyWJ42mIfn5XNZ2did9WaCLwiTvufgVa gvKlT5gaEAaUgbuE1NutXQfFStCh5LSLpdbnc4hnSFZgtf4KqHzeviH2oqs6xOy5q4x5jx xjzz9jis4G0M1Q/ZKHOrRUxsl2H5jGBSKgNDh3w5SQSeParm0sPvpanLo7+Rj9zhxMUBCR c5zV8KfSO9JgBD69gExtbnERw+cEJNa4q25tbXXtr5w5Hpp85wqE/+a566d4MoqMllIPjy 3E6wrp/M1gmUWhTlkTRIdASt9Sy6xOz87U70UH/XKg/SDY8oCvOPDrAmwOqJHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xFsBhdFhv11IDL/fhy5qSc3fqPYO3WiAMHc2O/d3Yyk=; b=mek+JEG//uFuCgxn7l/HKV62p81dk4khuvVZ1gxJw4OEPcTJFPXb+F9L4obTtsNmjHUlUk 9JG1df79MmwDhwGUgftdJh20LiDWWFdONaheNT+BNT50+V9pYeuKBmoNQOe0TW/TDBPz/U TwCws1aawM9G4Oti1W9u+4OfxZphGEK0Y7YYZcc90gajqHUta6JPU3By/Yt0JtJcojD0rt XoDuHz3G4RWDC0qaQNCK09elE38EmiH21lLayuG6T1I8m07aZUF7+nCTEXDRDNzU2nIl5v EcBf0DlKfhvYQmcMA6KIzqt6N2CrSQqwNwb60GHqcvuabo5V6CsIML35bsd9nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGvXw0qHlz19wH; Tue, 18 Mar 2025 01:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I1ZCuA097624; Tue, 18 Mar 2025 01:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I1ZCfo097621; Tue, 18 Mar 2025 01:35:12 GMT (envelope-from git) Date: Tue, 18 Mar 2025 01:35:12 GMT Message-Id: <202503180135.52I1ZCfo097621@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1c8cdd807a94 - main - rtld: fix several style(9) bugs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 commit 1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 Author: Konstantin Belousov AuthorDate: 2025-03-18 01:05:40 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-18 01:34:03 +0000 rtld: fix several style(9) bugs Sponsored by: The FreeBSD Foundation --- libexec/rtld-elf/rtld.c | 48 +++++++++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index aab20407b00d..2346c6eae9f6 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -665,15 +665,19 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) aux = auxp = (Elf_Auxinfo *)envp; auxpf = (Elf_Auxinfo *)(envp + rtld_argc); dbg("move aux from %p to %p", auxpf, aux); - /* XXXKIB insert place for AT_EXECPATH if not - * present */ + /* + * XXXKIB insert place for AT_EXECPATH if not + * present + */ for (;; auxp++, auxpf++) { *auxp = *auxpf; if (auxp->a_type == AT_NULL) break; } - /* Since the auxiliary vector has moved, - * redigest it. */ + /* + * Since the auxiliary vector has moved, + * redigest it. + */ for (i = 0; i < AT_COUNT; i++) aux_info[i] = NULL; for (auxp = aux; auxp->a_type != AT_NULL; @@ -682,8 +686,10 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) aux_info[auxp->a_type] = auxp; } - /* Point AT_EXECPATH auxv and aux_info to the - * binary path. */ + /* + * Point AT_EXECPATH auxv and aux_info to the + * binary path. + */ if (binpath == NULL) { aux_info[AT_EXECPATH] = NULL; } else { @@ -1677,7 +1683,7 @@ digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t entry, const char *path) obj->mapbase = obj->vaddrbase + obj->relocbase; } else { /* Last load segment */ obj->mapsize = rtld_round_page( - ph->p_vaddr + ph->p_memsz) - + ph->p_vaddr + ph->p_memsz) - obj->vaddrbase; } nsegs++; @@ -1877,8 +1883,8 @@ find_library(const char *xname, const Obj_Entry *refobj, int *fdp) if (strchr(name, '/') != NULL) { /* Hard coded pathname */ if (name[0] != '/' && !trust) { - _rtld_error("Absolute pathname required " - "for shared object \"%s\"", + _rtld_error( + "Absolute pathname required for shared object \"%s\"", name); return (NULL); } @@ -1957,8 +1963,8 @@ find_library(const char *xname, const Obj_Entry *refobj, int *fdp) } if (objgiven && refobj->path != NULL) { - _rtld_error("Shared object \"%s\" not found, " - "required by \"%s\"", + _rtld_error( + "Shared object \"%s\" not found, required by \"%s\"", name, basename(refobj->path)); } else { _rtld_error("Shared object \"%s\" not found", name); @@ -2040,8 +2046,10 @@ find_symdef(unsigned long symnum, const Obj_Entry *refobj, if (def != NULL) { *defobj_out = defobj; - /* Record the information in the cache to avoid subsequent - * lookups. */ + /* + * Record the information in the cache to avoid subsequent + * lookups. + */ if (cache != NULL) { cache[symnum].sym = def; cache[symnum].obj = defobj; @@ -2110,7 +2118,7 @@ gethints(bool nostdlib) if (read(fd, &hdr, sizeof hdr) != sizeof hdr) { dbg("failed to read %lu bytes from hints file \"%s\"", (u_long)sizeof hdr, ld_elf_hints_path); - cleanup1: +cleanup1: close(fd); hdr.dirlistlen = 0; return (NULL); @@ -2164,10 +2172,10 @@ gethints(bool nostdlib) } p = xmalloc(dirlistlen + 1); if (pread(fd, p, dirlistlen + 1, strtab + dirlist) != - (ssize_t)dirlistlen + 1 || - p[dirlistlen] != '\0') { + (ssize_t)dirlistlen + 1 || p[dirlistlen] != '\0') { free(p); - dbg("failed to read %d bytes starting at %d from hints file \"%s\"", + dbg( + "failed to read %d bytes starting at %d from hints file \"%s\"", dirlistlen + 1, strtab + dirlist, ld_elf_hints_path); goto cleanup1; @@ -2616,10 +2624,8 @@ load_filtee1(Obj_Entry *obj, Needed_Entry *needed, int flags, { for (; needed != NULL; needed = needed->next) { needed->obj = dlopen_object(obj->strtab + needed->name, -1, obj, - flags, - ((ld_loadfltr || obj->z_loadfltr) ? RTLD_NOW : RTLD_LAZY) | - RTLD_LOCAL, - lockstate); + flags, ((ld_loadfltr || obj->z_loadfltr) ? RTLD_NOW : + RTLD_LAZY) | RTLD_LOCAL, lockstate); } } From nobody Tue Mar 18 01:36:30 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGvZS33bKz5r3G6; Tue, 18 Mar 2025 01:36: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGvZQ6QkCz3w68; Tue, 18 Mar 2025 01:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usNIUYHEpW8jSn/IwUTxA0535p/ED0g7nK43jL6Ulxs=; b=OrU3Aiv6EiNB/g3I2ySqub7AbFfMCwcHmy386lc+V4DI30aXzp91BkacahimHZD9R4PlYt hb1WbenJ+gsOn68KgPpoiyQ3JM1ESBK+4rMR991hI+cE6Phq7mhT8RohN8ZVrRejDq1zQM YTe+fBm820rOfimKvKqsG8/LS727qeIUWcjTTKg37OZBufvxIozWwP1hgaTMYA4Ij4M3Pv wUyFYZpWj+ZTPn0N4dEyUgx7Ik/9pcJF/rOYh+q5ZkQ9ANwaI2cn0Lvv44MOF+xgRnZdv1 cFgRfCEj3EhRZ467Scf20TG1pkmRsQ2sAELP76OBn17ia2gYwLqAgB3FeXIFWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742261790; a=rsa-sha256; cv=none; b=PIHEqee0apu7PYefvaTFJBPB4M0i0MPuK8VeU0+vyS77YFQ36oQ9y0vSCA/tgjnRTLXwOa i5S3GmSqf2bWEqMoBmXbv0vizX6vBzTXiJqs+Y7YM29uVPmukNb5KiBOzCcM6XVIxMTf31 QcGPnWKN3EqRNDYnH2lrY1WY1hITr402mZ+fBIFCoXgrjjFdolUYzd2l5Pz2XTPUjrXrHW EtDFPDgDlYerEbl1NgCiCDMuWHT0/vucSFjFGIRY2izteYpKjy1p+sutgsEX8Bi4VJGEXT 85sghigAN0s9IzaXV6sIqjq3CapxcVQI/zeUpnOQaOjjbEqGxktQ65p9bpVQAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742261790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usNIUYHEpW8jSn/IwUTxA0535p/ED0g7nK43jL6Ulxs=; b=s0Z2mxKL1e2zoXGsQXbRv8s6mlgMKjlKAbTNhQtuYswdkqc4aZ9n2StKmCkie9MOIQ6Xln gSu7dFAaHuFytgkQOyiueLL1HjGfgQVzb4aY6nW5TPnOEhfniffoH0GUmLac7e6hmf2vvF /S/DNCwDg/q6R5c0mNd0nZLSAtyN+KgEcw3jZ+dSn+Y5Tflrf6oFHVgwYf93CduvgQHI+j zdZN05U1asnJZ2qWvjnr5B/Ud6BXUt1a5/Y3tCezG0U16wgvjnFh/55QyyQqPsGpXOdRGR pObHRAMDdQ68Gl+E/PB3DIRZbcsPzlHeMLjDZE1MT46AR5noAzYHSX6yffNnrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGvZQ50hyz1B8B; Tue, 18 Mar 2025 01:36:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I1aU6L098089; Tue, 18 Mar 2025 01:36:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I1aUV9098086; Tue, 18 Mar 2025 01:36:30 GMT (envelope-from git) Date: Tue, 18 Mar 2025 01:36:30 GMT Message-Id: <202503180136.52I1aUV9098086@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 12bff22669cf - main - .git-blame-ignore-revs: one more revision for rtld List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12bff22669cf24d8e7323aed8b89d61d6dc1e9fb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=12bff22669cf24d8e7323aed8b89d61d6dc1e9fb commit 12bff22669cf24d8e7323aed8b89d61d6dc1e9fb Author: Konstantin Belousov AuthorDate: 2025-03-18 01:36:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-18 01:36:05 +0000 .git-blame-ignore-revs: one more revision for rtld Sponsored by: The FreeBSD Foundation --- .git-blame-ignore-revs | 1 + 1 file changed, 1 insertion(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 7a8f6bbe90b7..a2e4845c1e59 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -13,6 +13,7 @@ 986c96b54b9ec1118d285b723f53c7451a4c0772 3a85aa6a1d8916082155867ce0545a07185e8924 78b5dadb58e201e51a3a2eda5cf8cab6d31e0b62 +1c8cdd807a9487aac532ef44f78bf53fe8ec4ce2 # whitespace fixes for sys/sys/kernel.h 5c623697d6011de63bc762560a648c09379e06d2 # style fixes for iflib From nobody Tue Mar 18 01:41:48 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGvhY1gD4z5r3SS; Tue, 18 Mar 2025 01:41: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGvhX3WbVz42Tb; Tue, 18 Mar 2025 01:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742262108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSymW7eVOsCqv5pqqTEfdNVKeFvEDwcgKaQzU6KoDe8=; b=m/h8l/oor9hJD3m/arhH4iuADO+9tJxXxeHWuFJcDY54VOJZg3Vnoz3gxJ7AYzGIhUH2CA Rv2TB9UVXWnCYLbLC5j1MPAVuDtRle/pcNNrY2V05MtLiFbfK6rP3t1ezI2ZGLr0s063tD rlPiRJsZYhWCmg97CbVlwYpjHoUrodur7GxZEu9MqGqM2fUrFhUtFYc4yiEhk0AoHCLZkN CNIIWB75sPXU+qTtwsZa61w90l+DTgqPlvGx/dm884KNI+3UpaFcW3hmYYWbw/xXbh8Hey YYQjaOihF3tR7OlITLWeqq5+qiM0VazCjXLR3Hcvy5gjOS0BBFUrbBmSBKIXVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742262108; a=rsa-sha256; cv=none; b=ueGGdMFGu8aQ8djhygGw/43iaXYjYqpuqXEpne+83dvJgF+WRvivd44X8O3h8aEown6mqX BhZTfp7ScdoM9yn9wH0wued10DLFLkRR9sCJp3C52VH3v04q8p6K4ArTx9YdcTzL54oE6v SqHjEaYyVKC1vCXsPfUR0xKWUZyLFarpGEzK5OARU7VeDbrOUEyhd1zTGeiR1qgHAABswA WP5/GfGu068bjN4UlwP1+ZmM9IX7YSqr27rw1FIJIkxcV1V6XAp39SON7PxK8b/uA9iDAv fRKXBIW5gSTGqMlcAlQPo9fHbvJamwbkpymFSgnrs/FTwUIix/HVkVWzMccf4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742262108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xSymW7eVOsCqv5pqqTEfdNVKeFvEDwcgKaQzU6KoDe8=; b=W4IXA86whRB83wnDVENftVQyTPZrbQOy9yLJDYr3E+p0AyGZF6FeSSdUKcZouwbCcjtAKf IU8z8bHrTGU83RcR0RHOkf5dAW802mSw0GeV+wsm2C2vYAsRRmOBUquKEesF844MtV6yDi uiBLNtZC38MxBFURmTDXgBuQA2Z3MXKx7R/Yphx4Dk0+HWFMr94EpA803vGX31UXEOilLx TwqXYsewnWw+WqeALIDVg4apIlVfRhYbr5sN+zWiP9eKfXp1JmJh/2jh3mEf7/QaNZZDf0 AZ2ehZLogBUfQjydC6z3/0SzF6UnL347u4kt4LWboki3ZEYq8q6F8R3iOvsNwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGvhX2q4lz1BVv; Tue, 18 Mar 2025 01:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I1fmUj011351; Tue, 18 Mar 2025 01:41:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I1fm96011337; Tue, 18 Mar 2025 01:41:48 GMT (envelope-from git) Date: Tue, 18 Mar 2025 01:41:48 GMT Message-Id: <202503180141.52I1fm96011337@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 8a78a9aa99d9 - stable/14 - mlx5: Fix BlueField-4 device description List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a78a9aa99d9bed91bc2bd8084a632d7ae8bac3d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8a78a9aa99d9bed91bc2bd8084a632d7ae8bac3d commit 8a78a9aa99d9bed91bc2bd8084a632d7ae8bac3d Author: Slava Shwartsman AuthorDate: 2025-03-09 12:31:17 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-18 01:41:18 +0000 mlx5: Fix BlueField-4 device description (cherry picked from commit 7008b9fab5552fd6dcf5a00cd2c62144d54ef3a0) --- sys/dev/mlx5/mlx5_core/mlx5_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_main.c b/sys/dev/mlx5/mlx5_core/mlx5_main.c index 95d88c728306..94d0bd3be745 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_main.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_main.c @@ -2129,7 +2129,7 @@ static const struct pci_device_id mlx5_core_pci_table[] = { { PCI_VDEVICE(MELLANOX, 0xa2d3) }, /* BlueField integrated ConnectX-5 network controller VF */ { PCI_VDEVICE(MELLANOX, 0xa2d6) }, /* BlueField-2 integrated ConnectX-6 Dx network controller */ { PCI_VDEVICE(MELLANOX, 0xa2dc) }, /* BlueField-3 integrated ConnectX-7 network controller */ - { PCI_VDEVICE(MELLANOX, 0xa2df) }, /* BlueField-4 integrated ConnectX-8 network controller */ + { PCI_VDEVICE(MELLANOX, 0xa2df) }, /* BlueField-4 Family integrated network controller */ { } }; From nobody Tue Mar 18 05:02:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH0832spGz5rGdM; Tue, 18 Mar 2025 05:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH08322nXz3qBp; Tue, 18 Mar 2025 05:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742274147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0b23t+9lYbDPRjLDhJC4bDNsomXU1Eu94HYsHVsik9w=; b=p1FCO9Dq8hQZVHihb3sXdRzxRcLk/PQLxOl+eXANjjuFQebZW75X/2/N9FBO3QWMnLHvtH VxXbS1x24o0DkmrZmFGsRn0XDwo0L/HUu9zCoyXIw6fxbNxlpXOIuNtD/cvHK7tgQPJLhV bWyHceFboGPUJwdW49ywBR7cwEg9vkSrA0RFA7sxjHz/4GQQugn+b1ofpK/Sj9qXHeEo// o+cFeWQzoAzt+odfT4V1m++EMr1FLaGKaOD5vvbW2QS9+u33CXlCSFgjvezKy8BZWOBJkF 08cGzqEZsKxVOvvEqZaOyJK8rNWlV/0pwW4AxeoExnP5zaK1jlH0H+MmWnAUBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742274147; a=rsa-sha256; cv=none; b=JLqvon/qAYp7lPaXoAkPBrrX4lhL5/DZ4JE+Hv+YNqzUH3fgr0LGbnyS2a9i2yxkuB8XaN Xx7eJ5uk4oiSw+fg8vshs+XkugkPONlqJ/edukwlSf8AUFcu80x/ScivzTV9GgYkULEh0Y nOZxIwYw92xKpsxu+us4fYrx6NmHaHqZ74ViejbNzsUqRwT77VB55bmy575B8YVAn5ZyQv m0VMm3gJNfgCx3mGC/4equMbqqbwl67UzemU+Ourq2ES1NYVRQJ0Cfoeaty36pS4d2MuZ7 Q0i+aHecFFMveSztyG/fUVQAtkCOoVxCbT4L0hMOT0YLXxoRVfI2FcRvvaQIYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742274147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0b23t+9lYbDPRjLDhJC4bDNsomXU1Eu94HYsHVsik9w=; b=jcaqSUYLex3IzJHZT4lXGmfNfVQ7XHFTLCxT+eLZG6qwBqr/R2GLOXxGa52TyTsOHfZvkH 7Klx3SzWBpPBq13SxG9Lc8STbknvLMCqr6V615GrWNN/24dHdb+e7uVSeAkTe0ryOmSLO6 SidWJ5MaanNRQLy/wEhTBcSIuORPy0O2EryBfjwk6p2OQlUmQGQV33c3zjB93QGkVP3d7f KFF9LJyWJ264fDmKXkCtLkcw3BMftag+On0flYmcBEi3frVkliYxQtwnilpytnsSoi3gUH OX4/EsBCktxokBWcQOceS6YfQff4eobS1N5rdwklcXu2F1jk6nUNrJA8N4vj8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH0831YgVz3kZ; Tue, 18 Mar 2025 05:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I52Rop089673; Tue, 18 Mar 2025 05:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I52Rrn089670; Tue, 18 Mar 2025 05:02:27 GMT (envelope-from git) Date: Tue, 18 Mar 2025 05:02:27 GMT Message-Id: <202503180502.52I52Rrn089670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Wei Hu Subject: git: 64610df59348 - stable/14 - mana: remove redundant doorbell in mana_poll_rx_cq() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 64610df59348c5f72fcca56b46a4a2909b41c471 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=64610df59348c5f72fcca56b46a4a2909b41c471 commit 64610df59348c5f72fcca56b46a4a2909b41c471 Author: Wei Hu AuthorDate: 2025-03-14 05:26:45 +0000 Commit: Wei Hu CommitDate: 2025-03-18 04:53:56 +0000 mana: remove redundant doorbell in mana_poll_rx_cq() With the last commit to refill the rx mbuf in batch, the doorbell in mana_poll_rx_cq() becomes redundant. Remove it to save a few microseconds spent in mmio call. Reported by: NetApp Reviewed by: Tallamraju, Sai Tested by: whu Fixes: 9b8701b8 ("mana: refill the rx mbuf in batch") MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 47f4137e44b8079c7784604d220a298db07a19a1) --- sys/dev/mana/mana_en.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 1df5419e6c64..9eeaec11d1b2 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -1890,13 +1890,6 @@ mana_poll_rx_cq(struct mana_cq *cq) mana_process_rx_cqe(cq->rxq, cq, &comp[i]); } - if (comp_read > 0) { - struct gdma_context *gc = - cq->rxq->gdma_rq->gdma_dev->gdma_context; - - mana_gd_wq_ring_doorbell(gc, cq->rxq->gdma_rq); - } - tcp_lro_flush_all(&cq->rxq->lro); } From nobody Tue Mar 18 09:10:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5fp5mtkz5qKmh; Tue, 18 Mar 2025 09:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5fp52F4z3wY1; Tue, 18 Mar 2025 09:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ynYCcIDaj+zgUq6SUziRsfNrgQduRbx5Yf3pV8IoyA=; b=fzNnlJNah6bMxqecrSby7ug2nkm0Kyy4PmIsiLjB+h3JYrsJdkImzCqTmB+VuOlUqt+30g KWRsJ47oxaDLHB0Z8i0dut/Y6l4Oly0nyV+28JvtO3UxDVAjJ2tGq/JwUVtNHsIFfq9ZAC 1q717BsaRF8U1utbAeHMf8YBfLeL0tgGL5tceMY1LInvTqUHIfRdndeYtbIT5gkCqpnc8g 21N3xkm+5mtEkcQfi2U5u5r5yhPByYihFg9whdzBAg+u8hhDmZOPSiAU2/jAVosgVI09AQ D+Lqedfym1uHbJ3zHG/H32IDADN6WgC9Lt4hSPDDeA6P2TDdT+ADtXv92BJ+4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289058; a=rsa-sha256; cv=none; b=pm27LpJOTwJwc9kmofY7wg/o56wKMFFhaxIpf0JIK7jALloJs/4WOMzl8Th75dY4llYsvB LMEOnnZ70Ukx5dEpt0HDONJsp2ji/dngSMfRAwWqLjqWc5yiJPGFDsV8y4B2jyU5dnyHrq VYq+tvlLSolnnGy/6Kz0F43KRuTFH2h7X6lFg+cpg2ns1Rbf37UuUAfS+3FTRs5MxoPSAL vmvx3et/yohHywKcpvS2Vi2bckrtipoZ1OEl5eTYXpqA6XUFiasSLAHqXazZvf4BNpenu9 AADXOrE7YfmeocdBx07eHeO7sQ5Advxt8eTwUi7dXV919SAT3JpzF7tnDlcvvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ynYCcIDaj+zgUq6SUziRsfNrgQduRbx5Yf3pV8IoyA=; b=ocBuENvBz1FN7tBWLVUL9EYJr7SYanXpqcY/dHNeU5OB8cJoD78aZ/7Kbq4yAQw2263D3Z jT6/9AXLYrt5HoPuSpS0bEdQPitZSrk1vzsHWNB0O88M6PL8j931K4goj/SaRx+NmsFNtm aHvZqUf84JHYjN69S5nOD4WLfOm8PhrYeTulvlrSzUSAyaqSFzfjasRoL3HmGEXwSukB+H oV/D5CTDpYcgXj1sJHdn12yq+sefyMeiJhHbqFGfCQTaXtMrgH+lg1cZgP7rocOehL51wG N2iymFK2YKXCqHBusU7WySwXZNgH/Xj2Lm8u8ThZ1CGpDAjqDoSkIAe+rPUSzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5fp4bH4zBBN; Tue, 18 Mar 2025 09:10:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9AwZ7051482; Tue, 18 Mar 2025 09:10:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9AwtY051479; Tue, 18 Mar 2025 09:10:58 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:10:58 GMT Message-Id: <202503180910.52I9AwtY051479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 01ade56eba14 - stable/14 - routing: do not allow PINNED routes to be overriden List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 01ade56eba148f9fbd33eb541d9bc8bdb3bd90a2 Auto-Submitted: auto-generated The branch stable/14 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=01ade56eba148f9fbd33eb541d9bc8bdb3bd90a2 commit 01ade56eba148f9fbd33eb541d9bc8bdb3bd90a2 Author: Andrey V. Elsukov AuthorDate: 2025-03-02 10:53:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-18 09:09:33 +0000 routing: do not allow PINNED routes to be overriden First configured PINNED routes should have higher priority. Fixes: 1da4954c92ea Differential Revision: https://reviews.freebsd.org/D48650 (cherry picked from commit 361a8395f0b0e6f254fd138798232529679d99f6) --- sys/net/route/route_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index e5ddd7782e1e..5a04e9dcf6e7 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -821,7 +821,7 @@ add_route_flags(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data /* Now either append or replace */ if (op_flags & RTM_F_REPLACE) { - if (nhop_get_prio(rnd_orig.rnd_nhop) > nhop_get_prio(rnd_add->rnd_nhop)) { + if (nhop_get_prio(rnd_orig.rnd_nhop) == NH_PRIORITY_HIGH) { /* Old path is "better" (e.g. has PINNED flag set) */ RIB_WUNLOCK(rnh); error = EEXIST; From nobody Tue Mar 18 09:12:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5h71kxRz5qKdh; Tue, 18 Mar 2025 09:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5h70k27z3xnS; Tue, 18 Mar 2025 09:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBxGeJmtePEi9bWaTRRrOAZLZ+3eyBgOtdYocIaAR6k=; b=GoAkdyyNtWUip4g4wnPx5gO0yP2dWUbMmcjhAeS9q2kW43s7m37JkXq/7N061cORMpFD0E BbPdjOFiP1Da5dAWYDbdGx614DaKwXSFGTv0LZzlL0Vsewvoh7BIuRTr4hd5uZhrZW1bfu yFwXOcbF/NZAe+MK4pwkPFUTxYHzbVn1ZBJxFdNhvQbOwsS0xzZPJ6EU9TTMNFuwhnzvG2 Dx4uFp+92kofnlMJHWY7gS2jE/1XrfimJNL7clUpoGonLdC77pVgDa0DCzZUu2E8I1i9+z C58fUjxQ9mIMwFGrdnKcrrWXxv2QnuADgtTSFLepPkFY0RKd01ZfM4x8u08ILA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289127; a=rsa-sha256; cv=none; b=FPJrzQnSZJ+wpuOtP1FkaolOoQtUMMyW+dnBvRTk7ukDQ0heFYJrVfRiQvwZ/pval+giM1 9XLv5O62MzqYei/r3NitWM4/z69sudxEQgWxxgxvWbJNkdkCPEclNUPJFPfrM8xneVL6xP pso7adlWoaWaOY5BzbtaGayJzdZH12e4ovlPPVQBwrh8mQ+qsAtwG4Qk2+WW9UfoHb92iR oY9+6po73B3FEvRZK9BvFJcRUXtSZyY4X9KB72YY2WPoqIN3+dEjl6LVNrbB7Wki2QpL6j JgmogsVWeZSvO12V6Ji3Dq3/ySpb2ar5oXGAXutRgfefAs9WCUXfkBAaJkRoxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gBxGeJmtePEi9bWaTRRrOAZLZ+3eyBgOtdYocIaAR6k=; b=ddJcZWI3C37A8b2/vvX0BzwbbyLIgK4N9hjjLIGcEnh2z0pQEwOV2vvcwHK+cFG7gVUhUc dvn0mzZ2mrBH11JWAaV7HlQj4QPTCd7my27Mq4Y9FsrTqXrouyDEg+7W/OTK20sCKuAeyN s3vlkWP4axASdY5Gfb1JoUFxW3hr7vZcAUB3DY2atUnPlhRLgvi+H/tohx0Q3IfaIEBsUU fHRzdZLslWr/46bgE6LRSf7zjs1ouUIxbxeVB8QCVI5mefZA1sxJFrtRf9LuScvepnRS/p txPDfUeD2RVTV/EVimv8ciZaZOlf5oMnHDZ6NO6vHnE5glzaJmpL2w7M/Ve45Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5h70J7Nz9xp; Tue, 18 Mar 2025 09:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9C6OL056805; Tue, 18 Mar 2025 09:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9C6fo056802; Tue, 18 Mar 2025 09:12:06 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:12:06 GMT Message-Id: <202503180912.52I9C6fo056802@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: b297093ebab6 - stable/13 - routing: do not allow PINNED routes to be overriden List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b297093ebab6a16f23cebeeb1dbd7470c13db004 Auto-Submitted: auto-generated The branch stable/13 has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=b297093ebab6a16f23cebeeb1dbd7470c13db004 commit b297093ebab6a16f23cebeeb1dbd7470c13db004 Author: Andrey V. Elsukov AuthorDate: 2025-03-02 10:53:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2025-03-18 09:11:37 +0000 routing: do not allow PINNED routes to be overriden First configured PINNED routes should have higher priority. Fixes: 1da4954c92ea Differential Revision: https://reviews.freebsd.org/D48650 (cherry picked from commit 361a8395f0b0e6f254fd138798232529679d99f6) --- sys/net/route/route_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 712e912189a5..0ebda049dc1d 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -806,7 +806,7 @@ add_route_flags(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data /* Now either append or replace */ if (op_flags & RTM_F_REPLACE) { - if (nhop_get_prio(rnd_orig.rnd_nhop) > nhop_get_prio(rnd_add->rnd_nhop)) { + if (nhop_get_prio(rnd_orig.rnd_nhop) == NH_PRIORITY_HIGH) { /* Old path is "better" (e.g. has PINNED flag set) */ RIB_WUNLOCK(rnh); error = EEXIST; From nobody Tue Mar 18 09:22:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5vm2YHwz5qL1m; Tue, 18 Mar 2025 09:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vl6xPbz459W; Tue, 18 Mar 2025 09:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjZgQayx4wLq4JfDnWNsT/2Yjn/DCufEPJWq8gM5LAk=; b=P0JTXlCpE338Er84d3yVF9u6TgQohocdcsYWWrTDDVJPtdRRUFRiK3roDOV0cjdzJa9UlI Ndov8OxvZtyjbYOlVgzDGRxwh7eXJ6N02XmxzPRcY+bMJfGtBD3L/rttoXwAi36OpmhpS7 j4Z3SRDgEqQrJZgIkugFOU0ffbVDZpn1cwlbDlMrB8ZvsxDFf2g6TPoATyjc8hJ5hqsj+/ hqLFDWKMdyoF5ZyhCwBVl4bMmcG5tAzcxyohklV583yH3gyx/QVoCvP1FOXsgDhYHZBgH6 e3MswQG3GNAzQOzvgQZLwT0ek6c7k+EdHlZ7JJjQrsijz7qV4vZi+Sc4V7xccg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289732; a=rsa-sha256; cv=none; b=qU1JRPlyjWXeGbFONoNPyR5KIzmttD+f+6iPnDNuSqXKv9rN4OWxykNaUomk5zM/k3d/Ra DxNHx4OxgCd7bvL8E5Ao/o9K2yAmtr8vRivzyXMGnYj0RINTkfS1SdBYjI+9COxoxSEvHa Xko2HTbxjVapnCx7LtI4XtAsB9sUfaATEGxacbA+l6k5lruInnBPz/yaTKkC5uTSReUh+K zzQCMXBkUU0GRrT9HoJWjwQoZzoSj9gD0h0hhPvFak3uVYoXv/LVr8uL2G8FMwDa5VpYhB V7+Mfjj4G75ruVbM7yfdtJuJNFfnartwilNYoHsr/HIB01HUWdhi1W72aeFdbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QjZgQayx4wLq4JfDnWNsT/2Yjn/DCufEPJWq8gM5LAk=; b=ixCmM3SQnf3Qi1I00xJTYV6llZlwi1jOyQbHQGeEaTfAEvoIsp/owJE341phoXL6objR0d 6RMbDVhzErhQRr7SvX+nEZZqoi4ahYxsbNoFOhDr7smdmEHOKpaZTsBn0KkXp0JUcIVZed dogQdYrbbsEUSL34JMAKQzsirwfXP1tprwmQxsq7OAp21KyWxhfAktWy5VHO1GHPCHjFfx XLKciXyAMxBYtQ/H/LN4KW05ug5h8ul1Ax9LkJRPij3i0Oa4gYw2BiDF11jwiPF0Nyt8hq AyEjZKoa6BnuTEKFZPoKhPN0IikzHFf+//6GL+ul2I0laHNwPDPkIUdS01oCbw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vl6Wx1zBGD; Tue, 18 Mar 2025 09:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MBX0076184; Tue, 18 Mar 2025 09:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MBjV076181; Tue, 18 Mar 2025 09:22:11 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:11 GMT Message-Id: <202503180922.52I9MBjV076181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0461600deaa2 - main - net80211: correct IEEE80211_KEY_BITS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0461600deaa227050fbff60274ba72ab3a407bcc Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0461600deaa227050fbff60274ba72ab3a407bcc commit 0461600deaa227050fbff60274ba72ab3a407bcc Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:22:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:31 +0000 net80211: correct IEEE80211_KEY_BITS Not only are some of the bits missing, \4 and following were also off-by-one. Correct that so we can use them instead of reading hex numbers. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49366 --- sys/net80211/ieee80211_crypto.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index b69df0cff3bd..5a365dd37aa3 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -118,8 +118,8 @@ struct ieee80211_key { IEEE80211_KEY_NOIVMGT|IEEE80211_KEY_NOMIC|IEEE80211_KEY_NOMICMGT) #define IEEE80211_KEY_BITS \ - "\20\1XMIT\2RECV\3GROUP\4SWENCRYPT\5SWDECRYPT\6SWENMIC\7SWDEMIC" \ - "\10DEVKEY\11CIPHER0\12CIPHER1" + "\20\1XMIT\2RECV\3GROUP\4NOREPLAY\5SWENCRYPT\6SWDECRYPT\7SWENMIC\10SWDEMIC" \ + "\11DEVKEY\12CIPHER0\13CIPHER1\14NOIV\15NOIVMGT\16NOMIC\17NOMICMGT" #define IEEE80211_KEYIX_NONE ((ieee80211_keyix) -1) From nobody Tue Mar 18 09:22:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5vn3DFgz5qKqT; Tue, 18 Mar 2025 09:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vn0kvdz456v; Tue, 18 Mar 2025 09:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZX1QzkHVycICQ9qU1qdXkm+3lxvLQEjWHeo+04ixks=; b=OUW/rlnP2Uoe/3s6Eo31ge1+/ml9F7I9wPZ7oixMSVN9Ey6/iRZbGeF40Y/DnjPN6AQISF TvE/YQachXsU6V1tiMo2UJRgFRQt33wNH7KFu9/N49qg530c1bgaIHatlZ565ZNCJQETG1 WsfB4ua9DtLqM98tump/KLBEzphZbxuoRIIavasxDjUEJ2RjS4UQvEFNNhZ6IM/AzebIT7 K1iMl8e/1ezCA+SuFRlKSNYg9iWJVJ/pnZmXJ0hwHxanJhulkFkXmPBTumiTsgr5sQcJLu nSLmxjOyH07Td1hrEimgaAgGJRwhAeNH8BdZ4w5c8D34Mlbp7X0FEpMBx21ZIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289733; a=rsa-sha256; cv=none; b=tzleAfdtJMt9f8zLv0TKlHHqihaL+BO40E40FN4xe+C9k+QPmoHW8kj+QS/ab45M1g1TkS dn4hfEbAwq5Ad7g5lNMpYI4cJAGdF9mXkvcP984fBbn0B9NVk/n89urstRD51M0KIiPRzT 8eYXuyw2qS1NNZQq/3Gzj9uRyMkCB1FAWS7hOjA9d1Ec70cqtp0xWRv3Z2s4RvFkZB+mzf kYL6+z3Vxz+MLPv+Oe9cYYu9hfiOw3afXC+H/1iewkizRICjwBlJKaZDXPLhZqV5mqloyo NOH7dexpxGpZSbPQ+JwkXB0HsHLh1Bqfcq3+lXbA2KAZ3dOiv9XayUJk/ril+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=1742289733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nZX1QzkHVycICQ9qU1qdXkm+3lxvLQEjWHeo+04ixks=; b=lc+Q2WSZEydNqXAyCTrrLzV8nv4CntHPOlXh9FlQMEV2JRrVjz9JaZQAFmiEBZRRmlh1kD nOk9rmF3sPUEW1J8GzidBeDXtHDJwOY2LRlTLkdgWBublaEeLXj7tnp74GS1eCgJnN8vrq QA/WFncgP0fawlu/qKcYmBcXQs6y/+7TBRKxww5b8IyjBQrAUJmBjekZRDQJDvvuHSQsNr lH6ysMQ8UEdIpnajoE163v0HqHXyeeV6tN7SOsTg3f68eH2BOzhccCsxOjxPefLU98j8B+ HYX6p/XKVr6qUVCUV4utIiSxvpIC7TFShvTE0zGHJiKk2/Yd7ulmZGgaT+kCfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vn0LSFzBrg; Tue, 18 Mar 2025 09:22:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MCr0076219; Tue, 18 Mar 2025 09:22:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MCCJ076216; Tue, 18 Mar 2025 09:22:12 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:12 GMT Message-Id: <202503180922.52I9MCCJ076216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: db8ceb8e5948 - main - net80211: cleanup keyidx argument of ieee80211_notify_michael_failure() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db8ceb8e59487d1d6b2e019efab3eef40688731c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=db8ceb8e59487d1d6b2e019efab3eef40688731c commit db8ceb8e59487d1d6b2e019efab3eef40688731c Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:33:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:47 +0000 net80211: cleanup keyidx argument of ieee80211_notify_michael_failure() Instead of passing -1 to the function in ieee80211_crypto_demic(), use the defined IEEE80211_KEYIX_NONE. net80211 uses ieee80211_keyix not u_int as type for the key index internally. Use that. This also helps when printing the -1 unsigned as it stays within the expected numerical scope and makes the debug message more readable. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49368 --- sys/net80211/ieee80211_crypto.c | 3 ++- sys/net80211/ieee80211_crypto.h | 2 +- sys/net80211/ieee80211_freebsd.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index daa2e0c1d6ec..b1c8b750e145 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -800,7 +800,8 @@ ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k, * modules to handle a NULL key and not to dereference * it. */ - ieee80211_notify_michael_failure(vap, wh, -1); + ieee80211_notify_michael_failure(vap, wh, + IEEE80211_KEYIX_NONE); return (0); } diff --git a/sys/net80211/ieee80211_crypto.h b/sys/net80211/ieee80211_crypto.h index 5a365dd37aa3..a830d89c6dc8 100644 --- a/sys/net80211/ieee80211_crypto.h +++ b/sys/net80211/ieee80211_crypto.h @@ -273,6 +273,6 @@ void ieee80211_notify_replay_failure(struct ieee80211vap *, const struct ieee80211_frame *, const struct ieee80211_key *, uint64_t rsc, int tid); void ieee80211_notify_michael_failure(struct ieee80211vap *, - const struct ieee80211_frame *, u_int keyix); + const struct ieee80211_frame *, ieee80211_keyix keyix); #endif /* defined(__KERNEL__) || defined(_KERNEL) */ #endif /* _NET80211_IEEE80211_CRYPTO_H_ */ diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c index db118bc19d16..d3c8352ab411 100644 --- a/sys/net80211/ieee80211_freebsd.c +++ b/sys/net80211/ieee80211_freebsd.c @@ -870,7 +870,7 @@ ieee80211_notify_replay_failure(struct ieee80211vap *vap, void ieee80211_notify_michael_failure(struct ieee80211vap *vap, - const struct ieee80211_frame *wh, u_int keyix) + const struct ieee80211_frame *wh, ieee80211_keyix keyix) { struct ifnet *ifp = vap->iv_ifp; From nobody Tue Mar 18 09:22:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5vp4C5Bz5qL69; Tue, 18 Mar 2025 09:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vp20bGz459n; Tue, 18 Mar 2025 09:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyT9eZeMGP3bflHZn3QqJGe03T2Ns16hmEZgV0XuTnc=; b=fNIEa8kxP9ccplCkAGVPsylvhXLqNgI2WyFR8zt/47n4iiNq9hp9CtBJm143Xs0h/8qwnm umZ5EoGbP9AhtW/SzcAfQz+3g5caMqzGdZgZmIHhYY/5tHSXpwbejIrmYwiWn2TrEHxyy0 GsjhnwiZG2/NkH2KHTmoJYjiW6d5ttksj8G9EiFD3W+7VRTTbSSyTy5Swcre2jhlfOQ9Ei Gw13IThlQGDVMzSMRt9my4r2fMKxdNfZvZT22P6ObxOwzozzCLNhjz+lgMusZM4/aas6JK 9245iMBJCjQsDyMlgUWLLlMFVevI1bnOa0pTNRVzCUM6Yc3nTCjlDXC0OtAVNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289734; a=rsa-sha256; cv=none; b=kXEGitdstqjmWgzQ60FdK2Z6UyxmOjl/mbOSxo//3w8gY0z/XTrDcFRm3mdpxLkE4YM3r8 MjijcwqIYri+Djhkdg9WC4deCALLtorUavSmY7jqCs7SJDbTxP//dl5TeII3MJNa7EO9vW CGCri2cUqHs7nzc7N9VoV9oLC9xej/OrbYnJGVarfmrOgzy0skvqdXUJYHAOF0Vob+UdYd PpazZX5yz6xGupkGLO7qGUeUp20v/01+HWnfR0jUrLcPptUcevLtNB3MHzD47UC87ydTL+ X6dwF5FfUhozXAKpUMf4JNWHkwFRgjVxfazj74N/KKgYJwTWKrMDllF00kFq1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GyT9eZeMGP3bflHZn3QqJGe03T2Ns16hmEZgV0XuTnc=; b=fzaNV6JBvicAGF9tZW17Gc45hVLH4TbqviZprXT48X/stn1zTimGWjE2b+3SackbTDIAEO zJ3MFptJ+dn021bKNFEiE/o9jP9TMMH6s/toM4xZRFVayO9R4PFFj8AcqpPY41dLpOZTvV XRCVl4e8iTcf5GGWqcLozDYUZLimHPncpvwiWIRuqK4Ol9pbZ3qb87pkeg6SGYr10dJgtC bRzR0Io0GZBxCqCUsi8u4GekokV/rCPjWp3VoY3zKmRkDlgrAr0gY0d1McgKV9CZErGfke Trf1Xx5Yb0pQt7Qx26Opt8d6JX1HWVp6hXCpmeC6QfvPxZZ+RDBb6RfSjlUsFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vp1K0czBGF; Tue, 18 Mar 2025 09:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MEEm076254; Tue, 18 Mar 2025 09:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MEJH076251; Tue, 18 Mar 2025 09:22:14 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:14 GMT Message-Id: <202503180922.52I9MEJH076251@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 7513a0afe5fb - main - net80211: make use of IEEE80211_KEY_BITS for debug messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7513a0afe5fb26d30dbcae0347e43728e3511d3e Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=7513a0afe5fb26d30dbcae0347e43728e3511d3e commit 7513a0afe5fb26d30dbcae0347e43728e3511d3e Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 23:43:17 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:21:57 +0000 net80211: make use of IEEE80211_KEY_BITS for debug messages Use %b with IEEE80211_KEY_BITS for the debug logging in ieee80211_crypto.c rather than just printing the hex value, which makes some of the messages more obvious and avoids having the header file next to one at all times. Sponsored by: The FreeBSD Foundation MFC after: 3 days Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49369 --- sys/net80211/ieee80211_crypto.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index b1c8b750e145..600d69d6043b 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -466,14 +466,15 @@ ieee80211_crypto_newkey(struct ieee80211vap *vap, */ IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: driver override for cipher %s, flags " - "0x%x -> 0x%x\n", __func__, cip->ic_name, - oflags, key->wk_flags); + "%b -> %b\n", __func__, cip->ic_name, + oflags, IEEE80211_KEY_BITS, + key->wk_flags, IEEE80211_KEY_BITS); keyctx = cip->ic_attach(vap, key); if (keyctx == NULL) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, "%s: unable to attach cipher %s with " - "flags 0x%x\n", __func__, cip->ic_name, - key->wk_flags); + "flags %b\n", __func__, cip->ic_name, + key->wk_flags, IEEE80211_KEY_BITS); key->wk_flags = oflags; /* restore old flags */ vap->iv_stats.is_crypto_attachfail++; return 0; @@ -498,9 +499,9 @@ _ieee80211_crypto_delkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(key->wk_cipher != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b rsc %ju tsc %ju len %u\n", __func__, key->wk_cipher->ic_name, - key->wk_keyix, key->wk_flags, + key->wk_keyix, key->wk_flags, IEEE80211_KEY_BITS, key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -566,9 +567,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) KASSERT(cip != NULL, ("No cipher!")); IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: %s keyix %u flags 0x%x mac %s rsc %ju tsc %ju len %u\n", + "%s: %s keyix %u flags %b mac %s rsc %ju tsc %ju len %u\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_flags, ether_sprintf(key->wk_macaddr), + key->wk_flags, IEEE80211_KEY_BITS, ether_sprintf(key->wk_macaddr), key->wk_keyrsc[IEEE80211_NONQOS_TID], key->wk_keytsc, key->wk_keylen); @@ -586,9 +587,9 @@ ieee80211_crypto_setkey(struct ieee80211vap *vap, struct ieee80211_key *key) */ if (!cip->ic_setkey(key)) { IEEE80211_DPRINTF(vap, IEEE80211_MSG_CRYPTO, - "%s: cipher %s rejected key index %u len %u flags 0x%x\n", + "%s: cipher %s rejected key index %u len %u flags %b\n", __func__, cip->ic_name, key->wk_keyix, - key->wk_keylen, key->wk_flags); + key->wk_keylen, key->wk_flags, IEEE80211_KEY_BITS); vap->iv_stats.is_crypto_setkey_cipher++; return 0; } From nobody Tue Mar 18 09:22:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5vs1vWvz5qL6G; Tue, 18 Mar 2025 09:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vr3Zypz45GQ; Tue, 18 Mar 2025 09:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o09jWHKt/V5r1VzV3GD8acFk0q8WPIBlc+TOeROxvyI=; b=BI0LmnEmAnN02os0/SBZ+r2gxVjl7Ht/+GIrM0Y/y4iZY6A5c4ubabeZfkBkpiBxL8U0Ae d/bzwtHiIahd5a8ZfZqlImGHKNXGRSXEC/+GVe49SKoAwvVtgHcR7mKDOR1KdbjbodeTQb RX3n/nK24lk0fhwdGG3SdG+ba8Iy2jYAyah8N1McGagtG5tnwujhzW/Z4qwUH5awKl5bCl cH0X6QD5mHhHGMGwDvA9I60oOfi5ViYaUXeQsK4f6oo06foqADGjUlMnK2r23Zolu9dgJ9 yLNNikU1iXno5FKbQgB+R8lNIAd0k2Ksf4UTu4RkLPf03YY4e+8RNJaCU1m5Tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289736; a=rsa-sha256; cv=none; b=RPd76Wia7VK7krlYHJY6t8+gGU7FoEuiS5xgQmHkfzyMqp1stolsdLE5vNvGe/Q2aV88QD pKz/dLgZJVcfw8Jg2DpSAifEDEkDHHQPJQqn/AE7dtFLqJKXQd+jZ90NnyD6Z4sAUx/gJO cP+vrzyUcPrhznMEbIMoaNNrEaTT6LgUdoG5Pc4L3vFUbUwXG4M7Vzxa42b6VYvNIzRTWj 8clUWMhiP9IhFngnG4YoOCL94kOzhrIo3mb2vzXx2XakuK//TD3yQkapoQg4oy7GagPF3a M6/rjek/+UkzUO8rwaPUnQ7U3MT0OQtdGx9oAIvoKaXXDnWLt+09Q/AXRpzpYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o09jWHKt/V5r1VzV3GD8acFk0q8WPIBlc+TOeROxvyI=; b=SOtYhrY8uQBlU9wc9diS0ZwhMd4kClVEJKEMg/vDaaBUV7Ko04iEn5G7Yq6QQg703ezdXe sLHcGCvXdw2MXl12EJwZ/obgUvYJ0coUyecOalURnlucsAgFCKe0HiT4seN1jcrd51qOv0 saTaCfCEG3CvkLS6sp3a98ADpmaUo+Z6uG8V99gs9I2KapynuF2dVdtYAXi/9pjMpSdR38 78d55Ocd2bTxXl5NQipDhSYPPMw+AT0hRNOiSBPFcO8anF9gLZzkk16B3bucWzTrosNFgp 6NemGdWj/zMHH1xqUMgfzZe1gbBeWSx7lxBAr4QH1gLFNKmWL4jAHmpxTzZjhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vr2yxyzBrj; Tue, 18 Mar 2025 09:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MGWH076324; Tue, 18 Mar 2025 09:22:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MGNw076321; Tue, 18 Mar 2025 09:22:16 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:16 GMT Message-Id: <202503180922.52I9MGNw076321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 52a43041d2a8 - main - iwlwifi: make mvm/d3.c compile again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52a43041d2a864961f0a1a109a7a7c4c6ebed918 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=52a43041d2a864961f0a1a109a7a7c4c6ebed918 commit 52a43041d2a864961f0a1a109a7a7c4c6ebed918 Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:08:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +0000 iwlwifi: make mvm/d3.c compile again Given we currently do not ompile the file by default make it compile again after the last vendor import. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/mvm/d3.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/contrib/dev/iwlwifi/mvm/d3.c b/sys/contrib/dev/iwlwifi/mvm/d3.c index 0fbafd5f0dbb..11d9911eabb1 100644 --- a/sys/contrib/dev/iwlwifi/mvm/d3.c +++ b/sys/contrib/dev/iwlwifi/mvm/d3.c @@ -9,6 +9,7 @@ #include #if defined(__FreeBSD__) #include +#include #endif #include #include @@ -3702,7 +3703,11 @@ static ssize_t iwl_mvm_d3_test_read(struct file *file, char __user *user_buf, break; } +#if defined(__linux__) if (msleep_interruptible(100)) +#elif defined(__FreeBSD__) + if (linux_msleep_interruptible(100)) +#endif break; if (time_is_before_jiffies(end)) { @@ -3756,7 +3761,11 @@ static int iwl_mvm_d3_test_release(struct inode *inode, struct file *file) while (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) && remaining_time > 0) { remaining_time--; +#if defined(__linux__) msleep(1000); +#elif defined(__FreeBSD__) + linux_msleep(1000); +#endif } if (remaining_time == 0) From nobody Tue Mar 18 09:22:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5vr1FSJz5qKyq; Tue, 18 Mar 2025 09:22:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vq2g41z4574; Tue, 18 Mar 2025 09:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIBKJyJsdwr968Dae1vP6uf1q0xOabSdDdpZ409Fkpo=; b=FNwiAZxVaGKm/kyartaVUvhFtLZVBaRYYvQxIcxvmlWcyzWTyuTXRMavdcYddkDr2cayq5 YCi/hcdEVjRhUb0yTs7WpK6pOB+hHcdHyPpjuvrVE9JBW4Iwa2kAAV4V6DclyHf12qsmJ5 vQEWk9/66L5PZBVT8GlWFSYoWRIZEKiS79N+jR0K0PEn824QcFFLlSZBAHiW1MiuEFBl3V vgDVS2+xuy6Tkx170iC9bojEZfgBPILcM144ma7Fiy5rVGy4s6CnKIQAmIw3EKbhCeIFtJ qAg9ioylYLaSGX6OwtmXpz5/VeDltw3axPGv/XcDzgr1dJ4o3k4RkApBAR2K0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289735; a=rsa-sha256; cv=none; b=faKBoXgIjZQY2mMD5xUW8uuQk9YBUd1TtSLWVsY+jfngZpLxoY8wDL7bWl/85591lwdebG 90Hata+WelxswwBLHfcz0tUoxB7C+gEabqEH72Ha242ewFub0Q7gifxUFfNq9kDFJhGgis nb/D/TxGoYPIVV9vmwhiaJXWXFSumczYvIhjzRCMH2LGTQJelXAU4ricwjejrGOPq5X0ns mAJ0lGOxuMSSbxGQdepSSwBmqlkGoA1UmziElpxoqtSNiMxKhPCplYYJ9Xzyt73G/5rev/ Xo74ggIepn/IYn4S1kTL9UK3YyfwaU7ohoer2oIAhs4GFcFdGKlQmRPlf/GKAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pIBKJyJsdwr968Dae1vP6uf1q0xOabSdDdpZ409Fkpo=; b=cQ31wfGilX4PQcZtjejMFgHFZRqGTuHp02sibhvYBSVbYjY8GccVN94g6iYMU/rf6ThmW8 E5L38wTZCQVtemsJS1PhEiINWW5enFZN1zPJvtKYLx0mc3ivA72EMtriLGQUjAam/SAiRd ny/ajNkUZFUaXl27TOl3Fa1x+JsTvdPYU8vL4KCanjN4MfDHlNurLKFweo4gIQUqq7yqv5 UNtmdYXPDJ7XUm2ruypCJznZO4y1BkLCu2RlBw3WgCvSay9JtZKxio91vMXDWqHqXsdtAJ 1PC2V0nadojk4Yih2tRT/Sq3Y4cn1tgk5NNoFv92bwztsTlK8UigEvPPRlqkPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vq23mLzBb8; Tue, 18 Mar 2025 09:22:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MFS0076289; Tue, 18 Mar 2025 09:22:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MFPg076286; Tue, 18 Mar 2025 09:22:15 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:15 GMT Message-Id: <202503180922.52I9MFPg076286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c8a6676eb652 - main - LinuxKPI: 802.11: crypto pn lengths List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8a6676eb652b59fee545dc3e24ffec21bd0cd8d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c8a6676eb652b59fee545dc3e24ffec21bd0cd8d commit c8a6676eb652b59fee545dc3e24ffec21bd0cd8d Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:01:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:00 +0000 LinuxKPI: 802.11: crypto pn lengths Define the last missing PN length and for consistency use them in struct ieee80211_key_seq (even though a 6 is a 6 is a 6). Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 3 ++- sys/compat/linuxkpi/common/include/net/mac80211.h | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index ca1493e666c6..964fd970ecf0 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2024 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * This software was developed by Björn Zeeb under sponsorship from * the FreeBSD Foundation. @@ -64,6 +64,7 @@ struct ieee80211_mmie_16 { #define IEEE80211_GCMP_MIC_LEN 16 #define IEEE80211_GCMP_PN_LEN 6 #define IEEE80211_GMAC_PN_LEN 6 +#define IEEE80211_CMAC_PN_LEN 6 #define IEEE80211_MAX_PN_LEN 16 diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 9faf58ed6ee5..4dc1aaccb886 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -581,10 +581,13 @@ struct ieee80211_key_seq { uint8_t pn[IEEE80211_CCMP_PN_LEN]; } ccmp; struct { - uint8_t pn[IEEE80211_CCMP_PN_LEN]; + uint8_t pn[IEEE80211_GCMP_PN_LEN]; + } gcmp; + struct { + uint8_t pn[IEEE80211_CMAC_PN_LEN]; } aes_cmac; struct { - uint8_t pn[IEEE80211_CCMP_PN_LEN]; + uint8_t pn[IEEE80211_GMAC_PN_LEN]; } aes_gmac; struct { uint32_t iv32; From nobody Tue Mar 18 09:22:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5vt3b0Mz5qKwB; Tue, 18 Mar 2025 09:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vs44txz45B8; Tue, 18 Mar 2025 09:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t4MYd4nU6ufJkPIsEj56YdjJEtrOopyr93whi/i5ua8=; b=lALmvVh1I1dHy6u9Y4hQfeuPLDTftsG9tv+zzultRlQQA5578j7orhL4SlxFcpfKYwV4vr NnadGc7TXI4jiILx5zOS1odDTmR33+7HHJNsYzKnst+oLAcZmK0Km44vH3L0gvGMhDJdaW rTip0/bydlZbEVqrHwj9OKB7VDTRxpHLyO/WMTwtFTyTAflqmFc4Q4VxYklxiMzDxLJrPp dgDBhqp5EvUmhT3GDVxQ5cTS2q9gQQ8ExHDrzizO+E0JM8wBY9Q/Va0qI0+QOYuRhK76Dw elsFJQmEZBIt0jX4IMTNim3cghADHj+FnsLi0wYvJQnIAwX8oiiaHzZw7m9qDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289737; a=rsa-sha256; cv=none; b=mHOteDLAZIXgnYkM3FSWZ58m5XhEnUW66uvieZUz2E9wjHGYfIZpUtBvxIQUQ2ERZYbRsO G/N5lPiq8fi8xBDG/4RG7qwg/PX1tvAPGkhXQkrmdpMrzGqreVP47nvyV4JeuCRnp1b+dh kMKlAuEsvxHVFb/k6uNBSTmg4SAb5wJ6RWn2pJB3Of3X8ag7Ge/CBU9LRTUHQFIp3D0xBM u519Z59OU5+ANNm6cNsxo2sMdMyNgMKBD92/huHVxjfRSNpA25EEEq8sriU380aYlMyaRo /4byvtBs5bvAFWUY/JzhRIvFZBzftvl5LjnUbeIu9CuVdEeEGQl45tgAIMnmwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t4MYd4nU6ufJkPIsEj56YdjJEtrOopyr93whi/i5ua8=; b=oEhdH6UX3O4PtxGFxiURQJyCPzLNQtmwD4uLIyfzbYyeMzOwpXkEoep4v6LNmggPJHN9Za Si9zdPYeoxKTALOCvMHIGSq0S0VFpZHdqK7t7wtLH1wYxdz+nDmh0fL7xLsOs9dM1aFgLK E927smiVaBxNsfcRXwghCoHvq8lWdPvUrJyqy0LtfZShHdlTkNf3HVegdQIi3Vwkkkmw1r f0MaH+QB30b0NvhzomqPlrflTAMLK2S+DESfR9GZSNCqhTniOfey2x0j7zy+7trVvk8Cox /X307nH2Ep3wMLugXpBcC3Nw/pSdT7WbxZ7zXb8RexPCTugXDgLHUu+g/k+d8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vs3d7HzBGG; Tue, 18 Mar 2025 09:22:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MHg2076368; Tue, 18 Mar 2025 09:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MH9i076364; Tue, 18 Mar 2025 09:22:17 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:17 GMT Message-Id: <202503180922.52I9MH9i076364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 848fdcae0326 - main - rtw89: make wow.c compile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848fdcae0326db5b7c3edd2e8c264d25254abe1d Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=848fdcae0326db5b7c3edd2e8c264d25254abe1d commit 848fdcae0326db5b7c3edd2e8c264d25254abe1d Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:14:52 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +0000 rtw89: make wow.c compile So far we have not compiled wow.c given we do not enable CONFIG_PM yet. Make the necessary file local adjustments to make the file compile once further changes in LinuxKPI 802.11 code are comitted. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/rtw89/wow.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/sys/contrib/dev/rtw89/wow.c b/sys/contrib/dev/rtw89/wow.c index 9882064ef68d..8322c0763715 100644 --- a/sys/contrib/dev/rtw89/wow.c +++ b/sys/contrib/dev/rtw89/wow.c @@ -17,13 +17,21 @@ void rtw89_wow_parse_akm(struct rtw89_dev *rtwdev, struct sk_buff *skb) struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data; struct rtw89_wow_param *rtw_wow = &rtwdev->wow; const u8 *rsn, *ies = mgmt->u.assoc_req.variable; +#if defined(__linux__) struct rtw89_rsn_ie *rsn_ie; +#elif defined(__FreeBSD__) + const struct rtw89_rsn_ie *rsn_ie; +#endif rsn = cfg80211_find_ie(WLAN_EID_RSN, ies, skb->len); if (!rsn) return; +#if defined(__linux__) rsn_ie = (struct rtw89_rsn_ie *)rsn; +#elif defined(__FreeBSD__) + rsn_ie = (const struct rtw89_rsn_ie *)rsn; +#endif rtw_wow->akm = rsn_ie->akm_cipher_suite.type; } @@ -111,8 +119,13 @@ static int rtw89_rx_pn_to_iv(struct rtw89_dev *rtwdev, if (err) return err; +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx to iv-%*ph\n", __func__, key->keyidx, pn, 8, iv); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx to iv-%*ph\n", + __func__, key->keyidx, (uintmax_t)pn, 8, iv); +#endif return 0; } @@ -129,8 +142,13 @@ static int rtw89_tx_pn_to_iv(struct rtw89_dev *rtwdev, if (err) return err; +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx to iv-%*ph\n", __func__, key->keyidx, pn, 8, iv); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx to iv-%*ph\n", + __func__, key->keyidx, (uintmax_t)pn, 8, iv); +#endif return 0; } @@ -204,8 +222,13 @@ static int rtw89_tx_iv_to_pn(struct rtw89_dev *rtwdev, return err; atomic64_set(&key->tx_pn, pn); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d iv-%*ph to pn-%llx\n", __func__, key->keyidx, 8, iv, pn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d iv-%*ph to pn-%jx\n", + __func__, key->keyidx, 8, iv, (uintmax_t)pn); +#endif return 0; } @@ -235,8 +258,13 @@ static int rtw89_rx_pn_get_pmf(struct rtw89_dev *rtwdev, u64_encode_bits(seq.ccmp.pn[5], RTW89_KEY_PN_0); gtk_info->ipn = cpu_to_le64(pn); gtk_info->igtk_keyid = cpu_to_le32(key->keyidx); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%llx\n", __func__, key->keyidx, pn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "%s key %d pn-%jx\n", + __func__, key->keyidx, (uintmax_t)pn); +#endif return 0; } @@ -472,10 +500,17 @@ static void rtw89_wow_debug_aoac_rpt(struct rtw89_dev *rtwdev) 8, aoac_rpt->gtk_rx_iv[2]); rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] gtk_rx_iv[3] = %*ph\n", 8, aoac_rpt->gtk_rx_iv[3]); +#if defined(__linux__) rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_key_id = %llu\n", aoac_rpt->igtk_key_id); rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_ipn = %llu\n", aoac_rpt->igtk_ipn); +#elif defined(__FreeBSD__) + rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_key_id = %ju\n", + (uintmax_t)aoac_rpt->igtk_key_id); + rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk_ipn = %ju\n", + (uintmax_t)aoac_rpt->igtk_ipn); +#endif rtw89_debug(rtwdev, RTW89_DBG_WOW, "[aoac_rpt] igtk = %*ph\n", 32, aoac_rpt->igtk); } From nobody Tue Mar 18 09:22:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZH5vv0s4dz5qKwC; Tue, 18 Mar 2025 09:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZH5vt5y6lz45Gr; Tue, 18 Mar 2025 09:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SV/4j6aHbQyv9deVQAiqjCrlMxift0nWF4fvMbMgWw=; b=w9GmPjCXCex35N2Te4dxCRvnYvFWQX5NV7AaxwTdoBeBAJ7qP6sfRlE58ppsr6e/s1pH9Y ynIBhuHJiaHY5qooK3FRwtn6O89e9Wc9ShLqg5JY/yJ+i8DK9S37eH/gecO2txsH1+5lTX E3P3F6NCLq5pj2bEwpJbpFaDM/+W3j40dYdKjbHGGM+kxcs9czz/fLqVrlhtqtw1+wwVRE QHuSzPUsktLYhdnOlJpimJPGGwBmtpL9OFpgxc3W8cUyHFEw//R/lW7ZEkBzLCUKloh6wA Dq7swG4oe816rqB07FXKIUDg1cqhL8oBfbZqCoXqPOSENeoDbmJrU0XBG9TKEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742289738; a=rsa-sha256; cv=none; b=I3gwJVJL/CN/2dOoebwnfomuef48F64dma2gGgLK3SLGm7TR9op0hsK+iOyFRw8AT0SR0A Sc15GroLCoXHWkspN+gxMiimzcH5PMQ/Nz3sC2woO43StfZRJQTE/X1cbCG/FiOzTYTr1V 0aKUmGGlxFbvda6CXEf4jc+0/wfYnM7JgTItCfAQ6NmTHBc0FNQHkT2WC9h/94i3D+5XyJ C8CWETdpxqf0yW/Filvn1PcXWhyozXWV4LFMuivLt4MkUnUndKN6ElqoMrcHqaBhpHyq6w F/QmzV93ZsG8vrzE+RmtFhkd7qUOtadN1vLYV1/p4bG4matKSBbcKsSemAAsHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742289738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7SV/4j6aHbQyv9deVQAiqjCrlMxift0nWF4fvMbMgWw=; b=qvFImGIq0VIvWZTWbs5Dw3JPxBlK8PwSoG9a1dwtoDLm9B8YYZmNERTGiMGq71Nj+EPCje 1wSisCxmfAgiY/aqZ60N1DZYTDKuGlSlHbozTtd0DuXo8quQ4hMfBtjWfx/2BHJsa+eQQg X3phz+usL5Mpin+8UM6+2CLNkohP0ZzcJS7NCTSvTQwDiNu03qbr9uR4ON1XyjYdEg/0YR 2SZd+6YZoxO+2L2VlPm5zdrUSCzKWz7BnxxnRuDRi/hx3jSWaWH+YgqJtzM+BjAfs51kTh dZLwCz7GMAgIgfM4EM5GOEnbQ+jQxLi9PiU1ff4DlUbb7NHzjQTuv/nFaQa9dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZH5vt4jGkzBCj; Tue, 18 Mar 2025 09:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52I9MIB9076403; Tue, 18 Mar 2025 09:22:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52I9MIWW076400; Tue, 18 Mar 2025 09:22:18 GMT (envelope-from git) Date: Tue, 18 Mar 2025 09:22:18 GMT Message-Id: <202503180922.52I9MIWW076400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b42c339c59fd - main - LinuxKPI: 802.11: CONFIG_PM_SLEEP / WoWLAN header adjustments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b42c339c59fd00f2d97f6854b17b54b340019d0c Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b42c339c59fd00f2d97f6854b17b54b340019d0c commit b42c339c59fd00f2d97f6854b17b54b340019d0c Author: Bjoern A. Zeeb AuthorDate: 2025-03-15 00:30:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-18 09:22:01 +0000 LinuxKPI: 802.11: CONFIG_PM_SLEEP / WoWLAN header adjustments Sort out some (though not yet all) changes needed for CONFIG_PM_SLEEP and respectively WoWLAN support (so we can compile it in). This is just one further step towards proper suspend/resume support. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- .../linuxkpi/common/include/linux/ieee80211.h | 7 ++++++ sys/compat/linuxkpi/common/include/net/cfg80211.h | 26 +++++++++++++++++----- sys/compat/linuxkpi/common/include/net/mac80211.h | 16 +++++++++---- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h index 964fd970ecf0..efac2a26e27e 100644 --- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h +++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h @@ -147,6 +147,7 @@ enum ieee80211_key_len { WLAN_KEY_LEN_WEP104 = 13, WLAN_KEY_LEN_TKIP = 32, WLAN_KEY_LEN_CCMP = 16, + WLAN_KEY_LEN_CCMP_256 = 32, WLAN_KEY_LEN_GCMP = 16, WLAN_KEY_LEN_AES_CMAC = 16, WLAN_KEY_LEN_GCMP_256 = 32, @@ -507,6 +508,12 @@ struct ieee80211_mgmt { uint16_t capab_info; uint8_t variable[0]; } beacon; + /* 9.3.3.5 Association Request frame format */ + struct { + uint16_t capab_info; + uint16_t listen_interval; + uint8_t variable[0]; + } assoc_req; /* 9.3.3.10 Probe Request frame format */ struct { uint8_t variable[0]; diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 3454b58f1db7..2cdb96ffccdf 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1033,9 +1033,12 @@ struct cfg80211_wowlan_nd_info { enum wiphy_wowlan_support_flags { WIPHY_WOWLAN_DISCONNECT, - WIPHY_WOWLAN_GTK_REKEY_FAILURE, WIPHY_WOWLAN_MAGIC_PKT, WIPHY_WOWLAN_SUPPORTS_GTK_REKEY, + WIPHY_WOWLAN_GTK_REKEY_FAILURE, + WIPHY_WOWLAN_EAP_IDENTITY_REQ, + WIPHY_WOWLAN_4WAY_HANDSHAKE, + WIPHY_WOWLAN_RFKILL_RELEASE, WIPHY_WOWLAN_NET_DETECT, }; @@ -1049,6 +1052,7 @@ struct cfg80211_wowlan_wakeup { /* XXX TODO */ uint16_t pattern_idx; bool disconnect; + bool unprot_deauth_disassoc; bool eap_identity_req; bool four_way_handshake; bool gtk_rekey_failure; @@ -1066,11 +1070,22 @@ struct cfg80211_wowlan_wakeup { struct cfg80211_wowlan { /* XXX TODO */ - int disconnect, gtk_rekey_failure, magic_pkt; - int eap_identity_req, four_way_handshake, rfkill_release, tcp, any; + bool any; + bool disconnect; + bool magic_pkt; + bool gtk_rekey_failure; + bool eap_identity_req; + bool four_way_handshake; + bool rfkill_release; + + /* Magic packet patterns. */ int n_patterns; - struct cfg80211_sched_scan_request *nd_config; struct cfg80211_pkt_pattern *patterns; + + /* netdetect? if not assoc? */ + struct cfg80211_sched_scan_request *nd_config; + + void *tcp; /* XXX ? */ }; struct cfg80211_gtk_rekey_data { @@ -1244,7 +1259,8 @@ struct wiphy { unsigned long ext_features[BITS_TO_LONGS(NUM_NL80211_EXT_FEATURES)]; struct dentry *debugfsdir; - struct cfg80211_wowlan_support *wowlan; + const struct wiphy_wowlan_support *wowlan; + struct cfg80211_wowlan *wowlan_config; /* Lower layer (driver/mac80211) specific data. */ /* Must stay last. */ uint8_t priv[0] __aligned(CACHE_LINE_SIZE); diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 4dc1aaccb886..9830d8f16d05 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -42,6 +42,7 @@ #include #include #include +#include #define ARPHRD_IEEE80211_RADIOTAP __LINE__ /* XXX TODO brcmfmac */ @@ -1089,9 +1090,7 @@ struct ieee80211_ops { int (*set_tim)(struct ieee80211_hw *, struct ieee80211_sta *, bool); int (*set_key)(struct ieee80211_hw *, enum set_key_cmd, struct ieee80211_vif *, struct ieee80211_sta *, struct ieee80211_key_conf *); - void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *, int); void (*update_tkip_key)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_key_conf *, struct ieee80211_sta *, u32, u16 *); - void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_gtk_rekey_data *); int (*start_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); void (*abort_pmsr)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_pmsr_request *); @@ -1135,9 +1134,18 @@ struct ieee80211_ops { void (*link_sta_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_link_sta *, struct dentry *); void (*link_add_debugfs)(struct ieee80211_hw *, struct ieee80211_vif *, struct ieee80211_bss_conf *, struct dentry *); /* #endif */ +/* #ifdef CONFIG_PM_SLEEP */ /* Do not change depending on compile-time option. */ + int (*suspend)(struct ieee80211_hw *, struct cfg80211_wowlan *); + int (*resume)(struct ieee80211_hw *); + void (*set_wakeup)(struct ieee80211_hw *, bool); + void (*set_rekey_data)(struct ieee80211_hw *, struct ieee80211_vif *, struct cfg80211_gtk_rekey_data *); + void (*set_default_unicast_key)(struct ieee80211_hw *, struct ieee80211_vif *, int); +/* #if IS_ENABLED(CONFIG_IPV6) */ + void (*ipv6_addr_change)(struct ieee80211_hw *, struct ieee80211_vif *, struct inet6_dev *); +/* #endif */ +/* #endif CONFIG_PM_SLEEP */ }; - /* -------------------------------------------------------------------------- */ /* linux_80211.c */ @@ -2425,7 +2433,7 @@ ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *key, static __inline struct ieee80211_key_conf * ieee80211_gtk_rekey_add(struct ieee80211_vif *vif, - struct ieee80211_key_conf *key) + struct ieee80211_key_conf *key, int link_id) { TODO(); return (NULL); From nobody Tue Mar 18 12:59:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHBl30PGQz5qd3d; Tue, 18 Mar 2025 12:59:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHBl22V5fz3dWS; Tue, 18 Mar 2025 12:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742302798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hk7UqmxNvAebu29NRAL++ohwRnGnKnMTisQuTVJOmdg=; b=DkaHQ34icUJ6zMgVkIIDbSYfLRYhWDgAnD2qxL50LvEw/t2eRUHSZf8JPyh7gbgkZhtNAh BN3c8+IIal4xDGNmFo5mJQAs2/rVxb1taswki5i+j+sQ3hC4lyKk8kb5tAqxEy6IB0nSzR izYgncj9mKEVGXarwktkGhSiPlP+JqB6/w9bHCmc79GZbUgGPziSxQxapHzN6jJa2sBBRs tCu09tKkNCzv0TcxWhEalREp2Aqn+05SbBQ5Q5Rler8SLhVWM8Y4sOiucIYRGgd6KG4GUq mzzx2EyO2a0A4i9w3ZHWJmkFriOCAVbHlf4NXprOho1Ru+7HHjvL9DhG2M+UpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742302798; a=rsa-sha256; cv=none; b=FHXQd9oKWbSNHmGOY6HmXi03v3aFy4v7gBTrBvEN9u3bRIfaP1bNEWZ+DdJWOetwCOm433 CQx/BY9bR2QVWXYDf0lpZzXiR0jtONOqNu3ugZ3vO5KdpNPsynlA5dgubOaoK7g691ICke wxJ75CMJgXDspicRYG+t2LyOiYTVw8sj3bekql1wXMwjCxqHNd7o+pfzq1+UgIuZS8czpO KGHaX+bGUrPZvGoAJNg3pgPYs54v6ZoBzZoeIaTeLO4Myf1AcEqJdHqfEEaW4KKfEwvT6s 2pYNf0Q4W2pn5U3p5sIwmMKNpIohUsh9blkrsNDhmxtadJWszfOtJnL90yqwqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742302798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hk7UqmxNvAebu29NRAL++ohwRnGnKnMTisQuTVJOmdg=; b=w/0pVCZKgXUJVr2be9+AmUmM4mRIr7xzpwxz3z6Q8T/L00YfHh5PgR64Zqi9rSo+Y37IrP bpRGS3+XI0Jr9oxNqThC8WlqMc66myTVHiiT48t7Yk9YXt1maeQUBuwLANudDrOcVjmmKN rejYJl5kTlMkCfjoGB1aIdRB4sQNrwJf2O1aY1y5/x74cp5j8CCCtWUmC1FlC0QiddsAXI 46cQU0YKFxUNBw+mjhqyldmtYvjLh2kyI5FTpI67cpXDFbiTkcb0JmYJzbKpCxKHTEAk9r bFMnDbM9BTra8eJroqGORBXwmojkrEjPUSmwi0ZRm5v0qxRI4RmyMi/7gsZiLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHBl21zYLzZnj; Tue, 18 Mar 2025 12:59:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52ICxwP5073631; Tue, 18 Mar 2025 12:59:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52ICxw7u073628; Tue, 18 Mar 2025 12:59:58 GMT (envelope-from git) Date: Tue, 18 Mar 2025 12:59:58 GMT Message-Id: <202503181259.52ICxw7u073628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 235fe911df59 - stable/14 - include: add a userland version of __assert_unreachable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 235fe911df596333ea63152baa7ec4eecdeb7d12 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=235fe911df596333ea63152baa7ec4eecdeb7d12 commit 235fe911df596333ea63152baa7ec4eecdeb7d12 Author: Kyle Evans AuthorDate: 2025-01-13 00:41:25 +0000 Commit: Christos Margiolis CommitDate: 2025-03-18 12:55:24 +0000 include: add a userland version of __assert_unreachable The kernel has had a version of this since c79cee71363d ("kernel: provide panicky version of __unreachable"), and userland can benefit from the same. __unreachable is largely inadequate because it's *not* an assertion of any sort, so we're not really alerted to a problem that we could've anticipated. Reviewed by: emaste, imp, jhb, olce Differential Revision: https://reviews.freebsd.org/D48077 (cherry picked from commit 712f81feea416e9f8aaf040173883876a50a7d34) --- include/assert.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/assert.h b/include/assert.h index 54e1456b9e0d..b483465dfc5f 100644 --- a/include/assert.h +++ b/include/assert.h @@ -45,15 +45,22 @@ #undef assert #undef _assert +#undef __assert_unreachable #ifdef NDEBUG #define assert(e) ((void)0) #define _assert(e) ((void)0) +#if __BSD_VISIBLE +#define __assert_unreachable() __unreachable() +#endif /* __BSD_VISIBLE */ #else #define _assert(e) assert(e) #define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ __LINE__, #e)) +#if __BSD_VISIBLE +#define __assert_unreachable() assert(0 && "unreachable segment reached") +#endif /* __BSD_VISIBLE */ #endif /* NDEBUG */ #ifndef _ASSERT_H_ From nobody Tue Mar 18 13:28:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHCMW6cGnz5qfJx; Tue, 18 Mar 2025 13:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHCMW57gbz416c; Tue, 18 Mar 2025 13:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742304487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poXitXVh8TLh+TYXveA80Y3kA+BKDLIRbGn8RWRYiIc=; b=iEylW2yQainWiOopacI+Zz5NwS9EkgnhtBd4mHrDI+bivqSeI859xgKvKAax1lknt7IA5u o0KVpdr/ZEeR2VnV8BH2J1haQeTx1in2g+xL/Dc/GgeQFCiaw6lZAWU9IsSYQ79Fbx11oS F8Mwmr29/nO1Z/DMYzrhJugf6po73udVwIudOrCny0MELNEWV1MJTsVeHNJ18oBQcTC/UU XxN0p1VrsX3wA6c+U5x7fUughLB7PwkVr3oH/B4rXWX3ISfJqcVKsSmnulZT+AhGUGbtMh pxGuJ0s2STL4m6ied0Vhhtvj8wDbQbn7MImcxWWCImQ0AZX/LvW44npOlArTrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742304487; a=rsa-sha256; cv=none; b=Nu7IsPGIVSarK84r0kYnQ/tdqNOp9Z1gDUrzB1wGYzAf8yRvLiOgYDbTyUdsLnkmjeuFOU a3e5PReT4+VOKxQ3yp+lDxu/Uhc9XINsabGiIEXV8CtkU/vsWQgMp3gVWg6p+0Wl3OLIbI rsol2E8nXG5cGMvIq1YJOAuacyuboSP2TQzbDBfQpR0sqa+EbXmOrQ/xySwwGf1efTfcr/ IJuv/f7r6AgcXGsFltF1O7ohG9X/xFKC89Y3a3o0Ln6oNemJeeXvWTK2vKkuo9F/8P4H1F JT2Kakz3cYQC8C6z1w40OrTqNU+NYzVJw3kVMU0l+mLGkXeHXY8wI8PzAxPpTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742304487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poXitXVh8TLh+TYXveA80Y3kA+BKDLIRbGn8RWRYiIc=; b=aX1oS9I2RT0Wb8TvUUeA+avs4tsiVjTwcy67B3719q3VV7byuzaI/LRImb8OaMZ2LQ0y4G 4Ht5ymUSOih9jSaJKx4i+f8l9NC5sOz7jk2s2P7w3iCN/O2Ep98hueD+I18a+K36CunPG5 bF//KtVbJ6yGeamcGHXK5RsdkXJrftdNEFXTQvVEZU06TiisqweGn4+wl93nxaO6XW693P gErIug38X2ysW56mcu5FFEvn3bD6HVKO5iYUHNrN+tvY2HtlVlHbRt98OpCMrvZmXxF32s eM4CZpHX86PawkD3OS6DQd4aV2VVr6an75SRgRtoqprFXhvC91awZ9vDrHtPZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHCMW4KFCzbKF; Tue, 18 Mar 2025 13:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IDS7AZ029450; Tue, 18 Mar 2025 13:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IDS7N6029447; Tue, 18 Mar 2025 13:28:07 GMT (envelope-from git) Date: Tue, 18 Mar 2025 13:28:07 GMT Message-Id: <202503181328.52IDS7N6029447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 872c817d52d9 - stable/14 - linuxkpi: Correct DIV_ROUND_DOWN_ULL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 872c817d52d9a4e46cf3b9d34169c310fdccc91b Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=872c817d52d9a4e46cf3b9d34169c310fdccc91b commit 872c817d52d9a4e46cf3b9d34169c310fdccc91b Author: Lutz Bichler AuthorDate: 2025-03-12 17:20:58 +0000 Commit: Ed Maste CommitDate: 2025-03-18 13:27:37 +0000 linuxkpi: Correct DIV_ROUND_DOWN_ULL This fixes a black screen issue with the i915 DRM driver from Linux v6.8 Fixes: c4e0746e7d5bd ("LinuxKPI: Add helper macros IS_ALIGNED and DIV_ROUND_DOWN_ULL.") Pull request: https://github.com/freebsd/freebsd-src/pull/1612 (cherry picked from commit ef037a028af7cc331e36ca6c8e2eb5612cdb1130) --- sys/compat/linuxkpi/common/include/linux/math.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/math.h b/sys/compat/linuxkpi/common/include/linux/math.h index dad7fa7fbe9c..5a348a57747b 100644 --- a/sys/compat/linuxkpi/common/include/linux/math.h +++ b/sys/compat/linuxkpi/common/include/linux/math.h @@ -46,7 +46,7 @@ #define DIV_ROUND_UP(x, n) howmany(x, n) #define DIV_ROUND_UP_ULL(x, n) DIV_ROUND_UP((unsigned long long)(x), (n)) -#define DIV_ROUND_DOWN_ULL(x, n) (((unsigned long long)(x) / (n)) * (n)) +#define DIV_ROUND_DOWN_ULL(x, n) ((unsigned long long)(x) / (n)) #define DIV_ROUND_CLOSEST(x, divisor) (((x) + ((divisor) / 2)) / (divisor)) #define DIV_ROUND_CLOSEST_ULL(x, divisor) ({ \ From nobody Tue Mar 18 14:31:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHDmm0pmhz5qkVW; Tue, 18 Mar 2025 14:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHDml6m1Qz3qkc; Tue, 18 Mar 2025 14:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742308296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fb+MsjCzO9jOHntXm6hKLci+rQYzk5lFhaYN2CMSKg4=; b=q+az1UTN6dE+8GnghdvlhlQ61wm9W5DvoTdcdGvMHLcDbT4oC6e7ttth+DfbK4hiafwxZf VH6JK12OQ0vHS1vEwnjrJCxJGecqnsuUT0HMtVHF7tAAJXapPkbVRBUwRFZm5QrwLbYczk jaMnivo+uv4/6ftth8MCKoYDnP8G3PWJT+KYAzY/UbHqvKGLRayizqsGoxsEf0sZs6+8EW 0pIJbbSJWqvFY7Oc1gm2GrsOG1a0LXyI3/ThDft2RtgGN5PzuoaSxDG+4jyGnBxngrMuk3 LGvM0FmdenqwUUz1/EqlHfwgsIgKT2XZrZTELKsWFMIu9NORsdHe/Ga7Vp+05g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742308296; a=rsa-sha256; cv=none; b=pfk+wDdlDmo+Y94smxYa7iik9ZP71bi/ls/jub9vCfN+qB67ZIaUiniBBDQBpJ/KD2e2Ll T1tcOrf0A7mVvV/rnQkDpsx7SB8jg4lgvumvdMjww1/ZaHJj/rTl1sSW4pQKe2cbliEZ8E 9B9twhLPxDo7Kx626VRM4C/mYIfFtKK+P2bD7atvlLetKhnp9An5QoyoH2BVgUaw4M3OBd nVE34/IwGKYtC3YKq5h9ZAtwjNPd4TGHZ0BcsQ4ptEx0Xnkjr4EMrmKTV6dsrT47IKMwis QUibqryfOnYeA5IqU6QawCW+j7Wq7Od1B7nKya52THC7rVhM+ljntD10pPhZFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742308296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fb+MsjCzO9jOHntXm6hKLci+rQYzk5lFhaYN2CMSKg4=; b=km/fxRSdCyvPfRDKY7Hco83EJsH5o48X4j2rFAM2hGMJ0EMsqlhh4oJaBTbGOaziyg/Ytq C6AHVWQf+HHlOr78frAbu5aQ6S1RSfeljNbHnCxSCb8i+6uCFG5fhJbP5j3owSzDkN+hXY YlMg0shhaNojkhodNcr9jjknxggwos45Xm59fJbjqTsqn8/cgZj2m7WuhvdSLDGEexJnSL naWLU/umWciZbT05aqGdPM3XdNta+yU3dM/JacCzHpjcwXKKn4Na/44UWrjOBJbRW5hX3p tERLubNc9mKnWer+g8BAYbCASQ3wmyX9/TmflB1FHMUpq0iRUSKNpL+nDNy0iA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHDml6H05zcqQ; Tue, 18 Mar 2025 14:31:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IEVZWj054858; Tue, 18 Mar 2025 14:31:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IEVZHd054855; Tue, 18 Mar 2025 14:31:35 GMT (envelope-from git) Date: Tue, 18 Mar 2025 14:31:35 GMT Message-Id: <202503181431.52IEVZHd054855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 00f1ccf959a6 - stable/14 - inet6: add the missing lock acquire to nd6_get_llentry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 00f1ccf959a62865a563857f7ab34f81e91def1b Auto-Submitted: auto-generated The branch stable/14 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=00f1ccf959a62865a563857f7ab34f81e91def1b commit 00f1ccf959a62865a563857f7ab34f81e91def1b Author: Mateusz Guzik AuthorDate: 2025-02-10 14:27:37 +0000 Commit: Mateusz Guzik CommitDate: 2025-03-18 14:31:22 +0000 inet6: add the missing lock acquire to nd6_get_llentry Reported by: Lexi Winter PR: 282378 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit d6138a65405f697715189363b2b18581e7abd982) --- sys/netinet6/nd6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index e1fd421060df..887da1ebe21a 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -2357,6 +2357,7 @@ nd6_get_llentry(struct ifnet *ifp, const struct in6_addr *addr, int family) } else { /* child lle already exists, free newly-created one */ lltable_free_entry(LLTABLE6(ifp), child_lle); + LLE_WLOCK(lle_tmp); child_lle = lle_tmp; } LLE_WUNLOCK(lle); From nobody Tue Mar 18 14:38:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHDww0ynxz5qlPV; Tue, 18 Mar 2025 14:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHDwv6vxKz3vR5; Tue, 18 Mar 2025 14:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742308720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJ5hMOA+J5VkonZMgna2s4xNdI0if/4OiX7EcKlUCVo=; b=Kz1PsWL0N+ZcXeypUk1b7lBQ8fgznyEDUiNtltgNvEvtiCemPQ3GDrEcyMM8y1vqLxApHX 0iRq+q0Mmo3AyGIMZ5f8zK3nfReocf/nlRH3N6lzY+CCdDJjRCrLBwxhJ6HGYrtLFI2qEh 77GgeAIJFF4vjUqWLNB6p2P77IR8nApSCBQMCb6+H9kYNFxMEWhGpJhwpKY9yJJXPkpihx fZSp4qHsTgqTdgmQVa6WqbEFUnXc2eY1o2Fhc1yJnzGXKkm5vX9D4KqnVDIqkyAYnukhuV o+yWq9himRhOHgl1ilKh9m0BauxB9p6AhRmkcdQzWOUdUSZvls63lq4Wlfe8bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742308720; a=rsa-sha256; cv=none; b=naHKDU6oDOUJIfjch/x4KaKfulcZcMTZC7cyOi91H0VOzNvqihY57QgMg6VXUDwHZBYnY4 9BHJFlsy2h8fawUVxmLDhIIdUG6/R7wQXGQEm9KhBRqDnY2xoOqiUzKe0b077mUiLZNgKD 0Dht8z2A2xKHbugT0kVRnmkSWwB6hSDPxz1s77zBZ+V0ChIL23qalU7O/rPIfOxaQJfS61 3k9svBSS0TvW0Sw4LxS7zbpAZjvzYq6T/ocxETyJ++kpK7ceN5YYONcHTvJTb1IZHfK3Xf 88x9jEnLV31IHSwVpQdDHP/wXkVPBhxFbYCA9uCOsRI8dlrhvzF5U7EWX2/T4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742308720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KJ5hMOA+J5VkonZMgna2s4xNdI0if/4OiX7EcKlUCVo=; b=dAWASv6g+5W9Nan1UUNawCoSvj0gMPcSOzp0dXLMDQf87uvjVQooHP+iFi2N52Yn29n9oS miTL5l3krSirlhfm5sTSsevPDK5mr2Pminzxc9GXHWBp6Jrz3Keyhg029EUZw3EQhJQHii zxyyIUIPL+Op02PV1Wwgd2vWxwE/rSe3QNyfyoZqvdYfYEdvNfxa8VKPLnS2mHPaigmTqc IW3mVZ9y7wKItok43OqnpWrKjE78UzwnyGp2HU7aRdcCZRbBW5J7q4BLBdBhIqoqJEOLL8 DBpGsor/vqAg8fsfK03R/OSSYDdAhkPzQIOamW0YmEsg+Rm/HuH0IPuh7LNmHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHDwv6TQRzdMv; Tue, 18 Mar 2025 14:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IEcdtr060520; Tue, 18 Mar 2025 14:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IEcd3r060517; Tue, 18 Mar 2025 14:38:39 GMT (envelope-from git) Date: Tue, 18 Mar 2025 14:38:39 GMT Message-Id: <202503181438.52IEcd3r060517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: d0105578f05f - stable/13 - inet6: add the missing lock acquire to nd6_get_llentry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d0105578f05f507614185436cf5aba92a2b61782 Auto-Submitted: auto-generated The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d0105578f05f507614185436cf5aba92a2b61782 commit d0105578f05f507614185436cf5aba92a2b61782 Author: Mateusz Guzik AuthorDate: 2025-02-10 14:27:37 +0000 Commit: Mateusz Guzik CommitDate: 2025-03-18 14:38:00 +0000 inet6: add the missing lock acquire to nd6_get_llentry Reported by: Lexi Winter PR: 282378 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit d6138a65405f697715189363b2b18581e7abd982) --- sys/netinet6/nd6.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 70fb468176a5..91e48bc8b991 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -2338,6 +2338,7 @@ nd6_get_llentry(struct ifnet *ifp, const struct in6_addr *addr, int family) } else { /* child lle already exists, free newly-created one */ lltable_free_entry(LLTABLE6(ifp), child_lle); + LLE_WLOCK(lle_tmp); child_lle = lle_tmp; } LLE_WUNLOCK(lle); From nobody Tue Mar 18 17:00:47 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHJ4x3w7Bz5qwc7; Tue, 18 Mar 2025 17:00: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHJ4w1hfLz49tm; Tue, 18 Mar 2025 17:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742317248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWZc/I7GmaN+DSrGNgC/tSI0GossDGUwJ5JsV/YJyZ8=; b=Ze3U6p+Np0glNMbWXPa9j4dz23E+iCHudOp7l9OS1ZhAQaSXZhPiw7CFMModr3P4wSKlsF D41ohlWok3iYFja4J4ZFNzQh0636JPk9V70zt/osXY38dY7tMrq1IoeGvAwZP9fXAP30ut MNEa/0YDvvhIgaQHLYttcXtnQiC7Hib9dc5jtWxLy4nV5WM6sGk9dZah5/l6g0lp2dPhmi T0gUOYruXjkDExikQxlCzzDDj0SlLygyjI0r+wXH/BqK1d/3DtYKzNRd1rnvM8rOSpRC6K 3NzDoqZZc7U0rxvZepIywBMUV/BL4uhi1sI67HcPAR65NHS47uPYc4dnAhY1MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742317248; a=rsa-sha256; cv=none; b=wDKsWREWR3TdeYbyeBZYdn5C8BUyfWc3l4u/0jwf4/0gHQdt0HI03oNZtvGn33MbEzpwLS exZo7cy6LOc0z0r5wWU5CV15brq069x8c2qzoDysOmMr8JjXqZneAcPn5qqQjUX324QkMd ADtbcTSRKQBPBCBC4BGIqY51ADIlSDhJpuOidPZfri65YEJ/jOJfb1tHC0a25w04QSQz83 amUiZZ4FPRLyP7a0OGZ4PtlCOi52kyLhghD1MIbmG4hb/rpJzIYbM7Zd34E+qfUbR8akhD h+9OTx8rqq1LbYQwwmB6nqVxh7sjYLcbmDTISy8aEwkwik/3eSAq9w60Gklc5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742317248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UWZc/I7GmaN+DSrGNgC/tSI0GossDGUwJ5JsV/YJyZ8=; b=nqFI2mGWgOyJr/ekqF0et4vOMtmzHwniToJ12f7THLHvZsI3qIGJZf6rRvJO50vCdyoIeM 0q6yNAknRI6PPVRTwn+e0IRu/2TnynskFN53Ob0lG+/a8mx++TSKo2Nj2Zy/cLoPF3KVae 8d4tOkPYElm4i4bVMwin7FyArzmQiWrhvyt6wGn3KQ8Mq/t/S5H9nXdq9v+X9ao+kBZsKr eoC4LW8bWjDQaxlIfXZ2btH4jlAUQ8v84bFxNNgs8Sg4I9qxlfbrh1c8XN50FJFC+rLbxk 5Ln2QtFo5geSGOV7W8gyza4bgeQkyj5ZFpB5ktVGmawIXUTtlBpJat3RoOPWrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHJ4w0XlQzhqY; Tue, 18 Mar 2025 17:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IH0lhO036257; Tue, 18 Mar 2025 17:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IH0ltn036254; Tue, 18 Mar 2025 17:00:47 GMT (envelope-from git) Date: Tue, 18 Mar 2025 17:00:47 GMT Message-Id: <202503181700.52IH0ltn036254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 0832a409c21b - main - Add driver for the RK3328 GPIO_MUTE pin List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0832a409c21b45b2a31b90c50a005d9a4b1a5efd Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=0832a409c21b45b2a31b90c50a005d9a4b1a5efd commit 0832a409c21b45b2a31b90c50a005d9a4b1a5efd Author: Stephen Hurd AuthorDate: 2025-03-15 19:43:55 +0000 Commit: Stephen Hurd CommitDate: 2025-03-18 17:00:19 +0000 Add driver for the RK3328 GPIO_MUTE pin This is used in in the ROC-RK3328-CC to control a regulator. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D49399 --- share/man/man4/man4.aarch64/Makefile | 1 + share/man/man4/man4.aarch64/rk_grf_gpio.4 | 44 ++++++ sys/arm/rockchip/files.rk32xx | 1 + sys/arm64/rockchip/rk_grf_gpio.c | 236 ++++++++++++++++++++++++++++++ sys/conf/files.arm64 | 1 + 5 files changed, 283 insertions(+) diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile index aca11eeb583f..0e85aab8b770 100644 --- a/share/man/man4/man4.aarch64/Makefile +++ b/share/man/man4/man4.aarch64/Makefile @@ -6,6 +6,7 @@ MAN= \ felix.4 \ rk_gpio.4 \ rk_grf.4 \ + rk_grf_gpio.4 \ rk_i2c.4 \ rk_pinctrl.4 \ diff --git a/share/man/man4/man4.aarch64/rk_grf_gpio.4 b/share/man/man4/man4.aarch64/rk_grf_gpio.4 new file mode 100644 index 000000000000..1587e708c93b --- /dev/null +++ b/share/man/man4/man4.aarch64/rk_grf_gpio.4 @@ -0,0 +1,44 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2025 Stephen Hurd +.\" +.Dd Mar 16, 2025 +.Dt RK_GRF_GPIO 4 +.Os +.Sh NAME +.Nm rk_grf_gpio +.Nd +.Xr gpio 3 +driver for RockChip GPIO_MUTE pin +.Sh SYNOPSIS +.Cd "options SOC_ROCKCHIP_rk3328" +.Sh DESCRIPTION +The +.Nm +driver provides a single-pin, output-only +.Xr gpio 3 +unit whose single pin is named GPIO_MUTE. This controls the output +of the GPIO_MUTE pin on the SoC. +.Pp +This gpio is usually used to control another device on the board, +so is not usually available for user software. +.Sh HARDWARE +The +.Nm +driver supports the following GRF GPIO controller: +.Pp +.Bl -bullet -compact +.It +rockchip,rk3328-grf-gpio +.El +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 15.0 . +.Sh AUTHORS +The +.Nm +driver and manual were written by +.An Stephen Hurd Aq Mt shurd@freebsd.org . diff --git a/sys/arm/rockchip/files.rk32xx b/sys/arm/rockchip/files.rk32xx index 7331b12a06ed..2faee11b0b6a 100644 --- a/sys/arm/rockchip/files.rk32xx +++ b/sys/arm/rockchip/files.rk32xx @@ -6,6 +6,7 @@ dev/iicbus/controller/rockchip/rk_i2c.c standard arm64/rockchip/rk_iodomain.c standard arm64/rockchip/rk_gpio.c standard arm64/rockchip/rk_grf.c standard +arm64/rockchip/rk_grf_gpio.c standard arm64/rockchip/rk_pinctrl.c standard arm64/rockchip/rk_pmu.c standard dev/pwm/controller/rockchip/rk_pwm.c standard diff --git a/sys/arm64/rockchip/rk_grf_gpio.c b/sys/arm64/rockchip/rk_grf_gpio.c new file mode 100644 index 000000000000..6818bd85bb95 --- /dev/null +++ b/sys/arm64/rockchip/rk_grf_gpio.c @@ -0,0 +1,236 @@ +/* + * Copyright (c) 2025 Stephen Hurd + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include "syscon_if.h" + +#define GRF_SOC_CON10 0x0428 +#define SOC_CON10_GPIOMUT (1 << 1) +#define SOC_CON10_GPIOMUT_MASK ((1 << 1) << 16) +#define SOC_CON10_GPIOMUT_EN (1 << 0) +#define SOC_CON10_GPIOMUT_EN_MASK ((1 << 0) << 16) + +struct rk_grf_gpio_softc { + device_t sc_dev; + device_t sc_busdev; + struct syscon *sc_grf; + bool active_high; +}; + +static struct ofw_compat_data compat_data[] = { + {"rockchip,rk3328-grf-gpio", 1}, + {NULL, 0} +}; + +static device_t +rk_grf_gpio_get_bus(device_t dev) +{ + struct rk_grf_gpio_softc *sc; + + sc = device_get_softc(dev); + + return (sc->sc_busdev); +} + +static int +rk_grf_gpio_pin_max(device_t dev, int *maxpin) +{ + *maxpin = 1; + return (0); +} + +static int +rk_grf_gpio_pin_getname(device_t dev, uint32_t pin, char *name) +{ + if (pin) + return (EINVAL); + + snprintf(name, GPIOMAXNAME, "GPIO_MUTE"); + + return (0); +} + +static int +rk_grf_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags) +{ + if (pin) + return (EINVAL); + *flags = GPIO_PIN_OUTPUT; + return (0); +} + +static int +rk_grf_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags) +{ + if (pin) + return (EINVAL); + if (flags != GPIO_PIN_OUTPUT) + return (EINVAL); + + return (0); +} + +static int +rk_grf_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps) +{ + if (pin) + return (EINVAL); + + *caps = GPIO_PIN_OUTPUT; + return (0); +} + +static int +rk_grf_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val) +{ + struct rk_grf_gpio_softc *sc; + uint32_t reg; + + sc = device_get_softc(dev); + + if (pin) + return (EINVAL); + + reg = SYSCON_READ_4(sc->sc_grf, GRF_SOC_CON10); + if (reg & SOC_CON10_GPIOMUT) + *val = 1; + else + *val = 0; + + return (0); +} + +static int +rk_grf_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value) +{ + struct rk_grf_gpio_softc *sc; + uint32_t val; + + sc = device_get_softc(dev); + + if (pin) + return (EINVAL); + + val = SOC_CON10_GPIOMUT_MASK; + if (value) + val |= SOC_CON10_GPIOMUT; + SYSCON_WRITE_4(sc->sc_grf, GRF_SOC_CON10, val); + + return (0); +} + +static int +rk_grf_gpio_map_gpios(device_t bus, phandle_t dev, phandle_t gparent, int gcells, + pcell_t *gpios, uint32_t *pin, uint32_t *flags) +{ + if (gpios[0]) + return (EINVAL); + + /* The gpios are mapped as */ + *pin = 0; + /* TODO: The only valid flags are active low or active high */ + *flags = GPIO_PIN_OUTPUT; + return (0); +} + +static int +rk_grf_gpio_probe(device_t dev) +{ + + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0) + return (ENXIO); + + device_set_desc(dev, "RockChip General Register File GPIO (GPIO_MUTE)"); + return (BUS_PROBE_DEFAULT); +} + +static int +rk_grf_gpio_attach(device_t dev) +{ + struct rk_grf_gpio_softc *sc; + phandle_t parent_node, node; + device_t pdev; + + sc = device_get_softc(dev); + sc->sc_dev = dev; + + node = ofw_bus_get_node(sc->sc_dev); + if (!OF_hasprop(node, "gpio-controller")) + return (ENXIO); + pdev = device_get_parent(dev); + parent_node = ofw_bus_get_node(pdev); + if (syscon_get_by_ofw_node(dev, parent_node, &sc->sc_grf) != 0) { + device_printf(dev, "cannot get parent syscon handle\n"); + return (ENXIO); + } + + sc->sc_busdev = gpiobus_attach_bus(dev); + if (sc->sc_busdev == NULL) { + return (ENXIO); + } + + return (0); +} + +static int +rk_grf_gpio_detach(device_t dev) +{ + struct rk_grf_gpio_softc *sc; + + sc = device_get_softc(dev); + + if (sc->sc_busdev) + gpiobus_detach_bus(dev); + + return(0); +} + +static device_method_t rk_grf_gpio_methods[] = { + DEVMETHOD(device_probe, rk_grf_gpio_probe), + DEVMETHOD(device_attach, rk_grf_gpio_attach), + DEVMETHOD(device_detach, rk_grf_gpio_detach), + + /* GPIO protocol */ + DEVMETHOD(gpio_get_bus, rk_grf_gpio_get_bus), + DEVMETHOD(gpio_pin_max, rk_grf_gpio_pin_max), + DEVMETHOD(gpio_pin_getname, rk_grf_gpio_pin_getname), + DEVMETHOD(gpio_pin_getflags, rk_grf_gpio_pin_getflags), + DEVMETHOD(gpio_pin_setflags, rk_grf_gpio_pin_setflags), + DEVMETHOD(gpio_pin_getcaps, rk_grf_gpio_pin_getcaps), + DEVMETHOD(gpio_pin_get, rk_grf_gpio_pin_get), + DEVMETHOD(gpio_pin_set, rk_grf_gpio_pin_set), + DEVMETHOD(gpio_map_gpios, rk_grf_gpio_map_gpios), + + DEVMETHOD_END +}; + +static driver_t rk_grf_gpio_driver = { + "gpio", + rk_grf_gpio_methods, + sizeof(struct rk_grf_gpio_softc), +}; + +/* + * GPIO driver is always a child of rk_grf driver and should be probed + * and attached within rk_grf function. Due to this, bus pass order + * must be same as bus pass order of rk_grf driver. + */ +EARLY_DRIVER_MODULE(rk_grf_gpio, simplebus, rk_grf_gpio_driver, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index de3134ad9124..480f1ac78905 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -735,6 +735,7 @@ dev/iicbus/pmic/rockchip/rk805.c optional fdt rk805 soc_rockchip_rk3328 dev/iicbus/pmic/rockchip/rk808.c optional fdt rk808 soc_rockchip_rk3399 dev/iicbus/pmic/rockchip/rk817.c optional fdt rk817 soc_rockchip_rk3568 arm64/rockchip/rk_grf.c optional fdt soc_rockchip +arm64/rockchip/rk_grf_gpio.c optional fdt soc_rockchip arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl soc_rockchip arm64/rockchip/rk_gpio.c optional fdt rk_gpio soc_rockchip arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain From nobody Tue Mar 18 17:03:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHJ8Y2VSCz5qx1l; Tue, 18 Mar 2025 17:03: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHJ8Y11sKz3CZb; Tue, 18 Mar 2025 17:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742317437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42NbsdnG432ikDASUeXrYnqJ1lZBuipdKbO5CPzFSms=; b=rpq04UtpRfECh8d7+f17URNxf0SkWC68TOfRJGtjlURf1E/r7ZHFRVpsJZZF4bPnih7y3H 2l2Uf8ZVsIIkIPsyimEqglVMs0woyrT31YYLnvUTEj2iifw/ZJEz69ykpQfhSeqjeftdnw ImBGGddynnHBXmeofc2CaFwKe8vBcSf8k1BlgGUpGZBRZCGS5zCHnZl6aAa8+SSYqsb7Um qUBWH/NtTDjO8Ba/FsWQmNLx2wJkCQ1HJIw4Fgm/KSg4jNCkd1PuEfN/BCrj3DfL5llbg7 +8SkHTt0/g7kDvnMSOlxT7AmqyUbezuzDVawlmH+k0LDpWCwyCRaGXbFOlU1cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742317437; a=rsa-sha256; cv=none; b=aY47Rk5ellbYCy7/Rmlxwl6wRgY47Qehdqn1F/KEKI/Vgp2RJrFrofAYhBxJZiGcGyan/n wDTBmd+dLWzQRhWUO/GzvU/Thrx/tH5XuY2083Y846l3TZfNuXVf5rCqMW4jHB5SHjiRXb 05iAMKsEWCMSbI++AYv9z4qNw4QWYfAvO+sQdcB0EUBrZkXf53Fa9jVlrw43uyLCGOoOZG XsWgGgwYGbO9Vwkcae70Pcj485juFnWu0So4qK1XlMxSWBCosRYKnN7fDx4Cz3pC5YvHTG WPzg81Wcoz9xKYDo7vLeZ5uoTg26YZ4554OVDbiFh9R/yTsLtZjQQ01gTgWQew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742317437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42NbsdnG432ikDASUeXrYnqJ1lZBuipdKbO5CPzFSms=; b=MU8xBUUip+5dL+nQomwf8sfCe6iQY/tzW7A27rdUrNZJIGgVs53bIsdzq+yHCt5pYpu0rC kemJmCwYPnG6/3y6JNWEoSF+JImnsVqBE+x/l4ojwJhu8lXNULBtFDZg0kNYrE3UhfVk1V izc4Dn0dtJ4GnD4ZtDF70SW7tWMctE0oh8XBITX3PceEGfJGLrMOlZkVUkcZiZ3RYudL1n QLR/NQnp0++NV1j+MxArh/sJXFoYcjzTuz+ejENcG79X9h2vGid2gLtHgF6AuxGl92eO1O fYcnJdHtvmfD/HBAQRcswIu9jQurOXjBxgcSz0be0lBKboe6IqWZzeseyR1zyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHJ8Y0XbMzj1x; Tue, 18 Mar 2025 17:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IH3uNL040399; Tue, 18 Mar 2025 17:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IH3uG3040396; Tue, 18 Mar 2025 17:03:56 GMT (envelope-from git) Date: Tue, 18 Mar 2025 17:03:56 GMT Message-Id: <202503181703.52IH3uG3040396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 0f684b5aec50 - main - Disable HS200 on rockchip_dwmmc in attach List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f684b5aec50b4766dc2a8f010fd7b9568af5063 Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=0f684b5aec50b4766dc2a8f010fd7b9568af5063 commit 0f684b5aec50b4766dc2a8f010fd7b9568af5063 Author: Stephen Hurd AuthorDate: 2025-03-17 07:16:53 +0000 Commit: Stephen Hurd CommitDate: 2025-03-18 17:01:21 +0000 Disable HS200 on rockchip_dwmmc in attach HS200 mode requires tuning, and there is no code to perform this tuning at present. Until there is, leave HS200 mode disabled. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D49400 --- sys/dev/mmc/host/dwmmc_rockchip.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/mmc/host/dwmmc_rockchip.c b/sys/dev/mmc/host/dwmmc_rockchip.c index c4b07ac3290e..656e9a9cf09d 100644 --- a/sys/dev/mmc/host/dwmmc_rockchip.c +++ b/sys/dev/mmc/host/dwmmc_rockchip.c @@ -78,6 +78,7 @@ rockchip_dwmmc_attach(device_t dev) { struct dwmmc_softc *sc; int type; + int rc; sc = device_get_softc(dev); sc->hwtype = HWTYPE_ROCKCHIP; @@ -90,8 +91,17 @@ rockchip_dwmmc_attach(device_t dev) } sc->update_ios = &dwmmc_rockchip_update_ios; + rc = dwmmc_attach(dev); - return (dwmmc_attach(dev)); + /* + * Note: It's not that the controller doesn't support HS200, + * it's that FreeBSD doesn't support tuning. + * If someone implemented tuning, this could work. + */ + device_printf(dev, "Disabling HS200+ (tuning code not written)\n"); + sc->host.caps &= ~(MMC_CAP_MMC_HS200 | MMC_CAP_MMC_HS400); + + return (rc); } static int From nobody Tue Mar 18 19:23:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHMFb3Cm9z5r6h5; Tue, 18 Mar 2025 19:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHMFb1r1Jz45Mb; Tue, 18 Mar 2025 19:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742325811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjxbcojV5Vv16Lf5lbd0N3PufT37eJHypqeI89xI1zo=; b=rFG5G9/Qjx0+ZQNPJI6Y870BP1gsTCZT2lDPq4VEUtpF0cJu3Iho26zAcz9TDovl2CfjMr Mp5ySdvXG/GvytWN+MB2g5WgSpO7XgCHn4EopYmC2EzK7khuJKtfv8AV+jXLrIl1Ec3lrd Snff3E3MLZFGZmeQiC+Hi0u/IFUiNH7iBflhIIbSJseSQhChlZ+QjSyzEKfvnkM2ll99yv ro5FXHCah2RiTrlM4dnwhkdqaZUHeBHM2DT0I9PE8tMSzr/ZH6ar/umQBhoGze0QKVflFL LC6xCyWD+QfCq3Vbd7z7CAoqZo00WSw8vUX1q0Q9YQyiOq2urhzYFVmn0XslnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742325811; a=rsa-sha256; cv=none; b=rqw26/T30IIz/X6Z3fl/Cb5sYwRBnDJZJs87QPV8wYheyW1QKmyOfzpzcoCSfvpI9HyCdt vJWibtKXWrIFEY2mkfwPwOyWUIq84UqXRs097Bqz7cRgbcqibhNgSJAChddv61yhsZCwgg yIy8HuZPOhnliSUvQAlEhW645XaGtgtCg+TdHv4U2XW2SQc2YkG8w1AABHDZHWlAl7YNtL spYf1bLM+BIJV8Icxj6MZfVXifZICYkUUu15anGlrNjCMa/8nCpjOk4/Oi2QDWzCJAlWdb NhtrmkjVuG/kf31FMhra7lcXQX9XOqSY6nTFxLCxEnDlXTkipmVBijV+PGxHRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742325811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SjxbcojV5Vv16Lf5lbd0N3PufT37eJHypqeI89xI1zo=; b=aut7njLfHqT//54sJw74a8jRYgz1mOIN0jZMuMNzlLu6klAE+E9uKkaa1QSK8/QobcX1gP T9HZt0H+twJkOJcNvquuEzqhzjwOdaqM/IxJ6KUmYcmBWAitnJQ/VMIT3RlUcNT7bCdjGs ltJqrSpbCgQGs5y9bq8eP5AbURLpw9KTwPwtLVauAhPVYJWc2eFIShC/eoQWzF29kPvR/B WGGn4mwZaq8Mt6BCM/m5TrtT/R3PZ70Y62wsAKgTdwZHXWTmc+47LPTGY27RrakkILQ61L f6UqwIAdzdCFwr61nLP0wS1Hr22Otu5W9ePR88aOd6mNFTO6oYHsQTWboSJimA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHMFb0xc3zmj2; Tue, 18 Mar 2025 19:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52IJNVuw002187; Tue, 18 Mar 2025 19:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52IJNVxZ002184; Tue, 18 Mar 2025 19:23:31 GMT (envelope-from git) Date: Tue, 18 Mar 2025 19:23:31 GMT Message-Id: <202503181923.52IJNVxZ002184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: c22b297062e1 - main - cxgbe(4): Add two new transceiver types. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c22b297062e1440676973a8aa89cbad1571e22f9 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=c22b297062e1440676973a8aa89cbad1571e22f9 commit c22b297062e1440676973a8aa89cbad1571e22f9 Author: Navdeep Parhar AuthorDate: 2025-03-16 02:26:08 +0000 Commit: Navdeep Parhar CommitDate: 2025-03-18 18:36:00 +0000 cxgbe(4): Add two new transceiver types. Future firmwares will report these types to the driver. These transceivers work already but are misidentified as a different type. MFC after: 1 month Sponsored by: Chelsio Communications --- sys/dev/cxgbe/firmware/t4fw_interface.h | 2 ++ sys/dev/cxgbe/t4_main.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h index 686bb55d658b..2794bae9474b 100644 --- a/sys/dev/cxgbe/firmware/t4fw_interface.h +++ b/sys/dev/cxgbe/firmware/t4fw_interface.h @@ -7820,6 +7820,8 @@ enum fw_port_module_type { FW_PORT_MOD_TYPE_TWINAX_PASSIVE = 0x4, FW_PORT_MOD_TYPE_TWINAX_ACTIVE = 0x5, FW_PORT_MOD_TYPE_LRM = 0x6, + FW_PORT_MOD_TYPE_LR_SIMPLEX = 0x7, + FW_PORT_MOD_TYPE_DR = 0x8, FW_PORT_MOD_TYPE_ERROR = M_FW_PORT_CMD_MODTYPE - 3, FW_PORT_MOD_TYPE_UNKNOWN = M_FW_PORT_CMD_MODTYPE - 2, FW_PORT_MOD_TYPE_NOTSUPPORTED = M_FW_PORT_CMD_MODTYPE - 1, diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 20df6a97aa87..9e91250cb61c 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3537,6 +3537,7 @@ port_mword(struct port_info *pi, uint32_t speed) /* Pluggable transceiver */ switch (pi->mod_type) { case FW_PORT_MOD_TYPE_LR: + case FW_PORT_MOD_TYPE_LR_SIMPLEX: switch (speed) { case FW_PORT_CAP32_SPEED_1G: return (IFM_1000_LX); @@ -3593,6 +3594,10 @@ port_mword(struct port_info *pi, uint32_t speed) if (speed == FW_PORT_CAP32_SPEED_10G) return (IFM_10G_LRM); break; + case FW_PORT_MOD_TYPE_DR: + if (speed == FW_PORT_CAP32_SPEED_100G) + return (IFM_100G_DR); + break; case FW_PORT_MOD_TYPE_NA: MPASS(0); /* Not pluggable? */ /* fall throough */ @@ -12210,7 +12215,8 @@ t4_os_portmod_changed(struct port_info *pi) struct vi_info *vi; if_t ifp; static const char *mod_str[] = { - NULL, "LR", "SR", "ER", "TWINAX", "active TWINAX", "LRM" + NULL, "LR", "SR", "ER", "TWINAX", "active TWINAX", "LRM", + "LR_SIMPLEX", "DR" }; KASSERT((pi->flags & FIXED_IFMEDIA) == 0, From nobody Wed Mar 19 14:52:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHsB65KJQz5rG1g; Wed, 19 Mar 2025 14:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHsB64JYWz3tcf; Wed, 19 Mar 2025 14:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742395934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m1LMXa5y+Hh0t8/qYNOHT6Dhb/vvfqmrEhnYXpS8m90=; b=ZRAoqsPPWZcx9nggMyGkEnY5z1N7QevoFC1T9V3QOoofLfV72KQWsZUUrWV735n49bi4be 8AyGnlnlykHllWRkCbpgOuJK/JJ/9Q6sz9PY2noMN9ZsApYaZqS8gAUO5uxlb5GBxV1WmI mK2spj5NkV1oxbUAZ3mmiNCuCnUEl8hLEgsaK/oJr1XPZuJEERWEFtOqxW5MtCufT8bigw BIZbcb11gk9zmCBoQOt2PYTTo/a54QxIfXbs3w5i83r39iDjy7FMWHwwTRUwQ9ymbvbX2p yDVp3Us8E6JD+cxXkVGQHIztgKGUepqI/Dx3CLtVwvrvPhqEzJTK/OExbiq9TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742395934; a=rsa-sha256; cv=none; b=TUEs64UBKzhsNTScYgPyHqk6VBeY29Vv55I67wfI1z6nShDoOFtK8TaJAYbo8yBFmDr56n bqQ+wU8aoU0zTTQF+JsYOHb19nBkztF8VQASnhoQkEHzTLJT2Ka//AZHqaZ7ltZ77P81xf KVTxlQ9wCio4U1R/YkqFhjxqZT5SMVPeXBwZ13t98BZI6VeB0mQU5ktkz8+bZXm9kVDX97 z9q3ZvmApOP9G4sSJYIEJdmPzY6UU5PHjnycd1qOmBgokhs58PGPNtT0/0z0aF/yMgIifI BUtKSXm1bkij4qMylljX5frW0WnU7mUVKIPkdAf8Fa7GnYRQ5osKW08j9IJj+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742395934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m1LMXa5y+Hh0t8/qYNOHT6Dhb/vvfqmrEhnYXpS8m90=; b=GgvoyAq7Bw5ossrhtHIEZiqkUU92HTnlWlwnx8OX2ksebCgUo2iYqftCgBu2Sk0eU5SMbV DUJlnlkLZYZ9GFipDfWYC37EBpr/TyAnG8dzpmXEjL8UKv8L/q4MEo/ioPQydc1DMa+9VQ ZR0wWV8U6LiLs8Y8O8N7C6Ic03dfeYUB+NXoW7NsmuOQHQQvlp2oV1T2nLMbsf+lNSdi8n EnYK/HjTl8ra7ovkkxIN6lXUxYEg33YAMOM83yKIWmLR0jGRa82rV06v7H/QSj2Zhs4JWi DJYHlbkI6ke1GI6EwDPxfngPGuaqNhNCs2d1l8ByDUWLLKxo+seDp3j9znhGOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHsB63vYLz87V; Wed, 19 Mar 2025 14:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JEqEZC000789; Wed, 19 Mar 2025 14:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JEqE7W000786; Wed, 19 Mar 2025 14:52:14 GMT (envelope-from git) Date: Wed, 19 Mar 2025 14:52:14 GMT Message-Id: <202503191452.52JEqE7W000786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b61c045ff868 - stable/14 - sound: Remove redundant check in mixer_clone() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b61c045ff868581009b740eaae047603d76da1c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b61c045ff868581009b740eaae047603d76da1c7 commit b61c045ff868581009b740eaae047603d76da1c7 Author: Christos Margiolis AuthorDate: 2025-03-12 21:15:34 +0000 Commit: Christos Margiolis CommitDate: 2025-03-19 14:52:08 +0000 sound: Remove redundant check in mixer_clone() PCM_REGISTERED() does this check through PCM_ALIVE(). Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit cabf76fde8368222a68865953521e1c3668b5298) --- sys/dev/sound/pcm/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index b5b5814e667b..7bd0a2e14c46 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -1365,7 +1365,7 @@ mixer_clone(void *arg, bus_topo_lock(); d = devclass_get_softc(pcm_devclass, snd_unit); /* See related comment in dsp_clone(). */ - if (d != NULL && PCM_REGISTERED(d) && d->mixer_dev != NULL) { + if (PCM_REGISTERED(d) && d->mixer_dev != NULL) { *dev = d->mixer_dev; dev_ref(*dev); } From nobody Wed Mar 19 18:18:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZHxmb0ZdJz5qFm4; Wed, 19 Mar 2025 18:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZHxmZ5MdCz3CdD; Wed, 19 Mar 2025 18:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742408334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rn+VA22q6LW9PD7sOu+LTTcFXDJj7i29srDJSQuSuGo=; b=xajQVu9UUeCzESDVx7qNkP7mD//4gk6Gaojq0i7kvMgShTIwUnp2xqd484CJEN7R5eG0cl XGuIV6ilY9NcpLgdc43EFhnBGQJkNn/f+bjUxH0CsDGTVJHgTMMW2ZCLTSetG6isIlx5HM iQu/Kevmc1VTyI0qO013E+ZfvuEDymcUHu9NQwLlQTt+GJb2xtXGqIXuPANf/+gzvCfNlD b4Kir3BmU7t+RKx2ku9mJrWOeFg2fUGtVJpZH27jaV7nUZP8wJff9WHaxMCleV6xuTrfU7 nOVQMRp8PZB3PzDTBK5R12xGR2+JxEIuIdwesRADD3cVdQDMvYYaHhOny3BlZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742408334; a=rsa-sha256; cv=none; b=jUGcp4R95zelG+nkzFrY57TyWQQGCIc0ob1UhvD5B/CZgFG70ldBA0uJCo8AxYmLZq8jAE roIcgm+JHDmAkwi3FONCPl2Zgjkshv63wCswu8PC3tZi1TSFDfYa0CnDqV+hz6qj6W7jph M6Svh+DgRqKXOjpTdOvzAZ6pnGTILueDdpu/NKfu0J4FRxfJAdz+iXXap1n591umVuQdhJ nlYF5EaifwR9rW8T9jxrVsgdtOLqQ5sYEIGjygjZn3llWD74sqxo4/CsirGDe5ECuC7vjE uPL7wQD0zLmJbJXHVynBZFambX8zUICmeizSgqP1IjO0I98Bc148mSxuzzv7OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742408334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rn+VA22q6LW9PD7sOu+LTTcFXDJj7i29srDJSQuSuGo=; b=yAzN4B2gslOnFeOisVPAMk7Y6H2werKh4ccgdVvc+SK4LniakX0cB8m90k3/k2SaSXiLns xVYFo3LIpiVUjik/fuogu4by4C8IxeZLMwNDyq9/iWX/J7+8+tgMb3kxVMOj4pePf0Xyy4 wPiLsKlEm0jKgfiM0BroWjYzaTBsV5o4Fyh9f+cLj3dvoOxirx9vSKqOq+uGnkf3j5UXvN v6rYb8Dh+gpYuyTw8p0h3LGw4VY+aMBIZKFAD67JIN7fRJ/2zfOWRsFCy/foJxAO++VpaB KuHw21bumEom3XPkQBMltwErlFh8szx5ceJgpAxCm5LwH3M2IU9TD3XZ6tWldA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZHxmZ4lHGzVdF; Wed, 19 Mar 2025 18:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JIIs5R077710; Wed, 19 Mar 2025 18:18:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JIIsrG077707; Wed, 19 Mar 2025 18:18:54 GMT (envelope-from git) Date: Wed, 19 Mar 2025 18:18:54 GMT Message-Id: <202503191818.52JIIsrG077707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: fc40132603f5 - main - snd_hda: Support Intel Raptor Lake 0x7a50 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc40132603f5133037a35e2c14ac1356a0128c50 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=fc40132603f5133037a35e2c14ac1356a0128c50 commit fc40132603f5133037a35e2c14ac1356a0128c50 Author: Christos Margiolis AuthorDate: 2025-03-19 18:18:37 +0000 Commit: Christos Margiolis CommitDate: 2025-03-19 18:18:37 +0000 snd_hda: Support Intel Raptor Lake 0x7a50 PR: 276379 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste, markj Differential Revision: https://reviews.freebsd.org/D49389 --- sys/dev/sound/pci/hda/hdac.c | 1 + sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 4f9f70d98cb6..a4242d2d1609 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -117,6 +117,7 @@ static const struct { { HDA_INTEL_ALLKPS, "Intel Alder Lake-PS", 0, 0 }, { HDA_INTEL_RPTLK1, "Intel Raptor Lake-P", 0, 0 }, { HDA_INTEL_RPTLK2, "Intel Raptor Lake-P", 0, 0 }, + { HDA_INTEL_RPTLK3, "Intel Raptor Lake-S", 0, 0 }, { HDA_INTEL_MTL, "Intel Meteor Lake-P", 0, 0 }, { HDA_INTEL_ARLS, "Intel Arrow Lake-S", 0, 0 }, { HDA_INTEL_ARL, "Intel Arrow Lake", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 72da5a4a44ac..9b11dcba32a8 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -77,6 +77,7 @@ #define HDA_INTEL_ALLKPS HDA_MODEL_CONSTRUCT(INTEL, 0x51c9) #define HDA_INTEL_RPTLK1 HDA_MODEL_CONSTRUCT(INTEL, 0x51ca) #define HDA_INTEL_RPTLK2 HDA_MODEL_CONSTRUCT(INTEL, 0x51cb) +#define HDA_INTEL_RPTLK3 HDA_MODEL_CONSTRUCT(INTEL, 0x7a50) #define HDA_INTEL_SCH HDA_MODEL_CONSTRUCT(INTEL, 0x811b) #define HDA_INTEL_LPT1 HDA_MODEL_CONSTRUCT(INTEL, 0x8c20) #define HDA_INTEL_LPT2 HDA_MODEL_CONSTRUCT(INTEL, 0x8c21) From nobody Wed Mar 19 20:22:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ0WK11vCz5qf0F; Wed, 19 Mar 2025 20:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WJ3gR1z3mnn; Wed, 19 Mar 2025 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zpd1PRaitGM2vrlBYPVvpSk//0arPW61uzA67xtU8ic=; b=GGitt2iDmFPFvnoBKQZK4n5XEcmrUZOg5LIWX3PkCwSYUNX/CSpvntThPD8ivf18fdoxyH HMHBWtZwdLeBjQMOvxHRALCafKF6F7D81yBs2S9lsYlc6q+LogC0VmtfzuMviqOhjewpFK RnXZUy7E0BOUMhmrFj+7mPtdR6nqpjjK44OB0uBAudsNFNWsnJHufDZduobwNkHynj/EJW Etapf5ygOwShgvfcrl3KMioh8sO2uZHk/raR6I3HYtOriABrY+KK/BxfHM/Ej05T2V62vi Q5sJoiTNLHHwRa7Rzm2M2VFnr5YNlfMmqRo4IvPAFz8hlSkzA4a7Ruf3RYvBbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415756; a=rsa-sha256; cv=none; b=du1GLltz7+l5cm98xXqD3HGC2MerRljYSouU9EndQUSpdzI6nIv9okEO0OguIjdsWJyVyO HAPSPZrwCxV/ZwDErHWd8gE675ObvYMWv79tqQc51CkGssGYJIBpktJ8WDL3StNeJI4Jy8 LtBf+rVgdpXRmYdezIcXnSfcFO9Y49gKOTUpP+qHlXOgBawC0AyQ0xFj6II1IIuv9P35c1 b89dEaO3ZDxHgnjUxI1ODnXaCJQDvGkY6KxfBdxYGVwZpGkT5LO4f+TTr+t+Da0z582Uys uLDfqL9/z6OcxQAGV5FR6QvZn9Az3CmBxuAxDZSD6QecA4pfQpR+u5dp6HTm0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zpd1PRaitGM2vrlBYPVvpSk//0arPW61uzA67xtU8ic=; b=gfKTf1FeP9qFCDSyEGPdlN6YwoVcca2SBN4JkrO/gFWX35h2tSP/JQFwXYZg3eaKpgUjZ0 XaSbasDwN3GQkjjlvJ3TG9St7V/8X/ZF2/TFXYOynvCz780lbqeqG9IycOle4BI77pt94t fM99ow0q57caapxlucMNQfmLTC2Fab36kbX4lBxV9DroQIU8IDADQiTOacVxyKLX6hFqBP qNTlw47eiZJRBVl89FmvkCJ+MpYXz/B4Gy6hog8f8R+Yk0i3Upy5NTYIFjXEWVMU7Ymiix p/CUm/cWoWYbsGUMTXBbe/LEHyXmjfYDdgPiGOQ22z4jr3CaDhbtz/TVxL9Txw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WJ37S4zbmv; Wed, 19 Mar 2025 20:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMaAb019134; Wed, 19 Mar 2025 20:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMaUG019132; Wed, 19 Mar 2025 20:22:36 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:36 GMT Message-Id: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 623be660fcc9 - main - beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 commit 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 Author: Chuck Silvers AuthorDate: 2025-03-19 19:48:10 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:48:10 +0000 beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS Sponsored by: Netflix --- usr.bin/beep/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile index f252ab64f843..8388ff7ff986 100644 --- a/usr.bin/beep/Makefile +++ b/usr.bin/beep/Makefile @@ -1,6 +1,7 @@ +.include + PROG= beep MAN= beep.1 - -LDFLAGS= -lm +LIBADD= m .include From nobody Wed Mar 19 20:22:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ0WM0WT1z5qdjF; Wed, 19 Mar 2025 20:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WL5S9vz3mtR; Wed, 19 Mar 2025 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1aUFVrRPoVtadsH/dbI7Jr0HRAVeJPuAH0AY+gv0HKo=; b=lsLdFXkWCfDZ1V3w0e0kRYKVXcNpX5Be9lt0TAxLR6JI/0yzSeK0OCJ+m2EkdZuDMBmssi PRij74Mg1Vps1+5cfyoLBIFHDkUqnFQp4VscCyCyWopnegHtrQ9wR43aXuseV4pKAiJaeU 5tmXC9HfhoOA7LC/Zf0WtqvZ8uXMF/i2yGoTCIxxU4sq+Pqdb4bQQI9Dyppoa7P8k0X8X6 bn/7gNsjWb2fjc78MU9Xc5aR04qmUEox8JUgsm0Qy3I0hOo9eaxDQ+zMDJ3Ty034kjC7Sh bnZh9kF6or1IrczvQLPzS3r7uUJlaKaXHn8jv1+b+J8+Bbl7N386IKrY/g55Mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415758; a=rsa-sha256; cv=none; b=rPUzC5GUa/UDMtt/rDZpF/sP2q2tQGBcvGeCB87mJtvk4bdaWSM3UoRZCQjfs0OZO6LAmx CW4Yv/3WjA3Hu5ySPlojY/UoGo8cHQMhoub7SlMzHVgycaeOOTJJ7tkMhPjCeuE/wHHw/p tNLSvTWiylEeiFY2ABWSsgSPYjrjuvXKaSUnyXf5Jz5tXKnLD6eTePl79y5/vbEG8fqR0x 2Rt02h05NMA07pSxoundVSZ4POUouRlrluoG5Kltx3GcRInnDlNPvTanaP7OYeeXp3FTrH YSmwG+ydafqA/fRKW1R+Rxtgh0Xo6lW6XiRo6lkN74i5W4y+9/hIh4Aoiah8SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1aUFVrRPoVtadsH/dbI7Jr0HRAVeJPuAH0AY+gv0HKo=; b=u3Df88l/TzU1VKCgSK5VJ6lk+wU4A8ItmzpLuWop8EGBz2NymHz2Z/pPvGLdGjLZ/XyWEp pLdb807VhjCd0cTUXjifZ4bhFaB+pUu41Xpeld6bqhjXn/hKZWkhn/jIr2P8G2STxRXiNZ rdT24/20mAjymkoYwsipvV+YNytTpcDmVbLJkENR67gDBI3T/U0z5jp5Q2RcZiv04OK6HS qzk2o2uk4riswm7dbYvzC6K8isCGnd6HsEqhcZXOc71WG3Sw8aDUcUZwf42nfY79nciuK7 LbYhr6D/nkBlrMZNoYH80MmmaQmI3jERsiJq+HLDPj0q1TV2K8fO/QrkeAe2cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WL53vQzbbC; Wed, 19 Mar 2025 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMcgf019203; Wed, 19 Mar 2025 20:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMcLQ019199; Wed, 19 Mar 2025 20:22:38 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:38 GMT Message-Id: <202503192022.52JKMcLQ019199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: a335a52eedfd - main - bsnmpd: append to LDFLAGS rather than replacing it List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a335a52eedfd2225ffd8b11d123d04a9d68a0274 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=a335a52eedfd2225ffd8b11d123d04a9d68a0274 commit a335a52eedfd2225ffd8b11d123d04a9d68a0274 Author: Chuck Silvers AuthorDate: 2025-03-19 19:50:08 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:50:08 +0000 bsnmpd: append to LDFLAGS rather than replacing it Sponsored by: Netflix --- usr.sbin/bsnmpd/bsnmpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile index 245ffc51002f..e7c7a87eec7c 100644 --- a/usr.sbin/bsnmpd/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/bsnmpd/Makefile @@ -131,7 +131,7 @@ CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY LIBADD= begemot bsnmp -LDFLAGS= -Wl,-export-dynamic +LDFLAGS+= -Wl,-export-dynamic .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO From nobody Wed Mar 19 20:22:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ0WL2B22z5qdj7; Wed, 19 Mar 2025 20:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WK4Tbsz3mnq; Wed, 19 Mar 2025 20:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1Ws7aDiGu0l2n1o+GrU6mjMSgBsjXl0dYj5PAsLQ4M=; b=EZLXkRSz3Sexqk5/kfNMWzsYjAeUFSXx+b5k4EV1u+6AhTlbYRs2W5Qiz0c8JY9LFnomAo q68gRgRSLIzml3NBQJBKJ5M/wq4PFigiwsP5uaf79V/WMZNtcpJI+pZheTkhXNPStXvagB tqfUvFCZf6hQZld1pUzMtNZTAZ0ZpvH14MKRnbb80uyVssu+3RWsWC0n04j1sMopZT4t7F HoBCsaK4INrbTfnzcOnl4mldNAPb3wHbPY30A+f1Lew566diIxouMM1JnJLemBYs5B5HP3 6fphCRmZpGhY1po/0xGlX0gsWEf7n1aMe4kF/sBCWRZKy6oulqExUqiSP1cxIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415757; a=rsa-sha256; cv=none; b=hZ/YA6ocukpeQM8D0I3zQUVD2u7EyRkWN1qUAU+MbmYxDsttPlDZ6RYRlIanPvHksnyNbN Udpn0OZtG94xrn4aEsVHLelnScbqF+xU5CK50uo/tiqokGTl0DdGUooOy3jRuVL5PFNcMO PVKNTN6a29DeDqDauJARCRQMVTgvTPZXoya6Oa8NzQYxpdG4xXUyxMob5GSCFwEkz7fKnL Wug1Oe5osFcz/48jHckOyLAYJrrvP732I4+jTdP2qcUCQGBgVrriFo8KoKnBr+hIug/Lk6 QCn9IiEMHgizyhyCV/yW2Ybn2MsfnKKF2XI3zAdAKGVJmWeKUIAAqlL+pGMrvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c1Ws7aDiGu0l2n1o+GrU6mjMSgBsjXl0dYj5PAsLQ4M=; b=pTtA1SVWkY7MPa7G/yU8wuhiyOvvYN6lHZ9JnM//dPg3K1mQHZ4lMiT6CyL1kejuj61WIo xDxzhFIymAfOS3bWJclU0H46DTzLSV6S8afkTyrnE19tKTchRJ3p02tl8SCPCwHEXTAgRJ xYp9Mnn+4ORcAkurrtYBsztDKAkxhwSxaiQuK7v9L0nV46vgwjHoSO6YsBKhr9xHd+VqJt Cqf1ekLTTSXpGilbI1STS9jwuISMrD6TDcWlgHIHmIqRxPvY2Wo+gvpTDI7siOjIHlRnId Qk+HfjFsJEwW1+PSy2xc1y8DbiZ5IyjapWI6ooUpwXLf4XGAy6rvY9vZtlOnQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WK44x4zbYL; Wed, 19 Mar 2025 20:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMbSQ019168; Wed, 19 Mar 2025 20:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMbP1019165; Wed, 19 Mar 2025 20:22:37 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:37 GMT Message-Id: <202503192022.52JKMbP1019165@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: db466e475446 - main - trim: add missing include of src.opts.mk, remove unneeded LDFLAGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db466e475446f232bdfde91c8773b0df8a653abd Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=db466e475446f232bdfde91c8773b0df8a653abd commit db466e475446f232bdfde91c8773b0df8a653abd Author: Chuck Silvers AuthorDate: 2025-03-19 19:49:14 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:49:14 +0000 trim: add missing include of src.opts.mk, remove unneeded LDFLAGS Sponsored by: Netflix --- usr.sbin/trim/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/trim/Makefile b/usr.sbin/trim/Makefile index 1263c0c6819e..1329c7f79690 100644 --- a/usr.sbin/trim/Makefile +++ b/usr.sbin/trim/Makefile @@ -1,6 +1,7 @@ +.include + PROG= trim MAN= trim.8 LIBADD= util -LDFLAGS= -lutil .include From nobody Wed Mar 19 20:22:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ0WN21cTz5qf9g; Wed, 19 Mar 2025 20:22: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ0WM621Pz3mwc; Wed, 19 Mar 2025 20:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoVCCurH74kbQ0SYtwrgCN1JuR1gV2EBopvNErhXUxo=; b=Dpll9PUMkEiZkBv/dsPqLHrsKw5QDT5WW1fU2VDrl71kRapXgZPbHhoT1cRio/7Mwtat9D y6qMP2DjygKxPKZDfjVTreh61OTBV9ocdzh1zIJsV7vs6ceEKCKMGpn3T0cffb9iffy3jz 6pVKw2s5XruikYhMRNoFJzzyUsICiZuEq9llj27jSnXKfY9AnVqIIY7IAA4h6Vpt7PAOPB +RCp+SaCchT2e2t93nEeBWgM3+Do1hLWVlRWLG0J2LunslDEQNW8e1Tg2d6ZwrAHumz/g5 EYkOCYG1SMhfQnxkad8FBO+q21x8/PIQccY8Pi1D4KDSJ9S265dB2KEG0yAvUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742415759; a=rsa-sha256; cv=none; b=BvZu/Hgv5szmV3ai1cKJGQPjeKlQ1ruDye0GKAkQC3CyBP6aoaTd2bFYLrh183Ph2w1Ro5 I+4XM1TnhiR2XL3G7bmfGgp2KwxAkB+SvsZIK1K60mkb7aYqDB4NI5IPCIz/VIoj/vE5eR LZuojFBW/pamgc2DG6qDmnbl7d2okulrILeFBrWKQSCBTkLu1Etnr/wyZtH1H3Xka1l8Cq DNLnUzmz2zUM32scYj0asEz50vTeCYBxzOCCWnOaRM87AOs85q/gqFzHrwoaHXfQeAYBQQ 6SLEkRLQQytsEeqF8q2aankt5H2uNJIWBLayE+oyp9QSlWHSIQdXcC6+ltDL7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742415759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoVCCurH74kbQ0SYtwrgCN1JuR1gV2EBopvNErhXUxo=; b=QeMMvFw+Esc1R3RfZCieVq6pCtvB11PiE7rRHEa77V0XaPkyItQ4AEpj7JBnqxz0uqqGi9 zKDy3h4HS5x2I1AG5CWtOTfMNFwil99LPL8I6caal0/Mc2BUMd15xmkqlzQ6VbFL3CTETh nvdbZuki9JOID+1tTEM7RVU7iWkdf3USDXYlQWWl8akfvcx2StEv+mf5qvtfm7DoNS9B4C rxnTP8jgI9XgPMt8zjkonlDLEmOdM1QCFU/l+DB7COXKN4K2vZtourdXZ/CvE7RtJw140W NCV66ElRvC1irMsk0pb8V0Efwyggq7sd+r8biGHjL3v/7BX2hHHJPQT2ASGf2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ0WM5dJVzbJ7; Wed, 19 Mar 2025 20:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JKMdbR019240; Wed, 19 Mar 2025 20:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JKMdp7019237; Wed, 19 Mar 2025 20:22:39 GMT (envelope-from git) Date: Wed, 19 Mar 2025 20:22:39 GMT Message-Id: <202503192022.52JKMdp7019237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 91d8ee3579ef - main - i386/loader: force 4k linker max page size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d8ee3579ef3589b836922b14b79cc10fb99bbc Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=91d8ee3579ef3589b836922b14b79cc10fb99bbc commit 91d8ee3579ef3589b836922b14b79cc10fb99bbc Author: Chuck Silvers AuthorDate: 2025-03-19 19:52:50 +0000 Commit: Chuck Silvers CommitDate: 2025-03-19 19:56:34 +0000 i386/loader: force 4k linker max page size Force the BIOS loaders to use the standard 4k linker max page size so that they fit in the limited space even if someone has set a larger default linker max page size via /etc/src.conf. Reviewed by: imp Sponsored by: Netflix --- stand/i386/loader/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index 857944dcd010..bb9111c3dcce 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -140,6 +140,10 @@ FILESMODE_${LOADER}= ${BINMODE} -b # files. LDFLAGS+= ${BTXCRT} +# Force the linker max page size to 4k so that we fit in the limited space even +# if someone has set a larger default linker max page size via /etc/src.conf. +LDFLAGS+= -Wl,-z,max-page-size=0x1000 + DPADD= ${LDR_INTERP32} ${LIBI386} ${LIBSA32} LDADD= ${LDR_INTERP32} ${LIBI386} ${LIBSA32} From nobody Wed Mar 19 20:44:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ10H0gfcz5qfy1; Wed, 19 Mar 2025 20:44:15 +0000 (UTC) (envelope-from brooks@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ10G16qLz49yh; Wed, 19 Mar 2025 20:44:14 +0000 (UTC) (envelope-from brooks@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742417054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cbApILZd5CYTyr0m7L1gXktzxk8QoNRX3SGJgkikOqU=; b=b8NtZsW23jNwIdjrVNkLDatsn8gz5DMKNmSZSWgRF3rb2rWWTYMVGNkszJtlReXUrZ84QK /mSHu7ZUGQBytppBqFANxJzkKY/FnUVnx0IcojKyDVjWLlxlzzZkoSRjX936AC9ngcsM3R c3N9DUQeW+8VZKfPFc1a6TcZx67YVPepp5UXrLCUDnNIyUJ9xGLOh4cDOwQGpvqA9nR+9G DHn85Pc9m3au5Jjp31lK3nrlq8wP/MdyXHN19kogWgh14E9U0tF4sK9vwBvNFn43bWLyTX Zetv3Wo2EUR+p4Wy1RC7fuAbvFqPnMhwNmgrqEWS4e+iFECzdlN+OjvfGohw7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742417054; a=rsa-sha256; cv=none; b=Y0z42RpuzB3JWIxNnjFCW24Nhfxd9dXYgCDBlyEThw/F6OHAfUYdX3ECXh9+xGdH7Pz9m2 +05Q/rc83l0Pvj0nXiGKLM5AQ5ddidAFqxrLIX89TJAIon6rhdoxUaOtEfefJbK0CA+jdP ZH84ET5JfjwW/4zRp+9ycoJJM4CNClj4ovCLLHjkKLG3dKY/IQ+CnPBm+zf/2ssbn5N0e1 4jHIEktdsUpZgYojFuTS7uM/J0qu3qrGqp+c7v845SYmfuNo+x2UYhDKQaF5EdLe0ACBbr qJl9rE8+xMk4JQ93//ieoanUxsH6MUMDXQ3+7SXb3aSuVDqtc9YjyOKCcj9qIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742417054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=cbApILZd5CYTyr0m7L1gXktzxk8QoNRX3SGJgkikOqU=; b=jS2kQp+qIhyccStUw4M3FDDF/sbFoa/HMTqU4BdPRo80qkGePeEzU/Y8NIUJSYB3HY959B 7BKAagNmfjRZnXbk9izi9d6C8LsD6wEXrf0H7l3u4ESZMCjdhVDYLVltlY8bh4axARnw9D SpDnHZyU63jOQWWENUaOqwu1lYaKuwSKANbMvQutm3AaDc63Wee/DL4QtKFkZDA0L2r1aO F6bq77uURXTe872YTkx5uYvYOaYqByEsg589PHtNpolErQTRrAufSB6yxRhppwpeAtJvaj AcXuZ82hLpFc4/QDznKyfy2LSTvTlxNLLw8u2u1u9KMH43YRcwLBjLuk42Uohw== Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.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: brooks/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZJ10G0GrtztLM; Wed, 19 Mar 2025 20:44:14 +0000 (UTC) (envelope-from brooks@freebsd.org) Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id 843C23C01A0; Wed, 19 Mar 2025 20:44:13 +0000 (UTC) Date: Wed, 19 Mar 2025 20:44:13 +0000 From: Brooks Davis To: Chuck Silvers Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 623be660fcc9 - main - beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS Message-ID: References: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> On Wed, Mar 19, 2025 at 08:22:36PM +0000, Chuck Silvers wrote: > The branch main has been updated by chs: > > URL: https://cgit.FreeBSD.org/src/commit/?id=623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > commit 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > Author: Chuck Silvers > AuthorDate: 2025-03-19 19:48:10 +0000 > Commit: Chuck Silvers > CommitDate: 2025-03-19 19:48:10 +0000 > > beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS > > Sponsored by: Netflix > --- > usr.bin/beep/Makefile | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile > index f252ab64f843..8388ff7ff986 100644 > --- a/usr.bin/beep/Makefile > +++ b/usr.bin/beep/Makefile > @@ -1,6 +1,7 @@ > +.include Why add src.opts.mk? Nothing is using it and bsd.prog.mk will include it. Is there another change coming that will use it? -- Brooks > + > PROG= beep > MAN= beep.1 > - > -LDFLAGS= -lm > +LIBADD= m > > .include > From nobody Wed Mar 19 21:02:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ1PD6tX7z5qhBc for ; Wed, 19 Mar 2025 21:02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ1PD3G51z3C6f; Wed, 19 Mar 2025 21:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742418144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MIC8hQve+cmjOSr7x/W8lDcC4fHUHfufOGzEzjIil00=; b=iyDYo0l4dBCn/DngMfoZ+Fw8W6IQW/hXwjdXzwYCOnO7NNgbnxZdfiYwQodVMqh286l7i7 ewSQFyyDtfZlIfMKzcqL5E71IlA21yIAvgCEu4bFTffOj04kIRf8XQBqx7d8GR+3MVQPUZ rETeJGd9c2HV5RQAOwewjdwYAsGUmugO3AAH1uvsE5X1ku4qDatI1CwtG0Yidxt5WrqnGi C1HYFEqehoB/ILcO2HYieaUhOWWs7W7gTbexw1mPLjMRJ9vNBc16KcRVCbNlz853SZISR0 z4N7qr9IVIGiJLZYMFMDYNbTyHyobOn1iSsBqHsR4FUhILk8OMhzOOHF7Ym04Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742418144; a=rsa-sha256; cv=none; b=BY0KfeCs/CshnNMA44V9KwkznszdTFntmC4QWOUp7xiUIWe5++eTevBZDKVYJ3kO9EgxTs MZhiTVNTOVKOdBmtbgolWtlJTAQXU/e4XolfzIVCMI5wk21xuPUrCcyW67jAKV7ZsHBYgn zJ8NNnevPg+x3cPOGsf0Pqi5YTX1cUUD4c2FBT6/U733cj+Bf2Q/paPr/MDAgRpRsoWiUv q5OePx4dePc8fkWz+gCVGdfu/rM3InzbJyDPx4dKkpSDnZsuc5PfseDksELgjVNSKDVMV0 r/byaOjbqjy6CKZJcWuA8VxgT5MWVvAxroETzY3zLp71tJRmhbKgq5I7xAILHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742418144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MIC8hQve+cmjOSr7x/W8lDcC4fHUHfufOGzEzjIil00=; b=CqkZCYnfF8/gm2VrLaXIKN49Vzk/XTi+aot+2vVVE1suTYoL15UXOHZGwanSGqKi0GHE08 1lpIkX8bRx8dMWAp5pnN9gylC1AuCK6/8ADmeh4DIh4seooacFPMJ3i30Gqk0pTtP4T+7s yvSYo7ZHTAs98fI8iti+KPBLxyMHSbEXPIEQ/k3iPSmKNRKoCF7ypfPNx8D/mJ7qE9XUzA HHOfcCrT6Iec0QlJREmyuX3gX6CeGwDlGwhDid7fSTM9R32CySBewocdZg3nmCyiKDKv4N KhBwuosJqARuQUpjrR1kIIfC6Cz+z3qOm1bgw8wky8daj6sPaAB03Kc1goCVBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ1PD22wGzcNr; Wed, 19 Mar 2025 21:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JL2OQi091981; Wed, 19 Mar 2025 21:02:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JL2O2E091977; Wed, 19 Mar 2025 21:02:24 GMT (envelope-from git) Date: Wed, 19 Mar 2025 21:02:24 GMT Message-Id: <202503192102.52JL2O2E091977@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Simon J. Gerraty" Subject: git: dbc6ef27beef - Create tag vendor/NetBSD/bmake/20250308 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/tags/vendor/NetBSD/bmake/20250308 X-Git-Reftype: annotated tag X-Git-Commit: dbc6ef27beef8c70874913e3a50d8c6013479644 Auto-Submitted: auto-generated The annotated tag vendor/NetBSD/bmake/20250308 has been created by sjg: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/NetBSD/bmake/20250308 tag vendor/NetBSD/bmake/20250308 Tagger: Simon J. Gerraty TaggerDate: 2025-03-19 21:01:25 +0000 Tag bmake/20250308 commit 397f57656d61ec830291c670fb8e33b18bf36ce9 Author: Simon J. Gerraty AuthorDate: 2025-03-19 21:01:12 +0000 Commit: Simon J. Gerraty CommitDate: 2025-03-19 21:01:12 +0000 Import bmake-20250308 Intersting/relevant changes since bmake-20250125 ChangeLog since bmake-20250125 2025-03-08 Simon J Gerraty * bsd.after-import.mk: by default generate makefiles closer to BSD style. * VERSION (_MAKE_VERSION): 20250308 Merge with NetBSD make, pick up o clean up comments and code for parallel mode o job.c: avoid SIGPIPE for children, call Job_Wait befor abort. 2025-02-27 Simon J Gerraty * VERSION (_MAKE_VERSION): 20250225 Merge with NetBSD make, pick up o job.c: reliably remove targets on interrupt, by passing signal to children first. mk/ChangeLog since bmake-20250125 2025-03-14 Simon J Gerraty * install-mk (MK_VERSION): 20250314 * meta.stage.mk: StageFiles --subdir: preserve the dir part of each file under $dest 2025-03-12 Simon J Gerraty * meta.autodep.mk: do a better job of handling MAKESYSPATH in GENDIRDEPS_ENV. If we have MAKE_VERSION >= 20230123 we can just use .SYSPATH, otherwise it is a bit more complicated. From nobody Wed Mar 19 21:02:24 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ1PD6rL5z5qh8H for ; Wed, 19 Mar 2025 21:02: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ1PD3HhXz3C6g; Wed, 19 Mar 2025 21:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742418144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNaYRKEwSwgNPRdhpexc2Ay8fBtGfbN6faVPIO73VZQ=; b=SWOtTdSlCW3N7ciSTWXUu6hkuH4bPnEBWzI+yRqMkU1TWZ5Fe6RRn+w31oXbrJxNuXF6BW vUJF1P7R7FIYFE0AFMGP+PZwN/64G3M66/pgU+b9XZaay5bWF9HQbRT5qtwIarrMTyEG1O Z4Gzhotv84iWs1LVQj25Ou5ISzcPFXtm+GK9leONlPKkarof24XcgqB9mhDI36CAuSdPIo PjldGo43d3dHGKeVN0hEr85NBA1NU2sPMmbJ10gxcO/aUrjH2pXc9slekm+sgkz+BXI/IJ 2CkUlvxScYJQFfNpxSK3OaPN7EijMJAH4sN4meZcj0Pa0N8fJOW7Jn1TAPrfeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742418144; a=rsa-sha256; cv=none; b=NzfVfKhRWD9BsQ3pLSI8XBk1IAXc8bL2J1+TmgY6EBwhyl68SFcNdvo2PT4DMrJRJGu/BA wzzN0CsC2h7NaYaOOmURzYCsu/xoV4RMdaKH0w0MVsEit5+bzCrMImXaWwF8OKuWNpfEgl 4H01rrOBOYlajJZuqcYOuGdI1ZoOla3y0GkY7P8MKj1+6QvILzYoz/X/7ks16XmPdfCtFz UxDvfXVUkNgLzRBhX3+11seZSiHVj/Roy1BXNJXuIKoYQfME/0vUFXLqbQENrOYtCdqETE 7bDW9R35NXzzr3zDlgo6QD55J5b7TNAFvyCqOWk9OwBmV6KL5wwEct7KlMdnxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742418144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XNaYRKEwSwgNPRdhpexc2Ay8fBtGfbN6faVPIO73VZQ=; b=vzdgcJNVHECxnI7COnHdf19sR0iJakwolVB2y45bNSFDbnErGi6qlWckYnQPvW2WLKGD1J PjiZaGfbUX/mJCMdcxXhvKseyRVDZMBVVFeWZaF+/pYGhi8kNAfucVIsmB1JKgX9AML6pa LHB8r5AV9g2gxKQFXpU7jGFP2zgPPnfVhql6fGaKEdVlbyg+HX/PPbaqkpq0ICREDn6fal M1RMpl/te1smifyz7D1JTNzI8Rl6aZsQEMNDdTQ1mGF1/+NCgeUXyWOm3Gg7IdUuKErXqz B8IvC9FG1o6T/vla1ouzB1MrIU3LBvR2R62DE1RsbarBYE4WgseE2sZdujcyEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ1PD1XxZzcJc; Wed, 19 Mar 2025 21:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JL2OtT091951; Wed, 19 Mar 2025 21:02:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JL2OZT091950; Wed, 19 Mar 2025 21:02:24 GMT (envelope-from git) Date: Wed, 19 Mar 2025 21:02:24 GMT Message-Id: <202503192102.52JL2OZT091950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 5ad769f660f3..397f57656d61 - vendor/NetBSD/bmake - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/vendor/NetBSD/bmake X-Git-Reftype: branch X-Git-Commit: 397f57656d61ec830291c670fb8e33b18bf36ce9 X-Git-Oldrev: 5ad769f660f3d00853bc739f82d9bc62f6a682cb X-Git-Newrev: 397f57656d61ec830291c670fb8e33b18bf36ce9 Auto-Submitted: auto-generated The branch vendor/NetBSD/bmake has been updated by sjg: URL: https://cgit.FreeBSD.org/src/log/?id=5ad769f660f3..397f57656d61 397f57656d61 Import bmake-20250308 From nobody Wed Mar 19 21:12:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ1cR4VSjz5qhjl; Wed, 19 Mar 2025 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ1cR16cGz3LyQ; Wed, 19 Mar 2025 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742418727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgG7B+4PUj3iTt3evPzWa9Ab6rQ1RGdQ550JE5sqBLM=; b=eKQjWeBxRxw9nq/7zMTymEC7t06f9ERKmnYZNu3oxfr8mhR6XOY/I5OmD6mgJX4h3oLyDc eJmuW8Xls+MET1+5tZ+73AtjsLTHsPWgr34OEvwuMtizDd/bCj7gVcrE4zlSaCQqzsg0JO VQoE5NidcDCTdtRAPPXReE4+fRLrK/mMQ5WDG3OnwrXH/tcKXa1gEg8rin9a/+8shUh1Oi 2FyAfWtwbSRQ5NtD7fjtoB/TnSiIx1LU69xdqo1yFR6STimY29BUs0uXJgaJP3gUx8NITo 4Bwd3Fd2piGcxh0tRm1e7S3CbmLdO0fTLJP1oajDKMZylQ7zdNYWnRan+jTBPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742418727; a=rsa-sha256; cv=none; b=h8EB9bg+4h6Y6FQs+LLXcmvmehJ0WWkKlNrmkDAQJrCV5QAjIwM8LefP1ikaUVuEIPOjyF IkGxIZhw6uxu5jC9VeFqWq9bCoVkUzz75wkWze8tL3rOqDDjb3nwrCy9nPH/D2f/2XJjoS zAAuHYm6a206PhQhfrp4zN1FSHO2bm9PLk//ghrA+wNZG6OCTmWfYYmeabOQFiVwHSioY8 BBluqmoZFvE/X+xx7zhtQemyy+moK77pKz5JFpTTFB9xz5w5+n4qFOuMFImscN5V3IH7bp chCqCM7y6+W8HDEWGBQBGxdICpRGD/+4Kyw4bdN72rhQosPiB3YeNbrVp4B6vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742418727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgG7B+4PUj3iTt3evPzWa9Ab6rQ1RGdQ550JE5sqBLM=; b=iaY+nf6zOtOBjEOVfInQsL6qd4q5QDAnLrHvR3890LEJUKlTzSyqP6ZL2h+WbPG2Y9yHZJ an04c7LB4syUxy97qd+1THDII+dlMFzgVVxNR/Pp6F6PRdE/AW/MqpEPWPEMiK8+bW3xj3 7RU4MJdqi/Uon/+CTSK2cB5bnhwbcidBleCiH4b83omA9++xT/QQ2Qj/0q2aJml2Ay4ueY xlikRbYx06zSYhMWk1GpP0GjQHqsG5lT4c4Z40Vv14AzRsm/CW8c9Z3cbeuzf+xVVsdSUE 6plwFr9w0q7dy3Vip7zihwqjcToBemw3YS2S8+lkRj844L5Fpy79lSxFiVGbmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ1cR0hWpzcXQ; Wed, 19 Mar 2025 21:12:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JLC7hf012109; Wed, 19 Mar 2025 21:12:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JLC18F012078; Wed, 19 Mar 2025 21:12:01 GMT (envelope-from git) Date: Wed, 19 Mar 2025 21:12:01 GMT Message-Id: <202503192112.52JLC18F012078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: d9a65c5de1c9 - main - Merge bmake-20250308 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9a65c5de1c9f30ae71ce0be8fb88be9d20d216d Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d9a65c5de1c9f30ae71ce0be8fb88be9d20d216d commit d9a65c5de1c9f30ae71ce0be8fb88be9d20d216d Merge: 91d8ee3579ef 397f57656d61 Author: Simon J. Gerraty AuthorDate: 2025-03-19 21:06:16 +0000 Commit: Simon J. Gerraty CommitDate: 2025-03-19 21:10:44 +0000 Merge bmake-20250308 contrib/bmake/ChangeLog | 17 +++ contrib/bmake/Makefile | 8 +- contrib/bmake/VERSION | 2 +- contrib/bmake/bmake.cat1 | 2 +- contrib/bmake/bsd.after-import.mk | 39 ++++-- contrib/bmake/job.c | 251 +++++++++++++------------------------- contrib/bmake/main.c | 22 +--- contrib/bmake/make.h | 3 +- contrib/bmake/mk/ChangeLog | 13 ++ contrib/bmake/mk/install-mk | 6 +- contrib/bmake/mk/jobs.mk | 6 +- contrib/bmake/mk/meta.autodep.mk | 20 ++- contrib/bmake/mk/meta.stage.mk | 29 ++++- contrib/bmake/mk/sys.vars.mk | 7 +- contrib/bmake/os.sh | 10 +- usr.bin/bmake/Makefile | 104 ++++++++-------- usr.bin/bmake/Makefile.config | 4 +- usr.bin/bmake/unit-tests/Makefile | 2 +- 18 files changed, 265 insertions(+), 280 deletions(-) diff --cc contrib/bmake/Makefile index 939b71c5e12c,000000000000..ba2b2e742d35 mode 100644,000000..100644 --- a/contrib/bmake/Makefile +++ b/contrib/bmake/Makefile @@@ -1,266 -1,0 +1,266 @@@ - # $Id: Makefile,v 1.132 2024/09/22 19:56:26 sjg Exp $ ++# $Id: Makefile,v 1.133 2025/03/08 20:12:56 sjg Exp $ + +PROG = bmake + +SRCS = \ + arch.c \ + buf.c \ + compat.c \ + cond.c \ + dir.c \ + for.c \ + hash.c \ + job.c \ + lst.c \ + main.c \ + make.c \ + make_malloc.c \ + meta.c \ + metachar.c \ + parse.c \ + str.c \ + suff.c \ + targ.c \ + trace.c \ + util.c \ + var.c + +.MAIN: all + +MAN = ${PROG}.1 +SRCS.${MAN} = ${srcdir}/make.1 + +.-include "VERSION" +.-include "Makefile.inc" + +# this file gets generated by configure +.-include "Makefile.config" + +.if !empty(LIBOBJS) +SRCS += ${LIBOBJS:T:.o=.c} +.endif + +# just in case +prefix ?= /usr +srcdir ?= ${.PARSEDIR} +srcdir := ${srcdir} + +DEFAULT_SYS_PATH ?= ${prefix}/share/mk + +CPPFLAGS += -DUSE_META +CFLAGS += ${CPPFLAGS} +CFLAGS += -D_PATH_DEFSYSPATH=\"${DEFAULT_SYS_PATH}\" +CFLAGS += -I. -I${srcdir} ${XDEFS} -DMAKE_NATIVE +CFLAGS += ${COPTS.${.ALLSRC:M*.c:T:u}} +COPTS.main.c += "-DMAKE_VERSION=\"${_MAKE_VERSION}\"" + +.for x in FORCE_MAKE_OS FORCE_MACHINE FORCE_MACHINE_ARCH +.ifdef $x +COPTS.main.c += "-D$x=\"${$x}\"" +.endif +.endfor + +# meta mode can be useful even without filemon +# should be set by now +USE_FILEMON ?= no +.if ${USE_FILEMON:tl} != "no" +.PATH: ${srcdir}/filemon - SRCS+= filemon_${USE_FILEMON}.c ++SRCS += filemon_${USE_FILEMON}.c +COPTS.meta.c += -DUSE_FILEMON -DUSE_FILEMON_${USE_FILEMON:tu} +COPTS.job.c += ${COPTS.meta.c} + +.if ${USE_FILEMON} == "dev" +FILEMON_H ?= /usr/include/dev/filemon/filemon.h +.if exists(${FILEMON_H}) && ${FILEMON_H:T} == "filemon.h" +COPTS.filemon_dev.c += -DHAVE_FILEMON_H -I${FILEMON_H:H} +.endif +.elif ${USE_FILEMON} == "ktrace" +COPTS.filemon_ktrace.c += -Wno-error=unused-parameter +.endif + +.endif # USE_FILEMON + +.PATH: ${srcdir} + +# start-delete1 for bsd.after-import.mk +# we skip a lot of this when building as part of FreeBSD etc. + +# list of OS's which are derrived from BSD4.4 +BSD44_LIST = NetBSD FreeBSD OpenBSD DragonFly MirBSD Bitrig +# we are... +OS := ${.MAKE.OS:U${uname -s:L:sh}} +# are we 4.4BSD ? +isBSD44 := ${BSD44_LIST:M${OS}} + +.if ${isBSD44} == "" && ${OS:NCygwin:NDarwin:NLinux} != "" +MANTARGET ?= cat +.if ${MACHINE} == "sun386" +# even I don't have one of these anymore :-) +CFLAGS += -DPORTAR +.elif ${OS} != "SunOS" +# assume the worst +SRCS += sigcompat.c +CFLAGS += -DSIGNAL_FLAGS=SA_RESTART +.endif +.else +MANTARGET ?= man +.endif + +# turn this on by default - ignored if we are root +WITH_INSTALL_AS_USER = + +# suppress with -DWITHOUT_* +OPTIONS_DEFAULT_YES += \ + AUTOCONF_MK \ + INSTALL_MK \ + PROG_LINK \ + TESTS \ + +OPTIONS_DEFAULT_NO += \ + GEN_MAN \ + PROG_VERSION \ + +.if ${PROG} != "make" || ${srcdir} != ${.CURDIR} || !exists(${srcdir}/${MAN}) +WITH_GEN_MAN = 1 +.endif + +# process options now +.include + +.if ${MK_PROG_VERSION} == "yes" +PROG_NAME = ${PROG}-${_MAKE_VERSION} +.if ${MK_PROG_LINK} == "yes" +SYMLINKS += ${PROG_NAME} ${BINDIR}/${PROG} +.endif +.endif + - EXTRACT_MAN=no ++EXTRACT_MAN = no +# end-delete1 + +.if make(obj) || make(clean) +SUBDIR.${MK_TESTS} += unit-tests +.endif + +MAN1 = ${MAN} + +.if ${MK_GEN_MAN:Uno} == "yes" + +# we use this to generate ${MAN} +.include <${srcdir}/mk/genfiles.mk> + +.if ${PROG} != "make" +CLEANFILES += my.history +SED_CMDS.${MAN} += \ + -e '/^.Dt/s/MAKE/${PROG:tu}/' \ + -e '/^.Nm/s/make/${PROG}/' \ + +.endif + +.if ${CLEANFILES:U:Mmy.history} != "" +${MAN}: my.history +my.history: + @(echo ".Nm"; \ + echo "is derived from NetBSD"; \ + echo ".Xr make 1 ."; \ + echo "It uses autoconf to facilitate portability to other platforms."; \ + echo ".Pp") > $@ + +SED_CMDS.${MAN} += \ + -e '/^.Sh HISTORY/rmy.history' \ + -e '/^.Sh HISTORY/,/BUGS/s,^.Nm,make,' \ + +.endif + +.if ${.MAKE.OS:N*BSD} != "" +# assume .Nx is not supported +SED_CMDS.${MAN} += -e 's/^\.Nx/NetBSD/' +.endif + +# watch out for a late change of PROG +.if !empty(SRCS.${MAN}) +.NOPATH: ${MAN} +${MAN}: ${SRCS.${MAN}} _GENFILES_USE + +all man beforeinstall: ${MAN} - _mfromdir=. ++_mfromdir = . +.endif +.endif # MK_GEN_MAN + +MANTARGET ?= cat +MANDEST ?= ${MANDIR}/${MANTARGET}1 + +.if ${MANTARGET} == "cat" +_mfromdir = ${srcdir} +.endif + +.include + +CPPFLAGS += -DMAKE_NATIVE -DHAVE_CONFIG_H +COPTS.var.c += -Wno-cast-qual +COPTS.job.c += -Wno-format-nonliteral +COPTS.parse.c += -Wno-format-nonliteral +COPTS.var.c += -Wno-format-nonliteral + +# Force these +SHAREDIR = ${SHAREDIR.bmake:U${prefix}/share} +BINDIR = ${BINDIR.bmake:U${prefix}/bin} +MANDIR = ${MANDIR.bmake:U${SHAREDIR}/man} + +${OBJS}: config.h + +# start-delete2 for bsd.after-import.mk + +# make sure that MAKE_VERSION gets updated. +main.o: ${srcdir}/VERSION + +.if ${MK_AUTOCONF_MK} == "yes" +CONFIGURE_DEPS += ${.CURDIR}/VERSION +# we do not need or want the generated makefile +CONFIGURE_ARGS += --without-makefile +AUTOCONF_GENERATED_MAKEFILE = Makefile.config +.include +.endif +SHARE_MK ?= ${SHAREDIR}/mk +MKSRC = ${srcdir}/mk +INSTALL ?= ${srcdir}/install-sh + +.if ${MK_INSTALL_MK} == "yes" +install: install-mk +.endif + +beforeinstall: + test -d ${DESTDIR}${BINDIR} || ${INSTALL} -m ${DIRMODE} -d ${DESTDIR}${BINDIR} + test -d ${DESTDIR}${MANDEST} || ${INSTALL} -m ${DIRMODE} -d ${DESTDIR}${MANDEST} + +install-mk: +.if exists(${MKSRC}/install-mk) + test -d ${DESTDIR}${SHARE_MK} || ${INSTALL} -m ${DIRMODE} -d ${DESTDIR}${SHARE_MK} + sh ${MKSRC}/install-mk -v -m ${NONBINMODE} ${DESTDIR}${SHARE_MK} +.else + @echo need to unpack mk.tar.gz under ${srcdir} or set MKSRC; false +.endif +# end-delete2 + +# A simple unit-test driver to help catch regressions +TEST_MAKE ?= ${.OBJDIR}/${PROG:T} +accept test: .NOMETA + cd ${.CURDIR}/unit-tests && \ + MAKEFLAGS= ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS=${TESTS:Q}} + + +.if make(test) && ${MK_AUTO_OBJ} == "yes" +# The test target above visits unit-tests with -r -m / +# which prevents MK_AUTO_OBJ doing its job +# so do it here +.if defined(MAKEOBJDIRPREFIX) || ${MAKEOBJDIR:U:M*/*} != "" +_utobj = ${.OBJDIR}/unit-tests +.else +_utobj = ${.CURDIR}/unit-tests/${MAKEOBJDIR:Uobj} +.endif +utobj: .NOMETA + @test -d ${_utobj} && exit 0; \ + echo "[Creating ${_utobj}...]"; \ + umask ${OBJDIR_UMASK:U002}; \ + mkdir -p ${_utobj} +test: utobj +.endif diff --cc contrib/bmake/job.c index bd85e6d95fb8,775c8197ea19..d06b1570ba85 --- a/contrib/bmake/job.c +++ b/contrib/bmake/job.c @@@ -2207,15 -2169,9 +2186,15 @@@ Job_Init(void aborting = ABORT_NONE; job_errors = 0; + Always_pass_job_queue = GetBooleanExpr(MAKE_ALWAYS_PASS_JOB_QUEUE, + Always_pass_job_queue); + + Job_error_token = GetBooleanExpr(MAKE_JOB_ERROR_TOKEN, Job_error_token); + + /* - * There is a non-zero chance that we already have children. - * eg after 'make -f- < + +.if ${PROG} != "make" - CLEANFILES += my.history - SED_CMDS.${MAN} += \ ++CLEANFILES+= my.history ++SED_CMDS.${MAN}+= \ + -e '/^.Dt/s/MAKE/${PROG:tu}/' \ + -e '/^.Nm/s/make/${PROG}/' \ + +.endif + +.if ${CLEANFILES:U:Mmy.history} != "" +${MAN}: my.history +my.history: + @(echo ".Nm"; \ + echo "is derived from NetBSD"; \ + echo ".Xr make 1 ."; \ + echo "It uses autoconf to facilitate portability to other platforms."; \ + echo ".Pp") > $@ + - SED_CMDS.${MAN} += \ ++SED_CMDS.${MAN}+= \ + -e '/^.Sh HISTORY/rmy.history' \ + -e '/^.Sh HISTORY/,/BUGS/s,^.Nm,make,' \ + +.endif + +.if ${.MAKE.OS:N*BSD} != "" +# assume .Nx is not supported - SED_CMDS.${MAN} += -e 's/^\.Nx/NetBSD/' ++SED_CMDS.${MAN}+= -e 's/^\.Nx/NetBSD/' +.endif + +# watch out for a late change of PROG +.if !empty(SRCS.${MAN}) +.NOPATH: ${MAN} +${MAN}: ${SRCS.${MAN}} _GENFILES_USE + +all man beforeinstall: ${MAN} - _mfromdir = . ++_mfromdir= . +.endif +.endif # MK_GEN_MAN + - MANTARGET ?= cat - MANDEST ?= ${MANDIR}/${MANTARGET}1 ++MANTARGET?= cat ++MANDEST?= ${MANDIR}/${MANTARGET}1 + +.if ${MANTARGET} == "cat" - _mfromdir = ${srcdir} ++_mfromdir= ${srcdir} +.endif + +.include + - CPPFLAGS += -DMAKE_NATIVE -DHAVE_CONFIG_H - COPTS.var.c += -Wno-cast-qual - COPTS.job.c += -Wno-format-nonliteral - COPTS.parse.c += -Wno-format-nonliteral - COPTS.var.c += -Wno-format-nonliteral ++CPPFLAGS+= -DMAKE_NATIVE -DHAVE_CONFIG_H ++COPTS.var.c+= -Wno-cast-qual ++COPTS.job.c+= -Wno-format-nonliteral ++COPTS.parse.c+= -Wno-format-nonliteral ++COPTS.var.c+= -Wno-format-nonliteral + +# Force these - SHAREDIR = ${SHAREDIR.bmake:U${prefix}/share} - BINDIR = ${BINDIR.bmake:U${prefix}/bin} - MANDIR = ${MANDIR.bmake:U${SHAREDIR}/man} ++SHAREDIR= ${SHAREDIR.bmake:U${prefix}/share} ++BINDIR= ${BINDIR.bmake:U${prefix}/bin} ++MANDIR= ${MANDIR.bmake:U${SHAREDIR}/man} + +${OBJS}: config.h + + +# A simple unit-test driver to help catch regressions - TEST_MAKE ?= ${.OBJDIR}/${PROG:T} ++TEST_MAKE?= ${.OBJDIR}/${PROG:T} +accept test: .NOMETA + cd ${.CURDIR}/unit-tests && \ + MAKEFLAGS= ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS=${TESTS:Q}} + + +.if make(test) && ${MK_AUTO_OBJ} == "yes" +# The test target above visits unit-tests with -r -m / +# which prevents MK_AUTO_OBJ doing its job +# so do it here +.if defined(MAKEOBJDIRPREFIX) || ${MAKEOBJDIR:U:M*/*} != "" - _utobj = ${.OBJDIR}/unit-tests ++_utobj= ${.OBJDIR}/unit-tests +.else - _utobj = ${.CURDIR}/unit-tests/${MAKEOBJDIR:Uobj} ++_utobj= ${.CURDIR}/unit-tests/${MAKEOBJDIR:Uobj} +.endif +utobj: .NOMETA + @test -d ${_utobj} && exit 0; \ + echo "[Creating ${_utobj}...]"; \ + umask ${OBJDIR_UMASK:U002}; \ + mkdir -p ${_utobj} +test: utobj +.endif + +# override some simple things - BINDIR = /usr/bin - MANDIR = /usr/share/man/man ++BINDIR= /usr/bin ++MANDIR= /usr/share/man/man + +# make sure we get this - CFLAGS += ${COPTS.${.IMPSRC:T}} ++CFLAGS+= ${COPTS.${.IMPSRC:T}} + +after-import: ${SRCTOP}/contrib/bmake/bsd.after-import.mk + cd ${.CURDIR} && ${.MAKE} -f ${SRCTOP}/contrib/bmake/bsd.after-import.mk + diff --cc usr.bin/bmake/Makefile.config index 9ca3691cbb2a,000000000000..a5e81a13cd0a mode 100644,000000..100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@@ -1,28 -1,0 +1,28 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# + +SRCTOP?= ${.CURDIR:H:H} + +# things set by configure + - _MAKE_VERSION?=20250125 ++_MAKE_VERSION?=20250308 + +prefix?= /usr +srcdir= ${SRCTOP}/contrib/bmake +CC?= cc +MAKE_OS?= +DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk + - EGREP = egrep ++EGREP= egrep +CPPFLAGS+= +CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H +LDFLAGS+= +LIBOBJS+= ${LIBOBJDIR}stresep$U.o +LDADD+= +USE_META?= yes +USE_FILEMON?= dev +FILEMON_H?= /usr/include/dev/filemon/filemon.h +BMAKE_PATH_MAX?= 1024 +# used if MAXPATHLEN not defined +CPPFLAGS+= -DBMAKE_PATH_MAX=${BMAKE_PATH_MAX} diff --cc usr.bin/bmake/unit-tests/Makefile index 7011ab754b9e,000000000000..cdf252d5e474 mode 100644,000000..100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@@ -1,918 -1,0 +1,918 @@@ +# This is a generated file, do NOT edit! +# See contrib/bmake/bsd.after-import.mk +# +# $Id: Makefile,v 1.230 2025/01/30 18:04:20 sjg Exp $ +# +# $NetBSD: Makefile,v 1.355 2025/01/25 22:46:30 sjg Exp $ +# +# Unit tests for make(1) +# +# The main targets are: +# +# all: +# run all the tests +# test: +# run 'all', and compare to expected results +# accept: +# move generated output to expected results +# +# Settable variables +# +# TEST_MAKE +# The make program to be tested. +# +# +# Adding a test case +# +# Each feature should get its own set of tests in its own suitably +# named makefile (*.mk), with its own set of expected results (*.exp), +# and it should be added to the TESTS list. +# + +.MAIN: all + +# we use these below but we might be an older make +.MAKE.OS?= ${uname -s:L:sh} +.MAKE.UID?= ${id -u:L:sh} + +# for many tests we need a TMPDIR that will not collide +# with other users. +.if ${.OBJDIR} != ${.CURDIR} +# easy +TMPDIR:= ${.OBJDIR}/tmp +.elif defined(TMPDIR) +TMPDIR:= ${TMPDIR}/uid${.MAKE.UID} +.else +TMPDIR:= /tmp/uid${.MAKE.UID} +.endif +# make sure it exists +.if !exist(${TMPDIR}) +_!= mkdir -p ${TMPDIR} +.endif +# and clean it up - outside the context of +# any target that might be using it. +.END: rm-tmpdir +rm-tmpdir: .NOMETA + @rm -rf ${TMPDIR} + +# Each test is in a sub-makefile. +# Keep the list sorted. +# Any test that is commented out must be ignored in +# src/tests/usr.bin/make/t_make.sh as well. +#TESTS+= archive +#TESTS+= archive-suffix +TESTS+= cmd-errors +TESTS+= cmd-errors-jobs +TESTS+= cmd-errors-lint +TESTS+= cmd-interrupt +TESTS+= cmdline +TESTS+= cmdline-redirect-stdin +TESTS+= cmdline-undefined +TESTS+= comment +TESTS+= compat-error +TESTS+= cond-cmp-numeric +TESTS+= cond-cmp-numeric-eq +TESTS+= cond-cmp-numeric-ge +TESTS+= cond-cmp-numeric-gt +TESTS+= cond-cmp-numeric-le +TESTS+= cond-cmp-numeric-lt +TESTS+= cond-cmp-numeric-ne +TESTS+= cond-cmp-string +TESTS+= cond-cmp-unary +TESTS+= cond-eof +TESTS+= cond-func +TESTS+= cond-func-commands +TESTS+= cond-func-defined +TESTS+= cond-func-empty +TESTS+= cond-func-exists +TESTS+= cond-func-make +TESTS+= cond-func-make-main +TESTS+= cond-func-target +TESTS+= cond-late +TESTS+= cond-op +TESTS+= cond-op-and +TESTS+= cond-op-and-lint +TESTS+= cond-op-not +TESTS+= cond-op-or +TESTS+= cond-op-or-lint +TESTS+= cond-op-parentheses +TESTS+= cond-short +TESTS+= cond-token-number +TESTS+= cond-token-plain +TESTS+= cond-token-string +TESTS+= cond-token-var +TESTS+= cond-undef-lint +TESTS+= counter +TESTS+= counter-append +TESTS+= dep +TESTS+= dep-colon +TESTS+= dep-colon-bug-cross-file +TESTS+= dep-double-colon +TESTS+= dep-double-colon-indep +TESTS+= dep-duplicate +TESTS+= dep-exclam +TESTS+= dep-none +TESTS+= dep-op-missing +TESTS+= dep-percent +TESTS+= dep-var +TESTS+= dep-wildcards +TESTS+= depsrc +TESTS+= depsrc-end +TESTS+= depsrc-exec +TESTS+= depsrc-ignore +TESTS+= depsrc-made +TESTS+= depsrc-make +TESTS+= depsrc-meta +TESTS+= depsrc-nometa +TESTS+= depsrc-nometa_cmp +TESTS+= depsrc-nopath +TESTS+= depsrc-notmain +TESTS+= depsrc-optional +TESTS+= depsrc-phony +TESTS+= depsrc-precious +TESTS+= depsrc-recursive +TESTS+= depsrc-silent +TESTS+= depsrc-use +TESTS+= depsrc-usebefore +TESTS+= depsrc-usebefore-double-colon +TESTS+= depsrc-wait +TESTS+= deptgt +TESTS+= deptgt-begin +TESTS+= deptgt-begin-fail +TESTS+= deptgt-begin-fail-indirect +TESTS+= deptgt-default +TESTS+= deptgt-delete_on_error +TESTS+= deptgt-end +TESTS+= deptgt-end-fail +TESTS+= deptgt-end-fail-all +TESTS+= deptgt-end-fail-indirect +TESTS+= deptgt-end-jobs +TESTS+= deptgt-error +TESTS+= deptgt-ignore +TESTS+= deptgt-interrupt +TESTS+= deptgt-main +TESTS+= deptgt-makeflags +TESTS+= deptgt-no_parallel +TESTS+= deptgt-nopath +TESTS+= deptgt-notparallel +TESTS+= deptgt-objdir +TESTS+= deptgt-order +TESTS+= deptgt-path +TESTS+= deptgt-path-suffix +TESTS+= deptgt-phony +TESTS+= deptgt-posix +TESTS+= deptgt-precious +TESTS+= deptgt-shell +TESTS+= deptgt-silent +TESTS+= deptgt-silent-jobs +TESTS+= deptgt-stale +TESTS+= deptgt-suffixes +TESTS+= dir +TESTS+= dir-expand-path +TESTS+= directive +TESTS+= directive-dinclude +TESTS+= directive-elif +TESTS+= directive-elifdef +TESTS+= directive-elifmake +TESTS+= directive-elifndef +TESTS+= directive-elifnmake +TESTS+= directive-else +TESTS+= directive-endfor +TESTS+= directive-endif +TESTS+= directive-error +TESTS+= directive-export +TESTS+= directive-export-env +TESTS+= directive-export-impl +TESTS+= directive-export-gmake +TESTS+= directive-export-literal +TESTS+= directive-for +TESTS+= directive-for-break +TESTS+= directive-for-empty +TESTS+= directive-for-errors +TESTS+= directive-for-escape +TESTS+= directive-for-generating-endif +TESTS+= directive-for-if +TESTS+= directive-for-lines +TESTS+= directive-for-null +TESTS+= directive-hyphen-include +TESTS+= directive-if +TESTS+= directive-if-nested +TESTS+= directive-ifdef +TESTS+= directive-ifmake +TESTS+= directive-ifndef +TESTS+= directive-ifnmake +TESTS+= directive-include +TESTS+= directive-include-fatal +TESTS+= directive-include-guard +TESTS+= directive-info +TESTS+= directive-misspellings +TESTS+= directive-sinclude +TESTS+= directive-undef +TESTS+= directive-unexport +TESTS+= directive-unexport-env +TESTS+= directive-warning +TESTS+= dollar +TESTS+= doterror +TESTS+= dotwait +TESTS+= error +TESTS+= # escape # broken by reverting POSIX changes +TESTS+= export +TESTS+= export-all +TESTS+= export-env +TESTS+= export-variants +TESTS+= gnode-submake +TESTS+= hanoi-include +TESTS+= impsrc +TESTS+= include-main +TESTS+= job-flags +TESTS+= job-output-long-lines +TESTS+= job-output-null +TESTS+= jobs-empty-commands +TESTS+= jobs-empty-commands-error +TESTS+= jobs-error-indirect +TESTS+= jobs-error-nested +TESTS+= jobs-error-nested-make +TESTS+= lint +TESTS+= make-exported +TESTS+= meta-cmd-cmp +TESTS+= moderrs +TESTS+= modmisc +.if ${.MAKE.UID} > 0 +TESTS+= objdir-writable +.endif +TESTS+= opt +TESTS+= opt-backwards +TESTS+= opt-chdir +TESTS+= opt-debug +TESTS+= opt-debug-all +TESTS+= opt-debug-archive +TESTS+= opt-debug-curdir +TESTS+= opt-debug-cond +TESTS+= opt-debug-dir +TESTS+= opt-debug-errors +TESTS+= opt-debug-errors-jobs +TESTS+= opt-debug-file +TESTS+= opt-debug-for +TESTS+= opt-debug-graph1 +TESTS+= opt-debug-graph2 +TESTS+= opt-debug-graph3 +TESTS+= opt-debug-hash +TESTS+= opt-debug-jobs +TESTS+= opt-debug-lint +TESTS+= opt-debug-loud +TESTS+= opt-debug-meta +TESTS+= opt-debug-making +TESTS+= opt-debug-no-rm +TESTS+= opt-debug-parse +TESTS+= opt-debug-suff +TESTS+= opt-debug-targets +TESTS+= opt-debug-varraw +TESTS+= opt-debug-var +TESTS+= opt-debug-x-trace +TESTS+= opt-define +TESTS+= opt-env +TESTS+= opt-file +TESTS+= opt-ignore +TESTS+= opt-include-dir +TESTS+= opt-jobs +TESTS+= opt-jobs-internal +TESTS+= opt-jobs-no-action +TESTS+= opt-keep-going +TESTS+= opt-keep-going-indirect +TESTS+= opt-keep-going-multiple +TESTS+= opt-m-include-dir +TESTS+= opt-no-action +TESTS+= opt-no-action-at-all +TESTS+= opt-no-action-runflags +TESTS+= opt-no-action-touch +TESTS+= opt-query +TESTS+= opt-raw +TESTS+= opt-silent +TESTS+= opt-touch +TESTS+= opt-touch-jobs +TESTS+= opt-tracefile +TESTS+= opt-var-expanded +TESTS+= opt-var-literal +TESTS+= opt-version +TESTS+= opt-warnings-as-errors +TESTS+= opt-where-am-i +TESTS+= opt-x-reduce-exported +TESTS+= order +TESTS+= parse +TESTS+= parse-var +TESTS+= phony-end +TESTS+= posix +TESTS+= # posix1 # broken by reverting POSIX changes +TESTS+= recursive +TESTS+= sh +TESTS+= sh-dots +TESTS+= sh-errctl +TESTS+= sh-flags +TESTS+= sh-jobs +TESTS+= sh-jobs-error +TESTS+= sh-leading-at +TESTS+= sh-leading-hyphen +TESTS+= sh-leading-plus +TESTS+= sh-meta-chars +TESTS+= sh-multi-line +TESTS+= sh-single-line +TESTS+= shell-csh +TESTS+= shell-custom +.if exists(/bin/ksh) +TESTS+= shell-ksh +.endif +TESTS+= shell-sh +TESTS+= suff +TESTS+= suff-add-later +TESTS+= suff-clear-regular +TESTS+= suff-clear-single +TESTS+= suff-incomplete +TESTS+= suff-lookup +TESTS+= suff-main +TESTS+= suff-main-several +TESTS+= suff-phony *** 586 LINES SKIPPED *** From nobody Wed Mar 19 21:23:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ1sv4SNKz5qjSb; Wed, 19 Mar 2025 21:23:47 +0000 (UTC) (envelope-from chuq@chuq.com) Received: from mail.vc.panix.com (mail.vc.panix.com [166.84.1.92]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ1sv2Nz6z3Y0R; Wed, 19 Mar 2025 21:23:47 +0000 (UTC) (envelope-from chuq@chuq.com) Authentication-Results: mx1.freebsd.org; none Received: from vc.chuq.com (vc.chuq.com [166.84.7.169]) by mail.vc.panix.com (Postfix) with ESMTPS id 4ZJ1sm6rLRz4P0d; Wed, 19 Mar 2025 17:23:40 -0400 (EDT) Received: from spathi.chuq.com (spathi.chuq.com [24.6.146.244]) by vc169.vc.panix.com (Postfix) with ESMTPS id 810933B5D7F; Wed, 19 Mar 2025 14:23:40 -0700 (PDT) (envelope-from chuq@chuq.com) Received: by spathi.chuq.com (Postfix, from userid 1022) id AE4F83CFFA25; Wed, 19 Mar 2025 14:23:39 -0700 (PDT) Date: Wed, 19 Mar 2025 14:23:39 -0700 From: Chuck Silvers To: Brooks Davis Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 623be660fcc9 - main - beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS Message-ID: References: <202503192022.52JKMaUG019132@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: 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:2033, ipnet:166.84.0.0/16, country:US] X-Rspamd-Queue-Id: 4ZJ1sv2Nz6z3Y0R X-Spamd-Bar: ---- On Wed, Mar 19, 2025 at 08:44:13PM +0000, Brooks Davis wrote: > On Wed, Mar 19, 2025 at 08:22:36PM +0000, Chuck Silvers wrote: > > The branch main has been updated by chs: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > > > commit 623be660fcc9860c0e8b99e8c2c4bbdefc121fd1 > > Author: Chuck Silvers > > AuthorDate: 2025-03-19 19:48:10 +0000 > > Commit: Chuck Silvers > > CommitDate: 2025-03-19 19:48:10 +0000 > > > > beep: add missing include of src.opts.mk, use LIBADD instead of LDFLAGS > > > > Sponsored by: Netflix > > --- > > usr.bin/beep/Makefile | 5 +++-- > > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile > > index f252ab64f843..8388ff7ff986 100644 > > --- a/usr.bin/beep/Makefile > > +++ b/usr.bin/beep/Makefile > > @@ -1,6 +1,7 @@ > > +.include > > Why add src.opts.mk? Nothing is using it and bsd.prog.mk will include > it. Is there another change coming that will use it? > > -- Brooks > > > + > > PROG= beep > > MAN= beep.1 > > - > > -LDFLAGS= -lm > > +LIBADD= m > > > > .include > > the motivation for these changes is that I want to be able to add something to LDFLAGS in /etc/src.conf and have that actually affect every executable and shared library that is built. we don't actually care about beep or trim, I just noticed that they were not getting the LDFLAGS from src.conf and thought I would fix them for completeness. adding the include of src.opts.mk seemed to fix that. also, a great many makefiles include src.opts.mk as the first thing and I thought that was just some boilerplate that was expected to be done everywhere and had been overlooked in these two. at that point I had not changed the usage of LDFLAGS in these two makefiles. then as I was arranging this stuff to commit, I grep'ed for other makefiles that assign rather than append to LDFLAGS (like I had found in bsnmpd) and found that these same two makefiles also incorrectly assigned to LDFLAGS, so then I added the other changes you see in those two commits. I'm not sure why I thought that including src.opts.mk without changing the LDFLAGS usage made things work initially. I tried that again just now and indeed it doesn't help, and the parts that remove the assignment to LDFLAGS are enough. maybe I had something stale in my obj dir before? anyway, I'd be happy to remove the include of src.opts.mk from these again if you'd like. -Chuck From nobody Wed Mar 19 22:12:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ2yQ1rKSz5qnG2 for ; Wed, 19 Mar 2025 22:12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ2yP5mDSz3KFd; Wed, 19 Mar 2025 22:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742422365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dDgzVIJFUBvbNK64Mu5KEcpvWEiIP/1drcN4nyVtW2E=; b=ezSU6QFriTR3GcI9D99VBTWfg+J92KP8H/PWHLhzzTFlWQeFwgbjWrikE/+r9sD5PbqdXa X8H+wVPvtTRrppNYhuOidtXIB1RkDzffQVLFuUp6WkKP5NfwK2myBTBwpX7DCOnSAwwLm2 yiP+4pfqC3iybzRvxnCtz1b8cpJxYhvDTbRvO4FbXDV/fCqxsIjgzOf3Rr0hmO7zmvTxQP lvSaGMoOWkxJkdyoGrFrFldDT6HqwOuXN5NkkGZR/yYUD1pJ5pmdV6xO/MB+sdpWw7U9UO C/dCbmdQecqKkJmp8Z5QOIIG0MUsYOkiwZkfNhZLCnmIuUiaxA4qCmUoRZGB7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742422365; a=rsa-sha256; cv=none; b=hqNoIUfmgbnHSRde87JmkPK4pwdsOSMR+Ip0RsjrooaXRRhj1k56tnw8+LS93aymcIzgAT GDr2o98xBMNlHpJVvHMl8Xafz5gYx3Bqp6oA77z5z4a5HoIYBgc7XsChBSLMmwzt06kzow 38dlKEarEmFdLLJvaqydFveOB6RFUBiftxaqbu889S77GJvF6BjUcY9az0omJNGyMFoqkW P6dMZfsOVBkysXEPNQK+BQtmse6OW8GHiRBeYDJ0Rrtag2E3p4s1xuBG/4Z75MMKAA4Ydt OhmdIjTSCe2xvIOvJtlU/NlpWuWESZpDaF/gS77yi87suTCUMnaM0BJVUvhBMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742422365; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dDgzVIJFUBvbNK64Mu5KEcpvWEiIP/1drcN4nyVtW2E=; b=jnv37hOjZACzTolqeFKacqtAOmL4rbp0b8uIWHnBH6s7JBJXpOLBYoWRe302KT/smZWC3L jM2eGq2jsgL1uphgOgzwJoP9BPHWkkC+RL3Yy7/InZ1rag337zJS/dYakRbHm/hadnAvqR T2UZ8iUm+ZmhczmCAoRRGynFjY0TYwUVVLzulxWfyPWaSvqEeqVrqIav5iuhfyhbasytoh I98Coi0aD7ycVgJJaXc6+cdgokS9X3eLAAXZGy9hMSarwxNDvwyakx91RzUh2xULciFNSf RsdOpFj09C2mmbVRsKKF0tKVkz3bpweLh7dgg0wYWvEZikl32ynWKf6GlBP3mQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ2yP4ggxzf8q; Wed, 19 Mar 2025 22:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMCj4a024535; Wed, 19 Mar 2025 22:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMCjDT024534; Wed, 19 Mar 2025 22:12:45 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:12:45 GMT Message-Id: <202503192212.52JMCjDT024534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Cy Schubert Subject: git: 1a79b20663ca..8f7d3ef26dec - vendor/krb5 - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/vendor/krb5 X-Git-Reftype: branch X-Git-Commit: 8f7d3ef26dec89a92ec0665de84a5936310a5574 X-Git-Oldrev: 1a79b20663ca26acc2998b90ea2ff2aefd8af5b1 X-Git-Newrev: 8f7d3ef26dec89a92ec0665de84a5936310a5574 Auto-Submitted: auto-generated The branch vendor/krb5 has been updated by cy: URL: https://cgit.FreeBSD.org/src/log/?id=1a79b20663ca..8f7d3ef26dec 8f7d3ef26dec krb5: Import MIT 1.21.3 From nobody Wed Mar 19 22:27:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ3Gy0lcjz5qp2H; Wed, 19 Mar 2025 22:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3Gx25fDz3b1L; Wed, 19 Mar 2025 22:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H02kdjpLxNZoeWieswNFI7pvuthZC1rY4zFvsCkpzxo=; b=rGMflxzozl1DFz9qrkfN59GiJj5wq21T8hU7G6my5xtiiUprFGoGXpq9AmWXaX3naYWo7c 84zjvZqn8aNE2WH2gRJpaYFY67sPXuVy5Tm0Rli/qVq0ILkJxYLytvKF/g885iajDtYQF+ EfssbVbPpadSxwDALPflhmSOOGoMALgJrJ3DwO1B8UKOZPnwccPZJQ7fa2jykf8DPTMTU+ /JlOBBEFJJqC0g5Dw+ZJyNJBlka4X7ARmSn8E8lyWqAYC58zaH9qxoUdGUec3k5seDTY/w wMA436+sw242eaI9nX9R4Eia4IVXrnFeEOJxe2R1U5SEVtZt+p5lk7VfqvT1XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423225; a=rsa-sha256; cv=none; b=Wlc+swZaiaHkLEcZDzuL9wLmu0J+TQlYLnuZst+L/nO220jYw6eGcHJAQGDTVruDsigYMI 2gg1wxlbnYIs5iMBKwiMa10SGk4itROZ1Is//Kp5rxTj5DYOY6T+/tu+jwiY+gd7Ky9xUa djImxR6uVjpjn2Onn8qWsekOjgTpTytLx98bF+UOC5c9G7Hdn/FygQsJ4HLAvXPfubCnf9 sfOHkdm1FzpsEHMJHVe4FlBjc72n2HO8/Sc3knVx96CCY2lxYr+UNh2hO+5MzwOGhadq3L ATlTc912pofNTfhbDAnVKVYxxRQZS5vrAk6w9rIru72efPN9GlgUhfSK00Nh2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H02kdjpLxNZoeWieswNFI7pvuthZC1rY4zFvsCkpzxo=; b=rPeN3J0RzHZ4/W0GFudklAnxo9i0DTrawmP+M6qBIFZ9q2WZVS2Em0trRBYbj59y3uTLQm 7u0TIWo9butCf5IoApG9JPhEHntWFoW1q0cRtdKmDV+nn+aNMkQSMp/l5YTLvteIzNea3K hO9+rnu1PaN+fdJtE7/qz90KTwx6VobyKIfvsy/zudeC/vHTrWnifqFpwt3Uql3rjToavE kLrCqJTDgCPS0X4HwwhxT7VAZqxLHRUp8KTO81XcvHh4IEgeBX078REqSepUcHX1K1zBoX zWmr3NgdTMjbaadsYJOzzU8wqQSlCvYAPYqsosd5tOAaCp51uHr8+mXL4m6QLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ3Gx1gPSzfgk; Wed, 19 Mar 2025 22:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMR53n044611; Wed, 19 Mar 2025 22:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMR55i044608; Wed, 19 Mar 2025 22:27:05 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:27:05 GMT Message-Id: <202503192227.52JMR55i044608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: f966ed85ac95 - stable/14 - net80211: Fix IEEE80211_KEY_UNDEFINED() in ieee80211_node_delucastkey() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f966ed85ac954bfe89652eb8bce7115a9207fc82 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f966ed85ac954bfe89652eb8bce7115a9207fc82 commit f966ed85ac954bfe89652eb8bce7115a9207fc82 Author: Bjoern A. Zeeb AuthorDate: 2025-03-05 00:02:50 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-19 22:22:15 +0000 net80211: Fix IEEE80211_KEY_UNDEFINED() in ieee80211_node_delucastkey() The adjustment of the check in 9763fec11b83 inverted the logic. Fix this. Sponsored by: The FreeBSD Foundation MFC after: 3 days Fixes: 9763fec11b83 Reported by: KUROSAWA Takahiro (takahiro.kurosawa gmail.com) in D48980 Reviewed by: KUROSAWA Takahiro (takahiro.kurosawa gmail.com), adrian Differential Revision: https://reviews.freebsd.org/D49234 (cherry picked from commit 27bf5c405bf2eb69392e45c06605defc78882612) --- sys/net80211/ieee80211_node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index f2fc3d21a361..ae22dc036bb6 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -2209,7 +2209,7 @@ ieee80211_node_delucastkey(struct ieee80211_node *ni) IEEE80211_NODE_LOCK(nt); nikey = NULL; status = 1; /* NB: success */ - if (IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { + if (!IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { keyix = ni->ni_ucastkey.wk_rxkeyix; status = ieee80211_crypto_delkey(ni->ni_vap, &ni->ni_ucastkey); if (nt->nt_keyixmap != NULL && keyix < nt->nt_keyixmax) { From nobody Wed Mar 19 22:27:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ3Gy5RPhz5qp4R; Wed, 19 Mar 2025 22:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3Gy35LXz3Zn5; Wed, 19 Mar 2025 22:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dSIM6VH9ZMvBMfhnwXkY8v5ozml48rrniWf2m6Cg/Ks=; b=cIwvRvpNUNidFjPVJAjqB9ZP64a3fL7nkSF+OiRM+SpXaIXRv8BnS7A/uiE2ExDdjyTmEO JcXax8RXyVZeIveEJe3pfzRXBNIOuTOKCs7Eo06G860Zx9d+5dW/T4t0L5rRKJMNplrUC3 JSE9AXu6GUKOjccDdOKQVLeYSj8vh1YtWIeJeaMu9tSgWaHJtg6onfdx5P6GIca1mumBHE YetHnunGamVMoPbItIF7TBnPA2UsCfkd5gdTRoSywYibgpRB05goxrv9mFyrTR4SGgWhUg 4TC2K4AmdZJW3i4abtMIKVu7f5LWC5UMfPod3Hj+Dt6EamqdwCO+y0xOiQV5aA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423226; a=rsa-sha256; cv=none; b=sA+0rChhuMZCSAaUYiPKXzCzRD48k9Jy4gMl0Lh//JxGaLHmeC0UgAPaO8dqx/lnRsLa7f HeSDejwmRnixR0VpoSOLalYZ7X3HHr3dOEPDZKgJHq+M8MCXwv5bKfzolMxSzTnhsNUe7m rDQ0CEa2zO0xn/UYghU+Gp1eZ2BGnLC6amz4T8SREEVk9NEptEWN2L83IB32xdcJgYXZx5 ijeXnL4kTRJp9rwJmZCfDeGX8LKaXZxQzP9eLB6JM55rNa861d5pteWaFEsuRZA2f1x1ir PXCoNRP5+ED3XBj8KcMTa5ozI+rfXe7jYs9krBKp6jzJNMsvRPr+IzrH3WqfdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dSIM6VH9ZMvBMfhnwXkY8v5ozml48rrniWf2m6Cg/Ks=; b=nvHI4pTc/PNNdRKx3wVCF+4lY05nlH9XCYA+SbVMgHMW2V/xOQQBtrjNoEt0vk46eId5iD USlhoTZTV177WDI1abAitBhVRGDrxdvs8vUBDm5pzOmcnuC0IcTbil7Mf1a4tqOH15pkkU YNOZ5jRYq3v2PxNzMjTqceZq+63Ylvdzc+xfTLYOlKrabUCzg4bHJtWotv+NWIKev0DRzY D0YbesD89ThaIY6P63XwsB36xRp9nVRMMRqRaByubXTTVV0IGigrsJpXfcwJSPCZGZUlca ttHDPRpjAO++JKDyPnQuTUDWgUq7eWOQcKHtlzaPAPFdQHOwhhCwQkUzEksOKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ3Gy2jJmzfJZ; Wed, 19 Mar 2025 22:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMR6cX044647; Wed, 19 Mar 2025 22:27:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMR6MW044644; Wed, 19 Mar 2025 22:27:06 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:27:06 GMT Message-Id: <202503192227.52JMR6MW044644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fecc36e328e7 - stable/14 - LinuxKPI: 802.11: improve key update locking to work around net80211 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fecc36e328e7d37e68e806f8614c56264498fd99 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fecc36e328e7d37e68e806f8614c56264498fd99 commit fecc36e328e7d37e68e806f8614c56264498fd99 Author: Bjoern A. Zeeb AuthorDate: 2025-03-06 13:17:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-19 22:22:15 +0000 LinuxKPI: 802.11: improve key update locking to work around net80211 As indicated in 11db70b6057e there was another panic on key removal which could no longer be reproduced. As originally assumed the problem was "hidden" by commit 9763fec11b83 as mentioned in 11db70b6057e. Said commit had logic inverted and 27bf5c405bf2 fixed that and with that the possible panic came back. The problem exists because some code paths out of net80211 are locked while others are not. This opens a possible race in net80211 which was tracked by extra logging in (*iv_key_update_begin)() (log lines shortend): key_update_begin: tid 100112 vap X nt Y unlocked key_update_begin: tid 100133 vap X nt Y locked One thread can be wpa_supplicant, the other is driven from the driver net80211 taskq. Further LinuxKPI needs to unlock (conditionally in case the lock is held) as a downcall to the driver/FW may sleep. This opens up possibilities for said race even further so that we observe it more reliably. This all leads to one thread calling down into the driver/firmware (unlocked) while the other will get to the same place (after acquiring the wiphy lock) before the nt re-lock happens and thus state checks did not catch this either. For LinuxKPI work around the problem utilizing (*iv_key_update_begin/end)() and taking the wiphy_lock() there holding it over the entire operation. Given we still have to conditionally unlock we need to keep track from _begin to _end on whether we have to re-lock. The checks for this need to be done under the wiphy_lock(). While a bool would suffice we use a refcount to make any future debugging easier. This isn't the most elegant solution but having the wiphy lock covering the full operation allows the 2nd thread to later run through the same code path and find the key gone (which we already checked). It remains questionable if (*iv_key_update_begin/end)() is the correct solution (as there are futher callers covering which would not need the unlock cycle) or if it should be done in the current code. The former will allow us to cover a full key store which we will need in case we will implement suspend/resume beyond what is done in native drivers/net80211 currently, if we will factor out the crypto locking for good, and fix the inconsistent locking of the nt (NODE) lock in net80211. Alternate solutions were discussed on freebsd-wireless today (2025-03-06, in the thread "Re: HEADS UP! Do not update on main currently (panic - on boot)"). Sponsored by: The FreeBSD Foundation X-MFC with: 27bf5c405bf2 Differential Revision: https://reviews.freebsd.org/D49256 (cherry picked from commit b8dfc3ecf7031a0a7764cdb67d85ebe0c03d5d93) --- sys/compat/linuxkpi/common/src/linux_80211.c | 99 +++++++++++++++++++++++----- sys/compat/linuxkpi/common/src/linux_80211.h | 2 + 2 files changed, 85 insertions(+), 16 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 9c3ca961d6be..b0bf54744e3a 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -1135,9 +1135,7 @@ _lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) struct ieee80211_sta *sta; struct ieee80211_node *ni; struct ieee80211_key_conf *kc; - struct ieee80211_node_table *nt; int error; - bool islocked; ic = vap->iv_ic; lhw = ic->ic_softc; @@ -1172,13 +1170,6 @@ _lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) return (1); } - /* This is inconsistent net80211 locking to be fixed one day. */ - nt = &ic->ic_sta; - islocked = IEEE80211_NODE_IS_LOCKED(nt); - if (islocked) - IEEE80211_NODE_UNLOCK(nt); - - wiphy_lock(hw->wiphy); kc = lsta->kc[k->wk_keyix]; /* Re-check under lock. */ if (kc == NULL) { @@ -1210,9 +1201,6 @@ _lkpi_iv_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) free(kc, M_LKPI80211); error = 1; out: - wiphy_unlock(hw->wiphy); - if (islocked) - IEEE80211_NODE_LOCK(nt); ieee80211_free_node(ni); return (error); } @@ -1262,7 +1250,6 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) } sta = LSTA_TO_STA(lsta); - wiphy_lock(hw->wiphy); if (lsta->kc[k->wk_keyix] != NULL) { IMPROVE("Still in firmware? Del first. Can we assert this cannot happen?"); ic_printf(ic, "%s: sta %6D found with key information\n", @@ -1283,7 +1270,6 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) ic_printf(ic, "%s: CIPHER SUITE %#x (%s) not supported\n", __func__, lcipher, lkpi_cipher_suite_to_name(lcipher)); IMPROVE(); - wiphy_unlock(hw->wiphy); ieee80211_free_node(ni); return (0); } @@ -1324,7 +1310,6 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) __func__, SET_KEY, "SET", sta->addr, ":", error); lsta->kc[k->wk_keyix] = NULL; free(kc, M_LKPI80211); - wiphy_unlock(hw->wiphy); ieee80211_free_node(ni); return (0); } @@ -1337,7 +1322,6 @@ _lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) kc, kc->keyidx, kc->hw_key_idx, kc->flags); #endif - wiphy_unlock(hw->wiphy); ieee80211_free_node(ni); return (1); } @@ -1348,6 +1332,86 @@ lkpi_iv_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k) return (_lkpi_iv_key_set(vap, k)); } + +static void +lkpi_iv_key_update_begin(struct ieee80211vap *vap) +{ + struct ieee80211_node_table *nt; + struct ieee80211com *ic; + struct lkpi_hw *lhw; + struct ieee80211_hw *hw; + struct lkpi_vif *lvif; + bool islocked; + + ic = vap->iv_ic; + lhw = ic->ic_softc; + hw = LHW_TO_HW(lhw); + lvif = VAP_TO_LVIF(vap); + nt = &ic->ic_sta; + + islocked = IEEE80211_NODE_IS_LOCKED(nt); + +#ifdef LINUXKPI_DEBUG_80211 + if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) + ic_printf(vap->iv_ic, "%s: tid %d vap %p nt %p %slocked " + "lvif nt_unlocked %d\n", __func__, curthread->td_tid, + vap, nt, islocked ? "" : "un", lvif->nt_unlocked); +#endif + + /* This is inconsistent net80211 locking to be fixed one day. */ + if (islocked) + IEEE80211_NODE_UNLOCK(nt); + + wiphy_lock(hw->wiphy); + + /* + * nt_unlocked could be a bool given we are under the lock and there + * must only be a single thread. + * In case anything in the future disturbs the order the refcnt will + * help us catching problems a lot easier. + */ + if (islocked) + refcount_acquire(&lvif->nt_unlocked); +} + +static void +lkpi_iv_key_update_end(struct ieee80211vap *vap) +{ + struct ieee80211_node_table *nt; + struct ieee80211com *ic; + struct lkpi_hw *lhw; + struct ieee80211_hw *hw; + struct lkpi_vif *lvif; + bool islocked; + + ic = vap->iv_ic; + lhw = ic->ic_softc; + hw = LHW_TO_HW(lhw); + lvif = VAP_TO_LVIF(vap); + nt = &ic->ic_sta; + + islocked = IEEE80211_NODE_IS_LOCKED(nt); + MPASS(!islocked); + +#ifdef LINUXKPI_DEBUG_80211 + if (linuxkpi_debug_80211 & D80211_TRACE_HW_CRYPTO) + ic_printf(vap->iv_ic, "%s: tid %d vap %p nt %p %slocked " + "lvif nt_unlocked %d\n", __func__, curthread->td_tid, + vap, nt, islocked ? "" : "un", lvif->nt_unlocked); +#endif + + /* + * Check under lock; see comment in lkpi_iv_key_update_begin(). + * In case the refcnt gets out of sync locking in net80211 will + * quickly barf as well (trying to unlock a lock not held). + */ + islocked = refcount_release_if_last(&lvif->nt_unlocked); + wiphy_unlock(hw->wiphy); + + /* This is inconsistent net80211 locking to be fixed one day. */ + if (islocked) + IEEE80211_NODE_LOCK(nt); +} #endif static u_int @@ -3413,6 +3477,7 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], mtx_init(&lvif->mtx, "lvif", NULL, MTX_DEF); INIT_LIST_HEAD(&lvif->lsta_list); lvif->lvif_bss = NULL; + refcount_init(&lvif->nt_unlocked, 0); lvif->lvif_bss_synched = false; vap = LVIF_TO_VAP(lvif); @@ -3545,6 +3610,8 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], if (lkpi_hwcrypto && lhw->ops->set_key != NULL) { vap->iv_key_set = lkpi_iv_key_set; vap->iv_key_delete = lkpi_iv_key_delete; + vap->iv_key_update_begin = lkpi_iv_key_update_begin; + vap->iv_key_update_end = lkpi_iv_key_update_end; } #endif diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index b17e6072066c..c2d29b2dcc4b 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -186,6 +186,8 @@ struct lkpi_vif { struct list_head lsta_list; struct lkpi_sta *lvif_bss; + + int nt_unlocked; /* Count of nt unlocks pending (*mo_set_key) */ bool lvif_bss_synched; bool added_to_drv; /* Driver knows; i.e. we called add_interface(). */ From nobody Wed Mar 19 22:27:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ3H01s7mz5qpCt; Wed, 19 Mar 2025 22:27:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3Gz3nPZz3b1W; Wed, 19 Mar 2025 22:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RkbVwT3+UskugKM8McbEc5yxjR+AyiTAZHlGr1sO6lU=; b=gke/hnc3N14XWXtPhZdTFPO/wu6tr31e31UXLyjQvxsFvp7NvnVHzsdyhGF/lfovs6ARzu hdGCcil8F+gVYrP6tnSakA5JliE+AD6pAWJTS+U6zY5FS0VmWiVxr9DIfpAOpU92vw6uJa zUiCrkqqC+PCW6zMom6BoTNOWICjQatH7VH/QEphC2EaT61kgIqWMM5A+TyOoLEB5pkISG aNWN7+xF3MzxF5nWxkfwM9iBww6456GKn+B4jWx6PVr65qqzqsbhC2agL1lm9Ka7pIVIUK 3aU4y3/7E7aNRg0dCUAhWF9MbvbPNskWGFfpusI5/o+EuTvHvliRLk0ceoKHjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423227; a=rsa-sha256; cv=none; b=diqqWOooTBrqnJwek9C8stMZLJumViWW7GooC86GqEMt7kDLFBT1WY4y1/zrBr1+MWXu6J AP3rTvw7K4Ose6gklDI3ZnWtwiz2jbrySKLavL39TDuxBQQqI7g2f+OMl0vfDJKXAv9Hbv 6mWdiv/DD9ZcCCoiVw1SSJ0ofR8XMxetUj2xi4TZURlAydiKi4IaRokRfzc79EPhtnsHp+ AKEDR7K5LmM/uoVMgAvs8CWUucIqcTFYkGStqCDtincdJlBEpMmuRTOwMlRkmi2UW8AABJ UtRAS/+yl5LcTuRuCs7i+C2afg+RLv0DK15AOQohqdo9/afi2Rov+qolQg2yOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RkbVwT3+UskugKM8McbEc5yxjR+AyiTAZHlGr1sO6lU=; b=s6TseqjTbC+NnPgtgCCddf+yfU3HrvI4YtnJig2f0Hx89wZJSpgquIAb+dtM7nEnTLseXA GtmuOYtS/TbKTD7yZ3XEPBZA8oT6t3xisKLKj59CuUAlrXsb4eoieMrGB9+WTr9u/LYnZ+ UaEdaLkGzvVrV/RXIpP+xyFKH0H7ckKgt+dvzIKabBJew3qO866Jkynp+8QIRG7Jj1oO8u MyjZJsUZ/WO2HqnCDVPfXT0HBrkgB+RVGBEwgOFE89w0yUJtnsmxaLBpLfAlV5gRK6m154 Mi5CRi5ml/X9x1C50xtnngYvJY7J7ripFCjXIJjyJ21lECAjZ5pMD9pGiJGs8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ3Gz3P6wzfJb; Wed, 19 Mar 2025 22:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMR7U2044686; Wed, 19 Mar 2025 22:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMR754044683; Wed, 19 Mar 2025 22:27:07 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:27:07 GMT Message-Id: <202503192227.52JMR754044683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 84ca9ab010dc - stable/14 - iwlwifi: adjust a debug comment referring to a PR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 84ca9ab010dc9bf1ce4f748100d5b15cf39f7b29 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=84ca9ab010dc9bf1ce4f748100d5b15cf39f7b29 commit 84ca9ab010dc9bf1ce4f748100d5b15cf39f7b29 Author: Bjoern A. Zeeb AuthorDate: 2025-03-14 16:32:14 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-19 22:22:15 +0000 iwlwifi: adjust a debug comment referring to a PR A FreeBSD specific comment asked people to report to a PR if they see this. By now we got enough feedback and also left this in a release. Simply point to the PR so people can check the status but not longer ask to submit a report to the PR. Sponsored by: The FreeBSD Foundation PR: 274382 (cherry picked from commit 4a4eee553307a2e02c6ed4796d575bfce2857049) --- sys/contrib/dev/iwlwifi/mvm/tx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/mvm/tx.c b/sys/contrib/dev/iwlwifi/mvm/tx.c index 8ece32dbb3f1..fbbed0bd7678 100644 --- a/sys/contrib/dev/iwlwifi/mvm/tx.c +++ b/sys/contrib/dev/iwlwifi/mvm/tx.c @@ -1276,8 +1276,8 @@ static int iwl_mvm_tx_mpdu(struct iwl_mvm *mvm, struct sk_buff *skb, if (WARN_ONCE(txq_id == IWL_MVM_INVALID_QUEUE, "Invalid TXQ id")) { #if defined(__FreeBSD__) printf("%s:%d: fc %#06x tid %u txq_id %u mvm %p " - "skb %p { len %u } info %p sta %p (if you see this please " - "report to PR 274382)\n", __func__, __LINE__, + "skb %p { len %u } info %p sta %p (see PR 274382)\n", + __func__, __LINE__, fc, tid, txq_id, mvm, skb, skb->len, info, sta); #endif iwl_trans_free_tx_cmd(mvm->trans, dev_cmd); From nobody Wed Mar 19 22:35:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ3SR1CJvz5qprC; Wed, 19 Mar 2025 22:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3SQ50c3z3kSJ; Wed, 19 Mar 2025 22:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O9iY+5JmU3RGaBQfnwTz7ZZNEluCWZrpJde3Sdg8r/s=; b=iqYln4sgleBFJ3BxmG7GpYVOJOzFnj+ilqPJ2xIlf3BkrGM3zFFzHwQHbubwILT+POiqFB qeWm7gRDxqlHi6gZEd6GOrovZU/QXw1MnvE95fK5XQv+VJBDs5BxKmEuTAgYJ0NaA9HgHm NA17On+O280Qp8MpPcrPcjC7xC+g+lg+Ak4DiIghfFSMuL0ZS+T7avohY/ZOq8dW3EkEGP hEeKBWcGd2CzJDCyqHHEt+YcVd9Ou93FUmU9l1e/P7QoTVoTAZi3mu762AyCD+rkJ+a3a0 PVsIgLJr8YZPmz6CDK4RUfM3RJFUF3lnbiHFRsVnqAFtt2A/l8dlrGy0ci4N0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423718; a=rsa-sha256; cv=none; b=Al98te3f3Qwq5RKNlo9solMhuzLzFD422849gB5mEsVO9P9yPRqz0tYDNr3TVaXYmgzc40 u6J03dLnqKEjKF5XwfQXZ8e5XA3UyfUhxUvqHU7Hd0D/82e2sy7R0bCtobcsgeWhyEhyDu +BcHzXd+z7fC0xePmdXuCxSB2QJTPmd0g54fiTopyIRNouhvOLxrrYq9wExfGBbsROw1Cz dP0dbXufiQ+c63G5qeu9HFTMUT8y/ULW6jWe5VAmvSj4NtIwRJmfWRz2i6x8hmJ+t3rdZt k9A6GhOy5hVrxaY/A/ptBtkIcU87Q7cfPUqE4dBUTlo0XIeT2I/4vrHXCdWMAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423718; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O9iY+5JmU3RGaBQfnwTz7ZZNEluCWZrpJde3Sdg8r/s=; b=mq3qPK8QBo0xsxGt5vFQ3t4BOQs4L+xeOtkSqJSWujM+2Jfg0+oAAYmQTgKWN6Qhv7uFWT SyXdYQCbyvzgMI8N8f5kPAYSMMkFhoWO/ZywKTWsiIQk1EBgise6q/B3BjHVjBhR24TCOQ NDMX7tkHYFGF/SJN2aRHviaja859HnVOINv+QX4gWXa3ceKN9jMVONm27d0UKrEkdht/U+ r+afNOekJGYfsJg/Lj0k1xlZWpT4JxvG5BbDADgXnrkab+kygveLwJVZsoLxRoXyCDgsT2 W2BSCS2hyyGCp+hxmPNfgYdmoG3OaGagvZ3kSYnCz+9SS2YF3b3ljePDDCjryw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ3SQ4cgszfxx; Wed, 19 Mar 2025 22:35:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMZIFx062598; Wed, 19 Mar 2025 22:35:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMZIKs062595; Wed, 19 Mar 2025 22:35:18 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:35:18 GMT Message-Id: <202503192235.52JMZIKs062595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: 0b663e0cee89 - main - powerpc: Add Hypervisor Facility Unavailable handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b663e0cee89dedf5b070ff4e839d5ad95061535 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=0b663e0cee89dedf5b070ff4e839d5ad95061535 commit 0b663e0cee89dedf5b070ff4e839d5ad95061535 Author: Justin Hibbits AuthorDate: 2025-03-19 22:22:32 +0000 Commit: Justin Hibbits CommitDate: 2025-03-19 22:22:32 +0000 powerpc: Add Hypervisor Facility Unavailable handling Treat Hypervisor Facility Unavailable as an illegal instruction in user space. This way programs that use facilities like transactional memory, which will never be supported as it has been removed from the ISA, will not crash the kernel. Tested by: pkubaj MFC after: 1 week --- sys/powerpc/aim/aim_machdep.c | 1 + sys/powerpc/powerpc/trap.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/sys/powerpc/aim/aim_machdep.c b/sys/powerpc/aim/aim_machdep.c index b439905441d3..814c679ff47e 100644 --- a/sys/powerpc/aim/aim_machdep.c +++ b/sys/powerpc/aim/aim_machdep.c @@ -417,6 +417,7 @@ aim_cpu_init(vm_offset_t toc) bcopy(&hypertrapcode, (void *)(EXC_HEA + trap_offset), trapsize); bcopy(&hypertrapcode, (void *)(EXC_HMI + trap_offset), trapsize); bcopy(&hypertrapcode, (void *)(EXC_HVI + trap_offset), trapsize); + bcopy(&hypertrapcode, (void *)(EXC_HFAC + trap_offset), trapsize); bcopy(&hypertrapcode, (void *)(EXC_SOFT_PATCH + trap_offset), trapsize); #endif diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c index ab3e56875169..d919b7715664 100644 --- a/sys/powerpc/powerpc/trap.c +++ b/sys/powerpc/powerpc/trap.c @@ -138,6 +138,7 @@ static struct powerpc_exception powerpc_exceptions[] = { { EXC_VEC, "altivec unavailable" }, { EXC_VSX, "vsx unavailable" }, { EXC_FAC, "facility unavailable" }, + { EXC_HFAC, "hypervisor facility unavailable" }, { EXC_ITMISS, "instruction tlb miss" }, { EXC_DLMISS, "data load tlb miss" }, { EXC_DSMISS, "data store tlb miss" }, @@ -147,6 +148,7 @@ static struct powerpc_exception powerpc_exceptions[] = { { EXC_THRM, "thermal management" }, { EXC_RUNMODETRC, "run mode/trace" }, { EXC_SOFT_PATCH, "soft patch exception" }, + { EXC_HVI, "hypervisor virtualization" }, { EXC_LAST, NULL } }; @@ -351,6 +353,7 @@ trap(struct trapframe *frame) mtspr(SPR_FSCR, fscr & ~FSCR_IC_MASK); break; case EXC_HEA: + case EXC_HFAC: sig = SIGILL; ucode = ILL_ILLOPC; break; From nobody Wed Mar 19 22:35:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ3SS4qrFz5qppL; Wed, 19 Mar 2025 22:35:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ3SR68szz3kd1; Wed, 19 Mar 2025 22:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9DTXmlLmjJ3rk2y+Ar3htoDvWDgO6VBfXogcwEIfUs=; b=FcrawY82fCInIx6HaJn02xlEFLOvgyFl8+c6GoABGmk7fKXJYAPXgq4C8amxNoDS/2tmZd N3qJDz1Gp/NbWF0Y+3e5MgeHAYHw98ijS7/rrRHZteKgUQQqCWcbtNTQsX90oVkSU3hskL VJTDV35CoRu1ak/eE+8dwu76eAHlDG2x2ggk0tY2LHDqM6tyRj+2aJrRmhS06Ji+IC8Pc6 atuZ0abOsRPYjbVHwZxJwag982EUsWIJLZ36988hGGuSFL01aMuVD+oJy/kk1ot/PlEA/9 fJYwQZ8R00AcF77oj+eJByqHs4Lnj+aX3qGJxxnS16fMbrYOHDWWBWFGkLDvVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423719; a=rsa-sha256; cv=none; b=ReminteWT6pPVSTkAxRuob+F+TwFYr66Rs/aFFLlaT67tNVk5QQhszbjS37wwYrJSmK6ML tYVBwG7VVLD7YPoDcZOgoxkVWJIsP6a8rGkHuyJhr4jTqmDVNIas4XICN+xn+lISPTJkqQ g7o42EBX2e+H8t6ASCxoqfYOZVstela+BiGp7LyXaxwEA0V0SA/tBvF4iI1oRupybwZxeU R05nLGg7Ij7wtbndUvwTFMxMqwGBD/zx3y1OHI8lB4YtchXTR6BlugAXnpyornCogkyL03 4fvIGNfFH/F4WKyuzQ3+b4HBsUoV2ExzZQ3HFKdbgGHWXeMUIv+1RebkbUbwqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9DTXmlLmjJ3rk2y+Ar3htoDvWDgO6VBfXogcwEIfUs=; b=Fq9hj5U2YQY8U6s/U4vIhI73w7mVorzjar86plHYVgFXOm9QFO8TBg68yasC7sRy0vMqvT dklUyg+jnbeWIUDUyterBo7R/+a5SVpGfcJBcBKHuv/kJxoimh3knYTU/ERkbnSqx6BeMJ 2p4PSPfXaSkGlg7o4GlyhK/gOU18nTEWujD3g18I4zDXOl5b/rPlbaUApj8rc2URznPHLd prkLTSPSaG3XY2V6qS2O2NMQzC9FZ7p/vYAvJqsSePwHwLANVLk5CYL/2RefpDmUmeVORB orej3ZDZP1WSW/Ml2wB9wjSpOu5o8DF1KfHCt9xhpyNIhmvkznNRBW6MRFO+8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ3SR5Ybpzfxy; Wed, 19 Mar 2025 22:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JMZJ81062631; Wed, 19 Mar 2025 22:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMZJGt062628; Wed, 19 Mar 2025 22:35:19 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:35:19 GMT Message-Id: <202503192235.52JMZJGt062628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: fe73eb441f1c - main - powernv: Explicitly enable the facilities we support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe73eb441f1c98fe350f4822c7d2abfeef046bf8 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=fe73eb441f1c98fe350f4822c7d2abfeef046bf8 commit fe73eb441f1c98fe350f4822c7d2abfeef046bf8 Author: Justin Hibbits AuthorDate: 2025-03-19 22:25:40 +0000 Commit: Justin Hibbits CommitDate: 2025-03-19 22:35:17 +0000 powernv: Explicitly enable the facilities we support Thus far we've relied on the firmware setting HFSCR correctly, enabling all facilities. However, it appears some recent firmwares do not. Linux explicitly enables all facilities it supports (including transactional memory, which new firmwares apparently do not enable), so do the same here, explicitly enable all the facilities FreeBSD supports. MFC after: 1 week --- sys/powerpc/include/spr.h | 5 +++++ sys/powerpc/powernv/platform_powernv.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/sys/powerpc/include/spr.h b/sys/powerpc/include/spr.h index 5bb3858b0fb5..605b1be194d9 100644 --- a/sys/powerpc/include/spr.h +++ b/sys/powerpc/include/spr.h @@ -162,6 +162,11 @@ #define FSCR_DSCR 0x0000000000000004 /* DSCR available in PR state */ #define SPR_UAMOR 0x09d /* User Authority Mask Override Register */ #define SPR_DPDES 0x0b0 /* .6. Directed Privileged Doorbell Exception State Register */ +#define SPR_HFSCR 0xbe /* Hypervisor Facility Status and Control Register */ +#define HFSCR_BHRB 0x0000000000000010 /* BHRB instructions */ +#define HFSCR_PM 0x0000000000000008 /* Performance monitor SPRs */ +#define HFSCR_VECVSX 0x0000000000000002 /* Vector and VSX facilities */ +#define HFSCR_FP 0x0000000000000001 /* Floating Point facility */ #define SPR_USPRG0 0x100 /* 4.8 User SPR General 0 */ #define SPR_VRSAVE 0x100 /* .6. AltiVec VRSAVE */ #define SPR_SPRG0 0x110 /* 468 SPR General 0 */ diff --git a/sys/powerpc/powernv/platform_powernv.c b/sys/powerpc/powernv/platform_powernv.c index 50af24794e69..678631322173 100644 --- a/sys/powerpc/powernv/platform_powernv.c +++ b/sys/powerpc/powernv/platform_powernv.c @@ -138,6 +138,7 @@ powernv_attach(platform_t plat) phandle_t opal; int res, len, idx; register_t msr; + register_t fscr; bool has_lp; /* Ping OPAL again just to make sure */ @@ -179,6 +180,11 @@ powernv_attach(platform_t plat) mtspr(SPR_LPCR, lpcr); isync(); + fscr = mfspr(SPR_HFSCR); + fscr |= FSCR_TAR | FSCR_EBB | HFSCR_BHRB | HFSCR_PM | + HFSCR_VECVSX | HFSCR_FP | FSCR_MSGP | FSCR_DSCR; + mtspr(SPR_HFSCR, fscr); + mtmsr(msr); powernv_cpuref_init(); From nobody Wed Mar 19 23:34:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ4ml67jXz5qsym; Wed, 19 Mar 2025 23:34: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ4ml4Py0z3kJZ; Wed, 19 Mar 2025 23:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742427271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0R0ZwhjNH4MQ0sXjN/XYNK95I61yrDolMdkh0ndegBs=; b=hKz5LHIj9sTrovivVyhNf3qAzzgSM8MqoPqDNdvyh6pqqX4pL9qDhuIRBOrotQfjRRjI51 dSX5/EcEAo+xJopQxZtkyf7Am8PcMokyKGHQjgW+lPo779e1PTI26tJTwFCosITObeuQtM 42QVhjX2TqcbVvbIyzATL0jQrBVfWT2wpp5EnCWBB6CeUYdxHl2yMF8jgybbDgsMqS+F9m 4nw33JaNVY/8mMhVDU1tawyq+GDbmzSkZMcAJMqpIZ0fJ+q1MgZDyir85eWQoeNXUyGzrW HNghuiYmAiNK0LSvOY1PrX8X7zM4b36jC+BzIDh4M3ESW6mgxrrvnenbhP9/sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742427271; a=rsa-sha256; cv=none; b=UgqIkqG7QDS2iV1xMieTJw7aqiPi5hwFn42tvhllD4fDMe7Nm5vo9gUigORl/Oo3r8eMiD V53wgiviD3HpRZoj01QAGJrg4uBcu4XC2wb2QxtedqBs6hUsFCevR3cBeRnIPxk+LBvR6m aDqUlkoFa9QwaO6JAduUEdHDDUqQJ/AZHsp8XCz+8ZTDZUN+q5pfV/WTv7bpk+V+wTB8Wx 7TmfGGAvuKU/iKGl92z8aIaoOvXxbyAc2uZiRd2bBb8Zj5xZWUf+mqphz764j8BCaEmy0P dtVynkfk+2q7j4U45t5ka8H6vIR1DYhsy3hHQPRpSjqvau/5JM4dBEcHJLvVOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742427271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0R0ZwhjNH4MQ0sXjN/XYNK95I61yrDolMdkh0ndegBs=; b=kvvjTPeAta5jnzPTG9pnUX1i3hp02xA6F23TzIIEcHGwaOj4MK8b4dqrirR3J2cSuXfpaJ J8CIl7CsShyH6FEm9b2BtVNTA+ksEwycbA/B6VzbYuhvwxyxvcC9ZTxmD4kAsXTGgM335/ dZCJULvlbC7I70OWKS+k1FmuX9WRWHAsYZkcHLz9rj4UceLjFJopMAIH4f1CkkKUaXu9zA b4MaXhjWhzzWYehmLk9f0su1VkaV0Up3M2kF3grI27AQoqsMbHSeLieqHZnNhccLOyNrNT dnUgZbsc7X0F3xcohJqZ0+mS6DSFhKnrBZn6a2u+0yVySBWPvVf/wmSPR9aPtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ4ml31Cxzgnd; Wed, 19 Mar 2025 23:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JNYVT2074082; Wed, 19 Mar 2025 23:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JNYV6O074079; Wed, 19 Mar 2025 23:34:31 GMT (envelope-from git) Date: Wed, 19 Mar 2025 23:34:31 GMT Message-Id: <202503192334.52JNYV6O074079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: c2cd605e8c8a - main - Get consistent updates for UFS superblocks. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2cd605e8c8a15e545dfd3e50aef2f660d460b30 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=c2cd605e8c8a15e545dfd3e50aef2f660d460b30 commit c2cd605e8c8a15e545dfd3e50aef2f660d460b30 Author: Kirk McKusick AuthorDate: 2025-03-19 23:32:39 +0000 Commit: Kirk McKusick CommitDate: 2025-03-19 23:33:59 +0000 Get consistent updates for UFS superblocks. Superblocks are written by Freebsd clients using the ffs_sbput() routine (exported from the kernel in sys/ufs/ffs/ffs_subr.c). These clients include the kernel, some geom modules, and system utilities using libufs. Currently backward compatible updates of UFS superblocks are done only when the kernel writes them. These updates should be done whenever any call to ffs_sbput() is done. This commit moves these UFS superblock compatibility updates from the kernel-specific superblock update to ffs_sbput() so that all clients make these compatibility updates when they write superblocks. Reviewed-by: kib Tested-by: Peter Holm MFC-after: 1 week Differential Revision: https://reviews.freebsd.org/D49276 Sponsored-by: Netflix --- sys/ufs/ffs/ffs_subr.c | 62 +++++++++++++++++++++++++++++++++--------------- sys/ufs/ffs/ffs_vfsops.c | 42 +++++++++++++------------------- 2 files changed, 59 insertions(+), 45 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index c293cbbcbfb0..67c423d3127c 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -384,16 +384,35 @@ void ffs_oldfscompat_write(struct fs *fs) { - /* - * Copy back UFS2 updated fields that UFS1 inspects. - */ - if (fs->fs_magic == FS_UFS1_MAGIC) { + switch (fs->fs_magic) { + case FS_UFS1_MAGIC: + if (fs->fs_sblockloc != SBLOCK_UFS1 && + (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { + printf( + "WARNING: %s: correcting fs_sblockloc from %jd to %d\n", + fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS1); + fs->fs_sblockloc = SBLOCK_UFS1; + } + /* + * Copy back UFS2 updated fields that UFS1 inspects. + */ fs->fs_old_time = fs->fs_time; fs->fs_old_cstotal.cs_ndir = fs->fs_cstotal.cs_ndir; fs->fs_old_cstotal.cs_nbfree = fs->fs_cstotal.cs_nbfree; fs->fs_old_cstotal.cs_nifree = fs->fs_cstotal.cs_nifree; fs->fs_old_cstotal.cs_nffree = fs->fs_cstotal.cs_nffree; - fs->fs_maxfilesize = fs->fs_save_maxfilesize; + if (fs->fs_save_maxfilesize != 0) + fs->fs_maxfilesize = fs->fs_save_maxfilesize; + break; + case FS_UFS2_MAGIC: + if (fs->fs_sblockloc != SBLOCK_UFS2 && + (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { + printf( + "WARNING: %s: correcting fs_sblockloc from %jd to %d\n", + fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS2); + fs->fs_sblockloc = SBLOCK_UFS2; + } + break; } } @@ -931,6 +950,7 @@ int ffs_sbput(void *devfd, struct fs *fs, off_t loc, int (*writefunc)(void *devfd, off_t loc, void *buf, int size)) { + struct fs_summary_info *fs_si; int i, error, blks, size; uint8_t *space; @@ -953,23 +973,27 @@ ffs_sbput(void *devfd, struct fs *fs, off_t loc, } } fs->fs_fmod = 0; -#ifndef _KERNEL - { - struct fs_summary_info *fs_si; - - fs->fs_time = time(NULL); - /* Clear the pointers for the duration of writing. */ - fs_si = fs->fs_si; - fs->fs_si = NULL; - fs->fs_ckhash = ffs_calc_sbhash(fs); - error = (*writefunc)(devfd, loc, fs, fs->fs_sbsize); - fs->fs_si = fs_si; - } -#else /* _KERNEL */ + ffs_oldfscompat_write(fs); +#ifdef _KERNEL fs->fs_time = time_second; +#else /* User Code */ + fs->fs_time = time(NULL); +#endif + /* Clear the pointers for the duration of writing. */ + fs_si = fs->fs_si; + fs->fs_si = NULL; fs->fs_ckhash = ffs_calc_sbhash(fs); error = (*writefunc)(devfd, loc, fs, fs->fs_sbsize); -#endif /* _KERNEL */ + /* + * A negative error code is returned when a copy of the + * superblock has been made which is discarded when the I/O + * is done. So the fs_si field does not and indeed cannot be + * restored after the write is done. Convert the error code + * back to its usual positive value when returning it. + */ + if (error < 0) + return (-error - 1); + fs->fs_si = fs_si; return (error); } diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index 498ef61d7cf1..891e490a7031 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -2032,9 +2032,15 @@ ffs_sbupdate(struct ufsmount *ump, int waitfor, int suspended) panic("ffs_sbupdate: write read-only filesystem"); /* * We use the superblock's buf to serialize calls to ffs_sbupdate(). + * Copy superblock to this buffer and have it written out. */ sbbp = getblk(ump->um_devvp, btodb(fs->fs_sblockloc), (int)fs->fs_sbsize, 0, 0, 0); + UFS_LOCK(ump); + fs->fs_fmod = 0; + bcopy((caddr_t)fs, sbbp->b_data, (uint64_t)fs->fs_sbsize); + UFS_UNLOCK(ump); + fs = (struct fs *)sbbp->b_data; /* * Initialize info needed for write function. */ @@ -2060,7 +2066,8 @@ ffs_use_bwrite(void *devfd, off_t loc, void *buf, int size) devfdp = devfd; ump = devfdp->ump; - fs = ump->um_fs; + bp = devfdp->sbbp; + fs = (struct fs *)bp->b_data; /* * Writing the superblock summary information. */ @@ -2077,44 +2084,27 @@ ffs_use_bwrite(void *devfd, off_t loc, void *buf, int size) } /* * Writing the superblock itself. We need to do special checks for it. + * A negative error code is returned to indicate that a copy of the + * superblock has been made and that the copy is discarded when the + * I/O is done. So the the caller should not attempt to restore the + * fs_si field after the write is done. The caller will convert the + * error code back to its usual positive value when returning it. */ - bp = devfdp->sbbp; if (ffs_fsfail_cleanup(ump, devfdp->error)) devfdp->error = 0; if (devfdp->error != 0) { brelse(bp); - return (devfdp->error); - } - if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_sblockloc != SBLOCK_UFS1 && - (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { - printf("WARNING: %s: correcting fs_sblockloc from %jd to %d\n", - fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS1); - fs->fs_sblockloc = SBLOCK_UFS1; - } - if (fs->fs_magic == FS_UFS2_MAGIC && fs->fs_sblockloc != SBLOCK_UFS2 && - (fs->fs_old_flags & FS_FLAGS_UPDATED) == 0) { - printf("WARNING: %s: correcting fs_sblockloc from %jd to %d\n", - fs->fs_fsmnt, fs->fs_sblockloc, SBLOCK_UFS2); - fs->fs_sblockloc = SBLOCK_UFS2; + return (-devfdp->error - 1); } if (MOUNTEDSOFTDEP(ump->um_mountp)) - softdep_setup_sbupdate(ump, (struct fs *)bp->b_data, bp); - UFS_LOCK(ump); - bcopy((caddr_t)fs, bp->b_data, (uint64_t)fs->fs_sbsize); - UFS_UNLOCK(ump); - fs = (struct fs *)bp->b_data; - fs->fs_fmod = 0; - ffs_oldfscompat_write(fs); - fs->fs_si = NULL; - /* Recalculate the superblock hash */ - fs->fs_ckhash = ffs_calc_sbhash(fs); + softdep_setup_sbupdate(ump, fs, bp); if (devfdp->suspended) bp->b_flags |= B_VALIDSUSPWRT; if (devfdp->waitfor != MNT_WAIT) bawrite(bp); else if ((error = bwrite(bp)) != 0) devfdp->error = error; - return (devfdp->error); + return (-devfdp->error - 1); } static int From nobody Wed Mar 19 23:45:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ51742pzz5qv1p; Wed, 19 Mar 2025 23:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ5173CbGz3wFy; Wed, 19 Mar 2025 23:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742427915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wZUjlyKNdCrN/UkUNW+Bfv4BIrPWB9GyBZgkdEs7KvU=; b=eJhwTjD982d2y0FE0B+JElRo6LDBWzIuDAFs/l/3sBqVZdSpdZUCTFdZ7Q+2FrEWoY3SLc PN1AYd+31/ySgqv4bGI3e+x6RMiikwdSGC6UwOBeIZ540891amdtmu/VM5549OGKQ1GXZ4 0qEIMgL9wTVHDBCYzCgJIqh0ToXnBdkA7bqnpEBIVEyq+iiTKM4x+8/4A2CGqK34IMhip2 xWxVBdNK23tqj/71ZLfRo6itgaJdPHY1ciYWUdAadh2IcZhXp6WStvS6rNmqbnhpCxAjFV k8gwIW/F3ZeH/U7GBofZAlx4u1C0a54KaRQ0oaFzRyJfKNftb5xIX1roTAdYfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742427915; a=rsa-sha256; cv=none; b=Y1GcANDkpmGiavslqdTtXGFvxGkZ5oaFLiSwm7otjDCAfeN66yTPQhxSdh+uxn6aRq3u1u rDPPpAtgYAsFmY+QH8ioA47POzn0V5u3NujDQC/UZxVHudFH5LQDdI6mj1ew+4OGmHMSiw JkQ2YlqhEOS0NeVjPniZC1qYnqTx4T2jP3eSzTU2sQw/WCgGzw2YehN9edTpNaSexcs0Rd 1WYgqpSi94TPleEv5zjgTv8+ZJ2iQzrf5zY19t0QQZVGYNR5LaU2cx/dJiMIXU35CMkAYV hmPa0/1U35c4RNbolmz4L8u3LeL6putlEohTeMatpiIGovEDJ6bIC7sp5NqwLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742427915; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wZUjlyKNdCrN/UkUNW+Bfv4BIrPWB9GyBZgkdEs7KvU=; b=TibhVDuMbhGMtQJbBT/hO6cVwD9EcfiR3t/Red5S1bEWnOrq1hXqa/nKpy7nam1gWOn4yD qR+Msx4ZqncTs5yAZUo1DfDnMkWXQ00g/Zrr4ApAq8I9dPL3KKO9D0KSsfKBNkVqSiA5g4 2CtrF+sinrMOs7TwMZrbCXBL8M+7oWloMnZSiWzb9waJIkuHgecyQFvGpM/n0CwKQUYe7P H2DS1TjvxTCHpIrR15WFV93UDqrTkyKUQEj8OhHZbILRjRvzmo2HNr+Ot0TpYm/wiNEJ/e SzUjtcVYX8zz8ngEIkfEjE41V2gzJKbutEyGbaDPtkX04+LOkrVmZHAxHZ0y1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ5172b7nzhk6; Wed, 19 Mar 2025 23:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52JNjFgY093049; Wed, 19 Mar 2025 23:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JNjFxt093046; Wed, 19 Mar 2025 23:45:15 GMT (envelope-from git) Date: Wed, 19 Mar 2025 23:45:15 GMT Message-Id: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 9d0eea9422d0 - main - Make newly POSIX functions visible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d0eea9422d075c8a6924b33161d2d5abfb4072a Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0eea9422d075c8a6924b33161d2d5abfb4072a commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a Author: Stephen Hurd AuthorDate: 2025-03-19 23:45:06 +0000 Commit: Stephen Hurd CommitDate: 2025-03-19 23:45:06 +0000 Make newly POSIX functions visible Some of the POSIX 202405L functions are already in the system, make them visible when appropriate. Reviewed by: imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47859 --- include/dlfcn.h | 8 +++++++- include/stdlib.h | 13 ++++++++----- include/string.h | 6 +++--- include/time.h | 8 +++++--- include/unistd.h | 16 ++++++++++------ include/wchar.h | 7 +++++-- 6 files changed, 38 insertions(+), 20 deletions(-) diff --git a/include/dlfcn.h b/include/dlfcn.h index 89ec43b332e9..ec4ad14b5091 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -80,6 +80,9 @@ typedef struct dl_info { const char *dli_sname; /* Name of nearest symbol. */ void *dli_saddr; /* Address of nearest symbol. */ } Dl_info; +#if __POSIX_VISIBLE >= 202405 +typedef struct dl_info Dl_info_t; +#endif /*- * The actual type declared by this typedef is immaterial, provided that @@ -119,9 +122,12 @@ char *dlerror(void); void *dlopen(const char *, int); void *dlsym(void * __restrict, const char * __restrict); +#if __POSIX_VISIBLE >= 202405 +int dladdr(const void * __restrict, Dl_info * __restrict); +#endif + #if __BSD_VISIBLE void *fdlopen(int, int); -int dladdr(const void * __restrict, Dl_info * __restrict); dlfunc_t dlfunc(void * __restrict, const char * __restrict); int dlinfo(void * __restrict, int, void * __restrict); void dllockinit(void *_context, diff --git a/include/stdlib.h b/include/stdlib.h index 162031ab393d..449b17fefff5 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -157,7 +157,7 @@ _Noreturn void _Exit(int) __noexcept; /* * If we're in a mode greater than C99, expose C11 functions. */ -#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L +#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L || __POSIX_VISIBLE >= 202405 void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) __alloc_size(2); int at_quick_exit(void (*)(void)) __noexcept; @@ -236,6 +236,13 @@ int unlockpt(int); int ptsname_r(int, char *, size_t); #endif +#if __POSIX_VISIBLE >= 202405 +void qsort_r(void *, size_t, size_t, + int (*)(const void *, const void *, void *), void *); +void *reallocarray(void *, size_t, size_t) __result_use_check + __alloc_size2(2, 3); +#endif + #if __BSD_VISIBLE extern const char *malloc_conf; extern void (*malloc_message)(void *, const char *); @@ -305,12 +312,8 @@ int mergesort_b(void *, size_t, size_t, int (^)(const void *, const void *)); int mkostemp(char *, int); int mkostemps(char *, int, int); int mkostempsat(int, char *, int, int); -void qsort_r(void *, size_t, size_t, - int (*)(const void *, const void *, void *), void *); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); -void *reallocarray(void *, size_t, size_t) __result_use_check - __alloc_size2(2, 3); void *reallocf(void *, size_t) __result_use_check __alloc_size(2); int rpmatch(const char *); char *secure_getenv(const char *); diff --git a/include/string.h b/include/string.h index a3fa96ebb449..3deca63bd71a 100644 --- a/include/string.h +++ b/include/string.h @@ -63,8 +63,8 @@ void *memrchr(const void *, int, size_t) __pure; #endif int memcmp(const void *, const void *, size_t) __pure; void *(memcpy)(void * __restrict, const void * __restrict, size_t); -#if __BSD_VISIBLE -void *memmem(const void *, size_t, const void *, size_t) __pure; +#if __POSIX_VISIBLE >= 202405 +void *(memmem)(const void *, size_t, const void *, size_t) __pure; #endif void *(memmove)(void *, const void *, size_t); #if __BSD_VISIBLE @@ -98,7 +98,7 @@ char *strerror(int); #if __POSIX_VISIBLE >= 200112 int strerror_r(int, char *, size_t); #endif -#if __BSD_VISIBLE +#if __POSIX_VISIBLE >= 202405 size_t (strlcat)(char * __restrict, const char * __restrict, size_t); size_t (strlcpy)(char * __restrict, const char * __restrict, size_t); #endif diff --git a/include/time.h b/include/time.h index 89a76ca5fd93..f85d9c40715a 100644 --- a/include/time.h +++ b/include/time.h @@ -180,15 +180,17 @@ time_t posix2time(time_t t); #include #endif -#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ +#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ -int timespec_get(struct timespec *ts, int base); -#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 +#if __ISO_C_VISIBLE >= 2023 || __POSIX_VISIBLE >= 202405 /* ISO/IEC 9899:2024 7.29.1 Components of time */ #define TIME_MONOTONIC 2 /* monotonic time */ +#endif +int timespec_get(struct timespec *ts, int base); +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ int timespec_getres(struct timespec *, int); #endif diff --git a/include/unistd.h b/include/unistd.h index 8574b2ba9915..3a4e1be192d9 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -483,6 +483,16 @@ int usleep(useconds_t); pid_t vfork(void) __returns_twice; #endif +/* 1003.1-2024 */ +#if __POSIX_VISIBLE >= 202405 +pid_t _Fork(void); +int getentropy(void *, size_t); +int getresgid(gid_t *, gid_t *, gid_t *); +int getresuid(uid_t *, uid_t *, uid_t *); +int setresgid(gid_t, gid_t, gid_t); +int setresuid(uid_t, uid_t, uid_t); +#endif + #if __BSD_VISIBLE struct timeval; /* select(2) */ @@ -510,14 +520,11 @@ int feature_present(const char *); int fchroot(int); char *fflagstostr(u_long); int getdomainname(char *, int); -int getentropy(void *, size_t); int getgrouplist(const char *, gid_t, gid_t *, int *); int getloginclass(char *, size_t); mode_t getmode(const void *, mode_t); int getosreldate(void); int getpeereid(int, uid_t *, gid_t *); -int getresgid(gid_t *, gid_t *, gid_t *); -int getresuid(uid_t *, uid_t *, uid_t *); char *getusershell(void); int initgroups(const char *, gid_t); int iruserok(unsigned long, int, const char *, const char *); @@ -575,8 +582,6 @@ void *setmode(const char *); int setpgrp(pid_t, pid_t); /* obsoleted by setpgid() */ void setproctitle(const char *_fmt, ...) __printf0like(1, 2); void setproctitle_fast(const char *_fmt, ...) __printf0like(1, 2); -int setresgid(gid_t, gid_t, gid_t); -int setresuid(uid_t, uid_t, uid_t); int setrgid(gid_t); int setruid(uid_t); void setusershell(void); @@ -589,7 +594,6 @@ int undelete(const char *); int unwhiteout(const char *); void *valloc(size_t); /* obsoleted by malloc() */ int funlinkat(int, const char *, int, int); -pid_t _Fork(void); #ifndef _OPTRESET_DECLARED #define _OPTRESET_DECLARED diff --git a/include/wchar.h b/include/wchar.h index e4b037c9b16f..a8c016c42faf 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -235,12 +235,15 @@ size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t, size_t, mbstate_t * __restrict); #endif -#if __BSD_VISIBLE -wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); +#if __POSIX_VISIBLE >= 202405 size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif +#if __BSD_VISIBLE +wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); +#endif + #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) #include #endif From nobody Thu Mar 20 00:36:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ67n25rYz5qyZ8; Thu, 20 Mar 2025 00:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ67m3Qkpz3fmJ; Thu, 20 Mar 2025 00:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742430964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4Gu6Yz7uKzv1IUD+Xvv/epaHdyaM7CWTKBbc6Mluj8=; b=dt3qASPfLQjJstQr1elTQfCzLkQP4qpTXpHYwhRXQ355AfQLkcKvV/EF7V9LPAWI6jbuUi u72Ld8f1dS37h/xHHSeZiZknGVVVNT9rcNspQXp3zjL0ZssMpmHblXuWYtE6xBVBCGopaF nkmbPbpJcqZIR+3AuEKY7Ny+Zy1L0Rxc/5bRLJfSMbJ3q9PDxWKYeKR4Cg0Wg6cWmtRr8+ AbUphejcgkWPtPKjw9RTvkanw02V2DMlJvXivks0bYNYiJ6hFOP50nWAFqDa/RcIMSZLhA ahctwFdTT1u7WCUqZqJYLia9OPHWdQoxk8ijCJN0F7O2EGFH5+oh1d9o1o4EuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742430964; a=rsa-sha256; cv=none; b=rn/KG3Skd8F+0nRL62tPQTVxSLskCUSafGUGrD34LqXF3t0K0SRO7ybWhQko9gyRDRVFoQ xh9lU9mosRntfeXZh4zugtHnTc9DRUeGjJideAC9sz+smIayzrz2EaioYlUCFTnVAKJVg8 /uIJWlCog01CzIJYanibtwrSkFuqS+d36SpbxpDW4f6KrtMv38weMKp72Qu0VQGTo86I6w /sZrXAEyzaeqhGEU3prl2j/GmdZagqPn5kAxD4GRBa0XpSS0aTw0vY9sI4t22JSS3rcIFa Xuycmdt74/4aa21jnmUg7HAOv4cshen96Fe2YZBF1LlZkyl6tw3P5l1w12rMsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742430964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c4Gu6Yz7uKzv1IUD+Xvv/epaHdyaM7CWTKBbc6Mluj8=; b=giWa+Hs3gW6GxkRl0BmAtl/0pB2JCzBv6/IfI/a43jyexbdYx4CncwPdByIYZP1Mu8f5fr Vq81EJmpRGAEB+763De6vw8DYJyt4XQFVAkImd6tV6qpA3WoVslCbuzduRincPu+PsErpc t/uTapm7JA9nnA8aCxNFpT+dju5DNAV5BNxI29EVBudko6uFYQP69PeZ2L/IKnOAkTaMqC 36tvlQleBS38hyae5I3JQMCg75j/QAWZUswysmiqnInXSzdTpUE2KBH4WLzHpuPu+5iLF6 blNoywA8XfrPSbBMrWoTzAI3iW55p8aWAgMlPTWMBc/DFFF6kxtYOfgiFEBnlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ67m1tTKzjdy; Thu, 20 Mar 2025 00:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K0a4h1085979; Thu, 20 Mar 2025 00:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K0a40p085976; Thu, 20 Mar 2025 00:36:04 GMT (envelope-from git) Date: Thu, 20 Mar 2025 00:36:04 GMT Message-Id: <202503200036.52K0a40p085976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7e8f29eb1b2c - stable/14 - snd_hda: Patch Framework AMD 13th gen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7e8f29eb1b2cb313106b1f5d24b30487ca4880ee Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8f29eb1b2cb313106b1f5d24b30487ca4880ee commit 7e8f29eb1b2cb313106b1f5d24b30487ca4880ee Author: Christos Margiolis AuthorDate: 2025-03-13 21:50:30 +0000 Commit: Christos Margiolis CommitDate: 2025-03-20 00:35:59 +0000 snd_hda: Patch Framework AMD 13th gen Redirect sound to headphone jack when plugged in. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D49346 (cherry picked from commit 68b6567d09ddd29a16443ad709e2609a9902a190) --- sys/dev/sound/pci/hda/hdaa_patches.c | 7 +++++++ sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 8 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 3c063deb0822..8ad1c845c254 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -340,6 +340,13 @@ hdac_pin_patch(struct hdaa_widget *w) patch_str = "as=3 seq=15 color=Black loc=Left"; break; } + } else if (id == HDA_CODEC_ALC295 && + subid == FRAMEWORK_LAPTOP_0006_SUBVENDOR) { + switch (nid) { + case 33: + patch_str = "as=1 seq=15 color=Black loc=Left"; + break; + } } else if (id == HDA_CODEC_ALC230 && subid == LENOVO_IDEAPAD330_SUBVENDOR) { switch (nid) { diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 40b697b05e78..72da5a4a44ac 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -529,6 +529,7 @@ #define FRAMEWORK_LAPTOP_0001_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0001) #define FRAMEWORK_LAPTOP_0002_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0002) #define FRAMEWORK_LAPTOP_0003_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0003) +#define FRAMEWORK_LAPTOP_0006_SUBVENDOR HDA_MODEL_CONSTRUCT(FRAMEWORK, 0x0006) /* All codecs you can eat... */ #define HDA_CODEC_CONSTRUCT(vendor, id) \ From nobody Thu Mar 20 00:55:25 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ6Z60whRz5r0cd; Thu, 20 Mar 2025 00:55:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ6Z56CPkz42Bk; Thu, 20 Mar 2025 00:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742432126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVqSijMVGTkh8b/BwOy/1atLU71fGg5oemiyZh+VmKQ=; b=sXDHSXsaSNk3pBHijL4HmZXg6Uj5zlXCy3vN/hWFpJDA9EdzIODmvQhGeYdKAMetIu+mNm gvNWAAJ4Z/WUL0kithNwS3C60PDX58He2wsBW/nR9An1SRVFilbb+NPoJ7DWfbO9q+5E0q GSS7DKBhSHTk8V2SH0b11fAGHJZsyipShGrPj2Tw4f2y5gnJRJaOlH23s4Gsdkn5KJM/xk tKJ5cb/53jNvZFja7PdY76FjFU74a7b7C/b50FFtEmIQ1l85t6Uh0pOv+98XXQECAfoSnf 9x4tzETg29nUt9qs68TyNysOxBovDm+98ugmL7VksCH5FZIPZI/LzllP65JChA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742432126; a=rsa-sha256; cv=none; b=w+K/jTQPnzWk+jJNnq12/F2RWOYkkevUJHFAmCreYT+c76XWxPJOrs8paNM6Vx3y6YlFus mBkQSsvqOxx5tkSYPmWh4q8da9cwOVlzvPw5zs7OX9Z8Hmrlgo3DSNg1hXX/JLWZMmDjaM 6wHj5bnkS9dFo4FOOB5ZaCw3z6e1zOYMk9S057Q84GyxUQ4Y+9UxF0wxGx8qyCMJ8GI9HY lTpzR0sW/u6GVi7UyXkilKJ69Hc2jU+POqcbwm3zAg6XMoLfkFzma7J8fcK39sBG6lPOyq 4XNyZtEHkMRWk9PekQMnOtxokfGvanhFFrp7zoqP/xgp9AcRejcPTGX5dcPDCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742432126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVqSijMVGTkh8b/BwOy/1atLU71fGg5oemiyZh+VmKQ=; b=yz8iGcV616V42DMHP/mIICX6UAKDpZELWUwi50du5FKW6ZlsCcrvKPm6dX7tfy2RACj2FI +ORfo185KaKIqsSzQ48R/QQogaxfIX/P+9WYqhQYxGEGTzKPiuB7btfZF5M63KXdPk8khu RTHq3e0xgCvYQ+ENKSMPAfPhwt8yFhjFu9MHCwBsan4v99J28c6rIGF+4GBYkGr3ewUtAu eOW3b9IDSIAx9AXXhcyHvAjEKwbHFlTViJ5dJ4qVNhChntl/HfCJo+G25Lm4xylMecPJGu vvvq7whwCMzJnBbTFYw+kgiMv0Zrqu9Gi4MJMdvDIpPU5gQZi/kqzutnqN5ZJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ6Z55XchzkYg; Thu, 20 Mar 2025 00:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K0tP7R023593; Thu, 20 Mar 2025 00:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K0tP4u023590; Thu, 20 Mar 2025 00:55:25 GMT (envelope-from git) Date: Thu, 20 Mar 2025 00:55:25 GMT Message-Id: <202503200055.52K0tP4u023590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: d7efac1be144 - main - Add missing || List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7efac1be1441c122f7fb9de51a409172f21326c Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=d7efac1be1441c122f7fb9de51a409172f21326c commit d7efac1be1441c122f7fb9de51a409172f21326c Author: Stephen Hurd AuthorDate: 2025-03-20 00:54:46 +0000 Commit: Stephen Hurd CommitDate: 2025-03-20 00:55:13 +0000 Add missing || Fixes: 9d0eea9422 --- include/time.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index f85d9c40715a..e011792aaaeb 100644 --- a/include/time.h +++ b/include/time.h @@ -180,7 +180,7 @@ time_t posix2time(time_t t); #include #endif -#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 \ +#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ From nobody Thu Mar 20 02:53:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9B52qTmz5r8j8; Thu, 20 Mar 2025 02:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B43Fq5z3c6G; Thu, 20 Mar 2025 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjH7ALMGsU+4KiNSR1wJXGO8kR43BdBtfO9xAB4jP1c=; b=m7v9Nufn3RFes40klko2hd8fAtqhsUYmLt5MlRr9aH0pYTO3MvpQnqJAlisvN5bfU7yluj 7AtvLy83qOADuqeGIOURgjXr49d2la+cplzfo7kLUSO1seUXZVsqOKMmLtfdXbytkov4ai +lOl8IopyYUtiY2N00UYD5g0L7rtBLsQuO13zjcnOIHNqfTNoaM9Z/rD4c12K6VblmMuPP A7RZpKAUizteMAmb0wQBtNTXhr+x4XPsIgBqCZ4AQKZ7eBuUmQMfWQWry77Kozzsg7Lgv7 Vfef9D//jXDlcJUXwIJcllc+5gfgcEJxbni+6m/nLeGNMSMzXKNKl9EC5La0AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439196; a=rsa-sha256; cv=none; b=H+h8s8mwsPm0b8x8bIJ7ChcpM+fGAyRMn5cykgo184nfjzJnyg6ogtrwbSgZcN52sW6Pap WNuesPPuwyAVqLtXItjMeJ8noBUZjRcokkmoL2Iv3KxPrTagsJRGHvNdPwFuSjAmn8wG1V cdn5lz9x/rXBmju/i3TWeHHydrNgsVOMAOt6T2k8I3c2i/Tj84s7DsJAZda/mEusw16lEY 3wp11kBg0eWHLS+cGcK1Am3utXFwpXymuOkFmEh8RU+kQ1czl7UG5IuIE2nCzKRBArNqFR 6F180tnVc+eXoCJL8hwRYMRCixSf4E+i2/CX20xmOYyK2k8OVFNmVNXFXLo+HQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vjH7ALMGsU+4KiNSR1wJXGO8kR43BdBtfO9xAB4jP1c=; b=a5fVB8jbHkqo2EndBlJdDNwRWwaodXzaMV47hzVdxoa4jCcGx2odEFZLRKVre8HoOg2zoy ckWbNJQ/j4L87FR4LAXPu8Rc7N7v2RMD7fqx1wTZ6x3kWALfxNhs5irkPe8C8dQ9S7NndQ XdW59vJwKj1OqxFK63Rm8a4sngs+yzPVXVKm6Yxmjue1qwN0MNX7Pmh2p/87W54Ng5gVd5 BbamMC+D65mIO8kJ+0QE2af1fhQlB/oG/dmqlhx85A8RMoqZgwz46SevAbyu/eREFSOYC1 5y4jEjM/QKyO1nwrxy9a7kXnjuSPwpvfAAQIzJX+/m8Y4XYiom0eDs4NEC5CbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B42kY3znCQ; Thu, 20 Mar 2025 02:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rGHQ046502; Thu, 20 Mar 2025 02:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rGIF046499; Thu, 20 Mar 2025 02:53:16 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:16 GMT Message-Id: <202503200253.52K2rGIF046499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 48d6b52add36 - main - devfs: Return early from sysctl_devname() if no input is given List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48d6b52add36cc09e7fb1fbec44ab66c0742f320 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48d6b52add36cc09e7fb1fbec44ab66c0742f320 commit 48d6b52add36cc09e7fb1fbec44ab66c0742f320 Author: Mark Johnston AuthorDate: 2025-03-20 01:34:10 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 01:34:10 +0000 devfs: Return early from sysctl_devname() if no input is given Otherwise we end up searching for a device using an uninitialized key, tripping up KMSAN. MFC after: 2 weeks --- sys/fs/devfs/devfs_devs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/fs/devfs/devfs_devs.c b/sys/fs/devfs/devfs_devs.c index db879efe803a..c6dcd4fc7646 100644 --- a/sys/fs/devfs/devfs_devs.c +++ b/sys/fs/devfs/devfs_devs.c @@ -86,6 +86,9 @@ sysctl_devname(SYSCTL_HANDLER_ARGS) struct cdev_priv *cdp; struct cdev *dev; + if (req->newptr == NULL) + return (EINVAL); + #ifdef COMPAT_FREEBSD11 if (req->newlen == sizeof(ud_compat)) { error = SYSCTL_IN(req, &ud_compat, sizeof(ud_compat)); From nobody Thu Mar 20 02:53:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9B64CC8z5r8j9; Thu, 20 Mar 2025 02:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B546vxz3cFL; Thu, 20 Mar 2025 02:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFWKmVapJjNeerERzjJQa1Vjjmu2VnT+zTPiYMpQaB4=; b=yZn7mzOb0bYdrCeiVKqr7npE9zVM0lpEipWAxIgjQfbtqAr5RTXFh3taE6gE+23qJcVC5+ YozbMiTI6J7vguGcVlClBfPWfjPzygpbzXoIzIfH3IMClrimem17x610qBNnPwawFMyKZx /3vgSgFSf5EyC0oRKyUPGUWiHe6coMMFwxc+diwVz69f9+FSdmp9NKNE+gczM3M9xg64eh jgEEXjfDeFXMXYs/KnxMFzhuBxV6L2GuLcCZ6XP26e9Kr3u5zhk14mru0pZ0V7lgiZ4Asa aP6gG/m3Zk7ceThus063Fy7MhywUPYCTvDQA7Y+4qWj0fJd/p5g2CMRokbg1ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439197; a=rsa-sha256; cv=none; b=UrI7MPoroGOlzqKLd7EhFJsKndhDY8pBKbV49/Bp6N0Zqg/8zIL2xgOSk5iGouVdxu81Nt ynuy7hteeMst4W/o6+UWmTr9jW2Xzh9tHYx1o5leV66SAdaPHkV/a7rQ8iqsioTbyHTAcK lJIgjA7Tkv9pPxPbKfW/34es1diPKA1nnmpxpBbjimPIaRzV8yOgiAARHTTj/GVr1C2XdH tZ/1OCRymo4USsy2qdBi0+yxfNIu4ek4/MCRKdsJyaMlopdQ0JSjO8BazFjlGhrUieZzJC 88+IyZXGOLGSxbcyHc/IvcNezwjkrkBrDjwt/1Kd5o1vU0+8dMOxJa8VXMWIuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFWKmVapJjNeerERzjJQa1Vjjmu2VnT+zTPiYMpQaB4=; b=BLSTwhi8xiMH+S5fnOF6faFx7rCWpnBPZwDzRKj0qll0JEsfGj6aZhdQVjDZLkeeUJ2BJ4 TVA7WL8BoLL2e39+b7HGXe+fU+shzdN5HyneCdrFxzpGXNv91lbyevDqH8hW/Eul6ACQAi B/luIguOSGKpNNva5lwIpVi6pijHhnJF/UvVegExxDvKLH69sHq/HXv+srVDdI/EnfDhe6 EbJX2V9/G6wWNkB7LzOmg1BcxOr6955hMkY3/j/Hxg9WFlb57hPX0xYJOOU3Onvd2/1xES x+4EKhcGZt+lNo2HYtIRMEwlNM0X4TQUUgwrqg4rJtONukcSSx1XAe/hEk+zAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B53fTgznFR; Thu, 20 Mar 2025 02:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rHGh046540; Thu, 20 Mar 2025 02:53:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rHJM046537; Thu, 20 Mar 2025 02:53:17 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:17 GMT Message-Id: <202503200253.52K2rHJM046537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d8703cd80247 - main - vfs: Return early from sysctl_vfs_ctl() if no input was given List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d8703cd80247ca203b817305753bda2b7dbfb5ef Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8703cd80247ca203b817305753bda2b7dbfb5ef commit d8703cd80247ca203b817305753bda2b7dbfb5ef Author: Mark Johnston AuthorDate: 2025-03-20 01:34:18 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 01:34:18 +0000 vfs: Return early from sysctl_vfs_ctl() if no input was given Otherwise we end up searching for a mountpoint using an uninitialized key, and likely failing the version test. This violates KMSAN's invariants, so simply return immediately instead. MFC after: 2 weeks --- sys/kern/vfs_subr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 95ed98d3217d..96e8bb765972 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6519,6 +6519,8 @@ sysctl_vfs_ctl(SYSCTL_HANDLER_ARGS) int error; struct mount *mp; + if (req->newptr == NULL) + return (EINVAL); error = SYSCTL_IN(req, &vc, sizeof(vc)); if (error) return (error); From nobody Thu Mar 20 02:53:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9B84b31z5r8Jy; Thu, 20 Mar 2025 02:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B767C8z3cBd; Thu, 20 Mar 2025 02:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18HfQoJ4oym2B5hsKJ17oCaXiBGMdw7oiD098uIRxM=; b=bKW16X95qliVn57K166IwQqGPQTbUgMcBucBibXK9g0/qOVbb32hq0dpsdE7fMKUCSuK2B upjhoh4Cgshq7Ivk66kWooRUmmmbDqcs2KFZTXYA4mR+6F3oXyjFVRJHPQNBye5m5z428d 8IofK9rEiuK+WGm3zCIZuTATG9k63kMxnybgzyvNKpwDD9CzbeAq2YmbJcT7P4I5DBvokU SxKe4arTlkD10GgGdlSB+RkEut9mFpmfU3EylGRMXXPisNUt2vcXkTewo9OROwEZw7N8bk G2VD6FQietTrEQxdo596n/ymNRRqyI0ZtU758TsTFlJbgoRUbc2W5GM0J8skPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439199; a=rsa-sha256; cv=none; b=gJA8droSGVm5yxJDY/9R3YoG+mrDTTs7rdw0W0J403QtHK8s5CqsdfmFdBGV5dn7e5Nbd5 CRitIU9zTEaCZNXcVMaRjrtVlw4jPlc60w7Jn0szOpY3U41aM/3CxaukFzOdBDqgDpCf1Z 5cjRxdOqpOOF4smKLLBNlhv8CwCvPIR8oHrwIGjjLTWuymDwQBqHPtKgjtdfv3Hs+D28Z/ X5Cd2+eCmYLotJ47XThE2Ip6Gcs9jUMP0VV9qS8IA/VegB58WdWt4cpdG5MS3/tanBXMYM enF8j52fJInEtL5Svub9ev+7nKCs+Lb6eQ0Q33kiOQWbvbbIngdje8CVwAzhFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i18HfQoJ4oym2B5hsKJ17oCaXiBGMdw7oiD098uIRxM=; b=lE6VtZ6MDKKjDoU73O+8tlZ+LuOERotMeVZDJgU4BDGkyQH6+BH97Rxc2YqpnnirpqrmZf CS5G65SzMcJ6vZF/U5INnlU0FAZZBe/3+7zB7+wqLvw77et2A8po2wQDexbpskUBc4bw15 Z9ZTV7OFjrJoxTccm92YV9FpV0PIXiMaprQ4byowzn7aGABH5UwGbAxf2uhHMijXaSp2jD d9KKVMCFWuUKZmGPVzUbNopRO4YMeHuhsgMA1ZKLahHghO4K/ZokkA4k0Z9iUuiXSBkBPb ZjBcrFvY7ty2oNq8H9M1+LuwXgsOb1K7ZlGS3eDk0MfHSPZ0zcVL/wwgi9AmJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B75ZsLzn8H; Thu, 20 Mar 2025 02:53:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rJ32046606; Thu, 20 Mar 2025 02:53:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rJrA046603; Thu, 20 Mar 2025 02:53:19 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:19 GMT Message-Id: <202503200253.52K2rJrA046603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 57b09e470dbd - main - pkill tests: Fix pkill usage in the pkill -x test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 57b09e470dbd84d1491a8972cf504b25e788a6c3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=57b09e470dbd84d1491a8972cf504b25e788a6c3 commit 57b09e470dbd84d1491a8972cf504b25e788a6c3 Author: Mark Johnston AuthorDate: 2025-03-15 11:12:45 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 02:52:49 +0000 pkill tests: Fix pkill usage in the pkill -x test The target process name(s) mark the beginning of the command's positional parameters, so the -P filter wasn't getting applied as intended. As a result, the second "pkill -x sleep -P $$" would kill all sleep(1) processes in the system, which can cause problems when running tests in parallel. MFC after: 2 weeks --- bin/pkill/tests/pkill-x_test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/pkill/tests/pkill-x_test.sh b/bin/pkill/tests/pkill-x_test.sh index 9247a85863c0..5fe751f9ec72 100644 --- a/bin/pkill/tests/pkill-x_test.sh +++ b/bin/pkill/tests/pkill-x_test.sh @@ -9,13 +9,13 @@ sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep $sleep 5 & sleep 0.3 -pkill -x slee -P $$ +pkill -P $$ -x slee if [ $? -ne 0 ]; then echo "ok 1 - $name" else echo "not ok 1 - $name" fi -pkill -x sleep -P $$ +pkill -P $$ -x sleep if [ $? -eq 0 ]; then echo "ok 2 - $name" else @@ -28,13 +28,13 @@ sleep=$(pwd)/sleep.txt ln -sf /bin/sleep $sleep $sleep 5 & sleep 0.3 -pkill -x -f "$sleep " -P $$ +pkill -P $$ -x -f "$sleep " if [ $? -ne 0 ]; then echo "ok 3 - $name" else echo "not ok 3 - $name" fi -pkill -x -f "$sleep 5" -P $$ +pkill -P $$ -x -f "$sleep 5" if [ $? -eq 0 ]; then echo "ok 4 - $name" else From nobody Thu Mar 20 02:53:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9B740T8z5r8X6; Thu, 20 Mar 2025 02:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9B64kVYz3c8X; Thu, 20 Mar 2025 02:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaFn5vTJDW8//6i2TUhoGMIvDUZo3U1nKv2xzKQo7ME=; b=ikWz/kfraJlIW/7Q2ifuWxSJcYqSobW0DzRNqgcauftSDV0AI49b7btfKSva8VHJQYguyq 4WL+UvcFDbKsiNSJ6S8EP3eJspV1vUmgGAZCzvPIzPBs/CRoKq/k9dPZoKv7QWrcdBMhkg rzUgdRMCy0l6uAPfD8ILty23nsKaHSg1XzOQt/98srx6LbJhlwF+6+bByNtlAxkSIG51d9 +fnYMp5/N44M14tB+W/VW9gs9H5/WbHoB+49o80LGGtRf+4YADEAqe4MmP1JEz04R1J4O4 6ezuDSKYZ66kgkq1kFw3AGdV+V+871o0rU0bDT8QLydvZLXhq0nGVzyZVOCOHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742439198; a=rsa-sha256; cv=none; b=HhYePln3vbW8LiQALDobdyVbOXRoq97jGinr7M9018z/ILLontSedG93iSEcXGAj0fxf5F PSu5jy4WoegDJVmrmOwBJh7GoX9Akpk8Xr6DmgSQ2KRpBdQcy/G52Q3CKVpZQHNYbsgMKJ QZJOz0WfNBypWoxSHC8Kzl/vQb7r+LQxAeMPrLL1S/9ArLKMHrprFziU6jvBxleC1p8Drs vgpKplIpIre/BZpW0LU56LG0n/bnJ6/iya3+S9y34Xj45bGD7UanICwUzgOQ8mTZpQlrBJ aRl1a6sSSrrQPt9iVXPtxtb3Ef49Ln61HVSvvjE+j1GqjrwzBnXt3ucTc1jD3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742439198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaFn5vTJDW8//6i2TUhoGMIvDUZo3U1nKv2xzKQo7ME=; b=yUYQy83wSxP3L8etCZnqlhp9jUQsukhiICm7EVAQ/UQzOdsNlMS6UvHZEuYvTocGJQq/xC lsXLG1wPLk85tudece/3o4KaHaSrrEJEXxs5lqM+mJN8avnCOKLwgr9sn0aF9AuuXzZSEC fu1V26D4T11NRi6Q+ccRnKM86VYFQPKTjeRTW025915I+9FDArmLGU3yYW0S8aZjKpYw7f BAvyn1vcnoHok45HKJuy3n1+vza+o075cfcsCaKdqB91gST1Mg+0K6sRQEr0csk+opR5K8 0qbhss6lO7wRWjI/o4EB4cgyIrl/M3fjqKbKDfxUP2DiVMiCTI8jFYsj45YEKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9B64L3vznCR; Thu, 20 Mar 2025 02:53:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K2rI06046573; Thu, 20 Mar 2025 02:53:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K2rIOb046570; Thu, 20 Mar 2025 02:53:18 GMT (envelope-from git) Date: Thu, 20 Mar 2025 02:53:18 GMT Message-Id: <202503200253.52K2rIOb046570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cf6a7804699f - main - pf: Update a dummy TCP checksum field in pf_test_state_icmp() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf6a7804699fee8931af7d5c36b1fddb19d700eb Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cf6a7804699fee8931af7d5c36b1fddb19d700eb commit cf6a7804699fee8931af7d5c36b1fddb19d700eb Author: Mark Johnston AuthorDate: 2025-03-20 01:34:38 +0000 Commit: Mark Johnston CommitDate: 2025-03-20 02:52:42 +0000 pf: Update a dummy TCP checksum field in pf_test_state_icmp() Otherwise the parameter &th.th_sum passed to pf_change_ap() points to uninitialized memory, since the portion of the TCP header that we copy from the embedded packet doesn't include the initial checksum. This is harmless but triggers a KMSAN violation. Use a dummy variable instead, initialized to zero, to fix the violation and make it clear to the reader that the value isn't used. Reviewed by: kp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49347 --- sys/netpfil/pf/pf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3bf7e0e2077c..dadb3299ff99 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7905,6 +7905,7 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, struct tcphdr th; u_int32_t seq; struct pf_state_peer *src, *dst; + u_int16_t dummy_cksum = 0; u_int8_t dws; int copyback = 0; @@ -8026,10 +8027,10 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, nk->af)) return (PF_DROP); pf_change_ap(pd->m, pd2.src, &th.th_sport, - pd->ip_sum, &th.th_sum, &nk->addr[pd2.sidx], + pd->ip_sum, &dummy_cksum, &nk->addr[pd2.sidx], nk->port[sidx], 1, pd->af, nk->af); pf_change_ap(pd->m, pd2.dst, &th.th_dport, - pd->ip_sum, &th.th_sum, &nk->addr[pd2.didx], + pd->ip_sum, &dummy_cksum, &nk->addr[pd2.didx], nk->port[didx], 1, pd->af, nk->af); m_copyback(pd2.m, pd2.off, 8, (c_caddr_t)&th); PF_ACPY(&pd->nsaddr, &nk->addr[pd2.sidx], From nobody Thu Mar 20 03:13:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9dx4qmcz5r9pG; Thu, 20 Mar 2025 03:13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9dx2s3Rz3w0P; Thu, 20 Mar 2025 03:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFk61KsQNmtplk/PegP1zloNg62TD5I/k7xMcfkXXjQ=; b=SADYIZBuKFX4QQKk1k7phwZEjmjxnlgATsYE8dZfyE1Sk4xUuErOQd58MBFurbTcdamTai dTZiDVzc30aupWpiYxS5sXnf8qep1xOGJlXjUbro9lI5gUXeW5RaYqcD+Fpqma5gTkB0Kd nQOoAEfcnZLYL9Sn6QDgmgriLB5w+Ao+tdIQFNf1XmuX+5AlBoDMKzz5IETOdbmWi0mxWa A/GiTWPU1d8hMTyKjddcqmcg4nrKDQjfuxangl7LXmwoC2r6oqASKNqcFi32JrT7mvm+Kc vXtNwdrGZ2CLnTfKJnYJpKhfxsU6JecqIRsSimA3npo/aUXIFKjlxQTscXP15A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440437; a=rsa-sha256; cv=none; b=aWExvQjZv9QjV+rmxIv/8fWWmdmFf4XM9d/11000H4OI7oMQtPAAzS0/boBl3ld8LUGS6A p5d786vN4rDzAuaWnQ5nDqQcu+gvSLb2/0Eh4XoffAKqRMSApmKcIJKMUtVHAWyPvdqRI4 yQOuJ/73p0134u5aFXnYq2FwU28rg5m0WJohX97jvR3PUKQeQlF88nCAZAf7GK2PacdFUD JqDHmY1MMhFEQ/oy8eMwVceWa5oxukiRY9Q25a4zvCcbp0N1CwDhk5Foy4yMglb/q4VF/0 PddCkmqR4w13DxcjLW20IBK4fkY1xWDrI5NVq41ZQ0D+iWMHQC0SAj3Bajwyiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jFk61KsQNmtplk/PegP1zloNg62TD5I/k7xMcfkXXjQ=; b=Fv/lVW5+9jNZCag6vXvy+a4YP0OUHaiiOrUR3hBLONNTLJfZPNHta7i/fNuaAwVraIZd1/ 0PmVyYwUZxUlP2b7jcvcVJZfn5ySr4bPnjg8G76zARavnTl5M7qkflIkWUBkQMWbYAik8G E6zFVMRdDYWGUHRQVo7yn0lzTOk809HzCG0AmSuNCvY5zi3mfJeTDgj2AmjvqZEQsDErAI Xb0Mg5TVX++/wK5W+9Bl9aG1TWW+JtN871wR0QIW3m9yrnK4npXLP2n7yfruP7l3UHF1Dt jnDpne65JXkpWG/lNjkmbgT1iqn+tpn8lxdpJTPwLn9bX6NSYL0ahysbtzWOtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9dx25SBznsp; Thu, 20 Mar 2025 03:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3DvH7085922; Thu, 20 Mar 2025 03:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3Dvpt085919; Thu, 20 Mar 2025 03:13:57 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:13:57 GMT Message-Id: <202503200313.52K3Dvpt085919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4ad84614e490 - stable/14 - ip6_cksum.c: generalize in6_cksum_partial() to allow L2 headers in passed mbuf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ad84614e490cf2d59d670081b1ee1b065d89c15 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4ad84614e490cf2d59d670081b1ee1b065d89c15 commit 4ad84614e490cf2d59d670081b1ee1b065d89c15 Author: Konstantin Belousov AuthorDate: 2025-02-19 12:38:34 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:36 +0000 ip6_cksum.c: generalize in6_cksum_partial() to allow L2 headers in passed mbuf (cherry picked from commit fcf81de12f27d34a5c18168fd0c756c371a62076) --- sys/netinet6/in6.h | 2 ++ sys/netinet6/in6_cksum.c | 25 +++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 0a4377638de1..b62da99f9293 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -666,6 +666,8 @@ struct ip6_hdr; int in6_cksum(struct mbuf *, uint8_t, uint32_t, uint32_t); int in6_cksum_partial(struct mbuf *, uint8_t, uint32_t, uint32_t, uint32_t); +int in6_cksum_partial_l2(struct mbuf *m, uint8_t nxt, uint32_t off_l3, + uint32_t off_l4, uint32_t len, uint32_t cov); int in6_cksum_pseudo(struct ip6_hdr *, uint32_t, uint8_t, uint16_t); int in6_localaddr(struct in6_addr *); diff --git a/sys/netinet6/in6_cksum.c b/sys/netinet6/in6_cksum.c index cb2d89065f74..40d4d80ea4fb 100644 --- a/sys/netinet6/in6_cksum.c +++ b/sys/netinet6/in6_cksum.c @@ -250,14 +250,15 @@ in6_cksum_partial_one(void *_arg, void *data, u_int len) /* * m MUST contain a contiguous IP6 header. - * off is an offset where TCP/UDP/ICMP6 header starts. + * off_l3 is an offset where ipv6 header starts. + * off_l4 is an offset where TCP/UDP/ICMP6 header starts. * len is a total length of a transport segment. * (e.g. TCP header + TCP payload) * cov is the number of bytes to be taken into account for the checksum */ int -in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, - uint32_t cov) +in6_cksum_partial_l2(struct mbuf *m, uint8_t nxt, uint32_t off_l3, + uint32_t off_l4, uint32_t len, uint32_t cov) { struct in6_cksum_partial_arg arg; union l_util l_util; @@ -275,9 +276,10 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, } uph; /* Sanity check. */ - KASSERT(m->m_pkthdr.len >= off + len, ("%s: mbuf len (%d) < off(%d)+" - "len(%d)", __func__, m->m_pkthdr.len, off, len)); - KASSERT(m->m_len >= sizeof(*ip6), + KASSERT(m->m_pkthdr.len >= off_l4 + len, + ("%s: mbuf len (%d) < off(%d)+len(%d)", + __func__, m->m_pkthdr.len, off_l4, len)); + KASSERT(m->m_len >= off_l3 + sizeof(*ip6), ("%s: mbuf len %d < sizeof(ip6)", __func__, m->m_len)); /* @@ -291,7 +293,7 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, sum = uph.phs[0]; sum += uph.phs[1]; sum += uph.phs[2]; sum += uph.phs[3]; - ip6 = mtod(m, struct ip6_hdr *); + ip6 = mtodo(m, off_l3); /* IPv6 source address. */ scope = in6_getscope(&ip6->ip6_src); @@ -315,7 +317,7 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, */ arg.sum = sum; arg.rlen = 0; - (void)m_apply(m, off, cov, in6_cksum_partial_one, &arg); + (void)m_apply(m, off_l4, cov, in6_cksum_partial_one, &arg); sum = arg.sum; /* @@ -330,6 +332,13 @@ in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, return (~sum & 0xffff); } +int +in6_cksum_partial(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len, + uint32_t cov) +{ + return (in6_cksum_partial_l2(m, nxt, 0, off, len, cov)); +} + int in6_cksum(struct mbuf *m, uint8_t nxt, uint32_t off, uint32_t len) { From nobody Thu Mar 20 03:13:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f02ww9z5r9rr; Thu, 20 Mar 2025 03:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9dz4FK9z3w9D; Thu, 20 Mar 2025 03:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sBaJ18mMIb43qqwx1NvyqKep9V83DKHZHYdsH98LtD4=; b=XnStsyxjj3YarbNzH4vkJfCmi8JOcNLgNIYhYfvPEFYzQphP90HcVYvXv3ofgpUnRxGfXs FJ/ASVMenen3KwhC5fOU7rCoDXfJ6AXeTbi7hyfLy1s91DIcuf0lqetrkY0BpJGHDFGdhv DqMq+bsefBSqqRT5iPgCVldx40CvHNayLzs8mDaGJRB1h6VfaDN3Ta1rECF8rlfk76p2iV x4+gCGXX0Gp17L1AGSMQMHdKn+Bbh2T6YUJikvy3RmOsXMTJNkdkv1Vg+f4aUnLN3L87vd R9yCUrLP6EAUJpgm6Gb6XZ4wQJ8oFgeLsf9UQWBh9MIKZeIA3Mgkelkpfl0O0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440439; a=rsa-sha256; cv=none; b=BFo9JMFLtPkZKaee4AUQKb3Y4pd5ANvix5AdK4Hi/WLx4GRHnV6EwTzPmQ57OMdqodwsWq 7+ttamEP9ARp7CZbddunZImmqus48ojZOofzM5ZEdMP93vQa5I9QPNRJCDWtnOvATIrlLQ 2duoWMmGfqch9ElF62VAFJ3oU2pmDmlxVjZQSYdiuqmLylomzFNkWqazzv0Ev27T7YozS3 C4CdsYMZLYijZbfIctPRp3anWtmEhIYkGrqJ2+/Cwvg1gEDRqIgQTGC8LJE8oAlvBsvnt8 1Ukpt4G+TDJHQwO4VnzCFJvk8YHpujsEfxLdhtwrZsMLj9HmyVKTnQRqDQFpcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sBaJ18mMIb43qqwx1NvyqKep9V83DKHZHYdsH98LtD4=; b=Kp4lp3dfk9fWgajf88NQFuf8yKI1G8IbwmLZYP1wx1mqJcFAlCmFCqAKHj0azEFz3helJW Z1M94KPGla3dp18tNPwufT8daUMpF7+r/jpCuNES2I+oa/sTUkAvcyBNoiqBK3SSyK0D3J S3L1qDwjVXl14FvMVEqpFHDp1LtYjLu8zjkQEFQ8xkBRQe1p3O8utL7jSDLDFReFYwqaFG SZNoT7gV0SptykIA4+0ty4rSFg2HLG1HL3Bcu76nJfyhQnvH5XJKgJe3xMGO1GNB7TqdFr CGmWRDXcTzvp8hqi0pOTEPI0IOxOe+K2PXcu9pivR/8R/T+gpa1TmgjraFf5mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9dz3q9FzpBc; Thu, 20 Mar 2025 03:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3Dxlh086057; Thu, 20 Mar 2025 03:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3DxEV086054; Thu, 20 Mar 2025 03:13:59 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:13:59 GMT Message-Id: <202503200313.52K3DxEV086054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 9ac8af72a7c5 - stable/14 - mlx5en: control hw LRO with the driver conf sysctl, leaving IFCAP_LRO to sw List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9ac8af72a7c5f756da6ad2468958f3bd0cc976b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9ac8af72a7c5f756da6ad2468958f3bd0cc976b8 commit 9ac8af72a7c5f756da6ad2468958f3bd0cc976b8 Author: Konstantin Belousov AuthorDate: 2025-01-28 20:38:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5en: control hw LRO with the driver conf sysctl, leaving IFCAP_LRO to sw (cherry picked from commit 816f27e848e549e6ff895affc29298f68e0bb644) --- sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 10 +--------- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 24 ++---------------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index 6a2c07addc62..459801cdf27d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -1124,16 +1124,8 @@ mlx5e_ethtool_handler(SYSCTL_HANDLER_ARGS) /* import HW LRO mode */ if (priv->params_ethtool.hw_lro != 0 && MLX5_CAP_ETH(priv->mdev, lro_cap)) { + priv->params.hw_lro_en = true; priv->params_ethtool.hw_lro = 1; - /* check if feature should actually be enabled */ - if (if_getcapenable(priv->ifp) & IFCAP_LRO) { - priv->params.hw_lro_en = true; - } else { - priv->params.hw_lro_en = false; - - mlx5_en_warn(priv->ifp, "To enable HW LRO " - "please also enable LRO via ifconfig(8).\n"); - } } else { /* return an error if HW does not support this feature */ if (priv->params_ethtool.hw_lro != 0) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 051669e7f85a..fb25d2f8b40c 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -3651,31 +3651,11 @@ siocsifcap_driver: } VLAN_CAPABILITIES(ifp); - /* turn off LRO means also turn of HW LRO - if it's on */ - if (mask & IFCAP_LRO) { - int was_opened = test_bit(MLX5E_STATE_OPENED, &priv->state); - bool need_restart = false; + /* hw_lro and IFCAP_LRO are divorsed, only toggle sw LRO. */ + if (mask & IFCAP_LRO) if_togglecapenable(ifp, IFCAP_LRO); - /* figure out if updating HW LRO is needed */ - if (!(if_getcapenable(ifp) & IFCAP_LRO)) { - if (priv->params.hw_lro_en) { - priv->params.hw_lro_en = false; - need_restart = true; - } - } else { - if (priv->params.hw_lro_en == false && - priv->params_ethtool.hw_lro != 0) { - priv->params.hw_lro_en = true; - need_restart = true; - } - } - if (was_opened && need_restart) { - mlx5e_close_locked(ifp); - mlx5e_open_locked(ifp); - } - } if (mask & IFCAP_HWRXTSTMP) { if_togglecapenable(ifp, IFCAP_HWRXTSTMP); if (if_getcapenable(ifp) & IFCAP_HWRXTSTMP) { From nobody Thu Mar 20 03:13:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9dz0WRkz5r9vM; Thu, 20 Mar 2025 03:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9dy3jfbz3w9B; Thu, 20 Mar 2025 03:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CWWqo89SHLq69VcePeflSrdiU/gf1RHfGKY8CnYwGX8=; b=nWe/s2ZCpG785ysPH7fxwBOx3Lw+sZn71hz/YkS41+FN6AdsjloBUDKcQTog13Ha3ejPWo p+OUIs3NBqgy1n3oPpgdvF1gmyMp8hLjH5fq0MnBQ23fvnOQzsY6/7wW0toJl1orNbG8nv gC4tBa4VTxJ8CA5bMVY2qk9PhD3Ns4qCn5rKudxjL2bsVNgLTbq4qT4qVtEAXJwpiFwg0e sHbmDXyEfApKS7cF10SpWePdbh+NV4AGIjTp4k0AisUVJu/E3Sh+YUeVDtUbraiQu2LOCH F+wcu8o3rf53jM0lW1rHCGoCmQ5LPyAw5tHSc6HDYcUF76a6AD00qnzYprYKjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440438; a=rsa-sha256; cv=none; b=gkEA+fJTlVTkqbTRQVnVvVDLQyK0snVe1blalxZ4lIuFzm3PwxlNiJmZjvFbusLwgzlrWS 6xfkGkzLkFbFLIUm4xU/pdKDKuhmgJ8K7pUWHS+Le0co4irzRTZxG7KNv0fQdyF6B+Nqe1 Zks0A/mCiW4K/RZ3UYYCM4tCdTRkx3DU+5HcyyIv7c5e9FgY6JLZItiLJ+mvCCVw4KEkbf Z9VLuChZyawjWC1S7upesvUtFllySpK75x1jlK2t0IAENbG5q+UoIx+qIaOBNpYO3FDlx4 sZ6I/ApMprWLygmSms+kfF+OuorKMCakapYxL9ENFb5/S4V4x/IBiWKN2oIjIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CWWqo89SHLq69VcePeflSrdiU/gf1RHfGKY8CnYwGX8=; b=cHQTi3UwWONCK9/OGaUeoXDiWLVk+XNq1HnKC6+hRsD/LMFrx7zqaUBiNp7omGaU4bBT90 iTqy8rhxFmJBkljTTcSqYm+6H9ENIvkALxhy8fRp4TtwKx6rg2Bkonjch1rvJtE/wgatWk st5mGbxq7UpupOHcG7Uk88Hl83WDCpz1a8I6U3QwlrEqiAg5clcqXr8TO0uC6v9B97cHkh dp5XEty4KLtB7J0qOceyR81u9FOBu1AUgPVlEsgot7h5jruVt9RF1ZaQxVSXlWNKW3iHYD gnnM/qINHtlo+ZGkC/krQvQP3sNsoMymoHTS13mXZAIFiuh47fQsvgEgceSNvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9dy3JFvzpG0; Thu, 20 Mar 2025 03:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3DwAt085956; Thu, 20 Mar 2025 03:13:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3DwBH085953; Thu, 20 Mar 2025 03:13:58 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:13:58 GMT Message-Id: <202503200313.52K3DwBH085953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: cb49625f1502 - stable/14 - mlx5en: make conf.hw_lro sysctl r/w List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cb49625f1502240488726f7cfdd8873149fa19c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cb49625f1502240488726f7cfdd8873149fa19c7 commit cb49625f1502240488726f7cfdd8873149fa19c7 Author: Konstantin Belousov AuthorDate: 2025-01-28 20:35:25 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5en: make conf.hw_lro sysctl r/w (cherry picked from commit bbac54b820cb9b76d19082d1f9f36507c3dd3a0e) --- sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index 0dcca1077a60..6a2c07addc62 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -1479,12 +1479,6 @@ mlx5e_create_ethtool(struct mlx5e_priv *priv) mlx5e_params_desc[2 * x], CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_MPSAFE, priv, x, &mlx5e_ethtool_handler, "QU", mlx5e_params_desc[2 * x + 1]); - } else if (strcmp(mlx5e_params_desc[2 * x], "hw_lro") == 0) { - /* read-only, but tunable parameters */ - SYSCTL_ADD_PROC(&priv->sysctl_ctx, SYSCTL_CHILDREN(node), OID_AUTO, - mlx5e_params_desc[2 * x], CTLTYPE_U64 | CTLFLAG_RDTUN | - CTLFLAG_MPSAFE, priv, x, &mlx5e_ethtool_handler, "QU", - mlx5e_params_desc[2 * x + 1]); } else { /* * NOTE: In FreeBSD-11 and newer the From nobody Thu Mar 20 03:14:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f12mD1z5r9pH; Thu, 20 Mar 2025 03:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f05FSxz3w2s; Thu, 20 Mar 2025 03:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tCdjn6hd/JD3C3HGBkdsqseOMtslmI0gQk5YEd3mmyk=; b=L+sO2fM7X1pq7g2MCfFf7Alaiw0BMyW3TvOtCFZ6vc3RoiqAXBha7cRjXcwBj7TsDfdOKU oClmsOrDa4BOgGl3Bub7LbVk2UabmPNftrSEZgArCPqgh3Bw4Q87mjoOKJVBxdGjQuSCTj 9ErsDMaubLNh2X5xY5yqX0C3/uwLmEzA8n6NkN7R6vU7jqI5OYABq0XJ+DtZj8CA3SVuiD SmFUhTkzN4tkGMu4dLB/W5FbZhP98uOyAojUnkuhj6IVtApQY0h0sFCPOnrMMziStykyMx /wNg1RSXL+oGJx8gyGxY8a7qVH8YUoB63Pej0+bv+hX43yUOeUkBzdf88VAlOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440440; a=rsa-sha256; cv=none; b=e0Bzv7lnUoWv+cBwPu4gmE6Xs5JMhZyReH9cyJLD/L5MbTNOWazWQ1KVOgU9fFTIskhUYI mP+0BvEJ9Xf8E1MIdGSAbW+kfVvPu873DubDJmOVWcSWU6+VcwENNsrpoKcWhGT3hw4s4v MaG/HMI7aVkadj5MDNaxdFoFwhDCpE1iQrlGeGhIIBv8I9sZlSD1aepAiu4YAq12ViWKc3 qncpD3BA6Ri/8iUipOfY5MGYQ17b2CNj11sof3GcDH6U0VpQwiMNLaRD/2ZyhnBvi/8j6s 1qabLNei2USvnjxQ05larkxBunN8xecNb07oK87GmTw2SIy48aQZsB28UvrYjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tCdjn6hd/JD3C3HGBkdsqseOMtslmI0gQk5YEd3mmyk=; b=hWhIcPe+lYaTvz0jDZv0zNY4h+VgB3reIoqd/tMLWZhHzwVL27jpiAqF4gehLG/KsXX6qG JjaL0vLKZzQ/i8jKJ9z1qsJ/asFcqAchexPTJ19leC4Y2soCEMdcfygLzM7fSalvW//oIM mZoYx8w2lG+DTwEm27Y3o0yHOHzFs03ivIfmViq1oSH0vl5wxqmwCgSehgYPvIN4V4PBoG pJCqRfaSnMcvG8ovlNoGDFEaFTfFw8PTUAOW4SPoOyDd17rUq6n+ppr4aaaKEKwqmYoPRX shFXs8n51/oTqIEzAwK7Cb1G3NlqB45IKzMrqIyOpCXbn0hXeiNWZo2U/qu6Fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f04YZ2zpBf; Thu, 20 Mar 2025 03:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E08k086112; Thu, 20 Mar 2025 03:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E0ZC086109; Thu, 20 Mar 2025 03:14:00 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:00 GMT Message-Id: <202503200314.52K3E0ZC086109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d0a800a7fcdc - stable/14 - mlx5core: add mlx5_core_modify_tir() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0a800a7fcdcb276d5083aa906bef7c7e5b33e93 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d0a800a7fcdcb276d5083aa906bef7c7e5b33e93 commit d0a800a7fcdcb276d5083aa906bef7c7e5b33e93 Author: Konstantin Belousov AuthorDate: 2025-01-30 11:11:29 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5core: add mlx5_core_modify_tir() (cherry picked from commit 98071573638a1f31e4007894ce20a4fdc8e33a1d) --- sys/dev/mlx5/mlx5_core/mlx5_transobj.c | 12 ++++++++++++ sys/dev/mlx5/mlx5_core/transobj.h | 1 + 2 files changed, 13 insertions(+) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_transobj.c b/sys/dev/mlx5/mlx5_core/mlx5_transobj.c index 6d375d371597..c62969d8d172 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_transobj.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_transobj.c @@ -166,6 +166,18 @@ int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, return err; } + +int +mlx5_core_modify_tir(struct mlx5_core_dev *dev, u32 *in, int inlen) +{ + u32 out[MLX5_ST_SZ_DW(create_tir_out)] = {0}; + int err; + + MLX5_SET(modify_tir_in, in, opcode, MLX5_CMD_OP_MODIFY_TIR); + err = mlx5_cmd_exec(dev, in, inlen, out, sizeof(out)); + return (err); +} + void mlx5_core_destroy_tir(struct mlx5_core_dev *dev, u32 tirn, u32 uid) { u32 in[MLX5_ST_SZ_DW(destroy_tir_in)] = {0}; diff --git a/sys/dev/mlx5/mlx5_core/transobj.h b/sys/dev/mlx5/mlx5_core/transobj.h index 1cc40ca8b1b7..6a21d7db90c8 100644 --- a/sys/dev/mlx5/mlx5_core/transobj.h +++ b/sys/dev/mlx5/mlx5_core/transobj.h @@ -40,6 +40,7 @@ void mlx5_core_destroy_sq(struct mlx5_core_dev *dev, u32 sqn); int mlx5_core_query_sq(struct mlx5_core_dev *dev, u32 sqn, u32 *out); int mlx5_core_create_tir(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tirn); +int mlx5_core_modify_tir(struct mlx5_core_dev *dev, u32 *in, int inlen); void mlx5_core_destroy_tir(struct mlx5_core_dev *dev, u32 tirn, u32 uid); int mlx5_core_create_tis(struct mlx5_core_dev *dev, u32 *in, int inlen, u32 *tisn); From nobody Thu Mar 20 03:14:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f23QFVz5r9bM; Thu, 20 Mar 2025 03:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f16bW6z3wCn; Thu, 20 Mar 2025 03:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NYa67TAV4gKVhYpi0PEDpTzw2GIsm56H/gqUruSTWI=; b=naM6e8FDn88LeNbnkFlfq2p2CIuIGTGkfruxoYbWIU8+qCVThAOjF39GpHpcaBDydd8LYn O91jwKfFyaFeVjUCqJUeLZZYj9HRVtUb0WFSHSTGoCa/l8SFdjHLwxDs82NnwEndDezK/c wUtIQGTU49MfG4h2fgIUx1j4IBPYVaSn9LWc1RatW2ADPhCU9zQLHG198kbZykJOzb4uK2 fHX7RZEkiT5uNS0r7zl2tcJlKdPympk18FofRKd6icf27Ol95qKfmqeJmjjhyxmjlGc4cI JYQJ/XyHgWmzBTKKS068H6MPHYGsayxhHA/pfJhim7gtspvGxdx0LHY7rTcvvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440441; a=rsa-sha256; cv=none; b=Ocn1Y+BOMHu9owHh2SHB9jLVReeTr6ZlZikRYhUJRLtdgIntGW0VeZNRQbrw6P6bF2Rw6G e8Z8t6jjkCuMwiL/GuSsx+2AZvKCS8ho6iPBumnD5phpX0AXYvxGpBwALNtN/yqoTIdjj5 6So+3AUMolOllxoPuxW3Mxty68siIrApzRnPcVZteuwtcTBwms/SZaic+UxT/5aFRGeUXy dxjfo70KSe9QiCQr0ARMCAcvZcURuVavLdq0HEwH1F+XtLG4HiYTHYlFm3tWsSjQebHB1z quaHP7eVAGKR1VwEbU38CdSUydy9JRtublBptFK0D3YUuc1+BbxR/xNVA7mS7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NYa67TAV4gKVhYpi0PEDpTzw2GIsm56H/gqUruSTWI=; b=a+eD7iGhnvJRNRkYg5Fsib+KEbbSrem4/r1crZZ+dco3b5+VxEJMi1MvFBMSGfpTMLTAWO Wz5+HxA0E4z1/2Ydn8yyqpk3LYN2qwxsgf+uLaxJW48F5TcfPYRsQJrXkQGfrPbGuCGYll CiszSEC4onbpRHfpF9V4mrrMhAu/+raYLl7hB4vEnhjzA5+DzeNJxGtFE6Wfe/GgHep9u4 23GKDwuiBuPKLIsSGMI34YfyrymkUWxKba6IcfyzHFjG1Mxvs/iZrk4/C4hnWUfeLK2UFv J5IQUW4kkeo6WyHvZZUyvwxI8/3oJzEWt9FzmKhUXdUQ0Uab5rCh/Ogg5QIEAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f15XZ9znyB; Thu, 20 Mar 2025 03:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E1IM086149; Thu, 20 Mar 2025 03:14:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E1Ag086146; Thu, 20 Mar 2025 03:14:01 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:01 GMT Message-Id: <202503200314.52K3E1Ag086146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 114a805bef25 - stable/14 - mlx5en: make the hw lro control dynamic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 114a805bef251169b23816e910db2da5cb581d6c Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=114a805bef251169b23816e910db2da5cb581d6c commit 114a805bef251169b23816e910db2da5cb581d6c Author: Konstantin Belousov AuthorDate: 2025-01-29 15:45:18 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5en: make the hw lro control dynamic (cherry picked from commit 02fe38b92175cb8f3a77f7a2bb72afb83836ebd2) --- sys/dev/mlx5/mlx5_en/en.h | 1 + sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 3 ++ sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 83 ++++++++++++++++++++++++++++------ 3 files changed, 73 insertions(+), 14 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index 502c1c19af6f..2de4ba6b5684 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -1295,6 +1295,7 @@ void mlx5e_refresh_sq_inline(struct mlx5e_priv *priv); int mlx5e_update_buf_lossy(struct mlx5e_priv *priv); int mlx5e_fec_update(struct mlx5e_priv *priv); int mlx5e_hw_temperature_update(struct mlx5e_priv *priv); +int mlx5e_hw_lro_update_tirs(struct mlx5e_priv *priv); /* Internal Queue, IQ, API functions */ void mlx5e_iq_send_nop(struct mlx5e_iq *, u32); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index 459801cdf27d..b0b7a175a1b6 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -1133,6 +1133,9 @@ mlx5e_ethtool_handler(SYSCTL_HANDLER_ARGS) priv->params.hw_lro_en = false; priv->params_ethtool.hw_lro = 0; } + + error = mlx5e_hw_lro_update_tirs(priv); + /* restart network interface, if any */ if (was_opened) mlx5e_open_locked(priv->ifp); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index fb25d2f8b40c..99554526bb28 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -2939,6 +2939,73 @@ mlx5e_get_rss_key(void *key_ptr) #endif } +static void +mlx5e_hw_lro_set_tir_ctx_lro_max_msg_sz(struct mlx5e_priv *priv, u32 *tirc) +{ +#define ROUGH_MAX_L2_L3_HDR_SZ 256 + + MLX5_SET(tirc, tirc, lro_max_msg_sz, (priv->params.lro_wqe_sz - + ROUGH_MAX_L2_L3_HDR_SZ) >> 8); +} + +static void +mlx5e_hw_lro_set_tir_ctx(struct mlx5e_priv *priv, u32 *tirc) +{ + MLX5_SET(tirc, tirc, lro_enable_mask, + MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO | + MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO); + /* TODO: add the option to choose timer value dynamically */ + MLX5_SET(tirc, tirc, lro_timeout_period_usecs, + MLX5_CAP_ETH(priv->mdev, lro_timer_supported_periods[2])); + mlx5e_hw_lro_set_tir_ctx_lro_max_msg_sz(priv, tirc); +} + +static int +mlx5e_hw_lro_update_tir(struct mlx5e_priv *priv, int tt, bool inner_vxlan) +{ + struct mlx5_core_dev *mdev = priv->mdev; + u32 *in; + void *tirc; + int inlen; + int err; + + inlen = MLX5_ST_SZ_BYTES(modify_tir_in); + in = mlx5_vzalloc(inlen); + if (in == NULL) + return (-ENOMEM); + tirc = MLX5_ADDR_OF(modify_tir_in, in, tir_context); + + /* fill the command part */ + MLX5_SET(modify_tir_in, in, tirn, inner_vxlan ? + priv->tirn_inner_vxlan[tt] : priv->tirn[tt]); + MLX5_SET64(modify_tir_in, in, modify_bitmask, + (1 << MLX5_MODIFY_TIR_BITMASK_LRO)); + + /* fill the context */ + if (priv->params.hw_lro_en) + mlx5e_hw_lro_set_tir_ctx(priv, tirc); + + err = mlx5_core_modify_tir(mdev, in, inlen); + + kvfree(in); + return (err); +} + +int +mlx5e_hw_lro_update_tirs(struct mlx5e_priv *priv) +{ + int err, err1, i; + + err = 0; + for (i = 0; i != 2 * MLX5E_NUM_TT; i++) { + err1 = mlx5e_hw_lro_update_tir(priv, i / 2, (i % 2) ? true : + false); + if (err1 != 0 && err == 0) + err = err1; + } + return (-err); +} + static void mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 * tirc, int tt, bool inner_vxlan) { @@ -2949,8 +3016,6 @@ mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 * tirc, int tt, bool inner_vxla MLX5_SET(tirc, tirc, transport_domain, priv->tdn); -#define ROUGH_MAX_L2_L3_HDR_SZ 256 - #define MLX5_HASH_IP (MLX5_HASH_FIELD_SEL_SRC_IP |\ MLX5_HASH_FIELD_SEL_DST_IP) @@ -2963,18 +3028,8 @@ mlx5e_build_tir_ctx(struct mlx5e_priv *priv, u32 * tirc, int tt, bool inner_vxla MLX5_HASH_FIELD_SEL_DST_IP |\ MLX5_HASH_FIELD_SEL_IPSEC_SPI) - if (priv->params.hw_lro_en) { - MLX5_SET(tirc, tirc, lro_enable_mask, - MLX5_TIRC_LRO_ENABLE_MASK_IPV4_LRO | - MLX5_TIRC_LRO_ENABLE_MASK_IPV6_LRO); - MLX5_SET(tirc, tirc, lro_max_msg_sz, - (priv->params.lro_wqe_sz - - ROUGH_MAX_L2_L3_HDR_SZ) >> 8); - /* TODO: add the option to choose timer value dynamically */ - MLX5_SET(tirc, tirc, lro_timeout_period_usecs, - MLX5_CAP_ETH(priv->mdev, - lro_timer_supported_periods[2])); - } + if (priv->params.hw_lro_en) + mlx5e_hw_lro_set_tir_ctx(priv, tirc); if (inner_vxlan) MLX5_SET(tirc, tirc, tunneled_offload_en, 1); From nobody Thu Mar 20 03:14:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f30yJhz5r9yB; Thu, 20 Mar 2025 03:14:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f26gsyz3w13; Thu, 20 Mar 2025 03:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AVYK77a5HPOcGj9R36CB2zDdslNqtOUHsVBiCy11lCM=; b=SwGmI/hjGVXSN6MOIpOAstywiq6ft4Kk/RKt5GQaNP1+fX6k1loOYw1GH9M2DlbekHv5Sv A17N0z/+OE7/9Xcgfb+kuSgL8Sa8fo1tU0IBAU6QxUIcOFiY0i9mVS50/Gv50CDmxlOlTp eB0H602U6YChL61Dm9PO0sWFXBiIroaqRRgSifIvQa/BbiTprVwzxxlRIugZnLvUfJiJTi 6F54VdjyscmpphCmZKHqwz4AeJVETDikpFgwIDSviJabZlncYnHzQaTf9QQn27x5RM7xk/ jCK8hRi/kiSQ/D6laKK84d6wUnV44gPxS3ewt6eAbZY+LMr7sfltdPkxc8xlAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440443; a=rsa-sha256; cv=none; b=fAtHbWgomPwB83aTbYoYXjH03ITaGRybG52bSUoOryU4hRFg05wM1IboXKEUdALsPC96AE RFhjbHF8vlbb2NxRmgPXYbVi1xtgmpnZiYbTtvv+IKqGeO3tg4cFLeGPQChPTAK3XjfLSd EZKGzemE1zqS2klG3iLwg8qvcegYi9oueIbnI+UNkxqjskWLKCFty2oU4+m4g7bos7GiIl wWtTNUAO3+Y5tCQwY2j5NhoL2rLdoOKNC08ty4ExyWuDk0XfeQCxBJX4AgyJ/0uMeNaWom toWah9I96glWb0RhQ/91ZSLhihT9255wmXyPq1226OQ9ZJTprUXuGFvjrliVXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AVYK77a5HPOcGj9R36CB2zDdslNqtOUHsVBiCy11lCM=; b=A34oJZhPMahkLWbih3f4YKcnUVBBO0VzKi3+asQeIUDTWZQU7PLjQUH0aPdUoFkjYpkkLG y2eYdfvEi0yH3Y3RLsQQYOZenLfXj1ZCFuNrznIC8EfYnuss6NnPJQ/k65OkdCtdEUm3V7 uwhPlE/THZoOmk0rZ7gVDyP4lI5gfvGyIU8wkgFFKSY1jwYjcjhycDNDjqh6tJzbCe+TUF bKwC6oIddDcUBlyGRiyPPAy23TTYMO7BSYtMdzm/XNyvDa2H6kkHhr4Tp68k+6YMM1V13p Zp63boeDPj4mVMueuGvxJsXiZ5cPve0HeVSHxr4IyMlcR8bpiiEs1XlloPMB2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f26FDMznw4; Thu, 20 Mar 2025 03:14:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E2CO086191; Thu, 20 Mar 2025 03:14:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E2US086188; Thu, 20 Mar 2025 03:14:02 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:02 GMT Message-Id: <202503200314.52K3E2US086188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: aebeaf151d4f - stable/14 - mlx5en: explain why interface needs to be reopened on hw lro change List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aebeaf151d4f8786f83958d98e9daefb851fab44 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aebeaf151d4f8786f83958d98e9daefb851fab44 commit aebeaf151d4f8786f83958d98e9daefb851fab44 Author: Konstantin Belousov AuthorDate: 2025-02-05 02:27:02 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5en: explain why interface needs to be reopened on hw lro change (cherry picked from commit 93e70e3a9442dca31533f0773ede667fd5379b01) --- sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c index b0b7a175a1b6..28401048a427 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_ethtool.c @@ -1136,7 +1136,10 @@ mlx5e_ethtool_handler(SYSCTL_HANDLER_ARGS) error = mlx5e_hw_lro_update_tirs(priv); - /* restart network interface, if any */ + /* + * Restart network interface, if any. This + * re-populates rx wqes with proper segment sizes. + */ if (was_opened) mlx5e_open_locked(priv->ifp); break; From nobody Thu Mar 20 03:14:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f42077z5r9Xy; Thu, 20 Mar 2025 03:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f40QwNz3w3L; Thu, 20 Mar 2025 03:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moulGmlDGbYspMIvN4j37rfS+DqjHLoTkgo3sAtEIeA=; b=OypAAALAElcCDAOB8gOEcZcU2Q+0Nr/ewPUSTmW7UDpVnXEcaNKiF41QGKj/5K+zeZ5wVX VSLgZNewY+j2xpOq+RT1kLoOJAXdGqDcOakgN6tY9yt0x+QEgezkxcfooUppEJzmfFrhOf xpQwsg7pmbmrwO60PwoAoQ9Z7znTvFnPtW0Qf4fgSN1ocWNgYWkpTToPhxVTHNFiW/ttO9 jYJntH6d2IQFBnWYdqEmc9WNnlu17gwah31etO/NVdO9b5Xg5VOL6o1QyGhDgBw8J522qG fiwWnf0agNZ8/Gk+5h97sT96Ilz/tpVxTRcvKVw/lk7wE9sbsnwYh/yf6j8lxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440444; a=rsa-sha256; cv=none; b=eguvQyeaLFAU1fgBH5ga1YhN1McbbTw7yriG3ULIoVxlLg65YLNhNWIEI8rlE/7tL/+OKm V6EUXXTfBKO7LdOIkPk5dQZOX5YVQcOTB13oW4fTOez62ZDvEVsIUHcLrP90gdQBbNht3i fQMnVpNe1LgBFjYaMCf3BZisUTUyaLRGOGGRckwkNmwcd/KOD+yd+jChiNJNUsnGBSnoaT c8znDQLY8J/5juvNBnLO8z4euT6XY7/16i0TR9ik8v0fn8tqIgYQodOUKBYDV4OQoxFAP3 W0fW0epoqnNeUI9EuYaVzIu3RSMvGAxaU0J2MLV55LlK7HKCN1EDqvzFqjDL/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=moulGmlDGbYspMIvN4j37rfS+DqjHLoTkgo3sAtEIeA=; b=MldDpoxY0MTkTveNo5QY5KnLnjVHFUGvbO+9Di7dAAEo6zPHF0qLUNPbUu47u/+lhPQncc 1Oi2M/LmEKJylgeFU21/lzIBN7yEpXX6uaNKtYutge3XtjAuzQArs4GGq/SeBiGSE3dvf8 pbbhO7D2hAABx2TsvghHtTi8k0lSTjQTFJ57jxQN57Yd9G037eh7M5SblQv24oD1ls1NgJ 5B2rZTIWQk5fCQ9OkQZf10p+L/UaLTh//W9DKnc+mocLUkEMzm3MI0k3CFFeuZK5uz0UfG IuYA1TQF59um7XXm3VLC4axh+P+dT1insbZhsS455UpDgDFPaDFyOnjMafHwLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f401kFznyC; Thu, 20 Mar 2025 03:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E3l7086226; Thu, 20 Mar 2025 03:14:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E307086223; Thu, 20 Mar 2025 03:14:03 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:03 GMT Message-Id: <202503200314.52K3E307086223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 17a322cae64a - stable/14 - mlx5en: follow PRM for setting the max hw lro segment size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 17a322cae64a152a2c36c58c3af938c50ca5241d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=17a322cae64a152a2c36c58c3af938c50ca5241d commit 17a322cae64a152a2c36c58c3af938c50ca5241d Author: Konstantin Belousov AuthorDate: 2025-02-05 03:05:35 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5en: follow PRM for setting the max hw lro segment size (cherry picked from commit c3555174fd97ce12682e5ed1e2d2586016962a8f) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 99554526bb28..191a48039a22 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -2942,10 +2942,8 @@ mlx5e_get_rss_key(void *key_ptr) static void mlx5e_hw_lro_set_tir_ctx_lro_max_msg_sz(struct mlx5e_priv *priv, u32 *tirc) { -#define ROUGH_MAX_L2_L3_HDR_SZ 256 - - MLX5_SET(tirc, tirc, lro_max_msg_sz, (priv->params.lro_wqe_sz - - ROUGH_MAX_L2_L3_HDR_SZ) >> 8); + MLX5_SET(tirc, tirc, lro_max_msg_sz, (priv->params.lro_wqe_sz >> 8) - + (MLX5_CAP_ETH(priv->mdev, lro_max_msg_sz_mode) == 0 ? 1 : 0)); } static void From nobody Thu Mar 20 03:14:07 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f81Cf6z5r9vV; Thu, 20 Mar 2025 03:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f73Yd2z3wPf; Thu, 20 Mar 2025 03:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPW1tNd2v8ILw3A9tfoKLwv8NqgrA7zOnBEtzhmJF8M=; b=uHVstvaKzdbh4aPPpnbk0aBwQOQssvzzUnUOAZRN0gUmR6uOYIURDLoRu7zsGgwZVsktOz Oy8CX6R+hIqlSEDGR7xTS7b/3P2eBxJBNSzuwM5e4cxSffCJPcLVauHZgDx6KrlDCItkcn pvTDnJFW3DUMAIaPCSiiiggedOZ6EF3e43SZ4SJSG7VLzyI7yUjNYfMJgPgCOof9emQkeH WCOzXB8e4MNqCv//PRZoD263ZlSrfhTLXrIS7vPIkOg6YFj4suDBzrIH4ym0TbIfNWxh7c w0rUYS6WmAQnwGtcIWX4TuBaUAuF+axode+ve20qBTn+LGb37lMgAi2pmOK9iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440447; a=rsa-sha256; cv=none; b=BQCnVu1OY2IhLwIcWlZdVVxgMv4sQicHvmWqbJBriMhyDQ7942xobY6FU5glh72ODy6CZf gjeB4HHwnjDtB+pFEK+47NkXA9GDQwqxsjPPPGRQM/SaUEmuViVAI0fjU8IuNbDPGVKsgm 2Rv1K9KeAIt821DO8Pqh2wQIWydDPqoTdzGnzyil1MnDBLtaMr01wHXtfLnr7vhoFTBeb6 ARGOUovfpk8RZNrKJcMcnPlIIsw4F1S531fRX9RJpUbOusDKBwwn6OeuFjo6QHbcjnqtf3 J8uMhIAZGBpuwl/iTDkwOhmWdVUHJ9N/sB+GkkiA8p97DejJ6J8/KvSADd2dPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPW1tNd2v8ILw3A9tfoKLwv8NqgrA7zOnBEtzhmJF8M=; b=lX/gdLsEXGdtzaNHFmhgU5GO0AJWkuqBoeMeljJfUMiV2k13yWEP/Ll/Ek5IPj2Xn7/HGb gfWa92inMLWukWq7OiwybHVk06znOWQoCTSQ/Yf5pcOr+VH1qaV8sE2gZCBxbRoHSG4RSl aKwiURufZAKUrTMp4Ssfczv1RIsW5/P5WlRoS0b2kTPNu3R+Ernd5N7Ht3aSWFOl6rIRwq HvT1/YT2C3OoVLJzut4Ccrw/LC23Bk4Nw3LxxX1YNAG5lXmBUzRbKGQZ9QWhXlcpFJ8T+X Qdz+SooAhnNTT3AKGBkqN1XdRmNNrbSIOE9jeB6pzXtxfTyuC4JkD1pcG5Vucw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f72dhrzpCS; Thu, 20 Mar 2025 03:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E7fQ086334; Thu, 20 Mar 2025 03:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E7YC086331; Thu, 20 Mar 2025 03:14:07 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:07 GMT Message-Id: <202503200314.52K3E7YC086331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7b64ccdf9605 - stable/14 - mlx5: recalculate tcp checksum for ipv6 hw lro coalesced packet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b64ccdf9605d78b2f7c84cccba50833bb0e5a53 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7b64ccdf9605d78b2f7c84cccba50833bb0e5a53 commit 7b64ccdf9605d78b2f7c84cccba50833bb0e5a53 Author: Konstantin Belousov AuthorDate: 2025-02-14 11:17:20 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5: recalculate tcp checksum for ipv6 hw lro coalesced packet (cherry picked from commit efe9a3996ee319358c51681a6d9da8b4bf608b03) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 266e8e804259..0a1cd2bc4aee 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -246,6 +246,15 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) ip6->ip6_hlim = cqe->lro_min_ttl; ip6->ip6_plen = cpu_to_be16(tot_len - sizeof(struct ip6_hdr)); + + /* TCP checksum */ + th->th_sum = 0; + tcp_csum = ~in6_cksum_partial_l2(mb, IPPROTO_TCP, + sizeof(struct ether_header), + sizeof(struct ether_header) + sizeof(struct ip6_hdr), + tot_len - sizeof(struct ip6_hdr), th->th_off * 4) & 0xffff; + tcp_csum = csum_reduce(tcp_csum + cqe->check_sum); + th->th_sum = ~tcp_csum & 0xffff; } } From nobody Thu Mar 20 03:14:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f55WYjz5r9rt; Thu, 20 Mar 2025 03:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f51v2Pz3wJk; Thu, 20 Mar 2025 03:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y7DrEOyL7XMn8NlXW2In5fOwm2/aNvBulXLBXYQIxdw=; b=xFrZEtpF72sMqrJKzJE1Eirz+/IiUJbuwP/Ho3I5YVTry82+G+eZVhbyhxmwiqc+/hn1LX fgec+tu1ZY1fc34DCHlRG3m6gPNtFJOeBBQUHMVpvyWh25euIKd57aruUGtqybuKiYIHM1 tic2YQrWiQF1lZWBdyyLt5a1Zgk4ftAWz+eoS9eU6SYGgPCtCwihPfPpINASVocXbBiROk IM/b5dckugy+xt3CceSCpwHJiWUhdMdWECzjpJ4Q8lm1W4HVswgLNhm+5RBXNL+nkL2ing K0QDDa/2eQ6XttgqfuTT0oPPFhGvxtwY/mnRWVueEFi+GnCaoIVegg2sWklUaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440445; a=rsa-sha256; cv=none; b=fUoDV1cZ0aoAbJJgfk6oAQoUvYSIcB8qG20glCFxPh6ZJ2Qs36BvKtAxeqbgrV45BpjbWc FFnHCG/oBhmUfjeCAv6BOUPn7Y8O6pRV63bjk5I6rcXpQDtN6Ol/000+mAcyENbQQLAg8C /uI36C8E51K09voXvAK2zm8X+kBm3+uSIohA89rBnyf1CXjn1aJErHq03RuVIAPSLbwAZs jiBE3ZmjSNi0Sg/cb8xAMEq4otKay3bwWum1Z8GOB/dc5rGrXZ0vDYSeyKvVGxn01xNWjf XTXdLvViC1h5k8c50MOdLiEOfSaoKKKxj2BGONLkATsMRLqtYDIIYAj/pvf7JA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y7DrEOyL7XMn8NlXW2In5fOwm2/aNvBulXLBXYQIxdw=; b=Zeb9iAgoo4pSTzlQY4jFh1YxbXN+IPXDcC8UWZKLh94D4BbBbfUyX9+TzXspFOLck89Pmn nd520T+zd1VxzGeMxNMys+2byVlEKaePgD9lD/8d5DHinKBzIE7d7UZRgEIZ9PBMH1j96M msP2WAOokUYJA45/BhWy1cYCgtuM1T3NxCWvYcUWhbilZj9P8k92IoP5ZcFbicRYE3+mEU wZaNcNDFaz4kz7JND5uYmCgQS6IcxhKAHIsyRkwbV23ME0vWsB+ANV0nlz/5mByV/nFg9N 2brK+mwbr3zRt5ylrrDZ6hp6KfKEbDwTgP5OGUVzQO/ciM9ViDgF7kvmeygx/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f50k1XzpBh; Thu, 20 Mar 2025 03:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E5nC086259; Thu, 20 Mar 2025 03:14:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E5a0086256; Thu, 20 Mar 2025 03:14:05 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:05 GMT Message-Id: <202503200314.52K3E5a0086256@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7ebbf9f756e7 - stable/14 - mlx5_en: correct recalculation of the ipv4 checksum for hw lro packet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ebbf9f756e742a4859da6233b243adb4f6612ad Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7ebbf9f756e742a4859da6233b243adb4f6612ad commit 7ebbf9f756e742a4859da6233b243adb4f6612ad Author: Konstantin Belousov AuthorDate: 2025-02-11 15:43:21 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5_en: correct recalculation of the ipv4 checksum for hw lro packet (cherry picked from commit dd1bd0ec5c91c21f1f60bb8bc58b2f5e794df43f) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index b52dee102a3d..73ac24f55f45 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -199,7 +199,8 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) ip4->ip_ttl = cqe->lro_min_ttl; ip4->ip_len = cpu_to_be16(tot_len); ip4->ip_sum = 0; - ip4->ip_sum = in_cksum(mb, ip4->ip_hl << 2); + ip4->ip_sum = in_cksum_skip(mb, (ip4->ip_hl << 2) + + ETHER_HDR_LEN, ETHER_HDR_LEN); } else { ip6->ip6_hlim = cqe->lro_min_ttl; ip6->ip6_plen = cpu_to_be16(tot_len - From nobody Thu Mar 20 03:14:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f70g0Hz5r9vR; Thu, 20 Mar 2025 03:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f62Z2jz3wJr; Thu, 20 Mar 2025 03:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X19gBmm+oPAWH8PZgrwoTBkGkiV1knoyuVrGN1hu8GQ=; b=NORjLGRPXgB19s1c45SttS8Is9zASUcjVPytc1ukQ6+6RustygDWl+7YNm7k+UFbLe6eae vKbMgTZqP9Fd6PeKbzDWcQiOFAfK1nIG8KDXOc1l/t8Z2tshxzZRKubMwhttE3jxyzxoR1 bFssM7ld2nykk7lm1uQHt6GcyxkEb0RkDn+LLXTf50jmapLt7zBjHX/0+lAjv9/Aym4vKV E7dod50OcuQZe4kUSi2B+m9/aG0z1IXotbSWGUYNAAvAYmwWSKXpefq8mRA+GlUatUJrJp g3pJaq8rP1A7MssgGsnolCN7Jeani1nuia45cHcypdw3JWWfm0PjzwwFckTItQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440446; a=rsa-sha256; cv=none; b=mPzjr7N+WapF5IE0P73T4DsJLLzTqhlr3ibRh/NhtuseN8/frSYqzr8Z2vS0YL6nECbnjt UDLRYiR5XJ1MGcjyVqsDHNG/b4dPiuwVjqLBV83cRZj+MuzSdQOhcRD4XuJV9vZYGUeopb SruuMNvgGlpP6RF/BSMjQUoA7W5piesNryDh5ZvZ47N9ZCUll29+h7yuFDW3x5Y1pN8ThY X6iCfjSIJfMxSrkH/yBZPNPUk5c7r+tmGpoF4cFQoHTVMR/3guganLb01+gzKTcyv2dD/O O4sqJVpbnfwfI4mQ4QmP9uKiHxvwyIMi4RlNsz7JNU6XeZ6DG6Fn4PKJhJVb7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X19gBmm+oPAWH8PZgrwoTBkGkiV1knoyuVrGN1hu8GQ=; b=bIVHdxIl//z5GJOXmVrITrRygNmPa43pcR0v/BgpOeMLxg24vHUy+ooUAJyMeP7I8BpFM+ a1S3/6Dx75f9ascsHkkW7iK8DLLu9lSnKUr6H5NChOtBhQ1Lr+v72NgCA+6AJ/bnR4Ke2d qkhTTc0FTHK0CRpAShiBCQ2oEX2aCfPcHdfgC7H75dKUmxc9Y4DtxkyiIioMatgfkB22nv 5LK/3dMh6O/1xevAYSOo415r2jh2c7fyDS6FF29lAs4LsqSUUE6pgV9t68V2zVmCaRru0q xZjrHacPmLOXpkeHt4M3MPWKqf8I9jl+KSGIL9ai65/1hrvrkZ79/tgoUqfpXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f61zp9zpBj; Thu, 20 Mar 2025 03:14:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E69h086292; Thu, 20 Mar 2025 03:14:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E6H7086289; Thu, 20 Mar 2025 03:14:06 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:06 GMT Message-Id: <202503200314.52K3E6H7086289@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 3c5bf8d9d935 - stable/14 - mlx5: recalculate tcp checksum for ipv4 hw lro coalesced packet List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c5bf8d9d9352d38393aac222451f638d6791499 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3c5bf8d9d9352d38393aac222451f638d6791499 commit 3c5bf8d9d9352d38393aac222451f638d6791499 Author: Konstantin Belousov AuthorDate: 2025-02-08 07:21:55 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:37 +0000 mlx5: recalculate tcp checksum for ipv4 hw lro coalesced packet (cherry picked from commit 3eb6d4b4a25a13b9ea9d825ee44c641b91669d06) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 42 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 73ac24f55f45..266e8e804259 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -27,6 +27,7 @@ #include "opt_ratelimit.h" #include +#include #include static inline int @@ -124,6 +125,27 @@ mlx5e_post_rx_wqes(struct mlx5e_rq *rq) mlx5_wq_ll_update_db_record(&rq->wq); } +static uint32_t +csum_reduce(uint32_t val) +{ + while (val > 0xffff) + val = (val >> 16) + (val & 0xffff); + return (val); +} + +static u_short +csum_buf(uint32_t val, void *buf, int len) +{ + u_short x; + + MPASS(len % 2 == 0); + for (int i = 0; i < len; i += 2) { + bcopy((char *)buf + i, &x, 2); + val = csum_reduce(val + x); + } + return (val); +} + static void mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) { @@ -135,6 +157,7 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) struct ip *ip4 = NULL; struct tcphdr *th; uint32_t *ts_ptr; + uint32_t tcp_csum; uint8_t l4_hdr_type; int tcp_ack; @@ -196,17 +219,34 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) } } if (ip4) { + struct ipovly io; + ip4->ip_ttl = cqe->lro_min_ttl; ip4->ip_len = cpu_to_be16(tot_len); ip4->ip_sum = 0; ip4->ip_sum = in_cksum_skip(mb, (ip4->ip_hl << 2) + ETHER_HDR_LEN, ETHER_HDR_LEN); + + /* TCP checksum: data */ + tcp_csum = cqe->check_sum; + + /* TCP checksum: IP pseudoheader */ + bzero(io.ih_x1, sizeof(io.ih_x1)); + io.ih_pr = IPPROTO_TCP; + io.ih_len = htons(ntohs(ip4->ip_len) - sizeof(*ip4)); + io.ih_src = ip4->ip_src; + io.ih_dst = ip4->ip_dst; + tcp_csum = csum_buf(tcp_csum, &io, sizeof(io)); + + /* TCP checksum: TCP header */ + th->th_sum = 0; + tcp_csum = csum_buf(tcp_csum, th, th->th_off * 4); + th->th_sum = ~tcp_csum & 0xffff; } else { ip6->ip6_hlim = cqe->lro_min_ttl; ip6->ip6_plen = cpu_to_be16(tot_len - sizeof(struct ip6_hdr)); } - /* TODO: handle tcp checksum */ } static uint64_t From nobody Thu Mar 20 03:14:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9f91Nc2z5r9bY; Thu, 20 Mar 2025 03:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f842Gdz3wKD; Thu, 20 Mar 2025 03:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwSiz55HeCE64xSnAdMkPpIkK4uPcHTAtbinJcW1pU8=; b=pfyFCiuCEfJATcvG2B6NvzUHPRXynaUlmBh59YwCV38HWht1irQJu8mvYZM9ElJ38yirP1 ECpd3JD01wn7xzxqwxvWcnf0gQGOk5VMJlDPhwNcZ/Y0vGNtT0KyGy/YNEsWK6xoGMJo/M 80ayn4BxParfK5uYAs+PTGun4QHQs/BIhuhqpbPC6qnTk00g4pS2gbrh2sZNCwrMbjHAQz JXqeyFKXro7jEHt/frbOjlWMj+UeltvqYOJVWolyhp21iyMc7pINIxKMezvF4cMGsQYBeB MARlbTXx9HVqCYmETVSX9ZB6loEt1zzHq4uS+vEWFUp8pqhpGOHlov1MJQJ9CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440448; a=rsa-sha256; cv=none; b=bGnGk1eG89zQBQ2T3pf4bAqoY+A2YIRK9gDVsVHbdazEbj5Er0qRoOCxYQyDdq3eYVcLQe Rj1ZnNHjJ+LjJe5fA1u5+59g1te35ly3vmzNw+CMLI9K6iFWTIitowg7NCn0tJXq13cpLW jruoE5VuWeVYOWoVhO1D/VKlekW9q/H0+5iEJpfQdoF4jv3FZtPt7JgD6JWiLzUi/O7UYd v64hM9MoqWtEC/e246kINASDYcqb53v9JG7G1gWF1lS1ViNCR1JyT1d6kYPIRrAeZVAPl8 fqajHbeD8QNHaYKJUfpcGQkr8We+DQ1AMtcN8kUtKk0VsvG593qYTkRAd2+whQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uwSiz55HeCE64xSnAdMkPpIkK4uPcHTAtbinJcW1pU8=; b=XTvkdRiwFeonJCpBt0AfWrpguY2W1oBhCIJ6US57/g1PUVWvphbSoQg7HKp5y0iuZYlwnX fxpjmCzs2OBPhQtyTR52Oxh6tJdoq51el+ofGGoTBx/mnXgSpOECRBuRJRXvDGPmTBH8YF wPzL+DzifWUNBiLOIxKK38+0ubAUMkcBVuYlQGdZOPD1UrtILCgSj0eWUbezKdPWxZ/sTO hZ/fmZjqhIqjWuDQQFsvqQDCbHVtJ7BqThEIKusa6RrZ2dKUKU1XHfvd63xH1vdgCJjJRv 00aKHFNYXCIgg8Koozc5enW4LptuX3eMPepqHBK6VU+zV8GWIBMmUGiaOvqXTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f83XLczp1g; Thu, 20 Mar 2025 03:14:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E8xk086366; Thu, 20 Mar 2025 03:14:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E8Pm086363; Thu, 20 Mar 2025 03:14:08 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:08 GMT Message-Id: <202503200314.52K3E8Pm086363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ec551188213e - stable/14 - mlx5: correct the predicate asserted in __predict_true() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ec551188213e7c5c52abb7d4c06d46540ef1d840 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ec551188213e7c5c52abb7d4c06d46540ef1d840 commit ec551188213e7c5c52abb7d4c06d46540ef1d840 Author: Konstantin Belousov AuthorDate: 2025-02-09 10:25:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5: correct the predicate asserted in __predict_true() (cherry picked from commit 903996760d1903a7bb594b7f2ed8072e9e6cef9f) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 0a1cd2bc4aee..d82718ed3bb5 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -206,9 +206,9 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) * +--------+--------+--------+--------+ */ if (get_cqe_lro_timestamp_valid(cqe) && - (__predict_true(*ts_ptr) == ntohl(TCPOPT_NOP << 24 | + (__predict_true(*ts_ptr == ntohl(TCPOPT_NOP << 24 | TCPOPT_NOP << 16 | TCPOPT_TIMESTAMP << 8 | - TCPOLEN_TIMESTAMP))) { + TCPOLEN_TIMESTAMP)))) { /* * cqe->timestamp is 64bit long. * [0-31] - timestamp. From nobody Thu Mar 20 03:14:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fB41z4z5r9YF; Thu, 20 Mar 2025 03:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9f94snrz3wSb; Thu, 20 Mar 2025 03:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpD9Nq4Yu6TIb8R0abQYmJaa8sPDf3WcFU8J7YGY3VA=; b=jAZ1HhdxubeCWm7wXPDl94GziKLI3M3Ua8xhRXJGnBYtko6c3pbV2MiP8tTdviSEcqRe0M FPTxlKxH3dT7a2aB4ciXqFiZYMHBuCSy0AEqxKIAsoSNS6b5OMiQoCRe2I/+nRaiypf4Ln lI3UM7rZ9y2dqUauwFTh/5AE6c71O6Hcmxk8XvtljCwORei4/+GaxeC4Cb79BccU4DjXfz QYmQLDpRU9nIQoTQw/6nUxPKXQYM5jnYt2SIuLj3zdeiSBmFm8dJXCWCPXm2fyIdwUj4QM Pd8ReuDU+ndNflg073CjW6TeN9y0IRqsO/Zb6xGvSpNCwnEfgsUWaVVg5UZMJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440449; a=rsa-sha256; cv=none; b=VLHYtrcTbHn4cXeyGUiNgV7AR3eiXajj9dzOZ1O/rS7+zglz2pe0phUrDwRjgWbCxoTQjG ZuNsniCIbW8+1O94KXmarr0WqvgaB4UvVhS39mZrNk8S9+vRlE2vrQxTZWxxIhad5//8mx fqpbs5Sr8YuhmyYz8ZWCuZWeCZzNgM55dTzpzi6El1axTJWZ9IiHEp9CXYvIlIufT/lzMS b4wqeqbvGv5PK3GVusvzlnfMJLVgprM+IGvwFzW5kVEHg383nw9Eyed1CylIy54qrFHGeh p70o9sRa8z4YhqfrF22jerLvFjWdVNeRaWnCIPsA8fpb+l5en1Evvg7PoV3mPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440449; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpD9Nq4Yu6TIb8R0abQYmJaa8sPDf3WcFU8J7YGY3VA=; b=XhPSZU6OxYNl0L7/ya2G99FQbEhQXNYW/FHOuBGuvCdbCMQ9qPdvWb1foNSBTSTBYQf+Ov 7WjwmcEVHxDkSRhFs9po2oFlPPHv1kBM/1UvTrsAAxDTM7NjX0pE8sPK1Y9BuEuZkj1ysn 6qi/4a946+24tVGBoqEx7iqmDirxWlap7wV67wB0TBotje6mc4nh27xd++rqWSyEmjdj2n kr0bfJs6bT8eQq7qiqdTuCisVUfPfTiFyDNKWdboeBzfTos/66dkKZ7OOtDuBoRFV9z/pu xRy4yPir7mnLAQMbjeNquqcVYy4mCNWPWp/G6+k1BEMZsDXxaUx8IRSLPtiQQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9f94SrkzpBk; Thu, 20 Mar 2025 03:14:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3E9O0086398; Thu, 20 Mar 2025 03:14:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3E96K086395; Thu, 20 Mar 2025 03:14:09 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:09 GMT Message-Id: <202503200314.52K3E96K086395@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f6e15b66206a - stable/14 - mlx5: assert CQE structure size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f6e15b66206ab59fd8a128d22da53c11a39f8069 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f6e15b66206ab59fd8a128d22da53c11a39f8069 commit f6e15b66206ab59fd8a128d22da53c11a39f8069 Author: Konstantin Belousov AuthorDate: 2025-02-10 02:02:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5: assert CQE structure size (cherry picked from commit 7560ed3a6b9deff85b2e865b6db74eb5e0f5f64b) --- sys/dev/mlx5/device.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/mlx5/device.h b/sys/dev/mlx5/device.h index 4b7cf8686794..9e11d6591b3a 100644 --- a/sys/dev/mlx5/device.h +++ b/sys/dev/mlx5/device.h @@ -712,6 +712,7 @@ struct mlx5_cqe64 { u8 signature; u8 op_own; }; +_Static_assert(sizeof(struct mlx5_cqe64) == 0x40, "CQE layout broken"); #define MLX5_CQE_TSTMP_PTP (1ULL << 63) From nobody Thu Mar 20 03:14:10 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fC1HSfz5r9yK; Thu, 20 Mar 2025 03:14: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fB5wTvz3wQB; Thu, 20 Mar 2025 03:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nqvkPG6aLKk8sDXwC/sp/W4pHczB2EXdxqWMucFwHc=; b=i7FX3B1V1MuqRAzVHu0V+ArI67k+GnG2iyglx0uVURrYgkwFl3poQOaoGLp/tHszpvHOdz 0zu+yWyjwB5qReW7m3IgoTNtOn+OWaglhkqVvsp1saa2KqHyZm+3Dcxfsr7ETJaI0xT8KV /lZIpYj622Ie1/XwaKaSfA3aSSr4rxSiFvEEu9T5PTk3KivMdBUGUzk17moKft+D5XSggA 57jAG1rGSF7WXM4762FwZwR0oYagj1xR6QMLDnEXCD2NezxdlrVYKuI+MiyyCGGSHJklPe jzovQrYASkCiPBnERMVn0p0a6W3izMjFnrUImlT/tp83t5fP+ihGFJJNXu8G6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440450; a=rsa-sha256; cv=none; b=Hzj+mjgafEFO3OhwMdWi2vsqUFY8iZKv/ORgRs1qQAzXf+xYOyD1sXU1hxXHUf1Hz17Muv ePvNMk+XdCHlynIYRTjh9Ji8K/8mR8GxA7l7viItBEXi0jzxy2RlyV1oWpG9/unP0iZcX5 Vc9kVxSLRkfpteFLYPvEdCIxzNSYJ6PHj2ipTDtOpWbT1RYHhksCnl+z9HdWTGWTZP0nzn +ooohirO/LdNJMPks8AEjcNyd0mAgxa1cmGBLYhkDs+VuI1npx34HHb7bbhW7k6vSzc/fr UFtisPgCfLPPLBgymzcwypwXcNtyJv636XO/L0iThFNJwVL6fGVRp+G5jNHutw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6nqvkPG6aLKk8sDXwC/sp/W4pHczB2EXdxqWMucFwHc=; b=k2Dy/iH7kl8EE0XU6TbWry0K24FY2KlLDQcZcCYoUDJxpxTSgQ20pYVhuTaarE9Hqda/HC t0T2dqs7ubOLn1jGy3ZIi8CMf6Z9v5PplnBsN98lpHurxi97SAzja1GogCuqYvj1jlOqHo w3d/6pC2Fx/FlLArt1NVEODWkrLti/HqqF2PwOj6ztDYpnnG8jqAPBO4GPESEuXJY7Tw+l RM9MQ0EsOMNukn2J7YUqffIF/G+u8K5KqCLGkLG+ZroECRGMEqFTxnbxRhk7k+WyjOuzzR 0gzlYvStIj3amhqj7lSrqfbC98d+MW1YUJrEFFSO0qnGyw1VGG0Xw9TpTVRGPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fB5SZczp1h; Thu, 20 Mar 2025 03:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3EAIw086430; Thu, 20 Mar 2025 03:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3EACZ086427; Thu, 20 Mar 2025 03:14:10 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:10 GMT Message-Id: <202503200314.52K3EACZ086427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6cb0bd50b531 - stable/14 - mlx5: overwrite only the echo reply timestamp from the last packet in LRO List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6cb0bd50b531c8491e06091d780729304c955e86 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb0bd50b531c8491e06091d780729304c955e86 commit 6cb0bd50b531c8491e06091d780729304c955e86 Author: Konstantin Belousov AuthorDate: 2025-02-10 04:35:55 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5: overwrite only the echo reply timestamp from the last packet in LRO (cherry picked from commit bc1023849256b786fd21aad06a1a1b577c5dbd9d) --- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index d82718ed3bb5..8e0c943bf1fe 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -214,7 +214,6 @@ mlx5e_lro_update_hdr(struct mbuf *mb, struct mlx5_cqe64 *cqe) * [0-31] - timestamp. * [32-64] - timestamp echo replay. */ - ts_ptr[1] = *(uint32_t *)&cqe->timestamp; ts_ptr[2] = *((uint32_t *)&cqe->timestamp + 1); } } From nobody Thu Mar 20 03:14:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fD6rkNz5rB3P; Thu, 20 Mar 2025 03:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fC6XyJz3wBx; Thu, 20 Mar 2025 03:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8WppelXlaa1lGaVO9wze1dDG9VyiiihC671TTzcTsqY=; b=DGjst01QdaH2ShfoAi6d2EWuJIFH2xwg5JCv8jGd7AG+9GcjsjdJkbbUjnXj54rR5dGbf+ vXtl1NU5zENbq1Vf4R/G0Hd0xPaxOBMqBCLQDJLf3GvG5lk6vXyC30jsYLKEkxXXB5THuY yno0Ep7ah8mlAj+i6Iy4GhJOxMcQ5LKb7I2dM318OYh4k3xfnscFMx8ft/TMFi8Vfvj5/7 EaOSzL3z5I4OsatJeSqnqLFX8cdSpq0qoC1GBpRMKZBV07XC0nyyoin6ZVd6F9YeP2tkfE sWRmHSm1K1eWsjhsVtReP9xIvPeiam1TaCsDJStQq3MWWTB0hrYTK5KtfCFrhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440452; a=rsa-sha256; cv=none; b=ERMpZx+3qtpoVK5uqlBczz0+1hGp312yIZHUUxYAKvHtW4Hf+rp15GIYguxjlaDxMzIATG pxoxiNibzEcqYDkZENyBEYTYSktdOgMHKdykuXRqFK28NPrKGPGixhru83pIjm5+72qbHd 48tV9/GAXus8BmLFoGsntfDU5Qg7BV8B7xu1s8Sapubz+r8/liOLB7n0+44WDvMOuHdudO FEVEqbjD+NH3qtNJeOb1STiFCW/kZ1DMYJmkr/6ITw9D3G4t5pX7K2fOBOKFOXN/mxcxa+ yV/7cqCePFTL2qraalXDr87e8nHFKOHra7ExV6+CZyX9WY0O1e+G2GjB6JpNrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8WppelXlaa1lGaVO9wze1dDG9VyiiihC671TTzcTsqY=; b=QZjiei0rKBbOjEw0eP123qlcpqG2Ro3VB7mcsER2x4GjD4sA8jesLneNN7cOPUvUYC2O6A DPxOPhNge4axE8t6h34jzNAfDvi9OUFUDVLq93lwmAEq4DT4uWe5WCLtD2R892WgVxNwpx 3Ji/aJpGlpJu0kmfNRGKezfscfVhbvpqVpkWEgcpi2mcuGhYThaybVHL9flTGrmQZMIzTq WioD1B5WJz+WsYk2C7lyEpFRF+9yNDW8Vq3UjkxjO99epmqihAhvbwraivX8qcUqJ7Vr8v zghFoBY9B3YD1b70Uuemg8iPdzV65pMxICur1s/8yfwrhDAK09P6GwQuho2lwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fC5wBZznw5; Thu, 20 Mar 2025 03:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3EBUw086462; Thu, 20 Mar 2025 03:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3EBvU086459; Thu, 20 Mar 2025 03:14:11 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:11 GMT Message-Id: <202503200314.52K3EBvU086459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c083ab4c8bfa - stable/14 - mlx5en: stop arbitrary limiting max wqe size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c083ab4c8bfaf6e6506e2c9552c4fe6590c5b31b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c083ab4c8bfaf6e6506e2c9552c4fe6590c5b31b commit c083ab4c8bfaf6e6506e2c9552c4fe6590c5b31b Author: Konstantin Belousov AuthorDate: 2025-02-27 01:54:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5en: stop arbitrary limiting max wqe size (cherry picked from commit 89491b1edb3438ebce84e17fdb6c1acab35df601) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 191a48039a22..8f424f7ebecd 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -2314,17 +2314,7 @@ mlx5e_get_wqe_sz(struct mlx5e_priv *priv, u32 *wqe_sz, u32 *nsegs) r = priv->params.hw_lro_en ? priv->params.lro_wqe_sz : MLX5E_SW2MB_MTU(if_getmtu(priv->ifp)); - if (r > MJUM16BYTES) - return (-ENOMEM); - - if (r > MJUM9BYTES) - r = MJUM16BYTES; - else if (r > MJUMPAGESIZE) - r = MJUM9BYTES; - else if (r > MCLBYTES) - r = MJUMPAGESIZE; - else - r = MCLBYTES; + r = r > MCLBYTES ? MJUMPAGESIZE : MCLBYTES; /* * n + 1 must be a power of two, because stride size must be. From nobody Thu Mar 20 03:14:12 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fF5pz6z5rB1Y; Thu, 20 Mar 2025 03:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fF130bz3wKr; Thu, 20 Mar 2025 03:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3KM10kJnrCFs93e+x2c0k/apsypUQYSSg3LqyCGHXI=; b=woEKRs7oZuQDM+LnIZUbheLh4IBGldHKrjz92J17xQjCgqtIf6goC/19bTH/rxGO3/5Xd7 QwKa6SBu7nKyDQSGG2VKwZOTBn1jg0NmZxWe0sZPhiCMr+v8ARpvmyxM/+H/1qI8HXm7pz cDK7NbdtfMz5a2Rd6AXtsqZob54Vi78798q/4y1hbNmpYI6tqqgIfq6CzH/h+OEv4TL92T E59+PtWMIiQyj8eRs22ljonvV2fAxWFLzTk3pMURvxVdm5nWL/CNCqMOo/tBspp8syKtOT /cBHgypKEI2QErPLvXTQIcDyy+J1J7s8c28FIwmDB1BZWSm6iEDe8Mj8BF1kSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440453; a=rsa-sha256; cv=none; b=hgnMQ4vXCrUhQFOL2XYQJ9Uc89Hi7r51iyPzCB+dQxm8bjDXHLP4GliqtMXiS4UUBBiqPg k8nrEvH0uC8toxGYPTXtz8mURAsNgeBn3P8dhB5qRPBghEH5nnjdWu9ik0dyt321uBBfBd 1UeWeBmrgmwUUQmwJVKZrYnVcj260cXYelcxajOhilef2JlNoFkFRuYZlovjliXBTqboiB H5iqAU34nvxOD9Vf8peHdKrfeWHLqAPt1+mEztHWzhzlc819TPvwGmUtII58Wh/t22dv9v gnQzpQjM0yz//MRn1Zm0YP6YeDjkG6VmDr/qCSmBOf94avh2Jo8VhJ7mOpyaBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w3KM10kJnrCFs93e+x2c0k/apsypUQYSSg3LqyCGHXI=; b=Er3r5vQA7EumDMfvuaHKpCxz11JCeRiNLiaGIr98ZbBUxH/x9wwK3d4Cz8ApOm/Kr9Sy52 nE8Dm1ogkDQ7vUFw38WbUUC12pTJPWEcW8peBxI0PGYM9yYAHa1bty/TOkj4kmKaCg/GfX KLqqptp37Wk3DlBq8fu0mXKZwkfNXH4A0907OPGFIspaeT280Vo2nLLGfhZ3+TH9z3Qq2B 0eiUTsIHLz/eh8xXt93BlFc5D1jBTRJmCgVJBURRZZnVKqtuKP9q0CKibtkCeKGDF6fINb RPGcjoysZ0QztyXSA7zTs1rb3IhU3zVtNTheUF8lhan9XZ27xcS84WSCSnogBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fF0CtTzpBl; Thu, 20 Mar 2025 03:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3ECie086500; Thu, 20 Mar 2025 03:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3ECHY086497; Thu, 20 Mar 2025 03:14:12 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:12 GMT Message-Id: <202503200314.52K3ECHY086497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: f38e9a31baf1 - stable/14 - mlx5: bump the max LRO packet size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f38e9a31baf1c3f6d59976891c038d96e27327c4 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f38e9a31baf1c3f6d59976891c038d96e27327c4 commit f38e9a31baf1c3f6d59976891c038d96e27327c4 Author: Konstantin Belousov AuthorDate: 2025-02-20 23:52:52 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5: bump the max LRO packet size (cherry picked from commit c2987d7876a04c292d29c74cd6f9c02a82689ed5) --- sys/dev/mlx5/mlx5_en/en.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index 2de4ba6b5684..73c463b3720f 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -95,8 +95,7 @@ #define MLX5E_MAX_RX_BYTES MCLBYTES #endif -#define MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ \ - MIN(65535, 7 * MLX5E_MAX_RX_BYTES) +#define MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ 65535 #define MLX5E_DIM_DEFAULT_PROFILE 3 #define MLX5E_DIM_MAX_RX_CQ_MODERATION_PKTS_WITH_LRO 16 From nobody Thu Mar 20 03:14:15 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fJ2NS6z5rB3m; Thu, 20 Mar 2025 03:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fH3H58z3wX3; Thu, 20 Mar 2025 03:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPKv7/jRmL9Th4f43SB2PpNb2CKigMLhEfJbY0YX0e8=; b=an31iUKhtFS+wNU7+WH9qqMdmasowEKyk+zWNhAgSX+zSHznkYIYo70Ipv1WL94H382qmy vpZJbyC7d4fNtf0va8GPoNM/LM4OVedW5fORw8m048v1WxAxxnZ4lxEN0n9XYBla9etK2C JIEw1TQIl8RnwLbFDFgBCleQuv3PEZUkagKF5iFFksJ0W60zn1awt8HvHVWd4aiG+jMItH 1tbfio7sWZfqBSBcrtvMTOhC6L4IH+IQ4Iu2c7QdeoMFRC/VcSRX5xu5q7tBSAyMwLBe4h w9wUg6OgqfbV+XSBo+zo1sFZuXDEV8qDMHgHisNz08/qEEPXHOKtox4MBgNbfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440455; a=rsa-sha256; cv=none; b=hkkr+KAxc77MjSJ4dmOxKzkPCzzklnyGHbPdBKN+ETOJU7huOxPZ2NMURJODpqjM8NY67T tuMLjA1wiNDetH5Y12Fe9dIZCv53OFJUIRVs7H2HNhwBuE+KxQz6zGIbQLydxBKigEUKwn tVB1R7t9+gX+pCnsrH8PRMoRnaMdmSY1fyFAebejaJS3Ijv0nS6h2lq84uXyfFFsotii+0 ctpDxtn0pg772NA42rDtaEp33/3+ZT4U6/Ny7KAEF3N3o37OkYoqvSz8APv2WEsXRgnyVQ rrgIEYe88j3IReUlh/O42bsvEBhoxmaJqnE+Kixla9X+IoKC2GV7WOcdSm4FZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rPKv7/jRmL9Th4f43SB2PpNb2CKigMLhEfJbY0YX0e8=; b=p5ESMRPTSzfRGZcWCQEhuizux/lw4J8OrySvGqw8et/iCsKVFzXgRaZXhIYfa/N5veIBlx f6txsHx1DZt0PfJ1KyyyY2lRvUfhvVNteaO1++TYV6bC+icVWr1Br3iPIccshgHn4dAXYp OOsZwtMwgstI9oHNKjwCv72IUxxe/EW1j57dUvOop+d5JqQgX7aKAZuikBteFLdsXjHK/z IdrBKp/ZGp40+gkfhx/FpI3yhZpGZMg2vqwJ1AANOlSJkEIoQau5il+O3+qIsTWerCpx7w L+olAvTbu715XTDxjcmzTR+Kpk8of4MKEoep+ew8029/Zkeez1ownHVCzLzijg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fH1vKjzpG1; Thu, 20 Mar 2025 03:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3EFII086564; Thu, 20 Mar 2025 03:14:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3EFOi086561; Thu, 20 Mar 2025 03:14:15 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:15 GMT Message-Id: <202503200314.52K3EFOi086561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 772390b6da7a - stable/14 - mlx5en: bump MLX5E_MAX_BUSDMA_RX_SEGS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 772390b6da7a899a1c6d87545754fa40c3ff444a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=772390b6da7a899a1c6d87545754fa40c3ff444a commit 772390b6da7a899a1c6d87545754fa40c3ff444a Author: Konstantin Belousov AuthorDate: 2025-03-03 06:31:48 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5en: bump MLX5E_MAX_BUSDMA_RX_SEGS (cherry picked from commit 480fc5b8e5dee2f111623eaec95c76575d876aa7) --- sys/dev/mlx5/mlx5_en/en.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/mlx5/mlx5_en/en.h b/sys/dev/mlx5/mlx5_en/en.h index 73c463b3720f..7741419ade55 100644 --- a/sys/dev/mlx5/mlx5_en/en.h +++ b/sys/dev/mlx5/mlx5_en/en.h @@ -89,7 +89,7 @@ #define MLX5E_PARAMS_DEFAULT_LOG_RQ_SIZE 0xa #define MLX5E_PARAMS_MAXIMUM_LOG_RQ_SIZE 0xe -#define MLX5E_MAX_BUSDMA_RX_SEGS 15 +#define MLX5E_MAX_BUSDMA_RX_SEGS 31 #ifndef MLX5E_MAX_RX_BYTES #define MLX5E_MAX_RX_BYTES MCLBYTES From nobody Thu Mar 20 03:14:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fH0QLYz5r9dv; Thu, 20 Mar 2025 03:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fG1B5gz3wWm; Thu, 20 Mar 2025 03:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/70n/EwSV7k0GvX+KmlITiQFbXAxatmeCjHY8XJOso=; b=lQrNwuUr4gntuTFN3fRygo9n5c2DVtt2v7BS3v0zwUg1K/wh2htkbUL3mxbf3uldm2BgbN viJeeQsERv5MWwIkzPTkNDrkhnsCm5M2L+jjBWHPr2IliWbd40077IIsrzFcKjeq+5hJRt VNBRghrrDw7gB+jF7wtEsuEhEYEXMinHSAUHHxOm8nnJFDwbRU7VSGeSWzkqs71UNzrhJt 0MwfLKynebIj0AgcZE8fGto73xp6PxQnOXLlvMcAIYmAbLvdiJUQc5g08S7hIr4yOutdSQ o7CVZvZq1cW5i81KOYd51xVvx/Is5UcQZs7EUBpSCTNpEei+D/dj8PANfkEHUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440454; a=rsa-sha256; cv=none; b=exFVzGxhg6awX+M2u8GKkycIcp959SxC6SNxGdnZkfZYAYwCdENgMpMzlfRUpNhDsyUmhW uqZEdChC/UHrPP3LMQJHuAEOSRHe4YbRJah1NHFK+JbnvhMKQ3UrHdmxcywQd+xh+44Lp7 oAhms5SRN2ajro8vawzGIEVBWyTTgu9GeQf0DCHw6moD2fetCMw3Uj6meZ8kB6BTwyDjmi UZ/Wl/cdPN1LxlmtNw/p7bDQM23S2pPLTEKUPbjS7iJYW0DlYVgpBwv2PmL2VEsah7QjvS pIzn5KpfcCaizprqcM75p31ouAjXo7Vqe08QJdLvePMxXejgLDqHHMunO8UmbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2/70n/EwSV7k0GvX+KmlITiQFbXAxatmeCjHY8XJOso=; b=HXcoLiu1E5kgf/jbDirLO1rLFtZ5wI5pAWGq/1RPSWOKJDuwlKyoGRWc2eKzmCMP1u4Pmf wrCmRodXlJNpNVqSDGr31xo+hxASxd54WqbPPQ85lg+7P76H/lvjLq7j4f9iB36LMbF2BM +GyqFkND48MXBnEc3tCv7Q7Y9Z5o4UsKbhTlliuSpUktsLjv0HhV9/h5P6xpeHsCp1MQ2m Tm11DJQ66IwAj3T/FFH/PLiQEPjpPIrGiRSJ4++uY3yXdk3qepoZLFomC+Iw6maemZV/EN TZJrIN2cRSuCxrDiBQeqRDhAHvwxEg2z+KaI0KXl5dlI0/74cGwppZl7/J2p+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fG0nlYzpBm; Thu, 20 Mar 2025 03:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3EEbV086532; Thu, 20 Mar 2025 03:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3ED0r086529; Thu, 20 Mar 2025 03:14:13 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:13 GMT Message-Id: <202503200314.52K3ED0r086529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 466623f29d5f - stable/14 - mlx5en: fix rq->wqe_sz usage List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 466623f29d5f46013160734768424c7cb76486e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=466623f29d5f46013160734768424c7cb76486e1 commit 466623f29d5f46013160734768424c7cb76486e1 Author: Konstantin Belousov AuthorDate: 2025-03-02 08:58:03 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 mlx5en: fix rq->wqe_sz usage (cherry picked from commit 016f40466afc029df28d699650237b182aa88211) --- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 14 ++++++-------- sys/dev/mlx5/mlx5_en/mlx5_en_rx.c | 16 ++++++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 8f424f7ebecd..4e3e66abf6d9 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -1221,9 +1221,9 @@ mlx5e_create_rq(struct mlx5e_channel *c, BUS_SPACE_MAXADDR, /* lowaddr */ BUS_SPACE_MAXADDR, /* highaddr */ NULL, NULL, /* filter, filterarg */ - nsegs * MLX5E_MAX_RX_BYTES, /* maxsize */ + nsegs * wqe_sz, /* maxsize */ nsegs, /* nsegments */ - nsegs * MLX5E_MAX_RX_BYTES, /* maxsegsize */ + nsegs * wqe_sz, /* maxsegsize */ 0, /* flags */ NULL, NULL, /* lockfunc, lockfuncarg */ &rq->dma_tag))) @@ -2310,20 +2310,18 @@ mlx5e_close_channel_wait(struct mlx5e_channel *c) static int mlx5e_get_wqe_sz(struct mlx5e_priv *priv, u32 *wqe_sz, u32 *nsegs) { - u32 r, n; + u32 r, n, maxs; - r = priv->params.hw_lro_en ? priv->params.lro_wqe_sz : + maxs = priv->params.hw_lro_en ? priv->params.lro_wqe_sz : MLX5E_SW2MB_MTU(if_getmtu(priv->ifp)); - r = r > MCLBYTES ? MJUMPAGESIZE : MCLBYTES; + r = maxs > MCLBYTES ? MJUMPAGESIZE : MCLBYTES; /* * n + 1 must be a power of two, because stride size must be. * Stride size is 16 * (n + 1), as the first segment is * control. */ - for (n = howmany(r, MLX5E_MAX_RX_BYTES); !powerof2(n + 1); n++) - ; - + n = roundup_pow_of_two(1 + howmany(maxs, r)) - 1; if (n > MLX5E_MAX_BUSDMA_RX_SEGS) return (-ENOMEM); diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c index 8e0c943bf1fe..2ed2060d5a5d 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_rx.c @@ -44,25 +44,21 @@ mlx5e_alloc_rx_wqe(struct mlx5e_rq *rq, if (rq->mbuf[ix].mbuf != NULL) return (0); - mb_head = mb = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, - MLX5E_MAX_RX_BYTES); + mb_head = mb = m_getjcl(M_NOWAIT, MT_DATA, M_PKTHDR, rq->wqe_sz); if (unlikely(mb == NULL)) return (-ENOMEM); - mb->m_len = MLX5E_MAX_RX_BYTES; - mb->m_pkthdr.len = MLX5E_MAX_RX_BYTES; + mb->m_len = rq->wqe_sz; + mb->m_pkthdr.len = rq->wqe_sz; for (i = 1; i < rq->nsegs; i++) { - if (mb_head->m_pkthdr.len >= rq->wqe_sz) - break; - mb = mb->m_next = m_getjcl(M_NOWAIT, MT_DATA, 0, - MLX5E_MAX_RX_BYTES); + mb = mb->m_next = m_getjcl(M_NOWAIT, MT_DATA, 0, rq->wqe_sz); if (unlikely(mb == NULL)) { m_freem(mb_head); return (-ENOMEM); } - mb->m_len = MLX5E_MAX_RX_BYTES; - mb_head->m_pkthdr.len += MLX5E_MAX_RX_BYTES; + mb->m_len = rq->wqe_sz; + mb_head->m_pkthdr.len += rq->wqe_sz; } /* rewind to first mbuf in chain */ mb = mb_head; From nobody Thu Mar 20 03:14:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fJ5LpDz5r9pm; Thu, 20 Mar 2025 03:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fJ3fXGz3wTl; Thu, 20 Mar 2025 03:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EgwGUXZfvnSxsj1/QOXfm3fBTh/kYgkJJ4lhVMqNZXk=; b=rm5ARAW0kP4Ube+cnFoZIVOquY3K8EZs4H93Cr31hsxViJdjCB6DsRtt5yNGre42qXT8P+ WUR1wWFt8nEKE9ZqOA7PinuF2jZPkpzr2LqNcyc3dwz8eRmGrWdoAtc0nd9V2vbUlLDXK4 2Kts4yPnZBx8wjY7gT5YQOtbWDCq129XGi+kV4ylvTft+Ii+8iJuN2dz8AWMv/9nPxAEiq KppWxqcgxEAfWs/+C/FqKjU+0D1ZRgo2cK2Ff2zAQiEbmpWrWN+aTAsMkmaSGJOnexUlfN f+zbhtsHWVWGdbF+MLgXZCPHPIBGbShIm3tb6TRGXPfyjDRXgD4HPcAP9U4Ycg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440456; a=rsa-sha256; cv=none; b=UYS2MWHExFm0RAtK48kV0slQevlYdYk31KOgMPYDivtZbMiQuTQm8E17s1uh6K10ILomGY eEy6Pa01uCwyEunjPkixu1USaruPw46oNxeYNESPPtpK+2G3ucZ1RmPFSPrPP5J2GH6q11 RwCDvyQH6bFQeR21vreYasZwMTq0o0PXKf6p/xFgRJHI2pLPwdfO0o8LK9nlaN4sYgVcGg XGtv9Va2bHgRckKHpxpN0jVcl4L3/l0jgcUALzfXd10Fx3KEb9Yh5si1gSkhtGqVXk3qFm 66t/FMpljpI8HjgxD3BOtcyS/SGWhHBB6PY357wmUzGOOTcWX0bEMd74cowZVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EgwGUXZfvnSxsj1/QOXfm3fBTh/kYgkJJ4lhVMqNZXk=; b=A4osbBvSqSl0elyiEUS7py6oxV+KUY0WeT4amg/UNFFhNbQz1kEUp5TRuplDTmAVclPdWm ImzVlKfyaRldF3Q71QQWpVlbXYF54zX+G4CgWFW59cnDhBad10ocJh6EYO2y6ZK0So3yGl UeBmtKNKwKmxC1/m27h1JZ0ZpxZLtjrLnCnxrryP0TlqGJvdgY77Oi07PJoJORhM9g48E1 YaZwStGYiuc6RTVcJfzfk6H41M4q6bXxSzoIPGJNNJPfZwROn1rtweI4J2N59DyTCLPi1u kNMkD200ts+QQSxqJEqkVKx9xVZfY1qBfcOky+UmDRHclQJtB/vD93SdQVncdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fJ31vmzpBn; Thu, 20 Mar 2025 03:14:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3EGHf086596; Thu, 20 Mar 2025 03:14:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3EGd0086593; Thu, 20 Mar 2025 03:14:16 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:16 GMT Message-Id: <202503200314.52K3EGd0086593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 60855d899315 - stable/14 - kern/sys_eventfd.c: fix includes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60855d899315a2f5a7877a095b434c1c98114e24 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=60855d899315a2f5a7877a095b434c1c98114e24 commit 60855d899315a2f5a7877a095b434c1c98114e24 Author: Konstantin Belousov AuthorDate: 2025-02-23 20:35:06 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 kern/sys_eventfd.c: fix includes (cherry picked from commit 0a7c164d91a85a0cc5cfb9ea1afb93c5e4f2e628) --- sys/kern/sys_eventfd.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/sys/kern/sys_eventfd.c b/sys/kern/sys_eventfd.c index 20e73f9c6b1b..c2a0f67cae85 100644 --- a/sys/kern/sys_eventfd.c +++ b/sys/kern/sys_eventfd.c @@ -25,28 +25,25 @@ * SUCH DAMAGE. */ -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include +#include +#include #include #include -#include #include -#include +#include +#include +#include #include From nobody Thu Mar 20 03:14:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fL3ygXz5rB68; Thu, 20 Mar 2025 03:14:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fK6gtQz3wJW; Thu, 20 Mar 2025 03:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TxKq7l7AGirmZWUvD0/QhES2+zY8dVOmJXubx5c0pMM=; b=umGiu/Jsu8MH9wAh4Vvt119iOXn2Nsi0wN4l9t5jdJI3FR/IZ+szroYOP2cLLZiuAssSHC 6rlLuzcgDazbf+n2nQCfv2hpH9rscUnw8xaRT0n/H8DQh7RwCvmOWLjgZmz+Q3R2VbVDiF aZlVmjqaW93+k541mwmke1DjwbI7KnHsSc8/wtu0GGqSAyP+FqwTpyTJhR4Jr2j1lxTfJc CQRZcLGhKzNf7xDdQ/ofTbERU0ake0k/UgARuxv7+HATvAW+kpp5Jh5S5Dq4HEyJpDbTqZ MxY9fxWopsyRdzaITmC6p1mO84QdG3wo4P6u7JQECcph16z+t/83ZpA8Un3LZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440458; a=rsa-sha256; cv=none; b=Ot8IopWsZWubnJ0fxOgFwwPb6L3WGKl+7WG27a1pTI1KDgL1ZKo/EHTlPV1N5S+G41kQCH O9aK7VnI9SCBtdLIu5MCtDJb5qz4Gi3xe9Lj+iIVkwbT3QNlYbaFl5eRr3qogr43gwCW2j orBhiud04KDR7D9k9BVgUMsj38WHVkXRMOYD8D4Q3y2VlPzRiBjohKphAEi+GLNOymPPE6 ILaQrasRXukarnnYyY4ioKhvxiMed3W157N//8UaKQbHbGUv5/7EKuZltKXcnyuE0L08+3 of3GYolfdXdmZhTNUaiXWbTw8gm4t2+VqEzWvzUnewXBV6VBKHsKM+SLWoVAVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742440458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TxKq7l7AGirmZWUvD0/QhES2+zY8dVOmJXubx5c0pMM=; b=fiYQfJycoaRILsplMYeK1JiUBItvCR0u/5OSDEdkyCoCHjCe/7AekM76f5hCZK7IxbiqmK cYl03BKHrhQB/PbUASrogq9O5/4eB0a2tG6tQxBVslv0uSeKMg8iY7lT4t4e+j4bjdItI9 Qq28TuCacPiQZmcqd6HP7PTwt1SvG4m9Jl04VE9iifRRbRJJ3JZF0dDJnniSUh2963g5AE gYpZjm6JN4+pCTzrUdEvi8gVeIqCOSYkcth2XV5Noinuk1qld5IYz5mv/seRsu4EfWkOd0 +WEkdpMWrknMk5JksR62EOkSQ28khZxZZshGNxMGTTDAbyvRvtPrAZcvcSniTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJ9fK48SFznsq; Thu, 20 Mar 2025 03:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K3EHbZ086628; Thu, 20 Mar 2025 03:14:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3EHPI086625; Thu, 20 Mar 2025 03:14:17 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:17 GMT Message-Id: <202503200314.52K3EHPI086625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d9b7d0a54846 - stable/14 - procstat.1: sort subcommands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9b7d0a54846bbc7b922982df08659fcc3c6b92e Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d9b7d0a54846bbc7b922982df08659fcc3c6b92e commit d9b7d0a54846bbc7b922982df08659fcc3c6b92e Author: Konstantin Belousov AuthorDate: 2025-03-01 21:43:40 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:38 +0000 procstat.1: sort subcommands (cherry picked from commit 0832381247d7e6e93ae9ba1639d07f33a6f07882) --- usr.bin/procstat/procstat.1 | 68 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1 index aa7f503259f4..96e8860b8213 100644 --- a/usr.bin/procstat/procstat.1 +++ b/usr.bin/procstat/procstat.1 @@ -159,16 +159,24 @@ option nor .Va pid list can be used to limit the display of the locks, mostly because some types of locks do not have local (or any) owning processes. +.It Ar argument(s) | Fl c +Display command line arguments for the process. +.Pp +Substring commands are accepted. +.It Ar auxv | Fl x +Display ELF auxiliary vector for the process. .It Ar basic Print basic process statistics (this is the default). .It Ar binary | Fl b Display binary information for the process. .Pp Substring commands are accepted. -.It Ar argument(s) | Fl c -Display command line arguments for the process. +.It Ar credential(s) | Fl s +Display security credential information for the process. .Pp Substring commands are accepted. +.It Ar cpuset | Ar cs | Fl S +Display the cpuset information for the thread. .It Ar environment | Fl e Display environment variables for the process. .Pp @@ -179,24 +187,6 @@ Display file descriptor information for the process. If the .Fl C subcommand flag is used then additional capability information is printed. -.It Ar signal(s) | Fl i -Display signal pending and disposition information for the process. -.Pp -If the -.Fl n -subcommand option is used, the signal numbers are shown instead of signal -names. -.Pp -Substring commands are accepted. -.It Ar tsignal(s) | Fl j -Display signal pending and blocked information for the process's threads. -.Pp -If the -.Fl n -subcommand option is used, the signal numbers are shown instead of signal -names. -.Pp -Substring commands are accepted. .It Ar kstack | Fl k Display the stacks of kernel threads in the process, excluding stacks of threads currently running on a CPU and threads with stacks swapped to disk. @@ -205,10 +195,16 @@ If the .Fl v subcommand option is used (or the command flag is repeated), function offsets as well as function names are printed. -.It Ar rlimit | Fl l -Display resource limits for the process. +.It Ar pargs +Display arguments for the process. +.It Ar penv +Display environment variables for the process. .It Ar ptlwpinfo | Fl L Display LWP info for the process pertaining to its signal driven exit. +.It Ar pwdx +Display current working directory for the process. +.It Ar rlimit | Fl l +Display resource limits for the process. .It Ar rusage | Fl r Display resource usage information for the process. .Pp @@ -220,24 +216,28 @@ is used then per-thread statistics are printed, rather than per-process statistics. The second field in the table will list the thread ID to which the row of information corresponds. -.It Ar credential(s) | Fl s -Display security credential information for the process. +.It Ar signal(s) | Fl i +Display signal pending and disposition information for the process. +.Pp +If the +.Fl n +subcommand option is used, the signal numbers are shown instead of signal +names. .Pp Substring commands are accepted. -.It Ar cpuset | Ar cs | Fl S -Display the cpuset information for the thread. .It Ar thread(s) | Fl t Display thread information for the process. +.It Ar tsignal(s) | Fl j +Display signal pending and blocked information for the process's threads. +.Pp +If the +.Fl n +subcommand option is used, the signal numbers are shown instead of signal +names. +.Pp +Substring commands are accepted. .It Ar vm | Fl v Display virtual memory mappings for the process. -.It Ar auxv | Fl x -Display ELF auxiliary vector for the process. -.It Ar pargs -Display arguments for the process. -.It Ar penv -Display environment variables for the process. -.It Ar pwdx -Display current working directory for the process. .El .Pp All options generate output in the format of a table, the first field of From nobody Thu Mar 20 04:27:01 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCGG3tsjz5rG6R; Thu, 20 Mar 2025 04:27: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGF70rMz3wq5; Thu, 20 Mar 2025 04:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cucki18JwYohI/63+ofXSDJMdK7XtG4Lq/saJrhr2xc=; b=K+AJeTR0tnHDN+YsjJEmZHTOWdCnlOqW4MBP7yLkm+g+XmocnCDwAIvEZYxUq50DcmJAOF eVVUKV2sGIL5HxCsCnhpdYEXyo0Yn8QPUm86u1xp1t6qTJ2wW7YFwDl8AOItpydoLKywEO Ix5jzvMVgizyET7eOYk40s77Hh7gIN5gSTd5IEVHsNQtXnumgs0SHvvAjOD7h46SF/kezb f+ozOFLKr0c65TE24J9PyeKNKMxYHqJGWvx3/tl4+UL1CPbeIL4W7imwGipdF3gg/d7bZS QfQdAM/dVK/JxY/03xwue6NvF+EJ/bPyGkMJ90XxHpcN0D65s+bkGU963ikwUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444822; a=rsa-sha256; cv=none; b=UmRoVMvpxiC1eXSM6fXMcNlgvSJvuh2fxMjnobUMFNUmTH+IuZusvvG54mjJg6BBS0VQNU ++2YOAhzyx2wTCsAqyriRa/Md3AnYh4HN1DcqvdLAz+hTWf80vX7dlLIl4OZP7bFPKBDEz dJ17k+r2lGxN2bYTpWlAWPhIJgdHIYQHaFTpWF3BKW7rdxZjPyQUcmlFAv78IjV5T2CB6q ZefjW/hxzKOuIewxeRrn/phjeyS2VI9SMAD3ZDzCJQsZZxtG0D+GZt13lw2WiwAkHu41w1 tsV7SoUbZ5GvrThlugY2fvS5J3gn+XMWYmvycLXXT05N0TL9ZfUPfU9Ezi41bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Cucki18JwYohI/63+ofXSDJMdK7XtG4Lq/saJrhr2xc=; b=qB50mURFosEDekaD63NYF3aKLRkRx6rUn8aB5BCuSKBhUB73FzFpTsfnaY+xAf438NwcwE 3sudDCdH7F50mn2s+UTKH0EjZtCwrrPpBkHBg4TrFD7G7bm0opyvaKKlYJeVkdpgarO9eq c3j23hVf0mlTeAWk5tG/gduUDhTmuDTwJaosP3L275GnrcyB7T/V9Ynoe4pqBbGrGkjozT aBWm+y52eZzXfhPvNYtZLnlW6AjVcif6ati2t6TmCLDYeyZhs2lRRtK8Z7q8gBi+kAz6jk kGAf7746hBxTpPxVyzz39EcQyLIjyP3hTWOrIH7HDwXN6vcvCsI2Xt78XHqj4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCGF4B8tzqqt; Thu, 20 Mar 2025 04:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4R18H018748; Thu, 20 Mar 2025 04:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4R1v1018745; Thu, 20 Mar 2025 04:27:01 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:01 GMT Message-Id: <202503200427.52K4R1v1018745@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: a7aa1196d354 - stable/14 - ntp: ntpd does not connect to NTP server with link local IPv6 address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a7aa1196d3541178b5d43c015ec28e0200aa3467 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=a7aa1196d3541178b5d43c015ec28e0200aa3467 commit a7aa1196d3541178b5d43c015ec28e0200aa3467 Author: Cy Schubert AuthorDate: 2025-01-31 22:25:14 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 04:26:45 +0000 ntp: ntpd does not connect to NTP server with link local IPv6 address Upstream bug 3943 (https://bugs.ntp.org/show_bug.cgi?id=3943) discusses: Starting with 4.2.8p18 ntp does not synchronize or even connect to the configured NTP server any more. ntp stays in .INIT. state indefinitely and checking the network traffic shows that ntp does not attempt to contact the NTP server. This is regression introduced by the fix for upstream bug 3913. This is a similar bug I reported upstream (ntp bug 3841). (cherry picked from commit 381956e267569031883a516e10446c29490ee41d) --- contrib/ntp/ntpd/ntp_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 12a61ccb1d2c..69fae606f5c7 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -3205,7 +3205,7 @@ sendpkt( } do { - if (INT_LL_OF_GLOB & src->flags) { + if (ismcast && INT_LL_OF_GLOB & src->flags) { /* avoid duplicate multicasts on same IPv6 net */ goto loop; } From nobody Thu Mar 20 04:27:02 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCGH03zwz5rG6S; Thu, 20 Mar 2025 04:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGG5Ntwz3whD; Thu, 20 Mar 2025 04:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yaCeMxENHdya3ajG6zX5cRg0AQrjmPas6iVkMHtGIyo=; b=K0VJJqucZhpMEQf5xihJfOZakT8obXB2/VVfcgYBHOaDtEJN+HOXo08lNN5bsLJwNTIVGC NM1s7kci9uNw62CoGuSdCauXAqYJD2EtocH5F/oFszc+ac112UC6U4TumRVYOf4N6GRa3q 9RKdRM/R9ESdPCE1ERjOKK6iCm9oq2lvUkLhZFH03m6Cqe7tamtInLNVFSlMWBQE/uDE9H NH+PQaksBIz1NJBy9lCq+q9eaCJkunEbnLRaxXgK8NQ6ZYjfU7Ipj74CKskeyngj+uGk2n dQLrC+P/aABl3FktQjMYuU79dnwIWRuyTZDCNChYhHds2GshJ67tMBAIKWBpVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444822; a=rsa-sha256; cv=none; b=cOh1fSK0mpzZxGrtungLhleSgzl+YtY6uz45t6XR51EtXy40DVtXBgMWF44Bz0ctd7R0u3 yRkXvHVEOj5RkoctVxgmYO5S4nVr1WTEHPjHklZ+iJGre9vLev07BBmi1cP8B2XI7hXDbi Sp0m1+OYzQPiVLuHCCxsnQk3IeDDf13QNsg8RBXaU74YWkzTts8J8p/2N66i+YIpX7F2x6 hsaF3rkSHNsnIuv+xO4uhYPMRCx/BAaubFZEfHqH+vy+LRgcya0rX6QWAVl89MrOaLoXTl EJbb0Qq/9WR5zJ1NJEWZn/tG5RPzzunU+1bEX9l+7nrpwn7UNiIzNbwsbNJulQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yaCeMxENHdya3ajG6zX5cRg0AQrjmPas6iVkMHtGIyo=; b=iEBvFtI5CUrOAsaQScjUo+YlxHJEuV35o9Gpxs8wDrmAVNMGcDE9hSGD3SIOGInQjpiRT7 oiYo4/BDM4Cgvs5DaBNDZFm75wOVMDzaMJfgfazczzzz+FWGIK/1IOzFC8v7T7Lyq0aIaU +SFNlpwqJDNDKHKkWVRFefKAjVgAKEzsD8EJBkqBOiXFaYVAwbp/sBzTzTkOC8rPz4bty5 0yXdwO/WypQjVTI/8+wMkjMUUINs98VO/d+HBRKTXvlYAXqF87NVf8BdDSwrh736WBhAre YiDz55zbP5tq6mtGqDkWAvKDi34f2pjSO/ofwRBBM1eTDa0LBakyQPM/D2KfuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCGG4RWjzr1Y; Thu, 20 Mar 2025 04:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4R29w018782; Thu, 20 Mar 2025 04:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4R2oA018779; Thu, 20 Mar 2025 04:27:02 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:02 GMT Message-Id: <202503200427.52K4R2oA018779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 61e5e864ca19 - stable/14 - ntp: Another patch to address IPv6 pool regression List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 61e5e864ca19a1a6cfef859cbaf1ae6795ca0bed Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=61e5e864ca19a1a6cfef859cbaf1ae6795ca0bed commit 61e5e864ca19a1a6cfef859cbaf1ae6795ca0bed Author: Cy Schubert AuthorDate: 2025-02-03 23:16:08 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 04:26:45 +0000 ntp: Another patch to address IPv6 pool regression 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regression. This patch, discussed in https://bugs.ntp.org/show_bug.cgi?id=3958, addresses another unworkable combination of link-local local address with non-link-local server. (cherry picked from commit c1767cf87cb64c25426fd7fe119be283b134509a) --- contrib/ntp/ntpd/ntp_proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index f9605b8feacb..6b875145802f 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -475,7 +475,7 @@ transmit( /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) - || !nonlocal_v4_addr_up) { + || (IS_IPV4(&peer->srcadr) && !nonlocal_v4_addr_up)) { unpeer(peer); return; } From nobody Thu Mar 20 04:27:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCGJ4bbkz5rG8S; Thu, 20 Mar 2025 04:27: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGH720Bz3wn2; Thu, 20 Mar 2025 04:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82LShVDlTZfsVewy48I/EW1d3MzPzloPAApw7cXM8hY=; b=tEW4mEI6/Bcth0QQXI677crJcDHirBlro+pNWqMREQtKzI9/dlJUe3kL5Bm3AZn8IpykRB xD9v9KWs7AB4OGtMVfcl3V9pJf6FUc5dpKU7qkQU13SZ+T0kk4Fs/IFlu7ynLvrf9Dea4V JFznsELtoyQCez5vK0xQf5x2K0U6KiE0cpUNpC1ej6LN1m8WFYU5aoZxSeie/j1uGyc/QW ZQefT94My+yYC8tFU+C/N1GzejW4VTQToPoQOKr5KWEeavHxYsYw6kw+DRjgpprCQWE2Hw 0HxXpAXL+NoKjTVNwa35CPEKuoEUyMi++5zPkgnv5eXIZKTCxpJ5fFfNzMxpPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444824; a=rsa-sha256; cv=none; b=L3oD4Npm1sCfkc3KZYPFryGTqjou1JZOPTGGDRvJvaeLz5pDAISG0DuwZmwC0DlQ2kD4+P cErRVV5q8au8fEwE3kN0hi/E+p8CW0kA1Zdy5+ZWnvowmgPmkjwBjJybO4QBSSYq8lZY/U oD2/Jm6imBTntQiwpXRrlPdGTpw5EsXbGFWOxH7fH7e+jEaZWpULFzuIVe3+8AmBhR+9Uy bj2Q3OsgMMaFIFDYRzZV2E+C8F3RTaS4g0wb+Zvb4tLonzxbtB0Je/hVh9YqHIQot+OlXF KbAQBA6j8TieaA68IMLpSfNHOWdrHaMJOPUM4Ay12jlPlk7eik6W6Xxj4SgqFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=82LShVDlTZfsVewy48I/EW1d3MzPzloPAApw7cXM8hY=; b=fPxcLfgrkUDzhLkAstNdQwTLpSZX4AhWQOJtsp2crdFqU3Gfajv0adUAVkwswYaAs2Pfra AK2on07/FMy5Atrnc/0npBAsUdpuPI9CTBAGjHw6SKg+VYHbfD+Z011SeVIZQZVADGgpY7 qWp9gbBLEveuXJXE/dz9cJzc9tsIvMMS1K/X2zZx1IXu4ENfS73XtVw0GABhxC/h35XziR LKfQT91euiCLpzRboN9kf7UuDFa/ifi42uq+gJp5xOUJAICQO0g2cu2VkXsYv6z20UxqIZ RkpzRtqcQ0movapN06WLa2SiNl6jDu111Plf2GbRclynlIgdGEV+U6uHhIsYvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCGH5Trqzr2Y; Thu, 20 Mar 2025 04:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4R37L018821; Thu, 20 Mar 2025 04:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4R39c018818; Thu, 20 Mar 2025 04:27:03 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:03 GMT Message-Id: <202503200427.52K4R39c018818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 4ac2d0f2537c - stable/14 - ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ac2d0f2537cbc1049d1f58f8b868c2130bd54e2 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=4ac2d0f2537cbc1049d1f58f8b868c2130bd54e2 commit 4ac2d0f2537cbc1049d1f58f8b868c2130bd54e2 Author: Cy Schubert AuthorDate: 2025-01-31 23:36:59 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 04:26:46 +0000 ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regresson. This patch removes the circumvention and replaces it with an upstream patch planned for the new release of ntp. (cherry picked from commit bc02e655872021595c434850fbcbdb8dd11d4a46) --- contrib/ntp/ntpd/ntp_io.c | 4 +--- contrib/ntp/ntpd/ntp_proto.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 69fae606f5c7..9c4f6c1553e3 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -1486,9 +1486,7 @@ is_linklocal( if (IS_IPV6(psau)) { p6addr = &psau->sa6.sin6_addr; - if ( IN6_IS_ADDR_LINKLOCAL(p6addr) - || IN6_IS_ADDR_SITELOCAL(p6addr)) { - + if (IN6_IS_ADDR_LINKLOCAL(p6addr)) { return TRUE; } } else if (IS_IPV4(psau)) { diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 6b875145802f..2e0d221c8472 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,7 +471,6 @@ transmit( return; } -#if 0 /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) @@ -480,7 +479,6 @@ transmit( return; } } -#endif /* * In unicast modes the dance is much more intricate. It is From nobody Thu Mar 20 04:27:17 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCGb5fnwz5rGF0; Thu, 20 Mar 2025 04:27: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGY6Y21z3x21; Thu, 20 Mar 2025 04: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=1742444838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6zOKqrtCLH8jzhw3Vp9QlLd7/esggZKdWtj8V4N7pqc=; b=ls8MvEN/IZvPENMbm0XZmdm3ZiLztS3uVSKDPNmzf0eNXAxRl7JeMV+jeeY0VgqMor1NbW t1HZBwmBoA50vhps2PiBoHRj0W0/4FQsMtaVFiOexkfjpml2xDht2szSi9aqPnxCd9AK90 Rjky9kRSNRcEwgZ4+1M2v5Snyj3M7QhqrTxYkb4o8KqcfAQySrsRZg+1Y5fkeHP4cn64Ar ZZNrvgWC809+oHc2Mu2m3ltyFKFFyKDCvbaV2Ht0QpwZq2ewNIaP2MbOc/Vqe+gcxc0wnp vlfKi6cZI7m5UCMgEZ9poVF7rKK2RZufwqcwaguMR4Q4eOdsNV7ENVMeoNdU9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444838; a=rsa-sha256; cv=none; b=a70cLE1oOxW23Oc4XUy9MJU7m9wx3g1JpytLEryUn0Z8Afywjkk1rv2a/bLwoHK0rJyZ1r IQPwPrTvRwHXVqLV46qSXirPxSoRUDcEHqe3LzYWg1tILJY8EXU24qWhUOm4BjkTbBkPIt UgixG9D3UHeAXJnn3m96eyEFU11+/W0jm2H8pxT/hVU1U13Ev4/7KjEHA1HTFGZQQZsbKz jK9nKhNYF/cIOmuEfnTxYwrmtVC6jrh+dbZM5O8e6skaxJZxIbT0UecS4Q9RveITQ112ah 39+bHtyb0uePuaKjI4hnvRx+ePtT7QH1e9gv1VVAP5ZQmbj9ruUr+zl+jbIWcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444838; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6zOKqrtCLH8jzhw3Vp9QlLd7/esggZKdWtj8V4N7pqc=; b=RJUyN9HZ6jFJabR1NHQnVYciUaSzpUGbxERHBcbnCG9Rqi8ftPk2PAebPAkgEmHLeRUU7R djR6jzoVf2R8aK2C7eiUwZwJnFhNYa7lWD38TAUY4g1LSGQr8DrIfGWJpuT5hJI7jFEIwu 6Q730ZlRA2mpgs20Q9mprUG9sGL0Of6mQlxoz7F9oPJMXJmdqhSjp/27sREpnl3XlPeplV WE3tYLKdATqNg5fxAofVYrr1sczFkcVWnm1Sl0YrCIXgMaQByY7iUh/O9ibCPrZiAHE6Ga oQj9V9tyCpLIlO5FHR8XhT0pZ+yGpVnzhEvicQOo5Cw0Vnq/WriQ7J5xRDiFJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCGY4NNGzqKx; Thu, 20 Mar 2025 04:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4RHH3019009; Thu, 20 Mar 2025 04:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4RHWS019006; Thu, 20 Mar 2025 04:27:17 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:17 GMT Message-Id: <202503200427.52K4RHWS019006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: e7b5dabcba26 - stable/13 - ntp: ntpd does not connect to NTP server with link local IPv6 address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e7b5dabcba26e28f79e9681a8fdb2ffa2c5122dc Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=e7b5dabcba26e28f79e9681a8fdb2ffa2c5122dc commit e7b5dabcba26e28f79e9681a8fdb2ffa2c5122dc Author: Cy Schubert AuthorDate: 2025-01-31 22:25:14 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 03:10:09 +0000 ntp: ntpd does not connect to NTP server with link local IPv6 address Upstream bug 3943 (https://bugs.ntp.org/show_bug.cgi?id=3943) discusses: Starting with 4.2.8p18 ntp does not synchronize or even connect to the configured NTP server any more. ntp stays in .INIT. state indefinitely and checking the network traffic shows that ntp does not attempt to contact the NTP server. This is regression introduced by the fix for upstream bug 3913. This is a similar bug I reported upstream (ntp bug 3841). (cherry picked from commit 381956e267569031883a516e10446c29490ee41d) --- contrib/ntp/ntpd/ntp_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 12a61ccb1d2c..69fae606f5c7 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -3205,7 +3205,7 @@ sendpkt( } do { - if (INT_LL_OF_GLOB & src->flags) { + if (ismcast && INT_LL_OF_GLOB & src->flags) { /* avoid duplicate multicasts on same IPv6 net */ goto loop; } From nobody Thu Mar 20 04:27:18 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCGc4R4Vz5rG2L; Thu, 20 Mar 2025 04:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGb5Ts0z3x95; Thu, 20 Mar 2025 04:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sbl6Uast2uI2TiJg/WgrGFz4DlFSGUjhal7SzBpC8i8=; b=VNKxp2HYUn3ad1Xue/m9IUHHzwxQAetlzU6BbhkO/9inY575KHpembwpHl5MocPLrGi7aQ qbarcMpi2Fei6dM2n5oBzrPm6vfMWd6s76l63IIVHrvGVuGv4XklJfL/IvumjJDB7IP4tH PiqomtI7EUV7rDNVd9tOfPRwawikq/nfKNtCBoqgmVaQWACP+ADNzGUdb4WTL9e1ybWjzY cmTSLzVVDmzyAaZLlG+/ICUH/1gzBEtBdJ1VRNu/KGrhkqwDxr7/d2g88K8s4kNS/andkx X7JSV40CY7nZn3mwM5k4Q6xa3jFdK8qUSo4ERpzrY0zoSafdxv3lkfWDnlZM4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444839; a=rsa-sha256; cv=none; b=elc2vIuGAmVDf0z17O9ox+sl32g3RNi8gSmw11RoAlX1xAoQ6H6J2fATlspB7DGtb7eeaV 91DFp8/EBp87m1hlX4TXo9VH8zLMg1N9chPM1tXXKcQLpSPaaye8CpE2HP/xwmNOEoSgb6 j0vdQF0zB9n1AFlz/vnAewlTReU+BTdpxMP4uL8xUnu8rrlJzRmKAMofiKqCpNXOZG4gUe gCokGR3Z50qRIUSARgVewfQAmVSzZhzzy5njQE1v4rw9kDpEI6EJ/gEvhLOUr61J4yiKJh IRpp+XVJnXhveW7LijdOYGT/CqOA01ePliQTpmXvHiLvwh48ZhNCRxUlLqiHjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sbl6Uast2uI2TiJg/WgrGFz4DlFSGUjhal7SzBpC8i8=; b=do6NhcSYEIbmWe4w3lRcLIcNEHL9pMf2g1I/CNHV1H2KNx+KklhIMhhmmbHAemtz1Zfv2l JFJ7cpxp5c4u217gA58dwdxxckopXtY1EVTFH9w/5kYMBICCC+9cvzo5XCC5G4kLTnm6sZ mNja/o23KgncwXdVQ7t4zwCFSzmut+NgEYxuSo5PS8bIFqYSOBSwMwOM9pRMTdNFm0iqYe oi/NlAttA1rVSSmJMrcQdfjdsuCi+q2F4/xmOjvFF5AAOG+klaUBqn7vyKU4I95nSNYoSl bcOOTkQrj3SyLL910ZfVVEbMmIDXS+v66H+soBMDPh2KwyMe+Ech5pFy2glVvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCGZ66qRzqnR; Thu, 20 Mar 2025 04:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4RIED019043; Thu, 20 Mar 2025 04:27:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4RIhW019040; Thu, 20 Mar 2025 04:27:18 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:18 GMT Message-Id: <202503200427.52K4RIhW019040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 9d425f11f9ff - stable/13 - ntp: Another patch to address IPv6 pool regression List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 commit 9d425f11f9ff9be2dc604d0bcaeb8f2c74c0aca5 Author: Cy Schubert AuthorDate: 2025-02-03 23:16:08 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 03:10:29 +0000 ntp: Another patch to address IPv6 pool regression 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regression. This patch, discussed in https://bugs.ntp.org/show_bug.cgi?id=3958, addresses another unworkable combination of link-local local address with non-link-local server. (cherry picked from commit c1767cf87cb64c25426fd7fe119be283b134509a) --- contrib/ntp/ntpd/ntp_proto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index f9605b8feacb..6b875145802f 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -475,7 +475,7 @@ transmit( /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) - || !nonlocal_v4_addr_up) { + || (IS_IPV4(&peer->srcadr) && !nonlocal_v4_addr_up)) { unpeer(peer); return; } From nobody Thu Mar 20 04:27:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCGc4R3mz5rFn3; Thu, 20 Mar 2025 04:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCGc0ydYz3xFp; Thu, 20 Mar 2025 04:27:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jeVxuh6lsBYwgE0Q+t+mGc8l2Z9nW2ptU9NZ3MwB+cI=; b=tSxcvpwwpvK6kqguoIRu9aczONw5aPwhuu4hjOzyXBc/tSmXzz9vmiwshzMDA2cgLlA1Y7 OV4ErBlJQ+LbKSD3mpEE78znHlvHSJ6MvPDISO7n4VE3UMeOcisk5pgrQbYjHWbsZNQeDx zouPGkM3FVPeW9tIEqYVzY75GEPHJ9SLywefr1e74+QmxGIxOwWCR8QnuK+FBcz+dGQgjI xT0RQ484laWRGeyzJ8bh6OkusvH16+qlvvS5EpdP3oc8nD+Z1Xn1ZhawzaGDhijnUnTEbA 8F6SY+btCjpAX3A79k0F27DYG+m0JN6KdzaQrfTnuNiL1q+J6vGfTuex4bCJ4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742444840; a=rsa-sha256; cv=none; b=DM91zvsnjm5BrMztGizb8kQbqIXYfZLcKoIqUZmAweOvv28+MLEnJ0fbPpcGH10dIqZ+UM LaUjzh/5WmW6pwR9fp1DIc4Dbqavb8WrTjKzbobviEXp9GNEHvXzvy/IdIcWcp5bZu9wQC 8aEsqpiacIk2MmY79tcHshO836fDLNfUv/A7yuKaSdYS2rAEJLU5kEz5+XH1yMQlMTzkfB XNo/GH88K/91N0xM0lHTKZV72GA38XYdZsDU5XP6aGgJMgKTVdr6Nn/XuIv95vfSuyQxc1 X93jYLNUaeqllcqIcvOHfFEMEQLBe2vRIFpEosOTZ+/1H0CaoSDNa1XeqBv/mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742444840; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jeVxuh6lsBYwgE0Q+t+mGc8l2Z9nW2ptU9NZ3MwB+cI=; b=jO5mkOsfGMcy6tVHgv6bh0HG5IKJUZLul0Rq6G2qdH9U33TmgROPkcsMhS6tD0qf7DEcAK 2d1AZvlQhLv502Lfl7kc5pzUfEsjpNwfIIkumQK4WUypmXR35pI4aTnVwNSbgtu4bkgKNx Bewmk7VM6kfYmfhlhzeoPCL9O60pNlE9bt659X8ev6ckfzaXxh0pVUbBUAXTmyROMI+8UP sxDU9cH0bpjkZVS+38hlVimG6iGPQGTaARJ6Juru5Z2+o0BIwfvqVTt+Kkcc4B+9EwFjMZ 3IBtJcry0+3q1pIDmj9cLFeS+lzVOpeBtrT2FGmyaWAeJbhgxUL4MzIXAV3NHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCGb5xlqzqKy; Thu, 20 Mar 2025 04:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4RJJj019076; Thu, 20 Mar 2025 04:27:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4RJmL019073; Thu, 20 Mar 2025 04:27:19 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:27:19 GMT Message-Id: <202503200427.52K4RJmL019073@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: dd503d7b4ce7 - stable/13 - ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd503d7b4ce735335fefeef006259204467f27d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=dd503d7b4ce735335fefeef006259204467f27d1 commit dd503d7b4ce735335fefeef006259204467f27d1 Author: Cy Schubert AuthorDate: 2025-01-31 23:36:59 +0000 Commit: Cy Schubert CommitDate: 2025-03-20 03:10:43 +0000 ntp: Replace the workaround from 98e34e8e2557 with a patch from upstream 98e34e8e2557 circumvented an upstream patch which caused an IPv6 pool regresson. This patch removes the circumvention and replaces it with an upstream patch planned for the new release of ntp. (cherry picked from commit bc02e655872021595c434850fbcbdb8dd11d4a46) --- contrib/ntp/ntpd/ntp_io.c | 4 +--- contrib/ntp/ntpd/ntp_proto.c | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/ntp/ntpd/ntp_io.c b/contrib/ntp/ntpd/ntp_io.c index 69fae606f5c7..9c4f6c1553e3 100644 --- a/contrib/ntp/ntpd/ntp_io.c +++ b/contrib/ntp/ntpd/ntp_io.c @@ -1486,9 +1486,7 @@ is_linklocal( if (IS_IPV6(psau)) { p6addr = &psau->sa6.sin6_addr; - if ( IN6_IS_ADDR_LINKLOCAL(p6addr) - || IN6_IS_ADDR_SITELOCAL(p6addr)) { - + if (IN6_IS_ADDR_LINKLOCAL(p6addr)) { return TRUE; } } else if (IS_IPV4(psau)) { diff --git a/contrib/ntp/ntpd/ntp_proto.c b/contrib/ntp/ntpd/ntp_proto.c index 6b875145802f..2e0d221c8472 100644 --- a/contrib/ntp/ntpd/ntp_proto.c +++ b/contrib/ntp/ntpd/ntp_proto.c @@ -471,7 +471,6 @@ transmit( return; } -#if 0 /* [Bug 3851] drop pool servers which can no longer be reached. */ if (MDF_PCLNT & peer->cast_flags) { if ( (IS_IPV6(&peer->srcadr) && !nonlocal_v6_addr_up) @@ -480,7 +479,6 @@ transmit( return; } } -#endif /* * In unicast modes the dance is much more intricate. It is From nobody Thu Mar 20 04:31:03 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCLw6Pxyz5rGRM; Thu, 20 Mar 2025 04:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLv6rCHz41YV; Thu, 20 Mar 2025 04:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIytv22n+zODQRgmTnrXf0hF4CSH73cKb9DwKAjGwIM=; b=b3BtrLDHvMH01IMIvk0SyCBFe9KJv5qfz6WeSBCS/XQbYlWZcvoqfLtznwko1QPEhXgKlu PHb/byKlMFM+Zt5JnM47uPIVUvNKF4Qjbj1uf0Ez+Q/wb1Xct8f4cVBHR17dyxYbJhkc28 nYiYsmPLVWjA9TsxjU9L33NlRGg4QA8F8O7oN6ZXxOTSeXmuwGgMrWv3NiylgzRikVH3iy dmsnACvZGdC+YUTzQtDEMCMypOk+JsPOJpTqtbOhQ6EG1kBVK6Afk6Wv/zs7s8tORu5Duh WE7rfTwtROvnIt9SSOFsChm364c6jKNyi08EoiIpUHCDErWolONusEXGXJielA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445064; a=rsa-sha256; cv=none; b=EEkpbV8+UOjno8iQgeMtCUE6/HY2jkTjqttdfYq9aM/RyCtwThcZGsBerhg3Fnml8wnbIr ky48w8Xh06lUlUiSmJMdTdZR6jSurS/aXfAtmruvAnvqYJ6x4jhsaOnwSWPf1xKpm/nhTX U5ZekLU2uFylKtM2xIQAoHhcqcu1+NLGP1NnMjrZpOCzmHfMGu0R+oJ1pU4S8MY/dcdP30 FY9EXDN+1y17tf4zhcPmPuMod6qJuUSjvplqao21S+rDU229NqSgX8nNqRt+DwRs3Xlvrr PZ//Xqx70GATOf9v2asCqesRCBplzKXqa9nuluKpGU6Y3JwRmTa0nUbVGJIj0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jIytv22n+zODQRgmTnrXf0hF4CSH73cKb9DwKAjGwIM=; b=UJJXkCo07NZzNfW9xUrrIq37Pfh8ANZDTrV5nhJSXyrGzw0nEXauxK5kuFX1QvAqmmajIn jSO7gckVgOnzNUwRQ6SJqA2vhTWEv/fOqZthLXwP31vdw96JvKhQyvx6LTwWSZntkqo9sN W1+G4vH63aPIOBPsmzEcQ9eClUJV342FP26dAw7lpA9tnfdt0rCm+ZGP7N1yXGnldrjTwn DkDrALzbpsHEa7Huw8Etx7+3sDioUncg5PqznBxFhNzGdoWjy1h3R4VbZlWwNLh7vwVL5Z /WmUwp6j9M3CB/fHJVASer9xVcrxC4csz1Zov5YMhbDF0vbX9daBA2OVqEhK7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLv47LPzr2j; Thu, 20 Mar 2025 04:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V3o2030870; Thu, 20 Mar 2025 04:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V38C030867; Thu, 20 Mar 2025 04:31:03 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:03 GMT Message-Id: <202503200431.52K4V38C030867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 9e8d2962aad3 - main - pf: convert DIOCRGETTSTATS to netlink List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e8d2962aad3af9bf1acd328a047f4745bb31086 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9e8d2962aad3af9bf1acd328a047f4745bb31086 commit 9e8d2962aad3af9bf1acd328a047f4745bb31086 Author: Kristof Provost AuthorDate: 2025-03-06 15:57:06 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:53 +0000 pf: convert DIOCRGETTSTATS to netlink Sponsored by: Rubicon Communications, LLC ("Netgate") --- lib/libpfctl/libpfctl.c | 91 ++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 4 ++ sbin/pfctl/pfctl_radix.c | 25 ------- sbin/pfctl/pfctl_table.c | 49 +++++++------- sys/netpfil/pf/pf_nl.c | 105 ++++++++++++++++++++++++++++++ sys/netpfil/pf/pf_nl.h | 13 ++++ usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 60 +++++++---------- 7 files changed, 264 insertions(+), 83 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index e93c79758428..e1cae22e2f3e 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -3188,3 +3188,94 @@ pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, return (e.error); } +static bool +snl_attr_get_uint64_into_int_array(struct snl_state *ss, struct nlattr *nla, + const void *arg, void *target) +{ + uint64_t *u64target; + struct snl_uint64_array a = { + .count = 0, + .max = (size_t)arg, + }; + bool error; + + u64target = malloc(a.max * sizeof(uint64_t)); + a.array = u64target; + + error = snl_parse_header(ss, NLA_DATA(nla), NLA_DATA_LEN(nla), &array_parser, &a); + if (! error) + return (error); + + for (size_t i = 0; i < a.count; i++) + ((int *)target)[i] = (int)u64target[i]; + + free(u64target); + + return (true); +} + +#define _OUT(_field) offsetof(struct pfr_table, _field) +static const struct snl_attr_parser ap_table[] = { + { .type = PF_T_ANCHOR, .off = _OUT(pfrt_anchor), .arg = (void *)MAXPATHLEN, .cb = snl_attr_copy_string }, + { .type = PF_T_NAME, .off = _OUT(pfrt_name), .arg = (void *)PF_TABLE_NAME_SIZE, .cb =snl_attr_copy_string }, + { .type = PF_T_TABLE_FLAGS, .off = _OUT(pfrt_flags), .cb = snl_attr_get_uint32 }, +}; +#undef _OUT +SNL_DECLARE_ATTR_PARSER(table_parser, ap_table); +#define _OUT(_field) offsetof(struct pfr_tstats, _field) +static struct snl_attr_parser ap_tstats[] = { + { .type = PF_TS_TABLE, .off = _OUT(pfrts_t), .arg = &table_parser, .cb = snl_attr_get_nested }, + { .type = PF_TS_PACKETS, .off = _OUT(pfrts_packets), .arg = (void *)(PFR_DIR_MAX * PFR_OP_TABLE_MAX), .cb = snl_attr_get_uint64_array}, + { .type = PF_TS_BYTES, .off = _OUT(pfrts_bytes), .arg = (void *)(PFR_DIR_MAX * PFR_OP_TABLE_MAX), .cb = snl_attr_get_uint64_array }, + { .type = PF_TS_MATCH, .off = _OUT(pfrts_match), .cb = snl_attr_get_uint64 }, + {. type = PF_TS_NOMATCH, .off = _OUT(pfrts_nomatch), .cb = snl_attr_get_uint64 }, + { .type = PF_TS_TZERO, .off = _OUT(pfrts_tzero), .cb = snl_attr_get_uint64 }, + { .type = PF_TS_REFCNT, .off = _OUT(pfrts_cnt), . arg = (void *)PFR_REFCNT_MAX, .cb = snl_attr_get_uint64_into_int_array }, +}; +#undef _OUT +SNL_DECLARE_PARSER(tstats_parser, struct genlmsghdr, snl_f_p_empty, ap_tstats); + +int +pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, + pfctl_get_tstats_fn fn, void *arg) +{ + struct snl_writer nw; + struct snl_errmsg_data e = {}; + struct nlmsghdr *hdr; + uint32_t seq_id; + int family_id; + int ret; + + family_id = snl_get_genl_family(&h->ss, PFNL_FAMILY_NAME); + if (family_id == 0) + return (ENOTSUP); + + snl_init_writer(&h->ss, &nw); + hdr = snl_create_genl_msg_request(&nw, family_id, PFNL_CMD_GET_TSTATS); + + snl_add_msg_attr_string(&nw, PF_T_ANCHOR, filter->pfrt_anchor); + snl_add_msg_attr_string(&nw, PF_T_NAME, filter->pfrt_name); + snl_add_msg_attr_u32(&nw, PF_T_TABLE_FLAGS, filter->pfrt_flags); + + if ((hdr = snl_finalize_msg(&nw)) == NULL) + return (ENXIO); + + seq_id = hdr->nlmsg_seq; + + if (!snl_send_message(&h->ss, hdr)) + return (ENXIO); + + while ((hdr = snl_read_reply_multi(&h->ss, seq_id, &e)) != NULL) { + struct pfr_tstats tstats = {}; + + if (!snl_parse_nlmsg(&h->ss, hdr, &tstats_parser, &tstats)) + continue; + + ret = fn(&tstats, arg); + if (ret != 0) + break; + } + + return (e.error); +} + diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 1108b0ffc693..c1c1da66746b 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -551,4 +551,8 @@ int pfctl_add_table(struct pfctl_handle *h, struct pfr_table *table, int pfctl_del_table(struct pfctl_handle *h, struct pfr_table *table, int *ndel, int flags); +typedef int (*pfctl_get_tstats_fn)(const struct pfr_tstats *t, void *arg); +int pfctl_get_tstats(struct pfctl_handle *h, const struct pfr_table *filter, + pfctl_get_tstats_fn fn, void *arg); + #endif diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 3bb2469a9bfb..3b0cc615e5a2 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -110,31 +110,6 @@ pfr_get_tables(struct pfr_table *filter, struct pfr_table *tbl, int *size, return (0); } -int -pfr_get_tstats(struct pfr_table *filter, struct pfr_tstats *tbl, int *size, - int flags) -{ - struct pfioc_table io; - - if (size == NULL || *size < 0 || (*size && tbl == NULL)) { - errno = EINVAL; - return (-1); - } - bzero(&io, sizeof io); - io.pfrio_flags = flags; - if (filter != NULL) - io.pfrio_table = *filter; - io.pfrio_buffer = tbl; - io.pfrio_esize = sizeof(*tbl); - io.pfrio_size = *size; - if (ioctl(dev, DIOCRGETTSTATS, &io)) { - pfr_report_error(filter, &io, "get tstats for"); - return (-1); - } - *size = io.pfrio_size; - return (0); -} - int pfr_clr_addrs(struct pfr_table *tbl, int *ndel, int flags) { diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 90e87adadb0f..57f7354b0172 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -57,8 +57,8 @@ extern void usage(void); static int pfctl_table(int, char *[], char *, const char *, char *, const char *, int); -static void print_table(struct pfr_table *, int, int); -static void print_tstats(struct pfr_tstats *, int); +static void print_table(const struct pfr_table *, int, int); +static int print_tstats(const struct pfr_tstats *, int); static int load_addr(struct pfr_buffer *, int, char *[], char *, int); static void print_addrx(struct pfr_addr *, struct pfr_addr *, int); static int nonzero_astats(struct pfr_astats *); @@ -165,28 +165,31 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, PFRB_TSTATS : PFRB_TABLES; if (argc || file != NULL) usage(); - for (;;) { - pfr_buf_grow(&b, b.pfrb_size); - b.pfrb_size = b.pfrb_msize; - if (opts & PF_OPT_VERBOSE2) - RVTEST(pfr_get_tstats(&table, - b.pfrb_caddr, &b.pfrb_size, flags)); - else - RVTEST(pfr_get_tables(&table, - b.pfrb_caddr, &b.pfrb_size, flags)); - if (b.pfrb_size <= b.pfrb_msize) - break; - } if ((opts & PF_OPT_SHOWALL) && b.pfrb_size > 0) pfctl_print_title("TABLES:"); - PFRB_FOREACH(p, &b) - if (opts & PF_OPT_VERBOSE2) - print_tstats(p, opts & PF_OPT_DEBUG); - else + if (opts & PF_OPT_VERBOSE2) { + uintptr_t arg = opts & PF_OPT_DEBUG; + pfctl_get_tstats(pfh, &table, + (pfctl_get_tstats_fn)print_tstats, (void *)arg); + } else { + for (;;) { + pfr_buf_grow(&b, b.pfrb_size); + b.pfrb_size = b.pfrb_msize; + RVTEST(pfr_get_tables(&table, + b.pfrb_caddr, &b.pfrb_size, flags)); + if (b.pfrb_size <= b.pfrb_msize) + break; + } + + if ((opts & PF_OPT_SHOWALL) && b.pfrb_size > 0) + pfctl_print_title("TABLES:"); + + PFRB_FOREACH(p, &b) print_table(p, opts & PF_OPT_VERBOSE, opts & PF_OPT_DEBUG); + } } else if (!strcmp(command, "kill")) { if (argc || file != NULL) usage(); @@ -408,7 +411,7 @@ _cleanup: } void -print_table(struct pfr_table *ta, int verbose, int debug) +print_table(const struct pfr_table *ta, int verbose, int debug) { if (!debug && !(ta->pfrt_flags & PFR_TFLAG_ACTIVE)) return; @@ -429,14 +432,14 @@ print_table(struct pfr_table *ta, int verbose, int debug) puts(ta->pfrt_name); } -void -print_tstats(struct pfr_tstats *ts, int debug) +int +print_tstats(const struct pfr_tstats *ts, int debug) { time_t time = ts->pfrts_tzero; int dir, op; if (!debug && !(ts->pfrts_flags & PFR_TFLAG_ACTIVE)) - return; + return (0); print_table(&ts->pfrts_t, 1, debug); printf("\tAddresses: %d\n", ts->pfrts_cnt); printf("\tCleared: %s", ctime(&time)); @@ -452,6 +455,8 @@ print_tstats(struct pfr_tstats *ts, int debug) stats_text[dir][op], (unsigned long long)ts->pfrts_packets[dir][op], (unsigned long long)ts->pfrts_bytes[dir][op]); + + return (0); } int diff --git a/sys/netpfil/pf/pf_nl.c b/sys/netpfil/pf/pf_nl.c index 73c39e1f7471..f34bb71839b3 100644 --- a/sys/netpfil/pf/pf_nl.c +++ b/sys/netpfil/pf/pf_nl.c @@ -1937,6 +1937,104 @@ pf_handle_del_table(struct nlmsghdr *hdr, struct nl_pstate *npt) return (0); } +static bool +nlattr_add_pfr_table(struct nl_writer *nw, int attrtype, + struct pfr_table *t) +{ + int off = nlattr_add_nested(nw, attrtype); + + nlattr_add_string(nw, PF_T_ANCHOR, t->pfrt_anchor); + nlattr_add_string(nw, PF_T_NAME, t->pfrt_name); + nlattr_add_u32(nw, PF_T_TABLE_FLAGS, t->pfrt_flags); + + nlattr_set_len(nw, off); + + return (true); +} + +static int +pf_handle_get_tstats(struct nlmsghdr *hdr, struct nl_pstate *npt) +{ + struct pfioc_table attrs = { 0 }; + struct nl_writer *nw = npt->nw; + struct genlmsghdr *ghdr_new; + struct pfr_tstats *pfrtstats; + int error; + int n; + + PF_RULES_RLOCK_TRACKER; + + error = nl_parse_nlmsg(hdr, &table_parser, npt, &attrs); + if (error != 0) + return (error); + + PF_TABLE_STATS_LOCK(); + PF_RULES_RLOCK(); + + n = pfr_table_count(&attrs.pfrio_table, attrs.pfrio_flags); + pfrtstats = mallocarray(n, + sizeof(struct pfr_tstats), M_TEMP, M_NOWAIT | M_ZERO); + + error = pfr_get_tstats(&attrs.pfrio_table, pfrtstats, + &n, attrs.pfrio_flags | PFR_FLAG_USERIOCTL); + + PF_RULES_RUNLOCK(); + PF_TABLE_STATS_UNLOCK(); + + if (error == 0) { + hdr->nlmsg_flags |= NLM_F_MULTI; + + for (int i = 0; i < n; i++) { + uint64_t refcnt[PFR_REFCNT_MAX]; + + if (!nlmsg_reply(nw, hdr, sizeof(struct genlmsghdr))) { + error = ENOMEM; + break; + } + + ghdr_new = nlmsg_reserve_object(nw, struct genlmsghdr); + ghdr_new->cmd = PFNL_CMD_GET_TSTATS; + ghdr_new->version = 0; + ghdr_new->reserved = 0; + + nlattr_add_pfr_table(nw, PF_TS_TABLE, + &pfrtstats[i].pfrts_t); + nlattr_add_u64_array(nw, PF_TS_PACKETS, + PFR_DIR_MAX * PFR_OP_TABLE_MAX, + (uint64_t *)pfrtstats[i].pfrts_packets); + nlattr_add_u64_array(nw, PF_TS_BYTES, + PFR_DIR_MAX * PFR_OP_TABLE_MAX, + (uint64_t *)pfrtstats[i].pfrts_bytes); + nlattr_add_u64(nw, PF_TS_MATCH, + pfrtstats[i].pfrts_match); + nlattr_add_u64(nw, PF_TS_NOMATCH, + pfrtstats[i].pfrts_nomatch); + nlattr_add_u64(nw, PF_TS_TZERO, + pfrtstats[i].pfrts_tzero); + nlattr_add_u64(nw, PF_TS_CNT, pfrtstats[i].pfrts_cnt); + + for (int j = 0; j < PFR_REFCNT_MAX; j++) + refcnt[j] = pfrtstats[i].pfrts_refcnt[j]; + + nlattr_add_u64_array(nw, PF_TS_REFCNT, PFR_REFCNT_MAX, + refcnt); + + if (! nlmsg_end(nw)) { + error = ENOMEM; + break; + } + } + } + free(pfrtstats, M_TEMP); + + if (!nlmsg_end_dump(npt->nw, error, hdr)) { + NL_LOG(LOG_DEBUG, "Unable to finalize the dump"); + return (ENOMEM); + } + + return (error); +} + static const struct nlhdr_parser *all_parsers[] = { &state_parser, &addrule_parser, @@ -2152,6 +2250,13 @@ static const struct genl_cmd pf_cmds[] = { .cmd_flags = GENL_CMD_CAP_DO | GENL_CMD_CAP_HASPOL, .cmd_priv = PRIV_NETINET_PF, }, + { + .cmd_num = PFNL_CMD_GET_TSTATS, + .cmd_name = "GET_TSTATS", + .cmd_cb = pf_handle_get_tstats, + .cmd_flags = GENL_CMD_CAP_DUMP | GENL_CMD_CAP_HASPOL, + .cmd_priv = PRIV_NETINET_PF, + }, }; void diff --git a/sys/netpfil/pf/pf_nl.h b/sys/netpfil/pf/pf_nl.h index dd68f452d7f1..ed01d3427fc4 100644 --- a/sys/netpfil/pf/pf_nl.h +++ b/sys/netpfil/pf/pf_nl.h @@ -64,6 +64,7 @@ enum { PFNL_CMD_CLEAR_TABLES = 26, PFNL_CMD_ADD_TABLE = 27, PFNL_CMD_DEL_TABLE = 28, + PFNL_CMD_GET_TSTATS = 29, __PFNL_CMD_MAX, }; #define PFNL_CMD_MAX (__PFNL_CMD_MAX -1) @@ -442,6 +443,18 @@ enum pf_tables_t { PF_T_NBR_ADDED = 6, /* u32 */ }; +enum pf_tstats_t { + PF_TS_UNSPEC, + PF_TS_TABLE = 1, /* nested, pfr_table */ + PF_TS_PACKETS = 2, /* u64 array */ + PF_TS_BYTES = 3, /* u64 array */ + PF_TS_MATCH = 4, /* u64 */ + PF_TS_NOMATCH = 5, /* u64 */ + PF_TS_TZERO = 6, /* u64 */ + PF_TS_CNT = 7, /* u64 */ + PF_TS_REFCNT = 8, /* u64 array */ +}; + #ifdef _KERNEL void pf_nl_register(void); diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index 0e40bcfb843e..f0f9e0f0e149 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -1297,11 +1297,28 @@ pfs_refresh(void) return (0); } +static int +pft_add_tstats(const struct pfr_tstats *t, void *arg) +{ + struct pft_entry *e; + int *index = arg; + + e = malloc(sizeof(struct pft_entry)); + if (e == NULL) + return (ENOMEM); + + e->index = (*index) + 1; + (*index)++; + memcpy(&e->pft, t, sizeof(struct pfr_tstats)); + TAILQ_INSERT_TAIL(&pft_table, e, link); + + return (0); +} + static int pft_refresh(void) { - struct pfioc_table io; - struct pfr_tstats *t = NULL; + struct pfr_table filter; struct pft_entry *e; int i, numtbls = 1; @@ -1314,45 +1331,18 @@ pft_refresh(void) free(e); } - bzero(&io, sizeof(io)); - io.pfrio_esize = sizeof(struct pfr_tstats); - - for (;;) { - t = reallocf(t, numtbls * sizeof(struct pfr_tstats)); - if (t == NULL) { - syslog(LOG_ERR, "pft_refresh(): reallocf() numtbls=%d: %s", - numtbls, strerror(errno)); - goto err2; - } - io.pfrio_size = numtbls; - io.pfrio_buffer = t; + bzero(&filter, sizeof(filter)); - if (ioctl(pfctl_fd(pfh), DIOCRGETTSTATS, &io)) { - syslog(LOG_ERR, "pft_refresh(): ioctl(): %s", - strerror(errno)); - goto err2; - } - - if (numtbls >= io.pfrio_size) - break; - - numtbls = io.pfrio_size; - } - - for (i = 0; i < numtbls; i++) { - e = malloc(sizeof(struct pft_entry)); - if (e == NULL) - goto err1; - e->index = i + 1; - memcpy(&e->pft, t+i, sizeof(struct pfr_tstats)); - TAILQ_INSERT_TAIL(&pft_table, e, link); + if (pfctl_get_tstats(pfh, &filter, pft_add_tstats, &i)) { + syslog(LOG_ERR, "pft_refresh(): pfctl_get_tstats(): %s", + strerror(errno)); + goto err1; } pft_table_age = time(NULL); pft_table_count = numtbls; pf_tick = this_tick; - free(t); return (0); err1: while (!TAILQ_EMPTY(&pft_table)) { @@ -1360,8 +1350,6 @@ err1: TAILQ_REMOVE(&pft_table, e, link); free(e); } -err2: - free(t); return(-1); } From nobody Thu Mar 20 04:31:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCLx6YHsz5rGCk; Thu, 20 Mar 2025 04:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLw6T9Gz41hJ; Thu, 20 Mar 2025 04:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nji1qr+BURCs7wVeRlJh+F4uDrAX942U9wIwn25DCis=; b=b+Uys80AX/C+N/yAXf3li7JqGwjp/04QalsBvSKdW5HUcy865VpZ5kbxg1oFf0pJBr4aYK wILtGSmws5gphOYTBNbI2HwNUHEgZZozPnJABZPzaD3oMRSKvhFGrOTpfscYMVutubcNOT 2LnU0vkwF5J1sN5wT5zhiqvOobMsAbOaYCBdKT2WZnMjMSJTQbUirVNXykHrLnM5Qe+aHc oz69qcB0frggeQfjWiul8DF+kpegJYVd0Sa9cKFAMvu2LPHt9Wyv1/744eN6AOY85OqYAc +Lw3Xf9j+M+W3F8qeCfvKyeptBdODXDo6kKqcf2Nj9sNcsLevJuTaetYfBFuLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445065; a=rsa-sha256; cv=none; b=obaE3S8jkr9bNmlmpszUKGkvR5wY4z4V0SGcPfbIsjWso4S3pCsZJHT5PjjPCbrEKM39Ma sn+C+u6DvxzvhwFHCG9AjUupcq4wt5v78w+j88WtDVOe0aaRQ0WQdJOxD3t3mkwlp1aleg D9I2mVLT/VHEX403T3M/tMP1gooHycJ8HToY2+bNvHdk2lOmpYqDn6y5r+oOPDn/zxgBO4 t3D83280XtJWTkUOXzMDGH3T7tGcR8tk2+a7OnPjVwLfQzBUVI0/UCVI56pFt1/5+Jv8Vl oj53J4BZ8bdXBVutYL4yCKOQnh9qDeLt4P6R6XdwaOuaLsgdY9DRw9kz3yZjTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nji1qr+BURCs7wVeRlJh+F4uDrAX942U9wIwn25DCis=; b=XDYTdRlgniroO704euRiY/dzU1L5DKvbgycpdJ/51PLoDaKNngoFXtkRCDCc9G3OUC72/J bsnLSP6UPVr04hioRVwj9XBHaLzthgDgix8kE9Fd2OioDNM55B5zRBhfD5+5fipXaMW0up 44PYueMB8Hb8NJnRnaFCINwyPXVAwhZQcyoDR8vuHzYWRIv6LiWJPFaaXHOGCBHqVF16vo eawVwVf3GeNEvBX8tWo8HElksz6oVZXI0xLoTg8QjKkguRnqoXaYF8gM5MsFunx6j54RqN yKmyrzix3rewPg/at1XN+WAl+9G9X2XB4z4sFIOpX6UmYbAyQ8Rp/MA3KRNLLg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLw4qJdzr4s; Thu, 20 Mar 2025 04:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V4nH030908; Thu, 20 Mar 2025 04:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V4KK030905; Thu, 20 Mar 2025 04:31:04 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:04 GMT Message-Id: <202503200431.52K4V4KK030905@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 712309a64512 - main - snmp_pf: fix pfInterfacesIfRefsState List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 712309a64512c7e4ebf0e10de8a5c59d5a185ae8 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=712309a64512c7e4ebf0e10de8a5c59d5a185ae8 commit 712309a64512c7e4ebf0e10de8a5c59d5a185ae8 Author: Kristof Provost AuthorDate: 2025-03-19 06:08:55 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:53 +0000 snmp_pf: fix pfInterfacesIfRefsState pfInterfacesIfRefsState was described as 'Null', which upset bsnmpwalk's attempt to resolve OIDs to symbolic names: > bsnmpwalk: Error adding leaf pfInterfacesIfRefsState to list This was done back in d6d3f01e0a339, because we don't return this value any more. Return it to 'Unsigned32', which fixes things, even if we still don't actually return this value. While here update the ORGANIZATION to reflect current ownership. Reviewed by: philip MFC after: 2 weeks Event: Tokyo Hackathon 202503 Differential Revision: https://reviews.freebsd.org/D49413 --- usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt | 14 ++++++-------- usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt index 13a4a646a669..8127eb92601f 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt @@ -21,19 +21,17 @@ IMPORTS FROM BEGEMOT-MIB; begemotPf MODULE-IDENTITY - LAST-UPDATED "201003180000Z" - ORGANIZATION "NixSys BVBA" + LAST-UPDATED "202503190000Z" + ORGANIZATION "Alternative Enterprises (HK) Limited" CONTACT-INFO " Philip Paeps - Postal: NixSys BVBA - Louizastraat 14 - BE-2800 Mechelen - Belgium - E-Mail: philip@FreeBSD.org" DESCRIPTION "The Begemot MIB for the pf packet filter." + REVISION "202503190000Z" + DESCRIPTION + "Reverted pfInterfacesIfRefsState to Unsigned32" REVISION "201003180000Z" DESCRIPTION "Modified pfTablesAddrEntry to support IPv6 @@ -583,7 +581,7 @@ PfInterfacesIfEntry ::= SEQUENCE { pfInterfacesIfDescr OCTET STRING, pfInterfacesIfType INTEGER, pfInterfacesIfTZero TimeTicks, - pfInterfacesIfRefsState Null, + pfInterfacesIfRefsState Unsigned32, pfInterfacesIfRefsRule Unsigned32, pfInterfacesIf4BytesInPass Counter64, pfInterfacesIf4BytesInBlock Counter64, diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def index dcdf676aa752..7a517a876fab 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def @@ -107,7 +107,7 @@ (2 pfInterfacesIfDescr OCTETSTRING GET) (3 pfInterfacesIfType ENUM ( 0 group 1 instance 2 detached ) GET) (4 pfInterfacesIfTZero TIMETICKS GET) - (5 pfInterfacesIfRefsState NULL GET) + (5 pfInterfacesIfRefsState UNSIGNED32 GET) (6 pfInterfacesIfRefsRule UNSIGNED32 GET) (7 pfInterfacesIf4BytesInPass COUNTER64 GET) (8 pfInterfacesIf4BytesInBlock COUNTER64 GET) From nobody Thu Mar 20 04:31:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCLz1gYYz5rG9p; Thu, 20 Mar 2025 04:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLy0B9Mz41TX; Thu, 20 Mar 2025 04:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ll1e3eTGqwAmjfP5/46QCUtS7L/aZ1l4fnCGipgxnTY=; b=QVLgB2ySASkInyiqH9f2rVCrhIKi3vKVYRcECIez35qscvXHrjpL3rvnUT27k65rs5wPdF NhaxvMFSMEs0JW41Ep/T5UvSXkD3L93G/psX00mcGIDlEGBgKrXgUKXJeyKf1+0UNVLlIo 0KtpWn6Vk7E7TBhSvrJmoPRPZNsdHaL0hA2YIKyUxZ3OtR/3+tsUvQ1f71pVKGjekNU7ia 2J2FcfKkT4/rnLdUz/abYXOk2B1Nd18yMJYDU+m804WoLHvsowtATRfF97/nMlTqlWfoqr qjBdWn7S2i1Firm7yoUhJI96K5HaCEPVaMZTWrTtSB21VDr2APIqA0252x8WFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445066; a=rsa-sha256; cv=none; b=tkSYFvfybc5DheCI/nReZDE0ZJzykh9yJ3kVm0pI6uLT/kTFUIr1zwb0QgikhDK4YsUWfL U5BCsRwj3K4gZ+tIbg/nepsztJaSfFA/I3uLZ/7QnQ2X1/SQ38A8ABvw719ydp7l/3CzHy EzFgah+3/ftC1gwu1D0AeGTkBQkNtXN5xhZ7YMiauV+T7h6cpA1gqQJlmdrPNM7Ut3E8lc 7H/9Ih+MtYR+uhz0U18R8jDjZeF6VmPsU7F3Idud3DG0l69XCLOwmiYkr0zfv1XRNT2/iY LY+JL5UJVbo2nTzk1jlA7tGYmXdwf1OIKXTlrcttxjM4E0bZk/MOxtUgIMFh3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ll1e3eTGqwAmjfP5/46QCUtS7L/aZ1l4fnCGipgxnTY=; b=e2JGwjYcG37iEGGv7tN9FkgtoTdFbSzAFWVlroCp1W4MBK/ijV1rzTIrnxLjn2Xxgyek2l sQ/CFVO6TrRMvmEsRIc+XnW6m5J3UgPA0BXC4XffrvRE/IrBNVbBgZPVoohPxSKQPQSFAE 4gmRjOIZuhmD6P+mF1N1Q11yP1zlpHPfoR6C9YHKNELNJ+6so16TZG0sES0gptkoj1JWA3 d2fBClzrS5E9gY6nGgt9/vG+e/0QA+6SzSwHq6E0IB58t9T3ZCU7mk45NAixePX1fPD6XS D1Xv4B2EGI5hn2+dZTB8ouOTb1HHFeSqSwStZGxYp/vFije6sW6eNjzTjfMnFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLx634Dzqr7; Thu, 20 Mar 2025 04:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V5TS030948; Thu, 20 Mar 2025 04:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V5N7030945; Thu, 20 Mar 2025 04:31:05 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:05 GMT Message-Id: <202503200431.52K4V5N7030945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: c849f5333260 - main - pf tests: add a basic snmp_pf test case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c849f533326026501c28cb2c344b16723862551a Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c849f533326026501c28cb2c344b16723862551a commit c849f533326026501c28cb2c344b16723862551a Author: Kristof Provost AuthorDate: 2025-03-19 06:42:42 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:54 +0000 pf tests: add a basic snmp_pf test case Event: Tokyo Hackathon 202503 --- tests/sys/netpfil/pf/Makefile | 6 +++- tests/sys/netpfil/pf/bsnmpd.conf | 47 ++++++++++++++++++++++++++ tests/sys/netpfil/pf/snmp.sh | 71 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 123 insertions(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 8a24fae47dcb..3b1ba2085f43 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -45,6 +45,7 @@ ATF_TESTS_SH+= altq \ sctp \ set_skip \ set_tos \ + snmp \ src_track \ status \ syncookie \ @@ -63,7 +64,9 @@ ATF_TESTS_PYTEST+= sctp.py TEST_METADATA+= execenv="jail" TEST_METADATA+= execenv_jail_params="vnet allow.raw_sockets" -${PACKAGE}FILES+= CVE-2019-5597.py \ +${PACKAGE}FILES+= \ + bsnmpd.conf \ + CVE-2019-5597.py \ CVE-2019-5598.py \ daytime_inetd.conf \ echo_inetd.conf \ @@ -79,6 +82,7 @@ ${PACKAGE}FILES+= CVE-2019-5597.py \ rdr-srcport.py \ utils.subr +${PACKAGE}FILESMODE_bsnmpd.conf= 0555 ${PACKAGE}FILESMODE_CVE-2019-5597.py= 0555 ${PACKAGE}FILESMODE_CVE-2019-5598.py= 0555 ${PACKAGE}FILESMODE_fragcommon.py= 0555 diff --git a/tests/sys/netpfil/pf/bsnmpd.conf b/tests/sys/netpfil/pf/bsnmpd.conf new file mode 100644 index 000000000000..27abdda6cbd3 --- /dev/null +++ b/tests/sys/netpfil/pf/bsnmpd.conf @@ -0,0 +1,47 @@ +location := "A galaxy far, far away" +contact := "skywalker@Tatooine" +system := 1 + +read := "public" +write := "geheim" +trap := "mytrap" + +NoAuthProtocol := 1.3.6.1.6.3.10.1.1.1 +HMACMD5AuthProtocol := 1.3.6.1.6.3.10.1.1.2 +HMACSHAAuthProtocol := 1.3.6.1.6.3.10.1.1.3 +NoPrivProtocol := 1.3.6.1.6.3.10.1.2.1 +DESPrivProtocol := 1.3.6.1.6.3.10.1.2.2 +AesCfb128Protocol := 1.3.6.1.6.3.10.1.2.4 + +securityModelAny := 0 +securityModelSNMPv1 := 1 +securityModelSNMPv2c := 2 +securityModelUSM := 3 + +MPmodelSNMPv1 := 0 +MPmodelSNMPv2c := 1 +MPmodelSNMPv3 := 3 + +noAuthNoPriv := 1 +authNoPriv := 2 +authPriv := 3 + +%snmpd +begemotSnmpdDebugDumpPdus = 2 +begemotSnmpdDebugSyslogPri = 7 + +begemotSnmpdCommunityString.0.1 = $(read) +begemotSnmpdCommunityDisable = 1 + +begemotSnmpdTransInetStatus.1.4.0.0.0.0.161.1 = 4 +begemotSnmpdTransInetStatus.2.16.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.161.1 = 4 + +begemotSnmpdLocalPortStatus."/var/run/snmpd.sock" = 1 +begemotSnmpdLocalPortType."/var/run/snmpd.sock" = 4 + +sysContact = $(contact) +sysLocation = $(location) +sysObjectId = 1.3.6.1.4.1.12325.1.1.2.1.$(system) + +begemotSnmpdModulePath."mibII" = "/usr/lib/snmp_mibII.so" +begemotSnmpdModulePath."pf" = "/usr/lib/snmp_pf.so" diff --git a/tests/sys/netpfil/pf/snmp.sh b/tests/sys/netpfil/pf/snmp.sh new file mode 100644 index 000000000000..0d6b2eb10ec7 --- /dev/null +++ b/tests/sys/netpfil/pf/snmp.sh @@ -0,0 +1,71 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Kristof Provost +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "basic" "cleanup" +basic_head() +{ + atf_set descr 'Basic pf_snmp test' + atf_set require.user root +} + +basic_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}b 192.0.2.2/24 up + + vnet_mkjail alcatraz ${epair}a + jexec alcatraz ifconfig ${epair}a 192.0.2.1/24 up + + # Start bsnmpd + jexec alcatraz bsnmpd -c $(atf_get_srcdir)/bsnmpd.conf + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "pass" + + # Sanity check, and create state + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + # pf should be enabled + atf_check -s exit:0 -o match:'pfStatusRunning.0 = true' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def begemot +} + +basic_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "basic" +} From nobody Thu Mar 20 04:31:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCM06j3kz5rG7W; Thu, 20 Mar 2025 04:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCLz39p5z41hQ; Thu, 20 Mar 2025 04:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtiU/1wd7GRXxE8AmzHRHSc7ewqIiI/KNEmXHnGQBd0=; b=NxcGYFcEX+3ARVw+haX3eymEAKRogJVM1hiULM6haAKaS+AAzkRKY6yTxmwGHHxQN0HWTb 9rrdBYW/18uRdjOwBcCHNU2rrzyosmfvxos8qqdKKdMAzv0A9QQqd27IaYdpPDasxB9gOa V5JG4DRHv25HHSF82jwskClHtXIvFvx23zmlBXs1Wp3YRgf9Xsg4w2fLhzYvqaCVS81mWd ojUekLquouJCxW/iD19Ng8nb5vZfubIUAlH1CbnCQ0qIIQDgBnnwl3+6nLvPkGMuzihYap tVyzdlPxwu4mhdKQqB9OTXPSlkfzkr+u1cAgQQ2TGt34Iu+b9emlgSDRPPtfeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445067; a=rsa-sha256; cv=none; b=oeI9tOT8AeinKpNz04RJPKMhm9hpdJp6atb8ACb+Ts94EHJxouADbeHQF2A8u9RH5gF7fH XSOZtZ9Dn7/3E2DJ1ofnQ9uStfIaAe2aahGsCfofgp2tCGyZy7niH6NsH7YpdwY/qpu76z df3MdcPgbJkolVMP3ga1d6FDBVCIA/7hNSpZ2Fi8dQAKUD7MXO/amkJBOvsLKfPl5cz+aq DkxeoADOfkmMxh0QJOZOqhJQujaZdAuf5PWUmP7GCOL0+wteOOWbj7xj6Sx+F1sq21X1Bd qVY4qR5Vc/tq8QDY87cO639MpBP7LwNgBTeCnYIt0L8COACOum5Y8/OVsdYDsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FtiU/1wd7GRXxE8AmzHRHSc7ewqIiI/KNEmXHnGQBd0=; b=E0AjQ5g1r5LW1Zf2BiWwwtTDNBCUELuFwvjzTGqoWyTZuUU2LOkyQYatvZmw/xYbw5vv0P NeJeeeF/FVkh47DB9XL17gJMqkLhx42kLSOJlAWD8Guj9NGM467AF9RcMU1zujVufHGI1n Kr7+iCP4cYoV61c6GXJU+QM1OgJf8m5gJHHmmse3flyH/gcpq2so7SDt+qcYoTqMlfr7KK E36ym0RPprr93TmR+JJi6e7R944Iw/XEA0Qqz8hbnIicx4iqhT8Zr1YASM/ih/UtFuyQhm vb1kUdJjiwE2xfqZq3/EYhTnmH0datiRGY59XkzhfCJgnVJDAOEGHBN4YnQkjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCLz0fhZzr2l; Thu, 20 Mar 2025 04:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4V6VT030981; Thu, 20 Mar 2025 04:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4V6Sw030978; Thu, 20 Mar 2025 04:31:06 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:31:06 GMT Message-Id: <202503200431.52K4V6Sw030978@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 36586800803d - main - pf tests: test table information export via snmp_pf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36586800803d24f1137d861bbaf487a6bde16a09 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=36586800803d24f1137d861bbaf487a6bde16a09 commit 36586800803d24f1137d861bbaf487a6bde16a09 Author: Kristof Provost AuthorDate: 2025-03-20 01:27:52 +0000 Commit: Kristof Provost CommitDate: 2025-03-20 04:29:54 +0000 pf tests: test table information export via snmp_pf Event: Tokyo Hackathon 202503 --- tests/sys/netpfil/pf/snmp.sh | 52 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tests/sys/netpfil/pf/snmp.sh b/tests/sys/netpfil/pf/snmp.sh index 0d6b2eb10ec7..37cc4b75cf92 100644 --- a/tests/sys/netpfil/pf/snmp.sh +++ b/tests/sys/netpfil/pf/snmp.sh @@ -65,7 +65,59 @@ basic_cleanup() pft_cleanup } +atf_test_case "table" "cleanup" +table_head() +{ + atf_set descr 'Test tables and pf_snmp' + atf_set require.user root +} + +table_body() +{ + pft_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}b 192.0.2.2/24 up + + vnet_mkjail alcatraz ${epair}a + jexec alcatraz ifconfig ${epair}a 192.0.2.1/24 up + + jexec alcatraz pfctl -e + pft_set_rules alcatraz \ + "table counters { 192.0.2.0/24 }" \ + "pass in from " + + # Start bsnmpd after creating the table so we don't have to wait for + # a refresh timeout + jexec alcatraz bsnmpd -c $(atf_get_srcdir)/bsnmpd.conf + + # Sanity check, and create state + atf_check -s exit:0 -o ignore \ + ping -c 1 192.0.2.1 + + # We should have one table + atf_check -s exit:0 -o match:'pfTablesTblNumber.0 = 1' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def begemot + + # We have the 'foo' table + atf_check -s exit:0 -o match:'pfTablesTblDescr.* = foo' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables + + # Which contains address 192.0.2.0/24 + atf_check -s exit:0 -o match:'pfTablesAddrNet.* = 192.0.2.0' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables + atf_check -s exit:0 -o match:'pfTablesAddrPrefix.* = 24' \ + bsnmpwalk -s public@192.0.2.1 -i pf_tree.def pfTables +} + +table_cleanup() +{ + pft_cleanup +} + atf_init_test_cases() { atf_add_test_case "basic" + atf_add_test_case "table" } From nobody Thu Mar 20 04:34:19 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCQj1LzLz5rGZC; Thu, 20 Mar 2025 04:34: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCQh34Srz44SR; Thu, 20 Mar 2025 04:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLX4FfCD/JBnqOlnKlQgsl7ChcQeEv75+b34om3o1Q8=; b=DidBdafixPmIhbhpr//zjcn+q5b8rZIYSKiCRX2RytVvIwGpRf4F8kiPVaCPDo4sCGUjVy XdG5TSmlvTc9peyj2D9iewt3hD6BjdEFAjWIoNsZjrWceCC+WuyQnUKMz3lsoaXDRZNBon miybnKn/WoxIEJW4mXX0GQoLjoZOLUV/q3S8YTkE8ZtbDF5VJ+OOKrfpYDMjk33MT9JHzY Pz4DOv/57e4xJzseSJLkvuKCvyEldfGy8rBlNy3tin8QmoRCM4i4ZLM41VdKbuwD2WKdcy 22Mdu9KKi6taQ5LGH80jAFcqB8hne5zWrGcmq3uAgGKiHZ27jlJNzsFzRI2RSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445260; a=rsa-sha256; cv=none; b=AbI/5OFDtdcV8RFQnIvHw1UUHJ/u5Da6CWStvLrJIH4U8Y7jiIrPIGoY4pir3wGQw0JIcI RYc8NXv8XhM6WeIYB/iLFqeWzEZQD+Lw2/n47o0EznVy42uatnhodNYsmUU09T/GrDiVjK 5qFpvvOIRr6XLe26llb5ZnI09eKqN2TaAzvbD7gMBBlKxcNfB7zZoKceIx9+RqRoWj2oCl sKf27fuU8/x9mQiedzYCXA0KeKc0Jz7S0AEe8LkOEaUp1EszCl5y90vuuwwd7q2uFG/5fy szGFAOmtxd4sg/+pF22e++PwFoROxu7FwDyD7fU85+4ukYR0Yb24Xoqrtz96mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wLX4FfCD/JBnqOlnKlQgsl7ChcQeEv75+b34om3o1Q8=; b=NYOyGCtQBmuhSqXMPNV7R/PnOV3XowJpRiLZgRi/3ttPRhULp9gCBtlpQYcEyWxzHzJjQ4 vZEpQQL3B/f9iRqS8hmu9s/kP44B8oeiFlYEfjxx1h2w9x73GJQm7E1ZGk6EUG6tua6Ku0 IruY+nv/lwm0VCiaKwb9lEw7Bcbfv6vJsogaCHwcr0lRB79md4+x4BvOsvDfBfuHDtuKqG 5Q+N5pZ3Mwj9KNtR9+w5jZSG1DvsfBGO8gJ73dAxsjsfyelaxMcdVrK732v0v21QtORnu/ qBHp1eqwZydSwQYBBiH7h1Eoprs3bGM2Pkc6WTyI3nl9+UDSkVXHMolbPPyR5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCQg5BRkzrGY; Thu, 20 Mar 2025 04:34:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4YJaJ037142; Thu, 20 Mar 2025 04:34:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4YJGA037139; Thu, 20 Mar 2025 04:34:19 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:34:19 GMT Message-Id: <202503200434.52K4YJGA037139@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 4c9ffb13dd74 - main - grep: avoid duplicated lines when we're coloring output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c9ffb13dd74159bd3ed7e1c4c706dbd15a70df2 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4c9ffb13dd74159bd3ed7e1c4c706dbd15a70df2 commit 4c9ffb13dd74159bd3ed7e1c4c706dbd15a70df2 Author: Kyle Evans AuthorDate: 2025-03-20 04:34:13 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:34:13 +0000 grep: avoid duplicated lines when we're coloring output For the default uncolored output, we'll just output a line once and then move on. For colored output, we'll output multiple matches per line with context from the line interspersed and may end up writing out some match context multiple times as we don't persist which part of the lines have already been printed. Fix it by tracking the length of line printed thus far in printline() and retaining it across successive calls to printline() in the same line. printline() should indicate whether it terminated the line or not to avoid tracking the logic for that in multiple places: -o lines are always terminated, so it's generally only some --color contexts where we wouldn't have terminated. Add a test to make sure that we're only printing one line going forward. Reported and tested by: Jamie Landeg-Jones Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D49324 --- usr.bin/grep/tests/grep_freebsd_test.sh | 15 +++++++ usr.bin/grep/util.c | 72 +++++++++++++++++++++++++++------ 2 files changed, 74 insertions(+), 13 deletions(-) diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh index 77017529843e..906b70645151 100755 --- a/usr.bin/grep/tests/grep_freebsd_test.sh +++ b/usr.bin/grep/tests/grep_freebsd_test.sh @@ -103,10 +103,25 @@ zflag_body() atf_check grep -qz "foo.*bar" in } +atf_test_case color_dupe +color_dupe_body() +{ + + # This assumes a MAX_MATCHES of exactly 32. Previously buggy procline() + # calls would terminate the line premature every MAX_MATCHES matches, + # meaning we'd see the line be output again for the next MAX_MATCHES + # number of matches. + jot -nb 'A' -s '' 33 > in + + atf_check -o save:color.out grep --color=always . in + atf_check -o match:"^ +1 color.out" wc -l color.out +} + atf_init_test_cases() { atf_add_test_case grep_r_implied atf_add_test_case rgrep atf_add_test_case gnuext atf_add_test_case zflag + atf_add_test_case color_dupe } diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 4e1c44b442f2..ed87e56956f6 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -72,7 +72,7 @@ static int litexec(const struct pat *pat, const char *string, size_t nmatch, regmatch_t pmatch[]); #endif static bool procline(struct parsec *pc); -static void printline(struct parsec *pc, int sep); +static bool printline(struct parsec *pc, int sep, size_t *last_out); static void printline_metadata(struct str *line, int sep); bool @@ -214,15 +214,29 @@ procmatch_match(struct mprintc *mc, struct parsec *pc) /* Print the matching line, but only if not quiet/binary */ if (mc->printmatch) { - printline(pc, ':'); + size_t last_out; + bool terminated; + + last_out = 0; + terminated = printline(pc, ':', &last_out); while (pc->matchidx >= MAX_MATCHES) { /* Reset matchidx and try again */ pc->matchidx = 0; if (procline(pc) == !vflag) - printline(pc, ':'); + terminated = printline(pc, ':', &last_out); else break; } + + /* + * The above loop processes the entire line as long as we keep + * hitting the maximum match count. At this point, we know + * that there's nothing left to be printed and can terminate the + * line. + */ + if (!terminated) + printline(pc, ':', &last_out); + first_match = false; mc->same_file = true; mc->last_outed = 0; @@ -748,26 +762,39 @@ printline_metadata(struct str *line, int sep) } /* - * Prints a matching line according to the command line options. + * Prints a matching line according to the command line options. We need + * *last_out to be populated on entry in case this is just a continuation of + * matches within the same line. + * + * Returns true if the line was terminated, false if it was not. */ -static void -printline(struct parsec *pc, int sep) +static bool +printline(struct parsec *pc, int sep, size_t *last_out) { - size_t a = 0; + size_t a = *last_out; size_t i, matchidx; regmatch_t match; + bool terminated; + + /* + * Nearly all paths below will terminate the line by default, but it is + * avoided in some circumstances in case we don't have the full context + * available here. + */ + terminated = true; /* If matchall, everything matches but don't actually print for -o */ if (oflag && matchall) - return; + return (terminated); matchidx = pc->matchidx; /* --color and -o */ - if ((oflag || color) && matchidx > 0) { + if ((oflag || color) && (pc->printed > 0 || matchidx > 0)) { /* Only print metadata once per line if --color */ - if (!oflag && pc->printed == 0) + if (!oflag && pc->printed == 0) { printline_metadata(&pc->ln, sep); + } for (i = 0; i < matchidx; i++) { match = pc->matches[i]; /* Don't output zero length matches */ @@ -780,9 +807,10 @@ printline(struct parsec *pc, int sep) if (oflag) { pc->ln.boff = match.rm_so; printline_metadata(&pc->ln, sep); - } else + } else { fwrite(pc->ln.dat + a, match.rm_so - a, 1, stdout); + } if (color) fprintf(stdout, "\33[%sm\33[K", color); fwrite(pc->ln.dat + match.rm_so, @@ -793,13 +821,31 @@ printline(struct parsec *pc, int sep) if (oflag) putchar('\n'); } - if (!oflag) { - if (pc->ln.len - a > 0) + + /* + * Don't terminate if we reached the match limit; we may have + * other matches on this line to process. + */ + *last_out = a; + if (!oflag && matchidx != MAX_MATCHES) { + if (pc->ln.len - a > 0) { fwrite(pc->ln.dat + a, pc->ln.len - a, 1, stdout); + *last_out = pc->ln.len; + } putchar('\n'); + } else if (!oflag) { + /* + * -o is terminated on every match output, so this + * branch is only designed to capture MAX_MATCHES in a + * line which may be a signal to us for a lack of + * context. The caller will know more and call us again + * to terminate if it needs to. + */ + terminated = false; } } else grep_printline(&pc->ln, sep); pc->printed++; + return (terminated); } From nobody Thu Mar 20 04:44:32 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCfT4tCvz5rGv0; Thu, 20 Mar 2025 04:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCfT2pQ1z4Dt4; Thu, 20 Mar 2025 04:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57gRk0JZ+Q9q0ICm4qIL+Rh7listEuRY0/F4F7FtEJc=; b=i0xDyHNRkctJ8YKOrhDcTdRbeAP0tmUOcdG7fd2RdpkOf3AQ0QlDax5vHN9/pF4kzpsSUS mRQQx7+HjK/KcH75QvSVKndCXjEfuuY9WPaX3v3hCiV2mNaC6VDOMIqpt9ydIrofXrSlL7 O1lJhEkBArU0Ycng3rwe/xN4puqmQBgDD837qGPCzyyvfN/ed5f1Xj55bLCXTHnMM/ijT2 cgn3Qw2buwuhJ6iViCcDREoQ8k8WaeGUySthHEz6YCy8oMYBQ96oOM6GWC0f/gmJiDFZWK W+K1gc+tH0NB9SRSg60pmRDv0sUHJlTCZYlj47+dSPmvWQ98RDyDnEZ3Qi+8bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445873; a=rsa-sha256; cv=none; b=eH5W2ibClJzCr++ZdHEb6ag6cXCGkjgxZnBHSgGNWV+vU2bAXRHStQRKDPbAlct63c3d5F GTuMBjeQPU0nrELUKyay3cOrRTE4guFWaybhu19s+Azs4NOwjJDiE5KLjHMVWj4rS4H+r/ 2Z3qLFnid89ZPIQ33S/oKMNMcUYkhtY5dlDhZ6ZMYMejombFCTA3gsol58S6UVxUAmbrOG PJH2CFRglr/xoysokNVJtehlEvkzOqMoYA0EeKQHsuZ6XNPgs48cP4jCpFyQwaGgFPrLMN aDhblSnmD1NE9slDGG0Q/qpTQaThO4Ng6McpRbtgqALEUE7/NmwCx3qJ8CuI1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=57gRk0JZ+Q9q0ICm4qIL+Rh7listEuRY0/F4F7FtEJc=; b=UtGHM6PMyLLZBcx+FzSGeE8vrfbnvA1RlaoN09inR+exEWPotaOijQjb97fXin7FgWte2B zJjV2cgj3FBAETRNgXOhVFg3j8GhZ7LB5tU0lxDoFJQ992hKaTMGJn781N/XenmhagRgFe Hhyu+obz/VR1kCUhtKBuicT5ak9OanU7rQK4OHxBVATUYVTUzM3BkNhydXjLL61NH3GKrt 2wYQvqTP2gIbAJVGH8ccXBki23nsx9PUV/mIrm1Y2w44uSrcqDqa+lbp3/ncFVhQJhs/Ul 762mQ94EsUm4ZPgA0oPy5f/l8qpq6HxR0Rem6WRiOPKqEouK0vouG0pJuK6NnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCfT0HtCzr3w; Thu, 20 Mar 2025 04:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4iWO1055464; Thu, 20 Mar 2025 04:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4iWFa055461; Thu, 20 Mar 2025 04:44:32 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:44:32 GMT Message-Id: <202503200444.52K4iWFa055461@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 85242b59d17d - main - libc: tests: fix luacheck warnings in the fortification test generator List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85242b59d17dcbfbc82afea9d4232006df074210 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=85242b59d17dcbfbc82afea9d4232006df074210 commit 85242b59d17dcbfbc82afea9d4232006df074210 Author: Kyle Evans AuthorDate: 2025-03-20 04:42:57 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:44:25 +0000 libc: tests: fix luacheck warnings in the fortification test generator All of these are simple shadowing that don't need to happen; we're passing the shadowed value through in every case anyways, just use it in the closure in a more lua-natural fashion. While we're here, lint the generator every time we generate tests to ensure that we don't regress without having to remember to manually run luacheck. Reported by: jlduran Reviewed by: jlduran, markj Differential Revision: https://reviews.freebsd.org/D49235 --- lib/libc/tests/secure/Makefile | 10 +++++++++- lib/libc/tests/secure/generate-fortify-tests.lua | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lib/libc/tests/secure/Makefile b/lib/libc/tests/secure/Makefile index ccf89afb1ad5..beaa01457cfe 100644 --- a/lib/libc/tests/secure/Makefile +++ b/lib/libc/tests/secure/Makefile @@ -18,10 +18,18 @@ FORTIFY_TCATS+= unistd FORTIFY_TCATS+= wchar # Manually run after updating the test generator. -generate-tests: .PHONY +lint-generator: .PHONY + @if ! which luacheck>/dev/null; then \ + 1>&2 echo "devel/lua-luacheck is required to regenerate and lint these tests"; \ + exit 1; \ + fi + luacheck ${.CURDIR}/generate-fortify-tests.lua + +generate-tests: .PHONY lint-generator .for tcat in ${FORTIFY_TCATS} ATF_TESTS_C+= fortify_${tcat}_test +.ORDER: lint-generator generate-tests-${tcat} generate-tests: generate-tests-${tcat} generate-tests-${tcat}: .PHONY ${.CURDIR}/generate-fortify-tests.lua ${tcat} > ${.CURDIR}/fortify_${tcat}_test.c diff --git a/lib/libc/tests/secure/generate-fortify-tests.lua b/lib/libc/tests/secure/generate-fortify-tests.lua index 0e46b8867862..ef9e0299dd48 100755 --- a/lib/libc/tests/secure/generate-fortify-tests.lua +++ b/lib/libc/tests/secure/generate-fortify-tests.lua @@ -1113,7 +1113,7 @@ local function configurable(def, idx) end local function generate_stackframe(buftype, bufsize, disposition, heap, def) - local function len_offset(inverted, disposition) + local function len_offset(inverted) -- Tests that don't use __len in their arguments may use an -- inverted sense because we can't just specify a length that -- would induce an access just after the end. Instead, we have @@ -1128,7 +1128,7 @@ local function generate_stackframe(buftype, bufsize, disposition, heap, def) end end - local function test_uses_len(def) + local function test_uses_len() if def.uses_len then return true end @@ -1151,8 +1151,8 @@ local function generate_stackframe(buftype, bufsize, disposition, heap, def) local vars = "\tstruct {\n" vars = vars .. "\t\tuint8_t padding_l;\n" - local uses_len = test_uses_len(def) - local bufsize_offset = len_offset(not uses_len, disposition) + local uses_len = test_uses_len() + local bufsize_offset = len_offset(not uses_len) local buftype_elem = array_type(buftype) local size_expr = bufsize @@ -1230,7 +1230,7 @@ local function write_test(fh, func, disposition, heap, def) return end - local function need_addr(buftype) + local function need_addr() return not (buftype:match("%[%]") or buftype:match("%*")) end @@ -1292,7 +1292,7 @@ local function write_test(fh, func, disposition, heap, def) end if arg == "__buf" then - if not heap and need_addr(buftype) then + if not heap and need_addr() then body = body .. "&" end From nobody Thu Mar 20 04:44:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCfV5K7Sz5rGv3; Thu, 20 Mar 2025 04:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCfV2tRVz4Dyh; Thu, 20 Mar 2025 04:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FY9HXw6v9Z2THM3sqBX7TLw8w8jvlRhT001yCrZvU0s=; b=oBlhrsO6YGcGIs6UTspzNIXNsZPMY3Dub12zZEtgrgNeCYIM2N7QWFrskJ0CkticsimY9X 2t4oQ7SLRD5t0yuGCqHKOr0GRRGM73niqVEC+EL82NrXxzZYXf2jx3jYXdF8c6rAcgfQhC 5QuJiAchwsEUFWmmWcTLyVoF0ubzhC1MldcTIYYt9luHo4qSW2eBGxN1p+YLHJiTPOrNTX JxymidZY5EiM2TsY2Q4pHB94lJQ5w4+hcoCcgL9qO6SJyV9uUQd4yExfGS1Z3JPU2Ri+Jv 4VEkLnIIoYVRPF7LuEB8AvhZ0YIR5QZbDC71yVrqFr4LsZk4RklyUXptefcSbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445874; a=rsa-sha256; cv=none; b=JhkKPzf3dK4ZwZJNMgl5sjXfmRYHe63fzwgV0YicrCs2G0fyHFK/+ww+le5OEbQfszCHNk BYaMWatRYLeYZmTM+d0tkGmGikW+n1QHwpC17LIpcrlUseiLjy3FbojJt2P+otKW3JV5rG nKABR2lHg+nVDowEo/uEyBosoXB0K0rAA82RoZDOvHkm6Q/Ll4qk7lMXnnpjdZTQRl9MFY VEtnyoNjjT/8BvxBRKMl/G8+o6aqEpcvgNFys7ZRAYyM+HkmZ3gyUy9O6vUqX1rFi9T1z5 c/LlSilYgQoC+5D3kEDe1Phx8dfM3O+oe8zS5WnlCO2UHnI3H4fixfsb4wwCRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445874; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FY9HXw6v9Z2THM3sqBX7TLw8w8jvlRhT001yCrZvU0s=; b=ZL8h1DSjKvx8nqKrhgdpWynnZUcY4fu2GgbQnG4ZkRk5Y43gcVLdx9FCi97Vo571mmIbX0 kyP3gC36HaAaDdt+ZjxCEVu8Kc3CvQEmAzDcMtRO+NLCKX6wz024uNLTpv05hCLUyuuTS0 BB6uQQ+2PPoEQ9vZsjxrwQbioHAEp8pmvlEG+68MUGR8KfFsabBqel8I6UUTLbnfD0bpMY yaGknWA/a5p1UbhG3Xl9TmQ0JT4I4KCF9qRbm/QtnC2CRZUyLAF3SHjbCUuNsEyxXN4nL5 KpfM5aLJjJirpCZB+uxKO1yQ9M+kxDC8Lrp1H437tBs5YemDCF98hRfqMjoNIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCfV15K9zrSY; Thu, 20 Mar 2025 04:44:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4iYxg055505; Thu, 20 Mar 2025 04:44:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4iYUW055502; Thu, 20 Mar 2025 04:44:34 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:44:34 GMT Message-Id: <202503200444.52K4iYUW055502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 09cdbf042f82 - main - libc: tests: allow fortified test cases to require root List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09cdbf042f825fc41762b5d5365ad930fec18b99 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=09cdbf042f825fc41762b5d5365ad930fec18b99 commit 09cdbf042f825fc41762b5d5365ad930fec18b99 Author: Kyle Evans AuthorDate: 2025-03-20 04:43:14 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:44:25 +0000 libc: tests: allow fortified test cases to require root An upcoming test will require root to create a jail with its own domainname/hostname to avoid external requirements on the test runner as we want to fetch them with valid and plausible sizes. Generate test headers for all cases to reduce churn in future diffs as metadata is added to individual tests, or in case other test options are added to correspond to different metadata to set. Reviewed by: jlduran, markj Differential Revision: https://reviews.freebsd.org/D49236 --- lib/libc/tests/secure/fortify_poll_test.c | 60 ++++- lib/libc/tests/secure/fortify_random_test.c | 25 +- lib/libc/tests/secure/fortify_select_test.c | 90 +++++-- lib/libc/tests/secure/fortify_socket_test.c | 255 ++++++++++++++---- lib/libc/tests/secure/fortify_stdio_test.c | 225 ++++++++++++---- lib/libc/tests/secure/fortify_stdlib_test.c | 50 +++- lib/libc/tests/secure/fortify_string_test.c | 325 ++++++++++++++++++----- lib/libc/tests/secure/fortify_strings_test.c | 75 ++++-- lib/libc/tests/secure/fortify_uio_test.c | 110 ++++++-- lib/libc/tests/secure/fortify_unistd_test.c | 325 ++++++++++++++++++----- lib/libc/tests/secure/fortify_wchar_test.c | 300 ++++++++++++++++----- lib/libc/tests/secure/generate-fortify-tests.lua | 13 +- 12 files changed, 1482 insertions(+), 371 deletions(-) diff --git a/lib/libc/tests/secure/fortify_poll_test.c b/lib/libc/tests/secure/fortify_poll_test.c index dce0b0bb65ea..9a5610cc3f0d 100644 --- a/lib/libc/tests/secure/fortify_poll_test.c +++ b/lib/libc/tests/secure/fortify_poll_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(poll_before_end); +ATF_TC(poll_before_end); +ATF_TC_HEAD(poll_before_end, tc) +{ +} ATF_TC_BODY(poll_before_end, tc) { #define BUF &__stack.__buf @@ -184,7 +187,10 @@ ATF_TC_BODY(poll_before_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_end); +ATF_TC(poll_end); +ATF_TC_HEAD(poll_end, tc) +{ +} ATF_TC_BODY(poll_end, tc) { #define BUF &__stack.__buf @@ -206,7 +212,10 @@ ATF_TC_BODY(poll_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_after_end); +ATF_TC(poll_after_end); +ATF_TC_HEAD(poll_after_end, tc) +{ +} ATF_TC_BODY(poll_after_end, tc) { #define BUF &__stack.__buf @@ -259,7 +268,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(poll_heap_before_end); +ATF_TC(poll_heap_before_end); +ATF_TC_HEAD(poll_heap_before_end, tc) +{ +} ATF_TC_BODY(poll_heap_before_end, tc) { #define BUF __stack.__buf @@ -282,7 +294,10 @@ ATF_TC_BODY(poll_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_heap_end); +ATF_TC(poll_heap_end); +ATF_TC_HEAD(poll_heap_end, tc) +{ +} ATF_TC_BODY(poll_heap_end, tc) { #define BUF __stack.__buf @@ -305,7 +320,10 @@ ATF_TC_BODY(poll_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(poll_heap_after_end); +ATF_TC(poll_heap_after_end); +ATF_TC_HEAD(poll_heap_after_end, tc) +{ +} ATF_TC_BODY(poll_heap_after_end, tc) { #define BUF __stack.__buf @@ -359,7 +377,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(ppoll_before_end); +ATF_TC(ppoll_before_end); +ATF_TC_HEAD(ppoll_before_end, tc) +{ +} ATF_TC_BODY(ppoll_before_end, tc) { #define BUF &__stack.__buf @@ -382,7 +403,10 @@ ATF_TC_BODY(ppoll_before_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_end); +ATF_TC(ppoll_end); +ATF_TC_HEAD(ppoll_end, tc) +{ +} ATF_TC_BODY(ppoll_end, tc) { #define BUF &__stack.__buf @@ -405,7 +429,10 @@ ATF_TC_BODY(ppoll_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_after_end); +ATF_TC(ppoll_after_end); +ATF_TC_HEAD(ppoll_after_end, tc) +{ +} ATF_TC_BODY(ppoll_after_end, tc) { #define BUF &__stack.__buf @@ -459,7 +486,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(ppoll_heap_before_end); +ATF_TC(ppoll_heap_before_end); +ATF_TC_HEAD(ppoll_heap_before_end, tc) +{ +} ATF_TC_BODY(ppoll_heap_before_end, tc) { #define BUF __stack.__buf @@ -483,7 +513,10 @@ ATF_TC_BODY(ppoll_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_heap_end); +ATF_TC(ppoll_heap_end); +ATF_TC_HEAD(ppoll_heap_end, tc) +{ +} ATF_TC_BODY(ppoll_heap_end, tc) { #define BUF __stack.__buf @@ -507,7 +540,10 @@ ATF_TC_BODY(ppoll_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(ppoll_heap_after_end); +ATF_TC(ppoll_heap_after_end); +ATF_TC_HEAD(ppoll_heap_after_end, tc) +{ +} ATF_TC_BODY(ppoll_heap_after_end, tc) { #define BUF __stack.__buf diff --git a/lib/libc/tests/secure/fortify_random_test.c b/lib/libc/tests/secure/fortify_random_test.c index 7763607dd2ed..41100fe5a5e2 100644 --- a/lib/libc/tests/secure/fortify_random_test.c +++ b/lib/libc/tests/secure/fortify_random_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(getrandom_before_end); +ATF_TC(getrandom_before_end); +ATF_TC_HEAD(getrandom_before_end, tc) +{ +} ATF_TC_BODY(getrandom_before_end, tc) { #define BUF &__stack.__buf @@ -180,7 +183,10 @@ ATF_TC_BODY(getrandom_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_end); +ATF_TC(getrandom_end); +ATF_TC_HEAD(getrandom_end, tc) +{ +} ATF_TC_BODY(getrandom_end, tc) { #define BUF &__stack.__buf @@ -198,7 +204,10 @@ ATF_TC_BODY(getrandom_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_heap_before_end); +ATF_TC(getrandom_heap_before_end); +ATF_TC_HEAD(getrandom_heap_before_end, tc) +{ +} ATF_TC_BODY(getrandom_heap_before_end, tc) { #define BUF __stack.__buf @@ -218,7 +227,10 @@ ATF_TC_BODY(getrandom_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_heap_end); +ATF_TC(getrandom_heap_end); +ATF_TC_HEAD(getrandom_heap_end, tc) +{ +} ATF_TC_BODY(getrandom_heap_end, tc) { #define BUF __stack.__buf @@ -238,7 +250,10 @@ ATF_TC_BODY(getrandom_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(getrandom_heap_after_end); +ATF_TC(getrandom_heap_after_end); +ATF_TC_HEAD(getrandom_heap_after_end, tc) +{ +} ATF_TC_BODY(getrandom_heap_after_end, tc) { #define BUF __stack.__buf diff --git a/lib/libc/tests/secure/fortify_select_test.c b/lib/libc/tests/secure/fortify_select_test.c index dfafac7e4d6d..aff13ccf58d2 100644 --- a/lib/libc/tests/secure/fortify_select_test.c +++ b/lib/libc/tests/secure/fortify_select_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(FD_SET_before_end); +ATF_TC(FD_SET_before_end); +ATF_TC_HEAD(FD_SET_before_end, tc) +{ +} ATF_TC_BODY(FD_SET_before_end, tc) { #define BUF &__stack.__buf @@ -180,7 +183,10 @@ ATF_TC_BODY(FD_SET_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_end); +ATF_TC(FD_SET_end); +ATF_TC_HEAD(FD_SET_end, tc) +{ +} ATF_TC_BODY(FD_SET_end, tc) { #define BUF &__stack.__buf @@ -198,7 +204,10 @@ ATF_TC_BODY(FD_SET_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_after_end); +ATF_TC(FD_SET_after_end); +ATF_TC_HEAD(FD_SET_after_end, tc) +{ +} ATF_TC_BODY(FD_SET_after_end, tc) { #define BUF &__stack.__buf @@ -247,7 +256,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_SET_heap_before_end); +ATF_TC(FD_SET_heap_before_end); +ATF_TC_HEAD(FD_SET_heap_before_end, tc) +{ +} ATF_TC_BODY(FD_SET_heap_before_end, tc) { #define BUF __stack.__buf @@ -267,7 +279,10 @@ ATF_TC_BODY(FD_SET_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_heap_end); +ATF_TC(FD_SET_heap_end); +ATF_TC_HEAD(FD_SET_heap_end, tc) +{ +} ATF_TC_BODY(FD_SET_heap_end, tc) { #define BUF __stack.__buf @@ -287,7 +302,10 @@ ATF_TC_BODY(FD_SET_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_SET_heap_after_end); +ATF_TC(FD_SET_heap_after_end); +ATF_TC_HEAD(FD_SET_heap_after_end, tc) +{ +} ATF_TC_BODY(FD_SET_heap_after_end, tc) { #define BUF __stack.__buf @@ -338,7 +356,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_CLR_before_end); +ATF_TC(FD_CLR_before_end); +ATF_TC_HEAD(FD_CLR_before_end, tc) +{ +} ATF_TC_BODY(FD_CLR_before_end, tc) { #define BUF &__stack.__buf @@ -356,7 +377,10 @@ ATF_TC_BODY(FD_CLR_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_end); +ATF_TC(FD_CLR_end); +ATF_TC_HEAD(FD_CLR_end, tc) +{ +} ATF_TC_BODY(FD_CLR_end, tc) { #define BUF &__stack.__buf @@ -374,7 +398,10 @@ ATF_TC_BODY(FD_CLR_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_after_end); +ATF_TC(FD_CLR_after_end); +ATF_TC_HEAD(FD_CLR_after_end, tc) +{ +} ATF_TC_BODY(FD_CLR_after_end, tc) { #define BUF &__stack.__buf @@ -423,7 +450,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_CLR_heap_before_end); +ATF_TC(FD_CLR_heap_before_end); +ATF_TC_HEAD(FD_CLR_heap_before_end, tc) +{ +} ATF_TC_BODY(FD_CLR_heap_before_end, tc) { #define BUF __stack.__buf @@ -443,7 +473,10 @@ ATF_TC_BODY(FD_CLR_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_heap_end); +ATF_TC(FD_CLR_heap_end); +ATF_TC_HEAD(FD_CLR_heap_end, tc) +{ +} ATF_TC_BODY(FD_CLR_heap_end, tc) { #define BUF __stack.__buf @@ -463,7 +496,10 @@ ATF_TC_BODY(FD_CLR_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_CLR_heap_after_end); +ATF_TC(FD_CLR_heap_after_end); +ATF_TC_HEAD(FD_CLR_heap_after_end, tc) +{ +} ATF_TC_BODY(FD_CLR_heap_after_end, tc) { #define BUF __stack.__buf @@ -514,7 +550,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_ISSET_before_end); +ATF_TC(FD_ISSET_before_end); +ATF_TC_HEAD(FD_ISSET_before_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_before_end, tc) { #define BUF &__stack.__buf @@ -532,7 +571,10 @@ ATF_TC_BODY(FD_ISSET_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_end); +ATF_TC(FD_ISSET_end); +ATF_TC_HEAD(FD_ISSET_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_end, tc) { #define BUF &__stack.__buf @@ -550,7 +592,10 @@ ATF_TC_BODY(FD_ISSET_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_after_end); +ATF_TC(FD_ISSET_after_end); +ATF_TC_HEAD(FD_ISSET_after_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_after_end, tc) { #define BUF &__stack.__buf @@ -599,7 +644,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_before_end); +ATF_TC(FD_ISSET_heap_before_end); +ATF_TC_HEAD(FD_ISSET_heap_before_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_heap_before_end, tc) { #define BUF __stack.__buf @@ -619,7 +667,10 @@ ATF_TC_BODY(FD_ISSET_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_end); +ATF_TC(FD_ISSET_heap_end); +ATF_TC_HEAD(FD_ISSET_heap_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_heap_end, tc) { #define BUF __stack.__buf @@ -639,7 +690,10 @@ ATF_TC_BODY(FD_ISSET_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_after_end); +ATF_TC(FD_ISSET_heap_after_end); +ATF_TC_HEAD(FD_ISSET_heap_after_end, tc) +{ +} ATF_TC_BODY(FD_ISSET_heap_after_end, tc) { #define BUF __stack.__buf diff --git a/lib/libc/tests/secure/fortify_socket_test.c b/lib/libc/tests/secure/fortify_socket_test.c index a2125d60fc2d..1f0b0f144f40 100644 --- a/lib/libc/tests/secure/fortify_socket_test.c +++ b/lib/libc/tests/secure/fortify_socket_test.c @@ -162,7 +162,10 @@ replace_stdin(void) close(fd); } -ATF_TC_WITHOUT_HEAD(getpeername_before_end); +ATF_TC(getpeername_before_end); +ATF_TC_HEAD(getpeername_before_end, tc) +{ +} ATF_TC_BODY(getpeername_before_end, tc) { #define BUF &__stack.__buf @@ -184,7 +187,10 @@ ATF_TC_BODY(getpeername_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_end); +ATF_TC(getpeername_end); +ATF_TC_HEAD(getpeername_end, tc) +{ +} ATF_TC_BODY(getpeername_end, tc) { #define BUF &__stack.__buf @@ -206,7 +212,10 @@ ATF_TC_BODY(getpeername_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_heap_before_end); +ATF_TC(getpeername_heap_before_end); +ATF_TC_HEAD(getpeername_heap_before_end, tc) +{ +} ATF_TC_BODY(getpeername_heap_before_end, tc) { #define BUF __stack.__buf @@ -229,7 +238,10 @@ ATF_TC_BODY(getpeername_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_heap_end); +ATF_TC(getpeername_heap_end); +ATF_TC_HEAD(getpeername_heap_end, tc) +{ +} ATF_TC_BODY(getpeername_heap_end, tc) { #define BUF __stack.__buf @@ -252,7 +264,10 @@ ATF_TC_BODY(getpeername_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(getpeername_heap_after_end); +ATF_TC(getpeername_heap_after_end); +ATF_TC_HEAD(getpeername_heap_after_end, tc) +{ +} ATF_TC_BODY(getpeername_heap_after_end, tc) { #define BUF __stack.__buf @@ -306,7 +321,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(getsockname_before_end); +ATF_TC(getsockname_before_end); +ATF_TC_HEAD(getsockname_before_end, tc) +{ +} ATF_TC_BODY(getsockname_before_end, tc) { #define BUF &__stack.__buf @@ -328,7 +346,10 @@ ATF_TC_BODY(getsockname_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_end); +ATF_TC(getsockname_end); +ATF_TC_HEAD(getsockname_end, tc) +{ +} ATF_TC_BODY(getsockname_end, tc) { #define BUF &__stack.__buf @@ -350,7 +371,10 @@ ATF_TC_BODY(getsockname_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_heap_before_end); +ATF_TC(getsockname_heap_before_end); +ATF_TC_HEAD(getsockname_heap_before_end, tc) +{ +} ATF_TC_BODY(getsockname_heap_before_end, tc) { #define BUF __stack.__buf @@ -373,7 +397,10 @@ ATF_TC_BODY(getsockname_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_heap_end); +ATF_TC(getsockname_heap_end); +ATF_TC_HEAD(getsockname_heap_end, tc) +{ +} ATF_TC_BODY(getsockname_heap_end, tc) { #define BUF __stack.__buf @@ -396,7 +423,10 @@ ATF_TC_BODY(getsockname_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(getsockname_heap_after_end); +ATF_TC(getsockname_heap_after_end); +ATF_TC_HEAD(getsockname_heap_after_end, tc) +{ +} ATF_TC_BODY(getsockname_heap_after_end, tc) { #define BUF __stack.__buf @@ -450,7 +480,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recv_before_end); +ATF_TC(recv_before_end); +ATF_TC_HEAD(recv_before_end, tc) +{ +} ATF_TC_BODY(recv_before_end, tc) { #define BUF &__stack.__buf @@ -471,7 +504,10 @@ ATF_TC_BODY(recv_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_end); +ATF_TC(recv_end); +ATF_TC_HEAD(recv_end, tc) +{ +} ATF_TC_BODY(recv_end, tc) { #define BUF &__stack.__buf @@ -492,7 +528,10 @@ ATF_TC_BODY(recv_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_heap_before_end); +ATF_TC(recv_heap_before_end); +ATF_TC_HEAD(recv_heap_before_end, tc) +{ +} ATF_TC_BODY(recv_heap_before_end, tc) { #define BUF __stack.__buf @@ -514,7 +553,10 @@ ATF_TC_BODY(recv_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_heap_end); +ATF_TC(recv_heap_end); +ATF_TC_HEAD(recv_heap_end, tc) +{ +} ATF_TC_BODY(recv_heap_end, tc) { #define BUF __stack.__buf @@ -536,7 +578,10 @@ ATF_TC_BODY(recv_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recv_heap_after_end); +ATF_TC(recv_heap_after_end); +ATF_TC_HEAD(recv_heap_after_end, tc) +{ +} ATF_TC_BODY(recv_heap_after_end, tc) { #define BUF __stack.__buf @@ -589,7 +634,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvfrom_before_end); +ATF_TC(recvfrom_before_end); +ATF_TC_HEAD(recvfrom_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_before_end, tc) { #define BUF &__stack.__buf @@ -610,7 +658,10 @@ ATF_TC_BODY(recvfrom_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_end); +ATF_TC(recvfrom_end); +ATF_TC_HEAD(recvfrom_end, tc) +{ +} ATF_TC_BODY(recvfrom_end, tc) { #define BUF &__stack.__buf @@ -631,7 +682,10 @@ ATF_TC_BODY(recvfrom_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_heap_before_end); +ATF_TC(recvfrom_heap_before_end); +ATF_TC_HEAD(recvfrom_heap_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_heap_before_end, tc) { #define BUF __stack.__buf @@ -653,7 +707,10 @@ ATF_TC_BODY(recvfrom_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_heap_end); +ATF_TC(recvfrom_heap_end); +ATF_TC_HEAD(recvfrom_heap_end, tc) +{ +} ATF_TC_BODY(recvfrom_heap_end, tc) { #define BUF __stack.__buf @@ -675,7 +732,10 @@ ATF_TC_BODY(recvfrom_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_heap_after_end); +ATF_TC(recvfrom_heap_after_end); +ATF_TC_HEAD(recvfrom_heap_after_end, tc) +{ +} ATF_TC_BODY(recvfrom_heap_after_end, tc) { #define BUF __stack.__buf @@ -728,7 +788,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_before_end); +ATF_TC(recvfrom_sockaddr_before_end); +ATF_TC_HEAD(recvfrom_sockaddr_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_before_end, tc) { #define BUF &__stack.__buf @@ -752,7 +815,10 @@ ATF_TC_BODY(recvfrom_sockaddr_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_end); +ATF_TC(recvfrom_sockaddr_end); +ATF_TC_HEAD(recvfrom_sockaddr_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_end, tc) { #define BUF &__stack.__buf @@ -776,7 +842,10 @@ ATF_TC_BODY(recvfrom_sockaddr_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_before_end); +ATF_TC(recvfrom_sockaddr_heap_before_end); +ATF_TC_HEAD(recvfrom_sockaddr_heap_before_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_heap_before_end, tc) { #define BUF __stack.__buf @@ -801,7 +870,10 @@ ATF_TC_BODY(recvfrom_sockaddr_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_end); +ATF_TC(recvfrom_sockaddr_heap_end); +ATF_TC_HEAD(recvfrom_sockaddr_heap_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_heap_end, tc) { #define BUF __stack.__buf @@ -826,7 +898,10 @@ ATF_TC_BODY(recvfrom_sockaddr_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_after_end); +ATF_TC(recvfrom_sockaddr_heap_after_end); +ATF_TC_HEAD(recvfrom_sockaddr_heap_after_end, tc) +{ +} ATF_TC_BODY(recvfrom_sockaddr_heap_after_end, tc) { #define BUF __stack.__buf @@ -882,7 +957,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_before_end); +ATF_TC(recvmsg_msg_name_before_end); +ATF_TC_HEAD(recvmsg_msg_name_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_before_end, tc) { #define BUF &__stack.__buf @@ -906,7 +984,10 @@ ATF_TC_BODY(recvmsg_msg_name_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_end); +ATF_TC(recvmsg_msg_name_end); +ATF_TC_HEAD(recvmsg_msg_name_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_end, tc) { #define BUF &__stack.__buf @@ -930,7 +1011,10 @@ ATF_TC_BODY(recvmsg_msg_name_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_before_end); +ATF_TC(recvmsg_msg_name_heap_before_end); +ATF_TC_HEAD(recvmsg_msg_name_heap_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_heap_before_end, tc) { #define BUF __stack.__buf @@ -955,7 +1039,10 @@ ATF_TC_BODY(recvmsg_msg_name_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_end); +ATF_TC(recvmsg_msg_name_heap_end); +ATF_TC_HEAD(recvmsg_msg_name_heap_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_heap_end, tc) { #define BUF __stack.__buf @@ -980,7 +1067,10 @@ ATF_TC_BODY(recvmsg_msg_name_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_after_end); +ATF_TC(recvmsg_msg_name_heap_after_end); +ATF_TC_HEAD(recvmsg_msg_name_heap_after_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_name_heap_after_end, tc) { #define BUF __stack.__buf @@ -1036,7 +1126,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_before_end); +ATF_TC(recvmsg_msg_iov_before_end); +ATF_TC_HEAD(recvmsg_msg_iov_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_before_end, tc) { #define BUF &__stack.__buf @@ -1070,7 +1163,10 @@ ATF_TC_BODY(recvmsg_msg_iov_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_end); +ATF_TC(recvmsg_msg_iov_end); +ATF_TC_HEAD(recvmsg_msg_iov_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_end, tc) { #define BUF &__stack.__buf @@ -1104,7 +1200,10 @@ ATF_TC_BODY(recvmsg_msg_iov_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_before_end); +ATF_TC(recvmsg_msg_iov_heap_before_end); +ATF_TC_HEAD(recvmsg_msg_iov_heap_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_heap_before_end, tc) { #define BUF __stack.__buf @@ -1139,7 +1238,10 @@ ATF_TC_BODY(recvmsg_msg_iov_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_end); +ATF_TC(recvmsg_msg_iov_heap_end); +ATF_TC_HEAD(recvmsg_msg_iov_heap_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_heap_end, tc) { #define BUF __stack.__buf @@ -1174,7 +1276,10 @@ ATF_TC_BODY(recvmsg_msg_iov_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_after_end); +ATF_TC(recvmsg_msg_iov_heap_after_end); +ATF_TC_HEAD(recvmsg_msg_iov_heap_after_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_iov_heap_after_end, tc) { #define BUF __stack.__buf @@ -1240,7 +1345,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_before_end); +ATF_TC(recvmsg_msg_control_before_end); +ATF_TC_HEAD(recvmsg_msg_control_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_before_end, tc) { #define BUF &__stack.__buf @@ -1265,7 +1373,10 @@ ATF_TC_BODY(recvmsg_msg_control_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_end); +ATF_TC(recvmsg_msg_control_end); +ATF_TC_HEAD(recvmsg_msg_control_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_end, tc) { #define BUF &__stack.__buf @@ -1290,7 +1401,10 @@ ATF_TC_BODY(recvmsg_msg_control_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_before_end); +ATF_TC(recvmsg_msg_control_heap_before_end); +ATF_TC_HEAD(recvmsg_msg_control_heap_before_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_heap_before_end, tc) { #define BUF __stack.__buf @@ -1316,7 +1430,10 @@ ATF_TC_BODY(recvmsg_msg_control_heap_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_end); +ATF_TC(recvmsg_msg_control_heap_end); +ATF_TC_HEAD(recvmsg_msg_control_heap_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_heap_end, tc) { #define BUF __stack.__buf @@ -1342,7 +1459,10 @@ ATF_TC_BODY(recvmsg_msg_control_heap_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_after_end); +ATF_TC(recvmsg_msg_control_heap_after_end); +ATF_TC_HEAD(recvmsg_msg_control_heap_after_end, tc) +{ +} ATF_TC_BODY(recvmsg_msg_control_heap_after_end, tc) { #define BUF __stack.__buf @@ -1399,7 +1519,10 @@ monitor: } -ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_before_end); +ATF_TC(recvmmsg_msgvec_before_end); +ATF_TC_HEAD(recvmmsg_msgvec_before_end, tc) +{ +} ATF_TC_BODY(recvmmsg_msgvec_before_end, tc) { #define BUF &__stack.__buf @@ -1418,7 +1541,10 @@ ATF_TC_BODY(recvmmsg_msgvec_before_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_end); +ATF_TC(recvmmsg_msgvec_end); +ATF_TC_HEAD(recvmmsg_msgvec_end, tc) +{ +} ATF_TC_BODY(recvmmsg_msgvec_end, tc) { #define BUF &__stack.__buf @@ -1437,7 +1563,10 @@ ATF_TC_BODY(recvmmsg_msgvec_end, tc) } -ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_after_end); +ATF_TC(recvmmsg_msgvec_after_end); +ATF_TC_HEAD(recvmmsg_msgvec_after_end, tc) +{ +} *** 3542 LINES SKIPPED *** From nobody Thu Mar 20 04:44:35 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJCfX4G87z5rHD4; Thu, 20 Mar 2025 04:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJCfW3bDQz4Dhq; Thu, 20 Mar 2025 04:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a1tg867hpKZ+0uer384HxbkDTfhAM8mmLbohPrlzzGY=; b=hJpeO7J/sz8XmXd02lF02Ym8595bsaVNJzL27xk0numNHTEn37D2wC+etVxbSDxoPeakVG hYlOquK0CbMgoyur9mux3s0Lm8yuprZeI+buucuYBPoIib5eUsTJdjYGQi8I/n4MLWK6zJ tuma2WVh3nXkeku7JHQehzbMgZtN1c1eEk0fPYOE7aq9kQIpZzeFYmBUQho2RdukXfaSQ/ 8LbEn4skQule9HYgWdM+I/6eNxzutKAsDbMava0hIrj0CjRjIitq12as+UEJmFdfpz0pDA +tORXGlULd0pU0N7XWS6kkM6xPWgsdvCxR/NTlBEPQZ/mNqaAgzv1CwQYO/E8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742445875; a=rsa-sha256; cv=none; b=jl8wJatwWzHHHxNshwOyuvmesGO+cdY681EvymD8JTsVJSHViadJiFNvO+TN0ydrVjE1Rc Bjttf/pgsHFGq9x3pSxxmDHq9V257Hp+rzSjaHfH4TtM/oxRPebSQaPlvNLeLajuRmVOsQ jLQpu0NvYQQyhW12Bpl4p9hE/oOeTcIe65M/xzljhxxfkxFgv7vbNu9qQPragj7atNTgUc nT8YeYAvQO5aF0ULXeTmDn7IBUmRO9t8bVEbJx9F2W3tM7dD/NpjEolsBIzuAoLDBpxwlE MB0r5UMs5P/fNb7bjomEgcJhi/YQ2i5lDMzHPWhPnO82X6Sy3L1zlN5qhNTUDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742445875; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a1tg867hpKZ+0uer384HxbkDTfhAM8mmLbohPrlzzGY=; b=Kms4ZY7uuakWEu9tdZp1Hx876qxhU1L9zagNNCjAcRPw9yNDzOKdZC0THFMftmSChUaZ12 E0Voxkw9FY015pjUSingnK1YTF5CAX+FrEyR83ZUDvozQ0qEMTTynUyhVprBkaUX4V41ne +/kU+J3vZCR6zaTaOCtK7j8UU/pLVOdj3k+u0hbRe3dNP97pspLK9rc5HH65gUhyI8qyPI d4gCJjsWQ5vXJ85G1UwpPyV+KWbMwQTPuFL4oWnJchNo2ooz0FabALYFQlR9xNTlvTILYs c9WNpK8zavqENfzqTp4XkMfXSiXSapk4aZ9xPFF5yAgyvUTP5RRdvcF+zCw2cg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJCfW2lSwzrSZ; Thu, 20 Mar 2025 04:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K4iZOB055539; Thu, 20 Mar 2025 04:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K4iZuR055536; Thu, 20 Mar 2025 04:44:35 GMT (envelope-from git) Date: Thu, 20 Mar 2025 04:44:35 GMT Message-Id: <202503200444.52K4iZuR055536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 22178cb29f03 - main - libc: tests: fix the gethostname() and getdomainname() tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22178cb29f03a3b7bf919f3605e0cd5d6b18fa0a Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=22178cb29f03a3b7bf919f3605e0cd5d6b18fa0a commit 22178cb29f03a3b7bf919f3605e0cd5d6b18fa0a Author: Kyle Evans AuthorDate: 2025-03-20 04:43:23 +0000 Commit: Kyle Evans CommitDate: 2025-03-20 04:44:26 +0000 libc: tests: fix the gethostname() and getdomainname() tests Instead of relying on any particular domainname and hostname to succeed, spin up a jail before we execute the test with them set to some known, fixed values. This allows them to be meaningfully tested -- previously, they were skipped much more often than not. Reported by: jlduran Reviewed by: jlduran, markj Differential Revision: https://reviews.freebsd.org/D49237 --- lib/libc/tests/secure/fortify_poll_test.c | 1 + lib/libc/tests/secure/fortify_random_test.c | 1 + lib/libc/tests/secure/fortify_select_test.c | 1 + lib/libc/tests/secure/fortify_socket_test.c | 1 + lib/libc/tests/secure/fortify_stdio_test.c | 1 + lib/libc/tests/secure/fortify_stdlib_test.c | 1 + lib/libc/tests/secure/fortify_string_test.c | 1 + lib/libc/tests/secure/fortify_strings_test.c | 1 + lib/libc/tests/secure/fortify_uio_test.c | 1 + lib/libc/tests/secure/fortify_unistd_test.c | 137 ++++++++++------------- lib/libc/tests/secure/fortify_wchar_test.c | 1 + lib/libc/tests/secure/generate-fortify-tests.lua | 54 ++++++--- 12 files changed, 109 insertions(+), 92 deletions(-) diff --git a/lib/libc/tests/secure/fortify_poll_test.c b/lib/libc/tests/secure/fortify_poll_test.c index 9a5610cc3f0d..3810c16c122f 100644 --- a/lib/libc/tests/secure/fortify_poll_test.c +++ b/lib/libc/tests/secure/fortify_poll_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_random_test.c b/lib/libc/tests/secure/fortify_random_test.c index 41100fe5a5e2..2f47c981b5ae 100644 --- a/lib/libc/tests/secure/fortify_random_test.c +++ b/lib/libc/tests/secure/fortify_random_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_select_test.c b/lib/libc/tests/secure/fortify_select_test.c index aff13ccf58d2..5ee97a352e2e 100644 --- a/lib/libc/tests/secure/fortify_select_test.c +++ b/lib/libc/tests/secure/fortify_select_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_socket_test.c b/lib/libc/tests/secure/fortify_socket_test.c index 1f0b0f144f40..3d2dc86f4e1c 100644 --- a/lib/libc/tests/secure/fortify_socket_test.c +++ b/lib/libc/tests/secure/fortify_socket_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_stdio_test.c b/lib/libc/tests/secure/fortify_stdio_test.c index 82f45b827411..17842393a740 100644 --- a/lib/libc/tests/secure/fortify_stdio_test.c +++ b/lib/libc/tests/secure/fortify_stdio_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_stdlib_test.c b/lib/libc/tests/secure/fortify_stdlib_test.c index 01ed3e72172a..ae021e8418f7 100644 --- a/lib/libc/tests/secure/fortify_stdlib_test.c +++ b/lib/libc/tests/secure/fortify_stdlib_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_string_test.c b/lib/libc/tests/secure/fortify_string_test.c index 17dec871b32c..cfea261ff66f 100644 --- a/lib/libc/tests/secure/fortify_string_test.c +++ b/lib/libc/tests/secure/fortify_string_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_strings_test.c b/lib/libc/tests/secure/fortify_strings_test.c index 4ad5d58c5300..9f7d37a2480e 100644 --- a/lib/libc/tests/secure/fortify_strings_test.c +++ b/lib/libc/tests/secure/fortify_strings_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_uio_test.c b/lib/libc/tests/secure/fortify_uio_test.c index 5f12ffc08e1d..46b46ed2f7df 100644 --- a/lib/libc/tests/secure/fortify_uio_test.c +++ b/lib/libc/tests/secure/fortify_uio_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/fortify_unistd_test.c b/lib/libc/tests/secure/fortify_unistd_test.c index b3880dc4f369..b12ef2bbb8ea 100644 --- a/lib/libc/tests/secure/fortify_unistd_test.c +++ b/lib/libc/tests/secure/fortify_unistd_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include @@ -162,6 +163,27 @@ replace_stdin(void) close(fd); } +#define JAIL_HOSTNAME "host.example.com" +#define JAIL_DOMAINNAME "example.com" +static void +dhost_jail(void) +{ + struct iovec iov[4]; + int jid; + + iov[0].iov_base = __DECONST(char *, "host.hostname"); + iov[0].iov_len = sizeof("host.hostname"); + iov[1].iov_base = __DECONST(char *, JAIL_HOSTNAME); + iov[1].iov_len = sizeof(JAIL_HOSTNAME); + iov[2].iov_base = __DECONST(char *, "host.domainname"); + iov[2].iov_len = sizeof("host.domainname"); + iov[3].iov_base = __DECONST(char *, JAIL_DOMAINNAME); + iov[3].iov_len = sizeof(JAIL_DOMAINNAME); + + jid = jail_set(iov, nitems(iov), JAIL_CREATE | JAIL_ATTACH); + ATF_REQUIRE_MSG(jid > 0, "Jail creation failed: %s", strerror(errno)); +} + ATF_TC(getcwd_before_end); ATF_TC_HEAD(getcwd_before_end, tc) { @@ -1354,24 +1376,21 @@ monitor: ATF_TC(getdomainname_before_end); ATF_TC_HEAD(getdomainname_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_before_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[12]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4 - 1; + const size_t __len = 12 - 1; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); getdomainname(__stack.__buf, __len); #undef BUF @@ -1380,24 +1399,21 @@ ATF_TC_BODY(getdomainname_before_end, tc) ATF_TC(getdomainname_end); ATF_TC_HEAD(getdomainname_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[12]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4; + const size_t __len = 12; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); getdomainname(__stack.__buf, __len); #undef BUF @@ -1406,6 +1422,7 @@ ATF_TC_BODY(getdomainname_end, tc) ATF_TC(getdomainname_heap_before_end); ATF_TC_HEAD(getdomainname_heap_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_heap_before_end, tc) { @@ -1415,15 +1432,11 @@ ATF_TC_BODY(getdomainname_heap_before_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 - 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (12); + const size_t __len = 12 - 1; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); getdomainname(__stack.__buf, __len); @@ -1434,6 +1447,7 @@ ATF_TC_BODY(getdomainname_heap_before_end, tc) ATF_TC(getdomainname_heap_end); ATF_TC_HEAD(getdomainname_heap_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_heap_end, tc) { @@ -1443,15 +1457,11 @@ ATF_TC_BODY(getdomainname_heap_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (12); + const size_t __len = 12; const size_t __idx __unused = __len - 1; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); getdomainname(__stack.__buf, __len); @@ -1462,6 +1472,7 @@ ATF_TC_BODY(getdomainname_heap_end, tc) ATF_TC(getdomainname_heap_after_end); ATF_TC_HEAD(getdomainname_heap_after_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(getdomainname_heap_after_end, tc) { @@ -1471,17 +1482,13 @@ ATF_TC_BODY(getdomainname_heap_after_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 + 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (12); + const size_t __len = 12 + 1; const size_t __idx __unused = __len - 1; pid_t __child; int __status; - char sysdomain[256]; - - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); + dhost_jail(); __child = fork(); ATF_REQUIRE(__child >= 0); if (__child > 0) @@ -1663,25 +1670,21 @@ monitor: ATF_TC(gethostname_before_end); ATF_TC_HEAD(gethostname_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_before_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[17]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4 - 1; + const size_t __len = 17 - 1; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); gethostname(__stack.__buf, __len); #undef BUF @@ -1690,25 +1693,21 @@ ATF_TC_BODY(gethostname_before_end, tc) ATF_TC(gethostname_end); ATF_TC_HEAD(gethostname_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_end, tc) { #define BUF &__stack.__buf struct { uint8_t padding_l; - unsigned char __buf[4]; + unsigned char __buf[17]; uint8_t padding_r; } __stack; const size_t __bufsz __unused = sizeof(__stack.__buf); - const size_t __len = 4; + const size_t __len = 17; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); gethostname(__stack.__buf, __len); #undef BUF @@ -1717,6 +1716,7 @@ ATF_TC_BODY(gethostname_end, tc) ATF_TC(gethostname_heap_before_end); ATF_TC_HEAD(gethostname_heap_before_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_heap_before_end, tc) { @@ -1726,16 +1726,11 @@ ATF_TC_BODY(gethostname_heap_before_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 - 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (17); + const size_t __len = 17 - 1; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); gethostname(__stack.__buf, __len); @@ -1746,6 +1741,7 @@ ATF_TC_BODY(gethostname_heap_before_end, tc) ATF_TC(gethostname_heap_end); ATF_TC_HEAD(gethostname_heap_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_heap_end, tc) { @@ -1755,16 +1751,11 @@ ATF_TC_BODY(gethostname_heap_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (17); + const size_t __len = 17; const size_t __idx __unused = __len - 1; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); __stack.__buf = malloc(__bufsz); gethostname(__stack.__buf, __len); @@ -1775,6 +1766,7 @@ ATF_TC_BODY(gethostname_heap_end, tc) ATF_TC(gethostname_heap_after_end); ATF_TC_HEAD(gethostname_heap_after_end, tc) { + atf_tc_set_md_var(tc, "require.user", "root"); } ATF_TC_BODY(gethostname_heap_after_end, tc) { @@ -1784,18 +1776,13 @@ ATF_TC_BODY(gethostname_heap_after_end, tc) unsigned char * __buf; uint8_t padding_r; } __stack; - const size_t __bufsz __unused = sizeof(*__stack.__buf) * (4); - const size_t __len = 4 + 1; + const size_t __bufsz __unused = sizeof(*__stack.__buf) * (17); + const size_t __len = 17 + 1; const size_t __idx __unused = __len - 1; pid_t __child; int __status; - char syshost[256]; - int error; - - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); + dhost_jail(); __child = fork(); ATF_REQUIRE(__child >= 0); if (__child > 0) diff --git a/lib/libc/tests/secure/fortify_wchar_test.c b/lib/libc/tests/secure/fortify_wchar_test.c index 9ac5d93ac078..43c7997bc6a3 100644 --- a/lib/libc/tests/secure/fortify_wchar_test.c +++ b/lib/libc/tests/secure/fortify_wchar_test.c @@ -4,6 +4,7 @@ #define TMPFILE_SIZE (1024 * 32) #include +#include #include #include #include diff --git a/lib/libc/tests/secure/generate-fortify-tests.lua b/lib/libc/tests/secure/generate-fortify-tests.lua index 3cb3278f017c..36ff01af7a17 100755 --- a/lib/libc/tests/secure/generate-fortify-tests.lua +++ b/lib/libc/tests/secure/generate-fortify-tests.lua @@ -62,6 +62,7 @@ local includes = { "sys/param.h", + "sys/jail.h", "sys/random.h", "sys/resource.h", "sys/select.h", @@ -87,6 +88,10 @@ local includes = { local tests_added = {} +-- Configuration for tests that want the host/domainname +local hostname = "host.example.com" +local domainname = "example.com" + -- Some of these will need to be excluded because clang sees the wrong size when -- an array is embedded inside a struct, we'll get something that looks more -- like __builtin_object_size(ptr, 0) than it does the correct @@ -858,18 +863,14 @@ local all_tests = { }, { func = "getdomainname", - bufsize = "4", + bufsize = #domainname + 1, arguments = { "__buf", "__len", }, + need_root = true, exclude = excludes_stack_overflow, - stackvars = "\tchar sysdomain[256];\n", - early_init = [[ - (void)getdomainname(sysdomain, __len); - if (strlen(sysdomain) <= __len) - atf_tc_skip("domain name too short for testing"); -]] + early_init = " dhost_jail();", }, { func = "getentropy", @@ -881,21 +882,14 @@ local all_tests = { }, { func = "gethostname", - bufsize = "4", + bufsize = #hostname + 1, arguments = { "__buf", "__len", }, + need_root = true, exclude = excludes_stack_overflow, - stackvars = [[ - char syshost[256]; - int error; -]], - early_init = [[ - error = gethostname(syshost, __len); - if (error != 0 || strlen(syshost) <= __len) - atf_tc_skip("hostname too short for testing"); -]] + early_init = " dhost_jail();", }, { func = "getlogin_r", @@ -1515,6 +1509,32 @@ replace_stdin(void) ]]) +if tcat == "unistd" then + fh:write("#define JAIL_HOSTNAME \"" .. hostname .. "\"\n") + fh:write("#define JAIL_DOMAINNAME \"" .. domainname .. "\"\n") + fh:write([[ +static void +dhost_jail(void) +{ + struct iovec iov[4]; + int jid; + + iov[0].iov_base = __DECONST(char *, "host.hostname"); + iov[0].iov_len = sizeof("host.hostname"); + iov[1].iov_base = __DECONST(char *, JAIL_HOSTNAME); + iov[1].iov_len = sizeof(JAIL_HOSTNAME); + iov[2].iov_base = __DECONST(char *, "host.domainname"); + iov[2].iov_len = sizeof("host.domainname"); + iov[3].iov_base = __DECONST(char *, JAIL_DOMAINNAME); + iov[3].iov_len = sizeof(JAIL_DOMAINNAME); + + jid = jail_set(iov, nitems(iov), JAIL_CREATE | JAIL_ATTACH); + ATF_REQUIRE_MSG(jid > 0, "Jail creation failed: %s", strerror(errno)); +} + +]]) +end + for _, def in pairs(tests) do local func = def.func local function write_tests(heap) From nobody Thu Mar 20 06:16:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJFh82ZHwz5rMqj for ; Thu, 20 Mar 2025 06:16:08 +0000 (UTC) (envelope-from 01000195b231d604-e7dc9387-036e-453b-ab96-a257c4bfbd9d-000000@amazonses.com) Received: from a8-237.smtp-out.amazonses.com (a8-237.smtp-out.amazonses.com [54.240.8.237]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJFh72f8Nz3C2Z for ; Thu, 20 Mar 2025 06:16:07 +0000 (UTC) (envelope-from 01000195b231d604-e7dc9387-036e-453b-ab96-a257c4bfbd9d-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=vnqrkfnvu6csdl6mwgk5t6ix3nnepx57; d=tarsnap.com; t=1742451365; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=kYXirL6T5SMEuGYUdunqxwrHTUFx7O+Ivnu0IG9v0AM=; b=TCJ5nG0nQOB9PCq66VZjO8hFKOI/MB1rFwy0dl8EabyoAL9dXUyoubGGvEASeg4R tBM9biZkBVin6TZI3tkUbUr7RAEmXpiDQ7pd8KHaNAOtymBl9+ENrfyq1+QM8jibrNh GgD7rDKtw9YGVm7Us31QIC+zcMH2lFJX+E1Tg2jM= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=6gbrjpgwjskckoa6a5zn6fwqkn67xbtw; d=amazonses.com; t=1742451365; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=kYXirL6T5SMEuGYUdunqxwrHTUFx7O+Ivnu0IG9v0AM=; b=YVZs0LaSiW/RKmLO8H8i1x2opBgtLmr4pS1Jpx13sUL+5+NZgfcvkr8iWyqs09Ap VbsNcLRZ8sdlDkdvsUXhtLh29eBvSuK/xGOxRfivo2dPxYdYNZoUhzyrCs755DlbviQ zaAsm6HIogvzMfiq79kf2puYQOrak3D7ZEEyaaBQ= Message-ID: <01000195b231d604-e7dc9387-036e-453b-ab96-a257c4bfbd9d-000000@email.amazonses.com> Date: Thu, 20 Mar 2025 06:16:05 +0000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9d0eea9422d0 - main - Make newly POSIX functions visible To: Stephen Hurd , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2025.03.20-54.240.8.237 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:14618, ipnet:54.240.8.0/21, country:US] X-Rspamd-Queue-Id: 4ZJFh72f8Nz3C2Z X-Spamd-Bar: ---- On 3/19/25 16:45, Stephen Hurd wrote: > commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a > Author: Stephen Hurd > AuthorDate: 2025-03-19 23:45:06 +0000 > Commit: Stephen Hurd > CommitDate: 2025-03-19 23:45:06 +0000 > > Make newly POSIX functions visible > > Some of the POSIX 202405L functions are already in the system, make > them visible when appropriate. > > Reviewed by: imp > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D47859 This broke lang/python311: > --- Modules/posixmodule.o --- > ./Modules/posixmodule.c:12907:9: error: call to undeclared function 'setresuid'; ISO C99 and later do not support implicit function decla > rations [-Werror,-Wimplicit-function-declaration] > 12907 | if (setresuid(ruid, euid, suid) < 0) > | ^ > ./Modules/posixmodule.c:12907:9: note: did you mean 'setreuid'? > /usr/include/unistd.h:458:6: note: 'setreuid' declared here > 458 | int setreuid(uid_t, uid_t); > | ^ > ./Modules/posixmodule.c:12930:9: error: call to undeclared function 'setresgid'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] > 12930 | if (setresgid(rgid, egid, sgid) < 0) > | ^ > ./Modules/posixmodule.c:12930:9: note: did you mean 'setregid'? > /usr/include/unistd.h:457:6: note: 'setregid' declared here > 457 | int setregid(gid_t, gid_t); > | ^ > ./Modules/posixmodule.c:12949:9: error: call to undeclared function 'getresuid'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] > 12949 | if (getresuid(&ruid, &euid, &suid) < 0) > | ^ > ./Modules/posixmodule.c:12970:9: error: call to undeclared function 'getresgid'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration] > 12970 | if (getresgid(&rgid, &egid, &sgid) < 0) > | ^ > 4 errors generated. > *** [Modules/posixmodule.o] Error code 1 > > make: stopped making "all" in /tmp/ports/usr/ports/lang/python311/work/Python-3.11.11 I realize this is almost certainly a bug in Python (assuming that these functions are available without setting the right POSIX level) but if Python has this bug I'm sure other ports will also be affected. Please back out this commit and talk to portmgr@ about doing an exp-run to find out what needs to be fixed in the ports tree before re-committing this. -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Mar 20 07:11:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJGwR12fFz5rQpN; Thu, 20 Mar 2025 07:11:51 +0000 (UTC) (envelope-from noreply@sjh.sh) Received: from sjh.sh (sjh.sh [IPv6:2001:19f0:5c00:286a:5400:5ff:fe26:bbcc]) (using TLSv1.3 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 "*.sjh.sh", Issuer "E6" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJGwQ0Hh9z3nZy; Thu, 20 Mar 2025 07:11:50 +0000 (UTC) (envelope-from noreply@sjh.sh) Authentication-Results: mx1.freebsd.org; none Received: from [IPV6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a] (unknown [IPv6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.sjh.sh (Postfix) with ESMTPSA id EA08675600; Thu, 20 Mar 2025 07:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=sjh.sh; s=default; t=1742454707; bh=q487n6np+Nl+lSjqQGXiHx4pTSEKAxzjK1KRW9fqE74=; h=Date:Subject:To:References:From:In-Reply-To; b=KbNLm5FXXF1Jn2GuuWGjgDi1f/euGDQ/DB0n3ezg6xdqu9TOpM9pbu6lqSG4TrHaA 5CKpw+yg/n272jP+RladHiRSRfxihkHQOXaYxH3izPSAI0HMdRxC+eCyR3Xc3/UG2S 98SIsdpefBRbDFhmE463LnN80Ugq6K50RpqYcgmcdBlqA/W8r0b2gemrcpsgmjxP36 75GjyAEteYqk7D3WCMO+Xq2/waBPxf240oojJ7+xRtDHQx77lt77HIbac1t2OyJ3Bw D9cDLJMxVP7jpjE729DZYK+mXZmTsr2795wOg+xcYGWlIiT0CbTddJSBqgGXfeGf5+ d3xM0DFxhLK0g== Message-ID: <1c4b2e3e-aabc-4fd4-a115-56a9133e9bff@sjh.sh> Date: Thu, 20 Mar 2025 03:11:46 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9d0eea9422d0 - main - Make newly POSIX functions visible To: Colin Percival , Stephen Hurd , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> <01000195b231d604-edc6ae17-e5d4-4dc6-afd3-995223ecde17-000000@email.amazonses.com> Content-Language: en-US From: Stephen Hurd In-Reply-To: <01000195b231d604-edc6ae17-e5d4-4dc6-afd3-995223ecde17-000000@email.amazonses.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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:20473, ipnet:2001:19f0:5c00::/38, country:US] X-Rspamd-Queue-Id: 4ZJGwQ0Hh9z3nZy X-Spamd-Bar: ---- On 2025-03-20 02:16, Colin Percival wrote: > On 3/19/25 16:45, Stephen Hurd wrote: >> commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a >> Author:     Stephen Hurd >> AuthorDate: 2025-03-19 23:45:06 +0000 >> Commit:     Stephen Hurd >> CommitDate: 2025-03-19 23:45:06 +0000 >> >>      Make newly POSIX functions visible >>           Some of the POSIX 202405L functions are already in the >> system, make >>      them visible when appropriate. >>           Reviewed by:    imp >>      MFC after:      1 week >>      Differential Revision: https://reviews.freebsd.org/D47859 > > This broke lang/python311: >> --- Modules/posixmodule.o --- >> ./Modules/posixmodule.c:12907:9: error: call to undeclared function >> 'setresuid'; ISO C99 and later do not support implicit function decla >> rations [-Werror,-Wimplicit-function-declaration] >>  12907 |     if (setresuid(ruid, euid, suid) < 0) >>        |         ^ > I realize this is almost certainly a bug in Python (assuming that these > functions are available without setting the right POSIX level) but if > Python has this bug I'm sure other ports will also be affected. Please > back out this commit and talk to portmgr@ about doing an exp-run to find > out what needs to be fixed in the ports tree before re-committing this. I could also make it #if __POSIX_VISIBLE >= 202405 || __BSD_VISIBLE Should fix the problem, but still make them visible for POSIX. From nobody Thu Mar 20 07:13:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJGyK6GJHz5rQh2; Thu, 20 Mar 2025 07:13:29 +0000 (UTC) (envelope-from shurd@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJGyK3bCdz3qMb; Thu, 20 Mar 2025 07:13:29 +0000 (UTC) (envelope-from shurd@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742454809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wEgZOzgRTtBXaerBNL+XHUEBCzjPOiqkzR6rE+5zD9o=; b=opw0WMrbpVrIx9R7YCb0Ifh30OCI9H4HaaptYRelGMQa7PEEJbqX0XhQeq3oWJCtiYhSuO iCM97RE4Zh5nHhiCRtyqVpIGoji0tIdZpGMva3ADrXDs2TXtQ5WFu+59vP5oB778YX84Wj qwovh8rmF9Fud8x817WwULz7fTBvmpHnISPilPXjgmkUyJvc+P2j0m8zbpM+Qv9+yIDRwP ETxTcmkVLK4gCsQ/G8FHlk7MdOfWVdS6thU2XVnuQkXM2UsJ+yvqEsp7YbpMC5R98+qg7e B7MSdJ4KMZj12inavkuOraM1X4xCHrJNdfwbGT1WPtwAKHpfF9qHU95AeaBwog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742454809; a=rsa-sha256; cv=none; b=V/vAbyY3sD6lDul8PC4B0KAP91u42Oz4EpDKeXTntsLsUtpMxwY7gXDu+dq1WByMV2t6EA JiheudibmICKB8RvXP2yBRDNuloW0mrvF1bfP/IQ78yN/uwd+U18/0eAV/tqcyU/qXoUQR SL3ult4JNXZBDJxVbHYWzZKXW5KhdJBfxTh8ZX3DVQOARUj843/Doko54F21uHsHdvLkpE OedM49Z/3QXaq0NxFbPentw9RupjxPbWrcIP+QQS/znO/tSNnpaclKi/z2J8jo7WwTPAzy ePpL2vLwZtKHxVM+noM7/+qFx0Lat7CNSUruJiNYD2EsSxuSL0dw33rvZHvrWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742454809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wEgZOzgRTtBXaerBNL+XHUEBCzjPOiqkzR6rE+5zD9o=; b=FtQPlKCv1WqgnCXHb2T9VbiOwdVe98wb9ZvbyxQwyfKuFd9vfTteMVp46k05bgu340u/gZ T4x7m+ZbHk9VFW43ZImdJXjNnki55eNdWMWSOHC5kszuRfCBci+gXb1MhEmyF5UhGLOZFk /dw+q3vQyZbM6OvePFQDN7YVZBn+HoYGDGjv5uBUKEKlOYIc0aUriZYgvK+VAEXRH/4Oyh EPgPrWCFBmHzSM50H3LFH76+GWwNTDwxm+LUq/5QHeX0s0qKhVsJh0Jwi7aNFc9TVJWnXD fllvJ2kE++cIQM/x7pLEvcpka6pAI2yEQJJtrW65Jhpp3Z4P1mkgVkKD3EqOfw== Received: from [IPV6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a] (unknown [IPv6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: shurd) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZJGyK11C8z16T9; Thu, 20 Mar 2025 07:13:29 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Message-ID: <8cc8ee54-d6ea-47dc-a22d-57b6b03bda4e@FreeBSD.org> Date: Thu, 20 Mar 2025 03:13:28 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 9d0eea9422d0 - main - Make newly POSIX functions visible To: Colin Percival , Stephen Hurd , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202503192345.52JNjFxt093046@gitrepo.freebsd.org> <01000195b231d604-edc6ae17-e5d4-4dc6-afd3-995223ecde17-000000@email.amazonses.com> <1c4b2e3e-aabc-4fd4-a115-56a9133e9bff@sjh.sh> Content-Language: en-US From: shurd@FreeBSD.org In-Reply-To: <1c4b2e3e-aabc-4fd4-a115-56a9133e9bff@sjh.sh> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025-03-20 03:11, Stephen Hurd wrote: > On 2025-03-20 02:16, Colin Percival wrote: >> On 3/19/25 16:45, Stephen Hurd wrote: >>> commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a >>> Author:     Stephen Hurd >>> AuthorDate: 2025-03-19 23:45:06 +0000 >>> Commit:     Stephen Hurd >>> CommitDate: 2025-03-19 23:45:06 +0000 >>> >>>      Make newly POSIX functions visible >>>           Some of the POSIX 202405L functions are already in the >>> system, make >>>      them visible when appropriate. >>>           Reviewed by:    imp >>>      MFC after:      1 week >>>      Differential Revision: https://reviews.freebsd.org/D47859 >> >> This broke lang/python311: >>> --- Modules/posixmodule.o --- >>> ./Modules/posixmodule.c:12907:9: error: call to undeclared function >>> 'setresuid'; ISO C99 and later do not support implicit function decla >>> rations [-Werror,-Wimplicit-function-declaration] >>>  12907 |     if (setresuid(ruid, euid, suid) < 0) >>>        |         ^ >> I realize this is almost certainly a bug in Python (assuming that these >> functions are available without setting the right POSIX level) but if >> Python has this bug I'm sure other ports will also be affected. Please >> back out this commit and talk to portmgr@ about doing an exp-run to find >> out what needs to be fixed in the ports tree before re-committing this. > > I could also make it #if __POSIX_VISIBLE >= 202405 || __BSD_VISIBLE > > Should fix the problem, but still make them visible for POSIX. https://reviews.freebsd.org/D49421 From nobody Thu Mar 20 07:41:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJHb600bCz5rSNs; Thu, 20 Mar 2025 07:41: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJHb55Hmsz47gL; Thu, 20 Mar 2025 07:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742456513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWKFb+8/USbHkBuWmYPxch318ue4yhhOpJgGvD+HwZI=; b=Mf+fgYX4Pkyuui902kV3sN1XUuuNheFHwMPIqOiJEDF5v5hQQaik/4uW7Af9gBlveW2sqJ l/KYEWACxC6G4eRS5V72CsZTp0r23UjVFIxM+TbzIf6jRNA0ZdbvvR14B1M0jdO9Fmojvw pRzHCxoZECAEaoG18YfWhu1+KYSJwKqD9UrvN2VfC5K6NsPhMJJGRw1jJXI46xmroyHLO0 7RnVbMvpP7Qg6gx9JdQGNAJJabdWgSqv+/v27kJjK6FuFUmAHmsvwAjw8FGd/Empfb2KtO mL4y9DZgjNSARJivpGwhMwLtgYaYWNsIR27Dy7w5ZMOH9TTGHx7RnEcz1Qxxqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742456513; a=rsa-sha256; cv=none; b=HyDSvp39g2AE2ejDJC4A/PzYCmu7DSz3Jf7RsoAFG7o4YFIKHgMdy/vovNdww3rFfi6y9o 1coYnxxfhKfzvKlstSEf5RJ0eYcX7n93r5xHSENiBL85fMgLOqpdXunMTFxRsXhkXMWoSy JDewrU5xd9ScVvAEwLMF6Ed67OEYaM3rldaKqoMyWD7Tncgxrj43PxQAiIt3TPI6KbAtiN IiD/mi6cWe+StxPqinPJdcpeNtg3RxjtiOm+0HI7cm1lVgI/sie1PziZjHNJpETqTlG+Rn 8FKH3xhVAxEoIlXCmfoUbR4fVlQFFTQ+8Aqm/bRECwLOIwczfqA+lSwjiiC4WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742456513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWKFb+8/USbHkBuWmYPxch318ue4yhhOpJgGvD+HwZI=; b=DvlDham5ghwQosWhoYGjHXuz5nL3p0736kQsYcbjJWNzTYNdNtcIXfCvAKMj3ff/hYfR0Q RNtipkPIj2ZLA5mNO6iTz22shthwiPyAsl2wYRfBmV6ABBYnYT08I5+MG2itPd8aCmGey2 Nz+8CtyV9dP8dqlObLo2Pi6s3dNWlAbmYWV52QGYncUp22glDnZkadlv+H1g9Q3ZGGaj/q DhuJN+vOcL/7aYenyP19oYA9mMNGmmTYls9aK8PXXHg/Xnm4VKI3BkWYbXC/uLQ87nDS1M s6baioT/trORZu3SD5OdBEzs5j4Vs6A+xdZHQKMOMrfP9H6DPPfMh38K8Kz2vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJHb54vbFzwgp; Thu, 20 Mar 2025 07:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K7frKr088366; Thu, 20 Mar 2025 07:41:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K7frms088363; Thu, 20 Mar 2025 07:41:53 GMT (envelope-from git) Date: Thu, 20 Mar 2025 07:41:53 GMT Message-Id: <202503200741.52K7frms088363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stephen Hurd Subject: git: 415a0ce02c9e - main - Revert Make newly POSIX functions visible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: shurd X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 Auto-Submitted: auto-generated The branch main has been updated by shurd: URL: https://cgit.FreeBSD.org/src/commit/?id=415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 Author: Stephen Hurd AuthorDate: 2025-03-20 07:15:15 +0000 Commit: Stephen Hurd CommitDate: 2025-03-20 07:41:27 +0000 Revert Make newly POSIX functions visible Summary: This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c. This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a. Some ports (specifically Python) define __BSD_VISIBLE themselves, so the change from __BSD_VISIBLE to __POSIX_VISIBLE >= 202405 makes them fail. Reported by: jrtc27, cperciva --- include/dlfcn.h | 8 +------- include/stdlib.h | 13 +++++-------- include/string.h | 6 +++--- include/time.h | 8 +++----- include/unistd.h | 16 ++++++---------- include/wchar.h | 7 ++----- 6 files changed, 20 insertions(+), 38 deletions(-) diff --git a/include/dlfcn.h b/include/dlfcn.h index ec4ad14b5091..89ec43b332e9 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -80,9 +80,6 @@ typedef struct dl_info { const char *dli_sname; /* Name of nearest symbol. */ void *dli_saddr; /* Address of nearest symbol. */ } Dl_info; -#if __POSIX_VISIBLE >= 202405 -typedef struct dl_info Dl_info_t; -#endif /*- * The actual type declared by this typedef is immaterial, provided that @@ -122,12 +119,9 @@ char *dlerror(void); void *dlopen(const char *, int); void *dlsym(void * __restrict, const char * __restrict); -#if __POSIX_VISIBLE >= 202405 -int dladdr(const void * __restrict, Dl_info * __restrict); -#endif - #if __BSD_VISIBLE void *fdlopen(int, int); +int dladdr(const void * __restrict, Dl_info * __restrict); dlfunc_t dlfunc(void * __restrict, const char * __restrict); int dlinfo(void * __restrict, int, void * __restrict); void dllockinit(void *_context, diff --git a/include/stdlib.h b/include/stdlib.h index 449b17fefff5..162031ab393d 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -157,7 +157,7 @@ _Noreturn void _Exit(int) __noexcept; /* * If we're in a mode greater than C99, expose C11 functions. */ -#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L || __POSIX_VISIBLE >= 202405 +#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) __alloc_size(2); int at_quick_exit(void (*)(void)) __noexcept; @@ -236,13 +236,6 @@ int unlockpt(int); int ptsname_r(int, char *, size_t); #endif -#if __POSIX_VISIBLE >= 202405 -void qsort_r(void *, size_t, size_t, - int (*)(const void *, const void *, void *), void *); -void *reallocarray(void *, size_t, size_t) __result_use_check - __alloc_size2(2, 3); -#endif - #if __BSD_VISIBLE extern const char *malloc_conf; extern void (*malloc_message)(void *, const char *); @@ -312,8 +305,12 @@ int mergesort_b(void *, size_t, size_t, int (^)(const void *, const void *)); int mkostemp(char *, int); int mkostemps(char *, int, int); int mkostempsat(int, char *, int, int); +void qsort_r(void *, size_t, size_t, + int (*)(const void *, const void *, void *), void *); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); +void *reallocarray(void *, size_t, size_t) __result_use_check + __alloc_size2(2, 3); void *reallocf(void *, size_t) __result_use_check __alloc_size(2); int rpmatch(const char *); char *secure_getenv(const char *); diff --git a/include/string.h b/include/string.h index 3deca63bd71a..a3fa96ebb449 100644 --- a/include/string.h +++ b/include/string.h @@ -63,8 +63,8 @@ void *memrchr(const void *, int, size_t) __pure; #endif int memcmp(const void *, const void *, size_t) __pure; void *(memcpy)(void * __restrict, const void * __restrict, size_t); -#if __POSIX_VISIBLE >= 202405 -void *(memmem)(const void *, size_t, const void *, size_t) __pure; +#if __BSD_VISIBLE +void *memmem(const void *, size_t, const void *, size_t) __pure; #endif void *(memmove)(void *, const void *, size_t); #if __BSD_VISIBLE @@ -98,7 +98,7 @@ char *strerror(int); #if __POSIX_VISIBLE >= 200112 int strerror_r(int, char *, size_t); #endif -#if __POSIX_VISIBLE >= 202405 +#if __BSD_VISIBLE size_t (strlcat)(char * __restrict, const char * __restrict, size_t); size_t (strlcpy)(char * __restrict, const char * __restrict, size_t); #endif diff --git a/include/time.h b/include/time.h index e011792aaaeb..89a76ca5fd93 100644 --- a/include/time.h +++ b/include/time.h @@ -180,17 +180,15 @@ time_t posix2time(time_t t); #include #endif -#if __ISO_C_VISIBLE >= 2011 || __POSIX_VISIBLE >= 202405 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ -#if __ISO_C_VISIBLE >= 2023 || __POSIX_VISIBLE >= 202405 -/* ISO/IEC 9899:2024 7.29.1 Components of time */ -#define TIME_MONOTONIC 2 /* monotonic time */ -#endif int timespec_get(struct timespec *ts, int base); #if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 +/* ISO/IEC 9899:2024 7.29.1 Components of time */ +#define TIME_MONOTONIC 2 /* monotonic time */ /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ int timespec_getres(struct timespec *, int); #endif diff --git a/include/unistd.h b/include/unistd.h index 3a4e1be192d9..8574b2ba9915 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -483,16 +483,6 @@ int usleep(useconds_t); pid_t vfork(void) __returns_twice; #endif -/* 1003.1-2024 */ -#if __POSIX_VISIBLE >= 202405 -pid_t _Fork(void); -int getentropy(void *, size_t); -int getresgid(gid_t *, gid_t *, gid_t *); -int getresuid(uid_t *, uid_t *, uid_t *); -int setresgid(gid_t, gid_t, gid_t); -int setresuid(uid_t, uid_t, uid_t); -#endif - #if __BSD_VISIBLE struct timeval; /* select(2) */ @@ -520,11 +510,14 @@ int feature_present(const char *); int fchroot(int); char *fflagstostr(u_long); int getdomainname(char *, int); +int getentropy(void *, size_t); int getgrouplist(const char *, gid_t, gid_t *, int *); int getloginclass(char *, size_t); mode_t getmode(const void *, mode_t); int getosreldate(void); int getpeereid(int, uid_t *, gid_t *); +int getresgid(gid_t *, gid_t *, gid_t *); +int getresuid(uid_t *, uid_t *, uid_t *); char *getusershell(void); int initgroups(const char *, gid_t); int iruserok(unsigned long, int, const char *, const char *); @@ -582,6 +575,8 @@ void *setmode(const char *); int setpgrp(pid_t, pid_t); /* obsoleted by setpgid() */ void setproctitle(const char *_fmt, ...) __printf0like(1, 2); void setproctitle_fast(const char *_fmt, ...) __printf0like(1, 2); +int setresgid(gid_t, gid_t, gid_t); +int setresuid(uid_t, uid_t, uid_t); int setrgid(gid_t); int setruid(uid_t); void setusershell(void); @@ -594,6 +589,7 @@ int undelete(const char *); int unwhiteout(const char *); void *valloc(size_t); /* obsoleted by malloc() */ int funlinkat(int, const char *, int, int); +pid_t _Fork(void); #ifndef _OPTRESET_DECLARED #define _OPTRESET_DECLARED diff --git a/include/wchar.h b/include/wchar.h index a8c016c42faf..e4b037c9b16f 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -235,13 +235,10 @@ size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t, size_t, mbstate_t * __restrict); #endif -#if __POSIX_VISIBLE >= 202405 -size_t wcslcat(wchar_t *, const wchar_t *, size_t); -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); -#endif - #if __BSD_VISIBLE wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); +size_t wcslcat(wchar_t *, const wchar_t *, size_t); +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif #if __POSIX_VISIBLE >= 200809 || defined(_XLOCALE_H_) From nobody Thu Mar 20 09:01:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJKM46MFbz5rXPS; Thu, 20 Mar 2025 09:01: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJKM452Tyz3KBJ; Thu, 20 Mar 2025 09:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742461296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jBGxinHG7JYYGDj4vyVIgrMpN5Sh9Zt6jdEKsFFfWDY=; b=iGsyldr6Plrfw+6av//ZI9JD1kGBZ9nGfYSkZj3D6ZaXgZZGX/gk0fDKoKGZuzq0r3ed5M eemr3sPobTgdWTzYbrpXe2gp3jiM27aWH0yJH/FnWSjKADXNWtDURBqCcBi73m4YUY4EED GqhlqsASSmL6HOkEFWhzGuQtTzJWRS1wVjSiDmGCH5Opjel9ArUox2b0ulmXkf+55IHxPt krTgzBwQW+RNBg+GM6cAHEMZoDadAeMwlPgijcGSUtW40Sk9lGd6D4Y7Y6CY5ivUSHHqcC A5BBo2PD9flpw5b6MMg5KhjkZfw+sYsEhAXCGUlCS5yPHqQFohWaRF3s9vlT3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742461296; a=rsa-sha256; cv=none; b=UNfCMur7SVjAg7BloufxmevCOG2G/1mbSt9OpWcGs+TaiRNqid0J2BU+OoVpVOvHOwHFKz MNfH14/D3x6h3K7LBUcZ5DgFsxAlNtL4wOyfPgmbVlFRIjtzb7bWhvhdApAq1S9H2yTRDF YE7mtjYB87VnwGcv0zNFDN75En+lB7zJetun2n1Z+qwBkDwqlcsWeI7Bcg0XZy4DCuzQRo J4SReX7V+0Tt2HqGTYqoeYWqJau/UHw5KXfu2wztArLQsOWC/eR3wzeTaRlXNgjD2b4Se2 00+javMxXywdGpHFg6o6S3GG9y67+7JFbb0Y+E5WJHFV3uJv7wNdcII6MGc8yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742461296; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jBGxinHG7JYYGDj4vyVIgrMpN5Sh9Zt6jdEKsFFfWDY=; b=P6RCfC7+q0viutgig849D/51S8dYWaQgFK4iXO2naPmp3qdyZP6Zansdqe1SelthGgrvG/ JQ692xJ/JyXyXMpPdtyJqVWB2W64MqiNxZRu3UQLvW3TcCjemLJa27YkLD0LyXZHuYrWN/ xZhBxfOWUoKt9T+MPKO6qMhBvEMiZ/oiplRzwXCJxgjhR9A8okt42aOeRMTGRvO7TgwZ9O OK5KhNpBDjaHB3EAYoYzam5sPYTr7mHve5FO0pcuRRpYrQn6V5BwO+Xn52z4BOV6U6F7nI 0X0a5FFKO2tKmZPP/sR3H2Nms5vN9LTYRCsBxensPPEYOH4zN8U2MiGDvVQ3wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJKM432j2zyPP; Thu, 20 Mar 2025 09:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52K91aKA045134; Thu, 20 Mar 2025 09:01:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K91aO8045129; Thu, 20 Mar 2025 09:01:36 GMT (envelope-from git) Date: Thu, 20 Mar 2025 09:01:36 GMT Message-Id: <202503200901.52K91aO8045129@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 5682eee1efd3 - main - devd: raise the maximum allowed client to 50 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5682eee1efd35fb65751641181ae2a50d86efaab Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=5682eee1efd35fb65751641181ae2a50d86efaab commit 5682eee1efd35fb65751641181ae2a50d86efaab Author: Baptiste Daroussin AuthorDate: 2025-03-20 08:53:16 +0000 Commit: Baptiste Daroussin CommitDate: 2025-03-20 08:56:51 +0000 devd: raise the maximum allowed client to 50 since the creation of libudev-devd, but also with powerd, recent libusb changes etc. 10 client is not enough anymore to cover the desktop needs and end users often ends up with: sonewconn: pcb 0xfffff8004dd43780 (local:/var/run/devd.seqpacket.pipe)... raise the maximum allowed client to 50, which should be enough to cover user requirements. MFC After: 1 week --- sbin/devd/devd.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 8d621e42a232..d7a3fee57870 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -938,7 +938,7 @@ create_socket(const char *name, int socktype) return (fd); } -static unsigned int max_clients = 10; /* Default, can be overridden on cmdline. */ +static unsigned int max_clients = 50; /* Default, can be overridden on cmdline. */ static unsigned int num_clients; static list clients; From nobody Thu Mar 20 09:55:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJLZ12sdhz5rbH2 for ; Thu, 20 Mar 2025 09:56:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJLZ05J13z3Pbr for ; Thu, 20 Mar 2025 09:56:08 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2ff64550991so710525a91.0 for ; Thu, 20 Mar 2025 02:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1742464567; x=1743069367; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=BMP1EK4BkXr+Bk5fYSxK3nZfYMy8o7sC8sFutHAVDQo=; b=g19/RC5zgz305DUtpQRiDrNf1NN48rc1LBWaUZ+TD7e9h7FfHMzM8f2ekO87MGGt6m PTvxhOKeirND7TQ9IpAHgZeAwl4FIso2t+sgOiuiaUX+qDE4ryOQRgyBL9EF9DnOXi02 qmwySSLBz297jtMSq2UtbbdVFXeUxdp/lizUdrIJhq511NwcebhfgaegO4zEZca5rjnh F7SBTDnhrFUn19qbKcUCOW4B3GQI76mgPsjmF02hJukR+HbBCFIp1jWeTn77v3LsmnLJ Gh7Ooq+yq1XaulXToANTbzq403ythSykP0uPTjFBg2nwFh9DTH4nu9FnLv2VbSfpsbrQ vcQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742464567; x=1743069367; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BMP1EK4BkXr+Bk5fYSxK3nZfYMy8o7sC8sFutHAVDQo=; b=LKbWMeKGC/16JPkcneO7Yrcs69lgp00xNpj5CHcBKaxbY63GrBortxVDsQeltk7XvT H572zzs4KAF2lxMA0k8eE7mfHHzUpxUiFbWigZQ+bKmAm5juYO/NXdNfOKHjtrd+lS8R DBfXlLf/+dyel9VPJQzzpyQQpxQy65nJ1SnKjxR3qEh46ApurPVJSrbg5bQAxdgiXPl+ 9ijZe77ZVqW4+6nZoiggvzDz2vR90yUWHAZLVldNr7LbmdSJeG8ncqDeY3OeXFVYmz/8 P5jUBQFBijZ6tgDtRf+u/nskYwfrhld+9iW0CL145dTcPCKMZRRQ50I0WY/LprESSazL IbPA== X-Forwarded-Encrypted: i=1; AJvYcCUsz4UAqNufUsI+a72Ch7CsCyiiFuZs9zpupgE7L1gzazu0g45vbTqy+QBXrJETdBdtzoeZUe54RxP84A9VxSYn4tqZ@freebsd.org X-Gm-Message-State: AOJu0YxQVD3sFTPKONqtaHcdX88ITcrbu4YhgmViwGYqEumGVhUZHJJF QaGivkT8eMdkK9d602HQzUpbyrIqwK9yb1A2EZoNIC6Cao4aoOddisTUvY36ap8py05SH1b9GkM ox/9ivMfbvuFpwS/HZVb6cdzxB7dsWLKiRKOfFg== X-Gm-Gg: ASbGncs9QVkO6Cx2MGBWPLT8Gl4d8GAg1lJEkn9EuM2uhLA5KerNXkYK5jwoUt+NNdb UHc8SZvFohpVA67FeomBr6R75vfaY0vJitBGKK37k3GL/NIq/BW01YsaVIsrRjQN6Gd4s8LyK5Y PWgIK3M7V9sBtDHZwa1vc54ISqe55/EmzzVzHWvJKl9O3BTB1a6kObPSX2 X-Google-Smtp-Source: AGHT+IF59zSGhTurwvrr5+ibsjM6wPDwQRI5qvP46inzmwsit30mWVZFY043+Ydf17f64PxoNysFFxri2f76v81ahkU= X-Received: by 2002:a17:90b:28cd:b0:2ee:e317:69ab with SMTP id 98e67ed59e1d1-301d4e83d83mr5327965a91.0.1742464567137; Thu, 20 Mar 2025 02:56:07 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 References: <202503200741.52K7frms088363@gitrepo.freebsd.org> In-Reply-To: <202503200741.52K7frms088363@gitrepo.freebsd.org> From: Warner Losh Date: Thu, 20 Mar 2025 03:55:56 -0600 X-Gm-Features: AQ5f1JpJ8mxfhXtXrlOeAO69-tl7wyGPN5BaPEP-v1cbywJ-jtDJYTUHFboigqM Message-ID: Subject: Re: git: 415a0ce02c9e - main - Revert Make newly POSIX functions visible To: Stephen Hurd Cc: src-committers , "" , "" Content-Type: multipart/alternative; boundary="0000000000008eff690630c32596" 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:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4ZJLZ05J13z3Pbr X-Spamd-Bar: ---- --0000000000008eff690630c32596 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 20, 2025, 1:42=E2=80=AFAM Stephen Hurd wrot= e: > The branch main has been updated by shurd: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D415a0ce02c9ee2c15c7973b2dfbddda= 71f6344a2 > > commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 > Author: Stephen Hurd > AuthorDate: 2025-03-20 07:15:15 +0000 > Commit: Stephen Hurd > CommitDate: 2025-03-20 07:41:27 +0000 > > Revert Make newly POSIX functions visible > > Summary: > This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c. > This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a. > > Some ports (specifically Python) define __BSD_VISIBLE themselves, so > the change from __BSD_VISIBLE to __POSIX_VISIBLE >=3D 202405 makes th= em > fail. > That's not legal. Defining __BSD_VISIBLE directly is illegal and won't work right. Can't work right and should likely be a compile time error. With am exp run to fix. Warner > Reported by: jrtc27, cperciva > --- > include/dlfcn.h | 8 +------- > include/stdlib.h | 13 +++++-------- > include/string.h | 6 +++--- > include/time.h | 8 +++----- > include/unistd.h | 16 ++++++---------- > include/wchar.h | 7 ++----- > 6 files changed, 20 insertions(+), 38 deletions(-) > > diff --git a/include/dlfcn.h b/include/dlfcn.h > index ec4ad14b5091..89ec43b332e9 100644 > --- a/include/dlfcn.h > +++ b/include/dlfcn.h > @@ -80,9 +80,6 @@ typedef struct dl_info { > const char *dli_sname; /* Name of nearest symbol. */ > void *dli_saddr; /* Address of nearest symbol. */ > } Dl_info; > -#if __POSIX_VISIBLE >=3D 202405 > -typedef struct dl_info Dl_info_t; > -#endif > > /*- > * The actual type declared by this typedef is immaterial, provided that > @@ -122,12 +119,9 @@ char *dlerror(void); > void *dlopen(const char *, int); > void *dlsym(void * __restrict, const char * __restrict); > > -#if __POSIX_VISIBLE >=3D 202405 > -int dladdr(const void * __restrict, Dl_info * __restrict); > -#endif > - > #if __BSD_VISIBLE > void *fdlopen(int, int); > +int dladdr(const void * __restrict, Dl_info * __restrict); > dlfunc_t dlfunc(void * __restrict, const char * __restrict); > int dlinfo(void * __restrict, int, void * __restrict); > void dllockinit(void *_context, > diff --git a/include/stdlib.h b/include/stdlib.h > index 449b17fefff5..162031ab393d 100644 > --- a/include/stdlib.h > +++ b/include/stdlib.h > @@ -157,7 +157,7 @@ _Noreturn void _Exit(int) __noexcept; > /* > * If we're in a mode greater than C99, expose C11 functions. > */ > -#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L || __POSIX_VIS= IBLE > >=3D 202405 > +#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L > void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) > __alloc_size(2); > int at_quick_exit(void (*)(void)) __noexcept; > @@ -236,13 +236,6 @@ int unlockpt(int); > int ptsname_r(int, char *, size_t); > #endif > > -#if __POSIX_VISIBLE >=3D 202405 > -void qsort_r(void *, size_t, size_t, > - int (*)(const void *, const void *, void *), void *); > -void *reallocarray(void *, size_t, size_t) __result_use_check > - __alloc_size2(2, 3); > -#endif > - > #if __BSD_VISIBLE > extern const char *malloc_conf; > extern void (*malloc_message)(void *, const char *); > @@ -312,8 +305,12 @@ int mergesort_b(void *, size_t, size_t, int > (^)(const void *, const void *)); > int mkostemp(char *, int); > int mkostemps(char *, int, int); > int mkostempsat(int, char *, int, int); > +void qsort_r(void *, size_t, size_t, > + int (*)(const void *, const void *, void *), void *); > int radixsort(const unsigned char **, int, const unsigned char *, > unsigned); > +void *reallocarray(void *, size_t, size_t) __result_use_check > + __alloc_size2(2, 3); > void *reallocf(void *, size_t) __result_use_check __alloc_size(2); > int rpmatch(const char *); > char *secure_getenv(const char *); > diff --git a/include/string.h b/include/string.h > index 3deca63bd71a..a3fa96ebb449 100644 > --- a/include/string.h > +++ b/include/string.h > @@ -63,8 +63,8 @@ void *memrchr(const void *, int, size_t) __pure; > #endif > int memcmp(const void *, const void *, size_t) __pure; > void *(memcpy)(void * __restrict, const void * __restrict, size_t); > -#if __POSIX_VISIBLE >=3D 202405 > -void *(memmem)(const void *, size_t, const void *, size_t) __pure; > +#if __BSD_VISIBLE > +void *memmem(const void *, size_t, const void *, size_t) __pure; > #endif > void *(memmove)(void *, const void *, size_t); > #if __BSD_VISIBLE > @@ -98,7 +98,7 @@ char *strerror(int); > #if __POSIX_VISIBLE >=3D 200112 > int strerror_r(int, char *, size_t); > #endif > -#if __POSIX_VISIBLE >=3D 202405 > +#if __BSD_VISIBLE > size_t (strlcat)(char * __restrict, const char * __restrict, size_t); > size_t (strlcpy)(char * __restrict, const char * __restrict, size_t); > #endif > diff --git a/include/time.h b/include/time.h > index e011792aaaeb..89a76ca5fd93 100644 > --- a/include/time.h > +++ b/include/time.h > @@ -180,17 +180,15 @@ time_t posix2time(time_t t); > #include > #endif > > -#if __ISO_C_VISIBLE >=3D 2011 || __POSIX_VISIBLE >=3D 202405 || \ > +#if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2011 || \ > (defined(__cplusplus) && __cplusplus >=3D 201703) > #include > /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ > #define TIME_UTC 1 /* time elapsed since epoch */ > -#if __ISO_C_VISIBLE >=3D 2023 || __POSIX_VISIBLE >=3D 202405 > -/* ISO/IEC 9899:2024 7.29.1 Components of time */ > -#define TIME_MONOTONIC 2 /* monotonic time */ > -#endif > int timespec_get(struct timespec *ts, int base); > #if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2023 > +/* ISO/IEC 9899:2024 7.29.1 Components of time */ > +#define TIME_MONOTONIC 2 /* monotonic time */ > /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ > int timespec_getres(struct timespec *, int); > #endif > diff --git a/include/unistd.h b/include/unistd.h > index 3a4e1be192d9..8574b2ba9915 100644 > --- a/include/unistd.h > +++ b/include/unistd.h > @@ -483,16 +483,6 @@ int usleep(useconds_t); > pid_t vfork(void) __returns_twice; > #endif > > -/* 1003.1-2024 */ > -#if __POSIX_VISIBLE >=3D 202405 > -pid_t _Fork(void); > -int getentropy(void *, size_t); > -int getresgid(gid_t *, gid_t *, gid_t *); > -int getresuid(uid_t *, uid_t *, uid_t *); > -int setresgid(gid_t, gid_t, gid_t); > -int setresuid(uid_t, uid_t, uid_t); > -#endif > - > #if __BSD_VISIBLE > struct timeval; /* select(2) */ > > @@ -520,11 +510,14 @@ int feature_present(const char *); > int fchroot(int); > char *fflagstostr(u_long); > int getdomainname(char *, int); > +int getentropy(void *, size_t); > int getgrouplist(const char *, gid_t, gid_t *, int *); > int getloginclass(char *, size_t); > mode_t getmode(const void *, mode_t); > int getosreldate(void); > int getpeereid(int, uid_t *, gid_t *); > +int getresgid(gid_t *, gid_t *, gid_t *); > +int getresuid(uid_t *, uid_t *, uid_t *); > char *getusershell(void); > int initgroups(const char *, gid_t); > int iruserok(unsigned long, int, const char *, const char *); > @@ -582,6 +575,8 @@ void *setmode(const char *); > int setpgrp(pid_t, pid_t); /* obsoleted by setpgid() > */ > void setproctitle(const char *_fmt, ...) __printf0like(1, 2); > void setproctitle_fast(const char *_fmt, ...) __printf0like(1, 2); > +int setresgid(gid_t, gid_t, gid_t); > +int setresuid(uid_t, uid_t, uid_t); > int setrgid(gid_t); > int setruid(uid_t); > void setusershell(void); > @@ -594,6 +589,7 @@ int undelete(const char *); > int unwhiteout(const char *); > void *valloc(size_t); /* obsoleted by malloc() = */ > int funlinkat(int, const char *, int, int); > +pid_t _Fork(void); > > #ifndef _OPTRESET_DECLARED > #define _OPTRESET_DECLARED > diff --git a/include/wchar.h b/include/wchar.h > index a8c016c42faf..e4b037c9b16f 100644 > --- a/include/wchar.h > +++ b/include/wchar.h > @@ -235,13 +235,10 @@ size_t wcsnrtombs(char * __restrict, const > wchar_t ** __restrict, size_t, > size_t, mbstate_t * __restrict); > #endif > > -#if __POSIX_VISIBLE >=3D 202405 > -size_t wcslcat(wchar_t *, const wchar_t *, size_t); > -size_t wcslcpy(wchar_t *, const wchar_t *, size_t); > -#endif > - > #if __BSD_VISIBLE > wchar_t *fgetwln(FILE * __restrict, size_t * __restrict); > +size_t wcslcat(wchar_t *, const wchar_t *, size_t); > +size_t wcslcpy(wchar_t *, const wchar_t *, size_t); > #endif > > #if __POSIX_VISIBLE >=3D 200809 || defined(_XLOCALE_H_) > --0000000000008eff690630c32596 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Mar 20, 2025, 1:42=E2=80= =AFAM Stephen Hurd <shurd@freebsd.o= rg> wrote:
The branch main h= as been updated by shurd:

URL: ht= tps://cgit.FreeBSD.org/src/commit/?id=3D415a0ce02c9ee2c15c7973b2dfbddda71f6= 344a2

commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2
Author:=C2=A0 =C2=A0 =C2=A0Stephen Hurd <shurd@FreeBSD.org>
AuthorDate: 2025-03-20 07:15:15 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Stephen Hurd <shurd@FreeBSD.org>
CommitDate: 2025-03-20 07:41:27 +0000

=C2=A0 =C2=A0 Revert Make newly POSIX functions visible

=C2=A0 =C2=A0 Summary:
=C2=A0 =C2=A0 This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c.=
=C2=A0 =C2=A0 This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a.=

=C2=A0 =C2=A0 Some ports (specifically Python) define __BSD_VISIBLE themsel= ves, so
=C2=A0 =C2=A0 the change from __BSD_VISIBLE to __POSIX_VISIBLE >=3D 2024= 05 makes them
=C2=A0 =C2=A0 fail.

That's not legal. Defining __BSD_VISIBLE directly is= illegal and won't work right. Can't work right and should likely b= e a compile time error. With am exp run to fix.

=
Warner


=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 jrtc27, cperciva
---
=C2=A0include/dlfcn.h=C2=A0 |=C2=A0 8 +-------
=C2=A0include/stdlib.h | 13 +++++--------
=C2=A0include/string.h |=C2=A0 6 +++---
=C2=A0include/time.h=C2=A0 =C2=A0|=C2=A0 8 +++-----
=C2=A0include/unistd.h | 16 ++++++----------
=C2=A0include/wchar.h=C2=A0 |=C2=A0 7 ++-----
=C2=A06 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/include/dlfcn.h b/include/dlfcn.h
index ec4ad14b5091..89ec43b332e9 100644
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -80,9 +80,6 @@ typedef=C2=A0 =C2=A0 =C2=A0 =C2=A0struct dl_info {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 const char=C2=A0 =C2=A0 =C2=A0 *dli_sname;=C2= =A0 =C2=A0 =C2=A0/* Name of nearest symbol. */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 void=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 *= dli_saddr;=C2=A0 =C2=A0 =C2=A0/* Address of nearest symbol. */
=C2=A0} Dl_info;
-#if __POSIX_VISIBLE >=3D 202405
-typedef struct dl_info Dl_info_t;
-#endif

=C2=A0/*-
=C2=A0 * The actual type declared by this typedef is immaterial, provided t= hat
@@ -122,12 +119,9 @@ char=C2=A0 =C2=A0 =C2=A0 =C2=A0*dlerror(void);
=C2=A0void=C2=A0 =C2=A0*dlopen(const char *, int);
=C2=A0void=C2=A0 =C2=A0*dlsym(void * __restrict, const char * __restrict);<= br>
-#if __POSIX_VISIBLE >=3D 202405
-int=C2=A0 =C2=A0 =C2=A0dladdr(const void * __restrict, Dl_info * __restric= t);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0void=C2=A0 =C2=A0*fdlopen(int, int);
+int=C2=A0 =C2=A0 =C2=A0dladdr(const void * __restrict, Dl_info * __restric= t);
=C2=A0dlfunc_t dlfunc(void * __restrict, const char * __restrict);
=C2=A0int=C2=A0 =C2=A0 =C2=A0dlinfo(void * __restrict, int, void * __restri= ct);
=C2=A0void=C2=A0 =C2=A0 dllockinit(void *_context,
diff --git a/include/stdlib.h b/include/stdlib.h
index 449b17fefff5..162031ab393d 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -157,7 +157,7 @@ _Noreturn void=C2=A0 =C2=A0 =C2=A0 =C2=A0_Exit(int) __n= oexcept;
=C2=A0/*
=C2=A0 * If we're in a mode greater than C99, expose C11 functions.
=C2=A0 */
-#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L || __POSIX= _VISIBLE >=3D 202405
+#if __ISO_C_VISIBLE >=3D 2011 || __cplusplus >=3D 201103L
=C2=A0void * aligned_alloc(size_t, size_t) __malloc_like __alloc_align(1) =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 __alloc_size(2);
=C2=A0int=C2=A0 =C2=A0 at_quick_exit(void (*)(void)) __noexcept;
@@ -236,13 +236,6 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0unlockpt(int); =C2=A0int=C2=A0 =C2=A0 =C2=A0ptsname_r(int, char *, size_t);
=C2=A0#endif

-#if __POSIX_VISIBLE >=3D 202405
-void=C2=A0 =C2=A0 qsort_r(void *, size_t, size_t,
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int (*)(const void *, const void = *, void *), void *);
-void=C2=A0 =C2=A0*reallocarray(void *, size_t, size_t) __result_use_check<= br> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__alloc_size2(2, 3);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0extern const char *malloc_conf;
=C2=A0extern void (*malloc_message)(void *, const char *);
@@ -312,8 +305,12 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0mergesort_b(void = *, size_t, size_t, int (^)(const void *, const void *));
=C2=A0int=C2=A0 =C2=A0 =C2=A0mkostemp(char *, int);
=C2=A0int=C2=A0 =C2=A0 =C2=A0mkostemps(char *, int, int);
=C2=A0int=C2=A0 =C2=A0 =C2=A0mkostempsat(int, char *, int, int);
+void=C2=A0 =C2=A0 qsort_r(void *, size_t, size_t,
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0int (*)(const void *, const void = *, void *), void *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0radixsort(const unsigned char **, int, const u= nsigned char *,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 unsigned);
+void=C2=A0 =C2=A0*reallocarray(void *, size_t, size_t) __result_use_check<= br> +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0__alloc_size2(2, 3);
=C2=A0void=C2=A0 =C2=A0*reallocf(void *, size_t) __result_use_check __alloc= _size(2);
=C2=A0int=C2=A0 =C2=A0 =C2=A0rpmatch(const char *);
=C2=A0char=C2=A0 =C2=A0*secure_getenv(const char *);
diff --git a/include/string.h b/include/string.h
index 3deca63bd71a..a3fa96ebb449 100644
--- a/include/string.h
+++ b/include/string.h
@@ -63,8 +63,8 @@ void=C2=A0 *memrchr(const void *, int, size_t) __pure; =C2=A0#endif
=C2=A0int=C2=A0 =C2=A0 =C2=A0memcmp(const void *, const void *, size_t) __p= ure;
=C2=A0void=C2=A0 =C2=A0*(memcpy)(void * __restrict, const void * __restrict= , size_t);
-#if __POSIX_VISIBLE >=3D 202405
-void=C2=A0 =C2=A0*(memmem)(const void *, size_t, const void *, size_t) __p= ure;
+#if __BSD_VISIBLE
+void=C2=A0 =C2=A0*memmem(const void *, size_t, const void *, size_t) __pur= e;
=C2=A0#endif
=C2=A0void=C2=A0 =C2=A0*(memmove)(void *, const void *, size_t);
=C2=A0#if __BSD_VISIBLE
@@ -98,7 +98,7 @@ char=C2=A0 *strerror(int);
=C2=A0#if __POSIX_VISIBLE >=3D 200112
=C2=A0int=C2=A0 =C2=A0 =C2=A0strerror_r(int, char *, size_t);
=C2=A0#endif
-#if __POSIX_VISIBLE >=3D 202405
+#if __BSD_VISIBLE
=C2=A0size_t=C2=A0 (strlcat)(char * __restrict, const char * __restrict, si= ze_t);
=C2=A0size_t=C2=A0 (strlcpy)(char * __restrict, const char * __restrict, si= ze_t);
=C2=A0#endif
diff --git a/include/time.h b/include/time.h
index e011792aaaeb..89a76ca5fd93 100644
--- a/include/time.h
+++ b/include/time.h
@@ -180,17 +180,15 @@ time_t posix2time(time_t t);
=C2=A0#include <xlocale/_time.h>
=C2=A0#endif

-#if __ISO_C_VISIBLE >=3D 2011 || __POSIX_VISIBLE >=3D 202405 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2011 || \
=C2=A0 =C2=A0 =C2=A0(defined(__cplusplus) && __cplusplus >=3D 20= 1703)
=C2=A0#include <sys/_timespec.h>
=C2=A0/* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */
=C2=A0#define TIME_UTC=C2=A0 =C2=A0 =C2=A0 =C2=A01=C2=A0 =C2=A0 =C2=A0 =C2= =A0/* time elapsed since epoch */
-#if __ISO_C_VISIBLE >=3D 2023 || __POSIX_VISIBLE >=3D 202405
-/* ISO/IEC 9899:2024 7.29.1 Components of time */
-#define TIME_MONOTONIC 2=C2=A0 =C2=A0 =C2=A0 =C2=A0/* monotonic time */ -#endif
=C2=A0int timespec_get(struct timespec *ts, int base);
=C2=A0#if __BSD_VISIBLE || __ISO_C_VISIBLE >=3D 2023
+/* ISO/IEC 9899:2024 7.29.1 Components of time */
+#define TIME_MONOTONIC 2=C2=A0 =C2=A0 =C2=A0 =C2=A0/* monotonic time */ =C2=A0/* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */
=C2=A0int timespec_getres(struct timespec *, int);
=C2=A0#endif
diff --git a/include/unistd.h b/include/unistd.h
index 3a4e1be192d9..8574b2ba9915 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -483,16 +483,6 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0usleep(useconds_t= );
=C2=A0pid_t=C2=A0 =C2=A0vfork(void) __returns_twice;
=C2=A0#endif

-/* 1003.1-2024 */
-#if __POSIX_VISIBLE >=3D 202405
-pid_t=C2=A0 =C2=A0_Fork(void);
-int=C2=A0 =C2=A0 =C2=A0getentropy(void *, size_t);
-int=C2=A0 =C2=A0 =C2=A0getresgid(gid_t *, gid_t *, gid_t *);
-int=C2=A0 =C2=A0 =C2=A0getresuid(uid_t *, uid_t *, uid_t *);
-int=C2=A0 =C2=A0 =C2=A0setresgid(gid_t, gid_t, gid_t);
-int=C2=A0 =C2=A0 =C2=A0setresuid(uid_t, uid_t, uid_t);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0struct timeval;=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* select(2) */=

@@ -520,11 +510,14 @@ int=C2=A0 =C2=A0 =C2=A0 =C2=A0 feature_present(const = char *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0fchroot(int);
=C2=A0char=C2=A0 =C2=A0*fflagstostr(u_long);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getdomainname(char *, int);
+int=C2=A0 =C2=A0 =C2=A0getentropy(void *, size_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getgrouplist(const char *, gid_t, gid_t *, int= *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getloginclass(char *, size_t);
=C2=A0mode_t=C2=A0 getmode(const void *, mode_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getosreldate(void);
=C2=A0int=C2=A0 =C2=A0 =C2=A0getpeereid(int, uid_t *, gid_t *);
+int=C2=A0 =C2=A0 =C2=A0getresgid(gid_t *, gid_t *, gid_t *);
+int=C2=A0 =C2=A0 =C2=A0getresuid(uid_t *, uid_t *, uid_t *);
=C2=A0char=C2=A0 =C2=A0*getusershell(void);
=C2=A0int=C2=A0 =C2=A0 =C2=A0initgroups(const char *, gid_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0iruserok(unsigned long, int, const char *, con= st char *);
@@ -582,6 +575,8 @@ void=C2=A0 =C2=A0 =C2=A0 =C2=A0 *setmode(const char *);=
=C2=A0int=C2=A0 =C2=A0 =C2=A0setpgrp(pid_t, pid_t);=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/* obsoleted by setpgid() */
=C2=A0void=C2=A0 =C2=A0 setproctitle(const char *_fmt, ...) __printf0like(1= , 2);
=C2=A0void=C2=A0 =C2=A0 setproctitle_fast(const char *_fmt, ...) __printf0l= ike(1, 2);
+int=C2=A0 =C2=A0 =C2=A0setresgid(gid_t, gid_t, gid_t);
+int=C2=A0 =C2=A0 =C2=A0setresuid(uid_t, uid_t, uid_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0setrgid(gid_t);
=C2=A0int=C2=A0 =C2=A0 =C2=A0setruid(uid_t);
=C2=A0void=C2=A0 =C2=A0 setusershell(void);
@@ -594,6 +589,7 @@ int=C2=A0 undelete(const char *);
=C2=A0int=C2=A0 =C2=A0 =C2=A0unwhiteout(const char *);
=C2=A0void=C2=A0 =C2=A0*valloc(size_t);=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 /* obsoleted by malloc() *= /
=C2=A0int=C2=A0 =C2=A0 =C2=A0funlinkat(int, const char *, int, int);
+pid_t=C2=A0 =C2=A0_Fork(void);

=C2=A0#ifndef _OPTRESET_DECLARED
=C2=A0#define=C2=A0 =C2=A0 =C2=A0 =C2=A0 _OPTRESET_DECLARED
diff --git a/include/wchar.h b/include/wchar.h
index a8c016c42faf..e4b037c9b16f 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -235,13 +235,10 @@ size_t=C2=A0 =C2=A0 wcsnrtombs(char * __restrict, con= st wchar_t ** __restrict, size_t,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 size_t, mbstate_t * __restrict);<= br> =C2=A0#endif

-#if __POSIX_VISIBLE >=3D 202405
-size_t wcslcat(wchar_t *, const wchar_t *, size_t);
-size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
-#endif
-
=C2=A0#if __BSD_VISIBLE
=C2=A0wchar_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 *fgetwln(FILE * __restrict, size_t= * __restrict);
+size_t wcslcat(wchar_t *, const wchar_t *, size_t);
+size_t wcslcpy(wchar_t *, const wchar_t *, size_t);
=C2=A0#endif

=C2=A0#if __POSIX_VISIBLE >=3D 200809 || defined(_XLOCALE_H_)
--0000000000008eff690630c32596-- From nobody Thu Mar 20 10:19:05 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJM4T6Bc3z5rc09; Thu, 20 Mar 2025 10:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJM4T5bMGz3SwY; Thu, 20 Mar 2025 10:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742465945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZF/Oz/5F/fZ4YpopSBnseQvYNyRLmfO+aaK+azU1yE=; b=IKpDeT+OIxw+m6ivEuUcu5DIfEeo0S9V0jtKPQPmX3ouOcLlw3G7XUTh6EcXJymyjTwVwp nyE+D7m2cxabgWBNB6YxDZYSOkcN31SK0ZqjPKQpYHLjYTux57fnuTUHZilCZWEM4jav5D Gs3l5T4jY4fi/7irgKYHDunw/tDjKBR22BZ98q5WNTZIHZh50RyfGH6qpmYOPC7xoES24u KnX4N3kqiSyruhHk4yh8WMAE2OCsG7rW5m8vdtK5W5J2KXbmDoyrGExaSTA9R6roA2JOS3 nBiHquD5jK33IgCV7sBupyOZcjtq4cTEPT29QcI75XA+sEYbRKKLxhQm90V+Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742465945; a=rsa-sha256; cv=none; b=nqUPQ3gGkyfc5Bes3HbSWba/zJzcYTep7VJTbDqIPATsgaA2PUONS2hhUMV3viypRDv67i KzLXivDI6A00NRlIF0hjOQXnCGcTirv1o19c2xdURDXVHNPAr1LNjbFCRVc1/YV4XDdsmV pUH+gtarm2e80AQWBdJT5dmABD116l6pwrZkM+7K6YApiUYaHr0IOFRm8Ndil+Z+orqfWi VbqpGixjrACFTtW/L/omBNC3M+s4uy42p4NGzqSY9kix6jflz1495T3QBcwIodmO6n4eQA QjXRTXhL8mPTGo3zJkhCNeueUIebQauTVRoqF8r/mXXY5Q1vSDOnmMzHzXFpAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742465945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZF/Oz/5F/fZ4YpopSBnseQvYNyRLmfO+aaK+azU1yE=; b=JegVJVXna21KRcDH7yvSiKIM8LmvaXCyCO4dteE3/P33FGASUkVToeK0M/M2SpcI5iXe4Q ebTGXXXVTVP1uvWO/NlF/xfoqVtUDvZQ0juAfxiEujci8iUR1H1Szo4ypcy3RZtZoZz1fD lpsHTfop6C4j98mVKWl8zA24ZRpK+wie/Jes3lnvXppgS78VWiR1IkGY+H92JHjGc685Vc Nbs3XiFeUAU51t+kGPEmDqOS96x7VBQUfwdMflsXfNT9R0516NBvgtkgeFRBeFq1ZKaoSZ X+vZvXU2sznyXV5RZtrr5zYtoNqsLJ5lVzCg9nQSTv9wLQzb/mSHWRm9wYmu8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJM4T4jKkz11yb; Thu, 20 Mar 2025 10:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KAJ5HT083698; Thu, 20 Mar 2025 10:19:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KAJ5PM083695; Thu, 20 Mar 2025 10:19:05 GMT (envelope-from git) Date: Thu, 20 Mar 2025 10:19:05 GMT Message-Id: <202503201019.52KAJ5PM083695@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 7577dae4d672 - stable/14 - caroot: update the root bundle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7577dae4d67216c602dc11e2388d190a2c9dc9ff Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=7577dae4d67216c602dc11e2388d190a2c9dc9ff commit 7577dae4d67216c602dc11e2388d190a2c9dc9ff Author: Michael Osipov AuthorDate: 2025-03-07 18:58:55 +0000 Commit: Michael Osipov CommitDate: 2025-03-20 10:18:27 +0000 caroot: update the root bundle Summary: - Seven (7) new roots - Four (4) distrusted roots - Fifteen (15) removed (expired) roots Reviewed by: kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49294 (cherry picked from commit 0100da4deb96e15acf72d7655127c6faafa4148f) --- ObsoleteFiles.inc | 20 +++ .../caroot/trusted/D-TRUST_BR_Root_CA_2_2023.pem | 139 ++++++++++++++++++++ .../caroot/trusted/D-TRUST_EV_Root_CA_2_2023.pem | 139 ++++++++++++++++++++ .../trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem | 71 +++++++++++ secure/caroot/trusted/SecureSign_Root_CA12.pem | 93 ++++++++++++++ secure/caroot/trusted/SecureSign_Root_CA14.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/SecureSign_Root_CA15.pem | 67 ++++++++++ secure/caroot/trusted/TWCA_CYBER_Root_CA.pem | 137 ++++++++++++++++++++ secure/caroot/untrusted/AddTrust_External_Root.pem | 99 --------------- .../untrusted/AddTrust_Low-Value_Services_Root.pem | 98 --------------- secure/caroot/untrusted/Cybertrust_Global_Root.pem | 99 --------------- secure/caroot/untrusted/DST_Root_CA_X3.pem | 92 -------------- .../untrusted/E-Tugra_Certification_Authority.pem | 140 --------------------- .../Entrust_Root_Certification_Authority_-_G4.pem | 0 secure/caroot/untrusted/GeoTrust_Global_CA.pem | 90 ------------- .../caroot/untrusted/GlobalSign_Root_CA_-_R2.pem | 99 --------------- .../caroot/untrusted/Hongkong_Post_Root_CA_1.pem | 89 ------------- secure/caroot/untrusted/QuoVadis_Root_CA.pem | 116 ----------------- .../{trusted => untrusted}/SecureSign_RootCA11.pem | 0 .../Security_Communication_RootCA3.pem | 0 .../untrusted/Security_Communication_Root_CA.pem | 91 -------------- secure/caroot/untrusted/Sonera_Class_2_Root_CA.pem | 90 ------------- .../untrusted/Staat_der_Nederlanden_EV_Root_CA.pem | 134 -------------------- .../Staat_der_Nederlanden_Root_CA_-_G2.pem | 137 -------------------- .../SwissSign_Silver_CA_-_G2.pem | 0 secure/caroot/untrusted/Trustis_FPS_Root_CA.pem | 91 -------------- 26 files changed, 801 insertions(+), 1465 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f3fec428ff4a..1ca9432d91d6 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,26 @@ # xargs -n1 | sort | uniq -d; # done +# 20250310: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority_-_G4.pem +OLD_FILES+=usr/share/certs/trusted/SecureSign_RootCA11.pem +OLD_FILES+=usr/share/certs/trusted/Security_Communication_RootCA3.pem +OLD_FILES+=usr/share/certs/trusted/SwissSign_Silver_CA_-_G2.pem +OLD_FILES+=usr/share/certs/untrusted/AddTrust_External_Root.pem +OLD_FILES+=usr/share/certs/untrusted/AddTrust_Low-Value_Services_Root.pem +OLD_FILES+=usr/share/certs/untrusted/Staat_der_Nederlanden_Root_CA_-_G2.pem +OLD_FILES+=usr/share/certs/untrusted/Cybertrust_Global_Root.pem +OLD_FILES+=usr/share/certs/untrusted/DST_Root_CA_X3.pem +OLD_FILES+=usr/share/certs/untrusted/GlobalSign_Root_CA_-_R2.pem +OLD_FILES+=usr/share/certs/untrusted/QuoVadis_Root_CA.pem +OLD_FILES+=usr/share/certs/untrusted/Sonera_Class_2_Root_CA.pem +OLD_FILES+=usr/share/certs/untrusted/GeoTrust_Global_CA.pem +OLD_FILES+=usr/share/certs/untrusted/Staat_der_Nederlanden_EV_Root_CA.pem +OLD_FILES+=usr/share/certs/untrusted/E-Tugra_Certification_Authority.pem +OLD_FILES+=usr/share/certs/untrusted/Hongkong_Post_Root_CA_1.pem +OLD_FILES+=usr/share/certs/untrusted/Security_Communication_Root_CA.pem +OLD_FILES+=usr/share/certs/untrusted/Trustis_FPS_Root_CA.pem + # 20250204: sys/vm/stack test symbols moved to /usr/lib/debug OLD_FILES+=usr/tests/sys/vm/stack/.debug/libsoxstack.so.debug OLD_DIRS+=usr/tests/sys/vm/stack/.debug diff --git a/secure/caroot/trusted/D-TRUST_BR_Root_CA_2_2023.pem b/secure/caroot/trusted/D-TRUST_BR_Root_CA_2_2023.pem new file mode 100644 index 000000000000..32d0d9dbdf0c --- /dev/null +++ b/secure/caroot/trusted/D-TRUST_BR_Root_CA_2_2023.pem @@ -0,0 +1,139 @@ +## +## D-TRUST BR Root CA 2 2023 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 73:3b:30:04:48:5b:d9:4d:78:2e:73:4b:c9:a1:dc:66 + Signature Algorithm: sha512WithRSAEncryption + Issuer: C = DE, O = D-Trust GmbH, CN = D-TRUST BR Root CA 2 2023 + Validity + Not Before: May 9 08:56:31 2023 GMT + Not After : May 9 08:56:30 2038 GMT + Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST BR Root CA 2 2023 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:ae:ff:09:59:91:80:0a:4a:68:e6:24:3f:b8:a7: + e4:c8:3a:0a:3a:16:cd:c9:23:61:a0:93:71:f2:ab: + 8b:73:8f:a0:67:65:60:d2:54:6b:63:51:6f:49:33: + e0:72:07:13:7d:38:cd:06:92:07:29:52:6b:4e:77: + 6c:04:d3:95:fa:dd:4c:8c:d9:5d:c1:61:7d:4b:e7: + 28:b3:44:81:7b:51:af:dd:33:b1:68:7c:d6:4e:4c: + fe:2b:68:b9:ca:66:69:c4:ec:5e:57:7f:f7:0d:c7: + 9c:36:36:e5:07:60:ac:c0:4c:ea:08:6c:ef:06:7c: + 4f:5b:28:7a:08:fc:93:5d:9b:f6:9c:b4:8b:86:ba: + 21:b9:f4:f0:e8:59:5a:28:a1:34:84:1a:25:91:b6: + b5:8f:ef:b2:f9:80:fa:f9:3d:3c:11:72:d8:e3:2f: + 86:76:c5:79:2c:c1:a9:90:93:46:98:67:cb:83:6a: + a0:50:23:a7:3b:f6:81:39:e0:ed:f0:b9:bf:65:f1: + d8:cb:7a:fb:ef:73:03:ce:00:f4:7d:d7:e0:5d:3b: + 66:b8:dc:8e:ba:83:cb:87:76:03:fc:25:d9:e7:23: + 6f:06:fd:67:f3:e0:ff:84:bc:47:bf:b5:16:18:46: + 69:14:cc:05:f7:db:d3:49:ac:6b:cc:ab:e4:b5:0b: + 43:24:5e:4b:6b:4d:67:df:d6:b5:3e:4f:78:1f:94: + 71:24:ea:de:70:fc:f1:93:fe:9e:93:5a:e4:94:5a: + 97:54:0c:35:7b:5f:6c:ee:00:1f:24:ec:03:ba:02: + f5:76:f4:9f:d4:9a:ed:85:2c:38:22:2f:c7:d8:2f: + 76:11:4f:fd:6c:5c:e8:f5:8e:27:87:7f:19:4a:21: + 47:90:1d:79:8d:1c:5b:f8:cf:4a:85:e4:ed:b3:5b: + 8d:be:c4:64:28:5d:41:c4:6e:ac:38:5a:4f:23:74: + 74:a9:12:c3:f6:d2:b9:11:15:33:07:91:d8:3b:37: + 3a:63:30:06:d1:c5:22:36:28:62:23:10:e0:46:cc: + 97:ac:d6:2b:5d:64:24:d5:ee:1c:0e:de:fb:08:5a: + 75:2a:f6:63:6d:ce:0b:42:be:d1:ba:70:1c:9c:21: + e5:0f:31:69:17:d7:fc:0a:b4:de:ed:80:9c:cb:92: + b4:8b:f5:de:59:a2:58:09:a5:63:47:0b:e1:41:32: + 34:41:d9:9a:b1:d9:a8:b0:1b:5a:de:0d:0d:f4:e2: + b2:5d:35:80:b9:81:d4:84:69:91:02:cb:75:d0:8d: + c5:b5:3d:09:91:09:8f:14:a1:14:74:79:3e:d6:c9: + 15:1d:a4:59:59:22:dc:f6:8a:45:3d:3c:12:d6:3e: + 5d:32:2f + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 67:90:F0:D6:DE:B5:18:D5:46:29:7E:5C:AB:F8:9E:08:BC:64:95:10 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 CRL Distribution Points: + Full Name: + URI:http://crl.d-trust.net/crl/d-trust_br_root_ca_2_2023.crl + Signature Algorithm: sha512WithRSAEncryption + Signature Value: + 34:f7:b3:77:53:db:30:16:b9:2d:a5:21:f1:40:21:75:eb:eb: + 48:16:81:3d:73:e0:9e:27:2a:eb:77:a9:13:a4:6a:0a:5a:5a: + 14:33:3d:68:1f:81:ae:69:fd:8c:9f:65:6c:34:42:d9:2d:d0: + 7f:78:16:b1:3a:ac:23:31:ad:5e:7f:ae:e7:ae:2b:fa:ba:fc: + 3c:97:95:40:93:5f:c3:2d:03:a3:ed:a4:6f:53:d7:fa:40:0e: + 30:f5:00:20:2c:00:4c:8c:3b:b4:a3:1f:b6:bf:91:32:ab:af: + 92:98:d3:16:e6:d4:d1:54:5c:43:5b:2e:ae:ef:57:2a:a8:b4: + 6f:a4:ef:0d:56:14:da:21:ab:20:76:9e:03:fc:26:b8:9e:3f: + 3e:03:26:e6:4c:db:9d:5f:42:84:3d:45:03:03:1c:59:88:ca: + dc:2e:61:24:5a:a4:ea:27:0b:73:12:be:52:b3:0a:cf:32:17: + e2:1e:87:1a:16:95:48:6d:5a:e0:d0:cf:09:92:26:66:91:d8: + a3:61:0e:aa:81:81:7f:e8:52:82:d1:42:e7:e0:1d:18:fa:a4: + 85:36:e7:86:e0:0d:eb:bc:d4:c9:d6:3c:43:f1:5d:49:6e:7e: + 81:9b:69:b5:89:62:8f:88:52:d8:d7:fe:27:c1:23:c5:cb:2b: + 02:bb:b1:5f:fe:fb:43:85:03:46:be:5d:c6:ca:21:26:ff:d7: + 02:9e:74:4a:dc:f8:13:15:b1:81:57:36:cb:65:5c:d1:1d:31: + 77:e9:25:c3:c3:b2:32:37:d5:f1:98:09:e4:6d:63:80:08:ab: + 06:92:81:d4:e9:70:8f:a7:3f:b2:ed:86:8c:82:6a:35:c8:42: + 5a:82:d1:52:1a:45:0f:15:a5:00:f0:94:7b:65:27:57:39:43: + cf:7c:7f:e6:bd:35:b3:7b:f1:19:4c:de:3a:96:cf:e9:76:ee: + 03:e7:c2:43:52:3c:6a:81:e8:c1:5a:80:bd:11:5d:93:6b:fb: + c7:e6:64:3f:bb:69:1c:e9:dd:25:8b:af:74:c9:54:40:ca:cb: + 93:13:0a:ed:fb:66:92:11:ca:f5:c0:fa:d8:83:55:03:7c:d3: + c5:22:46:75:70:6b:79:48:06:2a:82:9a:bf:e6:eb:16:0e:22: + 45:01:bc:dd:36:94:34:a9:35:26:8a:d7:97:b9:ee:08:72:bf: + 34:92:70:83:80:ab:38:aa:59:68:dd:40:a4:18:90:b2:f3:d5: + 03:ca:26:ca:ef:d5:c7:e0:8f:53:8e:f0:00:e3:a8:ed:9f:f9: + ad:77:e0:2b:63:4f:9e:c3:ee:37:bb:78:09:84:9e:b9:6e:fb: + 29:99:90:e8:80:d3:9f:24 +SHA1 Fingerprint=2D:B0:70:EE:71:94:AF:69:68:17:DB:79:CE:58:9F:A0:6B:96:F7:87 +-----BEGIN CERTIFICATE----- +MIIFqTCCA5GgAwIBAgIQczswBEhb2U14LnNLyaHcZjANBgkqhkiG9w0BAQ0FADBI +MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE +LVRSVVNUIEJSIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA4NTYzMVoXDTM4MDUw +OTA4NTYzMFowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi +MCAGA1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBAK7/CVmRgApKaOYkP7in5Mg6CjoWzckjYaCTcfKr +i3OPoGdlYNJUa2NRb0kz4HIHE304zQaSBylSa053bATTlfrdTIzZXcFhfUvnKLNE +gXtRr90zsWh81k5M/itoucpmacTsXld/9w3HnDY25QdgrMBM6ghs7wZ8T1soegj8 +k12b9py0i4a6Ibn08OhZWiihNIQaJZG2tY/vsvmA+vk9PBFy2OMvhnbFeSzBqZCT +Rphny4NqoFAjpzv2gTng7fC5v2Xx2Mt6++9zA84A9H3X4F07ZrjcjrqDy4d2A/wl +2ecjbwb9Z/Pg/4S8R7+1FhhGaRTMBffb00msa8yr5LULQyReS2tNZ9/WtT5PeB+U +cSTq3nD88ZP+npNa5JRal1QMNXtfbO4AHyTsA7oC9Xb0n9Sa7YUsOCIvx9gvdhFP +/Wxc6PWOJ4d/GUohR5AdeY0cW/jPSoXk7bNbjb7EZChdQcRurDhaTyN0dKkSw/bS +uREVMweR2Ds3OmMwBtHFIjYoYiMQ4EbMl6zWK11kJNXuHA7e+whadSr2Y23OC0K+ +0bpwHJwh5Q8xaRfX/Aq03u2AnMuStIv13lmiWAmlY0cL4UEyNEHZmrHZqLAbWt4N +DfTisl01gLmB1IRpkQLLddCNxbU9CZEJjxShFHR5PtbJFR2kWVki3PaKRT08EtY+ +XTIvAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUZ5Dw1t61 +GNVGKX5cq/ieCLxklRAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG +OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfYnJfcm9vdF9jYV8y +XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQA097N3U9swFrktpSHxQCF16+tI +FoE9c+CeJyrrd6kTpGoKWloUMz1oH4Guaf2Mn2VsNELZLdB/eBaxOqwjMa1ef67n +riv6uvw8l5VAk1/DLQOj7aRvU9f6QA4w9QAgLABMjDu0ox+2v5Eyq6+SmNMW5tTR +VFxDWy6u71cqqLRvpO8NVhTaIasgdp4D/Ca4nj8+AybmTNudX0KEPUUDAxxZiMrc +LmEkWqTqJwtzEr5SswrPMhfiHocaFpVIbVrg0M8JkiZmkdijYQ6qgYF/6FKC0ULn +4B0Y+qSFNueG4A3rvNTJ1jxD8V1Jbn6Bm2m1iWKPiFLY1/4nwSPFyysCu7Ff/vtD +hQNGvl3GyiEm/9cCnnRK3PgTFbGBVzbLZVzRHTF36SXDw7IyN9XxmAnkbWOACKsG +koHU6XCPpz+y7YaMgmo1yEJagtFSGkUPFaUA8JR7ZSdXOUPPfH/mvTWze/EZTN46 +ls/pdu4D58JDUjxqgejBWoC9EV2Ta/vH5mQ/u2kc6d0li690yVRAysuTEwrt+2aS +Ecr1wPrYg1UDfNPFIkZ1cGt5SAYqgpq/5usWDiJFAbzdNpQ0qTUmiteXue4Icr80 +knCDgKs4qllo3UCkGJCy89UDyibK79XH4I9TjvAA46jtn/mtd+ArY0+ew+43u3gJ +hJ65bvspmZDogNOfJA== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/D-TRUST_EV_Root_CA_2_2023.pem b/secure/caroot/trusted/D-TRUST_EV_Root_CA_2_2023.pem new file mode 100644 index 000000000000..5325b545bb3f --- /dev/null +++ b/secure/caroot/trusted/D-TRUST_EV_Root_CA_2_2023.pem @@ -0,0 +1,139 @@ +## +## D-TRUST EV Root CA 2 2023 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 69:26:09:7e:80:4b:4c:a0:a7:8c:78:62:53:5f:5a:6f + Signature Algorithm: sha512WithRSAEncryption + Issuer: C = DE, O = D-Trust GmbH, CN = D-TRUST EV Root CA 2 2023 + Validity + Not Before: May 9 09:10:33 2023 GMT + Not After : May 9 09:10:32 2038 GMT + Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST EV Root CA 2 2023 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:d8:8e:a3:89:80:0b:b2:57:52:dc:a9:53:4c:37: + b9:7f:63:17:13:ef:a7:5b:23:5b:69:75:b0:99:0a: + 17:c1:8b:c4:db:a8:e0:cc:31:ba:c2:f2:cd:5d:e9: + b7:f8:1d:af:6a:c4:95:87:d7:47:c9:95:d8:82:04: + 50:3d:81:08:ff:e4:3d:b3:b1:d6:c5:b2:fd:88:09: + db:9c:84:ec:25:17:14:87:7f:30:78:9b:6a:58:c9: + b6:73:28:3c:34:f7:99:f7:7f:d3:a6:f8:1c:45:7c: + ad:2c:8c:94:3f:d8:67:10:53:7e:22:cd:4e:25:51: + f0:25:24:35:11:5e:10:c6:ec:87:66:89:81:68:ba: + cc:2b:9d:47:73:1f:bd:cd:91:a4:72:6a:9c:a2:1b: + 18:a0:6f:ec:50:f4:7d:40:c2:a8:30:cf:bd:73:c8: + 13:2b:10:13:1e:8b:9a:a8:3a:94:73:d3:18:69:0a: + 4a:ff:c1:01:03:ff:79:7f:b5:48:7f:7b:ee:e8:29: + 6f:36:4c:95:61:86:d8:f9:a2:73:8a:ee:ae:2f:96: + ee:68:cd:3d:4d:28:42:f9:45:2b:32:1b:46:55:16: + 6a:a6:4b:29:f9:bb:95:56:bf:46:1d:ec:1d:93:1d: + c0:65:b2:1f:a1:43:ae:56:9e:a0:b1:8f:6b:12:b7: + 60:6d:78:0b:ca:8a:5c:ed:1e:96:0e:83:a6:48:95: + 8d:3b:a3:21:c4:ae:58:c6:00:b2:84:b4:23:a4:96: + 86:35:b8:d8:9e:d8:ac:34:49:98:63:95:c5:cb:6d: + 48:47:e2:f2:2e:18:1e:d0:31:ab:dd:74:ec:f9:dc: + 8c:b8:1c:8e:68:23:ba:d0:f3:50:dc:cf:65:8f:73: + 3a:32:c7:7c:fe:ca:82:22:4f:be:8e:62:47:66:e5: + cd:87:e2:e8:d5:0f:18:9f:e5:04:72:4b:46:3c:10: + f2:44:c2:64:56:71:4e:75:e8:9c:c9:26:74:c5:7d: + 59:d1:0a:5b:0f:6d:fe:9e:75:1c:18:c6:1a:3a:7c: + d8:0d:04:cc:cd:b7:45:65:7a:b1:8f:b8:ae:84:48: + 3e:b3:7a:4d:a8:03:e2:e2:7e:01:16:59:68:18:43: + 33:b0:d2:dc:b0:1a:43:35:ee:a5:da:a9:46:5c:ae: + 86:81:41:01:4a:74:26:ec:9f:06:bf:c2:05:37:64: + 75:78:29:68:fd:c5:f5:eb:fe:47:f9:e4:85:b0:e1: + 7b:31:9d:a6:7f:72:a3:b9:c4:2c:2e:cc:99:57:0e: + 21:0c:45:01:94:65:eb:65:09:c6:63:22:0b:33:49: + 92:48:3c:fc:cd:ce:b0:3e:8e:9e:8b:f8:fe:49:c5: + 35:72:47 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + AA:FC:91:10:1B:87:91:5F:16:B9:BF:4F:4B:91:5E:00:1C:B1:32:80 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 CRL Distribution Points: + Full Name: + URI:http://crl.d-trust.net/crl/d-trust_ev_root_ca_2_2023.crl + Signature Algorithm: sha512WithRSAEncryption + Signature Value: + 93:cb:a5:1f:99:11:ec:9a:0d:5f:2c:15:93:c6:3f:be:10:8d: + 78:42:f0:6e:90:47:47:8e:a3:92:32:8d:70:8f:f6:5b:8d:be: + 89:ce:47:01:6a:1b:20:20:89:5b:c8:82:10:6c:e0:e7:99:aa: + 6b:c6:2a:a0:63:35:91:6a:85:25:ad:17:38:a5:9b:7e:50:f2: + 76:ea:85:05:2a:27:41:2b:b1:81:d1:a2:f6:40:75:a9:0e:cb: + f1:55:48:d8:ec:d1:ec:b3:e8:ce:14:a1:35:ec:c2:5e:35:1a: + ab:a6:16:01:06:8e:ea:dc:2f:a3:8a:ca:2c:91:eb:52:8e:5f: + 0c:9b:17:cf:cb:73:07:19:c4:6a:c2:73:54:ef:7c:43:52:63: + c1:11:ca:c2:45:b1:f4:3b:53:f5:69:ae:3c:e3:a5:de:ac:e8: + 54:b7:b2:91:fd:ac:a9:1f:f2:87:e4:17:c6:49:a8:7c:d8:0a: + 41:f4:f2:3e:e7:77:34:04:52:dd:e8:81:f2:4d:2f:54:45:9d: + 15:e1:4f:cc:e5:de:34:57:10:c9:23:72:17:70:8d:50:70:1f: + 56:6c:cc:b9:ff:3a:5a:4f:63:7a:c3:6e:65:07:1d:84:a1:ff: + a9:0c:63:89:6d:b2:40:88:39:d7:1f:77:68:b5:fc:9c:d5:d6: + 67:69:5b:a8:74:db:fc:89:f6:1b:32:f7:a4:24:a6:76:b7:47: + 53:ef:8d:49:8f:a9:b6:83:5a:a5:96:90:45:61:f5:de:03:4f: + 26:0f:a8:8b:f0:03:96:b0:ac:15:d0:71:5a:6a:7b:94:e6:70: + 93:da:f1:69:e0:b2:62:4d:9e:8f:ff:89:9d:9b:5d:cd:45:e9: + 94:02:22:8d:e0:35:7f:e8:f1:04:79:71:6c:54:83:f8:33:b9: + 05:32:1b:58:55:11:4f:d0:e5:27:47:71:ec:ed:da:67:d6:62: + a6:4b:4d:0f:69:a2:c9:bc:ec:22:4b:94:c7:68:94:17:7e:e2: + 8e:28:3e:b6:c6:ea:f5:34:6c:9f:37:88:07:38:db:86:71:fa: + cd:95:48:43:6e:a3:4f:82:87:d7:34:98:6e:4b:93:79:60:75: + 69:0f:f0:1a:d5:53:fa:21:0c:c2:3f:e9:3f:1f:18:8c:92:5d: + 78:a7:76:67:19:bb:b2:ea:7f:e9:70:09:56:56:a3:b0:0c:0b: + 2d:36:5e:c5:e9:c4:d5:83:cb:86:17:97:2c:6c:13:6f:87:5a: + af:49:a6:1d:db:cd:38:04:2e:5f:e2:4a:35:0e:2d:4b:f8:a2: + 24:04:8d:d8:e1:63:5e:02:92:34:da:98:61:5c:1c:6f:58:76: + 64:b3:fc:02:b8:f5:9d:0a +SHA1 Fingerprint=A5:5B:D8:47:6C:8F:19:F7:4C:F4:6D:6B:B6:C2:79:82:22:DF:54:8B +-----BEGIN CERTIFICATE----- +MIIFqTCCA5GgAwIBAgIQaSYJfoBLTKCnjHhiU19abzANBgkqhkiG9w0BAQ0FADBI +MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlE +LVRSVVNUIEVWIFJvb3QgQ0EgMiAyMDIzMB4XDTIzMDUwOTA5MTAzM1oXDTM4MDUw +OTA5MTAzMlowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEi +MCAGA1UEAxMZRC1UUlVTVCBFViBSb290IENBIDIgMjAyMzCCAiIwDQYJKoZIhvcN +AQEBBQADggIPADCCAgoCggIBANiOo4mAC7JXUtypU0w3uX9jFxPvp1sjW2l1sJkK +F8GLxNuo4MwxusLyzV3pt/gdr2rElYfXR8mV2IIEUD2BCP/kPbOx1sWy/YgJ25yE +7CUXFId/MHibaljJtnMoPDT3mfd/06b4HEV8rSyMlD/YZxBTfiLNTiVR8CUkNRFe +EMbsh2aJgWi6zCudR3Mfvc2RpHJqnKIbGKBv7FD0fUDCqDDPvXPIEysQEx6Lmqg6 +lHPTGGkKSv/BAQP/eX+1SH977ugpbzZMlWGG2Pmic4ruri+W7mjNPU0oQvlFKzIb +RlUWaqZLKfm7lVa/Rh3sHZMdwGWyH6FDrlaeoLGPaxK3YG14C8qKXO0elg6DpkiV +jTujIcSuWMYAsoS0I6SWhjW42J7YrDRJmGOVxcttSEfi8i4YHtAxq9107PncjLgc +jmgjutDzUNzPZY9zOjLHfP7KgiJPvo5iR2blzYfi6NUPGJ/lBHJLRjwQ8kTCZFZx +TnXonMkmdMV9WdEKWw9t/p51HBjGGjp82A0EzM23RWV6sY+4roRIPrN6TagD4uJ+ +ARZZaBhDM7DS3LAaQzXupdqpRlyuhoFBAUp0JuyfBr/CBTdkdXgpaP3F9ev+R/nk +hbDhezGdpn9yo7nELC7MmVcOIQxFAZRl62UJxmMiCzNJkkg8/M3OsD6Onov4/knF +NXJHAgMBAAGjgY4wgYswDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqvyREBuH +kV8Wub9PS5FeAByxMoAwDgYDVR0PAQH/BAQDAgEGMEkGA1UdHwRCMEAwPqA8oDqG +OGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfZXZfcm9vdF9jYV8y +XzIwMjMuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQCTy6UfmRHsmg1fLBWTxj++EI14 +QvBukEdHjqOSMo1wj/Zbjb6JzkcBahsgIIlbyIIQbODnmaprxiqgYzWRaoUlrRc4 +pZt+UPJ26oUFKidBK7GB0aL2QHWpDsvxVUjY7NHss+jOFKE17MJeNRqrphYBBo7q +3C+jisosketSjl8MmxfPy3MHGcRqwnNU73xDUmPBEcrCRbH0O1P1aa4846XerOhU +t7KR/aypH/KH5BfGSah82ApB9PI+53c0BFLd6IHyTS9URZ0V4U/M5d40VxDJI3IX +cI1QcB9WbMy5/zpaT2N6w25lBx2Eof+pDGOJbbJAiDnXH3dotfyc1dZnaVuodNv8 +ifYbMvekJKZ2t0dT741Jj6m2g1qllpBFYfXeA08mD6iL8AOWsKwV0HFaanuU5nCT +2vFp4LJiTZ6P/4mdm13NRemUAiKN4DV/6PEEeXFsVIP4M7kFMhtYVRFP0OUnR3Hs +7dpn1mKmS00PaaLJvOwiS5THaJQXfuKOKD62xur1NGyfN4gHONuGcfrNlUhDbqNP +gofXNJhuS5N5YHVpD/Aa1VP6IQzCP+k/HxiMkl14p3ZnGbuy6n/pcAlWVqOwDAst +Nl7F6cTVg8uGF5csbBNvh1qvSaYd2804BC5f4ko1Di1L+KIkBI3Y4WNeApI02phh +XBxvWHZks/wCuPWdCg== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem b/secure/caroot/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem new file mode 100644 index 000000000000..c3372985be38 --- /dev/null +++ b/secure/caroot/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem @@ -0,0 +1,71 @@ +## +## FIRMAPROFESIONAL CA ROOT-A WEB +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 31:97:21:ed:af:89:42:7f:35:41:87:a1:67:56:4c:6d + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = ES, O = Firmaprofesional SA, organizationIdentifier = VATES-A62634068, CN = FIRMAPROFESIONAL CA ROOT-A WEB + Validity + Not Before: Apr 6 09:01:36 2022 GMT + Not After : Mar 31 09:01:36 2047 GMT + Subject: C = ES, O = Firmaprofesional SA, organizationIdentifier = VATES-A62634068, CN = FIRMAPROFESIONAL CA ROOT-A WEB + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:47:53:ea:2c:11:a4:77:c7:2a:ea:f3:d6:5f:7b: + d3:04:91:5c:fa:88:c6:22:b9:83:10:62:77:84:33: + 2d:e9:03:88:d4:e0:33:f7:ed:77:2c:4a:60:ea:e4: + 6f:ad:6d:b4:f8:4c:8a:a4:e4:1f:ca:ea:4f:38:4a: + 2e:82:73:2b:c7:66:9b:0a:8c:40:9c:7c:8a:f6:f2: + 39:60:b2:de:cb:ec:b8:e4:6f:ea:9b:5d:b7:53:90: + 18:32:55:c5:20:b7:94 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + 93:E1:43:63:5C:3C:9D:D6:27:F3:52:EC:17:B2:A9:AF:2C:F7:76:F8 + X509v3 Subject Key Identifier: + 93:E1:43:63:5C:3C:9D:D6:27:F3:52:EC:17:B2:A9:AF:2C:F7:76:F8 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:65:02:30:1d:7c:a4:7b:c3:89:75:33:e1:3b:a9:45:bf:46: + e9:e9:a1:dd:c9:22:16:b7:47:11:0b:d8:9a:ba:f1:c8:0b:70: + 50:53:02:91:70:85:59:a9:1e:a4:e6:ea:23:31:a0:00:02:31: + 00:fd:e2:f8:b3:af:16:b9:1e:73:c4:96:e3:c1:30:19:d8:7e: + e6:c3:97:de:1c:4f:b8:89:2f:33:eb:48:0f:19:f7:87:46:5d: + 26:90:a5:85:c5:b9:7a:94:3e:87:a8:bd:00 +SHA1 Fingerprint=A8:31:11:74:A6:14:15:0D:CA:77:DD:0E:E4:0C:5D:58:FC:A0:72:A5 +-----BEGIN CERTIFICATE----- +MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQsw +CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE +YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB +IFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2WhcNNDcwMzMxMDkwMTM2WjBuMQsw +CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE +YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB +IFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zf +e9MEkVz6iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6C +cyvHZpsKjECcfIr28jlgst7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB +/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FDY1w8ndYn81LsF7Kpryz3dvgwHQYDVR0O +BBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO +PQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgLcFBTApFw +hVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dG +XSaQpYXFuXqUPoeovQA= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/SecureSign_Root_CA12.pem b/secure/caroot/trusted/SecureSign_Root_CA12.pem new file mode 100644 index 000000000000..0e2b8a20edb2 --- /dev/null +++ b/secure/caroot/trusted/SecureSign_Root_CA12.pem @@ -0,0 +1,93 @@ +## +## SecureSign Root CA12 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 66:f9:c7:c1:af:ec:c2:51:b4:ed:53:97:e6:e6:82:c3:2b:1c:90:16 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = JP, O = "Cybertrust Japan Co., Ltd.", CN = SecureSign Root CA12 + Validity + Not Before: Apr 8 05:36:46 2020 GMT + Not After : Apr 8 05:36:46 2040 GMT + Subject: C = JP, O = "Cybertrust Japan Co., Ltd.", CN = SecureSign Root CA12 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (2048 bit) + Modulus: + 00:ba:39:c1:37:7a:68:45:2b:14:b4:eb:e4:13:eb: + 57:75:23:4d:8f:24:2d:16:e8:ae:8e:c9:7d:a4:57: + 3b:2a:76:25:33:83:6c:ea:32:8a:94:9b:4e:3c:96: + e4:fd:51:bf:99:c9:93:7e:bf:f9:ad:a7:b2:48:2b: + 07:1c:27:f5:4c:bc:70:12:77:a4:85:54:b5:fd:90: + 7a:e4:a3:e4:51:58:03:cd:10:79:79:ee:6b:93:1f: + 64:8e:6b:64:ab:a3:13:e3:71:fe:7d:ab:9c:dd:27: + 53:37:b3:aa:18:c2:59:26:ec:5b:1f:d2:e6:65:7c: + ef:93:bd:d8:58:5c:0b:c0:e3:65:6f:3c:c7:ca:59: + e3:fe:6e:5f:ac:83:be:fd:5d:25:4e:2a:29:3b:d6: + 0b:ab:17:32:78:a4:e1:3e:94:46:be:62:6e:9b:de: + 46:a8:b1:16:e7:85:6e:f4:08:40:45:11:a0:9e:54: + 44:84:f7:d8:36:ce:f5:50:47:dc:2c:30:9b:ee:c0: + f5:96:d2:fe:09:86:c7:06:59:ae:4f:ae:8e:11:98: + 7b:f3:0b:52:aa:62:26:aa:21:df:8e:25:33:79:97: + 16:49:8d:f5:3e:d5:47:9f:37:31:49:33:72:05:4d: + 0c:b6:55:8c:f1:57:8f:8a:87:d1:ad:c5:11:12:39: + a0:ad + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 57:34:F3:74:CF:04:4B:D5:25:E6:F1:40:B6:2C:4C:D9:2D:E9:A0:AD + Signature Algorithm: sha256WithRSAEncryption + Signature Value: + 3e:bb:db:17:16:d2:f2:14:01:20:2c:38:83:4b:ad:be:ca:85: + 7a:9a:b6:9b:6b:a6:e1:fc:a5:3a:ac:ad:b4:28:3a:af:d7:01: + 83:49:2b:63:a2:dd:9a:64:0e:98:5c:6f:dd:8e:bb:8a:54:22: + 2d:4a:13:f3:ae:40:43:db:4f:91:b7:86:1a:ec:00:b4:41:81: + a4:4f:fa:6a:8b:88:b3:76:08:72:2a:49:40:c3:d3:c3:85:89: + 98:10:a5:9d:6f:19:b7:bb:cf:7a:65:55:db:37:eb:3c:8a:72: + 32:97:1e:9a:29:3e:ad:8d:e6:a3:1b:6d:f5:75:1a:e6:b0:68: + b9:5b:a2:ee:69:47:27:35:a1:86:99:80:f3:33:4b:e1:6b:a4: + 26:c3:ef:74:59:6c:7a:a2:64:b6:1e:44:c3:50:e0:0f:39:3d: + a9:33:f1:a5:f3:d2:bd:62:84:ac:8e:1c:a9:cd:5a:bd:37:3b: + 6e:0a:22:b4:f4:15:e7:91:58:c5:3a:44:d3:95:28:d9:c0:65: + e9:72:ca:d0:0f:bd:1f:b3:15:d9:a9:e3:a4:47:09:9e:e0:cb: + 37:fb:fd:bd:97:d5:be:18:1a:69:a2:39:81:d9:1a:f5:ab:7f: + c8:e3:e2:67:0b:9d:f4:0c:ea:54:df:d2:b2:af:b1:22:f1:20: + df:bc:44:1c +SHA1 Fingerprint=7A:22:1E:3D:DE:1B:06:AC:9E:C8:47:70:16:8E:3C:E5:F7:6B:06:F4 +-----BEGIN CERTIFICATE----- +MIIDcjCCAlqgAwIBAgIUZvnHwa/swlG07VOX5uaCwysckBYwDQYJKoZIhvcNAQEL +BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u +LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExMjAeFw0yMDA0MDgw +NTM2NDZaFw00MDA0MDgwNTM2NDZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD +eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS +b290IENBMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6OcE3emhF +KxS06+QT61d1I02PJC0W6K6OyX2kVzsqdiUzg2zqMoqUm048luT9Ub+ZyZN+v/mt +p7JIKwccJ/VMvHASd6SFVLX9kHrko+RRWAPNEHl57muTH2SOa2SroxPjcf59q5zd +J1M3s6oYwlkm7Fsf0uZlfO+TvdhYXAvA42VvPMfKWeP+bl+sg779XSVOKik71gur +FzJ4pOE+lEa+Ym6b3kaosRbnhW70CEBFEaCeVESE99g2zvVQR9wsMJvuwPWW0v4J +hscGWa5Pro4RmHvzC1KqYiaqId+OJTN5lxZJjfU+1UefNzFJM3IFTQy2VYzxV4+K +h9GtxRESOaCtAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD +AgEGMB0GA1UdDgQWBBRXNPN0zwRL1SXm8UC2LEzZLemgrTANBgkqhkiG9w0BAQsF +AAOCAQEAPrvbFxbS8hQBICw4g0utvsqFepq2m2um4fylOqyttCg6r9cBg0krY6Ld +mmQOmFxv3Y67ilQiLUoT865AQ9tPkbeGGuwAtEGBpE/6aouIs3YIcipJQMPTw4WJ +mBClnW8Zt7vPemVV2zfrPIpyMpcemik+rY3moxtt9XUa5rBouVui7mlHJzWhhpmA +8zNL4WukJsPvdFlseqJkth5Ew1DgDzk9qTPxpfPSvWKErI4cqc1avTc7bgoitPQV +55FYxTpE05Uo2cBl6XLK0A+9H7MV2anjpEcJnuDLN/v9vZfVvhgaaaI5gdka9at/ +yOPiZwud9AzqVN/Ssq+xIvEg37xEHA== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/SecureSign_Root_CA14.pem b/secure/caroot/trusted/SecureSign_Root_CA14.pem new file mode 100644 index 000000000000..261254699085 --- /dev/null +++ b/secure/caroot/trusted/SecureSign_Root_CA14.pem @@ -0,0 +1,135 @@ +## +## SecureSign Root CA14 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 64:db:5a:0c:20:4e:e8:d7:29:77:c8:50:27:a2:5a:27:dd:2d:f2:cb + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = JP, O = "Cybertrust Japan Co., Ltd.", CN = SecureSign Root CA14 + Validity + Not Before: Apr 8 07:06:19 2020 GMT + Not After : Apr 8 07:06:19 2045 GMT + Subject: C = JP, O = "Cybertrust Japan Co., Ltd.", CN = SecureSign Root CA14 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:c5:d2:7a:a1:d6:8a:bf:16:31:d0:98:d1:3a:94: + fc:5a:b8:6e:22:c1:62:f7:a7:0a:27:ef:50:f6:2e: + b1:9e:68:12:f0:6c:24:63:39:f1:f0:df:10:c6:de: + b7:52:20:d5:52:5b:42:99:9e:f3:a0:be:52:1f:5f: + cc:67:6d:a7:2e:50:a2:c1:97:8d:b6:f8:95:f5:b0: + ba:dc:9d:e0:be:cb:df:f7:38:f2:47:f5:a6:9a:92: + 95:2a:62:59:50:0b:a2:b1:35:e7:65:b2:61:b2:ea: + 92:71:69:e4:29:f0:4f:81:81:04:3c:b2:a5:5b:d4: + c5:a8:59:67:7b:55:1c:49:ab:7a:9d:c2:e7:73:4d: + ef:cd:09:c2:c4:57:12:db:01:0e:23:79:09:07:3b: + a2:e8:fc:8a:cf:8f:c0:46:24:9c:38:27:e0:83:9d: + 1b:a0:bf:78:15:10:eb:86:4e:0a:5a:fd:df:da:2c: + 82:7e:ee:ca:f6:29:e1:fa:71:a1:f7:88:68:9c:9c: + f0:8d:be:0f:49:91:d8:ea:3a:f9:fd:d0:68:71:db: + e9:b5:2b:4e:82:92:6f:66:1f:e0:f0:dc:4c:ec:ca: + d1:ea:ba:74:06:f9:b3:84:90:94:d1:5f:8e:73:19: + 10:5d:02:e5:70:a5:c0:10:d0:10:7c:6f:c5:58:49: + b4:b0:6e:9a:da:7d:95:f5:cc:da:02:af:b8:2c:7d: + 79:8f:be:43:f1:f9:28:28:8d:09:43:f8:08:dd:6b: + c8:8b:2c:24:b1:8d:52:07:bd:78:9b:cb:ca:68:b2: + a4:dd:0c:4c:79:60:c6:99:d1:93:f1:30:1a:07:d3: + ae:22:c2:ea:ce:f1:84:09:cc:e0:14:6e:7f:3f:7e: + d2:82:85:ac:dc:a9:16:4e:85:a0:60:cb:f6:9c:d7: + c8:b3:8e:ed:c6:9b:98:75:0d:55:e8:5f:e5:95:8b: + 02:a4:ae:43:29:28:11:a4:e6:12:30:01:4b:75:6b: + 1e:66:9d:79:2f:a5:76:2f:1d:40:b4:6d:c9:7d:79: + 08:ec:d1:6a:b6:5d:2a:b2:a5:66:bd:6b:85:f4:74: + 56:c3:f5:e7:75:52:28:2c:a5:ff:66:47:a5:d4:fe: + fe:9e:54:bf:65:7e:01:d6:30:8f:a5:36:9c:a2:50: + 1c:ee:38:80:01:48:c6:c7:74:f4:c6:ac:c3:40:49: + 16:61:74:2c:af:8c:6f:35:ed:7b:18:00:5b:36:3c: + 9c:50:0d:ca:92:33:10:f1:26:49:6d:df:75:24:37: + 82:22:d7:e8:96:fd:15:4b:02:96:3e:07:72:95:7e: + ab:3d:4c:2e:d7:ca:f0:df:e0:58:3f:2d:2f:04:9a: + 38:a3:01 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + 06:93:A3:0A:5E:28:69:37:AA:61:1D:EB:EB:FC:2D:6F:23:E4:F3:A0 + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + 96:80:72:09:06:7e:9c:cc:93:04:16:bb:a0:3a:8d:92:4e:b7: + 11:1a:0a:71:71:10:cd:04:ad:7f:a5:45:50:10:66:4e:4a:41: + a2:03:d9:11:4f:7a:37:b9:4b:e2:c6:8f:32:66:75:25:fb:eb: + ce:3f:03:29:26:8d:b8:16:1d:f6:1f:33:6e:48:e6:e8:f8:57: + b2:1b:79:df:3b:87:0a:e2:64:ba:00:ca:6c:ef:7e:d0:23:eb: + 78:8f:ff:64:9b:34:37:9f:35:65:a2:a4:00:3d:12:23:96:58: + 5d:ca:63:87:c6:a3:07:88:4d:e7:69:76:8a:53:cd:f1:4f:ec: + 42:f2:93:e3:99:a4:37:3c:87:b8:62:db:f0:ec:1f:37:3f:37: + 5f:43:cc:51:9d:b5:f0:97:c2:b7:85:6a:68:0b:44:1e:e5:51: + ee:93:ce:4b:6e:86:c1:d2:0c:24:59:36:1a:9f:2c:91:8f:e3: + 18:db:94:95:0a:ed:91:aa:0e:99:dc:96:53:e3:61:83:c6:16: + ba:23:ba:dc:dd:7e:1a:c6:7b:42:b6:d9:5a:05:dc:9a:5f:d5: + df:b8:da:47:7d:da:38:db:ac:39:d5:1e:6b:6c:2a:17:8c:61: + cd:b1:6d:72:01:c3:c3:20:00:62:68:16:31:d5:76:aa:86:bb: + 0e:aa:9e:c6:f9:f0:d9:f8:0d:21:02:e4:c5:28:16:59:11:b9: + d9:69:73:2a:92:78:b8:92:57:9b:08:f2:3a:e5:2f:95:b0:58: + b7:6b:20:14:6d:14:ef:0a:bc:7e:d8:55:d8:88:da:2f:fa:19: + a5:fb:8b:e0:7f:39:f5:72:2b:85:c4:2c:ac:ef:19:45:92:4c: + b3:61:07:dc:4d:1f:6e:d2:81:13:5c:9a:f3:12:67:83:cf:9b: + 3f:8b:9f:9d:a4:b9:a8:96:03:7a:c5:ee:20:de:33:da:2f:9e: + 1a:7a:74:1e:e1:ee:cc:5a:3a:04:dd:b3:1a:04:a8:14:63:ac: + b7:47:12:83:9a:6c:f5:e6:e9:15:15:91:1a:84:19:0e:94:44: + e7:12:8e:25:5b:80:67:19:dc:63:93:10:0b:65:2e:8a:fa:09: + 9a:4e:da:86:28:7d:aa:61:35:d8:0e:a7:28:1a:bb:52:e0:78: + f8:6c:ba:6c:b0:6e:b9:87:5e:e9:99:35:37:f1:3d:64:2b:a9: + a0:34:93:cf:63:2f:d5:81:df:ae:63:27:a5:1e:4e:8d:dc:29: + 78:59:f8:f9:a1:20:8c:a7:26:40:6e:82:72:cd:78:b2:c8:8f: + 3c:1e:73:e7:c1:1f:bf:cf:ce:a5:2a:9b:db:44:64:32:a0:bb: + 7f:5c:25:13:48:b5:7f:92 +SHA1 Fingerprint=DD:50:C0:F7:79:B3:64:2E:74:A2:B8:9D:9F:D3:40:DD:BB:F0:F2:4F +-----BEGIN CERTIFICATE----- +MIIFcjCCA1qgAwIBAgIUZNtaDCBO6Ncpd8hQJ6JaJ90t8sswDQYJKoZIhvcNAQEM +BQAwUTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28u +LCBMdGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNDAeFw0yMDA0MDgw +NzA2MTlaFw00NTA0MDgwNzA2MTlaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpD +eWJlcnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBS +b290IENBMTQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDF0nqh1oq/ +FjHQmNE6lPxauG4iwWL3pwon71D2LrGeaBLwbCRjOfHw3xDG3rdSINVSW0KZnvOg +vlIfX8xnbacuUKLBl422+JX1sLrcneC+y9/3OPJH9aaakpUqYllQC6KxNedlsmGy +6pJxaeQp8E+BgQQ8sqVb1MWoWWd7VRxJq3qdwudzTe/NCcLEVxLbAQ4jeQkHO6Lo +/IrPj8BGJJw4J+CDnRugv3gVEOuGTgpa/d/aLIJ+7sr2KeH6caH3iGicnPCNvg9J +kdjqOvn90Ghx2+m1K06Ckm9mH+Dw3EzsytHqunQG+bOEkJTRX45zGRBdAuVwpcAQ +0BB8b8VYSbSwbprafZX1zNoCr7gsfXmPvkPx+SgojQlD+Ajda8iLLCSxjVIHvXib +y8posqTdDEx5YMaZ0ZPxMBoH064iwurO8YQJzOAUbn8/ftKChazcqRZOhaBgy/ac +18izju3Gm5h1DVXoX+WViwKkrkMpKBGk5hIwAUt1ax5mnXkvpXYvHUC0bcl9eQjs +0Wq2XSqypWa9a4X0dFbD9ed1Uigspf9mR6XU/v6eVL9lfgHWMI+lNpyiUBzuOIAB +SMbHdPTGrMNASRZhdCyvjG817XsYAFs2PJxQDcqSMxDxJklt33UkN4Ii1+iW/RVL +ApY+B3KVfqs9TC7XyvDf4Fg/LS8EmjijAQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUBpOjCl4oaTeqYR3r6/wtbyPk +86AwDQYJKoZIhvcNAQEMBQADggIBAJaAcgkGfpzMkwQWu6A6jZJOtxEaCnFxEM0E +rX+lRVAQZk5KQaID2RFPeje5S+LGjzJmdSX7684/AykmjbgWHfYfM25I5uj4V7Ib +ed87hwriZLoAymzvftAj63iP/2SbNDefNWWipAA9EiOWWF3KY4fGoweITedpdopT +zfFP7ELyk+OZpDc8h7hi2/DsHzc/N19DzFGdtfCXwreFamgLRB7lUe6TzktuhsHS +DCRZNhqfLJGP4xjblJUK7ZGqDpncllPjYYPGFrojutzdfhrGe0K22VoF3Jpf1d+4 +2kd92jjbrDnVHmtsKheMYc2xbXIBw8MgAGJoFjHVdqqGuw6qnsb58Nn4DSEC5MUo +FlkRudlpcyqSeLiSV5sI8jrlL5WwWLdrIBRtFO8KvH7YVdiI2i/6GaX7i+B/OfVy +K4XELKzvGUWSTLNhB9xNH27SgRNcmvMSZ4PPmz+Ln52kuaiWA3rF7iDeM9ovnhp6 +dB7h7sxaOgTdsxoEqBRjrLdHEoOabPXm6RUVkRqEGQ6UROcSjiVbgGcZ3GOTEAtl +Lor6CZpO2oYofaphNdgOpygau1LgePhsumywbrmHXumZNTfxPWQrqaA0k89jL9WB +365jJ6UeTo3cKXhZ+PmhIIynJkBugnLNeLLIjzwec+fBH7/PzqUqm9tEZDKgu39c +JRNItX+S +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/SecureSign_Root_CA15.pem b/secure/caroot/trusted/SecureSign_Root_CA15.pem new file mode 100644 index 000000000000..4d598436ea36 --- /dev/null +++ b/secure/caroot/trusted/SecureSign_Root_CA15.pem @@ -0,0 +1,67 @@ +## +## SecureSign Root CA15 +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 16:15:c7:c3:d8:49:a7:be:69:0c:8a:88:ed:f0:70:f9:dd:b7:3e:87 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = JP, O = "Cybertrust Japan Co., Ltd.", CN = SecureSign Root CA15 + Validity + Not Before: Apr 8 08:32:56 2020 GMT + Not After : Apr 8 08:32:56 2045 GMT + Subject: C = JP, O = "Cybertrust Japan Co., Ltd.", CN = SecureSign Root CA15 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:0b:50:74:8d:64:32:99:99:b3:d2:60:08:b8:22: + 8e:46:74:2c:78:c0:2b:44:2d:6d:5f:1d:c9:ae:4b: + 52:20:83:3d:b8:14:6d:53:87:60:9e:5f:6c:85:db: + 06:14:95:e0:c7:28:ff:9d:5f:e4:aa:f1:b3:8b:6d: + ed:4f:2f:4b:c9:4a:94:91:64:75:fe:01:ec:c1:d8: + eb:7a:94:78:56:18:43:5f:6b:81:cb:f6:bc:da:b4: + 0c:b6:29:93:08:69:8f + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Subject Key Identifier: + EB:41:C8:AE:FC:D5:9E:51:48:F5:BD:8B:F4:87:20:93:41:2B:D3:F4 + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:65:02:31:00:d9:2e:89:7e:5e:4e:a4:11:07:bd:59:c2:07: + de:ab:32:38:53:2a:46:44:06:17:7a:ce:51:e9:e0:ff:66:2d: + 09:4e:e0:4f:f4:05:d1:85:f6:35:60:dc:f5:72:b3:46:7d:02: + 30:44:98:46:1a:82:85:1e:61:69:89:4b:07:4b:66:b5:9e:aa: + ba:a0:1e:41:d9:01:74:3a:6e:45:3a:89:80:19:7b:32:98:55: + 63:ab:eb:63:6e:93:6d:ab:1b:09:60:31:4e +SHA1 Fingerprint=CB:BA:83:C8:C1:5A:5D:F1:F9:73:6F:CA:D7:EF:28:13:06:4A:07:7D +-----BEGIN CERTIFICATE----- +MIICIzCCAamgAwIBAgIUFhXHw9hJp75pDIqI7fBw+d23PocwCgYIKoZIzj0EAwMw +UTELMAkGA1UEBhMCSlAxIzAhBgNVBAoTGkN5YmVydHJ1c3QgSmFwYW4gQ28uLCBM +dGQuMR0wGwYDVQQDExRTZWN1cmVTaWduIFJvb3QgQ0ExNTAeFw0yMDA0MDgwODMy +NTZaFw00NTA0MDgwODMyNTZaMFExCzAJBgNVBAYTAkpQMSMwIQYDVQQKExpDeWJl +cnRydXN0IEphcGFuIENvLiwgTHRkLjEdMBsGA1UEAxMUU2VjdXJlU2lnbiBSb290 +IENBMTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQLUHSNZDKZmbPSYAi4Io5GdCx4 +wCtELW1fHcmuS1Iggz24FG1Th2CeX2yF2wYUleDHKP+dX+Sq8bOLbe1PL0vJSpSR +ZHX+AezB2Ot6lHhWGENfa4HL9rzatAy2KZMIaY+jQjBAMA8GA1UdEwEB/wQFMAMB +Af8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTrQciu/NWeUUj1vYv0hyCTQSvT +9DAKBggqhkjOPQQDAwNoADBlAjEA2S6Jfl5OpBEHvVnCB96rMjhTKkZEBhd6zlHp +4P9mLQlO4E/0BdGF9jVg3PVys0Z9AjBEmEYagoUeYWmJSwdLZrWeqrqgHkHZAXQ6 +bkU6iYAZezKYVWOr62Nuk22rGwlgMU4= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/TWCA_CYBER_Root_CA.pem b/secure/caroot/trusted/TWCA_CYBER_Root_CA.pem new file mode 100644 index 000000000000..f3a6b60e3bc8 --- /dev/null +++ b/secure/caroot/trusted/TWCA_CYBER_Root_CA.pem @@ -0,0 +1,137 @@ +## +## TWCA CYBER Root CA +## +## This is a single X.509 certificate for a public Certificate +## Authority (CA). It was automatically extracted from Mozilla's +## root CA list (the file `certdata.txt' in security/nss). +## +## It contains a certificate trusted for server authentication. +## +## Extracted from nss +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 40:01:34:8c:c2:00:00:00:00:00:00:00:01:3c:f2:c6 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = TW, O = TAIWAN-CA, OU = Root CA, CN = TWCA CYBER Root CA + Validity + Not Before: Nov 22 06:54:29 2022 GMT + Not After : Nov 22 15:59:59 2047 GMT + Subject: C = TW, O = TAIWAN-CA, OU = Root CA, CN = TWCA CYBER Root CA + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + Public-Key: (4096 bit) + Modulus: + 00:c6:f8:ca:1e:d9:09:20:7e:1d:6c:4e:ce:8f:e3: + 47:33:44:9c:c7:c9:69:aa:3a:5b:78:ee:70:d2:92: + f8:04:b3:52:52:1d:67:72:28:a1:df:8b:5d:95:0a: + fe:ea:cd:ed:f7:29:ce:f0:6f:7f:ac:cd:3d:ef:b3: + 1c:45:6a:f7:28:90:f1:61:57:c5:0c:c4:a3:50:5d: + de:d4:b5:cb:19:ca:80:b9:75:ce:29:ce:d2:85:22: + ec:02:63:cc:44:30:20:da:ea:91:5b:56:e6:1d:1c: + d5:9d:66:c7:3f:df:86:ca:4b:53:c4:d9:8d:b2:1d: + ea:f8:dc:27:53:a3:47:e1:61:cc:7d:b5:b0:f8:ee: + 73:91:c5:ce:73:6f:ce:ee:10:1f:1a:06:cf:e9:27: + 60:c5:4f:19:e4:eb:ce:22:26:45:d7:60:99:dd:ce: + 4f:37:e0:7f:e7:63:ad:b0:b8:59:b8:d0:06:68:35: + 60:d3:36:ae:71:43:04:f1:69:65:78:7c:f3:1f:f3: + ca:28:9f:5a:20:95:66:b4:cd:b7:ee:8f:78:a4:45: + 18:e9:26:2f:8d:9b:29:28:b1:a4:b7:3a:6d:b9:d4: + 1c:38:72:45:58:b1:5e:eb:f0:28:9b:b7:82:ca:fd: + cf:d6:33:0f:9f:fb:97:9e:b1:1c:9c:9e:ea:5f:5e: + db:aa:dd:54:e9:30:21:28:6d:8e:79:f3:75:92:8c: + 26:fe:dc:c5:f6:c3:b0:df:44:59:43:a3:b6:03:28: + f6:08:30:aa:0d:33:e1:ef:9c:a9:07:22:e3:59:5b: + 40:8f:da:88:b7:69:08:a8:b7:23:2e:44:09:59:37: + 5b:c7:e3:17:f2:22:eb:6e:39:52:c5:de:54:a7:98: + c9:4b:20:95:dc:46:89:5f:b4:12:f9:85:29:8e:eb: + c8:27:15:20:c0:4b:d4:cc:7c:0c:6c:34:0c:26:9b: + 26:31:a6:3c:a7:f6:d9:d0:4b:a2:64:ff:3b:99:41: + 72:c1:e0:70:97:f1:24:bb:2b:c4:74:22:b1:ac:6b: + 22:32:24:d3:78:2a:c0:c0:a1:2f:f1:52:05:c9:3f: + ef:76:66:e2:45:d8:0d:3d:ad:95:c8:c7:89:26:c8: + 0f:ae:a7:03:2e:fb:c1:5f:fa:20:e1:70:ad:b0:65: + 20:37:33:60:b0:d5:af:d7:0c:1c:c2:90:70:d7:4a: + 18:bc:7e:01:b0:b0:eb:15:1e:44:06:cd:a4:4f:e8: + 0c:d1:c3:20:10:e1:54:65:9e:b6:51:d0:1a:76:6b: + 42:5a:58:76:34:ea:b7:37:19:ae:2e:75:f9:96:e5: + c1:59:f7:94:57:29:25:8d:3a:4c:ab:4d:9a:41:d0: + 5f:26:03 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + 9D:85:61:14:7C:C1:62:6F:97:68:E4:4F:37:40:E1:AD:E0:0D:56:37 + X509v3 Subject Key Identifier: + 9D:85:61:14:7C:C1:62:6F:97:68:E4:4F:37:40:E1:AD:E0:0D:56:37 + Signature Algorithm: sha384WithRSAEncryption + Signature Value: + 64:8f:7a:c4:62:0e:b5:88:cc:b8:c7:86:0e:a1:4a:16:cd:70: + 0b:b7:a7:85:0b:b3:76:b6:0f:a7:ff:08:8b:0b:25:cf:a8:d4: + 83:75:2a:b8:96:88:b6:fb:df:2d:2d:b4:69:53:21:35:57:d6: + 89:4d:73:bf:69:8f:70:a3:61:cc:9a:db:1e:9a:e0:20:f8:6c: + bb:9b:22:9d:5d:84:31:9a:2c:8a:dd:6a:a1:d7:28:69:ca:fe: + 76:55:7a:46:67:eb:cc:43:88:16:a2:03:d6:b9:17:f8:19:6c: + 6d:23:02:7f:f1:5f:d0:0a:29:23:3b:d1:aa:0a:ed:a9:17:26: + 54:0a:4d:c2:a5:4d:f8:c5:fd:b8:81:cf:2b:2c:78:a3:67:4c: + a9:07:9a:f3:df:5e:fb:7c:f5:89:cd:74:97:61:10:6a:07:2b: + 81:5a:d2:8e:b7:e7:20:d1:20:6e:24:a8:84:27:a1:57:ac:aa: + 55:58:2f:dc:d9:ca:fa:68:04:9e:ed:44:24:f9:74:40:3b:23: + 33:ab:83:5a:18:26:42:b6:6d:54:b5:16:60:30:6c:b1:a0:f8: + b8:41:a0:5d:49:49:d2:65:05:3a:ea:fe:9d:61:bc:86:d9:bf: + de:d3:ba:3a:b1:7f:7e:92:34:8e:c9:00:6e:dc:98:bd:dc:ec: + 80:05:ad:02:3d:df:65:ed:0b:03:f7:f7:16:84:04:31:ba:93: + 94:d8:f2:12:f8:8a:e3:bf:42:af:a7:d4:cd:11:17:16:c8:42: + 1d:14:a8:42:f6:d2:40:86:a0:4f:23:ca:96:45:56:60:06:cd: + b7:55:01:a6:01:94:65:fe:6e:05:09:ba:b4:a4:aa:e2:ef:58: + be:bd:27:56:d8:ef:73:71:5b:44:33:f2:9a:72:ea:b0:5e:3e: + 6e:a9:52:5b:ec:70:6d:b5:87:8f:37:5e:3c:8c:9c:ce:e4:f0: + ce:0c:67:41:cc:ce:f6:80:ab:4e:cc:4c:56:f5:c1:61:59:93: + b4:3e:a6:da:b8:37:12:9f:2a:32:e3:8b:b8:21:ec:c3:2b:65: + 0c:ef:22:de:88:29:3b:4c:d7:fa:fe:b7:e1:47:be:9c:3e:3e: + 83:fb:51:5d:f5:68:f7:2e:21:85:dc:bf:f1:5a:e2:7c:d7:c5: + e4:83:c1:6a:eb:ba:80:5a:de:5c:2d:70:76:f8:c8:e5:87:87: + ca:a0:9d:a1:e5:22:12:27:0f:44:3d:1d:6c:ea:d4:c2:8b:2f: + 6f:79:ab:7f:50:a6:c4:19:a7:a1:7a:b7:96:f9:c1:1f:62:5a: + a2:43:07:40:5e:26:c6:ac:ed:ae:70:16:c5:aa:ca:72:8a:4d: + b0:cf:01:8b:03:3f:6e:d7 +SHA1 Fingerprint=F6:B1:1C:1A:83:38:E9:7B:DB:B3:A8:C8:33:24:E0:2D:9C:7F:26:66 +-----BEGIN CERTIFICATE----- +MIIFjTCCA3WgAwIBAgIQQAE0jMIAAAAAAAAAATzyxjANBgkqhkiG9w0BAQwFADBQ +MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290 +IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3QgQ0EwHhcNMjIxMTIyMDY1NDI5 +WhcNNDcxMTIyMTU1OTU5WjBQMQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FO +LUNBMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJUV0NBIENZQkVSIFJvb3Qg +Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDG+Moe2Qkgfh1sTs6P +40czRJzHyWmqOlt47nDSkvgEs1JSHWdyKKHfi12VCv7qze33Kc7wb3+szT3vsxxF +avcokPFhV8UMxKNQXd7UtcsZyoC5dc4pztKFIuwCY8xEMCDa6pFbVuYdHNWdZsc/ +34bKS1PE2Y2yHer43CdTo0fhYcx9tbD47nORxc5zb87uEB8aBs/pJ2DFTxnk684i +JkXXYJndzk834H/nY62wuFm40AZoNWDTNq5xQwTxaWV4fPMf88oon1oglWa0zbfu +j3ikRRjpJi+NmykosaS3Om251Bw4ckVYsV7r8Cibt4LK/c/WMw+f+5eesRycnupf +Xtuq3VTpMCEobY5583WSjCb+3MX2w7DfRFlDo7YDKPYIMKoNM+HvnKkHIuNZW0CP +2oi3aQiotyMuRAlZN1vH4xfyIutuOVLF3lSnmMlLIJXcRolftBL5hSmO68gnFSDA +S9TMfAxsNAwmmyYxpjyn9tnQS6Jk/zuZQXLB4HCX8SS7K8R0IrGsayIyJNN4KsDA +oS/xUgXJP+92ZuJF2A09rZXIx4kmyA+upwMu+8Ff+iDhcK2wZSA3M2Cw1a/XDBzC +kHDXShi8fgGwsOsVHkQGzaRP6AzRwyAQ4VRlnrZR0Bp2a0JaWHY06rc3Ga4udfmW +5cFZ95RXKSWNOkyrTZpB0F8mAwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYD +VR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSdhWEUfMFib5do5E83QOGt4A1WNzAd +BgNVHQ4EFgQUnYVhFHzBYm+XaORPN0DhreANVjcwDQYJKoZIhvcNAQEMBQADggIB +AGSPesRiDrWIzLjHhg6hShbNcAu3p4ULs3a2D6f/CIsLJc+o1IN1KriWiLb73y0t +tGlTITVX1olNc79pj3CjYcya2x6a4CD4bLubIp1dhDGaLIrdaqHXKGnK/nZVekZn +68xDiBaiA9a5F/gZbG0jAn/xX9AKKSM70aoK7akXJlQKTcKlTfjF/biBzysseKNn +TKkHmvPfXvt89YnNdJdhEGoHK4Fa0o635yDRIG4kqIQnoVesqlVYL9zZyvpoBJ7t +RCT5dEA7IzOrg1oYJkK2bVS1FmAwbLGg+LhBoF1JSdJlBTrq/p1hvIbZv97Tujqx +f36SNI7JAG7cmL3c7IAFrQI932XtCwP39xaEBDG6k5TY8hL4iuO/Qq+n1M0RFxbI +Qh0UqEL20kCGoE8jypZFVmAGzbdVAaYBlGX+bgUJurSkquLvWL69J1bY73NxW0Qz +8ppy6rBePm6pUlvscG21h483XjyMnM7k8M4MZ0HMzvaAq07MTFb1wWFZk7Q+ptq4 +NxKfKjLji7gh7MMrZQzvIt6IKTtM1/r+t+FHvpw+PoP7UV31aPcuIYXcv/Fa4nzX +xeSDwWrruoBa3lwtcHb4yOWHh8qgnaHlIhInD0Q9HWzq1MKLL295q39QpsQZp6F6 +t5b5wR9iWqJDB0BeJsas7a5wFsWqynKKTbDPAYsDP27X +-----END CERTIFICATE----- diff --git a/secure/caroot/untrusted/AddTrust_External_Root.pem b/secure/caroot/untrusted/AddTrust_External_Root.pem deleted file mode 100644 index 97fe312d0e8f..000000000000 --- a/secure/caroot/untrusted/AddTrust_External_Root.pem +++ /dev/null @@ -1,99 +0,0 @@ -## -## AddTrust External Root -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## Extracted from nss -## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root - Validity - Not Before: May 30 10:48:38 2000 GMT - Not After : May 30 10:48:38 2020 GMT - Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed: - 1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97: - a4:29:4c:7d:93:9f:bd:4a:bc:93:ed:03:1a:e3:8f: - cf:e5:6d:50:5a:d6:97:29:94:5a:80:b0:49:7a:db: - 2e:95:fd:b8:ca:bf:37:38:2d:1e:3e:91:41:ad:70: - 56:c7:f0:4f:3f:e8:32:9e:74:ca:c8:90:54:e9:c6: - 5f:0f:78:9d:9a:40:3c:0e:ac:61:aa:5e:14:8f:9e: - 87:a1:6a:50:dc:d7:9a:4e:af:05:b3:a6:71:94:9c: - 71:b3:50:60:0a:c7:13:9d:38:07:86:02:a8:e9:a8: - 69:26:18:90:ab:4c:b0:4f:23:ab:3a:4f:84:d8:df: - ce:9f:e1:69:6f:bb:d7:42:d7:6b:44:e4:c7:ad:ee: - 6d:41:5f:72:5a:71:08:37:b3:79:65:a4:59:a0:94: - 37:f7:00:2f:0d:c2:92:72:da:d0:38:72:db:14:a8: - 45:c4:5d:2a:7d:b7:b4:d6:c4:ee:ac:cd:13:44:b7: - c9:2b:dd:43:00:25:fa:61:b9:69:6a:58:23:11:b7: - a7:33:8f:56:75:59:f5:cd:29:d7:46:b7:0a:2b:65: - b6:d3:42:6f:15:b2:b8:7b:fb:ef:e9:5d:53:d5:34: - 5a:27 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A - X509v3 Key Usage: - Certificate Sign, CRL Sign - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Authority Key Identifier: - keyid:AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A - DirName:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root - serial:01 - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: - 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: - 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: - bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: - de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: - 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: - 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: - 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: - a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: - 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: - 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: - 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: - 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: - 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: - 8f:4e:86:04 -SHA1 Fingerprint=02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68 ------BEGIN CERTIFICATE----- *** 1484 LINES SKIPPED *** From nobody Thu Mar 20 11:14:31 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJNJT6JJvz5qhLg; Thu, 20 Mar 2025 11:14:33 +0000 (UTC) (envelope-from shurd@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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJNJT4YFvz3Xjs; Thu, 20 Mar 2025 11:14:33 +0000 (UTC) (envelope-from shurd@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742469273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iSD0hp37UIYBjYa3T3RG2267FTMli8LEhEng5ACGALc=; b=Nz2oE0FkSUex7mcLfLHVMEmt6lSKdPPsDvKvoYfEeN6x7g2G2hhe7a4sNs5Tw1tVGdioZx O52B4YsM4ygQqMCTsnwcOHgVPStpV1ZDa9ZW6XrVideJFYg01/1u0TWmMDZg8JJj5YUrof St8vJCiwCizHtsWvYBin9QfrZrYBWz39P06NAJ7Y5Jy5rJS1EIp88utmTjQfL84LTkWUq+ /5Uooi0lT9plORlXndHapPZIgcBE5clx8SaEVwP2eHqLbEvc2L70fVU3HqlJi3snme3SFV LdmZ8Sq8rjK6VJoflXcfPt0yFAqcB1ilr0aEita33McDCAiR+Oglzfy5xA53JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742469273; a=rsa-sha256; cv=none; b=ci4zrSqPgOPFfMdo9MsfzerdT1zorx/Q8DAphOQoHzc8fS2eOQKa1A94J2pnj7n9f+e2ml JO4ZvY2AEQhnbCSsoCNUj55yHEQzRWe30vPHGb3EkTd+mWmrsRuq+htTSKgRf1hug755Kn 2xlZol1m0lLa6Q8JlyATBX2snV+tKF3ISTbk+Fv9M3XEPPDt7ggFvO50MPCmHzrntFJ8h1 5p5SpPPTVosFAA3kmJe5rKgKc6+xj0fK2wJHM8HlpVm4cObtJuyM9uXIN6CO2FYzBzY7j0 v+FYILVoH4y8YDnMRI/edFNZjgzkR2U4N6Bjk+5KWOLWh36uuMAR10DIuskXYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742469273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=iSD0hp37UIYBjYa3T3RG2267FTMli8LEhEng5ACGALc=; b=WwU7eBCQB4Kvn56IwAqbi45HtKc2lmn41CLlKi06kDSwFUJ3GpQYbVAvEGNamTPJ91tQRn c8xfA3zpNnW1g0sj4b9Ub1zruwG6jCDv0mlUT03STLnhnyLA9xLJfc8HfjDwi6qTEcUjdf pkp+F+sKGbx9Tj3QXks4p1Thq4J9Oi8wGMlzJO5fYggq3OV7Fqty0sOQ459unuuo5yu260 liC6UCwtoFh4fc0l6KGie8d0inXGhhOkkuhfXmmw+ZuwCyvWltR5Sr2nzP/701fb9PX/Yk ndO3LzXrsN9v9/lS33QswT8HENX0dpWvHHfRy2UbVdi0eMZEJRnh0pDTFs6qbg== Received: from [IPV6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a] (unknown [IPv6:2601:404:ce00:7c90:ec4:7aff:fec4:ac4a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: shurd) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ZJNJT0rqzz1Bqh; Thu, 20 Mar 2025 11:14:32 +0000 (UTC) (envelope-from shurd@FreeBSD.org) Content-Type: multipart/alternative; boundary="------------WF10o1c7MsMLihyxeV7pRg8T" Message-ID: <8521154a-def4-4da4-97b1-d1d8df65e564@FreeBSD.org> Date: Thu, 20 Mar 2025 07:14:31 -0400 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 415a0ce02c9e - main - Revert Make newly POSIX functions visible To: Warner Losh , Stephen Hurd Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202503200741.52K7frms088363@gitrepo.freebsd.org> Content-Language: en-US From: shurd@FreeBSD.org In-Reply-To: This is a multi-part message in MIME format. --------------WF10o1c7MsMLihyxeV7pRg8T Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2025-03-20 05:55, Warner Losh wrote: > > > On Thu, Mar 20, 2025, 1:42 AM Stephen Hurd wrote: > > The branch main has been updated by shurd: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 > > > commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2 > Author:     Stephen Hurd > AuthorDate: 2025-03-20 07:15:15 +0000 > Commit:     Stephen Hurd > CommitDate: 2025-03-20 07:41:27 +0000 > >     Revert Make newly POSIX functions visible > >     Summary: >     This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c. >     This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a. > >     Some ports (specifically Python) define __BSD_VISIBLE > themselves, so >     the change from __BSD_VISIBLE to __POSIX_VISIBLE >= 202405 > makes them >     fail. > > > That's not legal. Defining __BSD_VISIBLE directly is illegal and won't > work right. Can't work right and should likely be a compile time > error. With am exp run to fix. The Python commit that added it for the curious: https://github.com/python/cpython/commit/abccf41a7d616cc950510ad4a3526b11e012ee24 22 years ago for 5.x The root of their usage appears to be the use of _XOPEN_SOURCE 700 with the following comment: # Some systems cannot stand _XOPEN_SOURCE being defined at all; they # disable features if it is defined, without any means to access these # features as extensions. For these systems, we skip the definition of # _XOPEN_SOURCE. Before adding a system to the list to gain access to # some feature, make sure there is no alternative way to access this # feature. Also, when using wildcards, make sure you have verified the # need for not defining _XOPEN_SOURCE on all systems matching the # wildcard, and that the wildcard does not include future systems # (which may remove their limitations). They mention _GNU_SOURCE to "re-enable" Linux extensions, so apparently went looking for the same thing on BSDs and found _NETBSD_SOURCE for NetBSD, _DARWIN_C_SOURCE for macOS... and __BSD_VISIBLE for FreeBSD I assume they started using _XOPEN_SOURCE for the wchar.h stuff and just followed the path of least resistance. I do note that the (new for 15?) cdefs(9) makes it clear that _BSD_SOURCE is the correct way to explicitly ask for everything now, though there doesn't seem to be any explicit support for that yet (basically, it's assumed unless one of the other mutually exclusive macros are defined). --------------WF10o1c7MsMLihyxeV7pRg8T Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit
On 2025-03-20 05:55, Warner Losh wrote:


On Thu, Mar 20, 2025, 1:42 AM Stephen Hurd <shurd@freebsd.org> wrote:
The branch main has been updated by shurd:

URL: https://cgit.FreeBSD.org/src/commit/?id=415a0ce02c9ee2c15c7973b2dfbddda71f6344a2

commit 415a0ce02c9ee2c15c7973b2dfbddda71f6344a2
Author:     Stephen Hurd <shurd@FreeBSD.org>
AuthorDate: 2025-03-20 07:15:15 +0000
Commit:     Stephen Hurd <shurd@FreeBSD.org>
CommitDate: 2025-03-20 07:41:27 +0000

    Revert Make newly POSIX functions visible

    Summary:
    This reverts commit d7efac1be1441c122f7fb9de51a409172f21326c.
    This reverts commit 9d0eea9422d075c8a6924b33161d2d5abfb4072a.

    Some ports (specifically Python) define __BSD_VISIBLE themselves, so
    the change from __BSD_VISIBLE to __POSIX_VISIBLE >= 202405 makes them
    fail.

That's not legal. Defining __BSD_VISIBLE directly is illegal and won't work right. Can't work right and should likely be a compile time error. With am exp run to fix.

The Python commit that added it for the curious:

https://github.com/python/cpython/commit/abccf41a7d616cc950510ad4a3526b11e012ee24

22 years ago for 5.x

The root of their usage appears to be the use of _XOPEN_SOURCE 700 with the following comment:

# Some systems cannot stand _XOPEN_SOURCE being defined at all; they
# disable features if it is defined, without any means to access these
# features as extensions. For these systems, we skip the definition of
# _XOPEN_SOURCE. Before adding a system to the list to gain access to
# some feature, make sure there is no alternative way to access this
# feature. Also, when using wildcards, make sure you have verified the
# need for not defining _XOPEN_SOURCE on all systems matching the
# wildcard, and that the wildcard does not include future systems
# (which may remove their limitations).

They mention _GNU_SOURCE to "re-enable" Linux extensions, so apparently went looking for the same thing on BSDs and found _NETBSD_SOURCE for NetBSD, _DARWIN_C_SOURCE for macOS... and __BSD_VISIBLE for FreeBSD

I assume they started using _XOPEN_SOURCE for the wchar.h stuff and just followed the path of least resistance.

I do note that the (new for 15?) cdefs(9) makes it clear that _BSD_SOURCE is the correct way to explicitly ask for everything now, though there doesn't seem to be any explicit support for that yet (basically, it's assumed unless one of the other mutually exclusive macros are defined).

--------------WF10o1c7MsMLihyxeV7pRg8T-- From nobody Thu Mar 20 11:40:13 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJNt60gFKz5qjc0; Thu, 20 Mar 2025 11:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJNt60Hzgz3Z3F; Thu, 20 Mar 2025 11:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742470814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ec6YgVTW9IJagjF37omv95qv0Hr7oatQ7AoB7W/PJU=; b=pJM1zcSvxvkkFpZGbO8uO1NdmeM7b7wbn733vHmsLlK/ilU4vlygJKGw6MdmLAI7aH3IFx uAv67MU9RrYbfabhEY83yoxlMdMzdOs10hnTYGY6kmIl/2badEet2eIb4mLKv70OfN8LAE Z8oJ+xDUyRM2gUQlAFICC+U3sA6cN+RV2xHwQsIfwJRLtRgLl2qobIhSB3vk7nXn1lcIMy gHQcBbBE9RU70XH3QBisbX0z5cQUUAXvB/StMENx9dH6J1I06GGMYyNc7duM1w6CJry+p1 AZdJQNXnlsFGNn70tooi+lgIWxDtiAZSLJGuSBRcdZ+IlmeD/oH45oqiTc8+fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742470814; a=rsa-sha256; cv=none; b=Jprs5HQlMO+BO84VfINyAqZP6LvqH393waAkOvgf8gBeali8jgmQ7vlpka0g8BXqRc+eJB cWw7tBKG+buYfj3G3Itg63RGy2fZivOsp/MwD+OafBvD+fqFMbgjJX3qv1cc7TT8ggSMcG 2tlqknIeZEXwrsYPzkePoQeiUYgnOmlDEQYeE6V4Xnig9O0bPFI0wQvkgW3aZGVBWaKg9G svnKxKFv2P8Ym1H85ZKExmKeWwKhPOA+ErEkcd0qZeFPrtKTL1OYgsKmW47/+M8KyeoXRu 093GtTaVjZeFRouswjz4PjrtucrvR2+mYI42OYAH6AcyunshY4q5HdkUOA9SOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742470814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8ec6YgVTW9IJagjF37omv95qv0Hr7oatQ7AoB7W/PJU=; b=WLfEV3R/35JSA+em6JbpkLcyQbxTQmftis4Do3Za+aN4S2Wsoy9c7xvDRvLNyBfOgumCLF 8Z57pFUJ4Prasd5L+U2JDRRZEgwlBNA+KXLPj1MQhrEdil7hEiN11wVDML77psfCOZnhV9 xNBRgAfdUCdvoDldaQLFq5qBLYEBAqKDoynWBuWhF6tnLFMKwpH7WTRHUYzinPAxvD0CyP 8XUR7a+XA/oYKUhqR6DLz1YWsVU+YlLY0idQEoQrZwcWpzoSGO4r+WoDPXzbKiv4qjv0Q1 fe1eK9RzmsyXhtaEGNYNrjrCW2yXd00uobs0xyYBr03WvttSPi2XSwOP5m+HuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJNt56kmLz13Cb; Thu, 20 Mar 2025 11:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KBeDRx038968; Thu, 20 Mar 2025 11:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KBeDZP038938; Thu, 20 Mar 2025 11:40:13 GMT (envelope-from git) Date: Thu, 20 Mar 2025 11:40:13 GMT Message-Id: <202503201140.52KBeDZP038938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: f89c056e1184 - stable/13 - caroot: update the root bundle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f89c056e118438759d3aa5b8475c075dcad9299e Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=f89c056e118438759d3aa5b8475c075dcad9299e commit f89c056e118438759d3aa5b8475c075dcad9299e Author: Michael Osipov AuthorDate: 2025-03-07 18:58:55 +0000 Commit: Michael Osipov CommitDate: 2025-03-20 11:32:44 +0000 caroot: update the root bundle Summary: - Seven (7) new roots - Four (4) distrusted roots - Fourteen (14) removed (expired) roots Reviewed by: kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49294 (cherry picked from commit 0100da4deb96e15acf72d7655127c6faafa4148f) --- ObsoleteFiles.inc | 20 +++ .../caroot/blacklisted/AddTrust_External_Root.pem | 99 --------------- .../AddTrust_Low-Value_Services_Root.pem | 98 --------------- .../caroot/blacklisted/Cybertrust_Global_Root.pem | 99 --------------- secure/caroot/blacklisted/DST_Root_CA_X3.pem | 92 -------------- .../E-Tugra_Certification_Authority.pem | 140 --------------------- .../Entrust_Root_Certification_Authority_-_G4.pem | 0 secure/caroot/blacklisted/GeoTrust_Global_CA.pem | 90 ------------- .../caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem | 99 --------------- .../caroot/blacklisted/Hongkong_Post_Root_CA_1.pem | 89 ------------- secure/caroot/blacklisted/QuoVadis_Root_CA.pem | 116 ----------------- .../SecureSign_RootCA11.pem | 0 .../Security_Communication_RootCA3.pem | 0 .../blacklisted/Security_Communication_Root_CA.pem | 91 -------------- .../caroot/blacklisted/Sonera_Class_2_Root_CA.pem | 90 ------------- .../Staat_der_Nederlanden_EV_Root_CA.pem | 134 -------------------- .../Staat_der_Nederlanden_Root_CA_-_G2.pem | 137 -------------------- .../SwissSign_Silver_CA_-_G2.pem | 0 secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem | 91 -------------- .../caroot/trusted/D-TRUST_BR_Root_CA_2_2023.pem | 139 ++++++++++++++++++++ .../caroot/trusted/D-TRUST_EV_Root_CA_2_2023.pem | 139 ++++++++++++++++++++ .../trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem | 71 +++++++++++ secure/caroot/trusted/SecureSign_Root_CA12.pem | 93 ++++++++++++++ secure/caroot/trusted/SecureSign_Root_CA14.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/SecureSign_Root_CA15.pem | 67 ++++++++++ secure/caroot/trusted/TWCA_CYBER_Root_CA.pem | 137 ++++++++++++++++++++ 26 files changed, 801 insertions(+), 1465 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 682a0848b6f6..eca0397d899a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,26 @@ # xargs -n1 | sort | uniq -d; # done +# 20250310: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority_-_G4.pem +OLD_FILES+=usr/share/certs/trusted/SecureSign_RootCA11.pem +OLD_FILES+=usr/share/certs/trusted/Security_Communication_RootCA3.pem +OLD_FILES+=usr/share/certs/trusted/SwissSign_Silver_CA_-_G2.pem +OLD_FILES+=usr/share/certs/blacklisted/AddTrust_External_Root.pem +OLD_FILES+=usr/share/certs/blacklisted/AddTrust_Low-Value_Services_Root.pem +OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_Root_CA_-_G2.pem +OLD_FILES+=usr/share/certs/blacklisted/Cybertrust_Global_Root.pem +OLD_FILES+=usr/share/certs/blacklisted/DST_Root_CA_X3.pem +OLD_FILES+=usr/share/certs/blacklisted/GlobalSign_Root_CA_-_R2.pem +OLD_FILES+=usr/share/certs/blacklisted/QuoVadis_Root_CA.pem +OLD_FILES+=usr/share/certs/blacklisted/Sonera_Class_2_Root_CA.pem +OLD_FILES+=usr/share/certs/blacklisted/GeoTrust_Global_CA.pem +OLD_FILES+=usr/share/certs/blacklisted/Staat_der_Nederlanden_EV_Root_CA.pem +OLD_FILES+=usr/share/certs/blacklisted/E-Tugra_Certification_Authority.pem +OLD_FILES+=usr/share/certs/blacklisted/Hongkong_Post_Root_CA_1.pem +OLD_FILES+=usr/share/certs/blacklisted/Security_Communication_Root_CA.pem +OLD_FILES+=usr/share/certs/blacklisted/Trustis_FPS_Root_CA.pem + # 20250204: sys/vm/stack test symbols moved to /usr/lib/debug OLD_FILES+=usr/tests/sys/vm/stack/.debug/libsoxstack.so.debug OLD_DIRS+=usr/tests/sys/vm/stack/.debug diff --git a/secure/caroot/blacklisted/AddTrust_External_Root.pem b/secure/caroot/blacklisted/AddTrust_External_Root.pem deleted file mode 100644 index 97fe312d0e8f..000000000000 --- a/secure/caroot/blacklisted/AddTrust_External_Root.pem +++ /dev/null @@ -1,99 +0,0 @@ -## -## AddTrust External Root -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## Extracted from nss -## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root - Validity - Not Before: May 30 10:48:38 2000 GMT - Not After : May 30 10:48:38 2020 GMT - Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed: - 1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97: - a4:29:4c:7d:93:9f:bd:4a:bc:93:ed:03:1a:e3:8f: - cf:e5:6d:50:5a:d6:97:29:94:5a:80:b0:49:7a:db: - 2e:95:fd:b8:ca:bf:37:38:2d:1e:3e:91:41:ad:70: - 56:c7:f0:4f:3f:e8:32:9e:74:ca:c8:90:54:e9:c6: - 5f:0f:78:9d:9a:40:3c:0e:ac:61:aa:5e:14:8f:9e: - 87:a1:6a:50:dc:d7:9a:4e:af:05:b3:a6:71:94:9c: - 71:b3:50:60:0a:c7:13:9d:38:07:86:02:a8:e9:a8: - 69:26:18:90:ab:4c:b0:4f:23:ab:3a:4f:84:d8:df: - ce:9f:e1:69:6f:bb:d7:42:d7:6b:44:e4:c7:ad:ee: - 6d:41:5f:72:5a:71:08:37:b3:79:65:a4:59:a0:94: - 37:f7:00:2f:0d:c2:92:72:da:d0:38:72:db:14:a8: - 45:c4:5d:2a:7d:b7:b4:d6:c4:ee:ac:cd:13:44:b7: - c9:2b:dd:43:00:25:fa:61:b9:69:6a:58:23:11:b7: - a7:33:8f:56:75:59:f5:cd:29:d7:46:b7:0a:2b:65: - b6:d3:42:6f:15:b2:b8:7b:fb:ef:e9:5d:53:d5:34: - 5a:27 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A - X509v3 Key Usage: - Certificate Sign, CRL Sign - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Authority Key Identifier: - keyid:AD:BD:98:7A:34:B4:26:F7:FA:C4:26:54:EF:03:BD:E0:24:CB:54:1A - DirName:/C=SE/O=AddTrust AB/OU=AddTrust External TTP Network/CN=AddTrust External CA Root - serial:01 - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - b0:9b:e0:85:25:c2:d6:23:e2:0f:96:06:92:9d:41:98:9c:d9: - 84:79:81:d9:1e:5b:14:07:23:36:65:8f:b0:d8:77:bb:ac:41: - 6c:47:60:83:51:b0:f9:32:3d:e7:fc:f6:26:13:c7:80:16:a5: - bf:5a:fc:87:cf:78:79:89:21:9a:e2:4c:07:0a:86:35:bc:f2: - de:51:c4:d2:96:b7:dc:7e:4e:ee:70:fd:1c:39:eb:0c:02:51: - 14:2d:8e:bd:16:e0:c1:df:46:75:e7:24:ad:ec:f4:42:b4:85: - 93:70:10:67:ba:9d:06:35:4a:18:d3:2b:7a:cc:51:42:a1:7a: - 63:d1:e6:bb:a1:c5:2b:c2:36:be:13:0d:e6:bd:63:7e:79:7b: - a7:09:0d:40:ab:6a:dd:8f:8a:c3:f6:f6:8c:1a:42:05:51:d4: - 45:f5:9f:a7:62:21:68:15:20:43:3c:99:e7:7c:bd:24:d8:a9: - 91:17:73:88:3f:56:1b:31:38:18:b4:71:0f:9a:cd:c8:0e:9e: - 8e:2e:1b:e1:8c:98:83:cb:1f:31:f1:44:4c:c6:04:73:49:76: - 60:0f:c7:f8:bd:17:80:6b:2e:e9:cc:4c:0e:5a:9a:79:0f:20: - 0a:2e:d5:9e:63:26:1e:55:92:94:d8:82:17:5a:7b:d0:bc:c7: - 8f:4e:86:04 -SHA1 Fingerprint=02:FA:F3:E2:91:43:54:68:60:78:57:69:4D:F5:E4:5B:68:85:18:68 ------BEGIN CERTIFICATE----- -MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEU -MBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFs -IFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290 -MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEwNDgzOFowbzELMAkGA1UEBhMCU0Ux -FDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRUcnVzdCBFeHRlcm5h -bCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0EgUm9v -dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvt -H7xsD821+iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9 -uMq/NzgtHj6RQa1wVsfwTz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzX -mk6vBbOmcZSccbNQYArHE504B4YCqOmoaSYYkKtMsE8jqzpPhNjfzp/haW+710LX -a0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy2xSoRcRdKn23tNbE7qzN -E0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv77+ldU9U0 -WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYD -VR0PBAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0 -Jvf6xCZU7wO94CTLVBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRU -cnVzdCBBQjEmMCQGA1UECxMdQWRkVHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsx -IjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENBIFJvb3SCAQEwDQYJKoZIhvcN -AQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZlj7DYd7usQWxH -YINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5 -6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvC -Nr4TDea9Y355e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEX -c4g/VhsxOBi0cQ+azcgOno4uG+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5a -mnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= ------END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem b/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem deleted file mode 100644 index afb471de944f..000000000000 --- a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem +++ /dev/null @@ -1,98 +0,0 @@ -## -## AddTrust Low-Value Services Root -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## Extracted from nss -## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1 (0x1) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root - Validity - Not Before: May 30 10:38:31 2000 GMT - Not After : May 30 10:38:31 2020 GMT - Subject: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:96:96:d4:21:49:60:e2:6b:e8:41:07:0c:de:c4: - e0:dc:13:23:cd:c1:35:c7:fb:d6:4e:11:0a:67:5e: - f5:06:5b:6b:a5:08:3b:5b:29:16:3a:e7:87:b2:34: - 06:c5:bc:05:a5:03:7c:82:cb:29:10:ae:e1:88:81: - bd:d6:9e:d3:fe:2d:56:c1:15:ce:e3:26:9d:15:2e: - 10:fb:06:8f:30:04:de:a7:b4:63:b4:ff:b1:9c:ae: - 3c:af:77:b6:56:c5:b5:ab:a2:e9:69:3a:3d:0e:33: - 79:32:3f:70:82:92:99:61:6d:8d:30:08:8f:71:3f: - a6:48:57:19:f8:25:dc:4b:66:5c:a5:74:8f:98:ae: - c8:f9:c0:06:22:e7:ac:73:df:a5:2e:fb:52:dc:b1: - 15:65:20:fa:35:66:69:de:df:2c:f1:6e:bc:30:db: - 2c:24:12:db:eb:35:35:68:90:cb:00:b0:97:21:3d: - 74:21:23:65:34:2b:bb:78:59:a3:d6:e1:76:39:9a: - a4:49:8e:8c:74:af:6e:a4:9a:a3:d9:9b:d2:38:5c: - 9b:a2:18:cc:75:23:84:be:eb:e2:4d:33:71:8e:1a: - f0:c2:f8:c7:1d:a2:ad:03:97:2c:f8:cf:25:c6:f6: - b8:24:31:b1:63:5d:92:7f:63:f0:25:c9:53:2e:1f: - bf:4d - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - 95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B - X509v3 Key Usage: - Certificate Sign, CRL Sign - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Authority Key Identifier: - keyid:95:B1:B4:F0:94:B6:BD:C7:DA:D1:11:09:21:BE:C1:AF:49:FD:10:7B - DirName:/C=SE/O=AddTrust AB/OU=AddTrust TTP Network/CN=AddTrust Class 1 CA Root - serial:01 - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - 2c:6d:64:1b:1f:cd:0d:dd:b9:01:fa:96:63:34:32:48:47:99: - ae:97:ed:fd:72:16:a6:73:47:5a:f4:eb:dd:e9:f5:d6:fb:45: - cc:29:89:44:5d:bf:46:39:3d:e8:ee:bc:4d:54:86:1e:1d:6c: - e3:17:27:43:e1:89:56:2b:a9:6f:72:4e:49:33:e3:72:7c:2a: - 23:9a:bc:3e:ff:28:2a:ed:a3:ff:1c:23:ba:43:57:09:67:4d: - 4b:62:06:2d:f8:ff:6c:9d:60:1e:d8:1c:4b:7d:b5:31:2f:d9: - d0:7c:5d:f8:de:6b:83:18:78:37:57:2f:e8:33:07:67:df:1e: - c7:6b:2a:95:76:ae:8f:57:a3:f0:f4:52:b4:a9:53:08:cf:e0: - 4f:d3:7a:53:8b:fd:bb:1c:56:36:f2:fe:b2:b6:e5:76:bb:d5: - 22:65:a7:3f:fe:d1:66:ad:0b:bc:6b:99:86:ef:3f:7d:f3:18: - 32:ca:7b:c6:e3:ab:64:46:95:f8:26:69:d9:55:83:7b:2c:96: - 07:ff:59:2c:44:a3:c6:e5:e9:a9:dc:a1:63:80:5a:21:5e:21: - cf:53:54:f0:ba:6f:89:db:a8:aa:95:cf:8b:e3:71:cc:1e:1b: - 20:44:08:c0:7a:b6:40:fd:c4:e4:35:e1:1d:16:1c:d0:bc:2b: - 8e:d6:71:d9 -SHA1 Fingerprint=CC:AB:0E:A0:4C:23:01:D6:69:7B:DD:37:9F:CD:12:EB:24:E3:94:9D ------BEGIN CERTIFICATE----- -MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEU -MBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3 -b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMw -MTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML -QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYD -VQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ul -CDtbKRY654eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6n -tGO0/7Gcrjyvd7ZWxbWroulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyl -dI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1Zmne3yzxbrww2ywkEtvrNTVokMsAsJch -PXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJuiGMx1I4S+6+JNM3GOGvDC -+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8wHQYDVR0O -BBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8E -BTADAQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBl -MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFk -ZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENB -IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxtZBsfzQ3duQH6lmM0MkhHma6X -7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0PhiVYrqW9yTkkz -43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY -eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJl -pz/+0WatC7xrmYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOA -WiFeIc9TVPC6b4nbqKqVz4vjccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= ------END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem deleted file mode 100644 index 657a1b7b683c..000000000000 --- a/secure/caroot/blacklisted/Cybertrust_Global_Root.pem +++ /dev/null @@ -1,99 +0,0 @@ -## -## Cybertrust Global Root -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## It contains a certificate trusted for server authentication. -## -## Extracted from nss -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: - 04:00:00:00:00:01:0f:85:aa:2d:48 - Signature Algorithm: sha1WithRSAEncryption - Issuer: O = "Cybertrust, Inc", CN = Cybertrust Global Root - Validity - Not Before: Dec 15 08:00:00 2006 GMT - Not After : Dec 15 08:00:00 2021 GMT - Subject: O = "Cybertrust, Inc", CN = Cybertrust Global Root - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:f8:c8:bc:bd:14:50:66:13:ff:f0:d3:79:ec:23: - f2:b7:1a:c7:8e:85:f1:12:73:a6:19:aa:10:db:9c: - a2:65:74:5a:77:3e:51:7d:56:f6:dc:23:b6:d4:ed: - 5f:58:b1:37:4d:d5:49:0e:6e:f5:6a:87:d6:d2:8c: - d2:27:c6:e2:ff:36:9f:98:65:a0:13:4e:c6:2a:64: - 9b:d5:90:12:cf:14:06:f4:3b:e3:d4:28:be:e8:0e: - f8:ab:4e:48:94:6d:8e:95:31:10:5c:ed:a2:2d:bd: - d5:3a:6d:b2:1c:bb:60:c0:46:4b:01:f5:49:ae:7e: - 46:8a:d0:74:8d:a1:0c:02:ce:ee:fc:e7:8f:b8:6b: - 66:f3:7f:44:00:bf:66:25:14:2b:dd:10:30:1d:07: - 96:3f:4d:f6:6b:b8:8f:b7:7b:0c:a5:38:eb:de:47: - db:d5:5d:39:fc:88:a7:f3:d7:2a:74:f1:e8:5a:a2: - 3b:9f:50:ba:a6:8c:45:35:c2:50:65:95:dc:63:82: - ef:dd:bf:77:4d:9c:62:c9:63:73:16:d0:29:0f:49: - a9:48:f0:b3:aa:b7:6c:c5:a7:30:39:40:5d:ae:c4: - e2:5d:26:53:f0:ce:1c:23:08:61:a8:94:19:ba:04: - 62:40:ec:1f:38:70:77:12:06:71:a7:30:18:5d:25: - 27:a5 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Key Usage: critical - Certificate Sign, CRL Sign - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Subject Key Identifier: - B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 - X509v3 CRL Distribution Points: - Full Name: - URI:http://www2.public-trust.com/crl/ct/ctroot.crl - X509v3 Authority Key Identifier: - B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - 56:ef:0a:23:a0:54:4e:95:97:c9:f8:89:da:45:c1:d4:a3:00: - 25:f4:1f:13:ab:b7:a3:85:58:69:c2:30:ad:d8:15:8a:2d:e3: - c9:cd:81:5a:f8:73:23:5a:a7:7c:05:f3:fd:22:3b:0e:d1:06: - c4:db:36:4c:73:04:8e:e5:b0:22:e4:c5:f3:2e:a5:d9:23:e3: - b8:4e:4a:20:a7:6e:02:24:9f:22:60:67:7b:8b:1d:72:09:c5: - 31:5c:e9:79:9f:80:47:3d:ad:a1:0b:07:14:3d:47:ff:03:69: - 1a:0c:0b:44:e7:63:25:a7:7f:b2:c9:b8:76:84:ed:23:f6:7d: - 07:ab:45:7e:d3:df:b3:bf:e9:8a:b6:cd:a8:a2:67:2b:52:d5: - b7:65:f0:39:4c:63:a0:91:79:93:52:0f:54:dd:83:bb:9f:d1: - 8f:a7:53:73:c3:cb:ff:30:ec:7c:04:b8:d8:44:1f:93:5f:71: - 09:22:b7:6e:3e:ea:1c:03:4e:9d:1a:20:61:fb:81:37:ec:5e: - fc:0a:45:ab:d7:e7:17:55:d0:a0:ea:60:9b:a6:f6:e3:8c:5b: - 29:c2:06:60:14:9d:2d:97:4c:a9:93:15:9d:61:c4:01:5f:48: - d6:58:bd:56:31:12:4e:11:c8:21:e0:b3:11:91:65:db:b4:a6: - 88:38:ce:55 -SHA1 Fingerprint=5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6 ------BEGIN CERTIFICATE----- -MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYG -A1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2Jh -bCBSb290MB4XDTA2MTIxNTA4MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UE -ChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBS -b290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA+Mi8vRRQZhP/8NN5 -7CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW0ozS -J8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2y -HLtgwEZLAfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iP -t3sMpTjr3kfb1V05/Iin89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNz -FtApD0mpSPCzqrdsxacwOUBdrsTiXSZT8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAY -XSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/ -MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2MDSgMqAw -hi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3Js -MB8GA1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUA -A4IBAQBW7wojoFROlZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMj -Wqd8BfP9IjsO0QbE2zZMcwSO5bAi5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUx -XOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2hO0j9n0Hq0V+09+zv+mKts2o -omcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+TX3EJIrduPuoc -A06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW -WL1WMRJOEcgh4LMRkWXbtKaIOM5V ------END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/DST_Root_CA_X3.pem b/secure/caroot/blacklisted/DST_Root_CA_X3.pem deleted file mode 100644 index 2b0739bfe36e..000000000000 --- a/secure/caroot/blacklisted/DST_Root_CA_X3.pem +++ /dev/null @@ -1,92 +0,0 @@ -## -## DST Root CA X3 -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## It contains a certificate trusted for server authentication. -## -## Extracted from nss -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: - 44:af:b0:80:d6:a3:27:ba:89:30:39:86:2e:f8:40:6b - Signature Algorithm: sha1WithRSAEncryption - Issuer: O = Digital Signature Trust Co., CN = DST Root CA X3 - Validity - Not Before: Sep 30 21:12:19 2000 GMT - Not After : Sep 30 14:01:15 2021 GMT - Subject: O = Digital Signature Trust Co., CN = DST Root CA X3 - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:df:af:e9:97:50:08:83:57:b4:cc:62:65:f6:90: - 82:ec:c7:d3:2c:6b:30:ca:5b:ec:d9:c3:7d:c7:40: - c1:18:14:8b:e0:e8:33:76:49:2a:e3:3f:21:49:93: - ac:4e:0e:af:3e:48:cb:65:ee:fc:d3:21:0f:65:d2: - 2a:d9:32:8f:8c:e5:f7:77:b0:12:7b:b5:95:c0:89: - a3:a9:ba:ed:73:2e:7a:0c:06:32:83:a2:7e:8a:14: - 30:cd:11:a0:e1:2a:38:b9:79:0a:31:fd:50:bd:80: - 65:df:b7:51:63:83:c8:e2:88:61:ea:4b:61:81:ec: - 52:6b:b9:a2:e2:4b:1a:28:9f:48:a3:9e:0c:da:09: - 8e:3e:17:2e:1e:dd:20:df:5b:c6:2a:8a:ab:2e:bd: - 70:ad:c5:0b:1a:25:90:74:72:c5:7b:6a:ab:34:d6: - 30:89:ff:e5:68:13:7b:54:0b:c8:d6:ae:ec:5a:9c: - 92:1e:3d:64:b3:8c:c6:df:bf:c9:41:70:ec:16:72: - d5:26:ec:38:55:39:43:d0:fc:fd:18:5c:40:f1:97: - eb:d5:9a:9b:8d:1d:ba:da:25:b9:c6:d8:df:c1:15: - 02:3a:ab:da:6e:f1:3e:2e:f5:5c:08:9c:3c:d6:83: - 69:e4:10:9b:19:2a:b6:29:57:e3:e5:3d:9b:9f:f0: - 02:5d - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Key Usage: critical - Certificate Sign, CRL Sign - X509v3 Subject Key Identifier: - C4:A7:B1:A4:7B:2C:71:FA:DB:E1:4B:90:75:FF:C4:15:60:85:89:10 - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - a3:1a:2c:9b:17:00:5c:a9:1e:ee:28:66:37:3a:bf:83:c7:3f: - 4b:c3:09:a0:95:20:5d:e3:d9:59:44:d2:3e:0d:3e:bd:8a:4b: - a0:74:1f:ce:10:82:9c:74:1a:1d:7e:98:1a:dd:cb:13:4b:b3: - 20:44:e4:91:e9:cc:fc:7d:a5:db:6a:e5:fe:e6:fd:e0:4e:dd: - b7:00:3a:b5:70:49:af:f2:e5:eb:02:f1:d1:02:8b:19:cb:94: - 3a:5e:48:c4:18:1e:58:19:5f:1e:02:5a:f0:0c:f1:b1:ad:a9: - dc:59:86:8b:6e:e9:91:f5:86:ca:fa:b9:66:33:aa:59:5b:ce: - e2:a7:16:73:47:cb:2b:cc:99:b0:37:48:cf:e3:56:4b:f5:cf: - 0f:0c:72:32:87:c6:f0:44:bb:53:72:6d:43:f5:26:48:9a:52: - 67:b7:58:ab:fe:67:76:71:78:db:0d:a2:56:14:13:39:24:31: - 85:a2:a8:02:5a:30:47:e1:dd:50:07:bc:02:09:90:00:eb:64: - 63:60:9b:16:bc:88:c9:12:e6:d2:7d:91:8b:f9:3d:32:8d:65: - b4:e9:7c:b1:57:76:ea:c5:b6:28:39:bf:15:65:1c:c8:f6:77: - 96:6a:0a:8d:77:0b:d8:91:0b:04:8e:07:db:29:b6:0a:ee:9d: - 82:35:35:10 -SHA1 Fingerprint=DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13 ------BEGIN CERTIFICATE----- -MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/ -MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT -DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow -PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD -Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB -AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O -rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq -OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b -xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw -7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD -aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV -HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG -SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69 -ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr -AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz -R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5 -JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo -Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ ------END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem b/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem deleted file mode 100644 index c37e3aa0ce59..000000000000 --- a/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem +++ /dev/null @@ -1,140 +0,0 @@ -## -## E-Tugra Certification Authority -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## It contains a certificate trusted for server authentication. -## -## Extracted from nss -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 7667447206703254355 (0x6a683e9c519bcb53) - Signature Algorithm: sha256WithRSAEncryption - Issuer: C = TR, L = Ankara, O = E-Tu\C4\9Fra EBG Bili\C5\9Fim Teknolojileri ve Hizmetleri A.\C5\9E., OU = E-Tugra Sertifikasyon Merkezi, CN = E-Tugra Certification Authority - Validity - Not Before: Mar 5 12:09:48 2013 GMT - Not After : Mar 3 12:09:48 2023 GMT - Subject: C = TR, L = Ankara, O = E-Tu\C4\9Fra EBG Bili\C5\9Fim Teknolojileri ve Hizmetleri A.\C5\9E., OU = E-Tugra Sertifikasyon Merkezi, CN = E-Tugra Certification Authority - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (4096 bit) - Modulus: - 00:e2:f5:3f:93:05:51:1e:85:62:54:5e:7a:0b:f5: - 18:07:83:ae:7e:af:7c:f7:d4:8a:6b:a5:63:43:39: - b9:4b:f7:c3:c6:64:89:3d:94:2e:54:80:52:39:39: - 07:4b:4b:dd:85:07:76:87:cc:bf:2f:95:4c:cc:7d: - a7:3d:bc:47:0f:98:70:f8:8c:85:1e:74:8e:92:6d: - 1b:40:d1:99:0d:bb:75:6e:c8:a9:6b:9a:c0:84:31: - af:ca:43:cb:eb:2b:34:e8:8f:97:6b:01:9b:d5:0e: - 4a:08:aa:5b:92:74:85:43:d3:80:ae:a1:88:5b:ae: - b3:ea:5e:cb:16:9a:77:44:c8:a1:f6:54:68:ce:de: - 8f:97:2b:ba:5b:40:02:0c:64:17:c0:b5:93:cd:e1: - f1:13:66:ce:0c:79:ef:d1:91:28:ab:5f:a0:12:52: - 30:73:19:8e:8f:e1:8c:07:a2:c3:bb:4a:f0:ea:1f: - 15:a8:ee:25:cc:a4:46:f8:1b:22:ef:b3:0e:43:ba: - 2c:24:b8:c5:2c:5c:d4:1c:f8:5d:64:bd:c3:93:5e: - 28:a7:3f:27:f1:8e:1e:d3:2a:50:05:a3:55:d9:cb: - e7:39:53:c0:98:9e:8c:54:62:8b:26:b0:f7:7d:8d: - 7c:e4:c6:9e:66:42:55:82:47:e7:b2:58:8d:66:f7: - 07:7c:2e:36:e6:50:1c:3f:db:43:24:c5:bf:86:47: - 79:b3:79:1c:f7:5a:f4:13:ec:6c:f8:3f:e2:59:1f: - 95:ee:42:3e:b9:ad:a8:32:85:49:97:46:fe:4b:31: - 8f:5a:cb:ad:74:47:1f:e9:91:b7:df:28:04:22:a0: - d4:0f:5d:e2:79:4f:ea:6c:85:86:bd:a8:a6:ce:e4: - fa:c3:e1:b3:ae:de:3c:51:ee:cb:13:7c:01:7f:84: - 0e:5d:51:94:9e:13:0c:b6:2e:a5:4c:f9:39:70:36: - 6f:96:ca:2e:0c:44:55:c5:ca:fa:5d:02:a3:df:d6: - 64:8c:5a:b3:01:0a:a9:b5:0a:47:17:ff:ef:91:40: - 2a:8e:a1:46:3a:31:98:e5:11:fc:cc:bb:49:56:8a: - fc:b9:d0:61:9a:6f:65:6c:e6:c3:cb:3e:75:49:fe: - 8f:a7:e2:89:c5:67:d7:9d:46:13:4e:31:76:3b:24: - b3:9e:11:65:86:ab:7f:ef:1d:d4:f8:bc:e7:ac:5a: - 5c:b7:5a:47:5c:55:ce:55:b4:22:71:5b:5b:0b:f0: - cf:dc:a0:61:64:ea:a9:d7:68:0a:63:a7:e0:0d:3f: - a0:af:d3:aa:d2:7e:ef:51:a0:e6:51:2b:55:92:15: - 17:53:cb:b7:66:0e:66:4c:f8:f9:75:4c:90:e7:12: - 70:c7:45 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Subject Key Identifier: - 2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Authority Key Identifier: - 2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 - X509v3 Key Usage: critical - Certificate Sign, CRL Sign - Signature Algorithm: sha256WithRSAEncryption - Signature Value: - 05:37:3a:f4:4d:b7:45:e2:45:75:24:8f:b6:77:52:e8:1c:d8: - 10:93:65:f3:f2:59:06:a4:3e:1e:29:ec:5d:d1:d0:ab:7c:e0: - 0a:90:48:78:ed:4e:98:03:99:fe:28:60:91:1d:30:1d:b8:63: - 7c:a8:e6:35:b5:fa:d3:61:76:e6:d6:07:4b:ca:69:9a:b2:84: - 7a:77:93:45:17:15:9f:24:d0:98:13:12:ff:bb:a0:2e:fd:4e: - 4c:87:f8:ce:5c:aa:98:1b:05:e0:00:46:4a:82:80:a5:33:8b: - 28:dc:ed:38:d3:df:e5:3e:e9:fe:fb:59:dd:61:84:4f:d2:54: - 96:13:61:13:3e:8f:80:69:be:93:47:b5:35:43:d2:5a:bb:3d: - 5c:ef:b3:42:47:cd:3b:55:13:06:b0:09:db:fd:63:f6:3a:88: - 0a:99:6f:7e:e1:ce:1b:53:6a:44:66:23:51:08:7b:bc:5b:52: - a2:fd:06:37:38:40:61:8f:4a:96:b8:90:37:f8:66:c7:78:90: - 00:15:2e:8b:ad:51:35:53:07:a8:6b:68:ae:f9:4e:3c:07:26: - cd:08:05:70:cc:39:3f:76:bd:a5:d3:67:26:01:86:a6:53:d2: - 60:3b:7c:43:7f:55:8a:bc:95:1a:c1:28:39:4c:1f:43:d2:91: - f4:72:59:8a:b9:56:fc:3f:b4:9d:da:70:9c:76:5a:8c:43:50: - ee:8e:30:72:4d:df:ff:49:f7:c6:a9:67:d9:6d:ac:02:11:e2: - 3a:16:25:a7:58:08:cb:6f:53:41:9c:48:38:47:68:33:d1:d7: - c7:8f:d4:74:21:d4:c3:05:90:7a:ff:ce:96:88:b1:15:29:5d: - 23:ab:d0:60:a1:12:4f:de:f4:17:cd:32:e5:c9:bf:c8:43:ad: - fd:2e:8e:f1:af:e2:f4:98:fa:12:1f:20:d8:c0:a7:0c:85:c5: - 90:f4:3b:2d:96:26:b1:2c:be:4c:ab:eb:b1:d2:8a:c9:db:78: - 13:0f:1e:09:9d:6d:8f:00:9f:02:da:c1:fa:1f:7a:7a:09:c4: - 4a:e6:88:2a:97:9f:89:8b:fd:37:5f:5f:3a:ce:38:59:86:4b: - af:71:0b:b4:d8:f2:70:4f:9f:32:13:e3:b0:a7:57:e5:da:da: - 43:cb:84:34:f2:28:c4:ea:6d:f4:2a:ef:c1:6b:76:da:fb:7e: - bb:85:3c:d2:53:c2:4d:be:71:e1:45:d1:fd:23:67:0d:13:75: - fb:cf:65:67:22:9d:ae:b0:09:d1:09:ff:1d:34:bf:fe:23:97: - 37:d2:39:fa:3d:0d:06:0b:b4:db:3b:a3:ab:6f:5c:1d:b6:7e: - e8:b3:82:34:ed:06:5c:24 -SHA1 Fingerprint=51:C6:E7:08:49:06:6E:F3:92:D4:5C:A0:0D:6D:A3:62:8F:C3:52:39 ------BEGIN CERTIFICATE----- -MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNV -BAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBC -aWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNV -BAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQDDB9FLVR1 -Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMwNTEyMDk0OFoXDTIz -MDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExQDA+ -BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhp -em1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN -ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5 -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4vU/kwVRHoViVF56C/UY -B4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vdhQd2h8y/L5VMzH2nPbxH -D5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5KCKpbknSF -Q9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEo -q1+gElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3D -k14opz8n8Y4e0ypQBaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcH -fC425lAcP9tDJMW/hkd5s3kc91r0E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsut -dEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gzrt48Ue7LE3wBf4QOXVGUnhMM -ti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAqjqFGOjGY5RH8 -zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn -rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUX -U8u3Zg5mTPj5dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6 -Jyr+zE7S6E5UMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5 -XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQAF -Nzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAKkEh47U6YA5n+KGCR -HTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jOXKqY -GwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c -77NCR807VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3 -+GbHeJAAFS6LrVE1Uweoa2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WK -vJUawSg5TB9D0pH0clmKuVb8P7Sd2nCcdlqMQ1DujjByTd//SffGqWfZbawCEeI6 -FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEVKV0jq9BgoRJP3vQXzTLl -yb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gTDx4JnW2P -AJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpD -y4Q08ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8d -NL/+I5c30jn6PQ0GC7TbO6Orb1wdtn7os4I07QZcJA== ------END CERTIFICATE----- diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem b/secure/caroot/blacklisted/Entrust_Root_Certification_Authority_-_G4.pem similarity index 100% rename from secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem rename to secure/caroot/blacklisted/Entrust_Root_Certification_Authority_-_G4.pem diff --git a/secure/caroot/blacklisted/GeoTrust_Global_CA.pem b/secure/caroot/blacklisted/GeoTrust_Global_CA.pem deleted file mode 100644 index 39416361b598..000000000000 --- a/secure/caroot/blacklisted/GeoTrust_Global_CA.pem +++ /dev/null @@ -1,90 +0,0 @@ -## -## GeoTrust Global CA -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## Extracted from nss -## with $FreeBSD: head/secure/caroot/MAca-bundle.pl 352951 2019-10-02 01:27:50Z kevans $ -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 144470 (0x23456) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C = US, O = GeoTrust Inc., CN = GeoTrust Global CA - Validity - Not Before: May 21 04:00:00 2002 GMT - Not After : May 21 04:00:00 2022 GMT - Subject: C = US, O = GeoTrust Inc., CN = GeoTrust Global CA - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:da:cc:18:63:30:fd:f4:17:23:1a:56:7e:5b:df: - 3c:6c:38:e4:71:b7:78:91:d4:bc:a1:d8:4c:f8:a8: - 43:b6:03:e9:4d:21:07:08:88:da:58:2f:66:39:29: - bd:05:78:8b:9d:38:e8:05:b7:6a:7e:71:a4:e6:c4: - 60:a6:b0:ef:80:e4:89:28:0f:9e:25:d6:ed:83:f3: - ad:a6:91:c7:98:c9:42:18:35:14:9d:ad:98:46:92: - 2e:4f:ca:f1:87:43:c1:16:95:57:2d:50:ef:89:2d: - 80:7a:57:ad:f2:ee:5f:6b:d2:00:8d:b9:14:f8:14: - 15:35:d9:c0:46:a3:7b:72:c8:91:bf:c9:55:2b:cd: - d0:97:3e:9c:26:64:cc:df:ce:83:19:71:ca:4e:e6: - d4:d5:7b:a9:19:cd:55:de:c8:ec:d2:5e:38:53:e5: - 5c:4f:8c:2d:fe:50:23:36:fc:66:e6:cb:8e:a4:39: - 19:00:b7:95:02:39:91:0b:0e:fe:38:2e:d1:1d:05: - 9a:f6:4d:3e:6f:0f:07:1d:af:2c:1e:8f:60:39:e2: - fa:36:53:13:39:d4:5e:26:2b:db:3d:a8:14:bd:32: - eb:18:03:28:52:04:71:e5:ab:33:3d:e1:38:bb:07: - 36:84:62:9c:79:ea:16:30:f4:5f:c0:2b:e8:71:6b: - e4:f9 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Subject Key Identifier: - C0:7A:98:68:8D:89:FB:AB:05:64:0C:11:7D:AA:7D:65:B8:CA:CC:4E - X509v3 Authority Key Identifier: - C0:7A:98:68:8D:89:FB:AB:05:64:0C:11:7D:AA:7D:65:B8:CA:CC:4E - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - 35:e3:29:6a:e5:2f:5d:54:8e:29:50:94:9f:99:1a:14:e4:8f: - 78:2a:62:94:a2:27:67:9e:d0:cf:1a:5e:47:e9:c1:b2:a4:cf: - dd:41:1a:05:4e:9b:4b:ee:4a:6f:55:52:b3:24:a1:37:0a:eb: - 64:76:2a:2e:2c:f3:fd:3b:75:90:bf:fa:71:d8:c7:3d:37:d2: - b5:05:95:62:b9:a6:de:89:3d:36:7b:38:77:48:97:ac:a6:20: - 8f:2e:a6:c9:0c:c2:b2:99:45:00:c7:ce:11:51:22:22:e0:a5: - ea:b6:15:48:09:64:ea:5e:4f:74:f7:05:3e:c7:8a:52:0c:db: - 15:b4:bd:6d:9b:e5:c6:b1:54:68:a9:e3:69:90:b6:9a:a5:0f: - b8:b9:3f:20:7d:ae:4a:b5:b8:9c:e4:1d:b6:ab:e6:94:a5:c1: - c7:83:ad:db:f5:27:87:0e:04:6c:d5:ff:dd:a0:5d:ed:87:52: - b7:2b:15:02:ae:39:a6:6a:74:e9:da:c4:e7:bc:4d:34:1e:a9: - 5c:4d:33:5f:92:09:2f:88:66:5d:77:97:c7:1d:76:13:a9:d5: - e5:f1:16:09:11:35:d5:ac:db:24:71:70:2c:98:56:0b:d9:17: - b4:d1:e3:51:2b:5e:75:e8:d5:d0:dc:4f:34:ed:c2:05:66:80: - a1:cb:e6:33 -SHA1 Fingerprint=DE:28:F4:A4:FF:E5:B9:2F:A3:C5:03:D1:A3:49:A7:F9:96:2A:82:12 ------BEGIN CERTIFICATE----- -MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT -MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i -YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG -EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg -R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9 -9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq -fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv -iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU -1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+ -bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW -MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA -ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l -uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn -Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS -tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF -PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un -hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV -5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw== ------END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem b/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem deleted file mode 100644 index 72698a6ad8f1..000000000000 --- a/secure/caroot/blacklisted/GlobalSign_Root_CA_-_R2.pem +++ /dev/null @@ -1,99 +0,0 @@ -## -## GlobalSign Root CA - R2 -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## It contains a certificate trusted for server authentication. -## -## Extracted from nss -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: - 04:00:00:00:00:01:0f:86:26:e6:0d - Signature Algorithm: sha1WithRSAEncryption - Issuer: OU = GlobalSign Root CA - R2, O = GlobalSign, CN = GlobalSign - Validity - Not Before: Dec 15 08:00:00 2006 GMT - Not After : Dec 15 08:00:00 2021 GMT - Subject: OU = GlobalSign Root CA - R2, O = GlobalSign, CN = GlobalSign - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:a6:cf:24:0e:be:2e:6f:28:99:45:42:c4:ab:3e: - 21:54:9b:0b:d3:7f:84:70:fa:12:b3:cb:bf:87:5f: - c6:7f:86:d3:b2:30:5c:d6:fd:ad:f1:7b:dc:e5:f8: - 60:96:09:92:10:f5:d0:53:de:fb:7b:7e:73:88:ac: - 52:88:7b:4a:a6:ca:49:a6:5e:a8:a7:8c:5a:11:bc: - 7a:82:eb:be:8c:e9:b3:ac:96:25:07:97:4a:99:2a: - 07:2f:b4:1e:77:bf:8a:0f:b5:02:7c:1b:96:b8:c5: - b9:3a:2c:bc:d6:12:b9:eb:59:7d:e2:d0:06:86:5f: - 5e:49:6a:b5:39:5e:88:34:ec:bc:78:0c:08:98:84: - 6c:a8:cd:4b:b4:a0:7d:0c:79:4d:f0:b8:2d:cb:21: - ca:d5:6c:5b:7d:e1:a0:29:84:a1:f9:d3:94:49:cb: - 24:62:91:20:bc:dd:0b:d5:d9:cc:f9:ea:27:0a:2b: - 73:91:c6:9d:1b:ac:c8:cb:e8:e0:a0:f4:2f:90:8b: - 4d:fb:b0:36:1b:f6:19:7a:85:e0:6d:f2:61:13:88: - 5c:9f:e0:93:0a:51:97:8a:5a:ce:af:ab:d5:f7:aa: - 09:aa:60:bd:dc:d9:5f:df:72:a9:60:13:5e:00:01: - c9:4a:fa:3f:a4:ea:07:03:21:02:8e:82:ca:03:c2: - 9b:8f - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Key Usage: critical - Certificate Sign, CRL Sign - X509v3 Basic Constraints: critical - CA:TRUE - X509v3 Subject Key Identifier: - 9B:E2:07:57:67:1C:1E:C0:6A:06:DE:59:B4:9A:2D:DF:DC:19:86:2E - X509v3 CRL Distribution Points: - Full Name: - URI:http://crl.globalsign.net/root-r2.crl - X509v3 Authority Key Identifier: - 9B:E2:07:57:67:1C:1E:C0:6A:06:DE:59:B4:9A:2D:DF:DC:19:86:2E - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - 99:81:53:87:1c:68:97:86:91:ec:e0:4a:b8:44:0b:ab:81:ac: - 27:4f:d6:c1:b8:1c:43:78:b3:0c:9a:fc:ea:2c:3c:6e:61:1b: - 4d:4b:29:f5:9f:05:1d:26:c1:b8:e9:83:00:62:45:b6:a9:08: - 93:b9:a9:33:4b:18:9a:c2:f8:87:88:4e:db:dd:71:34:1a:c1: - 54:da:46:3f:e0:d3:2a:ab:6d:54:22:f5:3a:62:cd:20:6f:ba: - 29:89:d7:dd:91:ee:d3:5c:a2:3e:a1:5b:41:f5:df:e5:64:43: - 2d:e9:d5:39:ab:d2:a2:df:b7:8b:d0:c0:80:19:1c:45:c0:2d: - 8c:e8:f8:2d:a4:74:56:49:c5:05:b5:4f:15:de:6e:44:78:39: - 87:a8:7e:bb:f3:79:18:91:bb:f4:6f:9d:c1:f0:8c:35:8c:5d: - 01:fb:c3:6d:b9:ef:44:6d:79:46:31:7e:0a:fe:a9:82:c1:ff: - ef:ab:6e:20:c4:50:c9:5f:9d:4d:9b:17:8c:0c:e5:01:c9:a0: - 41:6a:73:53:fa:a5:50:b4:6e:25:0f:fb:4c:18:f4:fd:52:d9: - 8e:69:b1:e8:11:0f:de:88:d8:fb:1d:49:f7:aa:de:95:cf:20: - 78:c2:60:12:db:25:40:8c:6a:fc:7e:42:38:40:64:12:f7:9e: - 81:e1:93:2e -SHA1 Fingerprint=75:E0:AB:B6:13:85:12:27:1C:04:F8:5F:DD:DE:38:E4:B7:24:2E:FE ------BEGIN CERTIFICATE----- -MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G -A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp -Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1 -MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG -A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL -v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8 -eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq -tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd -C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa -zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB -mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH -V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n -bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG -3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs -J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO -291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS -ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd -AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7 -TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg== ------END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/Hongkong_Post_Root_CA_1.pem b/secure/caroot/blacklisted/Hongkong_Post_Root_CA_1.pem deleted file mode 100644 index 67c30fc56a27..000000000000 --- a/secure/caroot/blacklisted/Hongkong_Post_Root_CA_1.pem +++ /dev/null @@ -1,89 +0,0 @@ -## -## Hongkong Post Root CA 1 -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## It contains a certificate trusted for server authentication. -## -## Extracted from nss -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 1000 (0x3e8) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C = HK, O = Hongkong Post, CN = Hongkong Post Root CA 1 - Validity - Not Before: May 15 05:13:14 2003 GMT - Not After : May 15 04:52:29 2023 GMT - Subject: C = HK, O = Hongkong Post, CN = Hongkong Post Root CA 1 - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:ac:ff:38:b6:e9:66:02:49:e3:a2:b4:e1:90:f9: - 40:8f:79:f9:e2:bd:79:fe:02:bd:ee:24:92:1d:22: - f6:da:85:72:69:fe:d7:3f:09:d4:dd:91:b5:02:9c: - d0:8d:5a:e1:55:c3:50:86:b9:29:26:c2:e3:d9:a0: - f1:69:03:28:20:80:45:22:2d:56:a7:3b:54:95:56: - 22:59:1f:28:df:1f:20:3d:6d:a2:36:be:23:a0:b1: - 6e:b5:b1:27:3f:39:53:09:ea:ab:6a:e8:74:b2:c2: - 65:5c:8e:bf:7c:c3:78:84:cd:9e:16:fc:f5:2e:4f: - 20:2a:08:9f:77:f3:c5:1e:c4:9a:52:66:1e:48:5e: - e3:10:06:8f:22:98:e1:65:8e:1b:5d:23:66:3b:b8: - a5:32:51:c8:86:aa:a1:a9:9e:7f:76:94:c2:a6:6c: - b7:41:f0:d5:c8:06:38:e6:d4:0c:e2:f3:3b:4c:6d: - 50:8c:c4:83:27:c1:13:84:59:3d:9e:75:74:b6:d8: - 02:5e:3a:90:7a:c0:42:36:72:ec:6a:4d:dc:ef:c4: - 00:df:13:18:57:5f:26:78:c8:d6:0a:79:77:bf:f7: - af:b7:76:b9:a5:0b:84:17:5d:10:ea:6f:e1:ab:95: - 11:5f:6d:3c:a3:5c:4d:83:5b:f2:b3:19:8a:80:8b: - 0b:87 - Exponent: 65537 (0x10001) - X509v3 extensions: - X509v3 Basic Constraints: critical - CA:TRUE, pathlen:3 - X509v3 Key Usage: critical - Digital Signature, Non Repudiation, Certificate Sign, CRL Sign - Signature Algorithm: sha1WithRSAEncryption - Signature Value: - 0e:46:d5:3c:ae:e2:87:d9:5e:81:8b:02:98:41:08:8c:4c:bc: - da:db:ee:27:1b:82:e7:6a:45:ec:16:8b:4f:85:a0:f3:b2:70: - bd:5a:96:ba:ca:6e:6d:ee:46:8b:6e:e7:2a:2e:96:b3:19:33: - eb:b4:9f:a8:b2:37:ee:98:a8:97:b6:2e:b6:67:27:d4:a6:49: - fd:1c:93:65:76:9e:42:2f:dc:22:6c:9a:4f:f2:5a:15:39:b1: - 71:d7:2b:51:e8:6d:1c:98:c0:d9:2a:f4:a1:82:7b:d5:c9:41: - a2:23:01:74:38:55:8b:0f:b9:2e:67:a2:20:04:37:da:9c:0b: - d3:17:21:e0:8f:97:79:34:6f:84:48:02:20:33:1b:e6:34:44: - 9f:91:70:f4:80:5e:84:43:c2:29:d2:6c:12:14:e4:61:8d:ac: - 10:90:9e:84:50:bb:f0:96:6f:45:9f:8a:f3:ca:6c:4f:fa:11: - 3a:15:15:46:c3:cd:1f:83:5b:2d:41:12:ed:50:67:41:13:3d: - 21:ab:94:8a:aa:4e:7c:c1:b1:fb:a7:d6:b5:27:2f:97:ab:6e: - e0:1d:e2:d1:1c:2c:1f:44:e2:fc:be:91:a1:9c:fb:d6:29:53: - 73:86:9f:53:d8:43:0e:5d:d6:63:82:71:1d:80:74:ca:f6:e2: - 02:6b:d9:5a -SHA1 Fingerprint=D6:DA:A8:20:8D:09:D2:15:4D:24:B5:2F:CB:34:6E:B2:58:B2:8A:58 ------BEGIN CERTIFICATE----- -MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx -FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg -Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG -A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr -b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ -jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn -PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh -ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9 -nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h -q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED -MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC -mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3 -7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB -oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs -EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO -fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi -AmvZWg== ------END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/QuoVadis_Root_CA.pem b/secure/caroot/blacklisted/QuoVadis_Root_CA.pem deleted file mode 100644 index 687deac9887e..000000000000 --- a/secure/caroot/blacklisted/QuoVadis_Root_CA.pem +++ /dev/null @@ -1,116 +0,0 @@ -## -## QuoVadis Root CA -## -## This is a single X.509 certificate for a public Certificate -## Authority (CA). It was automatically extracted from Mozilla's -## root CA list (the file `certdata.txt' in security/nss). -## -## It contains a certificate trusted for server authentication. -## -## Extracted from nss -## -## @generated -## -Certificate: - Data: - Version: 3 (0x2) - Serial Number: 985026699 (0x3ab6508b) - Signature Algorithm: sha1WithRSAEncryption - Issuer: C = BM, O = QuoVadis Limited, OU = Root Certification Authority, CN = QuoVadis Root Certification Authority - Validity - Not Before: Mar 19 18:33:33 2001 GMT - Not After : Mar 17 18:33:33 2021 GMT - Subject: C = BM, O = QuoVadis Limited, OU = Root Certification Authority, CN = QuoVadis Root Certification Authority - Subject Public Key Info: - Public Key Algorithm: rsaEncryption - Public-Key: (2048 bit) - Modulus: - 00:bf:61:b5:95:53:ba:57:fc:fa:f2:67:0b:3a:1a: - df:11:80:64:95:b4:d1:bc:cd:7a:cf:f6:29:96:2e: - 24:54:40:24:38:f7:1a:85:dc:58:4c:cb:a4:27:42: - 97:d0:9f:83:8a:c3:e4:06:03:5b:00:a5:51:1e:70: - 04:74:e2:c1:d4:3a:ab:d7:ad:3b:07:18:05:8e:fd: - 83:ac:ea:66:d9:18:1b:68:8a:f5:57:1a:98:ba:f5: - ed:76:3d:7c:d9:de:94:6a:3b:4b:17:c1:d5:8f:bd: - 65:38:3a:95:d0:3d:55:36:4e:df:79:57:31:2a:1e: - d8:59:65:49:58:20:98:7e:ab:5f:7e:9f:e9:d6:4d: - ec:83:74:a9:c7:6c:d8:ee:29:4a:85:2a:06:14:f9: - 54:e6:d3:da:65:07:8b:63:37:12:d7:d0:ec:c3:7b: - 20:41:44:a3:ed:cb:a0:17:e1:71:65:ce:1d:66:31: - f7:76:01:19:c8:7d:03:58:b6:95:49:1d:a6:12:26: *** 1484 LINES SKIPPED *** From nobody Thu Mar 20 15:28:50 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJTxv1jKKz5r0Xr; Thu, 20 Mar 2025 15:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJTxv1Dp0z3FC5; Thu, 20 Mar 2025 15:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742484531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh1vU5awYZRFv8wUquAiS1H4U8o4kFwaUhLHnwnKi5g=; b=AheWl2TZlv3a1thk9Mnxl9rKACB5wjH7t7POZtIf3HLBQP9df2NUfJ6b8N8jkLWF0UAwbx PPFKT+PNQj4vtD5IvLGt/ZsIrILaCg04nU84R1Wj6E/Oo/qwRf5vmNpaUDYRH8XBLQhAvN PiczlNFRwI8dWWQ811EuJMIj/AL+xHbKJij6i9cl1QRGhNJlTq9cJqUEKpS3ZCGLH0G4bg VJLCHUkQrGJfrwU6VQSpeJeLLi3d5Tv0MH5WWFNugRRJyGDAk+APVRc76g383Ei+7pq0Pz WNQqam0TryoOiJTy/t0oa3P/CQejzbZevJfqHRt3LPjlmzltFXxdEDFOk0jACQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742484531; a=rsa-sha256; cv=none; b=aGHOUgEPrNxSFYtlFzXRv3PcZM5bcTlAxDv/CrDr6G++mQoaiRTNnBZjlwge+u7zFyMUpn +VSfK8XALsvdECJ89L0gJuPOuY4Rv9xb52HjapH2TJJ0RRrYkKj4zlBN6Ba0GdGnTGDMeq f48OkPbfSfAUT1lxmL2QbBwMpvlojZXJwFYs1Anf983ZfRXUreROUeikwa6e7xH9BHRpjE Q8s5x+RIq95SLbISqkwr5qZgH8Mypwfi10ZB2cSgdE5qwpMr8YhmrE0Ssumh5j/7+ngug/ fKihdp6fylTHpW/bVLbhMchxPF/czdtIe194/JQ+m2GPbVevISUJ7D96KHqT/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742484531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kh1vU5awYZRFv8wUquAiS1H4U8o4kFwaUhLHnwnKi5g=; b=DgBm94rlb6p/zQ4UOwGjAMl5bL8oWE4KGfgDhq0xlKKVsTQCRcQkixGuxdTXPCgxGpvUwa 6LvOvYuAPtPp+XRs3LIRPsoGF6pNDJ3C5H8kU7pTWVLUFMtBJ1x14spFJEL8jIOsmBiFoq kUFJV+RFOVFYBF3NetBPmbsn05V31TPojz9n6Rgor83X98Ni6RDezsYVPoUnS/wTFYtkKG 79UVjmYT/tiFSqqmJME0uwxo0gFq5uisl5b7yq7x5iD3Tt5n8NHBNIN9pRu+LFj6kgVi44 lVofrPtdBmGhrBOApeVmaNJ7CZjcqkG8kniiStyNKtfbY9/1E8QLM+785gHauw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJTxv0ZTKz19fP; Thu, 20 Mar 2025 15:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KFSomB060803; Thu, 20 Mar 2025 15:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KFSoJE060800; Thu, 20 Mar 2025 15:28:50 GMT (envelope-from git) Date: Thu, 20 Mar 2025 15:28:50 GMT Message-Id: <202503201528.52KFSoJE060800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Gallatin Subject: git: b429d50df97b - stable/14 - ifconfig: fix reporting optics on most 100g interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b429d50df97bc6f85373d4bd4ffca7e7078b3fe8 Auto-Submitted: auto-generated The branch stable/14 has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=b429d50df97bc6f85373d4bd4ffca7e7078b3fe8 commit b429d50df97bc6f85373d4bd4ffca7e7078b3fe8 Author: Andrew Gallatin AuthorDate: 2025-02-25 19:17:14 +0000 Commit: Andrew Gallatin CommitDate: 2025-03-20 15:27:08 +0000 ifconfig: fix reporting optics on most 100g interfaces This fixes a bug where optics on 100G and faster NICs were not properly reported. (cherry picked from commit 709348c21351a783ff0025519d1f7cf884771077) --- lib/libifconfig/libifconfig_sfp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libifconfig/libifconfig_sfp.c b/lib/libifconfig/libifconfig_sfp.c index 17f130606765..8292135d3e47 100644 --- a/lib/libifconfig/libifconfig_sfp.c +++ b/lib/libifconfig/libifconfig_sfp.c @@ -181,6 +181,7 @@ get_qsfp_info(struct i2c_info *ii, struct ifconfig_sfp_info *sfp) if (code & SFF_8636_EXT_COMPLIANCE) { read_i2c(ii, SFF_8436_BASE, SFF_8436_OPTIONS_START, 1, &sfp->sfp_eth_ext); + sfp->sfp_eth_1040g = code; } else { /* Check 10/40G Ethernet class only */ sfp->sfp_eth_1040g = From nobody Thu Mar 20 17:59:41 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJYHz3hpqz5r9nR; Thu, 20 Mar 2025 17:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJYHy2f0xz4LTD; Thu, 20 Mar 2025 17:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742493582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpmZTRJwucFIA0+s6sOP64vOmrZ3leZB4BlYksziE80=; b=Ik5WcEqr2dNC05UB/DSpi/zvHvYO4ZkkPlkgEmK0uYUTn5seQYuHHSgh7WCJX8nvTALbff gyhe+XIfzwKWO33JldZwDj5XiWXZk9hmJmFbIMV4ctrVFijtB2Oj7q6LP5fJqiI2qRxE2o 6UPYEswa9Ohr/KsGj6GFSc/cPKrN2cpXZM1iPP691+AuDck152tQtNEQKYKGXboY+kwUnH 3O+VmGEGaA7sbrFE9bjt6Z67pyGJ7TG51uF8MYsvk1+hqk59tMRQ8n2GPIScRMzFgKJxpK gDXTxhXFIrQRQV5/1QJ9jQNJyjw/gRuK88qVPZ7CsCo/LW3Xfc/WbKSys7f4EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742493582; a=rsa-sha256; cv=none; b=wVh5eJp5r2st3TKynfb927sq/CKZEAFx4VK3aYdBWAEF7RLSs5/w6uaNRjsttC0sla6u6u yT8IdBoxT2bkJ7SvC7XfF4Hzd2A2nyMrxcPii5J6RUdc5Ze9/Mh+cQQn7T9DOp3gJcQEnw arkyXfBIeq+6psYZxnGRyrZRbU19Hr4TVbg61VOa4j3PkObdOJfes7RB0pr5cJO7f+ZTqI QWh1a6g7G18lHEwqDN/T5GN5/ljSzNYPA1KsdR92/yAEZ1W/DlnWDi2e8gXJTfgqzEJt4D W4JoFHwSblj3P6FKYehDOwdxz5XqTe24XnfNDO7g7GPT6SE6WfFtXq9Q6z675g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742493582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lpmZTRJwucFIA0+s6sOP64vOmrZ3leZB4BlYksziE80=; b=pwOORuqebu8AFP0KKK2rD/1+36jFOL0rknwb3i4o+w1vEdwb1H6pdZiSbGoFclx70NHNg0 Kbf61ErXUTRVA/GSnKm47uTN9WQjf2vdtQaEyhH2rVD3a9cu+R0OVX9sL2Adawd9USJPKQ /aPU66N5jmPf7+jUYRAb5c6Z4vT32ifpe75+puFYI7rnZy7/gcOFBvUwvPJsFQj9QofENg DMx/dejmJnl2sfZEyN1fPP79CE4+LN6T1tWPy02zvLCTDncZUwS5I480xM2VYL86/ITs/8 D0wN2bSAUfW13skK3KOZkIuE8Z/k6btEVyHsVQLyOBZq/TDllrG8ChT1eIcmCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJYHy0Nqrz1Dqh; Thu, 20 Mar 2025 17:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KHxfEW040558; Thu, 20 Mar 2025 17:59:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KHxfF2040555; Thu, 20 Mar 2025 17:59:41 GMT (envelope-from git) Date: Thu, 20 Mar 2025 17:59:41 GMT Message-Id: <202503201759.52KHxfF2040555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fdc4db57224c - main - usr.bin/Makefile: always build ELF Tool Chain strings(1) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fdc4db57224ce19b867c60fce4c410068be40c27 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fdc4db57224ce19b867c60fce4c410068be40c27 commit fdc4db57224ce19b867c60fce4c410068be40c27 Author: Ed Maste AuthorDate: 2025-03-20 17:47:29 +0000 Commit: Ed Maste CommitDate: 2025-03-20 17:59:32 +0000 usr.bin/Makefile: always build ELF Tool Chain strings(1) strings(1) is not conditional on WITH_/WITHOUT_TOOLCHAIN, as it is a small utility that is also useful outside of the toolchain context. As of commit 1cae7121c667 we switched to WITH_LLVM_BINUTILS by default. After this change building world with default options but installing WITHOUT_TOOLCHAIN failed, because we would build LLVM's strings but attempt to install ELF Tool Chain's version, which did not exist. Address this by always including ELF Tool Chain strings in non-install make targets, so that it will be available if options are changed at install time. PR: 285556 Reported by: Michael Butler Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49425 --- usr.bin/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index bca7896e5a17..15fcdeb479f7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -250,6 +250,12 @@ SUBDIR.${MK_TOOLCHAIN}+= nm SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size +.endif +# Include elftoolchain's strings in build targets even if using LLVM_BINUTILS, +# as we may later install with different options. In particular, the release +# artifact builds use default options for buildworld but install with +# MK_TOOLCHAIN=no which implies MK_LLVM_BINUTILS=no. +.if ${MK_LLVM_BINUTILS} == "no" || !make(install) SUBDIR+= strings .endif SUBDIR.${MK_TOOLCHAIN}+= c89 From nobody Thu Mar 20 19:35:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJbQb114Cz5rHQk; Thu, 20 Mar 2025 19:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbQb0Vdlz46Wf; Thu, 20 Mar 2025 19:35:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742499335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZw13nzikHsugiypvgVo1MlpGFdNM00A7UwX9MAzmJo=; b=RfCG2c5O0l20BgdrpdYrcKS3QCZKDt1IqkciBOl8dRXIxG8xBh1mlD7+n5TlmoQgTB5XxQ 3Byqw67JNkF2auLieyfTDBxjL3+HTWHzHx0wNJ5loqbfy6+mkOQzIPhenR7sqOitYFCX4E qFg2nFAHsoDo17mL7Nwhod6XSLuodOx0MGHt+p2BFHWA09ocXh+lb3riZ9tkxSFXwIJxxG VonI7vt6+zvXFa1kvZL9sNGlEgzDffjKWXfifTn0Q9KzMVLd2M4blYjlgRexGr1P8fsy/u 5yp+8KIKJDRZAapIUyBVGPe2PCSUk6ha0KvnSh7sP+kvqECT3hHGrkwA0/fk4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742499335; a=rsa-sha256; cv=none; b=xpNdQmnV7aZ7WNhMRS5poJqY0k0FMQgO20r3rUJmuwYL+dIGvqqoCHJlvHfhjGhkOuDEsG Onz1THPLXxHZ0QsOf0eDSm7++G915du/t81gnSxcGjB0mF310sFJOjgcWlCLgGlER/LI8n XIHm6MRjMXzcIUlLwj6kDl9qrwhUr0SW/5lULsGznhwIQadgljrJmaupUeaIisHzyGRNaL Y9kelwSYt34KDOb4y82naLZb+PhA2TgU7NJeIY7DmcOdJ78Fjmzt8qspPVzOFbiQbiJI9m 03APj11n92ycgvfj4UykuL7+rAKP940hN3bnJ5C2QmOYlEuAfmKL4v9LAWy1FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742499335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GZw13nzikHsugiypvgVo1MlpGFdNM00A7UwX9MAzmJo=; b=KjGI0YAGigcBHbhnNRcUs8BrMoj1K3f9eU11dWvkJ1yaKqd8HfxTNALAkNlwyTXTG6rYaJ h/ACmNBzPTWXJBYDWVMRt59T1eaogLudhqEcNS2kQcAQNQwCLwLwZH7FM3tSfWoTABvLli 4PT9tnHtHxM6stV7+q37ot32Iog+n/aN9LI74+7rT34Fzwspah4i+fpoY3PWi9A8YrRWLO Vs7o7CrIJseDgbKJ7cT9ZwmRbNAF+U550pNF1hTQDmOO614L1PvZzOYSLqTiHaYOoZMKXY guCdlNVV+ZTpc2dFtXaIvi9z1QMdcjuNTKQ3DlHQgQrjg/g7vdU7t+i1Qd4h2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbQZ74J5z1HRZ; Thu, 20 Mar 2025 19:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJZYD1026829; Thu, 20 Mar 2025 19:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJZYpG026826; Thu, 20 Mar 2025 19:35:34 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:35:34 GMT Message-Id: <202503201935.52KJZYpG026826@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: fbcf3b74e8f2 - main - tcp: fix detection of bad RTOs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fbcf3b74e8f2c0c5ba37f1839bfe9395eb2fd0b1 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fbcf3b74e8f2c0c5ba37f1839bfe9395eb2fd0b1 commit fbcf3b74e8f2c0c5ba37f1839bfe9395eb2fd0b1 Author: Michael Tuexen AuthorDate: 2025-03-20 15:17:40 +0000 Commit: Michael Tuexen CommitDate: 2025-03-20 15:17:40 +0000 tcp: fix detection of bad RTOs If timestamps are enabled, the actions performed by a retransmission timeout were rolled back, when they should not. It is needed to make sure the incoming segment advances SND.UNA. To do this, remove the incorrect upfront check and extend the check in the fast path to handle also the case of timestamps. PR: 282605 Reviewed by: cc, rscheff, Peter Lei MFC after: 3 days Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D49414 --- sys/netinet/tcp_input.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index cf480ccf9772..8f50843d940d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1635,11 +1635,6 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, to.to_tsecr -= tp->ts_offset; if (TSTMP_GT(to.to_tsecr, tcp_ts_getticks())) { to.to_tsecr = 0; - } else if (tp->t_rxtshift == 1 && - tp->t_flags & TF_PREVVALID && - tp->t_badrxtwin != 0 && - TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) { - cc_cong_signal(tp, th, CC_RTO_ERR); } } /* @@ -1792,15 +1787,17 @@ tcp_do_segment(struct tcpcb *tp, struct mbuf *m, struct tcphdr *th, TCPSTAT_INC(tcps_predack); /* - * "bad retransmit" recovery without timestamps. + * "bad retransmit" recovery. */ - if ((to.to_flags & TOF_TS) == 0 && - tp->t_rxtshift == 1 && + if (tp->t_rxtshift == 1 && tp->t_flags & TF_PREVVALID && tp->t_badrxtwin != 0 && - TSTMP_LT(ticks, tp->t_badrxtwin)) { + (((to.to_flags & TOF_TS) != 0 && + to.to_tsecr != 0 && + TSTMP_LT(to.to_tsecr, tp->t_badrxtwin)) || + ((to.to_flags & TOF_TS) == 0 && + TSTMP_LT(ticks, tp->t_badrxtwin)))) cc_cong_signal(tp, th, CC_RTO_ERR); - } /* * Recalculate the transmit timer / rtt. From nobody Thu Mar 20 19:53:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJbqn2rNMz5rJHr; Thu, 20 Mar 2025 19:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqm5yR3z3MkV; Thu, 20 Mar 2025 19:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MafCZCL/vd1SsFGUigngnYJDmt2lYOlmOJ88HFsam+M=; b=m4Yl+Md8Shk2y9ivycA0vTBtDR7UepkPFPaLwk2jJgPQOJ73GFjHZDnrRNRvzkzBixiYBh x3nWnXF7uCHNOFI835niFTaizBP5+up1VndjkgKtSb2oGeLin6BsF7caWjaYF37NWg2JXf v9/jjWGydIZRstyb/RQVPxFM95J7dPmM5izw6t9EbazQKTuPMIpZzjmxxzyJt/Mdlsq7Mo rK0FLQM5gjp5g5ifXTCNK2piJvX8OGeM8TroTDkyJ4Zbx74i/djm2NMj/O8v4ZaVnp15yq xKwn327QWS2hapeZaDCQNB+IHSRdiGX/IAD5xl3kKHVaN9j0HF1sn6X1Yvf1IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500436; a=rsa-sha256; cv=none; b=q22pQUE4GhVX7ehVnYvcnWx2cz81yofvQHCVTyDoe+m6C42A6cAib9cCvb1DMfan8HxTKJ 48q0+i5hY5Zi3wRpzM4k6a2bT7BBGpefhVzx6C6PAfx00hhcEXx/hnyZkJcPEdyTeuiTNd k8ZLfkuWkre6VjvMLGBAqR0bYpYZb2ZmT3fyB77FlGiEMJ4cHqQY+1zB0wBe74+U//G8gH 7Y+TUHZK+hGw2G7LFB7qauP/TKApK75KOvyxev67TYhmIPJnvfbQD5SZYUgS9flhvj7u2f 8s7uK5UiQu7UiPYMN7gDDyYRgK6Hi9/uqdD9yYDoK7W8efzOAAyPTgthythNsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MafCZCL/vd1SsFGUigngnYJDmt2lYOlmOJ88HFsam+M=; b=PApb5BOfRTpuaZbUMIGBaSg0K9uYNbDzMmChqxcWy1Cftos0zNxBbU+SJK4SZhRgFxGzoK p863qKarLXD46xB8rhk5aksJc/foWqyAd0az59BFJAaqAbiJ4AYFnUFVStML7Nq666kLmk bYtq4yaYhM16yl7j2JOORWBiirfu1lgL8Zt/mvQ+EVt75LRM4rSwZQ6jzqzsJr0VQgomWr KTad8uH9zaLxpkGgvuoJuco8bnkT+uAfq+mlzN9/C7Tl+m7M63i7MejdildaLod53evG2G ExIE22ZinxssNM1R0LpnP5hWrkKuBEY3Xu/jhH8IuKZFoZ581Wd1tAh495kYfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqm2xScz1JZ5; Thu, 20 Mar 2025 19:53:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJruKl063955; Thu, 20 Mar 2025 19:53:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJruFv063952; Thu, 20 Mar 2025 19:53:56 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:56 GMT Message-Id: <202503201953.52KJruFv063952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 09ba3ece1817 - main - linuxkpi: Add `list_for_each_rcu()` List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09ba3ece18177c6ed96f8be75c6d648e9d20acdf Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=09ba3ece18177c6ed96f8be75c6d648e9d20acdf commit 09ba3ece18177c6ed96f8be75c6d648e9d20acdf Author: Jean-Sébastien Pédron AuthorDate: 2025-02-22 18:25:51 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Add `list_for_each_rcu()` This is a variant of `list_for_each()` where the next item in the list is read using `rcu_dereference()`. This is used by the i915 DRM driver starting with Linux 6.8. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49375 --- sys/compat/linuxkpi/common/include/linux/list.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/list.h b/sys/compat/linuxkpi/common/include/linux/list.h index eecb517d780e..a6c74a324dac 100644 --- a/sys/compat/linuxkpi/common/include/linux/list.h +++ b/sys/compat/linuxkpi/common/include/linux/list.h @@ -234,6 +234,11 @@ list_del_init(struct list_head *entry) for (; &p->field != (h); \ p = list_prev_entry(p, field)) +#define list_for_each_rcu(p, head) \ + for (p = rcu_dereference((head)->next); \ + p != (head); \ + p = rcu_dereference((p)->next)) + static inline void list_add(struct list_head *new, struct list_head *head) { From nobody Thu Mar 20 19:53:58 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJbqq6kT7z5rJQM; Thu, 20 Mar 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqp5pZLz3Myg; Thu, 20 Mar 2025 19:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1yfZnXN/UqVNTNqdnqScANVWWoCfSSXq4TZKNGkeBM=; b=rVwZTb7k5EcrkC/QFXCiaGWFcJY4TQfCb6+HuFCIjUu4e5Czd40V+2NmG9+H9IGX14sOC2 bIQGNyp1voDMIdB0uJAO/Gu5E3pCzJdO9TEgHa/tr+j5j/htAF/zoRHEaajqx2kN4mUpZ0 LqSu+YRh4DBFbGhwzhYoCC33E9ny79asyql4HTmlabqBR2ubtxPTvx/HvJPPpz6ac4dEbg sG4WIc5GJyOEymYJ3Npm4qMsNkpi3fSwJIhh/6aa5uUiPOfYnU21OidkEIwLGfS0FH33FY AoNOJhYd1Dqh/immBneRPK5xVynsQkXH+vVFkLLKfkeCp25Y/lA+gy0qoEgogw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500438; a=rsa-sha256; cv=none; b=bDAn1x9xcnWzs1vCKFdsjVqgRAa9xl2sJ82KCdO/c81UVKNtndTcIvmGNpguyvBUS/p5uJ vPm77a9FMfyT4IFrHU0BTMM1UMYiZC5o1KCMqf7y6GKrGW/zkcNMqz7qblks2IBAMaPTiT JLhvS387D2Lk+6A+2HFXlYx7BFbOPf0eNr6JrbtrM6CKEa4tirNoDWz07n2wl2kka+t4tR C8gQVEpnajsT9Z2yxt+SrbR+KszqP5U1NKvnBDFO4OqdGQ+WMqZUrCgEl14f0/rBJsRfa8 a8PvGbHiD7XtPJbAdGWQQAe3AKa7WpxNhXFnjJok5naWo0H+yS7fWxo1cgVuCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1yfZnXN/UqVNTNqdnqScANVWWoCfSSXq4TZKNGkeBM=; b=KuNDTKXJL8TYQMG+DPzbrRcIPAiAj9iB7HcZbOOJb4CeZkPUaWJ6efksmRU9TUPJzDahuE MQNVCucoEAOJ83YIGd9dV63YKApUDAPvCSZG0B86JwPJFgZlHlucNUMqs3dVEo3qYuz4D9 aE4eV3210u6fFcf5LPDH/LPsplqpEbkDgcy8fV23wybVnCeDEpZjlmR5DvfCWylf4xRW8a 9/xd8XqTvpkmWDv6abX09H3GDcn31P6F4qzxonNoh22hjl08678rA73DKn8U3+6FHBKDca O8Z5hQsrUKYdmZ6OqTXtLzbkWRi3dp1LIw+hZ0Fjw/nBQhMx6TOjWVusWBGGwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqp58QXz1J1G; Thu, 20 Mar 2025 19:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJrw4Q064042; Thu, 20 Mar 2025 19:53:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJrwv2064039; Thu, 20 Mar 2025 19:53:58 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:58 GMT Message-Id: <202503201953.52KJrwv2064039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 62f2367e2aac - main - linuxkpi: Add List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 62f2367e2aac46194e4f97ff64ab32b82e4b8649 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=62f2367e2aac46194e4f97ff64ab32b82e4b8649 commit 62f2367e2aac46194e4f97ff64ab32b82e4b8649 Author: Jean-Sébastien Pédron AuthorDate: 2025-02-28 22:50:54 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Add The amdgpu DRM driver started to use it in Linux 6.8. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49383 --- sys/compat/linuxkpi/common/include/linux/units.h | 40 ++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/units.h b/sys/compat/linuxkpi/common/include/linux/units.h new file mode 100644 index 000000000000..304b5c27d87f --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/units.h @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2025 The FreeBSD Foundation + * Copyright (c) 2025 Jean-Sébastien Pédron + * + * This software was developed by Jean-Sébastien Pédron under sponsorship + * from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_UNITS_H_ +#define _LINUXKPI_LINUX_UNITS_H_ + +#define NANOHZ_PER_HZ 1000000000UL +#define MICROHZ_PER_HZ 1000000UL +#define MILLIHZ_PER_HZ 1000UL +#define HZ_PER_KHZ 1000UL +#define KHZ_PER_MHZ 1000UL +#define HZ_PER_MHZ 1000000UL + +#endif /* _LINUXKPI_LINUX_UNITS_H_ */ From nobody Thu Mar 20 19:53:57 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJbqp2DYFz5rJSZ; Thu, 20 Mar 2025 19:53:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqn6C0dz3Mn2; Thu, 20 Mar 2025 19:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zFckBS4bPTzE8x3G7pRWgk7oHyXSrq+GWfZ2QZY5W5Y=; b=xjiFgFFjeZV3Z73pTy2ef1JUQ8qwKUCJREss8rvwKWmubWYfoDd5Fn2IoaPy7ZPzl52xs0 3TKpGkJL/tpXweRZyuYU83phVXkWiZ3z+U2+gPkXMMx3fw2xlKZcgEGxuprdoRK+LQDufF T9JRCzH6pHXmyatUaTZeyj1cuPjIp6QsrKgFrjjt7aCzsUEUt+IfnigR+2OMLuoHUs7xbs aasXvGqt/8J/7eT0F0yfJuaRaxTz4Mv7d/7iQrLMC996cne27PnS1KEEXxRFieSM3zCp2+ fsoPQYVPxSXHgabsb9t9bmteB1/8YcVyQ7NVxDBDKPLgt3J6I1HYlqVD9Hoa6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500438; a=rsa-sha256; cv=none; b=bXoaUh95vA4Gfaf1hYYCl/9dzrBkTgWYJSPDsFEWGzCTa63zB9wbBCOGOfsm1S4MQ+iP9L wxEopSkheYDRC1aMBcppwNRNco+TB5DqOC3kKtgYQgQmw9Gc0ehF27yqnBOsLDOf2q8nHK Vuc4+7r+b7gOrvzweGWzib5YuYkelyYl94sjkx+m7PybsEsFrv9Iv2bxg8ltLfAT/qIvnM 1rO6qJrjDT9M2EkfAE1Kd60GmTVSsfjnqRsTr1zz8F1kRpLLHXQS2JLui3fQtHBNfvbJfa w0o0wAhi68+ouEnAVUjQQ+dijbDFfOF/VTWDnkqeKmt5eJ9nbPMoLKAiLRr11g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zFckBS4bPTzE8x3G7pRWgk7oHyXSrq+GWfZ2QZY5W5Y=; b=A362hPwLneuxJ7n0HDfZvNVoqFRtx5KP7gK7Czc9jrFMx8TzZyG3vpNVIYsTdpVY1eIRUx bRPDXLSewr8tF2D6AyXOKai1NNsTqSa2D8By2AOZwxv5dag5fQVpFGkYXrG4bm9mfAkKKv elNWy2wMbreiRtH116/G9mk08psgr6cv4X6RTVgi+z7oP7HB9uXdWe6bMvy6eQiF04HFph InzJa7ro55WDtrpkTxZeoIqeExIDQTLrs3PzUlLAzd82hRBll5yeXQdQo43q6kqso2tzUR e3+5CaCGeaE9GDlmnr/jcCh5o8LhFGz+DqubLwwHh0AwaKiYUjQruA12yqHCcQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqn3vwsz1Jbl; Thu, 20 Mar 2025 19:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJrv6i063995; Thu, 20 Mar 2025 19:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJrvQ9063992; Thu, 20 Mar 2025 19:53:57 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:57 GMT Message-Id: <202503201953.52KJrvQ9063992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: 3f847ccfd51e - main - linuxkpi: Define a few more `PCI_*` constants List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f847ccfd51edd0640cc892424a76a7460c353e8 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=3f847ccfd51edd0640cc892424a76a7460c353e8 commit 3f847ccfd51edd0640cc892424a76a7460c353e8 Author: Jean-Sébastien Pédron AuthorDate: 2025-02-25 23:27:02 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Define a few more `PCI_*` constants They are synonymous to existing FreeBSD constants. Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49379 --- sys/compat/linuxkpi/common/include/linux/pci.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 31475d6dc7c3..afd6c827b3b4 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -116,6 +116,10 @@ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ #define PCI_COMMAND PCIR_COMMAND #define PCI_COMMAND_INTX_DISABLE PCIM_CMD_INTxDIS #define PCI_COMMAND_MEMORY PCIM_CMD_MEMEN +#define PCI_PRIMARY_BUS PCIR_PRIBUS_1 +#define PCI_SECONDARY_BUS PCIR_SECBUS_1 +#define PCI_SUBORDINATE_BUS PCIR_SUBBUS_1 +#define PCI_SEC_LATENCY_TIMER PCIR_SECLAT_1 #define PCI_EXP_DEVCTL PCIER_DEVICE_CTL /* Device Control */ #define PCI_EXP_LNKCTL PCIER_LINK_CTL /* Link Control */ #define PCI_EXP_LNKCTL_ASPM_L0S PCIEM_LINK_CTL_ASPMC_L0S @@ -226,6 +230,8 @@ typedef int pci_power_t; extern const char *pci_power_names[6]; +#define PCI_ERR_UNCOR_STATUS PCIR_AER_UC_STATUS +#define PCI_ERR_COR_STATUS PCIR_AER_COR_STATUS #define PCI_ERR_ROOT_COMMAND PCIR_AER_ROOTERR_CMD #define PCI_ERR_ROOT_ERR_SRC PCIR_AER_COR_SOURCE_ID From nobody Thu Mar 20 19:53:59 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJbqr1wDrz5rJc7; Thu, 20 Mar 2025 19:54: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbqq6bgVz3Mw6; Thu, 20 Mar 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCNuhyzgvBfFBo1u00SDzXtUqOrTmOlUkXjqB2tEnAw=; b=SRktWjwLiB9pKQ0Tg+x8NssZAKNSY1v1rQ04/wzq2BReotI19LJMrJr32/hyzfdDWG/4ET Tng/T4CoSIhMlxD5821WI6YW5JaJPcWUW9aeo6ZAgjucppZd22RO8sYVRj2i/EZ/jBZm+l zTZWyP5WKIXMSElr3nEE+Td/kZkBcj/92ElEV5vMoVXwn98ncrzqFCGE0saenzZp2F20ZY 6PRQohpsGr/0OTAcnDueodnQaCoJePlSY7P7RidBEnmUkPPIbINOfXf/R9ulfBZTVDo00o +95hEo5npzQ1MBCCv3smEdjzKH0MltFRYDqTXpiDsbBiOE8/kKKhUDMbaRuIaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742500440; a=rsa-sha256; cv=none; b=sTrZMYsMWFdph9w474cgBHfp3doFWSsxAkvQ7SpdIbNX0nyi7O0T6MfyDDlv1Hs93aUu7h m0y9nEgn12cMSpDpCS9S2vYu6E7hm4fcmicucLHmsXsx5kQNoFSgkHNmbsgdgOC56WimLP 90579umz4ADw+P1EZD8/4q0m/kH/fNhuTGxTXPGrd9rByi1pFfqvyWOMPtKaEeaXT/aZfL gXskIH/EIDJglc/zWDrFE0g2l4/GQyAyDmgDT8gTIwLmtFlxQaiQMXMj/5vFNAi3len9sa niTJy/iEQpXuIF1WcQYgBK7VxAdZwUS909fl4ZDSzKOf2mqZ09RAP6W5yqiRSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742500439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCNuhyzgvBfFBo1u00SDzXtUqOrTmOlUkXjqB2tEnAw=; b=CxjSPF1XgFlJeLCMpEFJ+jAdd+zsGNhCJo53JTyHfC9sHFb9uoHtNcH1sfBIKjvsO/5tcC b09yG5/nzLGk/GQcj3qvRRdbzape2T2Ztac5t8ugg9sfpB2YIge2pRZ8AH5IZHRhvNv6aZ YC/yufDw5qE9VTrccAp9mfQbQwo1kvzfhPiJHgUBPBGEPaIEanbaur68ao+X3feo93V+dD hMLiVazbWZarzC11AiYwipqfaDRdK+F0xfE8uVEHeM6/DDrsBRsv1N+imR3FFqifaGSOjo 7ds69Lvm01+5qkWVsRHsj+F1nB3X+r3CXtC72dWHouek0McmvhzvcJqr0CtBbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJbqq69Lwz1JHZ; Thu, 20 Mar 2025 19:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KJrxJ0064083; Thu, 20 Mar 2025 19:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KJrxf8064080; Thu, 20 Mar 2025 19:53:59 GMT (envelope-from git) Date: Thu, 20 Mar 2025 19:53:59 GMT Message-Id: <202503201953.52KJrxf8064080@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: cd8c2e012761 - main - linuxkpi: Add List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd8c2e012761bf672074798be64d5ce16af7aff8 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=cd8c2e012761bf672074798be64d5ce16af7aff8 commit cd8c2e012761bf672074798be64d5ce16af7aff8 Author: Jean-Sébastien Pédron AuthorDate: 2025-03-03 19:32:20 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-20 19:43:44 +0000 linuxkpi: Add Reviewed by: emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49385 --- .../linuxkpi/common/include/linux/cpufeature.h | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/cpufeature.h b/sys/compat/linuxkpi/common/include/linux/cpufeature.h new file mode 100644 index 000000000000..046fab53d521 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/cpufeature.h @@ -0,0 +1,37 @@ +/*- + * Copyright (c) 2025 The FreeBSD Foundation + * Copyright (c) 2025 Jean-Sébastien Pédron + * + * This software was developed by Jean-Sébastien Pédron under sponsorship + * from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_LINUX_CPUFEATURE_H_ +#define _LINUXKPI_LINUX_CPUFEATURE_H_ + +// #include +#include +#include + +#endif /* _LINUXKPI_LINUX_CPUFEATURE_H_ */ From nobody Thu Mar 20 19:59:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJbyg5kxrz5rJFD for ; Thu, 20 Mar 2025 19:59:55 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJbyg2KNcz3SkG for ; Thu, 20 Mar 2025 19:59:55 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-391342fc1f6so970058f8f.1 for ; Thu, 20 Mar 2025 12:59:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742500793; x=1743105593; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gxq90aT+g8xLUHIV0sY4u/KM+aEqxh8XLc0rYmJmgss=; b=cdN52G0ejo9DoRgsatklorurGnLqYRnPvOH2RKHQHYTGJIpAPBF68wlO9pF9UZo1qd HX8TYHKXTuRkUyct3+28vCB0FI+qfNuuHiXP66XwTUqflD+xG3NyQCAbetm3p+UEm/DV oV51a48SmmmmXiKI+WVfFclkNrBm0YlaCfwHAPKHLbDU243Ug5rXsZIFjNUGEJz5LFw/ CGFSl5x2UbcsJi2OthB9J1ZLQnBVsqanO2MwhwtK86lDBGUTFe6Z1k7Fp91hf6cCiqC2 9/angnqO33LESk6i7NA5hNz/1uZRH/86ERMCbzJazdS0CjvWewbylqK6ODoJYOg3qapW Q8Cw== X-Forwarded-Encrypted: i=1; AJvYcCWMXdqoO2YWdApxgmW1oz4OTiLHvc8bK+Dh9JiSJ+va9doiA9j4egJildiN1HzUIcFB8YCAW8aPwkpRbUNiy77t+Mp8@freebsd.org X-Gm-Message-State: AOJu0YxO1gL2Teaurpnb/BVmT947g+IBqIyzEvcMLjdYuyhpifHvKOhe PiHpiddqIb7JQ+5hQA+eTWvkzxGwF44xaNMBZpcFa87GtNHiJFqKbBWH0BerTrLjaOLtaLlfXgi 5 X-Gm-Gg: ASbGncttUeH0mpVT6iYaBb4mQsNpSxs7TSqjbAjCQpTQictMw3Hlca7kEPcjymYwnaC ZNHEecHKmOGKhXVJt+xjrSAVYpuC3yP4Os1Xib8lZs7fdcPp+7PE4pwfq85j8mQZHc+LS3r+/61 v/1uVC0ebjyWELPL8vx1Kn4aBhaiy2slMK3ups9D6XpIfHU8aXCU1Ds9FLk9Cu+pZFQwFklnAY5 mTMnkaLBwKJXokAG736PW0t47Tg+Ul8QQ6UF4l3yvItts0ZrVGY7Fv/iGmWVgI42kNUoaVPeeUf FHw6qpYZ7uZKJhpDuz/5lpTcaKLUH9vVs9/UP4dwx4QBBv7gnR9oxNREUwc= X-Google-Smtp-Source: AGHT+IE3tdKLdnr9F4v1FQ0wmLd7M8fu7VV3nHkV8sHfJi9MB2CJbxHHNhrbielE8rfqxmbjo42ILA== X-Received: by 2002:a05:6000:1a8a:b0:390:f6aa:4e7c with SMTP id ffacd0b85a97d-3997f911525mr922490f8f.28.1742500791770; Thu, 20 Mar 2025 12:59:51 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4fdb06b9sm6417425e9.36.2025.03.20.12.59.50 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Mar 2025 12:59:50 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: cd8c2e012761 - main - linuxkpi: Add From: Jessica Clarke In-Reply-To: <202503201953.52KJrxf8064080@gitrepo.freebsd.org> Date: Thu, 20 Mar 2025 19:59:40 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <8BF17BC0-0D89-4136-A1E8-81D584415DA2@freebsd.org> References: <202503201953.52KJrxf8064080@gitrepo.freebsd.org> To: =?utf-8?Q?Jean-S=C3=A9bastienP=C3=A9dron?= X-Mailer: Apple Mail (2.3826.300.87.4.3) 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:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4ZJbyg2KNcz3SkG X-Spamd-Bar: ---- On 20 Mar 2025, at 19:53, Jean-S=C3=A9bastienP=C3=A9dron = wrote: >=20 > The branch main has been updated by dumbbell: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dcd8c2e012761bf672074798be64d5ce1= 6af7aff8 >=20 > commit cd8c2e012761bf672074798be64d5ce16af7aff8 > Author: Jean-S=C3=A9bastien P=C3=A9dron > AuthorDate: 2025-03-03 19:32:20 +0000 > Commit: Jean-S=C3=A9bastien P=C3=A9dron > CommitDate: 2025-03-20 19:43:44 +0000 >=20 > linuxkpi: Add >=20 > Reviewed by: emaste > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D49385 > --- > .../linuxkpi/common/include/linux/cpufeature.h | 37 = ++++++++++++++++++++++ > 1 file changed, 37 insertions(+) >=20 > diff --git a/sys/compat/linuxkpi/common/include/linux/cpufeature.h = b/sys/compat/linuxkpi/common/include/linux/cpufeature.h > new file mode 100644 > index 000000000000..046fab53d521 > --- /dev/null > +++ b/sys/compat/linuxkpi/common/include/linux/cpufeature.h > @@ -0,0 +1,37 @@ > +/*- > + * Copyright (c) 2025 The FreeBSD Foundation > + * Copyright (c) 2025 Jean-S=C3=A9bastien P=C3=A9dron > + * > + * This software was developed by Jean-S=C3=A9bastien P=C3=A9dron = under sponsorship > + * from the FreeBSD Foundation. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above = copyright > + * notice, this list of conditions and the following disclaimer in = the > + * documentation and/or other materials provided with the = distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' = AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, = THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN = CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN = ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +#ifndef _LINUXKPI_LINUX_CPUFEATURE_H_ > +#define _LINUXKPI_LINUX_CPUFEATURE_H_ > + > +// #include What=E2=80=99s up with this? Is this a header that should be included = but can=E2=80=99t yet be (if so, why?), one that should be included and was left commented locally for some reason, or one that shouldn=E2=80=99t be = included but was left over from something? If it needs to stay, please document why it=E2=80=99s not uncommented, and also conform to style(9) as this = is a C++-style comment. Jess > +#include > +#include > + > +#endif /* _LINUXKPI_LINUX_CPUFEATURE_H_ */ From nobody Thu Mar 20 20:37:42 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJcpH183Tz5rLmy; Thu, 20 Mar 2025 20:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJcpH0B20z3v13; Thu, 20 Mar 2025 20:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742503063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=smXDMqGWDm+xAxV2kjFVH0CsXgNQPGrfPC+X+CyB2po=; b=ZiwNhIfFLT2+ty2NLTNTnzolNo0xM+yWNeyZppjctV06CkCnlBT1zIzNDcHFiqd9yJYjs0 I2DlY5cei4u9sjyIe2aJjvgc2ei0DT/gyk89ImlYB0OypmRCgjPJZRJZXLE39h7tH4s1FF F2Ie2kRLzz3n+5OlA6935yOqOUNu1s0T17ALzKHFa1Lz0Y3VDNQz/5keQ4rxjfOmeRNVuF qHd/hfWpOLk/NS6yNXg+pRaH64k4QQO7dudq8qV+phJDRFnp9MU0tFykd71qICRUOcBxoA wgZpFKrvmt6RF6Eg8G+7vaJyEokjUStkgqvbs6YPcohE3otEyIO5qPN/uEuUbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742503063; a=rsa-sha256; cv=none; b=vl419+UqmnMih5NZSWKbNIJQue/MB0OWXmtY1PxxHdoPOl76qH3LvylmgpI5Jadz/WzMW/ zatNFnBpkyzTUNknY86UY8Hi/zweea0vZVuhSfQfGz7mhbKV9iWi/wRGQx16SQGI/gYUZ8 mDUQbXY4uLrWeEFuDG/d7Easo8DCavI4p1LbPv10E0a30BjqSnVHSnYXe3ntvY64jrWadW GtGfIR4lo34tqmVryto5g2/tRC4FpW6JMcIRUELY9ow61x6GKC8Tb6W4MW9/DzM4S0CBZP ZvoOtMXYKpXgGAKa7sSdNOaSqndW4tMjOb/KkqCk4A5DhZut9g7woSNrAgSTRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742503063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=smXDMqGWDm+xAxV2kjFVH0CsXgNQPGrfPC+X+CyB2po=; b=YkoUdE6tohh8j74RKvimJqysqteKPCqVcbqCcGx8gR7+MRKedaC3d/nZ40E1MvJOw9kVuE tLesltYjY00KmhB9mHnFUfzAt4YKPBeRTLjOfuGAS0zOOW2DpCP4PFpQmHrQeNht8rvTUG ypGUMGz+hvX3t2D/hZgtIEY+mTNw+9LtyeUfte/9u4QwuYubzNR0jcIv7OBbyBvLAexEzn kWEs2r7PEkp9xhiRx0h8BXKuR/lyN6sXumAO+Px4aA9mGvtjUoRmKQdHwp5bxO6NBrUWyu a2m6CS/GqYNvVSqopNjMw9Jy7TQHdEtrg/ywi7CNSsT6uO47jHmri/iCbvPJXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJcpG6nmMz1KPQ; Thu, 20 Mar 2025 20:37:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52KKbgB7040252; Thu, 20 Mar 2025 20:37:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52KKbgCa040249; Thu, 20 Mar 2025 20:37:42 GMT (envelope-from git) Date: Thu, 20 Mar 2025 20:37:42 GMT Message-Id: <202503202037.52KKbgCa040249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 16649530b7be - main - Formatting and style cleanups. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16649530b7be02a61a32b34d56e6e937734cd247 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=16649530b7be02a61a32b34d56e6e937734cd247 commit 16649530b7be02a61a32b34d56e6e937734cd247 Author: Kirk McKusick AuthorDate: 2025-03-20 20:36:48 +0000 Commit: Kirk McKusick CommitDate: 2025-03-20 20:37:23 +0000 Formatting and style cleanups. No functional change intended. MFC-after: 1 week Sponsored-by: Netflix --- sys/ufs/ffs/ffs_subr.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 67c423d3127c..682dd60ebd44 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -340,31 +340,36 @@ ffs_oldfscompat_read(struct fs *fs, ufs2_daddr_t sblockloc) fs->fs_old_flags |= FS_FLAGS_UPDATED; fs->fs_sblockloc = sblockloc; } - /* - * If not yet done, update UFS1 superblock with new wider fields. - */ - if (fs->fs_magic == FS_UFS1_MAGIC && fs->fs_maxbsize != fs->fs_bsize) { - fs->fs_maxbsize = fs->fs_bsize; - fs->fs_time = fs->fs_old_time; - fs->fs_size = fs->fs_old_size; - fs->fs_dsize = fs->fs_old_dsize; - fs->fs_csaddr = fs->fs_old_csaddr; - fs->fs_cstotal.cs_ndir = fs->fs_old_cstotal.cs_ndir; - fs->fs_cstotal.cs_nbfree = fs->fs_old_cstotal.cs_nbfree; - fs->fs_cstotal.cs_nifree = fs->fs_old_cstotal.cs_nifree; - fs->fs_cstotal.cs_nffree = fs->fs_old_cstotal.cs_nffree; - } - if (fs->fs_magic == FS_UFS1_MAGIC && - fs->fs_old_inodefmt < FS_44INODEFMT) { - fs->fs_maxfilesize = ((uint64_t)1 << 31) - 1; - fs->fs_qbmask = ~fs->fs_bmask; - fs->fs_qfmask = ~fs->fs_fmask; - } - if (fs->fs_magic == FS_UFS1_MAGIC) { + switch (fs->fs_magic) { + case FS_UFS2_MAGIC: + /* No changes for now */ + break; + + case FS_UFS1_MAGIC: + /* + * If not yet done, update UFS1 superblock with new wider fields + */ + if (fs->fs_maxbsize != fs->fs_bsize) { + fs->fs_maxbsize = fs->fs_bsize; + fs->fs_time = fs->fs_old_time; + fs->fs_size = fs->fs_old_size; + fs->fs_dsize = fs->fs_old_dsize; + fs->fs_csaddr = fs->fs_old_csaddr; + fs->fs_cstotal.cs_ndir = fs->fs_old_cstotal.cs_ndir; + fs->fs_cstotal.cs_nbfree = fs->fs_old_cstotal.cs_nbfree; + fs->fs_cstotal.cs_nifree = fs->fs_old_cstotal.cs_nifree; + fs->fs_cstotal.cs_nffree = fs->fs_old_cstotal.cs_nffree; + } + if (fs->fs_old_inodefmt < FS_44INODEFMT) { + fs->fs_maxfilesize = ((uint64_t)1 << 31) - 1; + fs->fs_qbmask = ~fs->fs_bmask; + fs->fs_qfmask = ~fs->fs_fmask; + } fs->fs_save_maxfilesize = fs->fs_maxfilesize; maxfilesize = (uint64_t)0x80000000 * fs->fs_bsize - 1; if (fs->fs_maxfilesize > maxfilesize) fs->fs_maxfilesize = maxfilesize; + break; } /* Compatibility for old filesystems */ if (fs->fs_avgfilesize <= 0) @@ -426,9 +431,8 @@ static int prttimechgs = 0; #ifdef _KERNEL SYSCTL_NODE(_vfs, OID_AUTO, ffs, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "FFS filesystem"); - SYSCTL_INT(_vfs_ffs, OID_AUTO, prttimechgs, CTLFLAG_RWTUN, &prttimechgs, 0, - "print UFS1 time changes made to inodes"); + "print UFS1 time changes made to inodes"); #endif /* _KERNEL */ bool ffs_oldfscompat_inode_read(struct fs *fs, union dinodep dp, time_t now) From nobody Fri Mar 21 01:39:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJlVT49Qmz5rdDB; Fri, 21 Mar 2025 01:39: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJlVS6dnJz46vW; Fri, 21 Mar 2025 01:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742521169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJB4bhi/inB541vGfGfQqX+PeoF4rESt02/IPEcvW04=; b=ktZWAiYDRBjDPhzCYP2J/JmuUB4POfu6bwrGAUeEEeeB79uqVGAo3vMNmoFp6M2UilBagd EB8wZDFs7TZyQ9FQTKhiOzoQTnN4RZ1x2ag2piHoM4XpOO95xMn2fe5f1MloUxWlyubb1C rBpgMoWO/68RmqqtK27E3mgQz7mm6Djw+ICB9UjbcpxOOIfGc4gAIwfkPjWYLNacbe95d1 3M0U3Ygnw1x7vReZRI0Z0q65jgxFRFR2zVO3166stJxdeC7GaVvi1irjAa9nI89Fk1Kr43 8sOOTZ3tRHkF2mbvx2Xe+1ST+Q4gJvl4c78jXP+UDCI/JmqEDZ/07b1cZgozxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742521169; a=rsa-sha256; cv=none; b=WzbS2KqhTl1sxI08akujidx1ocNeXQ6ohAu5Tc5uqLjHw8shLQyih11YlZET7OQbgCEgoS iPS8aR4lg4ANVzzVnqupFSmnIUG5bfvv8jfCH1/oQNpZsYbL14vOnH7GwTZ8DdNoDAYyBT 0jE8qNPm8z0mJzAqNys5Ax8g/c8ctbKkwkrBT6xmWHBdkKdPLY9BSgSNNubHtKRONaK3ON eXQBsNZ6ax9xZqj9QIW3EJIn6e9AsNj4VhoLOY7EEGPf7ANfYKwDu1apMb8rkSWv2ToDo9 TaQxspnUlERo7vdNsJusxFqbLMAegdyXDu426NGTodxygaZCwyIGwFuNdUnyQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742521169; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UJB4bhi/inB541vGfGfQqX+PeoF4rESt02/IPEcvW04=; b=Fpw4pQeHXEcHBder7mYXXLZVA1sqBIPszkXqvSshuWIC+D0+G6bIeDtZnwd9z8ZwonNYtq hKsWAb/DSf71z8kXFmZ+VYhLWE9gdbWJYTPyy93t7GcdsJn9MmVuBTVVSgT+X/wiGBI9mO NRRNHGhmTNlF9M0blhIHWMQ8GEfdhJU8oNeTN+Uy20uMrTTygENtguFQpYvFugzggPe3/u 9fsxGXN9hKYNQ3PfBnPyhhX5qFYw7gwY4vFQvxxw4D/kAbKFWlDe/Oullyl91ItVXAPBP2 BZwX3SyYRd+E3c78/hpvkn3hfY91En47lRX32mJJrqsN1N8j6pfUJbQvuVTeVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJlVS66H9zLc; Fri, 21 Mar 2025 01:39:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L1dS7r001079; Fri, 21 Mar 2025 01:39:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L1dSwu001076; Fri, 21 Mar 2025 01:39:28 GMT (envelope-from git) Date: Fri, 21 Mar 2025 01:39:28 GMT Message-Id: <202503210139.52L1dSwu001076@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5d02f17e8253 - main - pf: fix LINT-NOINET / LINT-NOINET6 build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d02f17e8253f330434dd3160403be284487b5bb Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5d02f17e8253f330434dd3160403be284487b5bb commit 5d02f17e8253f330434dd3160403be284487b5bb Author: Kristof Provost AuthorDate: 2025-03-21 01:18:19 +0000 Commit: Kristof Provost CommitDate: 2025-03-21 01:29:04 +0000 pf: fix LINT-NOINET / LINT-NOINET6 build --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2c06c0253d4b..002fff9b81be 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -7902,7 +7902,6 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, struct tcphdr th; u_int32_t seq; struct pf_state_peer *src, *dst; - u_int16_t dummy_cksum = 0; u_int8_t dws; int copyback = 0; @@ -7999,7 +7998,8 @@ pf_test_state_icmp(struct pf_kstate **state, struct pf_pdesc *pd, nk = (*state)->key[pd->didx]; #if defined(INET) && defined(INET6) - int afto, sidx, didx; + int afto, sidx, didx; + u_int16_t dummy_cksum = 0; afto = pd->af != nk->af; From nobody Fri Mar 21 05:25:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJrWD6s3cz5rrwJ; Fri, 21 Mar 2025 05:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJrWD5pgXz3n5n; Fri, 21 Mar 2025 05:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742534728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AM5qx0lVfxD7GhVNUwsPk+1mXT8v+NuD/m0BHoeU/NQ=; b=Y+8vwewsG71B7bD6ljmOVo2OZrF0rJzAnzW8oXRspsV916V1O58We5N1JnYf/cnEl6nHdu RNmwoDzRFTnXQRKSzZwQim7Ds0/uRMv8oRW2BS9qO/L8JsW6w4/ZbWYUZXBfruSiYQU1Pz T27aK9NjTQyRxtWkVWOEbBpaACN33cIncwsbf9CNDkNWilQMnKBZMl6quEtN64l5/SE94E WlOJLT6E4qAnxMGGa6pYeTILYYdvTqn32n0BYXAjcYam9uKZNZeP0OjH1Jw5wD6HzxqJua 6fYdXbuCS/bALIJ2uh3fHPYjNGwo0GAC1uwPOFahu0NAjQDSp75DlG+kVGBGxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742534728; a=rsa-sha256; cv=none; b=hajaPvzB9u002SpxzTimspRPkdp2Ij+MApWUvV49DHTty0EEVrhTnoB3txQ03kXV6K1l7+ PQEz2h9xn1rqJeBB+tKBAmYI7hVn12wPVm5/3VdUcs9aC34lOfEz/bGo/Wzl4E15LZqFS1 h6l31UHpagUtybAYmzfUeimcVzcgk67vFjiSbvxtq2lPBER+jjFgEEERAmGE+Loe698RjV hDt1zZmf6uuK3yRbjpkBoP7r2DfEvMSNzb54gmv+x5KrAOgpAXJoAAl5PytsGX8kQCcZ9Q ZMh2EWBROOLEqQf4N3Cv0lttA0AHqFCh17Qghpptii5S5T07XVkaSYUhVK8IFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742534728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AM5qx0lVfxD7GhVNUwsPk+1mXT8v+NuD/m0BHoeU/NQ=; b=Q6wPBqMmIrTPxptxF/L7GOlfP1SyBs87whTGlfdIZMJQygN5b8w+RKaqngfhwqNOKcMIGL pLUUfKagkJWytnpq3mpv49qh98nwGMN2pgiaiIuQNZr9w82misjkXCcahIxsqY0TNh8ljC nhQmxAFzWfiQ83Sz4uu94C/2+TwLdkE0w5FSXdoAyTkkIe/CtWOgTAhG68YoVKS7KfwKGs HP2gicafI7RIn04uWn6CM2Bp/qXaf4BuAzxmJ2hyArQU7OAor2cY0ycDvCrqNdoPD7Cjfh PWlByyiplgE/MyQT3zlyYJ/0daSN6zHbr8G+0XNn13Yw41/U0Ga/Jcda49ep/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZJrWD4xdrz6QW; Fri, 21 Mar 2025 05:25:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52L5PS0A032621; Fri, 21 Mar 2025 05:25:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52L5PSj7032618; Fri, 21 Mar 2025 05:25:28 GMT (envelope-from git) Date: Fri, 21 Mar 2025 05:25:28 GMT Message-Id: <202503210525.52L5PSj7032618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 6f6c07813b38 - main - tcp: fix reverting of spurious timeouts (RTO) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 commit 6f6c07813b38ab04d8b1b2bb87c0291dbae25a25 Author: Richard Scheffenegger AuthorDate: 2025-03-21 04:23:30 +0000 Commit: Richard Scheffenegger CommitDate: 2025-03-21 04:28:31 +0000 tcp: fix reverting of spurious timeouts (RTO) One variable that became critical to correctly calculate the cwnd during limited transmit was not properly reverted on detection of spurious timeouts. PR: 282605 Reviewed By: cc, tuexen, #transport MFC after: 3 days Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D48652 --- sys/netinet/tcp_input.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 8f50843d940d..2fc1e0deea16 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -465,6 +465,7 @@ cc_cong_signal(struct tcpcb *tp, struct tcphdr *th, uint32_t type) ENTER_CONGRECOVERY(tp->t_flags); tp->snd_nxt = tp->snd_max; tp->t_flags &= ~TF_PREVVALID; + tp->t_rxtshift = 0; tp->t_badrxtwin = 0; break; } From nobody Fri Mar 21 18:47:14 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKBJL48xgz5rXlN; Fri, 21 Mar 2025 18:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKBJL3NlQz3XKr; Fri, 21 Mar 2025 18:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742582834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UlPFRxv1UXPVUWIC0i09DrfkNNSh2ZSV1rMh+E8ig7s=; b=sr7mxNctfL7fireejDRE+qT47jeeBOG2JrCky+oR0CG/8nPIsS+JsI7egpEgGslzZBFSJL CQdbVf7JfsFI4kCvNmThNVMUOSeFgZwB6588reLmodoe4oWh6tF3LFRmaRBPF4MzNoHA5s LJohQSYmFaXxpbZB38VllCT1LK+smD+er3GN/14NDjyJUAdAh3JNrRRWSWSGop/f+U+jVZ fc6mLKs8Vqx2KrH/HEwW4PN3o0H6VwfrcL6U/aP5+R8lG/IfrPu9+FWFnCmj8iUVm4yk4X bSns5uMFL7F6QjlFlfVznJqJNcYFYQunzclBMUBXs4SHscI+mk/t0VNObuV99g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742582834; a=rsa-sha256; cv=none; b=sA8QSfC+qcS8XjWdC0VNS+z0i2DmI9+sUym/khIHgc+OI3F/QyxfULWLIRpbggRld+phdz cmIQTMMc2ukcgYQaPf1BrCL8hM/rcRpkGkbdSpB4WimaPHL+Cxpah8SQHwJQ9zMXqAbW2X mYqPqQNbBt+/scpSb7dAQu50RIW6vVKGmd1TV1i3lCnHt4E3tKa/Or9qOCliJZ5l/FarkM MrYK62ruUtpX1uWq0Qt+yY9gwXPAkQaOXOGd6xIkt+JpbZZs3Pv3sTnJJ8PusDpO0OXs78 4uDOHjbfAWEuJ0F3RVs7qxbB0EZ7eIT7K/yRwLZX5gejitOMAvsBzCIx03QHcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742582834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UlPFRxv1UXPVUWIC0i09DrfkNNSh2ZSV1rMh+E8ig7s=; b=jaR3UFN80+I6wCnfkB6/aoW/bL12YD+OWiONjhvtkdo45xZrKNAfJ120zn6up1rBjfs5k+ ox5pgLTjifhzlbq/nZ6bPZrRvqcakUrshUY0fJ9aMLSEKmLBDPtWNXMZYiLfDPpCdmY3Pd Ky9C8jZ/8SSkaydqlkOVhMtA9l32BAyWdiHG/HSHXJFdz1rHQckbKsDXkCXxjQEj6MTX8H l6dVS4QDULAKvkpGLLNyLJ8Jf+VhHj5pDpXYzH+9eTd+QyXmFKh+hISxLgqygnVbtZmWL7 /K/nP86kIZv7c3GnSBSrxIA/ScM/gVdSKahn9/qmJnFbhcvRUcCrMy0E/f8OYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKBJL2vNFznv6; Fri, 21 Mar 2025 18:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LIlEo9027111; Fri, 21 Mar 2025 18:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LIlEpt027108; Fri, 21 Mar 2025 18:47:14 GMT (envelope-from git) Date: Fri, 21 Mar 2025 18:47:14 GMT Message-Id: <202503211847.52LIlEpt027108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien?= =?utf-8?Q?P=C3=A9dron?= Subject: git: c8c32d3e336d - main - linuxkpi: Document why has an include commentted out List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8c32d3e336df2bdad254ed8019f8ef976ec9bf4 Auto-Submitted: auto-generated The branch main has been updated by dumbbell: URL: https://cgit.FreeBSD.org/src/commit/?id=c8c32d3e336df2bdad254ed8019f8ef976ec9bf4 commit c8c32d3e336df2bdad254ed8019f8ef976ec9bf4 Author: Jean-Sébastien Pédron AuthorDate: 2025-03-21 18:33:52 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2025-03-21 18:46:35 +0000 linuxkpi: Document why has an include commentted out on Linux includes . We don't have the latter on FreeBSD yet, so let's comment this include for now. It is still referenced because sometimes, consumers of headers rely voluntarily or not on the namespace pollution. Reported by: jrtc27 Approved by: jrtc27 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49448 --- sys/compat/linuxkpi/common/include/linux/cpufeature.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/cpufeature.h b/sys/compat/linuxkpi/common/include/linux/cpufeature.h index 046fab53d521..746d1a7164a8 100644 --- a/sys/compat/linuxkpi/common/include/linux/cpufeature.h +++ b/sys/compat/linuxkpi/common/include/linux/cpufeature.h @@ -30,7 +30,13 @@ #ifndef _LINUXKPI_LINUX_CPUFEATURE_H_ #define _LINUXKPI_LINUX_CPUFEATURE_H_ -// #include +/* + * Linux includes the following header. We don't have it on FreeBSD yet, so + * let's comment this include for now. It is still referenced here because + * sometimes, consumers of headers rely voluntarily or not on the namespace + * pollution. + */ +/* #include */ #include #include From nobody Fri Mar 21 19:29:44 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKCFN39P3z5rZdN; Fri, 21 Mar 2025 19:29: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKCFN2Yhgz3byv; Fri, 21 Mar 2025 19:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742585384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y37KF65MOsjJLX+1orR1cL6KY32eM/QvDhAdK7m7anU=; b=qt3yEjVF8Ud4ducq5XyYVcUV3F+8uOpBQOmcK1OzCXDj7Vx5h4VP8UCgazgEVCV3p8waa3 Ifs4dUAg+DlCifsQ+PFNP6dDtVSGPD4eVTxxGsmdRHygegorsOcC4soTStZfWZw4z/sO8H 6funLBfhR02eXFjlLBaWUAUlbfmwYB8hjrcxmHxMus9bYaAjr7JiznbZupdgI6hN8EarkA /rQRt6uGKBLJrZdar71n2uc8NvyqqVArp205uLOGIIQa+itUMM8BprD5E5u++B3idxugCr Ox801PT0j5YiG+3K3UUwLVDoLt91YIvA08mD3XJt8kqAuOQcLO3hMWjG4Ioutw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742585384; a=rsa-sha256; cv=none; b=sx0YHqOhEmk6BEyeaK0O5zAclRvHBqDzgMgSUeRuToGdBjbIVA7dtLeZDd3Km2EmVxKCg/ sCfiIQCKx2b92NXiCIOucn8yruwwQV7aYKpFH5MniwhsisjcsTzwKROUYUE6qssm12M7Xr /u9adLJRpRwB48I7hyUiJDltA0U3VJKI94pDhOoNLpt8WVio0VdwkToOIEhWoBxOx0DRCU JDhQJpSOs2ujkmgebdRPUenn04AypaA9i62sLZQnRAEEDF92rgo8EMzQzJkkpRu+rLRjkf kV8LP5bKdofRyFmCs1fqMJLmtRGmcAETu97ZZ0hYaPWhVoqPaNF/Ucs5EnWnBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742585384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y37KF65MOsjJLX+1orR1cL6KY32eM/QvDhAdK7m7anU=; b=J9LKk5EqBed1zRyvh8WdQ3CGc4TEiSMMSR05BUj/sjT4qxnGo0xcrR9VDbyYkoqLn2vreg dJPrGqCWwTXu4acCX7a47BkpKmA6s8N+A3sZ4Wex+6M1cIXRuCdeotSVsPlNPo1P96imc+ z6aiyGFlNXc+KES11J0Cv70WHf609zumms/ot71M2cMgbF/WsgHMoCKFe9d9zMjLx+TmLm zV7GnC3ZhS/UO85AwmDU3BxPAl/oXym+uQgYhoR8humZSCF3RxD/EEhqK+eoyn0NAqJEA7 YZYXtrTJvt/BB8wpXCYrB+l2lNCQc91RVDT+J0i6hydLNVEgog3NjE9AkwLNYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKCFN24wRzpgn; Fri, 21 Mar 2025 19:29:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LJTirV003198; Fri, 21 Mar 2025 19:29:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LJTicY003195; Fri, 21 Mar 2025 19:29:44 GMT (envelope-from git) Date: Fri, 21 Mar 2025 19:29:44 GMT Message-Id: <202503211929.52LJTicY003195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 3bf433f141a5 - main - ports.7: Update dialog4ports to portconfig List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bf433f141a5c8987f347c6618bab0482063a66c Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=3bf433f141a5c8987f347c6618bab0482063a66c commit 3bf433f141a5c8987f347c6618bab0482063a66c Author: Alexander Ziaee AuthorDate: 2025-03-21 16:31:26 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-21 19:29:11 +0000 ports.7: Update dialog4ports to portconfig dialog4ports has been replaced with portconfig for several years. It was marked as deprecated and broken in ports:61e4a788ecab. While here, tag SPDX. MFC after: 3 days Reported by: Community Discord Reviewed by: bapt (previous version), mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D49204 --- share/man/man7/ports.7 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man7/ports.7 b/share/man/man7/ports.7 index 1e924b291608..b681a326f407 100644 --- a/share/man/man7/ports.7 +++ b/share/man/man7/ports.7 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 1997 David E. O'Brien .\" .\" All rights reserved. @@ -23,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 24, 2023 +.Dd March 21, 2025 .Dt PORTS 7 .Os .Sh NAME @@ -163,7 +165,7 @@ target. Configure .Va OPTIONS for this port using -.Xr dialog4ports 1 . +.Xr portconfig 1 Pq Pa ports/ports-mgmt/portconfig . .It Cm fetch Fetch all of the files needed to build this port from the sites listed in @@ -245,7 +247,7 @@ configured. Configure .Va OPTIONS for this port and all its dependencies using -.Xr dialog4ports 1 . +.Xr portconfig 1 Pq Pa ports/ports-mgmt/portconfig . .It Cm fetch-list Show the list of files to fetch in order to build the port (but not its dependencies). From nobody Fri Mar 21 20:22:08 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKDPr5kjPz5qdYm; Fri, 21 Mar 2025 20:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKDPr4gM0z3gMd; Fri, 21 Mar 2025 20:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742588528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSCJXgZ9177Zcfyucbibr3NuhhNFMc94CppRLldnDMo=; b=wK+cR5zmAFDneJeMHAcZLbwncvJBdz6hsbEciFXcmek6N5NwM6CXV2sifh7fvBwKTAb924 O3veVTID/J/yPKsHOINsRA96hw079z4tyVL8IqZxfF9szXDJBq403KB9L/Xj3yWTe+3vq2 5Uub4l6+8Nebn4cQq1849AhaGEtU2MzbUpauVOlUmIB5LsXwCQmeangvNaLkOZ5skzmgAw kgC6s/0SqoJQE4M3WIZuQ+LO/60dYdwmwZPA3yTrHEb5woEt/32qSkFj5cprpnNpYog9mI Sftg91vk5CJ8OXndUrhaR7YVhz/W4P+LbCkPiiWWxdIKcUMk1rptknrxff1IpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742588528; a=rsa-sha256; cv=none; b=ZJhsOexv9KtIVR77r5GnL2VA+zFC7bkZyP0zqVkjyXOeolDKmadyTPSBpZYbBi8osk2bt1 L7iGY1iwB/YtjSHaTWXNuZkeLXb909985XzQpgM1p82Nty9vfLrxMhYTyBLOR2e9yrDuEl I5pkQsC9ZMG07yTOsG03NlDrlfEzXDgOw6vml59rkl01nrSRblEgiBxTOdGfM4yAf8BcQV zNuY9Q998Jh+eHvFtHY6ODKlYq04J4GkbStnPEkMg8dVNLuax1DJtB3UwdU3RNA7zIiRJX R1uL0Q7h0/eKFq45eaM24aYgBoS1Lzu7PkB0w5KKDLUuQCTUBHI72QC0eIcogg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742588528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cSCJXgZ9177Zcfyucbibr3NuhhNFMc94CppRLldnDMo=; b=xP2w186djgYt9jHiVuZxY/avtdCC6tiyHAJyVbwTGW/zX2ZEaD3dbxnWVUeyubdBa/R+jg TuLxkTzu8W3AJN3qhNe+gBYfRKifOsOBaGQzAqaYismhdLlMOYukpRi1MkWWFGIWlrjd2m tNlDVHzChx7X4JSC1jgWcy5Im4MukKHP6Je8dOohyqRXGgvR/KVzgbrL5PfTMSc7Sr9W7D zYi/bM0WNOkel85pR5dCNYD5xV1lsoie3NTbZ/XAjk3X2Ly3/tOra0tpqj2lnBAlriHzrh QSh2l67QnfLTwSw3dOIv386cZmjKwDKzSfeskzzyl9b4+Il04P4dPWTr65Gphw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKDPr41WRzrJ6; Fri, 21 Mar 2025 20:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LKM8wB011555; Fri, 21 Mar 2025 20:22:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LKM8PP011552; Fri, 21 Mar 2025 20:22:08 GMT (envelope-from git) Date: Fri, 21 Mar 2025 20:22:08 GMT Message-Id: <202503212022.52LKM8PP011552@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 283be95ea29a - main - etdump.1: Polish + xref cd9660(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 283be95ea29abd7f867e4084bafe368c47f6c038 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=283be95ea29abd7f867e4084bafe368c47f6c038 commit 283be95ea29abd7f867e4084bafe368c47f6c038 Author: Alexander Ziaee AuthorDate: 2025-01-19 02:04:36 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-21 20:20:21 +0000 etdump.1: Polish + xref cd9660(4) + correct misfile in section 8 + rewrite the document descirption to include -9660 + markup command modifiers as such instead of bold + markup variables as defined variables, enabling apropos + correct option syntax in description section + unwrap list offsets for legibility + fix line wrapping for standard BSD console + crossreference cd9660(4) and vis versa + tag SPDX for both manuals MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48513 --- share/man/man4/cd9660.4 | 5 ++++- usr.bin/etdump/etdump.1 | 52 ++++++++++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/share/man/man4/cd9660.4 b/share/man/man4/cd9660.4 index 0e4fd33637cb..a684df37bab9 100644 --- a/share/man/man4/cd9660.4 +++ b/share/man/man4/cd9660.4 @@ -1,4 +1,6 @@ .\" +.\" SPDX-License-Identifier: BSD-3-Clause +.\" .\" Copyright (c) 2017 Enji Cooper .\" .\" Redistribution and use in source and binary forms, with or without @@ -23,7 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd April 25, 2023 +.Dd January 18, 2025 .Dt CD9660 4 .Os .Sh NAME @@ -57,6 +59,7 @@ volume located on .Pp .Dl "mount -t cd9660 /dev/cd0 /mnt" .Sh SEE ALSO +.Xr etdump 1 , .Xr nmount 2 , .Xr unmount 2 , .Xr cd 4 , diff --git a/usr.bin/etdump/etdump.1 b/usr.bin/etdump/etdump.1 index bec8d201eb4f..a86a5e24742c 100644 --- a/usr.bin/etdump/etdump.1 +++ b/usr.bin/etdump/etdump.1 @@ -1,3 +1,6 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2018 iXsystems, Inc .\" All rights reserved. .\" @@ -22,51 +25,54 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 25, 2018 -.Dt ETDUMP 8 +.Dd January 18, 2025 +.Dt ETDUMP 1 .Os .Sh NAME .Nm etdump -.Nd Dump El Torito boot catalog information from ISO images +.Nd dump ISO-9660 El Torito boot catalog information .Sh SYNOPSIS .Nm .Op Fl f Ar format .Op Fl o Ar file .Ar .Sh DESCRIPTION -This program reads El Torito boot catalog information from an ISO image and -outputs it in various formats. -It can be used to check the catalog in an image or to output catalog data in -a format that can be used by other tools such as shell scripts. +This program reads El Torito boot catalog information +from an ISO-9660 image and outputs it in various formats. +It can be used to check the catalog in an image or +to output catalog data in a format that can be used by other tools +such as shell scripts. .Pp Supported options are: .Bl -tag -width flag -.It Fl f Ar format Fl -format Ar format +.It Fl f Ar format | Fl -format Ar format Select the output format. Supported output formats are: -.Bl -tag -width shell -offset indent -.It Sy text +.Bl -tag -width indent +.It Cm text Human-readable text (default) -.It Sy shell -Each boot entry is emitted as a string suitable for passing to a sh-compatible -eval command. +.It Cm shell +Each boot entry is emitted as a string +suitable for passing to a sh-compatible eval command. The variables emitted are: -.Bl -tag -width et_platform -offset indent -.It et_platform +.Bl -tag -width "et_platform" +.It Dv et_platform The platform ID from the section header. Set to 'default' for the initial (default) entry. -.It et_system +.It Dv et_system The system ID from the boot entry. -.It et_lba +.It Dv et_lba The starting LBA (2048-byte blocks) of the boot image. -.It et_sectors +.It Dv et_sectors The number of sectors (512-byte sectors) that comprise the boot image. .El .El -.It Fl o Ar file Fl -output Ar file +.It Fl o Ar file | Fl -output Ar file Write output to .Ar file . -If '-' is specified then standard out is used. +If +.Ql - +is specified then standard out is used. .El .Sh EXAMPLES To see what entries are in a given boot catalog run @@ -87,14 +93,16 @@ Section header: efi, final Media type: no emulation .Ed .Pp -To use the output in a shell script a for loop can be used to iterate over the -entries returned using eval: +To use the output in a shell script a for loop can be used +to iterate over the entries returned using eval: .Bd -literal -offset indent for entry in `etdump --format shell bootonly.iso`; do eval $entry echo $et_platform $et_system $et_lba $et_sectors done .Ed +.Sh SEE ALSO +.Xr cd9660 4 .Sh HISTORY The .Nm From nobody Fri Mar 21 23:40:38 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKJpt3JtCz5qsSy; Fri, 21 Mar 2025 23:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKJpt2ZcJz3vbR; Fri, 21 Mar 2025 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLCyKZyPDm0lRWYKnWWBDjjv2007JFdD6IPPikQCH14=; b=vqNFohG30d9g0jguaxd1Xq7T7nZk/2YHmyLXji72Rn2D7XnzSfLU7WdenRb0ijeQ3LNu1o FJRYvjG+rEsTM1CJavuGaWuNkpkvpOAD++YPrKs5KdLJAMxVrXXKBrUwexWfwjTFYQteBs 8OnKsFayTg02YeaL2wJ9W7vlLaIsS6hwvcEkNtyHh7/3ukh738FBf5Vpf18FoDthjOD18n EZdgal4Y5rYZbF+PZ2x8kWA8keFPayv2xRR6k5YUda6J76Qio74H6f9nw8pc23Iol0Pub2 BzrosHlIAH5tKQOhPNQTaP7Rpx4BcdRfeJFmDdADYzy2+KNHkwP/zryoQ2FM9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742600438; a=rsa-sha256; cv=none; b=eA7XC+mbsIoeLqaHetZ27ERSRntXktHTHwLDUpP/HPm+HbMsAFH2lzHCGTJjurJXeJG1mj CIw/sqUn6tUcFiZ2d/8N/aDEnC4iLdctjb5IE4RRHGf6C6JyvV3d/QH4yIZEeAqrn4gwBY UFrBa/xY8GSGJ2Y++pZeLBR0Eg+lzWjinsFCzsZADAzcsXdfXaABDrKuRfVhvN9oMMKCGz 1dhyr0x7IQ42OdLH7UHRW+m6hd7kR3XwuOI2imvYRokVuTT+d7ZTuLCA+K/6Cxg+Q7IyH0 NlFrZKRbzMFBB04ZIWox8gRNai4p+JgAMRTMQUxM6GwbrYj+gHwKhxwvnlxj6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XLCyKZyPDm0lRWYKnWWBDjjv2007JFdD6IPPikQCH14=; b=Cd+M3VVKCzIay/IwY2MxDVjoZQ7be+wIlMFvYs3Vc+FPsmHR1WNv7OlZ8uXwqysz92ppUb SuxhWhPUeOW7Uxk4tyd1pOL6c5XgSaqxY9kEdsuNJY13nzuoTKHEb3E6dRtofVDU4/z7a0 zHUcxR/0mzhkYgYE5ieyYlb8FN6jzdAEbFUG9lhxIzHoZM4G/b//NwJ6GgxrRLVF6g47AQ waIgR5nk6SfEF/Mii/ZkDJXHhZLC+d/7AJrPoBbaVhkjz56DVYPnAJ/p0FU8QtjqZXVpCD wGuO7TqUBSequLKweI0GXbwHdhM7dvUItpO8aEyiQcG+7Wh8r2jugSBHXTn7yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKJpt1wmPzxLk; Fri, 21 Mar 2025 23:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LNectq079203; Fri, 21 Mar 2025 23:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LNechu079200; Fri, 21 Mar 2025 23:40:38 GMT (envelope-from git) Date: Fri, 21 Mar 2025 23:40:38 GMT Message-Id: <202503212340.52LNechu079200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7fad17a3e634 - main - kern___acl_aclcheck_path: vrele the vnode after namei() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fad17a3e63481ef71b731b0059cb918aec14f17 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7fad17a3e63481ef71b731b0059cb918aec14f17 commit 7fad17a3e63481ef71b731b0059cb918aec14f17 Author: Konstantin Belousov AuthorDate: 2025-03-20 17:56:47 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-21 23:39:51 +0000 kern___acl_aclcheck_path: vrele the vnode after namei() Reported and tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/vfs_acl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index fde05478d41c..3106218abce6 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -551,6 +551,7 @@ kern___acl_aclcheck_path(struct thread *td, const char *path, acl_type_t type, error = namei(&nd); if (error == 0) { error = vacl_aclcheck(td, nd.ni_vp, type, aclp); + vrele(nd.ni_vp); NDFREE_PNBUF(&nd); } return (error); From nobody Fri Mar 21 23:40:39 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKJpw0skYz5qsZM; Fri, 21 Mar 2025 23:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKJpv2rHrz3vkF; Fri, 21 Mar 2025 23:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYN67uLp6XJ++4VOPAf84dFUuSuNBASJ+CYugTi1fyA=; b=gHUMQ3qkD7sBDAUTzfOXZKArd8mUkGr/Junllu9wik6ScwJmPQqaeTD+Kuc5OMvtXhB/JP FrFUOBux7XeGj3I2OeVDqhxql7R4b3kMg2v0NsdBvXRJd9qttpoWT3wIT31F0u6xvExPlQ 2l0dnfbOReQswkofcLl8U+PJAkXB4iJgVUnQEP4nagBJdRztFchCPD/LAZHxMFIbBE7OnF 2QZaI79zCD5jlatGR0v8A4Af7fyYG12xZFYaf6EF1FebAKBbztRXGITCHkgrv2uIYHamcA dciHd2OopqkFCTltoDRhj+MvV54ImtQQdtBKzRFkn2Kmam+td3CzgqySuJZycA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742600439; a=rsa-sha256; cv=none; b=yxxr4k2CPYzF0Ks3ok2hMuPq/Up3W4FdRuorgyMewnstbbpH6P7n91zKyLEX+Xfi9qv708 4m3dAMBcPyDChWmODrOABP+hCg12asHgw9y8bREWYsKgcsAIOQIDS8yViBt0cmegiXFP08 Ezij9K/tLSl0sOgzNSauT4w7U1DsZILpE5Ei63zSFdesNIbwD3cB42rldYSedqn4FUMCrW 7WVo5nnKlIlDqHUzjGWu3J5XR5A7HPQFC6qLVRqNb53OHtWau1hJv2V+9Q9kdGruD487LZ 1PQc3vvnWVUWTSOWr+PST7lJjA3eB78oBxNW4kU10edGP6387V78ZiWvJeEG9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XYN67uLp6XJ++4VOPAf84dFUuSuNBASJ+CYugTi1fyA=; b=eTtIYzGscyJzVqouflCDenxfxwmq/4AvqnwPZD/JF7gI+vZYFHKFOeZRlY30rZzEvi4stj WaBh4tfuYFPdS5Tpwt0L/PYDc9vJteSlBr8iUlotWrScNubqmdeZEyXw2jxdFvv9D4pWhG hxAmUlZxXHmBF9rYS5LHW2W+JXu9TVoAYSGdmyNsDAGI/yYQUUdb6NB6XyNB4DLhkaCjKj 7MKMudRQ7xLFUqFDIUDVNSVL+BX/tf1YYxE6apQpysmVCzRNGggpA+k3b4yRuh/8j7jgix hrM8/8zxJuSX2khsWaDt7AKoeINM4Z8kZ7H2T1+MLlmf1mWSxSkdb2nwiqYY2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKJpv2RyJzwLv; Fri, 21 Mar 2025 23:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LNedtc079237; Fri, 21 Mar 2025 23:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LNed8Z079234; Fri, 21 Mar 2025 23:40:39 GMT (envelope-from git) Date: Fri, 21 Mar 2025 23:40:39 GMT Message-Id: <202503212340.52LNed8Z079234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d7352b2d57e9 - main - ufs_acl.c: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7352b2d57e9fe4b9cfb6ae61fd7cdd18851cdd3 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d7352b2d57e9fe4b9cfb6ae61fd7cdd18851cdd3 commit d7352b2d57e9fe4b9cfb6ae61fd7cdd18851cdd3 Author: Konstantin Belousov AuthorDate: 2025-03-20 18:09:09 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-21 23:39:57 +0000 ufs_acl.c: style Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/ufs/ufs/ufs_acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c index 6fad085daea1..49bd686a0d96 100644 --- a/sys/ufs/ufs/ufs_acl.c +++ b/sys/ufs/ufs/ufs_acl.c @@ -642,7 +642,7 @@ ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) * to this kind of object. * Rely on the acl_posix1e_check() routine to verify the contents. */ - switch(ap->a_type) { + switch (ap->a_type) { case ACL_TYPE_ACCESS: break; From nobody Fri Mar 21 23:40:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKJpx6P8bz5qslS; Fri, 21 Mar 2025 23:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKJpw69hyz3vVw; Fri, 21 Mar 2025 23:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gTRufVHCex0ZUM3ET9K4LvynEb95qRTlp6sX2py5js=; b=bKLqaetFs5R+esKoJWtrBaHD8nWOy0v5OyKenTi9AI3EiJmThfRml7KEAxnKcNlh0oaVm/ Lsy7MsJUSgyZI3J8cmbY6dIBSnmPnYuz8EeAnVep5W5m9MtSSvcDFa5IMaHz0YxaBQhAQf Xcrv0ZAGqQts8+ttoDZ3pgfoxlilXmocebW3cNRxDB4RsVjBReqVoWUukeC9E1Y2bKZ92M za77GoVEXUGmMaQ93/+0JfxsdTxs1Wth7ExOhTD9UfZHBpab89ZuyUMPoP/lsBemP+Zh8R 7vE5vL4AghZImfM+f02+zhKo9RYRBIJK/B06J3WP/DHz8+KPHa5JxptoXycBNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742600440; a=rsa-sha256; cv=none; b=h0M0ELWc2Y0mrPBxah7/HnZ8vcYZTXmU7jvh631JC04mEUkZRt6Jeauk+zreWLC8ntImUS Y91s912gad/OkMsGY+G1GtOPE3FRPAVQcvxEH6Itk4rOfSCfGdgxcDLd/SSescAdEGZfBC KUNJ1ueo76lCmbvKsVQ0dlb4BlaBlTA/PnuVvQTog3eejad7AIZoFVy97rZO27+ajG5IAv 2t9VRnLSkn8J9wpFkxH/Ij9QSICg6S4S9f0BoPP6nS5i8lHwZh56QBFkUNxXeeqjoIRJjp TDVMyZ4lFG19hVNVtI1iC4tcJv1GpVKJJXbtipsGKoQuEpLRaRIcFSZxPPaitQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742600440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gTRufVHCex0ZUM3ET9K4LvynEb95qRTlp6sX2py5js=; b=Hi8n4hk01cVNsBFPPJuUamBJZaL5ANxv6LjeVY/n7RaQjuDvS0ZBHMdhM0RHG8fD8Gfnl5 O3dkv4rGvgwDR+j6jxUzxba7/o2Iz8aGoxpF+gN6lGASV/3V3YSXeGumehahqEs8Ta2g5O iCmyem+Fwi1+CkxMkTMy6etI3HwZh8remydtXxWxJREP6FnhAzkcNUYpgZeKgc/5DHTUDM 1A1LfwcOFvFJzM/gbJgY6dCYPFO74aFYoZ6RUh6D4LW24nHddYIFEdufDQGbIQ6pFAmt66 v6gJIVDAUdDK72jbOJVBj2+Tk1wK75LDdsj+yvKZMaP/uSt+Wcu6velTxWZBcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKJpw2xn4zwLw; Fri, 21 Mar 2025 23:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52LNeeNO079271; Fri, 21 Mar 2025 23:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52LNeeia079269; Fri, 21 Mar 2025 23:40:40 GMT (envelope-from git) Date: Fri, 21 Mar 2025 23:40:40 GMT Message-Id: <202503212340.52LNeeia079269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5648c1d6f3b0 - main - ufs_aclcheck(): accurately dereference vp->v_mount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 commit 5648c1d6f3b0d8f4d67d2e6ec56dd2abcbd8fff5 Author: Konstantin Belousov AuthorDate: 2025-03-20 18:10:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-21 23:40:00 +0000 ufs_aclcheck(): accurately dereference vp->v_mount The argument vnode passed to VOP_ACLCHECK() is not locked, it is not safe to deref a_vp->v_mount without ensuring that the pointer is non-null and stable. Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/ufs/ufs/ufs_acl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sys/ufs/ufs/ufs_acl.c b/sys/ufs/ufs/ufs_acl.c index 49bd686a0d96..4b6cabc2ab30 100644 --- a/sys/ufs/ufs/ufs_acl.c +++ b/sys/ufs/ufs/ufs_acl.c @@ -609,11 +609,11 @@ ufs_setacl(struct vop_setacl_args *ap) } static int -ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap) +ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap, struct mount *mp) { int is_directory = 0; - if ((ap->a_vp->v_mount->mnt_flag & MNT_NFS4ACLS) == 0) + if ((mp->mnt_flag & MNT_NFS4ACLS) == 0) return (EINVAL); /* @@ -631,10 +631,9 @@ ufs_aclcheck_nfs4(struct vop_aclcheck_args *ap) } static int -ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) +ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap, struct mount *mp) { - - if ((ap->a_vp->v_mount->mnt_flag & MNT_ACLS) == 0) + if ((mp->mnt_flag & MNT_ACLS) == 0) return (EINVAL); /* @@ -667,14 +666,18 @@ ufs_aclcheck_posix1e(struct vop_aclcheck_args *ap) int ufs_aclcheck(struct vop_aclcheck_args *ap) { + struct mount *mp; - if ((ap->a_vp->v_mount->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) + mp = atomic_load_ptr(&ap->a_vp->v_mount); + if (mp == NULL) + return (EBADF); + if ((mp->mnt_flag & (MNT_ACLS | MNT_NFS4ACLS)) == 0) return (EOPNOTSUPP); if (ap->a_type == ACL_TYPE_NFS4) - return (ufs_aclcheck_nfs4(ap)); + return (ufs_aclcheck_nfs4(ap, mp)); - return (ufs_aclcheck_posix1e(ap)); + return (ufs_aclcheck_posix1e(ap, mp)); } #endif /* !UFS_ACL */ From nobody Sat Mar 22 00:28:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKKt43v5Jz5qwfd; Sat, 22 Mar 2025 00:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKKt41Hrvz3DCy; Sat, 22 Mar 2025 00:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742603308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nt4p0JKAO/k9XxRiY2vwQ7U+stseAl0kutiDtax436Q=; b=s2PinIuk7NSKwTfWQ8q6RPpWCTYO1v6T80nTtd06wZW5It4x1g7Rub2kp5+ahNgMzgcfEt CU57ogSbbMCOixPSKmQRkKCvPTaMR9v5G/FNZoXR36gjgSQp1Jw287set0j2rU8ncTO4AU P3NNM2+HszFBXfZN3kKDelT5bHXMwGiBgYZGM7m95EWMo7tw8ocuP9Y9bigS18N9pfC6bn nu4llQXBwYZfIj/gIynFXADM5c4jRv5tDNGgM6xR+q2Fk7HZEc3Ca3BAmaiTiGTMZaHedp ntleH2d93tjCf8IgM+QG+423A8NtENzoePcEbAgXwC12Z0NpjliF1WX9fcs9+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742603308; a=rsa-sha256; cv=none; b=XneMPg9ttm0TRefGXNs2CEvkKxubMH9m5likZCHdBXoelHUKec3GWG3uZU9YKSpDhuZ/Ws aqta7KNgZwhMWJGylgon6V2SH03ZcPTTmFZjO391RlQGzjKFbfnRci5hiCEZnrRZlPq2f7 Ev8l9XkOCm3tXycXit06hlpKh4gYrbqjSHcoJjw9M1BBjqYOA3vl6AWq1aga3dyQ/gtg5f nykb7os0YOT1TJ+uEfJdn81fFwF+CBSLyBfUdWz/3WwseSuwseih5VGdM2a8kjA6rILlq9 gYUKY/r5CihCwQeTC3ujwv/JLiPnz6DgK9b1Pu4n4K3RyOoAAQEFc6Ayd+0epA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742603308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nt4p0JKAO/k9XxRiY2vwQ7U+stseAl0kutiDtax436Q=; b=bqwJIejKh3Oc7mO6ijsB3eiWwOVyEQE/hvySDW/fCOjUdThX2hiK2qQ7kwwwrUv8Zn7/86 p69DEgR1MQ5xhLhF0NTXVG7CMEXl3J/M7TXMoF7yNmiHjRnQnHMcwOHZuDjG4fUFBOCWep p8OXcQtpdYABuM+TorAJ4bkF0aZWWdbOxCMwtvFM6YM2szJHuO4qntEnQPEZlaTWr4BLb1 PEXnhaZSY7rBl2e1nzBpay6HSAtkbmWDNZtwmITmAkWssYCjmjKRo2+oICKnQVvyo3GvH7 u7goLCthejDJvCGgW5SSe+X36BHiJlIBdTnZ+EhrF55XtAieqEi8Le67GzUF3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKKt40ZV2zyRY; Sat, 22 Mar 2025 00:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52M0SRXN063140; Sat, 22 Mar 2025 00:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52M0SRpI063137; Sat, 22 Mar 2025 00:28:27 GMT (envelope-from git) Date: Sat, 22 Mar 2025 00:28:27 GMT Message-Id: <202503220028.52M0SRpI063137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e39ee9b9ef3c - stable/14 - libibverbs: Extend support of NDR rates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e39ee9b9ef3c9951da0f0a0f00460e7e4b3175c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e39ee9b9ef3c9951da0f0a0f00460e7e4b3175c0 commit e39ee9b9ef3c9951da0f0a0f00460e7e4b3175c0 Author: Slava Shwartsman AuthorDate: 2025-03-12 08:49:37 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-22 00:27:55 +0000 libibverbs: Extend support of NDR rates PR: 285305 (cherry picked from commit 5963423232e869b8dbe8e9a65134e92735dfb521) --- contrib/ofed/libibverbs/examples/devinfo.c | 1 + contrib/ofed/libibverbs/verbs.c | 8 ++++++++ contrib/ofed/libibverbs/verbs.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/contrib/ofed/libibverbs/examples/devinfo.c b/contrib/ofed/libibverbs/examples/devinfo.c index 7693cb30739d..866d82718f7d 100644 --- a/contrib/ofed/libibverbs/examples/devinfo.c +++ b/contrib/ofed/libibverbs/examples/devinfo.c @@ -145,6 +145,7 @@ static const char *speed_str(uint8_t speed) case 16: return "14.0 Gbps"; case 32: return "25.0 Gbps"; case 64: return "50.0 Gbps"; + case 128: return "100.0 Gbps"; default: return "invalid speed"; } } diff --git a/contrib/ofed/libibverbs/verbs.c b/contrib/ofed/libibverbs/verbs.c index aec8706fd0cc..9c7e3b403f92 100644 --- a/contrib/ofed/libibverbs/verbs.c +++ b/contrib/ofed/libibverbs/verbs.c @@ -115,6 +115,8 @@ int __attribute__((const)) ibv_rate_to_mult(enum ibv_rate rate) case IBV_RATE_50_GBPS: return 20; case IBV_RATE_400_GBPS: return 160; case IBV_RATE_600_GBPS: return 240; + case IBV_RATE_800_GBPS: return 320; + case IBV_RATE_1200_GBPS: return 480; default: return -1; } } @@ -135,6 +137,8 @@ enum ibv_rate __attribute__((const)) mult_to_ibv_rate(int mult) case 20: return IBV_RATE_50_GBPS; case 160: return IBV_RATE_400_GBPS; case 240: return IBV_RATE_600_GBPS; + case 320: return IBV_RATE_800_GBPS; + case 480: return IBV_RATE_1200_GBPS; default: return IBV_RATE_MAX; } } @@ -163,6 +167,8 @@ int __attribute__((const)) ibv_rate_to_mbps(enum ibv_rate rate) case IBV_RATE_50_GBPS: return 53125; case IBV_RATE_400_GBPS: return 425000; case IBV_RATE_600_GBPS: return 637500; + case IBV_RATE_800_GBPS: return 850000; + case IBV_RATE_1200_GBPS: return 1275000; default: return -1; } } @@ -191,6 +197,8 @@ enum ibv_rate __attribute__((const)) mbps_to_ibv_rate(int mbps) case 53125: return IBV_RATE_50_GBPS; case 425000: return IBV_RATE_400_GBPS; case 637500: return IBV_RATE_600_GBPS; + case 850000: return IBV_RATE_800_GBPS; + case 1275000: return IBV_RATE_1200_GBPS; default: return IBV_RATE_MAX; } } diff --git a/contrib/ofed/libibverbs/verbs.h b/contrib/ofed/libibverbs/verbs.h index 498275561280..8a76dfdf7fd5 100644 --- a/contrib/ofed/libibverbs/verbs.h +++ b/contrib/ofed/libibverbs/verbs.h @@ -595,6 +595,8 @@ enum ibv_rate { IBV_RATE_50_GBPS = 20, IBV_RATE_400_GBPS = 21, IBV_RATE_600_GBPS = 22, + IBV_RATE_800_GBPS = 23, + IBV_RATE_1200_GBPS = 24, }; /** From nobody Sat Mar 22 15:57:22 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKkTv4tnxz5qfCH; Sat, 22 Mar 2025 15:57: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKkTt4N3cz3smJ; Sat, 22 Mar 2025 15:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742659042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koL6p+TKKZ36AjA86xLsNSPPaMmixDJt5+RD90+2XlQ=; b=HXWpaKQ/XgWlwcjc9Mo1nhdQnhkgRYcudnZul9U1IyqS0dacqMbwvRffkldAsWEQOdBQXb CWbDnrulnc29or4tVEPJNfEZwYxj+LH7yB38gp2MQeWA8PbNJsT9JRPLPOIw7RyW8MXf4W lN9kgav74OHCtQJoptVa+Yk5CSaYcJnDd7Hc56zTn2xJ4dn5XpkTo/NdT7cNLrgMGdaN3i IQ8hoWENnB4YiRDTNrFqHhXdyExedisxwSygR7i0Z2U3G32RkeS/Go6JCDMbNh7q6EJc0Q cm11llPGMtWttSRhvx25eUQqHvPbGhSu2RgnAle43qhCpvrEB0JDeh6b9ZD0NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742659042; a=rsa-sha256; cv=none; b=WCLTWT15RcVLx6lkYk57JYNv25TU3Dv23RqzwKn58mrVa8aOxFRsgqLSe+AIFphYveyXev sv1b63QN+Xoz6fw4n9U4wuYrx7cgQBoahyuJmt4PTd8jZ3f9dyiyCj2rqolvAYTiFMTWRa Vq3ZewRheFWpbtAr0BCAifm60ZfWKEDA97bYaclGD/aDFJRhHUqvaLw61CuIBzBQ6JaD4T 7QfSbUjJ0/cC/Rt88F0F+sLL5Haf+3TMk0N/M5HQYZkThO/689wkMIa4uCMrjLjgdjC+aF z5IPJhMqTwDYmqDXtZEbNhoAmpmMJaNVBqWzjOsvHeODTDBM/y27D891YsVqng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742659042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=koL6p+TKKZ36AjA86xLsNSPPaMmixDJt5+RD90+2XlQ=; b=Yrn2Hy85149cKStUN2OIYfynvOjwUiEVlsneyYhSDY1pfOJybF6nGasceRHDEwIQBxAbIE vfGHnymSZDsFvrMdv+AbqA6Qno5swyeZJAm9/wkiT9CnURQ3G3rLXCMqejrBtM4w5A+Z7d XWPhTt5jH7T4Xsa5L9kF/8rIkKjfZWPckgHmW1uQ8lxGNnfSrlc/1t218Y0kSTr03r77AS h5Phi1x3zX/mtUMlq0HpoVQthWbe3aTPWFjY0nVi0TBNYfQK0n0Zsr6b0r512KoMPSX8qM I8mZZXqqPXH5/hIx2liz8iXs8dt+4NCRvTCigsxtYTHxlG+qEJasteTt5hkSGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKkTt3x62zCBB; Sat, 22 Mar 2025 15:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52MFvMjp003202; Sat, 22 Mar 2025 15:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52MFvMn9003199; Sat, 22 Mar 2025 15:57:22 GMT (envelope-from git) Date: Sat, 22 Mar 2025 15:57:22 GMT Message-Id: <202503221557.52MFvMn9003199@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: 23db5fccb60a - main - hda: add macbook air 6,1 and 6,2 GPIO to enable amplifier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 23db5fccb60a1b008c7cbd3a6b88f9a6b1bac167 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=23db5fccb60a1b008c7cbd3a6b88f9a6b1bac167 commit 23db5fccb60a1b008c7cbd3a6b88f9a6b1bac167 Author: Adrian Chadd AuthorDate: 2023-01-24 07:37:14 +0000 Commit: Adrian Chadd CommitDate: 2025-03-22 15:56:34 +0000 hda: add macbook air 6,1 and 6,2 GPIO to enable amplifier GPIO0 needs to be flipped on to enable the amplifier. The CS4208 looks /sort/ of like previous cirrus logic codecs, enough for audio to work. This actually provides working audio on my mbair 6,2 but it doesn't yet detect the jack. That requires patches to the pin configs, which is going to need some further work. Differential Revision: https://reviews.freebsd.org/D49350 Reviewed by: christos --- sys/dev/sound/pci/hda/hdaa.c | 2 +- sys/dev/sound/pci/hda/hdaa_patches.c | 6 ++++++ sys/dev/sound/pci/hda/hdac.h | 3 +++ sys/dev/sound/pci/hda/hdacc.c | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index ac62c04b5374..1e486b01b168 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -2912,7 +2912,7 @@ hdaa_dump_gpo(struct hdaa_devinfo *devinfo) data = hda_command(dev, HDA_CMD_GET_GPO_DATA(0, devinfo->nid)); for (i = 0; i < HDA_PARAM_GPIO_COUNT_NUM_GPO(devinfo->gpio_cap); i++) { - device_printf(dev, " GPO%d: state=%d", i, + device_printf(dev, " GPO%d: state=%d\n", i, (data >> i) & 1); } } diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 8ad1c845c254..0e88a63e2423 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -113,6 +113,12 @@ static const struct { { APPLE_MACBOOKAIR31, HDA_CODEC_CS4206, HDA_MATCH_ALL, 0, 0, HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) }, + { HDA_MATCH_ALL, HDA_CODEC_CS4208, APPLE_MACBOOKAIR61, + 0, 0, + HDAA_GPIO_SET(0) }, + { HDA_MATCH_ALL, HDA_CODEC_CS4208, APPLE_MACBOOKAIR62, + 0, 0, + HDAA_GPIO_SET(0) }, { APPLE_MACBOOKPRO55, HDA_CODEC_CS4206, HDA_MATCH_ALL, 0, 0, HDAA_GPIO_SET(1) | HDAA_GPIO_SET(3) }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 9b11dcba32a8..231839327530 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -426,6 +426,8 @@ */ #define APPLE_INTEL_MAC 0x76808384 #define APPLE_MACBOOKAIR31 0x0d9410de +#define APPLE_MACBOOKAIR61 0x106b7100 +#define APPLE_MACBOOKAIR62 0x106b7200 #define APPLE_MACBOOKPRO55 0xcb7910de #define APPLE_MACBOOKPRO71 0xcb8910de @@ -540,6 +542,7 @@ #define CIRRUSLOGIC_VENDORID 0x1013 #define HDA_CODEC_CS4206 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4206) #define HDA_CODEC_CS4207 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4207) +#define HDA_CODEC_CS4208 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4208) #define HDA_CODEC_CS4210 HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0x4210) #define HDA_CODEC_CSXXXX HDA_CODEC_CONSTRUCT(CIRRUSLOGIC, 0xffff) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index b4321a5bf998..4198982c9c2a 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -74,6 +74,7 @@ static const struct { } hdacc_codecs[] = { { HDA_CODEC_CS4206, 0, "Cirrus Logic CS4206" }, { HDA_CODEC_CS4207, 0, "Cirrus Logic CS4207" }, + { HDA_CODEC_CS4208, 0, "Cirrus Logic CS4208" }, { HDA_CODEC_CS4210, 0, "Cirrus Logic CS4210" }, { HDA_CODEC_ALC215, 0, "Realtek ALC215" }, { HDA_CODEC_ALC221, 0, "Realtek ALC221" }, From nobody Sat Mar 22 23:40:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKwmZ2v9pz5rQ3Q; Sat, 22 Mar 2025 23:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKwmY5smjz3lT8; Sat, 22 Mar 2025 23:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742686845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6hEHBRTAXsudeSi9BT3yi8qNbO1T9Z4GwLoLZJ87XrI=; b=JVXql3nzbv9q03GzfMAd3jx0PxhFhf+I+zjCPQAebfSzho2S59DoeI6qK/U80ahfwWZArj dnk0vPxMb57NTmPJKCC+fQZbP6t4OMOpfC3RBmVhQKse3kZoIWh56YD68H7qqwc+FOvAnX 95V5/BwQOuiiq9O2ALBiU5dQGmucBNwVRze7yaj8lc92JseIBQ8GLya2Zm1tGBhq6ptRBM IM5Pkh6dksylGrHrNiRnqLa4NT0/DlmiXC/HPHtb5pAP0mWni8l/4D97l2Is8i6HyrmszK ySONUZBwdfnVkba08ob0y20VChdfPHLOhE3370dgGIGdtPzmt9AXiT0C1fEhCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742686845; a=rsa-sha256; cv=none; b=xZrIglnhKgr2/x+R2IQcRJvSiZbL+qYDPAp7/LwTAGjgCR5qaUhXWjiSmkJkhbwsjNwg/T 2JVzzOQip8Avy07ktOY9DEFLEmnFOizikdaBm1+QEyEx5w4a9KiUnOA/tn7tkwc8YM0wo7 f56TuAY6DGMli8UiW8ydJd74pFnlmP0Lqwl6yq5TRjGOhcUyPzN/nqL16NGTyKlO7UHjyr bxuE/la7EzGIjvpB5jMixKMGhs/TAISIVtHalVmRBG6q1K/qjmeaCr7RsUv8EzyyXDqpYb Nn2cG31TJxg8K0igwBGXt/6tIrT9+9J0oS+P0DAUnwMynhvBUcpkxKnnJO+mCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742686845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6hEHBRTAXsudeSi9BT3yi8qNbO1T9Z4GwLoLZJ87XrI=; b=nTFvJWH2mzvG+LZM5Gbm1BHftInh8z/7UduoolBwgLUifpB9if4IRoDuZnUwehphtibqay iPbXny8pkv4fctLcn61ExHzGW2xTA9u7IMyaq0wGc58MTCkdf/YjYpPfZD95x7rBiniKJX 8hYWZexQts+GS5OsyXYLMxX1UeZOE/mecOK774IXShTHRgwg7nlSYWvOnuMP7BmkvPiH2o lzc7+NSu9gqZv0uPe56OD8aw7luMVLueS87YNu9E96rAlNe+lTAgM5R7Hp5TNHi3gE+Ixl x1yw8FkCMVC4GU1ifeQ3I32BrnMVaVA9it7Ce4Xshm64Mp0Zgq/3Qw2s5h1CjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKwmY5Gsvzk2V; Sat, 22 Mar 2025 23:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52MNejvF071184; Sat, 22 Mar 2025 23:40:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52MNejaK071181; Sat, 22 Mar 2025 23:40:45 GMT (envelope-from git) Date: Sat, 22 Mar 2025 23:40:45 GMT Message-Id: <202503222340.52MNejaK071181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: baad45c9c120 - main - inpcb: push multicast case local address selection logic into in_pcbladdr() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: baad45c9c12028964acd0b58096f3aaa0fb22859 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=baad45c9c12028964acd0b58096f3aaa0fb22859 commit baad45c9c12028964acd0b58096f3aaa0fb22859 Author: Gleb Smirnoff AuthorDate: 2025-03-22 23:37:37 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-22 23:37:37 +0000 inpcb: push multicast case local address selection logic into in_pcbladdr() When destination is multicast and inpcb has multicast options configured, we use completely different logic than in a normal case. Before this change, in in_pcbconnect() we would run in_pcbladdr() and then just ignore its results and run the multicast case block, that would override any earlier selection or failure. Let's embed the case in in_pcbladdr() and also check it earlier. Also, 69c05f428714 switched UDP unconnected sendto(2) to use in_pcbladdr() instead of in_pcbconnect_setup() and due to that lost the multicast case. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49435 Fixes: 69c05f42871406b4b2b2dac00a268d1da0cacd3e --- sys/netinet/in_pcb.c | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 9a49353f1538..3774f73a7a8f 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1127,29 +1127,6 @@ in_pcbconnect(struct inpcb *inp, struct sockaddr_in *sin, struct ucred *cred) if (in_nullhost(inp->inp_laddr)) { error = in_pcbladdr(inp, &faddr, &laddr, cred); - /* - * If the destination address is multicast and an outgoing - * interface has been set as a multicast option, prefer the - * address of that interface as our source address. - */ - if (IN_MULTICAST(ntohl(sin->sin_addr.s_addr)) && - inp->inp_moptions != NULL && - inp->inp_moptions->imo_multicast_ifp != NULL) { - struct ifnet *ifp = - inp->inp_moptions->imo_multicast_ifp; - struct in_ifaddr *ia; - - CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { - if (ia->ia_ifp == ifp && - prison_check_ip4(cred, - &ia->ia_addr.sin_addr) == 0) - break; - } - if (ia == NULL) - return (EADDRNOTAVAIL); - laddr = ia->ia_addr.sin_addr; - error = 0; - } if (error) return (error); } else @@ -1231,6 +1208,27 @@ in_pcbladdr(const struct inpcb *inp, struct in_addr *faddr, if (!prison_saddrsel_ip4(cred, laddr)) return (0); + /* + * If the destination address is multicast and an outgoing + * interface has been set as a multicast option, prefer the + * address of that interface as our source address. + */ + if (IN_MULTICAST(ntohl(faddr->s_addr)) && inp->inp_moptions != NULL && + inp->inp_moptions->imo_multicast_ifp != NULL) { + struct ifnet *ifp = inp->inp_moptions->imo_multicast_ifp; + struct in_ifaddr *ia; + + CK_STAILQ_FOREACH(ia, &V_in_ifaddrhead, ia_link) { + if (ia->ia_ifp == ifp && + prison_check_ip4(cred, &ia->ia_addr.sin_addr) == 0) + break; + } + if (ia == NULL) + return (EADDRNOTAVAIL); + *laddr = ia->ia_addr.sin_addr; + return (0); + } + error = 0; nh = NULL; From nobody Sat Mar 22 23:40:46 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKwmb5lN5z5rQ3V; Sat, 22 Mar 2025 23:40: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKwmZ6kxVz3lhT; Sat, 22 Mar 2025 23:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742686847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bD2tGDpvQ4nXdNUd7TUFUajgpENAGveSjvtJQXQA6ZE=; b=LP6DPWKC2Mwxna4qpJ6qbunCrdEvKJ12KF/V5ku431MUdgDV8rWTK+Q5Jw2QV8ptQErD06 MxjUByIaQUaEp2huzPIqnHcldnm3r74JUjjQpswxaxEACGVz5vVac2AKRfwRBKNRSXHRGS /DOPThkn+mRnYBtIe+xd/FlcNrb0G3588Y9E3o3IFAqUu74RGP9HoeCTAMn5/+jDCHttYV rcWFS33Wq8TIDaQOmVWb6q6YH/nthq3wrktJd9GDp30XbZDtNOlTFAFoaxm8MUAWcuxMZP S8eRJSLALQRhk9gXfHFrbsfJjA7k8lwwGCrm6GvbYUPYGvqnsxMHtXpheLQ7yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742686847; a=rsa-sha256; cv=none; b=jVh7i10UuCS0wMmPLVlHI29uh+jeJ+UxVO7sW8014pK+lruJ4DPmpfWOWBK7UZtmcPznhu Pq1+z/rtmw63HQ0GmUzNQ0HATAiWKwmHltZStUqgl8TDJI2IkAVbHSz/EXMv/Nj9Zr6FPk vQVrw67GwFEYZksvWqkMI931Z6MzkysDvMVWLl1FsyBlLRZ5xmhx4rqsvee0RJUguEbYwd WQP9MpvcYVL/s73rGqcWF6i9EQpw9g7+qvaVHlZV3mMDNOev+8mukNID7bAoUOQsFicZk2 +ahm+y/KyaHvGvbB86IMJFKfmloy+t2zxnuOzudsE6Nba9gk0TovrfDtZ8q5nQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742686847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bD2tGDpvQ4nXdNUd7TUFUajgpENAGveSjvtJQXQA6ZE=; b=O+ikYbY6OH/g2AwkH9yxPt2Krtn0s4SRgDy19D4XCW6ruen8rFOFPw72dT8/vvscM7KakF M27P+1nszTHnXIoPU3y/1KIEJbVTJf2sVyz6wuJ22FSZP+qD3hPPKNKDLGARwtvXN36DAV yV+iuDRYQ30eqktmOGKIiKRWrpZuo2TOpjA7a5K7lxTLWtfHgESaVFvV1p/v+KYrnwB/IO hRU8bjzGdR/UsVgnuGwetJTsQs7jewznBGGIR00UUg/no8K9DLivKSSfFFzjAFWN88Sw3Q 5/SXq/99oUJ09ObPDl9E0zPo6RnKEBXsZX+Pv++wX3095+K6hy8MtqmxJXPnEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKwmZ698Gzk0Y; Sat, 22 Mar 2025 23:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52MNek7i071222; Sat, 22 Mar 2025 23:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52MNekCX071219; Sat, 22 Mar 2025 23:40:46 GMT (envelope-from git) Date: Sat, 22 Mar 2025 23:40:46 GMT Message-Id: <202503222340.52MNekCX071219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0849f1634a70 - main - tests/netinet: add test for IP_MULTICAST_IF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0849f1634a70099b90256ceece52a598eeb3280e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0849f1634a70099b90256ceece52a598eeb3280e commit 0849f1634a70099b90256ceece52a598eeb3280e Author: Gleb Smirnoff AuthorDate: 2025-03-22 22:44:20 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-22 23:39:50 +0000 tests/netinet: add test for IP_MULTICAST_IF --- tests/sys/netinet/Makefile | 3 +- tests/sys/netinet/multicast.sh | 61 +++++++++++++++++++++++++++++ tests/sys/netinet/sendto-IP_MULTICAST_IF.c | 63 ++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 1 deletion(-) diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index bd972bc3b2a0..cc525bf24480 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -24,6 +24,7 @@ ATF_TESTS_SH= arp \ fibs_test \ forward \ lpm \ + multicast \ output \ redirect @@ -47,7 +48,7 @@ TEST_METADATA.forward+= required_programs="python" \ TEST_METADATA.output+= required_programs="python" TEST_METADATA.redirect+= required_programs="python" -PROGS= udp_dontroute tcp_user_cookie +PROGS= udp_dontroute tcp_user_cookie sendto-IP_MULTICAST_IF ${PACKAGE}FILES+= redirect.py diff --git a/tests/sys/netinet/multicast.sh b/tests/sys/netinet/multicast.sh new file mode 100644 index 000000000000..eb2b962dac70 --- /dev/null +++ b/tests/sys/netinet/multicast.sh @@ -0,0 +1,61 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2025 Gleb Smirnoff +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/../common/vnet.subr + +# See regression fixed in baad45c9c12028964acd0b58096f3aaa0fb22859 +atf_test_case "IP_MULTICAST_IF" "cleanup" +IP_MULTICAST_IF_head() +{ + atf_set descr \ + 'sendto() for IP_MULTICAST_IF socket does not do routing lookup' + atf_set require.user root + +} + +IP_MULTICAST_IF_body() +{ + local epair mjail + + vnet_init + # The test doesn't use our half of epair + epair=$(vnet_mkepair) + vnet_mkjail mjail ${epair}a + jexec mjail ifconfig ${epair}a up + jexec mjail ifconfig ${epair}a 192.0.2.1/24 + atf_check -s exit:0 -o empty \ + jexec mjail $(atf_get_srcdir)/sendto-IP_MULTICAST_IF 192.0.2.1 +} + +IP_MULTICAST_IF_cleanup() +{ + vnet_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "IP_MULTICAST_IF" +} diff --git a/tests/sys/netinet/sendto-IP_MULTICAST_IF.c b/tests/sys/netinet/sendto-IP_MULTICAST_IF.c new file mode 100644 index 000000000000..d478e4da0b3b --- /dev/null +++ b/tests/sys/netinet/sendto-IP_MULTICAST_IF.c @@ -0,0 +1,63 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 Gleb Smirnoff + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include + +int +main(int argc, char *argv[]) +{ + struct sockaddr_in sin = { + .sin_family = AF_INET, + .sin_len = sizeof(struct sockaddr_in), + }; + struct in_addr in; + int s, rv; + + if (argc < 2) + errx(1, "Usage: %s IPv4-address", argv[0]); + + if (inet_pton(AF_INET, argv[1], &in) != 1) + err(1, "inet_pton(%s) failed", argv[1]); + + assert((s = socket(PF_INET, SOCK_DGRAM, 0)) > 0); + assert(bind(s, (struct sockaddr *)&sin, sizeof(sin)) == 0); + assert(setsockopt(s, IPPROTO_IP, IP_MULTICAST_IF, &in, sizeof(in)) + == 0); + /* RFC 6676 */ + assert(inet_pton(AF_INET, "233.252.0.1", &sin.sin_addr) == 1); + sin.sin_port = htons(6676); + rv = sendto(s, &sin, sizeof(sin), 0, + (struct sockaddr *)&sin, sizeof(sin)); + if (rv != sizeof(sin)) + err(1, "sendto failed"); + + return (0); +} From nobody Sun Mar 23 01:28:09 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKz8T6KVRz5rWDD for ; Sun, 23 Mar 2025 01:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKz8T2F9Qz3FbX; Sun, 23 Mar 2025 01:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742693289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NPbJG0UE+beMY8kwT6kjoq8yv12e+7K2nc4P3xFk87k=; b=yV2UxUSsBC4+/DrUZfqoHQslAuXH35IWnM+t9PvXV0wlHJKQzYTGfbmimT3a2dOSD32Wvc 9xc9c6PU/wAenEZORtkKnUjC6Pf91fUmg5ZlU11L6IKIT83SU+7MDWiPbjV1XUJnJxl+qf YgO/l4GyF8ODaCnRtWtm7MiA2R1E5HVQn3werhpoFGOJ7z2TiD+VcuWhN40dNYr2n9GBUJ LP2+hTMJo4xm+m+l4iTAwVESH1xVRMJd3/saoORvdqRI/e4KE8DIkTkVOMWTrGesmpa9VX B99p8QzKs18o9qc1dDPee7TJYX1pvktOn4kZAfMKQYphgkNsD8koJmthz/O/yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742693289; a=rsa-sha256; cv=none; b=Q/Tgr2VdL43hDu2MkZYS1zYyEglbCs6sEiLMeWryzi5MnYCIT2LREx/GnF7oZSDkXrMuRZ 2dbV4uaAlRXZsfVb949uXMY8aNCh0Rv7WjZv4osVlpz7Op0A/XGVZUH3KJjlAO9wAw0pPS DIRqeuoiNPVC6e/7LAkxIt1q8UJafExXsBSxuYViaEIsWleSTT9NgjHYzAptbWs0gTXRMK wARm4aLJ6KGfw3srG1Vora1yoCxXvx7KO/2iYWBEiBSfgQPQ8H9ntC96lkRMUhcQR5Dqyy oCX7EoTvdHzo0QiEOx3ZHOU+e/iJz7QLEgr6s7mRKKHMKLIaChSMlufWB6jfPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742693289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NPbJG0UE+beMY8kwT6kjoq8yv12e+7K2nc4P3xFk87k=; b=IaeOIWOQnV7pP4/9Rd6BajubwlHMD6Rf2UeGoayXRTKJW4gpt/BPYsCODCPaGzToQY2aRQ G/2Ach/HrgOhQD52fi6Nj9QwmY8JV42ngQHHt0ZITheWHhOnAXDaWm+og341KJUry8W/Qi mWRafTZzXLAS/+gl6t+E7mEa9TUbDiiL0ghVWy4vCH8bU1mQMoLAX7uM9Ex3NGtkgIY+Zm OP/1E2H68R5xJ7c1veYtlTCZC2FNliWPGMFE/aQOksd3EBX7b0EsGNNYNFGpAiqYck64N5 FXUbDw50gQFO0nM/djSIwKdZ4AgN9wRatL/rZXvjzPeAV6dL5qL0payxYP5rOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKz8T1XXNzmjw; Sun, 23 Mar 2025 01:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N1S9qx065967; Sun, 23 Mar 2025 01:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N1S9Ai065966; Sun, 23 Mar 2025 01:28:09 GMT (envelope-from git) Date: Sun, 23 Mar 2025 01:28:09 GMT Message-Id: <202503230128.52N1S9Ai065966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Philip Paeps Subject: git: b4a294ba7e60..09f889d4a3f4 - vendor/tzdata - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/vendor/tzdata X-Git-Reftype: branch X-Git-Commit: 09f889d4a3f4aa26f8029286f4d39de3413346fc X-Git-Oldrev: b4a294ba7e6013c296c42213799a25be87b635d7 X-Git-Newrev: 09f889d4a3f4aa26f8029286f4d39de3413346fc Auto-Submitted: auto-generated The branch vendor/tzdata has been updated by philip: URL: https://cgit.FreeBSD.org/src/log/?id=b4a294ba7e60..09f889d4a3f4 09f889d4a3f4 Import tzdata 2025b From nobody Sun Mar 23 01:30:45 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZKzCZ0vyVz5rWd5; Sun, 23 Mar 2025 01:30: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZKzCX3vRDz3JMw; Sun, 23 Mar 2025 01:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742693448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwJ6+nZL6oFKm6kl3ajc3irYkGFZePpVLNem/pnGdj8=; b=k8ziJN/j/5zKeDaWsuouDcYvcGmfOX9fH3xJqe/Khzmxb7/xf5pMDzQKzYvaBvgKe1OJOa 6o92PsBPiAeR5S3AM/coTZC6TpVJWi2prewFC3FVsJeMKBhPoTPfsafui9QZogzc4RV3rj RBFUDMFWixF86Z0U/EXrPd9Jk9L/bwDwsnRB5ORavnZzdpFOJChAWbiUFUgtjcItrI4Qr5 I/8cl1ggcn3o7Kj97fdJv/Ik/ajqcP9cOZ3yDz1BGmfFINMhkAAvko3aEH3YlIJG8ASksy zHWs12esbOd/IId6WcidLptLCE2YtW4B2Oo7fD/DrO4O5NB0Vg46srHhJf4UAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742693448; a=rsa-sha256; cv=none; b=Zsx1rx6Sr+Yc3Iz/2ll333VgIHpUCQecY/7AoxDlfDB4UKStrI4NXg4c7t+cg8ek3edECv Kc4+Q9I1rF8jwoWzWGkQCZVCg3hOW4dfvoQg38fq88zEa3M6qWs/C4gZm6hUiTFbtdiGHG OYb613VA78J14WkdYwqoxpp+caF/+KY4777aEjXCxEa3FMRN2LROQHYupL0yGhVO8aHVYl SnuRw3FMn/Mu8UPt1cgfsJheWbA7JyHEMUIFheFc+cVHZe+3ajPZPJkd2CrI//0c5iLpXV i2p3fU5prdzk2kKDFa3LMc30v6FwIu0rYx94mtZD2cJR9N47PNbi3Q+IsnKc/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742693448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwJ6+nZL6oFKm6kl3ajc3irYkGFZePpVLNem/pnGdj8=; b=Keygf3XSMhHf65KCz28dtxsSKTxJT2r+wMSkpLFvD/zvstEp5BwgjqfZaRNa+7kWiuzq38 2Hna2yaoJeszHNccqompgFspEpZI9lC5G4hT9WuXiqqoL07wQA5+yx4poUW/SBK+9BcDeZ SplNv5uVOltWz67ALPEP+G2tg+APfL6lAfIHr8npc5stczXvOK2u6A4JBWpghW1wWcKD3x CDd+FyPdoYO91X/NqFK6at9jV+Z50ZSECFINWiBzEJlPnMGHc8Rh0HXY2AGgHhFHzrhlmN 3a6sv5yzXfr3DWdrBNUDZw+yz64hc4ZUahkrzUeQegXbLom4CU8o2pG+VbBuzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZKzCX3PmVzmkx; Sun, 23 Mar 2025 01:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N1Umvi076344; Sun, 23 Mar 2025 01:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N1Ujms076331; Sun, 23 Mar 2025 01:30:45 GMT (envelope-from git) Date: Sun, 23 Mar 2025 01:30:45 GMT Message-Id: <202503230130.52N1Ujms076331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: d2cccdef3037 - main - contrib/tzdata: import tzdata 2025b List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2cccdef30376b7de5643caae1ef035f8e6932f0 Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=d2cccdef30376b7de5643caae1ef035f8e6932f0 commit d2cccdef30376b7de5643caae1ef035f8e6932f0 Merge: 0849f1634a70 09f889d4a3f4 Author: Philip Paeps AuthorDate: 2025-03-23 01:28:44 +0000 Commit: Philip Paeps CommitDate: 2025-03-23 01:28:44 +0000 contrib/tzdata: import tzdata 2025b Changes: https://github.com/eggert/tz/blob/2025b/NEWS MFC after: 3 days contrib/tzdata/NEWS | 29 +++++++++++++-- contrib/tzdata/asia | 12 ++++++- contrib/tzdata/northamerica | 9 +++++ contrib/tzdata/southamerica | 86 ++++++++++++++++++++++++++++++++++++--------- contrib/tzdata/version | 2 +- contrib/tzdata/zone.tab | 3 +- contrib/tzdata/zone1970.tab | 3 +- contrib/tzdata/zonenow.tab | 2 +- 8 files changed, 123 insertions(+), 23 deletions(-) From nobody Sun Mar 23 04:38:06 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZL3Mf6JbCz5rjGL; Sun, 23 Mar 2025 04:38: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZL3Mf497Rz3rkF; Sun, 23 Mar 2025 04:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742704686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MaNF1IFqBX2GHIpxOwOii7ph0yT9l/fgL3jtnndXx2o=; b=yRrlIGguaCHsuG6f+MXPvulkynv6mZ7ZvZuAfySEYo4Q/FL0fCyGBUevg8hY6xsRlbyQs0 wCVKDYuS7fRmNPSuw4xEwgMAQ3+Cisw5kfgs/5iZyfK9BZsPWP8NkC5YfWTQkunAqk12wy c9MykcSFlXvvgRFx0fdnD+VkN2DFVafoF1Jgivw/byhhtMZb+r2qMKaY81tbMK71ASU5Ub I+t5O1o58lRcIacJKtrVg4Oh0a2rBULFX39daVHsTkbB7N4aRNx1IK8upy1uNwtQyy9MVs XltAPRjm3obMObHpFQA71WtIBniQzSo1hFvLT/6f/+GWsQseyzl7qB+53Kneqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742704686; a=rsa-sha256; cv=none; b=FLyR8kgzJoq+nGBw08T8H82XfugL7Tv0GQKG23QGk48NrCfCx8y0p/8oSAje+fc75OD67j tjbE+YESukYq7Qp2L5sZszOblKr6Unc+p3KRSK1YD1dFkMkGQufu48KypeVyhtva6Jd06+ tYq89bJWuy56NS/bkJngGBSlr/K8M5l26MPHZJFmwWfxqy6rsNEYCbI8TcoLJld/sjv38O NlFfU4U0tgVY87k3j2Bre8UBSpLDuX68YfQumgoVLDaU4VMgly6AHFZx3Ka4jCywa1UoQR QPOqjYvwOXoW4iwEkTgsd/jZte/4eUeFe52qtv5sgtqr9gDnzNlHHXkyedtpOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742704686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MaNF1IFqBX2GHIpxOwOii7ph0yT9l/fgL3jtnndXx2o=; b=Kj2gOTYSRRHPA3BVwndUQBjrQtPYoIAAhYlNp3GgcIbWMH+DT40ooAptis0dt/goNJK+H2 NM/xkgtGTcpLMsLzY9OdzpoUJ8tcJIULKxfZn8hBPxbukiV5UBkTxmOUL0fqo+etkPPqRP kwg1Iqt38ujDcOWkfnfQHNcC6oNTNKkwBH0PdqMoRjghgDwByeMyf+dgU5THntmwLEUc16 LUggt1Tu6b+yltKBS9YwAw/MZg8qGo26VpOOrWRU9PPBkRPK8ySEA8i7tnIfGSPeDs/rPz YrK2v5lgOrW1lj8J3+8Nl48iURJT83uOwY1tzLDTIJLXONFZYZnOEruq2J15qQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZL3Mf3D59zt5r; Sun, 23 Mar 2025 04:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N4c6o3022270; Sun, 23 Mar 2025 04:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N4c6fs022267; Sun, 23 Mar 2025 04:38:06 GMT (envelope-from git) Date: Sun, 23 Mar 2025 04:38:06 GMT Message-Id: <202503230438.52N4c6fs022267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 220ce523e976 - main - rk_grf_gpio.4: Polish List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 220ce523e9762b961d41d3d7797f6606c4ad1b0f Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=220ce523e9762b961d41d3d7797f6606c4ad1b0f commit 220ce523e9762b961d41d3d7797f6606c4ad1b0f Author: Alexander Ziaee AuthorDate: 2025-03-18 22:04:02 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-23 04:35:01 +0000 rk_grf_gpio.4: Polish Normalize copyright, date, wrapping, and document description. Fixes: 0832a409c (add driver for the RK3328 GPIO_MUTE) Reviewed by: mhorne, shurd Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D49408 --- share/man/man4/man4.aarch64/rk_grf_gpio.4 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/share/man/man4/man4.aarch64/rk_grf_gpio.4 b/share/man/man4/man4.aarch64/rk_grf_gpio.4 index 1587e708c93b..6a5ebbe19e3b 100644 --- a/share/man/man4/man4.aarch64/rk_grf_gpio.4 +++ b/share/man/man4/man4.aarch64/rk_grf_gpio.4 @@ -1,16 +1,14 @@ .\" -.\" SPDX-License-Identifier: BSD-2-Clause -.\" .\" Copyright (c) 2025 Stephen Hurd .\" -.Dd Mar 16, 2025 +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd March 18, 2025 .Dt RK_GRF_GPIO 4 .Os .Sh NAME .Nm rk_grf_gpio -.Nd -.Xr gpio 3 -driver for RockChip GPIO_MUTE pin +.Nd RockChip GPIO_MUTE pin driver .Sh SYNOPSIS .Cd "options SOC_ROCKCHIP_rk3328" .Sh DESCRIPTION @@ -18,8 +16,8 @@ The .Nm driver provides a single-pin, output-only .Xr gpio 3 -unit whose single pin is named GPIO_MUTE. This controls the output -of the GPIO_MUTE pin on the SoC. +unit whose single pin is named GPIO_MUTE. +This controls the output of the GPIO_MUTE pin on the SoC. .Pp This gpio is usually used to control another device on the board, so is not usually available for user software. From nobody Sun Mar 23 04:46:26 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZL3YH0ryMz5rjb9; Sun, 23 Mar 2025 04:46:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZL3YG5sQCz41ZM; Sun, 23 Mar 2025 04:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742705186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HUrXH5C06f5lTxvp9oXJRaKti/bCzso6Q2AOdkAaJJg=; b=BARbAivoFWhnQRd+X9zZmYZMR6kAA1w48xvbScCk64l/tVoRMprs3IDoBoQKkbBMMjGZ28 SV30raUeiNgxZ+/C6Km2bDbuIcIE+PrxKnB6Bhoa+aDinygHoOG+YNPQSToveO47imJDxU LEyDtHuxM4bYyFxAsDyC2tShnp50Tk4k50GUaZn/+2FE/URPk8eIJFAARs9FijcCN9CVGU cozDnLy0BrAZ5pfmpdfr9TKuWlm9STVfEqxQ3Fl/6hWeLNFqw69ElCEmh9KLTcCzPmulAs XGs7NTOAvqL/o3Avfy0Ej2UbkRIxqc8qTXfUE+NufCNrTFFcqgD4W1UoanA2Gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742705186; a=rsa-sha256; cv=none; b=QNYMN8ZMwPtc4w4SAawmqkiglOqhen0jnBcVs0qApR4yRmQhJZYFu5zPIjxJdBT+9LTk7w u7FFIyCqFliJ2lJeH69lNKCA+7KaNHjf0NERGjRJGsf/mpzogatHZ8skcD8H05TPnrWIT0 PyLdlnAl7OqWEzuZJ/PzvckkGiY1mewyb83ZrARpZLvhuc5SO9bTdePCwSAkmBB/Vmayer y4v3i9l8Ms9ler3mBYP5SyEYHjvfp2BjoOV0keVpm7FCyYZdJuEw/A/UxxKueo+8LgtTty N6+AoYlRx5/WYujEHtfETHon4VEnMgMxmPa4P23Wb+AxccrASUh+qNF0eRMzwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742705186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HUrXH5C06f5lTxvp9oXJRaKti/bCzso6Q2AOdkAaJJg=; b=XAqr9PWkYl3Fquoqq4Vz/KRLQczQSBW9oEiR8ut6S/wJnLMClUTIsGEHzpRLGLaJB8ZCiI Rh710orRKWdCRKze2rAXfwuRHzGEmupapfJkmm5i1Xq7aMCi86JsOrNImmpdgZEywK79Sh JSwzl6p5CiuIRGEOugvPFa8nQQzAGmQ6dwyRzUzjUncCizmO3d05z+DuyCs33usOefvRM3 yLOYKG5F0r6rrJjwg0p0D4asHIb85Xc7Wry9gjdEcPvlysqXWVV9yr6uVd8IC4xnrTmYrx 2dIX4QbtO6u9s52Yc5C1XR6xmSPxLiXGHJ2wePgtxc2KeWuyluAaXZet8Yv2WQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZL3YG59t1zt3r; Sun, 23 Mar 2025 04:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N4kQto040488; Sun, 23 Mar 2025 04:46:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N4kQgM040485; Sun, 23 Mar 2025 04:46:26 GMT (envelope-from git) Date: Sun, 23 Mar 2025 04:46:26 GMT Message-Id: <202503230446.52N4kQgM040485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: dcef6ce862cd - main - UPDATING: Show plural syntax for PORTS_MODULES List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcef6ce862cd19b3496486469cc631bb1b71fcbf Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=dcef6ce862cd19b3496486469cc631bb1b71fcbf commit dcef6ce862cd19b3496486469cc631bb1b71fcbf Author: Alexander Ziaee AuthorDate: 2025-03-23 04:40:34 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-23 04:43:06 +0000 UPDATING: Show plural syntax for PORTS_MODULES Show two examples in PORTS_MODULES to demonstrate space separation. This also shows off our working PRIME dual-gpu support. Switching to this doubled my laptop's battery life! MFC after: 3 days Reviewed by: mhorne Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48342 --- UPDATING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 6989bb7c7f99..56b5e2dc16b7 100644 --- a/UPDATING +++ b/UPDATING @@ -2188,7 +2188,7 @@ FOOTNOTES: happens automatically. If all your modules come from ports, then adding the port origin directories to PORTS_MODULES instead is also automatic and effective, eg: - PORTS_MODULES+=x11/nvidia-driver + PORTS_MODULES+=graphics/drm-kmod graphics/nvidia-drm-kmod [3] From the bootblocks, boot -s, and then do fsck -p From nobody Sun Mar 23 04:58:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZL3pw5nVhz5rk6T; Sun, 23 Mar 2025 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZL3pw4sL2z4FCq; Sun, 23 Mar 2025 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742705896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5Maiercck5zoYGOTEz/pWcCMTPCRSZmqkvqrFDpHqM=; b=FLmh1zGLh1EY4A9RmuWQTsETBDN8zCOVNqRIfzgx819FgV6bjl+Hobj9dfRwlgs8trrldF j6JBlB4GfqyjQ+qz3DXNancl5a1KEWpgqRCAo/yVXhaqWWtcauHx8ZZp3+03ymWi5wlAem BSVYPSeZ2pOd2TTai4SbEeXyE60sU6YhRDSD4ZzzwVP7nBBS4msqiK7n5Nv749yLtjv1fS AoUU/90pjtStXnocw8sxZt1sb3kOx2BsjsfgRg5TnkWUPu28skAI9nkb0Fi7kHnWElwNbd nvbNedlvj5/9LZ+jCSD7k0dQyBD8aLHS+IeOR8Bknz+xd9coE3+wPEd6xGMT1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742705896; a=rsa-sha256; cv=none; b=mhpWWhvRuhq+pVd+PomiKugTiEAzgpG1gTCqgYYIrjnL0TiBY2hzmdfkyVv+cyf514eRCv i2hnbWJDpXfT6BLWpmmmGBBi2i1/FWXNG4CB8SlahM1yuWEs5D2Oopuu7Y5f/3X1uttRX7 ybHNQpVtCCAZQ57/ndk2UrktlIQVG6xK8hkWjVZW3iyWmoCi41z9RoA6csHJRZBSduaxVu RG/j6k2BFtKnr/NL7QbhMJbhrzypI4R1baCNE/BPPA+lKk6+OP6aLVWlxtYvC4v5l3Whcg TvSUhZo3pWe7ArXgCWA5xsT6XSMoqPn9bee/QFDZQzb7OLuTzPu70annOigMpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742705896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B5Maiercck5zoYGOTEz/pWcCMTPCRSZmqkvqrFDpHqM=; b=ro3gb3vnu5bx9VrISv8essiX7F9jnrnPV35/vYt/tWa25pObt96aB/ISbzxkt843is0A9f r+5aSadi+Ca50v+D3wnFXzDOoZBPkl7n6H/wJDDt0PsruI7XmsxcMhKwgUqeFXpndG/bdW yhM3MKgRQdFizzYLW4txfHizZQD7PsO4NL2dDrRqj8TYWmLvAk4aRGcGnSjKsftqfv9ZP0 nvjtTa6/PnLswUvSAsmrgY9aM0yuXMgFGlcddG7Pnk1qYP5x0k1I9jkgvTll7uzZnt4f/V ZzVfzINFXvxx3uOGQD95k3Vyv3jwbaBLdTXv0dzfyGoEZpxgV70/VuIQ3VlWGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZL3pw3FdNztH5; Sun, 23 Mar 2025 04:58:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52N4wGjt059374; Sun, 23 Mar 2025 04:58:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52N4wGDD059371; Sun, 23 Mar 2025 04:58:16 GMT (envelope-from git) Date: Sun, 23 Mar 2025 04:58:16 GMT Message-Id: <202503230458.52N4wGDD059371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Ziaee Subject: git: 29eb4de61a4c - main - style.mdoc: HARDWARE generates Release Notes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ziaee X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29eb4de61a4c2ab1d940e10f3816db79e74d46b1 Auto-Submitted: auto-generated The branch main has been updated by ziaee: URL: https://cgit.FreeBSD.org/src/commit/?id=29eb4de61a4c2ab1d940e10f3816db79e74d46b1 commit 29eb4de61a4c2ab1d940e10f3816db79e74d46b1 Author: Alexander Ziaee AuthorDate: 2024-10-06 22:44:15 +0000 Commit: Alexander Ziaee CommitDate: 2025-03-23 04:54:21 +0000 style.mdoc: HARDWARE generates Release Notes FreeBSD Release Infrastructure has been building the Hardware Release Notes from these subsections in the Kernel Interfaces Manual. Standardize this behavior in the FreeBSD Manual page style guide with everything we learned in the 14.2-RELEASE. To me, this is an enormously exciting discovery, and I believe that over the next 5 years, this can transform the supported hardware UX, without reinventing the wheel, by doubling down on our ways instead of reinventing them. MFC after: 3 days Reported by: bz (special thanks) Reviewed by: imp, mhorne, pauamma, rpolaka Approved by: mhorne (mentor) Differential Revision: https://reviews.freebsd.org/D48343 --- share/man/man5/style.mdoc.5 | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/share/man/man5/style.mdoc.5 b/share/man/man5/style.mdoc.5 index dd4d8a1f5fdf..d96c9ff08bbb 100644 --- a/share/man/man5/style.mdoc.5 +++ b/share/man/man5/style.mdoc.5 @@ -1,4 +1,4 @@ -.\"- +.\" .\" SPDX-License-Identifier: BSD-2-Clause .\" .\" Copyright (c) 2018-2022 Mateusz Piotrowski <0mp@FreeBSD.org> @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 12, 2024 +.Dd December 21, 2024 .Dt STYLE.MDOC 5 .Os .Sh NAME @@ -74,6 +74,33 @@ Historically, was the preferred way before the deprecation of .Sy \&Li . .El +.Ss HARDWARE Section +Driver manuals in section four should have a +.Sx HARDWARE +section describing hardware known to work with the driver. +This section is drawn verbatim into the Release Hardware Notes, +therefore there are several things to note: +.Bl -dash -width "" +.It +The introductory sentence should be in the form: +.Bd -literal -offset indent +The +\&.Nm +driver supports the following $device_class: +.Ed +.Pp +Followed by the list of supported hardware. +.Pp +This defines what driver the subsection is referring to, +and allows the reader to search through the Hardware Notes +not only for the device models they have, +but also for the device type they are looking to acquire. +.It +The supported hardware should be listed as a bullet list, +or if complexity requires, a column list. +These two list types create very neat subsections +with clean starting and stopping points. +.El .Ss EXAMPLES Section .Bl -dash -width "" .It From nobody Sun Mar 23 11:59:54 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZLF9R2Ch0z5rCF6; Sun, 23 Mar 2025 11:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLF9R1bzKz3R4g; Sun, 23 Mar 2025 11:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742731195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIq8wkCawVs4lUiSy4gQsVQbSuFTe7xELLr99B9sGOg=; b=q7kn1tWYttYevP6EbqVgPyUkW7yZFbmj/GBvse48OVe8aMFDR12LL/PL9O8vuFI547Dad5 nHrDnf8AsAgnZ9kN6SVh6LFH0JfnylTfjJZxHHsqoh6+AyfjH5jYu9mltZiy//aW84thui 0Szvxfg4fmIkZNaVtGvnOE8dy8ow4rRwuRuI+z63DT6Sa5NnMWreZ1lUoSEv+L2xj84ala r/pZ+7486QjUczZB2WZWHqMHNC3lR6rIUpwLSFeMBJVr7RrPuAz0Ez9556Uq4O6hYlgmaR VCWlKCRBIRxvrYFX4UJ4Vi51d0vYHXq3bYFwd5O6+BQGmywdEaqcNq4ZD9q6Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742731195; a=rsa-sha256; cv=none; b=ujH2RLlvY8Q+kEDq0a+okaoTGuERBsFCZWNHiMRY6g2ucl1ELw5A+83/VBwgineaV9rNua PBj6UMMQv3/O5Getle0qcDWgBXGyHa8Aud8p43z1wG1iLGALrfF5om9+j2HjKpK6fJO5JY 4sDnO+qrO7GSk04TRinPq10zh7zFQOfGVydOy2jCTEQQsZDu/+R78CEmLVe3HMfUeEJhWT tlNVwdrsU2L0MzXcCg1QjprDzDMfO+/Mn/xd3uz1bpDBft7bm/vljQLHARfmnfHC42Cp4a yqlR0owl3RWHJ0YabpyqjZbNrMSRCJGq/sIkTTsiCYn0JoOHoF4GgMuNU/Ttng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742731195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dIq8wkCawVs4lUiSy4gQsVQbSuFTe7xELLr99B9sGOg=; b=tC8sQzhtlOXlf0pWBJ674q79oRKH55cvEZAWm6EXWzNmEZZpe/5kKUvsgVBjT1nPNEjsYn ERZl59UW+1t3qRyIjYUf73BLIe1m5fc2BGaXo3N3qxiVCu0df7aiUkPfLo8sQk3YVxST3p lhC6lhaIGM6OAReucihrFCqjQhNVy8ZjjvOChPPhizZrFV7l6s1m6P87w93PJ9nt8MxaUE maqxoDlHT3eKjWR5ot5IpGx2M2kc+ePBRQ8h3KWmHnRhMfaJDNKYTMrODuW4N2/H8vZLFo 4zJRTfYblURZfNgfBZpmqHg170y+RApj5u5FHfF4s67FFiM9rW6ln4r7fnNtSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLF9R0nZkz1661; Sun, 23 Mar 2025 11:59:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NBxsQp044875; Sun, 23 Mar 2025 11:59:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NBxsMX044872; Sun, 23 Mar 2025 11:59:54 GMT (envelope-from git) Date: Sun, 23 Mar 2025 11:59:54 GMT Message-Id: <202503231159.52NBxsMX044872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e9a846468acf - main - ktrace: Use STAILQ_EMPTY_ATOMIC when checking for records in userret() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9a846468acfbba35ca40b888670559aaff7228d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e9a846468acfbba35ca40b888670559aaff7228d commit e9a846468acfbba35ca40b888670559aaff7228d Author: Mark Johnston AuthorDate: 2025-03-23 11:54:59 +0000 Commit: Mark Johnston CommitDate: 2025-03-23 11:54:59 +0000 ktrace: Use STAILQ_EMPTY_ATOMIC when checking for records in userret() As in commit 36631977d8c9, this check is unlocked and may trigger spurious assertion failures. Use STAILQ_EMPTY_ATOMIC() here as well. Fix nearby whitespace. Reported by: syzkaller Reviewed by: olce Fixes: 34740937f7a4 ("queue: New debug macros for STAILQ") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49441 --- sys/sys/ktrace.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 9d06cd33d5d2..6608b9250da4 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -87,10 +87,9 @@ struct ktr_header { * is the public interface. */ #define KTRCHECK(td, type) ((td)->td_proc->p_traceflag & (1 << type)) -#define KTRPOINT(td, type) (__predict_false(KTRCHECK((td), (type)))) -#define KTRCHECKDRAIN(td) (!(STAILQ_EMPTY(&(td)->td_proc->p_ktr))) +#define KTRPOINT(td, type) (__predict_false(KTRCHECK((td), (type)))) #define KTRUSERRET(td) do { \ - if (__predict_false(KTRCHECKDRAIN(td))) \ + if (__predict_false(!STAILQ_EMPTY_ATOMIC(&(td)->td_proc->p_ktr))) \ ktruserret(td); \ } while (0) From nobody Sun Mar 23 11:59:56 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZLF9S3kzjz5rC1G; Sun, 23 Mar 2025 11:59: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLF9S1bRxz3R3s; Sun, 23 Mar 2025 11:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742731196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lgKmsxqQhZA9q1r3qZIWUTJm4VWRUkny44e3hYYEl0k=; b=fKL0f1/AbaQeU5UvGfWB3DM1WYXaHSR4tqHWF1dNhJZY/aEO6/ZgSAHzUmiBYn+xstndsl iAarimOuJAfL5bCjuo21eEin20KECVo7cyjMk4Yb3rkY9+HVDt1gN0DcA5PC+2/8Fege2x mUajnIGMrEpzcjlqd8FQZEJF33ibeKmmGYfn/B+fnLBBHBZy3jxfeUwjMxGWCDAXKSNDbW /GZl3obljuSbgEGT+vs5Ia/iieFBXq6gJcjjBpMLjFIG9wp4azq84cIQGdbEelN58DOV6K frOFTPYi8plvBQtokI0eDfV/DNehzmXlVRQ1HvZPh/ZCk1brO8lU5Sj4PQBenA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742731196; a=rsa-sha256; cv=none; b=uY/6xJYyLVRsdPwNj0+1J+UFOWUrI61exR3bIP6OSFrn/ThEXO+6mKOG8XWlbTQVfIRcdU bU1nnj7VfMTOej4VhKTeTZrMSNvTVPAVF+vAX8GFASqZlSFYOqjdnVl5hRXa45U0bO26qJ P4tYk2q9clnxHJqBp7/jmUPdThLTX7ffm7YXH817F5s9HFZKBI6iFI9wWxBxoU1B7E5aWi BtW75fsVzxjFVFrzYnLH0iqza5Ki7yz/yBLeSmCXmOhZW0o+72DDkowZ/RBQ8XKg+SdGET zCg/a4P6cuA+d7kA2rWOAMb72lTI+QXnC+go94RRgo/3UFTBgwMA0z3Qr96RBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742731196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lgKmsxqQhZA9q1r3qZIWUTJm4VWRUkny44e3hYYEl0k=; b=pTfcCrik1sJrxUzgWCRhC1ntZZp7LYJDcN+YP9lPMOXXDMh4+4YCqalq5kaKLu9T9sLmII yCsJhp2jgUS7Nh+ww06doPd0foI+7yRSgFcYmztFLbmt3TGZAgZjmEXpPh22WLknH1JEy/ Oc+r5E2uV8GNu1789T+TEAmdbF43XsYpCKdQ/okdxa7rtZow5jEnsxnKFwUuGEaQKyLHKr tNgz2h12mWsyulkw3HETTcgZs6JUchmQaBRl+c8vOBogKXLtyA4hz7ikmYisz19AMU3ILT L6HOAGugy+n6zpSNwy1Sn82nt4l/cfaZlvEULdHrKGCEl2REI5NN6PBEBgowzg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLF9S0tCMz16Ct; Sun, 23 Mar 2025 11:59:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NBxusP044910; Sun, 23 Mar 2025 11:59:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NBxuOa044907; Sun, 23 Mar 2025 11:59:56 GMT (envelope-from git) Date: Sun, 23 Mar 2025 11:59:56 GMT Message-Id: <202503231159.52NBxuOa044907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 574816356834 - main - socket: Fix a race in the SO_SPLICE state machine List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 574816356834cb99295b124be0ec34bd9e0b9c72 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=574816356834cb99295b124be0ec34bd9e0b9c72 commit 574816356834cb99295b124be0ec34bd9e0b9c72 Author: Mark Johnston AuthorDate: 2025-03-23 11:55:56 +0000 Commit: Mark Johnston CommitDate: 2025-03-23 11:55:56 +0000 socket: Fix a race in the SO_SPLICE state machine When so_splice() links two sockets together, it first attaches the splice control structure to the source socket; at that point, the splice is in the idle state. After that point, a socket wakeup will queue up work for a splice worker thread: in particular, so_splice_dispatch() only queues work if the splice is idle. Meanwhile, so_splice() continues initializing the splice, and finally calls so_splice_xfer() to transfer any already buffered data. This assumes that the splice is still idle, but that's not true if some async work was already dispatched. Solve the problem by introducing an initial "under construction" state for the splice control structure, such that wakeups won't queue any work until so_splice() has finished. While here, remove an outdated comment from the beginning of so_splice_xfer(). Reported by: syzkaller Reviewed by: gallatin Fixes: a1da7dc1cdad ("socket: Implement SO_SPLICE") MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D49437 --- sys/kern/uipc_socket.c | 7 +------ sys/sys/socketvar.h | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 03bfea721dd2..c27b007cafc6 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -592,11 +592,6 @@ so_splice_xfer_data(struct socket *so_src, struct socket *so_dst, off_t max, /* * Transfer data from the source to the sink. - * - * If "direct" is true, the transfer is done in the context of whichever thread - * is operating on one of the socket buffers. We do not know which locks are - * held, so we can only trylock the socket buffers; if this fails, we fall back - * to the worker thread, which invokes this routine with "direct" set to false. */ static void so_splice_xfer(struct so_splice *sp) @@ -1638,7 +1633,7 @@ so_splice_alloc(off_t max) sp->wq_index = atomic_fetchadd_32(&splice_index, 1) % (mp_maxid + 1); } while (CPU_ABSENT(sp->wq_index)); - sp->state = SPLICE_IDLE; + sp->state = SPLICE_INIT; TIMEOUT_TASK_INIT(taskqueue_thread, &sp->timeout, 0, so_splice_timeout, sp); return (sp); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index 735ff49062de..02d0ca139fa4 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -80,6 +80,7 @@ struct so_splice { struct mtx mtx; unsigned int wq_index; enum so_splice_state { + SPLICE_INIT, /* embryonic state, don't queue work yet */ SPLICE_IDLE, /* waiting for work to arrive */ SPLICE_QUEUED, /* a wakeup has queued some work */ SPLICE_RUNNING, /* currently transferring data */ From nobody Sun Mar 23 15:35:11 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZLKxr0HW4z5rS1x; Sun, 23 Mar 2025 15:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLKxq6ZVfz3r6p; Sun, 23 Mar 2025 15:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742744111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVIFfaqMJHFKaJGl02iI+WVdeUpe5FzJAMBgbERM4Aw=; b=XfVqnx/ccZ1qRPOZVoSeOioEPv7D1F2TlC8TZn1WN6No4RLS437mkfDxMC/vlF/Hts+vwa T8ats6txIFO65en1FKFPH+YlRz3x3gVE30nqbn+WLAX7U3z+DdgWv2i06qYZJntj6jOWPl fTelc0fGMjyZOK2zVwdn3RMAGo8IsNiO2AuVstm40bAq/R4H/gem8OPPZ0qrvtS7KDjrZo xiWhWjVi9sToRUkofafGMIq+zgOTAQ7AxrO1MkqAMztr3HCJKZbHp5PH1QT9E2VcX71TrC o7B+cUc1yG7KKs9USSz/NDRDj88+aPeQ/hwXrY8SV4jV2Ch+cvUN1nB1y+n3QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742744111; a=rsa-sha256; cv=none; b=W70S3BYfp1swiJt1f24cNDupqcH1rHhGt2vTXcl0GuakYuXRNHdEIsVbMxADo4vaKL59md U/hr7hOPNNWcnFRxat3B++l9vKT/OIUTf0+ReRfCI6QuNscX63bU0FKW8nO9M9TdxKyW4w gh7RR1KCrpTkOHAdfvRxTTrCk4/7H720MxA4+9bg29gkZ/UFtS2orfxqjwR6nuxZoX+Ahq gIp9RsLO32HAT6sf+CZkvzxSSfhcHIZ4X1ayBMPn6neqY3IYLu+qXEACImDt0MXz1vtMSL ENNGlqLR1P3Wb2q4d4oSr25GkByQvomM7oHus1SXNB8WxnJquxzo/rRE6WnIvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742744111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HVIFfaqMJHFKaJGl02iI+WVdeUpe5FzJAMBgbERM4Aw=; b=i3RuoKD11kWZbQJr53NnLJIryi8i2aoueShhTMteZZIsM6/aI3k3TIv5OrdW3X+WD0oX63 Syynn3NvMdGcCEqmIek1l3ikVFyimF9ezqXlDyzCOBfktLZ8zwtyJhL4lyPYVR09Mmxsih /LVy7ypj0MCPNPVbPuye28WHhwLdeL8Yo3jMogxzgwZRTMRd+BafuDW4efGjFfMPM3Mn7C ZlvdIaymePAO0kdYrp71vDcEDjoJIeEPHYLUI+0aBcAhzY+Tkkv7hcz+4q9xZhj4m41AYi BOakXX+01xYRavNf280mNp6ppKRWM5b5+VGIiV5rQbZ2ZPqPZ24s04N0ZP6+2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLKxq66QVz1C57; Sun, 23 Mar 2025 15:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NFZBpa054936; Sun, 23 Mar 2025 15:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NFZBH1054933; Sun, 23 Mar 2025 15:35:11 GMT (envelope-from git) Date: Sun, 23 Mar 2025 15:35:11 GMT Message-Id: <202503231535.52NFZBH1054933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Tijl Coosemans Subject: git: 487d79d44f8a - stable/14 - devd: Don't install autofs.conf with WITHOUT_AUTOFS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 487d79d44f8a7a31edeaabf43b96e5f1af028f17 Auto-Submitted: auto-generated The branch stable/14 has been updated by tijl: URL: https://cgit.FreeBSD.org/src/commit/?id=487d79d44f8a7a31edeaabf43b96e5f1af028f17 commit 487d79d44f8a7a31edeaabf43b96e5f1af028f17 Author: Tijl Coosemans AuthorDate: 2023-12-22 14:14:55 +0000 Commit: Tijl Coosemans CommitDate: 2025-03-23 15:32:33 +0000 devd: Don't install autofs.conf with WITHOUT_AUTOFS (cherry picked from commit 272b4b764bdfb563f655da37ef9ec8c01c77f386) --- sbin/devd/Makefile | 2 ++ tools/build/mk/OptionalObsoleteFiles.inc | 1 + 2 files changed, 3 insertions(+) diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index 20490c954031..1d9023e9c5bc 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -11,10 +11,12 @@ DEVDDIR= /etc/devd DEVD+= asus.conf .endif +.if ${MK_AUTOFS} != "no" CONFGROUPS+= AUTOFS AUTOFSDIR= ${DEVDDIR} AUTOFS+= autofs.conf AUTOFSPACKAGE= autofs +.endif CONFGROUPS+= DHCLIENT DHCLIENTDIR= ${DEVDDIR} diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 6af2a2e33eb0..b985adbd1e0b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -127,6 +127,7 @@ OLD_FILES+=etc/autofs/special_media OLD_FILES+=etc/autofs/special_noauto OLD_FILES+=etc/autofs/special_null OLD_FILES+=etc/auto_master +OLD_FILES+=etc/devd/autofs.conf OLD_FILES+=etc/rc.d/automount OLD_FILES+=etc/rc.d/automountd OLD_FILES+=etc/rc.d/autounmountd From nobody Sun Mar 23 21:06:04 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZLTHd0t2Hz5rpdb; Sun, 23 Mar 2025 21:06:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLTHc6kzkz3TfQ; Sun, 23 Mar 2025 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742763965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FclhPRhhQxXocLejqIwJ7LgOlgZMY/DCWeA59eIPvGk=; b=cii9+jnf1IK0d9A72KyFHVl+kPyyJdtoEcsxDs3kgRj6w6GIFg8kAR0M/XyIMozwNSK2mQ yW0zuGbBUKycbZBJ8P3L96T0BtpCkoc03X2IC8VMhhK1P/ayL9miJD+CowQZ5kuK3CT6un f4Spvl7d3WQuCOPvGQsVx4YUjEYPwvE/LtHMhoMSoAI7Qkn4d4BUyQ5Pr3+uVnjrz/JnEI cq4IKWY/9+OI6vNTBxmlGADfeDCIT66rPJaNobunHFTXgjjrcu+6Hr5pbQxNQWnewrVlUR uT/yPY/yArD0tze5F7cAIDMjoN7J/16Lxzu2YJus5CKkimMgprCXXXFVC0KkQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742763965; a=rsa-sha256; cv=none; b=AWYWjFvXiYfDKGqf09qD/oyCLrjLYiF2TFcyOGUT3+HxNO7REku9PBMOrXsQxAfh1IEU1N 6FHO+eLb8waJgaLOAmDSZyLkmMqTKciZKH+pLtjTHL6NeyUHDz41AOnhy4E9HpE6VOEU45 qeItgGzuI7048mvayBqA51POsmaoYyld4vPbjVpg3c4ZRtrgdjxBiqqcKbg4JnbLR3mxeL pK2whsw+IkmzIWVWGSyOMfSdX8lpaGHOXI3q11m1fATebuxCRw+8691juog0jwpKH2yTua Nc/51M4Iftdu6Y5wGTmioPZttUp6XB55kVlu/2tSYt5qZizYZg9Tde7qyoa++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=1742763965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FclhPRhhQxXocLejqIwJ7LgOlgZMY/DCWeA59eIPvGk=; b=TfAL1fC0vVbtA+EtIJQBFa8tnppbCQf0cqh+sP5vRDl9vZLFv0F65cdBQRxWoajOkAC2+p o8yynPzEr65Qqc9x0eKijNBxrD9rpARcbwuaivmuMj8C50QO1jCUoW4Teeowhl8wFlZcna IhZtaGBUGUbDPcc/vA0sbqJsik+zLHN7S4KFn7CW/aAPn6V1TVrl5h/VmcIOShyiJKgZuI MW61kL0uR1geV/Bt8sH8hwmUcg/+Ub6VaZNftQQOe9GUp1h8cvstpt9IWSgt/nqwMLTArI 3cGUzdcYVCJtlgj8jk0vM4DF1ow6wqSFZClAf4jqyxe5SEeZ5MRME6oygtJzkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLTHc6CtCz8fl; Sun, 23 Mar 2025 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NL64bA071899; Sun, 23 Mar 2025 21:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NL64MG071896; Sun, 23 Mar 2025 21:06:04 GMT (envelope-from git) Date: Sun, 23 Mar 2025 21:06:04 GMT Message-Id: <202503232106.52NL64MG071896@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 74361d693aec - main - malloc: Fix DEBUG_REDZONE for contigmalloc() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74361d693aec892b01c1553bda7176f8d341b2ff Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=74361d693aec892b01c1553bda7176f8d341b2ff commit 74361d693aec892b01c1553bda7176f8d341b2ff Author: Mark Johnston AuthorDate: 2025-03-23 13:42:40 +0000 Commit: Mark Johnston CommitDate: 2025-03-23 13:50:41 +0000 malloc: Fix DEBUG_REDZONE for contigmalloc() When free() was adapted to support allocations originating from contigmalloc(), redzone(9) support was not included. redzone(9) involves adjusting the pointer to freed memory before looking up the slab cookie, so it's not straightforward to make contigmalloc() opt out of redzone support. Thus, augment contigmalloc() to support redzone. Reported by: glebius Tested by: dhw MFC after: 2 weeks Fixes: 9e6544dd6e02 ("malloc(9): extend contigmalloc(9) by a "slab cookie"") --- sys/kern/kern_malloc.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index b1347b15e651..0b76e633b04a 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -477,11 +477,18 @@ contigmalloc_size(uma_slab_t slab) } void * -contigmalloc(unsigned long size, struct malloc_type *type, int flags, +contigmalloc(unsigned long osize, struct malloc_type *type, int flags, vm_paddr_t low, vm_paddr_t high, unsigned long alignment, vm_paddr_t boundary) { void *ret; + unsigned long size; + +#ifdef DEBUG_REDZONE + size = redzone_size_ntor(osize); +#else + size = osize; +#endif ret = (void *)kmem_alloc_contig(size, flags, low, high, alignment, boundary, VM_MEMATTR_DEFAULT); @@ -489,16 +496,26 @@ contigmalloc(unsigned long size, struct malloc_type *type, int flags, /* Use low bits unused for slab pointers. */ vsetzoneslab((uintptr_t)ret, NULL, CONTIG_MALLOC_SLAB(size)); malloc_type_allocated(type, round_page(size)); +#ifdef DEBUG_REDZONE + ret = redzone_setup(ret, osize); +#endif } return (ret); } void * -contigmalloc_domainset(unsigned long size, struct malloc_type *type, +contigmalloc_domainset(unsigned long osize, struct malloc_type *type, struct domainset *ds, int flags, vm_paddr_t low, vm_paddr_t high, unsigned long alignment, vm_paddr_t boundary) { void *ret; + unsigned long size; + +#ifdef DEBUG_REDZONE + size = redzone_size_ntor(osize); +#else + size = osize; +#endif ret = (void *)kmem_alloc_contig_domainset(ds, size, flags, low, high, alignment, boundary, VM_MEMATTR_DEFAULT); @@ -506,6 +523,9 @@ contigmalloc_domainset(unsigned long size, struct malloc_type *type, /* Use low bits unused for slab pointers. */ vsetzoneslab((uintptr_t)ret, NULL, CONTIG_MALLOC_SLAB(size)); malloc_type_allocated(type, round_page(size)); +#ifdef DEBUG_REDZONE + ret = redzone_setup(ret, osize); +#endif } return (ret); } From nobody Sun Mar 23 22:17:36 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZLVt91XdLz5rtPd; Sun, 23 Mar 2025 22:17: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZLVt84QP0z3NP2; Sun, 23 Mar 2025 22:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742768256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+B2Vjv0p/kmif1z6yruJdgSRRUG5ZpGRZXRwWzcJJ0=; b=mpGRUdyvlXMIFNHE58K5Kfg5xWclr4IGJhcJrKJxrF6p4wh9Pd0/+zmtnTDaL4Jsf8qRc1 EJ1t4KCInFy8JFY4+rMX8X147WoOiCmoyrSo/Qvp3oZWFR5Zl7laIt8xiZ0Nyx2JcXZqZL odlo0RcMyuv8NbiCTMzWhhftRlabZ9ceufKf/jAN3QIU1Xh6Fr7EaGIV1jbg4mFkchTRtC 0WQn+zZ+kTArmjN4LzvORsQj0KmWrK7EGaNzvlsRN18IEeN65KUZ2yvixTEh4bnua4kuDr owKkXHT2E5Vvq+IjRO2fm2PZMgf+pFdILcs7d3TbR8JMBN4BFGtAFW1uatLRFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742768256; a=rsa-sha256; cv=none; b=tTiGX8rBtelf6hzo+tp91vOp6dzyr9zxF02Qt1JwAByM1BlU4382QCQaS8ysbZtn2mz5su whX8cCIsiOGXwcV1YOdtoBO/z9octkd17qJez/yXpyZgNmJqgfQy7qj60YqjBmNJI0gCn8 D2qlgGopEvwG3QS0/tpSsVLT/hjcQcfn+WFH8GXTvi8DC6bIcY7lyYhUoybRbiLNTrSU9y 0TXW0f3UoOSPiQ3eJai/uBJwtmrOJFKWPZgcQ58Jjc4n36A9z+hN3C4L1gj50H7FL45/77 8mJUyNnu8RjyA+xBB0Gj/t4Hki1PAosHTHARJXjl3zSeGmu+yLONIp0xOPGY6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742768256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+B2Vjv0p/kmif1z6yruJdgSRRUG5ZpGRZXRwWzcJJ0=; b=KUpmOQ1WKvoPTLkFar6AmHnxUAeKqD78Ed3oRUhA1rKddYNXGAdDpk/hhkx+oZWIrkDUrv flOeU7T6yfwXvqXAzI0gBejSUM9KzTcPgTceQM7C4S0345q/eo5RZ2FrD6q+glpefsNw3b a6yiekY2CIw9aVN12J+y8VVtYmjFDCOv1GwsZ2KK72AJujCHBZqaIYOLDlN/C5tCG+VSW/ aGSgC0tZn0fjtlKfvjTcaeKFBWsBw6r6V2x4ihViNKX9qyHH3/P7N0uDeo9ZdvEjCMJJKt xDxypPe8PnSCmQBeRe7cn0IMmY/1iGdkROTl5dtdoJUdoA+4lGy1uKTGNlJvHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZLVt82hRPzBQL; Sun, 23 Mar 2025 22:17:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52NMHa01003332; Sun, 23 Mar 2025 22:17:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52NMHaYA003329; Sun, 23 Mar 2025 22:17:36 GMT (envelope-from git) Date: Sun, 23 Mar 2025 22:17:36 GMT Message-Id: <202503232217.52NMHaYA003329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b885643b63e4 - main - boot: Always use ELF Tool Chain elfcopy for EFI builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b885643b63e4df51cc6c74c4ddd4d0b640075678 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b885643b63e4df51cc6c74c4ddd4d0b640075678 commit b885643b63e4df51cc6c74c4ddd4d0b640075678 Author: Ed Maste AuthorDate: 2025-03-14 16:42:15 +0000 Commit: Ed Maste CommitDate: 2025-03-23 22:17:03 +0000 boot: Always use ELF Tool Chain elfcopy for EFI builds We now use llvm-objcopy by default (as of commit 1cae7121c667), but it does not support efi-app-x86_64 and similar ouptut formats (for more detail see LLVM issue 108609[1]). Go back to installing ELF Tool Chain's version of objcopy as elfcopy (the standard upstream name) and use it for EFI builds. [1] https://github.com/llvm/llvm-project/issues/108609). PR: 280771 Reviewed by: andrew Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49362 --- ObsoleteFiles.inc | 3 --- stand/efi/Makefile.inc | 1 + stand/efi/boot1/Makefile | 2 +- stand/efi/loader/Makefile | 2 +- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ usr.bin/Makefile | 3 ++- usr.bin/objcopy/Makefile | 14 +++++++++++--- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index f56ad74294f9..850133db608a 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -13587,9 +13587,6 @@ OLD_FILES+=usr/share/man/man1/rlog.1.gz OLD_FILES+=usr/share/man/man5/rcsfile.5.gz # 20161010: remove link to removed m_getclr(9) macro OLD_FILES+=usr/share/man/man9/m_getclr.9.gz -# 20161003: MK_ELFCOPY_AS_OBJCOPY option retired -OLD_FILES+=usr/bin/elfcopy -OLD_FILES+=usr/share/man/man1/elfcopy.1.gz # 20160906: libkqueue tests moved to /usr/tests/sys/kqueue/libkqueue OLD_FILES+=usr/tests/sys/kqueue/kqtest OLD_FILES+=usr/tests/sys/kqueue/kqueue_test diff --git a/stand/efi/Makefile.inc b/stand/efi/Makefile.inc index b5bd341d1b78..f91ac9102ca8 100644 --- a/stand/efi/Makefile.inc +++ b/stand/efi/Makefile.inc @@ -26,6 +26,7 @@ EFI_TARGET= efi-app-x86_64 .else EFI_TARGET= binary .endif +EFI_OBJCOPY?= elfcopy # Arbitrarily set the PE/COFF header timestamps to 1 Jan 2024 00:00:00 # for build reproducibility. diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index 8641ecf457ab..e2966e813504 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -96,7 +96,7 @@ ${BOOT1}.efi: ${PROG} exit 1; \ fi SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ - ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ + ${EFI_OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index e9d29e5a219e..2dae035f04a8 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -128,7 +128,7 @@ ${LOADER}.efi: ${PROG} exit 1; \ fi SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH} \ - ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ + ${EFI_OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ -j set_X${LOADER_INTERP}_compile_set \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 864057692566..b25f551d069b 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -8125,6 +8125,7 @@ OLD_FILES+=usr/bin/cc OLD_FILES+=usr/bin/c88 OLD_FILES+=usr/bin/c++ OLD_FILES+=usr/bin/c++filt +OLD_FILES+=usr/bin/elfcopy OLD_FILES+=usr/bin/ld OLD_FILES+=usr/bin/ld.bfd OLD_FILES+=usr/bin/nm @@ -8135,6 +8136,7 @@ OLD_FILES+=usr/bin/strip OLD_FILES+=usr/bin/yacc OLD_FILES+=usr/share/man/man1/addr2line.1.gz OLD_FILES+=usr/share/man/man1/c++filt.1.gz +OLD_FILES+=usr/share/man/man1/elfcopy.1.gz OLD_FILES+=usr/share/man/man1/nm.1.gz OLD_FILES+=usr/share/man/man1/readelf.1.gz OLD_FILES+=usr/share/man/man1/size.1.gz diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 15fcdeb479f7..b9e4d6c1153a 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -247,7 +247,6 @@ SUBDIR.${MK_TFTP}+= tftp SUBDIR.${MK_TOOLCHAIN}+= addr2line SUBDIR.${MK_TOOLCHAIN}+= ar SUBDIR.${MK_TOOLCHAIN}+= nm -SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= readelf SUBDIR.${MK_TOOLCHAIN}+= size .endif @@ -270,6 +269,8 @@ SUBDIR.${MK_TOOLCHAIN}+= indent SUBDIR.${MK_TOOLCHAIN}+= lex SUBDIR.${MK_TOOLCHAIN}+= lorder SUBDIR.${MK_TOOLCHAIN}+= mkstr +# ELF Tool Chain elfcopy required for EFI objects (PR280771) +SUBDIR.${MK_TOOLCHAIN}+= objcopy SUBDIR.${MK_TOOLCHAIN}+= rpcgen SUBDIR.${MK_TOOLCHAIN}+= unifdef SUBDIR.${MK_TOOLCHAIN}+= xstr diff --git a/usr.bin/objcopy/Makefile b/usr.bin/objcopy/Makefile index 101c84cc5206..2f3386d95ebe 100644 --- a/usr.bin/objcopy/Makefile +++ b/usr.bin/objcopy/Makefile @@ -7,12 +7,22 @@ ELFCOPYDIR= ${ELFTCDIR}/elfcopy .PATH: ${ELFCOPYDIR} -PROG= objcopy +PROG= elfcopy +MAN= elfcopy.1 + +.if ${MK_LLVM_BINUTILS} == "no" + +LINKS+= ${BINDIR}/${PROG} ${BINDIR}/objcopy +LINKS+= ${BINDIR}/${PROG} ${BINDIR}/strip +MAN+= objcopy.1 strip.1 + objcopy.1: elfcopy.1 sed -e 's/\.Dt ELFCOPY 1/.Dt OBJCOPY 1/' \ -e '/\.Nm elfcopy ,/d' < ${.ALLSRC} > ${.TARGET} CLEANFILES+= objcopy.1 +.endif + SRCS= archive.c ascii.c binary.c main.c pe.c sections.c segments.c symbols.c WARNS?= 5 @@ -22,9 +32,7 @@ LIBADD= archive elftc elf pe CFLAGS+=-I${ELFTCDIR}/libelftc -I${ELFTCDIR}/libpe -I${ELFTCDIR}/common CFLAGS+=-DWITH_PE=1 -MAN= ${PROG}.1 strip.1 -LINKS= ${BINDIR}/${PROG} ${BINDIR}/strip # This same hack is in lib/libelf/Makefile and usr.bin/readelf/Makefile # We need to link against the correct version of these files. One