From nobody Mon Mar 17 00:48:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 00:48:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 18:36:45 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:46 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:49 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:53 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:52 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:54 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 Tue Mar 18 01:41:48 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 12:59:58 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 Wed Mar 19 14:52:14 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 22:27:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ3Gw4hcQz5qp2G; Wed, 19 Mar 2025 22: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 4ZJ3Gw1NVPz3Zvh; Wed, 19 Mar 2025 22:27:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742423224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4mEYVRE56K9ONH9lywmZBeTuuEcnErX0nm54XIwZa4=; b=bonv6jquklo5j6wupcgRE143BaYAtD+NlGJhzFpCVKfWbCtYR5XYqvN+qCy2qfurJWYlCB MCx4w2rXl0a0p3XmCp8m3gnGMQBNzybSZgpxmlBH/bnqUaV02nXRfY7PoR79AVsEwihFPC Xh/46DWejsOX4HvCC4SxjlJ+qS/QH/vh2dvUEtYlZmKsNqEjIa4n3QLNdi8tC9RSEkBFql K7IoYS+yWM59x3urEBwtncG+OGELLp9Th8Gk149c0xZtp9/PEBeSIm724u/Yw7iER/WL3k kyZuCyrTsBNlOr66a9C5/2nSK2rL2w2eEpBpXGDZ4ThjSolliUzvkVNwgPVu/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742423224; a=rsa-sha256; cv=none; b=abzb6JB+EnnIR+VDzrBhhqLbcpPk/sQg1Hf8wS+UMaLXl4S5ZIAkeGRVtaUp/Od2RtubeV a/Pqqi0GSDP5fYsMoBVRAr1Pc4bn1dLNZTtGWZ1zSIPM2Wrb92iUaQOHNe7Y6Gp/08+mly MpmtVjo5rJSdN/quytlsMk7cPYrv4dJn8FUbhGeA5AiMOF1ffMe+Yg7TQfhidPpO2A9qwu VE+X5we+skP9925qGwYi0exd7zXpOzGCykyhQ848XffKvU388YtG/j3rLdfbikFClL8urn XUz12LyaclIdJfMLiGajYUL1v38YoE1mIFNSs7gxFGYD7tWn/8t8Kf28/pZtTw== 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=1742423224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K4mEYVRE56K9ONH9lywmZBeTuuEcnErX0nm54XIwZa4=; b=a7eaXJxwfJJvQMJ4Cxu2G8Xp7xW+a4CS/kuZjVRKezb7xxmwAadXcvokHnxqAJkQGPAcKq fvRoOvXZ68YEpoIO336u9a47DFSSihdqNnJUUZBILhXWglM7hJbTlWxOgEv3c0gKk29YoX 3MhmtRawLWTh8c1rFJhZdpzo+A/0MqtKpbyXQDtJDuFjOQgi9QdZr0GceYsYFilPoQkgBs QpCqpMBLN3gjyd6c+ox2dEB8F1kA2PqBVO0VHWZ2TmtyjEM4z6L/blEM1UKgDJk88YjQ3Q mi/5U1MbhGdIHTgmYsaQariXkelva+JiKRAuWDtgSW+SKtUiHGKs/5J7L0UgPA== 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 4ZJ3Gw0zWFzfCl; Wed, 19 Mar 2025 22:27: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 52JMR4Ij044575; Wed, 19 Mar 2025 22:27:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52JMR4NP044572; Wed, 19 Mar 2025 22:27:04 GMT (envelope-from git) Date: Wed, 19 Mar 2025 22:27:04 GMT Message-Id: <202503192227.52JMR4NP044572@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: 6bd0e98fd3e5 - stable/14 - net80211: LinuxKPI 802.11: clean up MIC vs. MMIC rx flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6bd0e98fd3e5a6785833a33352f71ca7db56e234 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6bd0e98fd3e5a6785833a33352f71ca7db56e234 commit 6bd0e98fd3e5a6785833a33352f71ca7db56e234 Author: Bjoern A. Zeeb AuthorDate: 2025-03-03 11:43:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-03-19 22:22:15 +0000 net80211: LinuxKPI 802.11: clean up MIC vs. MMIC rx flags net80211 used MMIC flags for CCMP instead of only for TKIP. LinuxKPI 802.11 compat code (and later net80211) had a comment about this. Given LinuxKPI seems to be the only consumer for these flags currently outside of net80211 itself, clean them up before implementing TKIP in LinuxKPI after all and before GCMP comes into the tree. Sponsored by: The FreeBSD Foundation Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D49219 (cherry picked from commit 394a9a5b1c2ad7b679a00c3087c41378abfa74a1) (cherry picked from commit 5f2893553f3cde7c1529f9ca3987be378a9b7025) --- sys/compat/linuxkpi/common/src/linux_80211.c | 10 ++++------ sys/net80211/_ieee80211.h | 5 +++-- sys/net80211/ieee80211_crypto.c | 7 ++++--- sys/net80211/ieee80211_crypto_ccmp.c | 11 +++-------- sys/net80211/ieee80211_crypto_tkip.c | 2 +- 5 files changed, 15 insertions(+), 20 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 88bbc9fa52a7..9c3ca961d6be 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -6224,14 +6224,12 @@ lkpi_convert_rx_status(struct ieee80211_hw *hw, } if (rx_status->flag & RX_FLAG_MMIC_STRIPPED) rx_stats->c_pktflags |= IEEE80211_RX_F_MMIC_STRIP; - if (rx_status->flag & RX_FLAG_MIC_STRIPPED) { - /* net80211 re-uses M[ichael]MIC for MIC too. Confusing. */ - rx_stats->c_pktflags |= IEEE80211_RX_F_MMIC_STRIP; - } + if (rx_status->flag & RX_FLAG_MMIC_ERROR) + rx_stats->c_pktflags |= IEEE80211_RX_F_FAIL_MMIC; + if (rx_status->flag & RX_FLAG_MIC_STRIPPED) + rx_stats->c_pktflags |= IEEE80211_RX_F_MIC_STRIP; if (rx_status->flag & RX_FLAG_IV_STRIPPED) rx_stats->c_pktflags |= IEEE80211_RX_F_IV_STRIP; - if (rx_status->flag & RX_FLAG_MMIC_ERROR) - rx_stats->c_pktflags |= IEEE80211_RX_F_FAIL_MIC; if (rx_status->flag & RX_FLAG_FAILED_FCS_CRC) rx_stats->c_pktflags |= IEEE80211_RX_F_FAIL_FCSCRC; #endif diff --git a/sys/net80211/_ieee80211.h b/sys/net80211/_ieee80211.h index 8b86cd612168..798dde6fe08a 100644 --- a/sys/net80211/_ieee80211.h +++ b/sys/net80211/_ieee80211.h @@ -564,16 +564,17 @@ struct ieee80211_mimo_info { #define IEEE80211_RX_F_AMPDU 0x00000010 /* This is the start of an decap AMPDU list */ #define IEEE80211_RX_F_AMPDU_MORE 0x00000020 /* This is another decap AMPDU frame in the batch */ #define IEEE80211_RX_F_FAIL_FCSCRC 0x00000040 /* Failed CRC/FCS */ -#define IEEE80211_RX_F_FAIL_MIC 0x00000080 /* Failed MIC check */ +#define IEEE80211_RX_F_FAIL_MMIC 0x00000080 /* Failed Michael MIC (MMIC) check */ #define IEEE80211_RX_F_DECRYPTED 0x00000100 /* Hardware decrypted */ #define IEEE80211_RX_F_IV_STRIP 0x00000200 /* Decrypted; IV stripped */ -#define IEEE80211_RX_F_MMIC_STRIP 0x00000400 /* Decrypted; [Micheal] MIC ([M]MIC) stripped */ +#define IEEE80211_RX_F_MMIC_STRIP 0x00000400 /* Decrypted; Michael MIC (MMIC) stripped */ #define IEEE80211_RX_F_SHORTGI 0x00000800 /* This is a short-GI frame */ #define IEEE80211_RX_F_CCK 0x00001000 #define IEEE80211_RX_F_OFDM 0x00002000 #define IEEE80211_RX_F_HT 0x00004000 #define IEEE80211_RX_F_VHT 0x00008000 #define IEEE80211_RX_F_PN_VALIDATED 0x00010000 /* Decrypted; PN validated */ +#define IEEE80211_RX_F_MIC_STRIP 0x00020000 /* Decrypted; MIC stripped */ /* Channel width */ #define IEEE80211_RX_FW_20MHZ 1 diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index bdbe52720f6e..c5e0816bd43c 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -716,9 +716,9 @@ ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k, * Handle demic / mic errors from hardware-decrypted offload devices. */ if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_DECRYPTED)) { - if (rxs->c_pktflags & IEEE80211_RX_F_FAIL_MIC) { + if ((rxs->c_pktflags & IEEE80211_RX_F_FAIL_MMIC) != 0) { /* - * Hardware has said MIC failed. We don't care about + * Hardware has said MMIC failed. We don't care about * whether it was stripped or not. * * Eventually - teach the demic methods in crypto @@ -729,7 +729,8 @@ ieee80211_crypto_demic(struct ieee80211vap *vap, struct ieee80211_key *k, return (0); } - if (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP) { + if ((rxs->c_pktflags & + (IEEE80211_RX_F_MIC_STRIP|IEEE80211_RX_F_MMIC_STRIP)) != 0) { /* * Hardware has decrypted and not indicated a * MIC failure and has stripped the MIC. diff --git a/sys/net80211/ieee80211_crypto_ccmp.c b/sys/net80211/ieee80211_crypto_ccmp.c index 404996b1cbca..87730679c47f 100644 --- a/sys/net80211/ieee80211_crypto_ccmp.c +++ b/sys/net80211/ieee80211_crypto_ccmp.c @@ -295,11 +295,7 @@ finish: m_adj(m, ccmp.ic_header); } - /* - * XXX TODO: see if MMIC_STRIP also covers CCMP MIC trailer. - * Well no as it's a MIC not MMIC but we re-use the same flag for now. - */ - if ((rxs == NULL) || (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP) == 0) + if ((rxs == NULL) || (rxs->c_pktflags & IEEE80211_RX_F_MIC_STRIP) == 0) m_adj(m, -ccmp.ic_trailer); /* @@ -683,10 +679,9 @@ ccmp_decrypt(struct ieee80211_key *key, u_int64_t pn, struct mbuf *m, int hdrlen } /* - * If the MIC (we use MMIC despite not being Micheal) was stripped - * by HW/driver we are done. + * If the MIC was stripped by HW/driver we are done. */ - if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_MMIC_STRIP) != 0) + if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_MIC_STRIP) != 0) return (1); if (memcmp(mic, a, ccmp.ic_trailer) != 0) { diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c index d2bc281f15a2..4b5cf73e1065 100644 --- a/sys/net80211/ieee80211_crypto_tkip.c +++ b/sys/net80211/ieee80211_crypto_tkip.c @@ -394,7 +394,7 @@ tkip_demic(struct ieee80211_key *k, struct mbuf *m, int force) * directly notify as a michael failure to the upper * layers. */ - if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_FAIL_MIC)) { + if ((rxs != NULL) && (rxs->c_pktflags & IEEE80211_RX_F_FAIL_MMIC)) { struct ieee80211vap *vap = ctx->tc_vap; ieee80211_notify_michael_failure(vap, wh, k->wk_rxkeyix != IEEE80211_KEYIX_NONE ? From nobody Wed Mar 19 22:27:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:27:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 Thu Mar 20 00:36:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 03:13:57 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:07 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:08 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:10 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:09 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:17 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 03:14:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZJ9fM0c6sz5r9sG; Thu, 20 Mar 2025 03:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZJ9fL5S1gz3wc8; Thu, 20 Mar 2025 03:14:18 +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=gBJGBH6+s3h6hsquM19KgQRxOVLyfOG2xAc8Eeh2a9M=; b=PMwoO1nyQ6CwzlDvQ2aZKNziLcDDwX0/CJCSAAnuH4oZmumBLqtdHN1+RU8lqKf8kSoqi0 1IeMvqBWHRFcUif6JBNZ3U9gOPKp2pm2fuE1spmNv/DU6P+tAGv4k4LgrVz7BQ1RH96GAc 4FrxIEUYqNRVnv6iVPOeq27tiOFcZYk6/kvtcKvVC6qFnQMu97EtGWnCBrkLGYJoKHrjPn A9bZXHdSYyzcOp7Fg3X5248olW0IxZQCnYojKiGcQhlOyImltXdDc7JX2h+hQ/NrdIlU0g Rg5Tb7k42lRlu4C/N4zkWe+utpVIaJalFcP4RGx5pLeuYalnX5sWWwVnhLFksA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742440458; a=rsa-sha256; cv=none; b=uBP1fCVkmPRRhOHMbH6IT0ITnMM6wuZrYLpWz/cSVDuEAfQ6In7iSxzmQS0OUcQa/FGS0w huVt5Gym08XeCW5ztgjobTI34ZqT2Tb+4Ph8055Yx9HZJh9NBJxuJ4NprZEu97oW7fdn7u ANwfCZBos96hho+Xry3+LM3g5J5PZXv0/n4Ow46b9gStFgDyRrpo0JWgfJjxpcK/X4hLUF xM6ee4xtmJJ5fbfcrXA0SAF6NOZdaRJ3TPmsA9wu9G4gCIZBnCxldcFkuvQUN1pMbfGhfR 3mTPCGFz7V7Bn+uY+gFhEZODugXUIaeA9x7alkCE0rspEcpFGTPzht06UDirqw== 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=gBJGBH6+s3h6hsquM19KgQRxOVLyfOG2xAc8Eeh2a9M=; b=FGm6rgmxS58yfN5sDIbMIKz/bu/5dBfnoBGSWHPJkKU85z58oVmbucLbgd9yo3Xi97HX2L s1GJ8E65M51AzmZjsn9IBSox6lDbVw3XggcTkAFDJRSic5YzizZNwh4WdRuhyFJ8w/+zDJ LwNGYrIg59prg87eTcoEw0hpimU3iiJKDltnHHZ3HpHmGgHvM2q7W2eUbbCNvCdrxVdvkH YDgjFVaH4iJY+O1I4srycqjB2YNVZyivUUCmtV9LT+VfG2Zp1Zv9/Cll62j1CpLuzMT8Tp JHIpqOork4bj8wIeP16VoKFqSJyXhTbpTXCSHFIIrLHmwVbOauGDzRY/dRrUKg== 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 4ZJ9fL4yZhzpCT; Thu, 20 Mar 2025 03:14: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 52K3EIKW086666; Thu, 20 Mar 2025 03:14:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52K3EISo086663; Thu, 20 Mar 2025 03:14:18 GMT (envelope-from git) Date: Thu, 20 Mar 2025 03:14:18 GMT Message-Id: <202503200314.52K3EISo086663@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: 8025c3957bc6 - stable/14 - procstat.1: document rlimitusage List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8025c3957bc630545aab9786f76552fce6d15d00 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8025c3957bc630545aab9786f76552fce6d15d00 commit 8025c3957bc630545aab9786f76552fce6d15d00 Author: Konstantin Belousov AuthorDate: 2025-03-09 16:31:19 +0000 Commit: Konstantin Belousov CommitDate: 2025-03-20 03:13:39 +0000 procstat.1: document rlimitusage (cherry picked from commit 82897058342e9bfe7193283421055e3f07ac9b8f) --- usr.bin/procstat/procstat.1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1 index 96e8860b8213..c078b405d185 100644 --- a/usr.bin/procstat/procstat.1 +++ b/usr.bin/procstat/procstat.1 @@ -205,6 +205,8 @@ Display LWP info for the process pertaining to its signal driven exit. Display current working directory for the process. .It Ar rlimit | Fl l Display resource limits for the process. +.It Ar rlimitusage +Display the usage of the resource limits for the process. .It Ar rusage | Fl r Display resource usage information for the process. .Pp From nobody Thu Mar 20 03:14:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 04:27:01 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:19 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/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:27:18 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 10:19:05 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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:40:13 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 Sat Mar 22 00:28:27 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 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 Sun Mar 23 15:35:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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