From nobody Sat Sep 2 20:57:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RdRzz39kdz4sD1F; Sat, 2 Sep 2023 20:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RdRzz2cHWz4MLt; Sat, 2 Sep 2023 20:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693688255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jY+/T7fLBemyOFb2oqgfOfzF1kQOHKklJKrsX7Mg/RU=; b=Q/erAwDkJ7P2UR+bDVuPgRo8LHFGjBY0c3YnvF7KKFTY8NUGeENquzOex4wuZnQq6FTN5N Mgfc/P/NMw6fll8YkrEIYURxn/VVE4VXhgV3a6SNRuNKIEdvxCSiD081hI3pT4ZJQX374q 2cPtQTp9yfPHP36HmoAD6Yw6DkluP0ArZdZvA8KT3Ct7vSdvgcb5KlrDnV4A0nebAINYcK 6RxI3mFc1Gb39BFsLKsJ/eIUqQAVoIMzawvNQtBho3OAQZv/V4T8dKIoi1lXiBchbs+BjY hlZUQMI/psuw7/MlU1hkEOqmlL4wURp60Zw3os3oX+auc1Agm5m+qlwH5/C59w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693688255; a=rsa-sha256; cv=none; b=hOF2jFf7k7z/EW+aj9l7XoduN4mcICfEX4mhT80K6lHJQUm0qDp9FCAvFnZj8lGziKgiLH POGIhCjbfD5O1yzN3suhXDMkye3hccPKIugX/aWmr790/BaFxJ+0EKRqQh89021HWXypvG RJ90i54uKPzseGS0Mg7lkca/kN+sPEBge5qhwM6N86q1JfZHxylnlglcE5gCJ5CG4WRxfp l6G+2PXbktYs0Rbfbp8uK1Fn5yuixt2XuSlFicS9i59PB3nVfn0tZ06i6WfEXkW/dYK5uE zDXU4L5zy/IZFPCnDvS6hq6R2hrwjt6f/E6dBT8ROQ6GrY7Pl7K8v3luRdrAJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693688255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jY+/T7fLBemyOFb2oqgfOfzF1kQOHKklJKrsX7Mg/RU=; b=RRhNTMd3cMdzxwQicP+gJJH+HlBd0U8/LF8s4cLmQTvF4bE3BXqlyeTaw25BLVmc8FGbnD AUR9IJttms5XPgA/3+SJM5NJpeXuw1KklvXJp9wKmWqCfatMJ9nkmMRwLUZdiF+CqwyI+c 1aow7IUFKedcK37MVOHoZneRf7MY45jtLpOtvTD2NB+ZwLNMgTG27m5n8VQ4sf4jcCyUUe udW2DN5D/zha3GMILMUsxMPHLw+GGAtifWvQj/wIlBsWkV6MZfVM9nVvandaPXET/OEMBf 0PqAgmrFQqJnl8fTIub2COt3xFpvj0yyGzP95txBEz3XuL1VK999UeIQiUxn4Q== 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 4RdRzz1gbnzxVw; Sat, 2 Sep 2023 20:57:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 382KvZs8057020; Sat, 2 Sep 2023 20:57:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 382KvZ7N057017; Sat, 2 Sep 2023 20:57:35 GMT (envelope-from git) Date: Sat, 2 Sep 2023 20:57:35 GMT Message-Id: <202309022057.382KvZ7N057017@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: ac77837ca758 - main - dtsec(4): Restore IFCAP_JUMBO_MTU lost in IfAPI conversion List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac77837ca7583221f5ef2d63235fd19ac9c571f7 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=ac77837ca7583221f5ef2d63235fd19ac9c571f7 commit ac77837ca7583221f5ef2d63235fd19ac9c571f7 Author: Justin Hibbits AuthorDate: 2023-09-02 20:52:30 +0000 Commit: Justin Hibbits CommitDate: 2023-09-02 20:59:09 +0000 dtsec(4): Restore IFCAP_JUMBO_MTU lost in IfAPI conversion Also add IFCAP_VLAN_MTU, since it's supported. Fixes: 0083fc5c7 ("Mechanically convert dtsec(4) to IfAPI") MFC after: 1 week --- sys/dev/dpaa/if_dtsec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/dpaa/if_dtsec.c b/sys/dev/dpaa/if_dtsec.c index de5ca75c9a77..73272e1af79e 100644 --- a/sys/dev/dpaa/if_dtsec.c +++ b/sys/dev/dpaa/if_dtsec.c @@ -735,6 +735,7 @@ dtsec_attach(device_t dev) if_setsendqready(ifp); #endif + if_setcapabilities(ifp, IFCAP_JUMBO_MTU | IFCAP_VLAN_MTU); if_setcapenable(ifp, if_getcapabilities(ifp)); /* Attach PHY(s) */ From nobody Sun Sep 3 05:20:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rdg8101GGz4sSdm; Sun, 3 Sep 2023 05:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rdg806gnwz4ZRF; Sun, 3 Sep 2023 05:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693718416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q2z8uRC0s4Z64Bqhd1aorTZxSmkyDtC8AujhJlpEv5s=; b=u6okH+JVp8kOx03ed6E+tOKC6ppwAcAt9LepLjmGo2ZJ1dHQKuXAyg2vKTTZFM3I0Rjm60 BmupvEXC9DzLVYbLG2l2CPXRsgZjinOuA/PItdWtERdhFXJOrBoTxmonTPVjW9y4YIYUp7 2TPNXj80Z7OJMN1cXTo9SlQafQv0zXRdDU0PQ8WQbCgJ06kMGgpx+lriXMo5Wy7dDEjayS k3MRQRsBqWI0c4Tt4WSK03GVlD1seVV+Lx9qKGP/YjW/JgRAFv+PThLplD4t2KHqOe5lY6 jf4l9f0L3UhTxZMI9WrsE7Wn6ELBFiWcBWUbemg5GpbdAITpzmU0vVRizfoUaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693718416; a=rsa-sha256; cv=none; b=SPIa+5ozPRoWwBDT7pjPJ7iYbDmdsl4rGQ84498phUTat9jk0YwFKtfZpiIqWqHWerCV8F XCgjSWuKEYKfuejd2MbC5eZxFotzYj87+LLmzknNkWNexf/T/YhctRn5ifMYba4gzgNozW C2S/rFZuv1kixK/D7+xPgB8aGlCPLqo6kbXg+CG/qtckTl4YP7Td25j2qJDm+DRIbwzlmT pw2p3SfX7TbjWRkurzNa8g0zofO7Jh+CeGfQ6GKggfBxlgvM+WldgD/j6tWdtfh9622/2g VncMf+a4h8qsOLDq37TFSdyNLavyGelhFuDsprb65t841lMNnoITga9s5yNmBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693718416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q2z8uRC0s4Z64Bqhd1aorTZxSmkyDtC8AujhJlpEv5s=; b=HtDLNjyou0v7zaJJ3Kvb8qygcntz4TJ/GCp27tIqFGlSPkOipeJbK4FNQFoZo2URnXKhpq QED6wIiONyLfv3NAay/Sy2v4z8FgtLFc6WQ7RA+zAqNdhkJD/J4ghO7Kt8fWLHdUEFYcGS ERqytQxOOjYI/eStnczcGdmvzi9cT/lm95m7hkrW6dETBO9CeqIENlrphxwswdKNfMIuzq 1mqg5FPMW0lCQIMtul7YFYpvM3aD/FhHZBdmmvZHiZ/W06lTDMzG9qSV3NpmA1ybZcRTAn SBN5hU17CdV/7GEjum4mWAwcfvebgbBn6t3fwbsxj3GBOI4F5nSkO4ZNiPOekQ== 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 4Rdg805jBPz1BNV; Sun, 3 Sep 2023 05:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3835KGFJ092237; Sun, 3 Sep 2023 05:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3835KGYL092232; Sun, 3 Sep 2023 05:20:16 GMT (envelope-from git) Date: Sun, 3 Sep 2023 05:20:16 GMT Message-Id: <202309030520.3835KGYL092232@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: f920de9a0cbe - stable/13 - libc: fix history for strverscmp(3) and versionsort(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f920de9a0cbe611a6db6efa5d133dddea2df3a1b Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f920de9a0cbe611a6db6efa5d133dddea2df3a1b commit f920de9a0cbe611a6db6efa5d133dddea2df3a1b Author: Mina Galić AuthorDate: 2023-08-31 11:50:17 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-03 05:19:23 +0000 libc: fix history for strverscmp(3) and versionsort(3) PR: 273401 (cherry picked from commit 09ec5e67a7a6605e5a58a2e3e82dab243a90609a) --- lib/libc/gen/scandir.3 | 4 ++-- lib/libc/string/strverscmp.3 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3 index 024e9947e682..e6d1fb38c2b1 100644 --- a/lib/libc/gen/scandir.3 +++ b/lib/libc/gen/scandir.3 @@ -27,7 +27,7 @@ .\" .\" @(#)scandir.3 8.1 (Berkeley) 6/4/93 .\" -.Dd August 23, 2022 +.Dd August 31, 2023 .Dt SCANDIR 3 .Os .Sh NAME @@ -189,4 +189,4 @@ and .Fn versionsort functions were added in -.Fx 14.0 . +.Fx 13.2 . diff --git a/lib/libc/string/strverscmp.3 b/lib/libc/string/strverscmp.3 index e4413fb96e36..495e5c8780c1 100644 --- a/lib/libc/string/strverscmp.3 +++ b/lib/libc/string/strverscmp.3 @@ -1,6 +1,6 @@ .\" SPDX-License-Identifier: BSD-2-Clause .\" Copyright (c) 2022 Aymeric Wibo -.Dd July 11, 2022 +.Dd August 31, 2023 .Dt STRVERSCMP 3 .Os .Sh NAME @@ -53,4 +53,4 @@ function is a GNU extension and conforms to no standard. The .Fn strverscmp function was added in -.Fx 14.0 . +.Fx 13.2 . From nobody Sun Sep 3 05:22:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RdgBd1jC8z4rFTR; Sun, 3 Sep 2023 05:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RdgBc6VRPz4bGK; Sun, 3 Sep 2023 05:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693718552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DjEjJF820xtsjcMJEGVrhS61KpK7pStbq7wGRpEXZ4M=; b=mELV00SqcaLLpHCD8Qip/UZr1R7b1myDptEDe8nZzVuxMn3jsqwjHvYWUAuVKnXivrW5Nz zLfpYlYymChHR8St5jJoqRcOOC0uXFeIK9aXcanyWRQIdsD4735L0B7kJM8S9x6WtQOKhj KVU1jSfwYiUXuN+hOTIfQ5P3r+41VRmQkitLp1EcNKOQzZeYGWYDAMrplABQDJ/WTugNxZ KEEHewwHm4COI1vqFxQYNoYhbAvywgG/t2pWTBkhqESBcpvbgwxeQIiNic8kLvzjUSMD0e Bp3GZEwJMSyBf3cjCLGqeAKGj58Ryzs+JWuNR7gtm3nNMPI3HVBCOIzJwKYQXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693718552; a=rsa-sha256; cv=none; b=LsRNmmQZIoxj8MjS3JP7tX6gScDLFLEK9EGOn7OZxX6XwJp+a/vQb2evgxu0ZkomuawO3s womg9JKNz4gpVbimHwIigTzULiR+1MTCU2lFG13x7wlKeFZN/T4Co60kRUJgfl7dud2Aeq 8Ty51PsUgZcLovSNijiHX6i2LTmOVzYH2In6Zw+pWnIOzcctDTRJzwkWpJG9lzClNeYVrr i4DihM+FNowvwqfIfykO9AD0pN5LeYqYQ5/paDrychBFEFutpgpDH87ur1JGTXa4VMC2bW LgwVHcR5cAgReYI+3HXgmJemOWkbkCGmI/mv9/eWGJK5wtQgm0SBU3fO6tE9dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693718552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DjEjJF820xtsjcMJEGVrhS61KpK7pStbq7wGRpEXZ4M=; b=kHiTrpRgZ/ZQa9y8l7oYMFwezgE8XETY5ia+6ImAZttM9F65l0FVmOtJFdt2J/WPcxfYzG JD9FbvIcLWnQF2VIg9Pn/T5LItbkHIauzQBrHZlL3wnT+vn57Cgv4MsFD302sCIv8t1tR1 VzyYZ+lpk424+1GdFXVpW4xhlKOELK6NZEW5sY2u9E4wM5OrPXtsJeyFyXJ8d5s7qGTMBn YZcjfdZJwfd7SMA6V8y5jfGVH50Fzoyz+aMITPIMm/g6KXtad9zmddfe+ORzUxJD6FpjEP AeGwIWlclEaEXeVsdVjH/S7Yy9/Z5PVGp7yQ/8mDegrbW2k4UQQj0+rK67md5g== 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 4RdgBc5bPVz1C5y; Sun, 3 Sep 2023 05:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3835MWDF099985; Sun, 3 Sep 2023 05:22:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3835MWi8099982; Sun, 3 Sep 2023 05:22:32 GMT (envelope-from git) Date: Sun, 3 Sep 2023 05:22:32 GMT Message-Id: <202309030522.3835MWi8099982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ea70866bb15d - main - kern_kthread.c: some style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea70866bb15dd707c1a6a729c44e5ae611c83dd1 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ea70866bb15dd707c1a6a729c44e5ae611c83dd1 commit ea70866bb15dd707c1a6a729c44e5ae611c83dd1 Author: Konstantin Belousov AuthorDate: 2023-09-02 07:05:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-03 05:21:44 +0000 kern_kthread.c: some style Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41694 --- sys/kern/kern_kthread.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index bf481cafc72e..3604d63531da 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -63,7 +63,7 @@ kproc_start(const void *udata) int error; error = kproc_create((void (*)(void *))kp->func, NULL, - kp->global_procpp, 0, 0, "%s", kp->arg0); + kp->global_procpp, 0, 0, "%s", kp->arg0); if (error) panic("kproc_start: %s: error %d", kp->arg0, error); } @@ -97,8 +97,8 @@ kproc_create(void (*func)(void *), void *arg, fr.fr_pages = pages; fr.fr_procp = &p2; error = fork1(&thread0, &fr); - if (error) - return error; + if (error != 0) + return (error); /* save a global descriptor, if desired */ if (newpp != NULL) @@ -134,12 +134,12 @@ kproc_create(void (*func)(void *), void *arg, sched_user_prio(td, PUSER); /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) + if ((flags & RFSTOPPED) == 0) sched_add(td, SRQ_BORING); else thread_unlock(td); - return 0; + return (0); } void @@ -188,7 +188,8 @@ kproc_suspend(struct proc *p, int timo) } SIGADDSET(p->p_siglist, SIGSTOP); wakeup(p); - return msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, "suspkp", timo); + return (msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, + "suspkp", timo)); } int @@ -230,11 +231,11 @@ kproc_suspend_check(struct proc *p) void kthread_start(const void *udata) { - const struct kthread_desc *kp = udata; + const struct kthread_desc *kp = udata; int error; error = kthread_add((void (*)(void *))kp->func, NULL, - NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); + NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); if (error) panic("kthread_start: %s: error %d", kp->arg0, error); } @@ -313,13 +314,13 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, PMC_CALL_HOOK_UNLOCKED(td, PMC_FN_THR_CREATE_LOG, NULL); #endif /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) { + if ((flags & RFSTOPPED) == 0) { thread_lock(newtd); sched_add(newtd, SRQ_BORING); } if (newtdp) *newtdp = newtd; - return 0; + return (0); } void @@ -451,8 +452,8 @@ kthread_suspend_check(void) int kproc_kthread_add(void (*func)(void *), void *arg, - struct proc **procptr, struct thread **tdptr, - int flags, int pages, const char *procname, const char *fmt, ...) + struct proc **procptr, struct thread **tdptr, + int flags, int pages, const char *procname, const char *fmt, ...) { int error; va_list ap; @@ -461,7 +462,7 @@ kproc_kthread_add(void (*func)(void *), void *arg, if (*procptr == NULL) { error = kproc_create(func, arg, - procptr, flags, pages, "%s", procname); + procptr, flags, pages, "%s", procname); if (error) return (error); td = FIRST_THREAD_IN_PROC(*procptr); @@ -479,6 +480,6 @@ kproc_kthread_add(void (*func)(void *), void *arg, vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); error = kthread_add(func, arg, *procptr, - tdptr, flags, pages, "%s", buf); + tdptr, flags, pages, "%s", buf); return (error); } From nobody Sun Sep 3 05:22:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RdgBf2QGpz4rFY8; Sun, 3 Sep 2023 05:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RdgBf0Rrlz4bff; Sun, 3 Sep 2023 05:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693718554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbTopMa7VKH6zBADC+luHWBG96O0OgRxM2arc5RFLs4=; b=q1TmqciaXUPB+bBjLfaYLQLLQlxhU09fjfoVqSqZJ13e5xDzlnknA6WbjhEz5dcUrVdQVZ auxo1tZh3QxoK9xEAlijnTpqoXXqb5jGjTsnBsRD6/gpOV7jhLb9P1FMUZsvdEGNJNPmd3 flW3xqAijkhWIEIt0G02qJxaqNgJDhw+gSDdMgS/bZjEhb4EwY0PEwlNdbmAU+LDT2aFa/ BXj8j/Jy5dTGDLuKE8Pf26bkGDdebk24BF6TwZXcHGPFYnOuuQXRqBwhkLaf+JT4Oxkdj8 5LOnZDaW1oS+tB1jJ21eDxYd8xpsIdo7h2vVL97F/fnWF7j2nnsQzOOYuuRsAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693718554; a=rsa-sha256; cv=none; b=Ic8/wUAJ96AvBcmuA5xXEiOq22RRjJ4McC6ydIh5Sg10sREji78oEUvaOX5jh+zwbwyHHU 4K+ltuPhbRsO3SnDocxm3PT86vXU+1D/QSYHP0NTqc2baIkImCryPe3SGEWy7SDblmMgJq pKCeYTe7s9V2BEcdj4EZs9kUSUWBHyI3/zwc5PSX7FZyk0u/8iBo5kLoha1b07YNUIxpfF hsHhk8VLpoUWl4af9winDkdEQQiwYIOs/HjWLg9b+94JEi2Ua0Y5eiP1dSLeqvrL3ynDu5 EUBpLCSppKKDjPJMMNqgVSov+GzQxDHTu1N09Q5QYT6YhoOO+fkSLfVcMVfmcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693718554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CbTopMa7VKH6zBADC+luHWBG96O0OgRxM2arc5RFLs4=; b=Quyzv+s05BQpZSKcRu/wMbhjByIizV0nzdR7OERKXf84H+sfJp4eEpxKI+nkmqQtdIlU0z 9CCfnB+zYZ3kkLwyhhpNxd8V8/WeI91XglPs92AeI4KEN3tXqtOxdO4yEgOlg6xk/12QPV Dvm+AhGo2+8A2Q+AQBmcAHMUKScThsYiGdyTjAN/CdzQziUg/pHJYRo4DhC+pXuj46S2A8 BIJZRvrfpABTRHstrXonl2nitJNpGM0ATtY8jX7Rw4Tu2H3ZfnQOF32E6wlnJdGoDot3LS 99DJDMumj9rPXXGBSWVNo0Xdocd0kcYL2vZnALHfvxbarEF2bne/MJi20lZkNA== 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 4RdgBd6c3zz1BsD; Sun, 3 Sep 2023 05:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3835MXbM000058; Sun, 3 Sep 2023 05:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3835MX7T000055; Sun, 3 Sep 2023 05:22:33 GMT (envelope-from git) Date: Sun, 3 Sep 2023 05:22:33 GMT Message-Id: <202309030522.3835MX7T000055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 525bc87f54f2 - main - kern_kthread: fork1() does not handle locked Giant List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 525bc87f54f288793a95abbcd0a845efddb8c41b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=525bc87f54f288793a95abbcd0a845efddb8c41b commit 525bc87f54f288793a95abbcd0a845efddb8c41b Author: Konstantin Belousov AuthorDate: 2023-09-02 07:16:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-03 05:21:53 +0000 kern_kthread: fork1() does not handle locked Giant fork1() does not behave if called under Giant. For instance, it might need to call thread_suspend_check() which explicitly verifies that Giant is not locked. On the other hand, the kthread KPI is often called from SYSINIT() which is still Giant-locked. Correct this by dropping Giant in kthread_add() and kproc_create(). Reported by: pho Reviewed by: jhb Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41694 --- sys/kern/kern_kthread.c | 60 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 3604d63531da..5e32aea1f56d 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -78,13 +78,12 @@ kproc_start(const void *udata) * flags are flags to fork1 (in unistd.h) * fmt and following will be *printf'd into (*newpp)->p_comm (for ps, etc.). */ -int -kproc_create(void (*func)(void *), void *arg, - struct proc **newpp, int flags, int pages, const char *fmt, ...) +static int +kproc_create1(void (*func)(void *), void *arg, + struct proc **newpp, int flags, int pages, const char *tdname) { struct fork_req fr; int error; - va_list ap; struct thread *td; struct proc *p2; @@ -105,13 +104,9 @@ kproc_create(void (*func)(void *), void *arg, *newpp = p2; /* set up arg0 for 'ps', et al */ - va_start(ap, fmt); - vsnprintf(p2->p_comm, sizeof(p2->p_comm), fmt, ap); - va_end(ap); + strcpy(p2->p_comm, tdname); td = FIRST_THREAD_IN_PROC(p2); - va_start(ap, fmt); - vsnprintf(td->td_name, sizeof(td->td_name), fmt, ap); - va_end(ap); + strcpy(td->td_name, tdname); #ifdef KTR sched_clear_tdname(td); #endif @@ -142,6 +137,23 @@ kproc_create(void (*func)(void *), void *arg, return (0); } +int +kproc_create(void (*func)(void *), void *arg, + struct proc **newpp, int flags, int pages, const char *fmt, ...) +{ + va_list ap; + int error; + char tdname[MAXCOMLEN + 1]; + + va_start(ap, fmt); + vsnprintf(tdname, sizeof(tdname), fmt, ap); + va_end(ap); + DROP_GIANT(); + error = kproc_create1(func, arg, newpp, flags, pages, tdname); + PICKUP_GIANT(); + return (error); +} + void kproc_exit(int ecode) { @@ -250,11 +262,10 @@ kthread_start(const void *udata) * ** XXX fix this --> flags are flags to fork1 (in unistd.h) * fmt and following will be *printf'd into (*newtd)->td_name (for ps, etc.). */ -int -kthread_add(void (*func)(void *), void *arg, struct proc *p, - struct thread **newtdp, int flags, int pages, const char *fmt, ...) +static int +kthread_add1(void (*func)(void *), void *arg, struct proc *p, + struct thread **newtdp, int flags, int pages, const char *tdname) { - va_list ap; struct thread *newtd, *oldtd; if (!proc0.p_stats) @@ -278,9 +289,7 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, __rangeof(struct thread, td_startcopy, td_endcopy)); /* set up arg0 for 'ps', et al */ - va_start(ap, fmt); - vsnprintf(newtd->td_name, sizeof(newtd->td_name), fmt, ap); - va_end(ap); + strcpy(newtd->td_name, tdname); TSTHREAD(newtd, newtd->td_name); @@ -323,6 +332,23 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, return (0); } +int +kthread_add(void (*func)(void *), void *arg, struct proc *p, + struct thread **newtdp, int flags, int pages, const char *fmt, ...) +{ + va_list ap; + int error; + char tdname[MAXCOMLEN + 1]; + + va_start(ap, fmt); + vsnprintf(tdname, sizeof(tdname), fmt, ap); + va_end(ap); + DROP_GIANT(); + error = kthread_add1(func, arg, p, newtdp, flags, pages, tdname); + PICKUP_GIANT(); + return (error); +} + void kthread_exit(void) { From nobody Sun Sep 3 05:46:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rdgk207NDz4rMP8; Sun, 3 Sep 2023 05:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rdgk1717yz4fVv; Sun, 3 Sep 2023 05:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693719977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wuawzqHpJLdR1/rWePnjMevDiyTScuhaf0fgDScohl0=; b=YDFIWYu9yCKoUXTRHlNdEltBPPixhol5je0rurRF8sI4d30nZLd1L3uQ2HCzNGEmIZtlJI 8+jQVHqkScVJJfZg8WNyh2El1JLED+jX+QKzD7zFQplMMKFs8VQ0lzwoJiOzR0TLT95Px/ l1beF5iddFFsS4Te5ZJJCZq2rETnlhK8BIWWH0UP/fsQ+NWKQUgbOkvCwfCU/797kxD71s TuLY075BRAMl9rF8A5Dl9EccgANSNT0AouzLz+nuf17XO8Hl+Xh45dsmApkOgDO6cvGZig xeBZWM+kYAl0uXor+2pRre5LQZMBR5ByBNdrOQ7vJX9rok1iJmaHi+w30yNXUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693719977; a=rsa-sha256; cv=none; b=AXJK+7he4yWZY8U6KS6N0S/L7W6biEVIenaAu/ZwIh+YzZLRdZR9oXlK2hWEkPtuztwdmJ y8MCUr0A7OqYNGCTvWnNrWKyQwLz+Hz027fTTNpgUCSBepZThova6s5ujWxKv0i1gwt4Zv d5XyyNzqvlyhk+2BKGady3BnwHvh0L1LME1EU30GvMD7efzjygkGT78rBfTK8QwaKnjMWW ghrwGkLiGgs/YBi/6UClhBjIaeH01+lPIOzXjeUIwiicF+Lb+a9Jp0/Pc8kHIEYGbbZ0AO WCXbHFbejTae2xXdhSq2dIaKB34L55trbZoei6p6VrwaqsLMiFkdxgmj7Qy1Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693719977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wuawzqHpJLdR1/rWePnjMevDiyTScuhaf0fgDScohl0=; b=vA09vnLlPFDLPz68acdCCcSFGiH/cV3XIgzb3lYE3UzfgRtYOAzwcSONscaCicku+6la47 Z9cfxBMYsPqvSBT1AfFZ5YogSLbIFhRUvr3XAW+1hNHyDSg0Pw0eMQSrI8i2L1hRLeBPM7 KXzF5vGYgIPbF1/+f7B6sIZ4UkFxH3zYlHPJ/ZzIBaRXtahhap6czpFyVDkYjmdgO9EWZp rzGHyxWzvZBcfZaTDsBex7BTLN/CCMr8v8DTXPjf9PET3RfaQztsK9sErGBe68xcCx5uCS LMtd8LWi/jGqbQuSYGSzVvMzSGHHCRsP1eq+IlMp2M05BGoE5Mdk0pg4+S5UEA== 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 4Rdgk15jP1z1CKQ; Sun, 3 Sep 2023 05:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3835kH3h032934; Sun, 3 Sep 2023 05:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3835kHNt032930; Sun, 3 Sep 2023 05:46:17 GMT (envelope-from git) Date: Sun, 3 Sep 2023 05:46:17 GMT Message-Id: <202309030546.3835kHNt032930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 05e3998add1c - stable/13 - MFC: MFV: zlib 1.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05e3998add1c3c0cbe6a8b9162321481ce700459 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=05e3998add1c3c0cbe6a8b9162321481ce700459 commit 05e3998add1c3c0cbe6a8b9162321481ce700459 Author: Xin LI AuthorDate: 2023-08-20 06:06:49 +0000 Commit: Xin LI CommitDate: 2023-09-03 05:46:13 +0000 MFC: MFV: zlib 1.3 Relnotes: yes (cherry picked from commit 4717628ed859513a3262ea68259d0605f39de0b3) --- sys/contrib/zlib/ChangeLog | 20 +- sys/contrib/zlib/FAQ | 2 +- sys/contrib/zlib/README | 19 +- sys/contrib/zlib/adler32.c | 32 +-- sys/contrib/zlib/compress.c | 21 +- sys/contrib/zlib/crc32.c | 254 ++++++----------- sys/contrib/zlib/deflate.c | 569 ++++++++++++++++----------------------- sys/contrib/zlib/deflate.h | 16 +- sys/contrib/zlib/gzclose.c | 4 +- sys/contrib/zlib/gzguts.h | 23 +- sys/contrib/zlib/gzlib.c | 103 ++----- sys/contrib/zlib/gzread.c | 90 ++----- sys/contrib/zlib/gzwrite.c | 86 ++---- sys/contrib/zlib/infback.c | 30 +-- sys/contrib/zlib/inffast.c | 5 +- sys/contrib/zlib/inffast.h | 2 +- sys/contrib/zlib/inflate.c | 129 +++------ sys/contrib/zlib/inftrees.c | 17 +- sys/contrib/zlib/inftrees.h | 6 +- sys/contrib/zlib/test/example.c | 103 ++----- sys/contrib/zlib/test/infcover.c | 5 +- sys/contrib/zlib/test/minigzip.c | 172 ++++-------- sys/contrib/zlib/trees.c | 526 +++++++++++++++--------------------- sys/contrib/zlib/uncompr.c | 16 +- sys/contrib/zlib/zconf.h | 10 +- sys/contrib/zlib/zconf.h.in | 8 +- sys/contrib/zlib/zlib.3 | 6 +- sys/contrib/zlib/zlib.h | 377 +++++++++++++------------- sys/contrib/zlib/zutil.c | 60 ++--- sys/contrib/zlib/zutil.h | 20 +- 30 files changed, 1024 insertions(+), 1707 deletions(-) diff --git a/sys/contrib/zlib/ChangeLog b/sys/contrib/zlib/ChangeLog index 457526bc6a51..8707988ac18c 100644 --- a/sys/contrib/zlib/ChangeLog +++ b/sys/contrib/zlib/ChangeLog @@ -1,6 +1,24 @@ ChangeLog file for zlib +Changes in 1.3 (18 Aug 2023) +- Remove K&R function definitions and zlib2ansi +- Fix bug in deflateBound() for level 0 and memLevel 9 +- Fix bug when gzungetc() is used immediately after gzopen() +- Fix bug when using gzflush() with a very small buffer +- Fix crash when gzsetparams() attempted for transparent write +- Fix test/example.c to work with FORCE_STORED +- Rewrite of zran in examples (see zran.c version history) +- Fix minizip to allow it to open an empty zip file +- Fix reading disk number start on zip64 files in minizip +- Fix logic error in minizip argument processing +- Add minizip testing to Makefile +- Read multiple bytes instead of byte-by-byte in minizip unzip.c +- Add memory sanitizer to configure (--memory) +- Various portability improvements +- Various documentation improvements +- Various spelling and typo corrections + Changes in 1.2.13 (13 Oct 2022) - Fix configure issue that discarded provided CC definition - Correct incorrect inputs provided to the CRC functions @@ -1445,7 +1463,7 @@ Changes in 0.99 (27 Jan 96) - fix typo in Make_vms.com (f$trnlnm -> f$getsyi) - in fcalloc, normalize pointer if size > 65520 bytes - don't use special fcalloc for 32 bit Borland C++ -- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc... +- use STDC instead of __GO32__ to avoid redeclaring exit, calloc, etc. - use Z_BINARY instead of BINARY - document that gzclose after gzdopen will close the file - allow "a" as mode in gzopen diff --git a/sys/contrib/zlib/FAQ b/sys/contrib/zlib/FAQ index 99b7cf92e454..55f1cdc22f6b 100644 --- a/sys/contrib/zlib/FAQ +++ b/sys/contrib/zlib/FAQ @@ -4,7 +4,7 @@ If your question is not there, please check the zlib home page http://zlib.net/ which may have more recent information. -The lastest zlib FAQ is at http://zlib.net/zlib_faq.html +The latest zlib FAQ is at http://zlib.net/zlib_faq.html 1. Is zlib Y2K-compliant? diff --git a/sys/contrib/zlib/README b/sys/contrib/zlib/README index ba34d1894a9b..e02fc5aa206b 100644 --- a/sys/contrib/zlib/README +++ b/sys/contrib/zlib/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.13 is a general purpose data compression library. All the code is +zlib 1.3 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and @@ -29,18 +29,17 @@ PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help. Mark Nelson wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available at -http://marknelson.us/1997/01/01/zlib-engine/ . +https://marknelson.us/posts/1997/01/01/zlib-engine.html . -The changes made in version 1.2.13 are documented in the file ChangeLog. +The changes made in version 1.3 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . -zlib is available in Java using the java.util.zip package, documented at -http://java.sun.com/developer/technicalArticles/Programming/compression/ . +zlib is available in Java using the java.util.zip package. Follow the API +Documentation link at: https://docs.oracle.com/search/?q=java.util.zip . -A Perl interface to zlib written by Paul Marquess is available -at CPAN (Comprehensive Perl Archive Network) sites, including -http://search.cpan.org/~pmqs/IO-Compress-Zlib/ . +A Perl interface to zlib and bzip2 written by Paul Marquess +can be found at https://github.com/pmqs/IO-Compress . A Python interface to zlib written by A.M. Kuchling is available in Python 1.5 and later versions, see @@ -64,7 +63,7 @@ Notes for some targets: - zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works when compiled with cc. -- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is +- On Digital Unix 4.0D (formerly OSF/1) on AlphaServer, the cc option -std1 is necessary to get gzprintf working correctly. This is done by configure. - zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with @@ -84,7 +83,7 @@ Acknowledgments: Copyright notice: - (C) 1995-2022 Jean-loup Gailly and Mark Adler + (C) 1995-2023 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/sys/contrib/zlib/adler32.c b/sys/contrib/zlib/adler32.c index d0be4380a39c..04b81d29bad1 100644 --- a/sys/contrib/zlib/adler32.c +++ b/sys/contrib/zlib/adler32.c @@ -7,8 +7,6 @@ #include "zutil.h" -local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); - #define BASE 65521U /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -60,11 +58,7 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #endif /* ========================================================================= */ -uLong ZEXPORT adler32_z(adler, buf, len) - uLong adler; - const Bytef *buf; - z_size_t len; -{ +uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) { unsigned long sum2; unsigned n; @@ -131,20 +125,12 @@ uLong ZEXPORT adler32_z(adler, buf, len) } /* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -{ +uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len) { return adler32_z(adler, buf, len); } /* ========================================================================= */ -local uLong adler32_combine_(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ +local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2) { unsigned long sum1; unsigned long sum2; unsigned rem; @@ -169,18 +155,10 @@ local uLong adler32_combine_(adler1, adler2, len2) } /* ========================================================================= */ -uLong ZEXPORT adler32_combine(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off_t len2; -{ +uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) { return adler32_combine_(adler1, adler2, len2); } -uLong ZEXPORT adler32_combine64(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ +uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) { return adler32_combine_(adler1, adler2, len2); } diff --git a/sys/contrib/zlib/compress.c b/sys/contrib/zlib/compress.c index 2ad5326c14ec..f43bacf7ab97 100644 --- a/sys/contrib/zlib/compress.c +++ b/sys/contrib/zlib/compress.c @@ -19,13 +19,8 @@ memory, Z_BUF_ERROR if there was not enough room in the output buffer, Z_STREAM_ERROR if the level parameter is invalid. */ -int ZEXPORT compress2(dest, destLen, source, sourceLen, level) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; - int level; -{ +int ZEXPORT compress2(Bytef *dest, uLongf *destLen, const Bytef *source, + uLong sourceLen, int level) { z_stream stream; int err; const uInt max = (uInt)-1; @@ -65,12 +60,8 @@ int ZEXPORT compress2(dest, destLen, source, sourceLen, level) /* =========================================================================== */ -int ZEXPORT compress(dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; -{ +int ZEXPORT compress(Bytef *dest, uLongf *destLen, const Bytef *source, + uLong sourceLen) { return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); } @@ -78,9 +69,7 @@ int ZEXPORT compress(dest, destLen, source, sourceLen) If the default memLevel or windowBits for deflateInit() is changed, then this function needs to be updated. */ -uLong ZEXPORT compressBound(sourceLen) - uLong sourceLen; -{ +uLong ZEXPORT compressBound(uLong sourceLen) { return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + (sourceLen >> 25) + 13; } diff --git a/sys/contrib/zlib/crc32.c b/sys/contrib/zlib/crc32.c index 7b0e60462dda..6c38f5c04c6a 100644 --- a/sys/contrib/zlib/crc32.c +++ b/sys/contrib/zlib/crc32.c @@ -103,19 +103,6 @@ # define ARMCRC32 #endif -/* Local functions. */ -local z_crc_t multmodp OF((z_crc_t a, z_crc_t b)); -local z_crc_t x2nmodp OF((z_off64_t n, unsigned k)); - -#if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE)) - local z_word_t byte_swap OF((z_word_t word)); -#endif - -#if defined(W) && !defined(ARMCRC32) - local z_crc_t crc_word OF((z_word_t data)); - local z_word_t crc_word_big OF((z_word_t data)); -#endif - #if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE)) /* Swap the bytes in a z_word_t to convert between little and big endian. Any @@ -123,11 +110,7 @@ local z_crc_t x2nmodp OF((z_off64_t n, unsigned k)); instruction, if one is available. This assumes that word_t is either 32 bits or 64 bits. */ -local z_word_t byte_swap OF((z_word_t word)); - -local z_word_t byte_swap(word) - z_word_t word; -{ +local z_word_t byte_swap(z_word_t word) { # if W == 8 return (word & 0xff00000000000000) >> 56 | @@ -148,24 +131,77 @@ local z_word_t byte_swap(word) } #endif +#ifdef DYNAMIC_CRC_TABLE +/* ========================================================================= + * Table of powers of x for combining CRC-32s, filled in by make_crc_table() + * below. + */ + local z_crc_t FAR x2n_table[32]; +#else +/* ========================================================================= + * Tables for byte-wise and braided CRC-32 calculations, and a table of powers + * of x for combining CRC-32s, all made by make_crc_table(). + */ +# include "crc32.h" +#endif + /* CRC polynomial. */ #define POLY 0xedb88320 /* p(x) reflected, with x^32 implied */ -#ifdef DYNAMIC_CRC_TABLE +/* + Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial, + reflected. For speed, this requires that a not be zero. + */ +local z_crc_t multmodp(z_crc_t a, z_crc_t b) { + z_crc_t m, p; + + m = (z_crc_t)1 << 31; + p = 0; + for (;;) { + if (a & m) { + p ^= b; + if ((a & (m - 1)) == 0) + break; + } + m >>= 1; + b = b & 1 ? (b >> 1) ^ POLY : b >> 1; + } + return p; +} + +/* + Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been + initialized. + */ +local z_crc_t x2nmodp(z_off64_t n, unsigned k) { + z_crc_t p; + + p = (z_crc_t)1 << 31; /* x^0 == 1 */ + while (n) { + if (n & 1) + p = multmodp(x2n_table[k & 31], p); + n >>= 1; + k++; + } + return p; +} +#ifdef DYNAMIC_CRC_TABLE +/* ========================================================================= + * Build the tables for byte-wise and braided CRC-32 calculations, and a table + * of powers of x for combining CRC-32s. + */ local z_crc_t FAR crc_table[256]; -local z_crc_t FAR x2n_table[32]; -local void make_crc_table OF((void)); #ifdef W local z_word_t FAR crc_big_table[256]; local z_crc_t FAR crc_braid_table[W][256]; local z_word_t FAR crc_braid_big_table[W][256]; - local void braid OF((z_crc_t [][256], z_word_t [][256], int, int)); + local void braid(z_crc_t [][256], z_word_t [][256], int, int); #endif #ifdef MAKECRCH - local void write_table OF((FILE *, const z_crc_t FAR *, int)); - local void write_table32hi OF((FILE *, const z_word_t FAR *, int)); - local void write_table64 OF((FILE *, const z_word_t FAR *, int)); + local void write_table(FILE *, const z_crc_t FAR *, int); + local void write_table32hi(FILE *, const z_word_t FAR *, int); + local void write_table64(FILE *, const z_word_t FAR *, int); #endif /* MAKECRCH */ /* @@ -178,7 +214,6 @@ local void make_crc_table OF((void)); /* Definition of once functionality. */ typedef struct once_s once_t; -local void once OF((once_t *, void (*)(void))); /* Check for the availability of atomics. */ #if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \ @@ -198,10 +233,7 @@ struct once_s { invoke once() at the same time. The state must be a once_t initialized with ONCE_INIT. */ -local void once(state, init) - once_t *state; - void (*init)(void); -{ +local void once(once_t *state, void (*init)(void)) { if (!atomic_load(&state->done)) { if (atomic_flag_test_and_set(&state->begun)) while (!atomic_load(&state->done)) @@ -224,10 +256,7 @@ struct once_s { /* Test and set. Alas, not atomic, but tries to minimize the period of vulnerability. */ -local int test_and_set OF((int volatile *)); -local int test_and_set(flag) - int volatile *flag; -{ +local int test_and_set(int volatile *flag) { int was; was = *flag; @@ -236,10 +265,7 @@ local int test_and_set(flag) } /* Run the provided init() function once. This is not thread-safe. */ -local void once(state, init) - once_t *state; - void (*init)(void); -{ +local void once(once_t *state, void (*init)(void)) { if (!state->done) { if (test_and_set(&state->begun)) while (!state->done) @@ -281,8 +307,7 @@ local once_t made = ONCE_INIT; combinations of CRC register values and incoming bytes. */ -local void make_crc_table() -{ +local void make_crc_table(void) { unsigned i, j, n; z_crc_t p; @@ -449,11 +474,7 @@ local void make_crc_table() Write the 32-bit values in table[0..k-1] to out, five per line in hexadecimal separated by commas. */ -local void write_table(out, table, k) - FILE *out; - const z_crc_t FAR *table; - int k; -{ +local void write_table(FILE *out, const z_crc_t FAR *table, int k) { int n; for (n = 0; n < k; n++) @@ -466,11 +487,7 @@ local void write_table(out, table, k) Write the high 32-bits of each value in table[0..k-1] to out, five per line in hexadecimal separated by commas. */ -local void write_table32hi(out, table, k) -FILE *out; -const z_word_t FAR *table; -int k; -{ +local void write_table32hi(FILE *out, const z_word_t FAR *table, int k) { int n; for (n = 0; n < k; n++) @@ -486,11 +503,7 @@ int k; bits. If not, then the type cast and format string can be adjusted accordingly. */ -local void write_table64(out, table, k) - FILE *out; - const z_word_t FAR *table; - int k; -{ +local void write_table64(FILE *out, const z_word_t FAR *table, int k) { int n; for (n = 0; n < k; n++) @@ -500,8 +513,7 @@ local void write_table64(out, table, k) } /* Actually do the deed. */ -int main() -{ +int main(void) { make_crc_table(); return 0; } @@ -513,12 +525,7 @@ int main() Generate the little and big-endian braid tables for the given n and z_word_t size w. Each array must have room for w blocks of 256 elements. */ -local void braid(ltl, big, n, w) - z_crc_t ltl[][256]; - z_word_t big[][256]; - int n; - int w; -{ +local void braid(z_crc_t ltl[][256], z_word_t big[][256], int n, int w) { int k; z_crc_t i, p, q; for (k = 0; k < w; k++) { @@ -533,69 +540,13 @@ local void braid(ltl, big, n, w) } #endif -#else /* !DYNAMIC_CRC_TABLE */ -/* ======================================================================== - * Tables for byte-wise and braided CRC-32 calculations, and a table of powers - * of x for combining CRC-32s, all made by make_crc_table(). - */ -#include "crc32.h" #endif /* DYNAMIC_CRC_TABLE */ -/* ======================================================================== - * Routines used for CRC calculation. Some are also required for the table - * generation above. - */ - -/* - Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial, - reflected. For speed, this requires that a not be zero. - */ -local z_crc_t multmodp(a, b) - z_crc_t a; - z_crc_t b; -{ - z_crc_t m, p; - - m = (z_crc_t)1 << 31; - p = 0; - for (;;) { - if (a & m) { - p ^= b; - if ((a & (m - 1)) == 0) - break; - } - m >>= 1; - b = b & 1 ? (b >> 1) ^ POLY : b >> 1; - } - return p; -} - -/* - Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been - initialized. - */ -local z_crc_t x2nmodp(n, k) - z_off64_t n; - unsigned k; -{ - z_crc_t p; - - p = (z_crc_t)1 << 31; /* x^0 == 1 */ - while (n) { - if (n & 1) - p = multmodp(x2n_table[k & 31], p); - n >>= 1; - k++; - } - return p; -} - /* ========================================================================= * This function can be used by asm versions of crc32(), and to force the * generation of the CRC tables in a threaded application. */ -const z_crc_t FAR * ZEXPORT get_crc_table() -{ +const z_crc_t FAR * ZEXPORT get_crc_table(void) { #ifdef DYNAMIC_CRC_TABLE once(&made, make_crc_table); #endif /* DYNAMIC_CRC_TABLE */ @@ -621,11 +572,8 @@ const z_crc_t FAR * ZEXPORT get_crc_table() #define Z_BATCH_ZEROS 0xa10d3d0c /* computed from Z_BATCH = 3990 */ #define Z_BATCH_MIN 800 /* fewest words in a final batch */ -unsigned long ZEXPORT crc32_z(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - z_size_t len; -{ +unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf, + z_size_t len) { z_crc_t val; z_word_t crc1, crc2; const z_word_t *word; @@ -725,22 +673,14 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) least-significant byte of the word as the first byte of data, without any pre or post conditioning. This is used to combine the CRCs of each braid. */ -local z_crc_t crc_word OF((z_word_t data)); - -local z_crc_t crc_word(data) - z_word_t data; -{ +local z_crc_t crc_word(z_word_t data) { int k; for (k = 0; k < W; k++) data = (data >> 8) ^ crc_table[data & 0xff]; return (z_crc_t)data; } -local z_word_t crc_word_big OF((z_word_t data)); - -local z_word_t crc_word_big(data) - z_word_t data; -{ +local z_word_t crc_word_big(z_word_t data) { int k; for (k = 0; k < W; k++) data = (data << 8) ^ @@ -751,11 +691,8 @@ local z_word_t crc_word_big(data) #endif /* ========================================================================= */ -unsigned long ZEXPORT crc32_z(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - z_size_t len; -{ +unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf, + z_size_t len) { /* Return initial CRC, if requested. */ if (buf == Z_NULL) return 0; @@ -787,8 +724,8 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) words = (z_word_t const *)buf; /* Do endian check at execution time instead of compile time, since ARM - processors can change the endianess at execution time. If the - compiler knows what the endianess will be, it can optimize out the + processors can change the endianness at execution time. If the + compiler knows what the endianness will be, it can optimize out the check and the unused branch. */ endian = 1; if (*(unsigned char *)&endian) { @@ -1075,20 +1012,13 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) #endif /* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - uInt len; -{ +unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf, + uInt len) { return crc32_z(crc, buf, len); } /* ========================================================================= */ -uLong ZEXPORT crc32_combine64(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off64_t len2; -{ +uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) { #ifdef DYNAMIC_CRC_TABLE once(&made, make_crc_table); #endif /* DYNAMIC_CRC_TABLE */ @@ -1096,18 +1026,12 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) } /* ========================================================================= */ -uLong ZEXPORT crc32_combine(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off_t len2; -{ +uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) { return crc32_combine64(crc1, crc2, (z_off64_t)len2); } /* ========================================================================= */ -uLong ZEXPORT crc32_combine_gen64(len2) - z_off64_t len2; -{ +uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) { #ifdef DYNAMIC_CRC_TABLE once(&made, make_crc_table); #endif /* DYNAMIC_CRC_TABLE */ @@ -1115,17 +1039,11 @@ uLong ZEXPORT crc32_combine_gen64(len2) } /* ========================================================================= */ -uLong ZEXPORT crc32_combine_gen(len2) - z_off_t len2; -{ +uLong ZEXPORT crc32_combine_gen(z_off_t len2) { return crc32_combine_gen64((z_off64_t)len2); } /* ========================================================================= */ -uLong ZEXPORT crc32_combine_op(crc1, crc2, op) - uLong crc1; - uLong crc2; - uLong op; -{ +uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op) { return multmodp(op, crc1) ^ (crc2 & 0xffffffff); } diff --git a/sys/contrib/zlib/deflate.c b/sys/contrib/zlib/deflate.c index cffe335093d6..06eb2c0f6de5 100644 --- a/sys/contrib/zlib/deflate.c +++ b/sys/contrib/zlib/deflate.c @@ -1,5 +1,5 @@ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2022 Jean-loup Gailly and Mark Adler + * Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.13 Copyright 1995-2022 Jean-loup Gailly and Mark Adler "; + " deflate 1.3 Copyright 1995-2023 Jean-loup Gailly and Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -60,9 +60,6 @@ const char deflate_copyright[] = copyright string in the executable of your product. */ -/* =========================================================================== - * Function prototypes. - */ typedef enum { need_more, /* block not completed, need more input or more output */ block_done, /* block flush performed */ @@ -70,29 +67,16 @@ typedef enum { finish_done /* finish done, accept no more input or output */ } block_state; -typedef block_state (*compress_func) OF((deflate_state *s, int flush)); +typedef block_state (*compress_func)(deflate_state *s, int flush); /* Compression function. Returns the block state after the call. */ -local int deflateStateCheck OF((z_streamp strm)); -local void slide_hash OF((deflate_state *s)); -local void fill_window OF((deflate_state *s)); -local block_state deflate_stored OF((deflate_state *s, int flush)); -local block_state deflate_fast OF((deflate_state *s, int flush)); +local block_state deflate_stored(deflate_state *s, int flush); +local block_state deflate_fast(deflate_state *s, int flush); #ifndef FASTEST -local block_state deflate_slow OF((deflate_state *s, int flush)); -#endif -local block_state deflate_rle OF((deflate_state *s, int flush)); -local block_state deflate_huff OF((deflate_state *s, int flush)); -local void lm_init OF((deflate_state *s)); -local void putShortMSB OF((deflate_state *s, uInt b)); -local void flush_pending OF((z_streamp strm)); -local unsigned read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); -local uInt longest_match OF((deflate_state *s, IPos cur_match)); - -#ifdef ZLIB_DEBUG -local void check_match OF((deflate_state *s, IPos start, IPos match, - int length)); +local block_state deflate_slow(deflate_state *s, int flush); #endif +local block_state deflate_rle(deflate_state *s, int flush); +local block_state deflate_huff(deflate_state *s, int flush); /* =========================================================================== * Local data @@ -195,9 +179,12 @@ local const config configuration_table[10] = { * bit values at the expense of memory usage). We slide even when level == 0 to * keep the hash table consistent if we switch back to level > 0 later. */ -local void slide_hash(s) - deflate_state *s; -{ +#if defined(__has_feature) +# if __has_feature(memory_sanitizer) + __attribute__((no_sanitize("memory"))) +# endif +#endif +local void slide_hash(deflate_state *s) { unsigned n, m; Posf *p; uInt wsize = s->w_size; @@ -221,30 +208,177 @@ local void slide_hash(s) #endif } +/* =========================================================================== + * Read a new buffer from the current input stream, update the adler32 + * and total number of bytes read. All deflate() input goes through + * this function so some applications may wish to modify it to avoid + * allocating a large strm->next_in buffer and copying from it. + * (See also flush_pending()). + */ +local unsigned read_buf(z_streamp strm, Bytef *buf, unsigned size) { + unsigned len = strm->avail_in; + + if (len > size) len = size; + if (len == 0) return 0; + + strm->avail_in -= len; + + zmemcpy(buf, strm->next_in, len); + if (strm->state->wrap == 1) { + strm->adler = adler32(strm->adler, buf, len); + } +#ifdef GZIP + else if (strm->state->wrap == 2) { + strm->adler = crc32(strm->adler, buf, len); + } +#endif + strm->next_in += len; + strm->total_in += len; + + return len; +} + +/* =========================================================================== + * Fill the window when the lookahead becomes insufficient. + * Updates strstart and lookahead. + * + * IN assertion: lookahead < MIN_LOOKAHEAD + * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD + * At least one byte has been read, or avail_in == 0; reads are + * performed for at least two bytes (required for the zip translate_eol + * option -- not supported here). + */ +local void fill_window(deflate_state *s) { + unsigned n; + unsigned more; /* Amount of free space at the end of the window. */ + uInt wsize = s->w_size; + + Assert(s->lookahead < MIN_LOOKAHEAD, "already enough lookahead"); + + do { + more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); + + /* Deal with !@#$% 64K limit: */ + if (sizeof(int) <= 2) { + if (more == 0 && s->strstart == 0 && s->lookahead == 0) { + more = wsize; + + } else if (more == (unsigned)(-1)) { + /* Very unlikely, but possible on 16 bit machine if + * strstart == 0 && lookahead == 1 (input done a byte at time) + */ + more--; + } + } + + /* If the window is almost full and there is insufficient lookahead, + * move the upper half to the lower one to make room in the upper half. + */ + if (s->strstart >= wsize + MAX_DIST(s)) { + + zmemcpy(s->window, s->window + wsize, (unsigned)wsize - more); + s->match_start -= wsize; + s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ + s->block_start -= (long) wsize; + if (s->insert > s->strstart) + s->insert = s->strstart; + slide_hash(s); + more += wsize; + } + if (s->strm->avail_in == 0) break; + + /* If there was no sliding: + * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && + * more == window_size - lookahead - strstart + * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) + * => more >= window_size - 2*WSIZE + 2 + * In the BIG_MEM or MMAP case (not yet supported), + * window_size == input_size + MIN_LOOKAHEAD && + * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. + * Otherwise, window_size == 2*WSIZE so more >= 2. + * If there was sliding, more >= WSIZE. So in all cases, more >= 2. + */ + Assert(more >= 2, "more < 2"); + + n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); + s->lookahead += n; + + /* Initialize the hash value now that we have some input: */ + if (s->lookahead + s->insert >= MIN_MATCH) { + uInt str = s->strstart - s->insert; + s->ins_h = s->window[str]; + UPDATE_HASH(s, s->ins_h, s->window[str + 1]); +#if MIN_MATCH != 3 + Call UPDATE_HASH() MIN_MATCH-3 more times +#endif + while (s->insert) { + UPDATE_HASH(s, s->ins_h, s->window[str + MIN_MATCH-1]); +#ifndef FASTEST + s->prev[str & s->w_mask] = s->head[s->ins_h]; +#endif + s->head[s->ins_h] = (Pos)str; + str++; + s->insert--; + if (s->lookahead + s->insert < MIN_MATCH) + break; + } + } + /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, + * but this is not important since only literal bytes will be emitted. + */ + + } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); + + /* If the WIN_INIT bytes after the end of the current data have never been + * written, then zero those bytes in order to avoid memory check reports of + * the use of uninitialized (or uninitialised as Julian writes) bytes by + * the longest match routines. Update the high water mark for the next + * time through here. WIN_INIT is set to MAX_MATCH since the longest match + * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. + */ + if (s->high_water < s->window_size) { + ulg curr = s->strstart + (ulg)(s->lookahead); + ulg init; + + if (s->high_water < curr) { + /* Previous high water mark below current data -- zero WIN_INIT + * bytes or up to end of window, whichever is less. + */ + init = s->window_size - curr; + if (init > WIN_INIT) + init = WIN_INIT; + zmemzero(s->window + curr, (unsigned)init); + s->high_water = curr + init; + } + else if (s->high_water < (ulg)curr + WIN_INIT) { + /* High water mark at or above current data, but below current data + * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up + * to end of window, whichever is less. + */ + init = (ulg)curr + WIN_INIT - s->high_water; + if (init > s->window_size - s->high_water) + init = s->window_size - s->high_water; + zmemzero(s->window + s->high_water, (unsigned)init); + s->high_water += init; + } + } + + Assert((ulg)s->strstart <= s->window_size - MIN_LOOKAHEAD, + "not enough room for search"); +} + /* ========================================================================= */ -int ZEXPORT deflateInit_(strm, level, version, stream_size) - z_streamp strm; - int level; - const char *version; - int stream_size; -{ +int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version, + int stream_size) { return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, version, stream_size); /* To do: ignore strm->next_in if we use it as window */ } /* ========================================================================= */ -int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - version, stream_size) - z_streamp strm; - int level; - int method; - int windowBits; - int memLevel; - int strategy; - const char *version; - int stream_size; -{ +int ZEXPORT deflateInit2_(z_streamp strm, int level, int method, + int windowBits, int memLevel, int strategy, + const char *version, int stream_size) { deflate_state *s; int wrap = 1; static const char my_version[] = ZLIB_VERSION; @@ -386,9 +520,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, *** 4247 LINES SKIPPED *** From nobody Sun Sep 3 07:17:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rdjlm2lbTz4rpk3; Sun, 3 Sep 2023 07:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rdjlm2S3bz3Ps9; Sun, 3 Sep 2023 07:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693725476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UPr1zcWfbHZuohkOPMRHfAGGKuSY2jm+X/BKGAtK6c=; b=PrJ/RlHmMML2MAZYUL3c0SXvAjSz7a0Bed3FoWTDrkDfw1YH9AxtOIab7fpkic5vKggX4t 9eU5gAWW3w2aFucXuVY9PrBwlJCcL/KLJ3a6lyzgyKhJ+cDTH4WtEVxtW3f6q85/Rct+FZ eE1aPI/FsrTXfiBLnY2HbF1fg/nWXKLeHBynh5PRCxwpVMaJ4dMmJbaqxSQnQM5C4QaZSP Ap2vDDOxgsvtJ+4NJNmQHDAFntgS96okuWaY8XxEEJkC8y85ra58PRcaugDSgEL/43Ozwf zEsiTVDU/AQL5VinLiomECktPoiUX3mV8PHZVLo7u9Irj95rlAtF0CA6wCkoQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693725476; a=rsa-sha256; cv=none; b=KP3cMPRlNj3SpHt8PjvGacXagt+1y8bFE5Qf/hhzD9ArgxdQH55GXmq6vrDrsZrB9alr9N /OqqwclFciXaXHknxz1ATAhhGaERoeBp+gsIjLnsc8bPZ+zc82mSpn9VPLa75BJ94zJRbR S+CdmcWw44eQmhOxzjEE4+OSTV87e05oQCFdk4v97nRGHVLcL9r7SVIqI6alDmtm0pdNN+ hpak4cryxy8dsdLaPSKaChruqFZQC++ybJP+x/OawamjC1f8v1tW+qJYHEIUP+UbM8Nltr vwVPsGWLunjQlDJ4M9FNg/ycPYLHrYg2gOWp4nC4/AXgSZ6vCL3xjFCSeC6vIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693725476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UPr1zcWfbHZuohkOPMRHfAGGKuSY2jm+X/BKGAtK6c=; b=dYC6mDSyEHYDA8RpAXijE2hDXSSELbRXvtjrHWS2MEmgGhNYMfkgyzRqa/PcmJ44g0cDFc iZxUn7T+SFA32QihZ8EpVxsJrx2+BQUJGLzh1CjB/DvQvbPtYVlra6lKqr2x7HtcsFbhJ1 5ebFLIYU0WbFAeUXJ2FZqS2Bcenaa+j06zy8ekxBfCZs2jo2+PBttFSOgm38Gx85RVtzMo RbAeKLnSLccVsYISCoexluUlMm2qlN/aVxsjRoRo0QA947w7rQMc7FuI5/MFxVUoWoqG0B yiT/QaHfnTEYFk8wVy8r79kwYDtscb5a0PWhKcKVAk6a6O71ONqhhc3l8tRH7A== 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 4Rdjlm1Q2vz1HW; Sun, 3 Sep 2023 07:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3837Huhj082669; Sun, 3 Sep 2023 07:17:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3837Hn2e082651; Sun, 3 Sep 2023 07:17:49 GMT (envelope-from git) Date: Sun, 3 Sep 2023 07:17:49 GMT Message-Id: <202309030717.3837Hn2e082651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: f789381671a3 - stable/14 - zfs: merge openzfs/zfs@32949f256 (zfs-2.2-release) into stable/14 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f789381671a3f97496d496d8f996a67eaa8b1a33 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f789381671a3f97496d496d8f996a67eaa8b1a33 commit f789381671a3f97496d496d8f996a67eaa8b1a33 Merge: 4c3f144478d4 32949f2560bf Author: Martin Matuska AuthorDate: 2023-09-02 19:50:10 +0000 Commit: Martin Matuska CommitDate: 2023-09-03 07:15:24 +0000 zfs: merge openzfs/zfs@32949f256 (zfs-2.2-release) into stable/14 Notable upstream pull request merges: #15024 Add missed DMU_PROJECTUSED_OBJECT prefetch #15029 Do not request data L1 buffers on scan prefetch #15036 FreeBSD: catch up to __FreeBSD_version 1400093 #15039 Fix raw receive with different indirect block size #15047 FreeBSD: Fix build on stable/13 after 1302506 #15049 Fix the ZFS checksum error histograms with larger record sizes #15052 Reduce bloat in ereport.fs.zfs.checksum events #15056 Avoid extra snprintf() in dsl_deadlist_merge() #15061 Ignore pool ashift property during vdev attachment #15063 Don't panic if setting vdev properties is unsupported for this vdev type #15067 spa_min_alloc should be GCD, not min #15071 Add explicit prefetches to bpobj_iterate() #15072 Adjust prefetch parameters #15079 set autotrim default to 'off' everywhere #15080 ZIL: Fix config lock deadlock #15088 metaslab: tuneable to better control force ganging #15096 Avoid waiting in dmu_sync_late_arrival() #15097 BRT should return EOPNOTSUPP #15103 Remove zl_issuer_lock from zil_suspend() #15107 Remove fastwrite mechanism #15113 libzfs: sendrecv: send_progress_thread: handle SIGINFO/SIGUSR1 #15122 ZIL: Second attempt to reduce scope of zl_issuer_lock #15129 zpool_vdev_remove() should handle EALREADY error return #15132 ZIL: Replay blocks without next block pointer #15148 zfs_clone_range should return descriptive error codes #15153 ZIL: Avoid dbuf_read() before dmu_sync() #15161 Make zoned/jailed zfsprops(7) make more sense #15172 copy_file_range: fix fallback when source create on same txg #15180 Update outdated assertion from zio_write_compress #15216 Relax error reporting in zpool import and zpool split #15227 ZIL: Tune some assertions #15228 ZIL: Revert zl_lock scope reduction #15233 ZIL: Change ZIOs issue order Obtained from: OpenZFS OpenZFS commit: 32949f2560bf35ec86dfa5d984514908e0eb3ecc Approved by: re (gjb) Makefile.inc1 | 5 +- ObsoleteFiles.inc | 3 + cddl/lib/libzfs/Makefile | 1 + cddl/lib/libzfs/Makefile.depend | 1 + lib/librt/Makefile | 1 + rescue/rescue/Makefile | 2 +- rescue/rescue/Makefile.depend | 1 + share/mk/src.libnames.mk | 2 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 77 ++- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 2 - sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c | 5 + sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 2 + .../openzfs/cmd/zed/zed.d/statechange-slot_off.sh | 64 ++ sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 5 + sys/contrib/openzfs/cmd/zpool/zpool_main.c | 34 +- sys/contrib/openzfs/cmd/ztest.c | 2 +- sys/contrib/openzfs/config/Shellcheck.am | 3 +- sys/contrib/openzfs/config/kernel-blkdev.m4 | 54 ++ .../config/kernel-vfs-extended-file_range.m4 | 50 ++ .../openzfs/config/kernel-vfs-file_range.m4 | 164 +++++ sys/contrib/openzfs/config/kernel.m4 | 12 + sys/contrib/openzfs/contrib/debian/changelog | 6 + .../contrib/debian/openzfs-zfs-test.install | 2 - .../contrib/debian/openzfs-zfsutils.install | 4 +- .../contrib/dracut/90zfs/zfs-env-bootfs.service.in | 11 +- .../dracut/90zfs/zfs-rollback-bootfs.service.in | 2 +- sys/contrib/openzfs/include/libzfs.h | 1 + .../openzfs/include/os/freebsd/spl/sys/vnode.h | 6 +- .../include/os/linux/kernel/linux/blkdev_compat.h | 10 + .../include/os/linux/kernel/linux/simd_x86.h | 19 +- .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 8 + .../openzfs/include/os/linux/spl/sys/types.h | 2 +- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 53 ++ sys/contrib/openzfs/include/sys/bpobj.h | 2 +- sys/contrib/openzfs/include/sys/brt.h | 1 + sys/contrib/openzfs/include/sys/dmu.h | 4 + sys/contrib/openzfs/include/sys/dmu_impl.h | 2 - sys/contrib/openzfs/include/sys/dmu_zfetch.h | 2 - sys/contrib/openzfs/include/sys/fm/fs/zfs.h | 4 - sys/contrib/openzfs/include/sys/metaslab.h | 3 - sys/contrib/openzfs/include/sys/metaslab_impl.h | 6 +- sys/contrib/openzfs/include/sys/spa_impl.h | 1 + sys/contrib/openzfs/include/sys/vdev_impl.h | 2 +- sys/contrib/openzfs/include/sys/zil_impl.h | 44 +- sys/contrib/openzfs/include/sys/zio.h | 1 - sys/contrib/openzfs/include/sys/zio_checksum.h | 2 - sys/contrib/openzfs/lib/libzfs/Makefile.am | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 4 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 6 + sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 95 ++- sys/contrib/openzfs/man/Makefile.am | 16 +- sys/contrib/openzfs/man/man4/zfs.4 | 10 +- sys/contrib/openzfs/man/man7/zfsprops.7 | 16 +- sys/contrib/openzfs/man/man8/zfs-send.8 | 18 +- sys/contrib/openzfs/man/man8/zpool-events.8 | 23 +- sys/contrib/openzfs/man/man8/zpool.8 | 58 +- sys/contrib/openzfs/module/Kbuild.in | 1 + .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 6 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 26 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 7 + .../openzfs/module/os/linux/zfs/zfs_znode.c | 8 + sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 29 +- .../openzfs/module/os/linux/zfs/zpl_file_range.c | 272 ++++++++ .../openzfs/module/os/linux/zfs/zpl_super.c | 39 +- sys/contrib/openzfs/module/zfs/bpobj.c | 49 +- sys/contrib/openzfs/module/zfs/brt.c | 43 +- sys/contrib/openzfs/module/zfs/dbuf.c | 11 +- sys/contrib/openzfs/module/zfs/dmu.c | 24 +- sys/contrib/openzfs/module/zfs/dmu_recv.c | 22 +- sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 12 +- sys/contrib/openzfs/module/zfs/dnode.c | 31 +- sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 6 +- sys/contrib/openzfs/module/zfs/dsl_scan.c | 17 +- sys/contrib/openzfs/module/zfs/metaslab.c | 83 +-- sys/contrib/openzfs/module/zfs/spa_misc.c | 1 + sys/contrib/openzfs/module/zfs/vdev.c | 90 ++- sys/contrib/openzfs/module/zfs/vdev_indirect.c | 2 +- sys/contrib/openzfs/module/zfs/vdev_raidz.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_fm.c | 33 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 46 +- sys/contrib/openzfs/module/zfs/zil.c | 764 +++++++++------------ sys/contrib/openzfs/module/zfs/zio.c | 45 +- sys/contrib/openzfs/module/zfs/zio_checksum.c | 2 - sys/contrib/openzfs/module/zfs/zvol.c | 6 +- sys/contrib/openzfs/tests/runfiles/linux.run | 11 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 18 + sys/contrib/openzfs/tests/zfs-tests/cmd/.gitignore | 1 + .../openzfs/tests/zfs-tests/cmd/Makefile.am | 1 + .../openzfs/tests/zfs-tests/cmd/clonefile.c | 333 +++++++++ sys/contrib/openzfs/tests/zfs-tests/cmd/readmmap.c | 1 + .../openzfs/tests/zfs-tests/include/commands.cfg | 1 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 14 + .../functional/block_cloning/block_cloning.kshlib | 54 ++ .../block_cloning/block_cloning_copyfilerange.ksh | 60 ++ .../block_cloning_copyfilerange_cross_dataset.ksh | 65 ++ .../block_cloning_copyfilerange_fallback.ksh | 86 +++ ...ock_cloning_copyfilerange_fallback_same_txg.ksh | 66 ++ .../block_cloning_copyfilerange_partial.ksh | 68 ++ .../block_cloning_disabled_copyfilerange.ksh | 60 ++ .../block_cloning_disabled_ficlone.ksh | 50 ++ .../block_cloning_disabled_ficlonerange.ksh | 50 ++ .../block_cloning/block_cloning_ficlone.ksh | 56 ++ .../block_cloning/block_cloning_ficlonerange.ksh | 56 ++ .../block_cloning_ficlonerange_partial.ksh | 64 ++ .../tests/functional/block_cloning/cleanup.ksh | 34 + .../tests/functional/block_cloning/setup.ksh | 36 + .../cli_root/zpool_attach/attach-o_ashift.ksh | 30 +- .../cli_root/zpool_replace/replace-o_ashift.ksh | 32 +- .../cli_root/zpool_replace/replace_prop_ashift.ksh | 24 +- sys/modules/zfs/zfs_config.h | 30 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 112 files changed, 3024 insertions(+), 896 deletions(-) diff --cc Makefile.inc1 index 8838d31c795a,000000000000..f740cc5abcca mode 100644,000000..100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@@ -1,3692 -1,0 +1,3695 @@@ +# +# +# Make command line options: +# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir +# -DNO_CLEAN do not clean at all +# -DDB_FROM_SRC use the user/group databases in src/etc instead of +# the system database when installing. +# -DNO_SHARE do not go into share subdir +# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,OBJ} +# -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel +# -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel +# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel +# -DNO_ROOT install without using root privilege +# -DWITHOUT_CTF do not run the DTrace CTF conversion tools on built objects +# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list +# LOCAL_ITOOLS="list of tools" to add additional tools to the ITOOLS list +# LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target +# LOCAL_MTREE="list of mtree files" to process to allow local directories +# to be created before files are installed +# LOCAL_LEGACY_DIRS="list of dirs" to add additional dirs to the legacy +# target +# LOCAL_BSTOOL_DIRS="list of dirs" to add additional dirs to the +# bootstrap-tools target +# LOCAL_TOOL_DIRS="list of dirs" to add additional dirs to the build-tools +# target +# LOCAL_XTOOL_DIRS="list of dirs" to add additional dirs to the +# cross-tools target +# METALOG="path to metadata log" to write permission and ownership +# when NO_ROOT is set. (default: ${DESTDIR}/${DISTDIR}/METALOG, +# check /etc/make.conf for DISTDIR) +# TARGET="machine" to crossbuild world for a different machine type +# TARGET_ARCH= may be required when a TARGET supports multiple endians +# BUILDENV_SHELL= shell to launch for the buildenv target (def:${SHELL}) +# WORLD_FLAGS= additional flags to pass to make(1) during buildworld +# KERNEL_FLAGS= additional flags to pass to make(1) during buildkernel +# SUBDIR_OVERRIDE="list of dirs" to build rather than everything. +# All libraries and includes, and some build tools will still build. + +# +# The intended user-driven targets are: +# buildworld - rebuild *everything*, including glue to help do upgrades +# installworld- install everything built by "buildworld" +# checkworld - run test suite on installed world +# doxygen - build API documentation of the kernel +# +# Standard targets (not defined here) are documented in the makefiles in +# /usr/share/mk. These include: +# obj depend all install clean cleandepend cleanobj + +.if !defined(TARGET) || !defined(TARGET_ARCH) +.error Both TARGET and TARGET_ARCH must be defined. +.endif + +.if make(showconfig) || make(test-system-*) +_MKSHOWCONFIG= t +.endif + +SRCDIR?= ${.CURDIR} +LOCALBASE?= /usr/local +TIME_ENV ?= time env + +.include "share/mk/src.tools.mk" + +# Cross toolchain changes must be in effect before bsd.compiler.mk +# so that gets the right CC, and pass CROSS_TOOLCHAIN to submakes. +.if defined(CROSS_TOOLCHAIN) +.if exists(${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk) +.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk" +.elif exists(${CROSS_TOOLCHAIN}) +.include "${CROSS_TOOLCHAIN}" +.else +.error CROSS_TOOLCHAIN ${CROSS_TOOLCHAIN} not found +.endif +CROSSENV+=CROSS_TOOLCHAIN="${CROSS_TOOLCHAIN}" +.elif defined(UNIVERSE_TOOLCHAIN) +UNIVERSE_TOOLCHAIN_PATH?=${HOST_OBJTOP}/tmp/usr/bin +XCC?="${UNIVERSE_TOOLCHAIN_PATH}/cc" +XCXX?="${UNIVERSE_TOOLCHAIN_PATH}/c++" +XCPP?="${UNIVERSE_TOOLCHAIN_PATH}/cpp" +XLD?="${UNIVERSE_TOOLCHAIN_PATH}/ld" +.endif +.if defined(CROSS_TOOLCHAIN_PREFIX) +CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} +.endif + +XCOMPILERS= CC CXX CPP +.for COMPILER in ${XCOMPILERS} +.if defined(CROSS_COMPILER_PREFIX) +X${COMPILER}?= ${CROSS_COMPILER_PREFIX}${${COMPILER}} +.else +X${COMPILER}?= ${${COMPILER}} +.endif +.endfor +# If a full path to an external cross compiler is given, don't build +# a cross compiler. +.if ${XCC:N${CCACHE_BIN}:M/*} +MK_CLANG_BOOTSTRAP= no +# Make sure sub-makes see the option as disabled so the hack in bsd.sys.mk to +# work around incompatible headers in Clang's resource directory is enabled. +.MAKEOVERRIDES+= MK_CLANG_BOOTSTRAP +.endif + +# Pull in compiler metadata from buildworld/toolchain if possible to avoid +# running CC from bsd.compiler.mk. +.if make(installworld) || make(install) || make(distributeworld) || \ + make(stageworld) +.-include "${OBJTOP}/toolchain-metadata.mk" +.if !defined(_LOADED_TOOLCHAIN_METADATA) +.error A build is required first. You may have the wrong MAKEOBJDIRPREFIX set. +.endif +.endif + +# Pull in COMPILER_TYPE and COMPILER_FREEBSD_VERSION early. Pull it from the +# tree to be friendlier to foreign OS builds. It's safe to do so unconditionally +# here since we will always have the right make, unlike in src/Makefile +# Don't include bsd.linker.mk yet until XBINUTILS is handled (after src.opts.mk) +_NO_INCLUDE_LINKERMK= t +# We also want the X_COMPILER* variables if we are using an external toolchain. +_WANT_TOOLCHAIN_CROSS_VARS= t +.include "share/mk/bsd.compiler.mk" +.undef _NO_INCLUDE_LINKERMK +.undef _WANT_TOOLCHAIN_CROSS_VARS +# src.opts.mk depends on COMPILER_FEATURES +.include "share/mk/src.opts.mk" + +.if ${TARGET} == ${MACHINE} +TARGET_CPUTYPE?=${CPUTYPE} +.else +TARGET_CPUTYPE?= +.endif +.if !empty(TARGET_CPUTYPE) +_TARGET_CPUTYPE=${TARGET_CPUTYPE} +.else +_TARGET_CPUTYPE=dummy +.endif +.if ${TARGET} == "arm" +.if ${TARGET_CPUTYPE:M*soft*} == "" +TARGET_TRIPLE_ABI= gnueabihf +.else +TARGET_TRIPLE_ABI= gnueabi +.endif +.endif +MACHINE_TRIPLE_ABI?= unknown +MACHINE_TRIPLE?=${MACHINE_ARCH:S/amd64/x86_64/}-${MACHINE_TRIPLE_ABI}-freebsd${OS_REVISION} +TARGET_TRIPLE_ABI?= unknown +TARGET_TRIPLE?= ${TARGET_ARCH:S/amd64/x86_64/}-${TARGET_TRIPLE_ABI}-freebsd${OS_REVISION} +KNOWN_ARCHES?= aarch64/arm64 \ + amd64 \ + armv6/arm \ + armv7/arm \ + i386 \ + powerpc \ + powerpc64/powerpc \ + powerpc64le/powerpc \ + powerpcspe/powerpc \ + riscv64/riscv + +.if ${TARGET} == ${TARGET_ARCH} +_t= ${TARGET} +.else +_t= ${TARGET_ARCH}/${TARGET} +.endif +.for _t in ${_t} +.if empty(KNOWN_ARCHES:M${_t}) +.error Unknown target ${TARGET_ARCH}:${TARGET}. +.endif +.endfor + +.if ${TARGET_ARCH} == "amd64" +LIBCOMPAT_INCLUDE_DIRS+= i386 +.elif ${TARGET_ARCH} == "aarch64" +LIBCOMPAT_INCLUDE_DIRS+= arm +.endif + +.if ${.MAKE.OS} != "FreeBSD" +CROSSBUILD_HOST=${.MAKE.OS} +.if ${.MAKE.OS} != "Linux" && ${.MAKE.OS} != "Darwin" +.warning Unsupported crossbuild system: ${.MAKE.OS}. Build will probably fail! +.endif +# We need to force NO_ROOT/DB_FROM_SRC builds when building on other operating +# systems since the BSD.foo.dist specs contain users and groups that do not +# exist by default on a Linux/MacOS system. +NO_ROOT:= 1 +DB_FROM_SRC:= 1 +.export NO_ROOT +.endif + +# If all targets are disabled for system llvm then don't expect it to work +# for cross-builds. +.if !defined(TOOLS_PREFIX) && ${MK_LLVM_TARGET_ALL} == "no" && \ + ${MACHINE} != ${TARGET} && ${MACHINE_ARCH} != ${TARGET_ARCH} && \ + !make(showconfig) +MK_SYSTEM_COMPILER= no +MK_SYSTEM_LINKER= no +.endif + +# Handle external binutils. +.if defined(CROSS_TOOLCHAIN_PREFIX) +CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} +.endif +XBINUTILS= AS AR ELFCTL LD NM OBJCOPY RANLIB SIZE STRINGS STRIPBIN +.for BINUTIL in ${XBINUTILS} +.if defined(CROSS_BINUTILS_PREFIX) && \ + exists(${CROSS_BINUTILS_PREFIX}/${${BINUTIL}}) +X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX:C,/*$,,}/${${BINUTIL}} +.else +X${BINUTIL}?= ${${BINUTIL}} +.endif +.endfor + +# If a full path to an external linker is given, don't build lld. +.if ${XLD:M/*} +MK_LLD_BOOTSTRAP= no +.endif + +# We also want the X_LINKER* variables if we are using an external toolchain. +_WANT_TOOLCHAIN_CROSS_VARS= t +.include "share/mk/bsd.linker.mk" +.undef _WANT_TOOLCHAIN_CROSS_VARS + +# Begin WITH_SYSTEM_COMPILER / WITH_SYSTEM_LD + +# WITH_SYSTEM_COMPILER - Pull in needed values and make a decision. + +# Check if there is a local compiler that can satisfy as an external compiler. +# Which compiler is expected to be used? +.if ${MK_CLANG_BOOTSTRAP} == "yes" +WANT_COMPILER_TYPE= clang +.else +WANT_COMPILER_TYPE= +.endif + +.if !defined(WANT_COMPILER_FREEBSD_VERSION) && !make(showconfig) && \ + !make(test-system-linker) +.if ${WANT_COMPILER_TYPE} == "clang" +WANT_COMPILER_FREEBSD_VERSION_FILE= lib/clang/freebsd_cc_version.h +WANT_COMPILER_FREEBSD_VERSION!= \ + awk '$$2 == "FREEBSD_CC_VERSION" {printf("%d\n", $$3)}' \ + ${SRCDIR}/${WANT_COMPILER_FREEBSD_VERSION_FILE} || echo unknown +WANT_COMPILER_VERSION_FILE= lib/clang/include/clang/Basic/Version.inc +WANT_COMPILER_VERSION!= \ + awk '$$2 == "CLANG_VERSION" {split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \ + ${SRCDIR}/${WANT_COMPILER_VERSION_FILE} || echo unknown +.endif +.export WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_VERSION +.endif # !defined(WANT_COMPILER_FREEBSD_VERSION) + +# It needs to be the same revision as we would build for the bootstrap. +# If the expected vs CC is different then we can't skip. +# GCC cannot be used for cross-arch yet. For clang we pass -target later if +# TARGET_ARCH!=MACHINE_ARCH. +.if ${MK_SYSTEM_COMPILER} == "yes" && \ + defined(WANT_COMPILER_FREEBSD_VERSION) && \ + ${MK_CLANG_BOOTSTRAP} == "yes" && \ + !make(xdev*) && \ + ${X_COMPILER_TYPE} == ${WANT_COMPILER_TYPE} && \ + (${X_COMPILER_TYPE} == "clang" || ${TARGET_ARCH} == ${MACHINE_ARCH}) && \ + ${X_COMPILER_VERSION} == ${WANT_COMPILER_VERSION} && \ + ${X_COMPILER_FREEBSD_VERSION} == ${WANT_COMPILER_FREEBSD_VERSION} +# Everything matches, disable the bootstrap compiler. +MK_CLANG_BOOTSTRAP= no +USING_SYSTEM_COMPILER= yes +.endif # ${WANT_COMPILER_TYPE} == ${COMPILER_TYPE} + +# WITH_SYSTEM_LD - Pull in needed values and make a decision. + +# Check if there is a local linker that can satisfy as an external linker. +# Which linker is expected to be used? +.if ${MK_LLD_BOOTSTRAP} == "yes" +WANT_LINKER_TYPE= lld +.else +WANT_LINKER_TYPE= +.endif + +.if !defined(WANT_LINKER_FREEBSD_VERSION) && !make(showconfig) && \ + !make(test-system-compiler) +.if ${WANT_LINKER_TYPE} == "lld" +WANT_LINKER_FREEBSD_VERSION_FILE= lib/clang/include/lld/Common/Version.inc +WANT_LINKER_FREEBSD_VERSION!= \ + awk '$$2 == "LLD_FREEBSD_VERSION" {print $$3}' \ + ${SRCDIR}/${WANT_LINKER_FREEBSD_VERSION_FILE} || echo unknown +WANT_LINKER_VERSION_FILE= lib/clang/include/lld/Common/Version.inc +WANT_LINKER_VERSION!= \ + awk '$$2 == "LLD_VERSION_STRING" {gsub("\"", "", $$3); split($$3, a, "."); print a[1] * 10000 + a[2] * 100 + a[3]}' \ + ${SRCDIR}/${WANT_LINKER_VERSION_FILE} || echo unknown +.else +WANT_LINKER_FREEBSD_VERSION_FILE= +WANT_LINKER_FREEBSD_VERSION= +.endif +.export WANT_LINKER_FREEBSD_VERSION WANT_LINKER_VERSION +.endif # !defined(WANT_LINKER_FREEBSD_VERSION) + +.if ${MK_SYSTEM_LINKER} == "yes" && \ + defined(WANT_LINKER_FREEBSD_VERSION) && \ + (${MK_LLD_BOOTSTRAP} == "yes") && \ + !make(xdev*) && \ + ${X_LINKER_TYPE} == ${WANT_LINKER_TYPE} && \ + ${X_LINKER_VERSION} == ${WANT_LINKER_VERSION} && \ + ${X_LINKER_FREEBSD_VERSION} == ${WANT_LINKER_FREEBSD_VERSION} +# Everything matches, disable the bootstrap linker. +MK_LLD_BOOTSTRAP= no +USING_SYSTEM_LINKER= yes +.endif # ${WANT_LINKER_TYPE} == ${LINKER_TYPE} + +# WITH_SYSTEM_COMPILER / WITH_SYSTEM_LINKER - Handle defaults and debug. +USING_SYSTEM_COMPILER?= no +USING_SYSTEM_LINKER?= no + +TEST_SYSTEM_COMPILER_VARS= \ + USING_SYSTEM_COMPILER MK_SYSTEM_COMPILER \ + MK_CROSS_COMPILER MK_CLANG_BOOTSTRAP \ + WANT_COMPILER_TYPE WANT_COMPILER_VERSION WANT_COMPILER_VERSION_FILE \ + WANT_COMPILER_FREEBSD_VERSION WANT_COMPILER_FREEBSD_VERSION_FILE \ + CC COMPILER_TYPE COMPILER_FEATURES COMPILER_VERSION \ + COMPILER_FREEBSD_VERSION \ + XCC X_COMPILER_TYPE X_COMPILER_FEATURES X_COMPILER_VERSION \ + X_COMPILER_FREEBSD_VERSION +TEST_SYSTEM_LINKER_VARS= \ + USING_SYSTEM_LINKER MK_SYSTEM_LINKER \ + MK_LLD_BOOTSTRAP \ + WANT_LINKER_TYPE WANT_LINKER_VERSION WANT_LINKER_VERSION_FILE \ + WANT_LINKER_FREEBSD_VERSION WANT_LINKER_FREEBSD_VERSION_FILE \ + LD LINKER_TYPE LINKER_FEATURES LINKER_VERSION \ + LINKER_FREEBSD_VERSION \ + XLD X_LINKER_TYPE X_LINKER_FEATURES X_LINKER_VERSION \ + X_LINKER_FREEBSD_VERSION + +.for _t in compiler linker +test-system-${_t}: .PHONY +.for v in ${TEST_SYSTEM_${_t:tu}_VARS} + ${_+_}@printf "%-35s= %s\n" "${v}" "${${v}}" +.endfor +.endfor +.if (make(buildworld) || make(buildkernel) || make(kernel-toolchain) || \ + make(toolchain) || make(_cross-tools)) +.if ${USING_SYSTEM_COMPILER} == "yes" +.info SYSTEM_COMPILER: Determined that CC=${CC} matches the source tree. Not bootstrapping a cross-compiler. +.elif ${MK_CLANG_BOOTSTRAP} == "yes" +.info SYSTEM_COMPILER: libclang will be built for bootstrapping a cross-compiler. +.endif +.if ${USING_SYSTEM_LINKER} == "yes" +.info SYSTEM_LINKER: Determined that LD=${LD} matches the source tree. Not bootstrapping a cross-linker. +.elif ${MK_LLD_BOOTSTRAP} == "yes" +.info SYSTEM_LINKER: libclang will be built for bootstrapping a cross-linker. +.endif +.endif + +# End WITH_SYSTEM_COMPILER / WITH_SYSTEM_LD + +# Store some compiler metadata for use in installworld where we don't +# want to invoke CC at all. +_TOOLCHAIN_METADATA_VARS= COMPILER_VERSION \ + COMPILER_TYPE \ + COMPILER_FEATURES \ + COMPILER_FREEBSD_VERSION \ + COMPILER_RESOURCE_DIR \ + LINKER_VERSION \ + LINKER_FEATURES \ + LINKER_TYPE \ + LINKER_FREEBSD_VERSION +toolchain-metadata.mk: .PHONY .META + @: > ${.TARGET} + @echo ".info Using cached toolchain metadata from build at $$(hostname) on $$(date)" \ + > ${.TARGET} + @echo "_LOADED_TOOLCHAIN_METADATA=t" >> ${.TARGET} +.for v in ${_TOOLCHAIN_METADATA_VARS} + @echo "${v}=${${v}}" >> ${.TARGET} + @echo "X_${v}=${X_${v}}" >> ${.TARGET} +.endfor + @echo ".export ${_TOOLCHAIN_METADATA_VARS}" >> ${.TARGET} + @echo ".export ${_TOOLCHAIN_METADATA_VARS:C,^,X_,}" >> ${.TARGET} + + +# We must do lib/ and libexec/ before bin/ in case of a mid-install error to +# keep the users system reasonably usable. For static->dynamic root upgrades, +# we don't want to install a dynamic binary without rtld and the needed +# libraries. More commonly, for dynamic root, we don't want to install a +# binary that requires a newer library version that hasn't been installed yet. +# This ordering is not a guarantee though. The only guarantee of a working +# system here would require fine-grained ordering of all components based +# on their dependencies. +.if !empty(SUBDIR_OVERRIDE) +SUBDIR= ${SUBDIR_OVERRIDE} +.else +SUBDIR= lib libexec +# Add LOCAL_LIB_DIRS, but only if they will not be picked up as a SUBDIR +# of a LOCAL_DIRS directory. This allows LOCAL_DIRS=foo and +# LOCAL_LIB_DIRS=foo/lib to behave as expected. +.for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|} +_REDUNDANT_LIB_DIRS+= ${LOCAL_LIB_DIRS:M${_DIR}*} +.endfor +.for _DIR in ${LOCAL_LIB_DIRS} +.if ${_DIR} == ".WAIT" || (empty(_REDUNDANT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile)) +SUBDIR+= ${_DIR} +.endif +.endfor +.if !defined(NO_ROOT) && (make(installworld) || make(install)) +# Ensure libraries are installed before progressing. +SUBDIR+=.WAIT +.endif +SUBDIR+=bin +.if ${MK_CDDL} != "no" +SUBDIR+=cddl +.endif +SUBDIR+=gnu include +.if ${MK_KERBEROS} != "no" +SUBDIR+=kerberos5 +.endif +.if ${MK_RESCUE} != "no" +SUBDIR+=rescue +.endif +SUBDIR+=sbin +.if ${MK_CRYPT} != "no" +SUBDIR+=secure +.endif +.if !defined(NO_SHARE) +SUBDIR+=share +.endif +.if ${MK_BOOT} != "no" +SUBDIR+=stand +.endif +SUBDIR+=sys usr.bin usr.sbin +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + +# Local directories are built in parallel with the base system directories. +# Users may insert a .WAIT directive at the beginning or elsewhere within +# the LOCAL_DIRS and LOCAL_LIB_DIRS lists as needed. +.for _DIR in ${LOCAL_DIRS} +.if ${_DIR} == ".WAIT" || exists(${.CURDIR}/${_DIR}/Makefile) +SUBDIR+= ${_DIR} +.endif +.endfor + +# We must do etc/ last as it hooks into building the man whatis file +# by calling 'makedb' in share/man. This is only relevant for +# install/distribute so they build the whatis file after every manpage is +# installed. +.if make(installworld) || make(install) +SUBDIR+=.WAIT +.endif +SUBDIR+=etc + +.endif # !empty(SUBDIR_OVERRIDE) + +.if defined(NOCLEAN) +.warning The src.conf WITHOUT_CLEAN option can now be used instead of NOCLEAN. +MK_CLEAN:= no +.endif +.if defined(NO_CLEAN) +.info The src.conf WITHOUT_CLEAN option can now be used instead of NO_CLEAN. +MK_CLEAN:= no +.endif +.if defined(NO_CLEANDIR) +CLEANDIR= clean cleandepend +.else +CLEANDIR= cleandir +.endif + +.if defined(WORLDFAST) +MK_CLEAN:= no +NO_OBJWALK= t +.endif + +.if ${MK_META_MODE} == "yes" +# If filemon is used then we can rely on the build being incremental-safe. +# The .meta files will also track the build command and rebuild should +# it change. +.if empty(.MAKE.MODE:Mnofilemon) +MK_CLEAN:= no +.endif +.endif +.if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes" +NO_OBJWALK= t +NO_KERNELOBJ= t +.endif +.if !defined(NO_OBJWALK) +_obj= obj +.endif + +LOCAL_TOOL_DIRS?= +PACKAGEDIR?= ${DESTDIR}/${DISTDIR} + +.if empty(SHELL:M*csh*) +BUILDENV_SHELL?=${SHELL} +.else +BUILDENV_SHELL?=/bin/sh +.endif + +.if !defined(_MKSHOWCONFIG) +.if !defined(VCS_REVISION) || empty(VCS_REVISION) +.if !defined(SVNVERSION_CMD) || empty(SVNVERSION_CMD) +. for _D in ${PATH:S,:, ,g} +. if exists(${_D}/svnversion) +SVNVERSION_CMD?=${_D}/svnversion +. endif +. if exists(${_D}/svnliteversion) +SVNVERSION_CMD?=${_D}/svnliteversion +. endif +. endfor +.endif +.if defined(SVNVERSION_CMD) && !empty(SVNVERSION_CMD) +_VCS_REVISION?= $$(eval ${SVNVERSION_CMD} ${SRCDIR}) +. if !empty(_VCS_REVISION) +VCS_REVISION= $$(echo r${_VCS_REVISION}) +.export VCS_REVISION +. endif +.endif +.endif + +.if !defined(GIT_CMD) || empty(GIT_CMD) +. for _P in /usr/bin /usr/local/bin +. if exists(${_P}/git) +GIT_CMD= ${_P}/git +. endif +. endfor +.export GIT_CMD +.endif + +.if !defined(OSRELDATE) +.if exists(/usr/include/osreldate.h) +OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ + /usr/include/osreldate.h +.else +OSRELDATE= 0 +.endif +.export OSRELDATE +.endif + +# Set VERSION for CTFMERGE to use via the default CTFFLAGS=-L VERSION. +.for _V in BRANCH REVISION TYPE +.if !defined(_${_V}) +_${_V}!= eval $$(awk '/^${_V}=/{print}' ${SRCTOP}/sys/conf/newvers.sh); echo $$${_V} +.export _${_V} +.endif +.endfor +.if !defined(SRCRELDATE) +SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ + ${SRCDIR}/sys/sys/param.h +.export SRCRELDATE +.endif +.if !defined(VERSION) +VERSION= FreeBSD ${_REVISION}-${_BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE} +.export VERSION +.endif +MAJOR_REVISION= ${_REVISION:R} + +.if !defined(PKG_VERSION) +_STRTIMENOW= %Y%m%d%H%M%S +_TIMENOW= ${_STRTIMENOW:gmtime} +.if ${_BRANCH:MCURRENT*} || ${_BRANCH:MSTABLE*} || ${_BRANCH:MPRERELEASE*} +EXTRA_REVISION= .snap${_TIMENOW} +.elif ${_BRANCH:MALPHA*} +EXTRA_REVISION= .a${_BRANCH:C/ALPHA([0-9]+).*/\1/}.${_TIMENOW} +.elif ${_BRANCH:MBETA*} +EXTRA_REVISION= .b${_BRANCH:C/BETA([0-9]+).*/\1/}.${_TIMENOW} +.elif ${_BRANCH:MRC*} +EXTRA_REVISION= .rc${_BRANCH:C/RC([0-9]+).*/\1/}.${_TIMENOW} +.elif ${_BRANCH:M*-p*} +EXTRA_REVISION= p${_BRANCH:C/.*-p([0-9]+$)/\1/} +.endif +PKG_VERSION:= ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g} +.endif +.endif # !defined(PKG_VERSION) + +.if !defined(PKG_TIMESTAMP) +TIMEEPOCHNOW= %s +SOURCE_DATE_EPOCH= ${TIMEEPOCHNOW:gmtime} +.else +SOURCE_DATE_EPOCH= ${PKG_TIMESTAMP} +.endif + +PKG_NAME_PREFIX?= FreeBSD +PKG_MAINTAINER?= re@FreeBSD.org +PKG_WWW?= https://www.FreeBSD.org +.export PKG_NAME_PREFIX +.export PKG_MAINTAINER +.export PKG_WWW + +.if !defined(_MKSHOWCONFIG) +_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \ + -m ${.CURDIR}/share/mk MK_AUTO_OBJ=no -V CPUTYPE +.if ${_CPUTYPE} != ${_TARGET_CPUTYPE} +.error CPUTYPE global should be set with ?=. +.endif +.endif +.if make(buildworld) +BUILD_ARCH!= uname -p +# On some Linux systems uname -p returns "unknown" so skip this check there. +# This check only exists to tell people to use TARGET_ARCH instead of +# MACHINE_ARCH so skipping it when crossbuilding on non-FreeBSD should be fine. +.if ${MACHINE_ARCH} != ${BUILD_ARCH} && ${.MAKE.OS} == "FreeBSD" +.error To cross-build, set TARGET_ARCH. +.endif +.endif +WORLDTMP?= ${OBJTOP}/tmp +BPATH= ${CCACHE_WRAPPER_PATH_PFX}${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin:${WORLDTMP}/legacy/usr/libexec +XPATH= ${WORLDTMP}/bin:${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin + +# When building we want to find the cross tools before the host tools in ${BPATH}. +# We also need to add UNIVERSE_TOOLCHAIN_PATH so that we can find the shared +# toolchain files (clang, lld, etc.) during make universe/tinderbox +STRICTTMPPATH= ${XPATH}:${BPATH}:${UNIVERSE_TOOLCHAIN_PATH} +# We should not be using tools from /usr/bin accidentally since this could cause +# the build to break on other systems that don't have that tool. For now we +# still allow using the old behaviour (inheriting $PATH) if +# BUILD_WITH_STRICT_TMPPATH is set to 0 but this will eventually be removed. + +# Currently strict $PATH can cause build failures. Once the remaining issues +# have been resolved it will be turned on by default. +BUILD_WITH_STRICT_TMPPATH?=0 +.if defined(CROSSBUILD_HOST) +# When building on non-FreeBSD we can't rely on the tools in /usr/bin being compatible +# with what FreeBSD expects. Therefore we only use tools from STRICTTMPPATH +# during the world build stage. We build most tools during the bootstrap-tools +# phase but symlink host tools that are known to work instead of building them +BUILD_WITH_STRICT_TMPPATH:=1 +.endif +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 +TMPPATH= ${STRICTTMPPATH} +.else +TMPPATH= ${STRICTTMPPATH}:${PATH} +.endif + +# +# Avoid running mktemp(1) unless actually needed. +# It may not be functional, e.g., due to new ABI +# when in the middle of installing over this system. +# +.if make(distributeworld) || make(installworld) || make(stageworld) +.if ${BUILD_WITH_STRICT_TMPPATH} != 0 +MKTEMP=${WORLDTMP}/legacy/usr/bin/mktemp +.if !exists(${MKTEMP}) +.error mktemp binary doesn't exist in expected location: ${MKTEMP} +.endif +.else +MKTEMP=mktemp +.endif +INSTALLTMP!= ${MKTEMP} -d -u -t install + +.if ${.MAKE.OS} == "FreeBSD" +# When building on FreeBSD we always copy the host tools instead of linking +# into INSTALLTMP to avoid issues with incompatible libraries (see r364030). +# Note: we could create links if we don't intend to update the current machine. +INSTALLTMP_COPY_HOST_TOOL=cp +.else +# However, this is not necessary on Linux/macOS. Additionally, copying the host +# tools to another directory with cp results in AMFI Launch Constraint +# Violations on macOS Ventura as part of its System Integrity Protection. +INSTALLTMP_COPY_HOST_TOOL=ln -s +.endif +.endif + +.if make(stagekernel) || make(distributekernel) +TAGS+= kernel +PACKAGE= kernel +.endif + +# +# Building a world goes through the following stages +# +# 1. legacy stage [BMAKE] +# This stage is responsible for creating compatibility +# shims that are needed by the bootstrap-tools, +# build-tools and cross-tools stages. These are generally +# APIs that tools from one of those three stages need to +# build that aren't present on the host. +# 1. bootstrap-tools stage [BMAKE] +# This stage is responsible for creating programs that +# are needed for backward compatibility reasons. They +# are not built as cross-tools. +# 2. build-tools stage [TMAKE] +# This stage is responsible for creating the object +# tree and building any tools that are needed during +# the build process. Some programs are listed during +# this phase because they build binaries to generate +# files needed to build these programs. This stage also +# builds the 'build-tools' target rather than 'all'. +# 3. cross-tools stage [XMAKE] +# This stage is responsible for creating any tools that +# are needed for building the system. A cross-compiler is one +# of them. This differs from build tools in two ways: +# 1. the 'all' target is built rather than 'build-tools' +# 2. these tools are installed into TMPPATH for stage 4. +# 4. world stage [WMAKE] +# This stage actually builds the world. +# 5. install stage (optional) [IMAKE] +# This stage installs a previously built world. +# + +BOOTSTRAPPING?= 0 +# Keep these in sync +MINIMUM_SUPPORTED_OSREL?= 1104001 +MINIMUM_SUPPORTED_REL?= 11.4 + +# Common environment for world related stages +CROSSENV+= \ + MACHINE_ARCH=${TARGET_ARCH} \ + MACHINE=${TARGET} \ + CPUTYPE=${TARGET_CPUTYPE} +.if ${MK_META_MODE} != "no" +# Don't rebuild build-tools targets during normal build. +CROSSENV+= BUILD_TOOLS_META=.NOMETA +.endif +.if defined(TARGET_CFLAGS) +CROSSENV+= ${TARGET_CFLAGS} +.endif +.if (${TARGET} != ${MACHINE} && !defined(WITH_LOCAL_MODULES)) || \ + defined(WITHOUT_LOCAL_MODULES) +CROSSENV+= LOCAL_MODULES= +.endif + +BOOTSTRAPPING_OSRELDATE?=${OSRELDATE} + +# bootstrap-tools stage +BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ + TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \ + PATH=${BPATH:Q}:${PATH:Q} \ + WORLDTMP=${WORLDTMP} \ + MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" +# need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile +BSARGS= DESTDIR= \ + OBJTOP='${WORLDTMP}/obj-tools' \ + OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ + MAKEOBJDIRPREFIX= \ + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ + BWPHASE=${.TARGET:C,^_,,} \ + -DNO_CPU_CFLAGS \ + -DNO_LINT \ + -DNO_PIC \ + -DNO_SHARED \ + MK_ASAN=no \ + MK_CTF=no \ + MK_CLANG_EXTRAS=no \ + MK_CLANG_FORMAT=no \ + MK_CLANG_FULL=no \ + MK_HTML=no \ + MK_MAN=no \ + MK_PROFILE=no \ + MK_RETPOLINE=no \ + MK_SSP=no \ + MK_TESTS=no \ + MK_UBSAN=no \ + MK_WERROR=no \ + MK_INCLUDES=yes \ + MK_MAN_UTILS=yes + +BMAKE= \ + ${TIME_ENV} ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ + ${BSARGS} +.if empty(.MAKEOVERRIDES:MMK_LLVM_TARGET_ALL) +BMAKE+= MK_LLVM_TARGET_ALL=no +.endif + +# build-tools stage +TMAKE= \ + ${TIME_ENV} ${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + DESTDIR= \ + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ + BWPHASE=${.TARGET:C,^_,,} \ + -DNO_CPU_CFLAGS \ + -DNO_LINT \ + MK_ASAN=no \ + MK_CTF=no \ + MK_CLANG_EXTRAS=no \ + MK_CLANG_FORMAT=no \ + MK_CLANG_FULL=no \ + MK_LLDB=no \ + MK_RETPOLINE=no \ + MK_SSP=no \ + MK_TESTS=no \ + MK_UBSAN=no \ + MK_WERROR=no + +# cross-tools stage +# TOOLS_PREFIX set in BMAKE +XMAKE= ${BMAKE} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + MK_LLDB=no \ + MK_LLVM_BINUTILS=no \ + MK_TESTS=no + +# kernel-tools stage +KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \ + PATH=${BPATH:Q}:${PATH:Q} \ + WORLDTMP=${WORLDTMP} \ + MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" + +KTMAKE= ${TIME_ENV} \ + TOOLS_PREFIX=${TOOLS_PREFIX_UNDEF:U${WORLDTMP}} \ + ${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \ + DESTDIR= \ + OBJTOP='${WORLDTMP}/obj-kernel-tools' \ + OBJROOT='$${OBJTOP}/' \ + UNIVERSE_TOOLCHAIN_PATH=${UNIVERSE_TOOLCHAIN_PATH} \ + MAKEOBJDIRPREFIX= \ + BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \ + -DNO_CPU_CFLAGS \ + -DNO_LINT \ + -DNO_PIC \ + -DNO_SHARED \ + MK_CTF=no \ + MK_HTML=no \ + MK_MAN=no \ + MK_PROFILE=no \ + MK_SSP=no \ + MK_RETPOLINE=no \ + MK_WERROR=no + +# world stage *** 23342 LINES SKIPPED *** From nobody Sun Sep 3 16:07:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RdxVH4DQhz4sHp8; Sun, 3 Sep 2023 16:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RdxVH3pVYz4fRL; Sun, 3 Sep 2023 16:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693757223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=al+h7ZumBZ2mft5gVolDbPYMBnu6byA75jvStADjg30=; b=tYYdRu9Ft16vL+OZvBSv+tB0XqJ9yB4bJ2j2jHF3nfdKo0uilHu9k56zfGHQN8+Y4KSFmA xgX6DQAtbNIAO8hv3NXysAvwmNTXbNNHsvH3NedQgt0meUx6ZlLZ5U04qVluDqV9kF3q3n QhQ6PLdo8FGjgCByvXWOekKOhopbQmdu96Vp8VEvHKu5kFTAdfeyrvI8F2udtlavbsYU2O YeKpnonSoC7l1DYxy2Z3srF/bcPaTQHlI9E08drE9d5T23tbOA9ghxgEoy1W0v5G7K/B3u wiUcmpPdM4wMsXA+LrMeu1mlAqmnv1TtG0Nj+qKhfYn3/Olx/nY9XpigoSbQBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693757223; a=rsa-sha256; cv=none; b=FTxGp+KFwgSTz4vfv/pzzEVP8mI5NyjyRe0+scmVCr8cZrMcFNkMAPCosG68Fo+tFUaKPf A7ThPW+14NLRIANpSCb7zaHDdFej/nAectX6KnK71/JhrOZvQW06yYb7PKfGkr8OzkVUg5 NYQzR0qunFPsD/h9pdjxhfQbLICqUJA2pEoQLsPvOta60MdEzUq8pA21P4WIN18YHXmByt pe5zo9zLvqmLY6aJk3eDTZiMDqYF0fkbvvvKCfX/jmWVdILw55BhDppzd1OmJhBEtQEiuV BZbht1CR+eYyWSdVYV5UhQESfOKsnVJBbfu8OOPHXHqnCDSHVfiVMUzkL01FJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693757223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=al+h7ZumBZ2mft5gVolDbPYMBnu6byA75jvStADjg30=; b=e6Th4CMWtF8F4uTSqrZKesSJX3WskvTO2yjYBKA07n6vuuPZvZfe75ZxHaRDZw0R2sPPfB skUkcLQy7sLTa030AkkSsJyJ0k10/eZ5F2iFtBe1Bt3jJvc5q2yn7J+rjlRyPHrWr+o5Wg 3H7LGSvOuLe0OF8xFXfnHP5rHCagIMVczWsly7OSVO7dvV4yznyWqV/dNTdp1PgkWit/og yRG1Vwc/8EgPJYVB1SMabhHcDXsScfk3hWrDmMDSnBqRblFB2ipxgv3CtAkspghpQmfvTx kK35z9rbH+vcyG5W33CFrRmHHpWCTb7UirYa4GNX4hfqeL87P0reelVytwmCwQ== 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 4RdxVH2rcpzWyb; Sun, 3 Sep 2023 16:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383G73B2060042; Sun, 3 Sep 2023 16:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383G730n060039; Sun, 3 Sep 2023 16:07:03 GMT (envelope-from git) Date: Sun, 3 Sep 2023 16:07:03 GMT Message-Id: <202309031607.383G730n060039@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: 4c509ef95c5d - stable/14 - libc: fix history for strverscmp(3) and versionsort(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c509ef95c5d2b359b7276487a05f5e9ce911e3d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c509ef95c5d2b359b7276487a05f5e9ce911e3d commit 4c509ef95c5d2b359b7276487a05f5e9ce911e3d Author: Mina Galić AuthorDate: 2023-08-31 11:50:17 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-03 16:06:36 +0000 libc: fix history for strverscmp(3) and versionsort(3) PR: 273401 Approved by: re (gjb) (cherry picked from commit 09ec5e67a7a6605e5a58a2e3e82dab243a90609a) --- lib/libc/gen/scandir.3 | 4 ++-- lib/libc/string/strverscmp.3 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3 index 024e9947e682..e6d1fb38c2b1 100644 --- a/lib/libc/gen/scandir.3 +++ b/lib/libc/gen/scandir.3 @@ -27,7 +27,7 @@ .\" .\" @(#)scandir.3 8.1 (Berkeley) 6/4/93 .\" -.Dd August 23, 2022 +.Dd August 31, 2023 .Dt SCANDIR 3 .Os .Sh NAME @@ -189,4 +189,4 @@ and .Fn versionsort functions were added in -.Fx 14.0 . +.Fx 13.2 . diff --git a/lib/libc/string/strverscmp.3 b/lib/libc/string/strverscmp.3 index e4413fb96e36..495e5c8780c1 100644 --- a/lib/libc/string/strverscmp.3 +++ b/lib/libc/string/strverscmp.3 @@ -1,6 +1,6 @@ .\" SPDX-License-Identifier: BSD-2-Clause .\" Copyright (c) 2022 Aymeric Wibo -.Dd July 11, 2022 +.Dd August 31, 2023 .Dt STRVERSCMP 3 .Os .Sh NAME @@ -53,4 +53,4 @@ function is a GNU extension and conforms to no standard. The .Fn strverscmp function was added in -.Fx 14.0 . +.Fx 13.2 . From nobody Sun Sep 3 18:49:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf15J68Fsz4rtBY; Sun, 3 Sep 2023 18:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf15J5jz0z3f8t; Sun, 3 Sep 2023 18:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693766948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZTpcN/QSkKSTS8M8eVKT0+XXlTwH7RtLFzLS+gw3Rs=; b=aTGE02hrOaR+m2kQH5M3u0PHyU6e8tPZxOaM1ayaZdR8YE0RvfgZvuGTpEPQp2WTHFtRJL ZWtaETqxM497N2N2+J/VAAnZqbKete0UwAa7kIe502xTQU5XGQ8yPIo+APDTrQO5AMO7DR dDMCl22xxJlXfyAlk7JuD4Gr2ovSV7AIPqsEfTXHafFRExt/Y98laHP57Wh9Zy9pjViJNB UrAztieubot+hkaPzDB9f2RwR4FLR0kXuaxyd0ulBcG3NYkkh6+WpNpplrRGLFWD5p9oL+ 1MspTpZyGRhA7WMs/WDWL274tgjLM/8CdlpvbezLTHWowtGvJzbWyWoEkjuhlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693766948; a=rsa-sha256; cv=none; b=oYmeg9sb6piF5Vs9SZ7yaBhTO2EiscyHJ6A647vNDRFC6X2TcgAHYNuc6P6ezO8c92OaOh nJIRhnjLrfYnVdu2bY3yn6DcDHT9hf2hGmQRVfBgJ18PtXmwMM9hvSB70QhTysaV9Q7oxt 5C6hs8jDKTh1htAhTMtJhCPfA8A5oGUxsgBIXrQHty8e4PPhZNUVuxYtJ1b/NkJB8whB2E FDaLu/zNrfF3v7Tm9yAw2s1nS9ltUygvRmU2Q5wjOkUGYgBLyG2r3NYTduYT7cpueY3o5J JEfQaQqtJfwtEsrPFl3tmPYuSupnR2ia3niJcO2bt266Tz3yDOwAtwLsAlPmWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693766948; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dZTpcN/QSkKSTS8M8eVKT0+XXlTwH7RtLFzLS+gw3Rs=; b=ORPQlQqTqJBM6LrgPN8QzMcwC9+pPaVZAw2UL3N0nJfOna2WKs3bARUUuqa2EuwGnGVOml mGaZTWn1XFcNbzTCeHTnRJNhNA32BfJ4Vw18e2e0ujjCTKkO9mfj4oUxmgmSkypjEl1gLE jhogKSOMcBZLhiAinxj/hsU/v8ysftLg5tUoPEB7r1dh6VsYccQIb/5yUgLKreS8uEqelV HvG7TjusGEmRS6n3MwCQ7zEHsd8lI4//K5I8TC3lQKHRMvfcA/txY53oFNzXvYh79JiSj4 BCQju8BSLkXK5r1K2s8GNlVtmLMiJf05VYTXXW66erjIDEzOTVlttLXEAMyv7w== 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 4Rf15J4np3zbS0; Sun, 3 Sep 2023 18:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383In8YD023680; Sun, 3 Sep 2023 18:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383In8u2023677; Sun, 3 Sep 2023 18:49:08 GMT (envelope-from git) Date: Sun, 3 Sep 2023 18:49:08 GMT Message-Id: <202309031849.383In8u2023677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 02183951bfb1 - stable/13 - Fix build for FreeBSD 13. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 02183951bfb19fda7a199acaeb9223cd28f29de3 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=02183951bfb19fda7a199acaeb9223cd28f29de3 commit 02183951bfb19fda7a199acaeb9223cd28f29de3 Author: Xin LI AuthorDate: 2023-09-03 18:49:02 +0000 Commit: Xin LI CommitDate: 2023-09-03 18:49:02 +0000 Fix build for FreeBSD 13. The minigzip utility has been removed in FreeBSD 14 but still exists in FreeBSD 13. The upstream revision e9d5486e removed prototype definitions, rendering the code no longer compliant with WARNS=5. --- usr.bin/minigzip/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile index 6b04d8a65599..e7174694865a 100644 --- a/usr.bin/minigzip/Makefile +++ b/usr.bin/minigzip/Makefile @@ -4,7 +4,7 @@ SRCDIR= ${SRCTOP}/sys/contrib/zlib/test PROG= minigzip -WARNS?= 5 +WARNS?= 2 CFLAGS+=-DUSE_MMAP LIBADD= z From nobody Sun Sep 3 19:39:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf2D60tW2z4s8F9 for ; Sun, 3 Sep 2023 19:40:06 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf2D567ddz4LQB for ; Sun, 3 Sep 2023 19:40:05 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-31aeee69de0so563423f8f.2 for ; Sun, 03 Sep 2023 12:40:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693770004; x=1694374804; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3qi7Wl5nJeusFFtNBIW2kEm4WFnJau+OF1TV3I3WPR0=; b=aLzKZUyuYOHoyt2eeV9eZzkX3vQRjvMefjmCZXXnCgDq0SKGvnMJW0YJqs6+uRGk+d B58DqBCG3quJhe1ybO3sJvuJr93DdXAWYMIEVSYNvXcvx9W0ZUu1AXpvFLizGJ2KbhQ6 nO/aeZdGufarVmpD7yh3m8Lr8cR0P2Vj548QlshUwMwngFNNWwCuXsQbcKUkS+W67K9T L23BQezi+DRshjTKGC0e8FE8RLoHND82aZjE4JHGFnYV/aBE1syLAIUVkxbqRfko7Cxi YGReo7ApslsC4D+yzYIOPzPtHer7+o4hajKxK6KeHYQrecVjCk3TdZ6RO4gx2s0r0JzT +yLg== X-Gm-Message-State: AOJu0YzoIoC8sDDYYdTKSuNLTniPKsCkLQ8RlRexvQnwzlaDIYE4ivK0 4I/+8qDNl23hVf/lezWV4N8UE0s+iPVjU/AzA6gssA== X-Google-Smtp-Source: AGHT+IFrY1KTFZep7W5tHEsVoMqVwutZokda/ijsjPTKJUFfRfIdqdCSZh3ncXJzCZrQmX/ZKLzctQ== X-Received: by 2002:adf:ed05:0:b0:31a:d1c3:97ca with SMTP id a5-20020adfed05000000b0031ad1c397camr5511640wro.20.1693770003890; Sun, 03 Sep 2023 12:40:03 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id c17-20020adfe711000000b0031773a8e5c4sm12376975wrm.37.2023.09.03.12.40.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Sep 2023 12:40:03 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 02183951bfb1 - stable/13 - Fix build for FreeBSD 13. From: Jessica Clarke In-Reply-To: <202309031849.383In8u2023677@gitrepo.freebsd.org> Date: Sun, 3 Sep 2023 20:39:52 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <3D2AC67E-C1F8-4DD0-9D7C-65AD4E283C44@freebsd.org> References: <202309031849.383In8u2023677@gitrepo.freebsd.org> To: Xin LI X-Mailer: Apple Mail (2.3731.600.7) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Rf2D567ddz4LQB On 3 Sep 2023, at 19:49, Xin LI wrote: >=20 > The branch stable/13 has been updated by delphij: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D02183951bfb19fda7a199acaeb9223cd= 28f29de3 >=20 > commit 02183951bfb19fda7a199acaeb9223cd28f29de3 > Author: Xin LI > AuthorDate: 2023-09-03 18:49:02 +0000 > Commit: Xin LI > CommitDate: 2023-09-03 18:49:02 +0000 >=20 > Fix build for FreeBSD 13. >=20 > The minigzip utility has been removed in FreeBSD 14 but still > exists in FreeBSD 13. The upstream revision e9d5486e removed > prototype definitions, rendering the code no longer compliant > with WARNS=3D5. Uh, what on earth is upstream doing? Has this been reported / complained about? Jess > --- > usr.bin/minigzip/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile > index 6b04d8a65599..e7174694865a 100644 > --- a/usr.bin/minigzip/Makefile > +++ b/usr.bin/minigzip/Makefile > @@ -4,7 +4,7 @@ SRCDIR=3D ${SRCTOP}/sys/contrib/zlib/test >=20 > PROG=3D minigzip >=20 > -WARNS?=3D 5 > +WARNS?=3D 2 > CFLAGS+=3D-DUSE_MMAP > LIBADD=3D z >=20 From nobody Sun Sep 3 20:18:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf34X6CCJz4sKKv; Sun, 3 Sep 2023 20:18:36 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf34X5bCCz4RNJ; Sun, 3 Sep 2023 20:18:36 +0000 (UTC) (envelope-from delphij@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JPiaEF+AJwFaLvQGVLvVpUBZQJVwHAFCeUI2RTvPRdI=; b=i5fudegFcB0BvuKWcQNXc+BQaXZQR7nw5aoyko1EZUOoFZ+wl2i3cmxYqj1wwHI2xu7Y6A oIK0+ZztDdGfNPI4IBYLec8IQSTneh/JIDRpCwDQa5Q1wYjn9W0wQ3/ZGLnepWnVL7Rsfh ZGDHyfbhodcUHyBxzbp/32kullHi2xkecHlQ9DnXJWch+r4lwl5J+mnfghE3bgYzyN802z nSd07pUVQFcd914swlzsn2+zIw6WQ5Lf/4DdKJDa67vAxkOTpnWkwMWUxQrQs0Q6NOypDp yjWjpqk09OoM7L1XXeWxj/cSPbnnwF3nV/aR/VMNAGFEpBeXKT2Zd93JWyuREQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693772316; a=rsa-sha256; cv=none; b=IBiObkK6bfTV78tm6EwDHAAaxZNAEdVCwDWYl3vZULe1AzDJTsIDUTw4WX7U+wr2JPakva qZagKkY/gD7A3j0ByYqrCnf3LL3w6BeaaumOIhAsSqFEu7PRJHQ587LSSYzkB5v8dU4WXF zd2veRSgsxJZvqBy/QKEhQEJiXtYisinV0Y4Al1YCZMWW8zUUKSb5NMJRiD3K28V/405fd HstxndnlXikc+y8prra0BwxR2dxO4AZXGQWyRsAtLZgsCy5SluRljk/nyBbbESdXgz2HDb tyi5T0v1rMbGjFjrtmwknEov/ZlQFHk+ViOQW69uUxLCqxqKOX1MI9G9eIzPRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=JPiaEF+AJwFaLvQGVLvVpUBZQJVwHAFCeUI2RTvPRdI=; b=FVc5yBt7g7AwXwU4wO9DnAPkctiX558XxvruJHWv0jnyj91hWSuj5mFGDCvtTChHmM0fD4 kUks4Ec5WHQWj4mKQp3rbKUU+pS5PCcNKeH4UrHowedhMl+GV5q6vyb8oimoFxO32KDsZn fACZ0m6Cvj9C4LhINCaBIU00z2iRU9rTpEgXvK22rAmnNQJupwkeaHC68g6nIDv28ShsXm Ee2buG/IxVGKtjwA2vSqC9wiMDwTvfGyz5QA3jIWxPJ9By5cLiRxwE9BJ0kEz6CBZV/uEK yAkqEflRqkOnC7ZEJt4fhaLi5kIUcqoSPBWEZSYR4YyC/4oKoVOHaBVow1Jm6g== Received: from [100.64.10.64] (unknown [141.193.140.240]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: delphij/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rf34X0s8qzWk; Sun, 3 Sep 2023 20:18:35 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Message-ID: Date: Sun, 3 Sep 2023 13:18:32 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Thunderbird Subject: Re: git: 02183951bfb1 - stable/13 - Fix build for FreeBSD 13. To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" References: <202309031849.383In8u2023677@gitrepo.freebsd.org> <3D2AC67E-C1F8-4DD0-9D7C-65AD4E283C44@freebsd.org> Content-Language: en-US From: Xin Li Organization: The FreeBSD Project In-Reply-To: <3D2AC67E-C1F8-4DD0-9D7C-65AD4E283C44@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2023-09-03 12:39 PM, Jessica Clarke wrote: > On 3 Sep 2023, at 19:49, Xin LI wrote: >> >> The branch stable/13 has been updated by delphij: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=02183951bfb19fda7a199acaeb9223cd28f29de3 >> >> commit 02183951bfb19fda7a199acaeb9223cd28f29de3 >> Author: Xin LI >> AuthorDate: 2023-09-03 18:49:02 +0000 >> Commit: Xin LI >> CommitDate: 2023-09-03 18:49:02 +0000 >> >> Fix build for FreeBSD 13. >> >> The minigzip utility has been removed in FreeBSD 14 but still >> exists in FreeBSD 13. The upstream revision e9d5486e removed >> prototype definitions, rendering the code no longer compliant >> with WARNS=5. > > Uh, what on earth is upstream doing? Has this been reported / > complained about? I've created a PR for this https://github.com/madler/zlib/pull/855 (by converting the functions to static ones). Cheers, From nobody Sun Sep 3 20:27:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf3H63gjbz4sMnH; Sun, 3 Sep 2023 20:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf3H6383Fz4Sm3; Sun, 3 Sep 2023 20:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wU2kXQaIyYJISr8hjJzqPf7hZgdwCDb5EP8aC8HfQqk=; b=wHqYs4CI3xygx5psuRLiThG0dUGoRz4/QyY2K7j/HSIY6jQeN5WzZLijDzHpBRrw+GlSWu hlx9bNpwMCiLHDdDwtBNfB6sG2e0VyDA9k/FchWPw7dF1JO+HRsVoOk0Ws0Kxk6+13KWKN TdVZ/MVfSvjyat00Hb3FMYn8oQ2P0X2idhMSnjmWXPOTe7r3A4ef81G99L27wmjnZ7MBKr 4TpajJlws1PFxuIGmo0Ge9yPc+M0BTbAQpeoB3zBZO72FflcZIr6nkmnfuqLMThAsZBS0N 1L6M6B79OAG9Vz+eUrfwrljiYrjPZbDoqMzZ1rD5B7Heuu3q+4TGv4WCswOCYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693772866; a=rsa-sha256; cv=none; b=Z9kK1Ol2zAgvgGn/JUta6BVr5+IO7wTU+KPtGLsT/aOQkttNHGVk5e2PAy2X9K9TgLWs7J 2Hv2w51Q14UecexaV6amVu/mDxUEaFo3oRw+k3AuLcuykNsmtc93yyN/1O+GEFE1mdpPMP SpzSU7BfjjdnE8yafoOEkLQFUqP9esW0P8ILuerBFnxL9kLCYFhFF1f8j4aqRU5Lg9M/Ed Jgxft+Q22YkVi5hxrjFy2KCKbqswuKuf9nOHI6Dd55JctXFEbmVD+mspWcsgjxv1k4lB9K gUWCod3VDoLx7SAG+ZfkexQo+H+syEWi/4pyPdAo2R2Yw7Hh2qeJvgREYR0VNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wU2kXQaIyYJISr8hjJzqPf7hZgdwCDb5EP8aC8HfQqk=; b=MdJDXg7uP77Q77507rTt1+gr/+jNt3vxg8CFV1fXDttvVD+/v4Hq0AMSpNuvInifL8e6Mr fIDnIYdAkV7fCA3SFf2PbcxpnBFLS62/RwyD8gOIj/5bRerB9F9x7VmArdzV4fM2+mcsE9 e8AKcoDnEL/M72+gr/zMIOWNvOkuZSjxhts9b2g6dXUkXqigB/mGfi+DCiHEb01hd6k8VA 1/Cfz/XX9HioEIzHQQA8CttM/KhFBf5Rz/L2b57a1pxWI4FZ+tuVpHdITpH/wrHbkpwnqK LTKtyz1SMJnnByx6ckPhO/KHxej0noFnjwYFEWqACnJOQ/1YmICQnjJ3Sjc9RA== 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 4Rf3H62Bvgzf3r; Sun, 3 Sep 2023 20:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383KRkbn089775; Sun, 3 Sep 2023 20:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383KRkcu089772; Sun, 3 Sep 2023 20:27:46 GMT (envelope-from git) Date: Sun, 3 Sep 2023 20:27:46 GMT Message-Id: <202309032027.383KRkcu089772@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 45dcc17e2fb8 - main - libpmc: make pmc_pmu_pmcallocate() machine-independent List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45dcc17e2fb8f0f9838ba167b311f271a08fcea9 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=45dcc17e2fb8f0f9838ba167b311f271a08fcea9 commit 45dcc17e2fb8f0f9838ba167b311f271a08fcea9 Author: Mitchell Horne AuthorDate: 2023-06-19 22:32:22 +0000 Commit: Mitchell Horne CommitDate: 2023-09-03 20:27:05 +0000 libpmc: make pmc_pmu_pmcallocate() machine-independent Have it call the platform-dependent version. For better layering, move the reset logic inside the new function. This is mainly to facilitate an upcoming change. Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40752 --- lib/libpmc/libpmc.c | 5 ----- lib/libpmc/libpmc_pmu_util.c | 34 ++++++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index 71fba89237ff..a7ed1c3d9ac8 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -1091,11 +1091,6 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, assert(pmc_config.pm_ev < PMC_EVENT_FIRST); goto found; } - - /* Otherwise, reset any changes */ - pmc_config.pm_ev = 0; - pmc_config.pm_caps = 0; - pmc_config.pm_class = 0; } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index a61f81f7d2c7..772dec7a9d53 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -572,8 +572,8 @@ pmc_pmu_intel_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm, return (0); } -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -604,8 +604,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__powerpc64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -631,8 +631,8 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #elif defined(__aarch64__) -int -pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +static int +pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) { const struct pmu_event *pe; struct pmu_event_desc ped; @@ -658,9 +658,27 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) #else -int -pmc_pmu_pmcallocate(const char *e __unused, struct pmc_op_pmcallocate *p __unused) +static int +pmc_pmu_pmcallocate_md(const char *e __unused, struct pmc_op_pmcallocate *p __unused) { return (EOPNOTSUPP); } #endif + +int +pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) +{ + int error; + + error = pmc_pmu_pmcallocate_md(event_name, pm); + if (error != 0) { + /* Reset any changes. */ + pm->pm_ev = 0; + pm->pm_caps = 0; + pm->pm_class = 0; + + return (error); + } + + return (0); +} From nobody Sun Sep 3 20:27:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf3H75GRjz4sMgK; Sun, 3 Sep 2023 20:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf3H74Q0dz4Stm; Sun, 3 Sep 2023 20:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=knvkC6uNHOf65tZJDy61g4IEAPD0yNh3oW9eBXS+r0I=; b=uTj905h/u1iJCPoL5QYwUU09nNWI8U4QwvuUErIDdhIzsfXztyR0zP1HF3yy2k72ExiDkA Pq94567pwJTptUj73093GtF7HZcz69zBkpenGJR7MthtSah0HG0qI/Zn7dXvLc7QjKtZ3Y whlHItOMpXYEM9//fQ5IWSKUcHXegQFratCsgiT+DRZgQvet7NkXj7Qne7tpTxxdZpiUwK 0DZomAFBqC+WuL7bRUY7wnkDu704cDj2rGkEWXstHIUKE38RA6DSWl7m3F9V9QG4V5I97S BuVDX69qHtVRhlMdgHkJpbOfiQHAksEqZ93tA6++37A5PJltIhvlKAOysGAI1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693772867; a=rsa-sha256; cv=none; b=pI2Ty5UHWAFIMNhPQkdKFXeCum5LnN5XrfSdvRxDqdq84Uw3/qpVOIV1rIUVFGza+iKZGJ AhBTTKppDZlILlp6wOyU/Id6FcivTa6jzQgbDhFdRPz4px5toGFQAp2iu95Ns0uZYOWvLX INlB305Bc9ln3CroY9TQsERNGv8hCmHDU3zMJeO982UElfzarFlsDFOcDQwF7ZfPnsAOor cVI5MXV/Pi+ahtE3Sbc5byBgo0kdRUKb4a+YVh06duxVeml8Gi9QRvJyNT69QGiDXn7RGw TJHey/VG4QYNiLKFtRN/Q/VdpfwI5xduH98MaS3S0lrz++/romTQmUxXatYgdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693772867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=knvkC6uNHOf65tZJDy61g4IEAPD0yNh3oW9eBXS+r0I=; b=bAtDSC3ER7+tfMhnj9vNzqDfBJpqTL9l6s4/rfkkGSG+T1KhhPy9+Oe/QhtOSe2U9dYpuS EjtEi9rsxghFTmVPqpFKtd6L84CVNf3hkUHpMNQlZLiVQiskf/06tc/OcSDUROluJBfM4e 7YHE2Ildkio4hTDOozSK3h/OQ/SA2Z+fBfqSYS//D+Rcjr/tYj5N9lRBv71NwNQ/FOdcnS nbmHERKzeFYsCnILJ7ANTTOB3P22dZOOaK1205SxTpRro30+LfBKMwpbz72QBHFiG+3g5L wc4pM0bOFBJfNHeyKr4bZhxIbs0FN+uPq2ZIJc49ysJEWHeOl7PWvsXKnNdCvA== 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 4Rf3H73CPHzf3s; Sun, 3 Sep 2023 20:27:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383KRlxG089821; Sun, 3 Sep 2023 20:27:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383KRlYm089818; Sun, 3 Sep 2023 20:27:47 GMT (envelope-from git) Date: Sun, 3 Sep 2023 20:27:47 GMT Message-Id: <202309032027.383KRlYm089818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c190fb35f35c - main - pmc: better distinguish pmu-events allocation path List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c190fb35f35cc163b61e582a49115680b0d49dcc Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c190fb35f35cc163b61e582a49115680b0d49dcc commit c190fb35f35cc163b61e582a49115680b0d49dcc Author: Mitchell Horne AuthorDate: 2023-06-06 17:26:46 +0000 Commit: Mitchell Horne CommitDate: 2023-09-03 20:27:21 +0000 pmc: better distinguish pmu-events allocation path Background: The pm_ev field of struct pmc_op_pmcallocate and struct pmc traditionally contains the index of the chosen event, corresponding to the __PMC_EVENTS array in pmc_events.h. This is a static list of events, maintained by FreeBSD. In the usual case, libpmc translates the user supplied event name (string) into the pm_ev index, which is passed as an argument to the allocation syscall. On the kernel side, the allocation method for the relevant hwpmc class translates the given index into the event code that will be written to an event selection register. In 2018, a new source of performance event definitions was introduced: the pmu-events json files, which are maintained by the Linux kernel. The result was better coverage for newer Intel processors with a reduced maintenance burden for libpmc/hwpmc. Intel and AMD CPUs were unconditionally switched to allocate events from pmu-events instead of the traditional scheme (959826ca1bb0a, 81eb4dcf9e0d). Under the pmu-events scheme, the pm_ev field contains an index corresponding to the selected event from the pmu-events table, something which the kernel has no knowledge of. The configuration for the performance counting registers is instead passed via class-dependent fields (struct pmc_md_op_pmcallocate). In 2021 I changed the allocation logic so that it would attempt to pull from the pmu-events table first, and fall-back to the traditional method (dfb4fb41166bc3). Later, pmu-events support for arm64 and power8 CPUs was added (28dd6730a5d6 and b48a2770d48b). The problem that remains is that the pm_ev field is overloaded, without a definitive way to determine whether the event allocation came from the pmu-events table or FreeBSD's statically-defined PMC events. This resulted in a recent fix, 21f7397a61f7. Change: To disambiguate these two supported but separate use-cases, add a new flag, PMC_F_EV_PMU, to be set as part of the allocation, indicating that the event index came from pmu-events. This is useful in two ways: 1. On the kernel side, we can validate the syscall arguments better. Some classes support only the traditional event scheme (e.g. hwpmc_armv7), while others support only the pmu-events method (e.g. hwpmc_core for Intel). We can now check for this. The hwpmc_arm64 class supports both methods, so the new flag supersedes the existing MD flag, PM_MD_EVENT_RAW. 2. The flag will be tracked in struct pmc for the duration of its lifetime, meaning it is communicated back to userspace. This allows libpmc to perform the reverse index-to-event-name translation without speculating about the meaning of the index value. Adding the flag is a backwards-incompatible ABI change. We recently bumped the major version of the hwpmc module, so this breakage is acceptable. Reviewed by: jkoshy MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40753 --- lib/libpmc/libpmc.c | 9 +-------- lib/libpmc/libpmc_pmu_util.c | 2 +- lib/libpmc/pmclog.c | 11 +++-------- sys/arm64/include/pmc_mdep.h | 2 -- sys/dev/hwpmc/hwpmc_amd.c | 3 +++ sys/dev/hwpmc/hwpmc_arm64.c | 6 +++--- sys/dev/hwpmc/hwpmc_core.c | 6 ++++++ sys/dev/hwpmc/hwpmc_mod.c | 3 ++- sys/dev/hwpmc/hwpmc_power8.c | 3 +++ sys/dev/hwpmc/hwpmc_uncore.c | 6 ++++++ sys/sys/pmc.h | 8 ++++++++ 11 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lib/libpmc/libpmc.c b/lib/libpmc/libpmc.c index a7ed1c3d9ac8..f10a64e28cac 100644 --- a/lib/libpmc/libpmc.c +++ b/lib/libpmc/libpmc.c @@ -33,7 +33,6 @@ #include #include -#include #include #include #include @@ -1083,14 +1082,8 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode, r = spec_copy = strdup(ctrspec); ctrname = strsep(&r, ","); if (pmc_pmu_enabled()) { - if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) { - /* - * XXX: pmclog_get_event exploits this to disambiguate - * PMU from PMC event codes in PMCALLOCATE events. - */ - assert(pmc_config.pm_ev < PMC_EVENT_FIRST); + if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) goto found; - } } free(spec_copy); spec_copy = NULL; diff --git a/lib/libpmc/libpmc_pmu_util.c b/lib/libpmc/libpmc_pmu_util.c index 772dec7a9d53..fa2e76e8d026 100644 --- a/lib/libpmc/libpmc_pmu_util.c +++ b/lib/libpmc/libpmc_pmu_util.c @@ -649,7 +649,6 @@ pmc_pmu_pmcallocate_md(const char *event_name, struct pmc_op_pmcallocate *pm) assert(idx >= 0); pm->pm_ev = idx; pm->pm_md.pm_md_config = ped.ped_event; - pm->pm_md.pm_md_flags |= PM_MD_RAW_EVENT; pm->pm_class = PMC_CLASS_ARMV8; pm->pm_caps |= (PMC_CAP_READ | PMC_CAP_WRITE); @@ -680,5 +679,6 @@ pmc_pmu_pmcallocate(const char *event_name, struct pmc_op_pmcallocate *pm) return (error); } + pm->pm_flags |= PMC_F_EV_PMU; return (0); } diff --git a/lib/libpmc/pmclog.c b/lib/libpmc/pmclog.c index a21fe42c9947..3b1572baaa2c 100644 --- a/lib/libpmc/pmclog.c +++ b/lib/libpmc/pmclog.c @@ -357,15 +357,10 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len, PMCLOG_READ64(le,ev->pl_u.pl_a.pl_rate); /* - * Could be either a PMC event code or a PMU event index; - * assume that their encodings don't overlap (i.e. no PMU event - * table is more than 0x1000 entries) to distinguish them here. - * Otherwise pmc_pmu_event_get_by_idx will go out of bounds if - * given a PMC event code when it knows about that CPU. - * - * XXX: Ideally we'd have user flags to give us that context. + * pl_event could contain either a PMC event code or a PMU + * event index. */ - if (ev->pl_u.pl_a.pl_event < PMC_EVENT_FIRST) + if ((ev->pl_u.pl_a.pl_flags & PMC_F_EV_PMU) != 0) ev->pl_u.pl_a.pl_evname = pmc_pmu_event_get_by_idx(ps->ps_cpuid, ev->pl_u.pl_a.pl_event); diff --git a/sys/arm64/include/pmc_mdep.h b/sys/arm64/include/pmc_mdep.h index 5c43a7924b01..97d0f30c9c09 100644 --- a/sys/arm64/include/pmc_mdep.h +++ b/sys/arm64/include/pmc_mdep.h @@ -45,8 +45,6 @@ union pmc_md_op_pmcallocate { struct { uint32_t pm_md_config; - uint32_t pm_md_flags; -#define PM_MD_RAW_EVENT 0x1 }; struct pmc_md_cmn600_pmu_op_pmcallocate pm_cmn600; struct pmc_md_dmc620_pmu_op_pmcallocate pm_dmc620; diff --git a/sys/dev/hwpmc/hwpmc_amd.c b/sys/dev/hwpmc/hwpmc_amd.c index b15d223bc7a5..fbbaf92a1547 100644 --- a/sys/dev/hwpmc/hwpmc_amd.c +++ b/sys/dev/hwpmc/hwpmc_amd.c @@ -582,6 +582,9 @@ amd_allocate_pmc(int cpu, int ri, struct pmc *pm, if (pd->pd_class != a->pm_class) return EINVAL; + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + caps = pm->pm_caps; PMCDBG2(MDP,ALL,1,"amd-allocate ri=%d caps=0x%x", ri, caps); diff --git a/sys/dev/hwpmc/hwpmc_arm64.c b/sys/dev/hwpmc/hwpmc_arm64.c index 995b7158ac20..9a5debb8016b 100644 --- a/sys/dev/hwpmc/hwpmc_arm64.c +++ b/sys/dev/hwpmc/hwpmc_arm64.c @@ -177,9 +177,9 @@ arm64_allocate_pmc(int cpu, int ri, struct pmc *pm, } pe = a->pm_ev; - /* Adjust the config value if needed. */ - config = a->pm_md.pm_md_config; - if ((a->pm_md.pm_md_flags & PM_MD_RAW_EVENT) == 0) { + if ((a->pm_flags & PMC_F_EV_PMU) != 0) { + config = a->pm_md.pm_md_config; + } else { config = (uint32_t)pe - PMC_EV_ARMV8_FIRST; if (config > (PMC_EV_ARMV8_LAST - PMC_EV_ARMV8_FIRST)) return (EINVAL); diff --git a/sys/dev/hwpmc/hwpmc_core.c b/sys/dev/hwpmc/hwpmc_core.c index 15b875e3af94..3829a03eb729 100644 --- a/sys/dev/hwpmc/hwpmc_core.c +++ b/sys/dev/hwpmc/hwpmc_core.c @@ -239,6 +239,9 @@ iaf_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_IAF) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + iap = &a->pm_md.pm_iap; config = iap->pm_iap_config; ev = IAP_EVSEL_GET(config); @@ -721,6 +724,9 @@ iap_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_IAP) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + iap = &a->pm_md.pm_iap; ev = IAP_EVSEL_GET(iap->pm_iap_config); diff --git a/sys/dev/hwpmc/hwpmc_mod.c b/sys/dev/hwpmc/hwpmc_mod.c index de012b74d558..5dd8bc67d60a 100644 --- a/sys/dev/hwpmc/hwpmc_mod.c +++ b/sys/dev/hwpmc/hwpmc_mod.c @@ -3349,7 +3349,8 @@ pmc_do_op_pmcallocate(struct thread *td, struct pmc_op_pmcallocate *pa) * Look for valid values for 'pm_flags'. */ if ((flags & ~(PMC_F_DESCENDANTS | PMC_F_LOG_PROCCSW | - PMC_F_LOG_PROCEXIT | PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN)) != 0) + PMC_F_LOG_PROCEXIT | PMC_F_CALLCHAIN | PMC_F_USERCALLCHAIN | + PMC_F_EV_PMU)) != 0) return (EINVAL); /* PMC_F_USERCALLCHAIN is only valid with PMC_F_CALLCHAIN. */ diff --git a/sys/dev/hwpmc/hwpmc_power8.c b/sys/dev/hwpmc/hwpmc_power8.c index fc6b878eff7d..d7ccbc5c6c0a 100644 --- a/sys/dev/hwpmc/hwpmc_power8.c +++ b/sys/dev/hwpmc/hwpmc_power8.c @@ -168,6 +168,9 @@ power8_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_POWER8) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + /* * PMC5 and PMC6 are not programmable and always count instructions * completed and cycles, respectively. diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index c16800c14ce1..fd4266b605ef 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -199,6 +199,9 @@ ucf_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_UCF) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + flags = UCF_EN; pm->pm_md.pm_ucf.pm_ucf_ctrl = (flags << (ri * 4)); @@ -498,6 +501,9 @@ ucp_allocate_pmc(int cpu, int ri, struct pmc *pm, if (a->pm_class != PMC_CLASS_UCP) return (EINVAL); + if ((a->pm_flags & PMC_F_EV_PMU) == 0) + return (EINVAL); + ucp = &a->pm_md.pm_ucp; ev = UCP_EVSEL(ucp->pm_ucp_config); switch (uncore_cputype) { diff --git a/sys/sys/pmc.h b/sys/sys/pmc.h index a4d03efb6aac..714d8a7c65b7 100644 --- a/sys/sys/pmc.h +++ b/sys/sys/pmc.h @@ -369,6 +369,14 @@ enum pmc_ops { #define PMC_F_CALLCHAIN 0x00000080 /*OP ALLOCATE capture callchains */ #define PMC_F_USERCALLCHAIN 0x00000100 /*OP ALLOCATE use userspace stack */ +/* V10 API */ +#define PMC_F_EV_PMU 0x00000200 /* + * OP ALLOCATE: pm_ev has special + * userspace meaning; counter + * configuration is communicated + * through class-dependent fields + */ + /* internal flags */ #define PMC_F_ATTACHED_TO_OWNER 0x00010000 /*attached to owner*/ #define PMC_F_NEEDS_LOGFILE 0x00020000 /*needs log file */ From nobody Sun Sep 3 20:30:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf3Lh3w4rz4sNmh for ; Sun, 3 Sep 2023 20:30:52 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf3Lh0Fhgz4V3K for ; Sun, 3 Sep 2023 20:30:51 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-401da71b7faso7964925e9.2 for ; Sun, 03 Sep 2023 13:30:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693773050; x=1694377850; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dsb9Wa/yHX4THOPhn5GHL3wsCkeTS1SgubMa6gSBiso=; b=SzXtg0Ot9y3vO9LGZeI3sQM8qQ1KJX2V3JdTFDu5JbBBTG+yFpzEzkIRqGIi4rMXQb TQwRO0pAic70fmq1I/RZkrwfKOm6WymZ20PSf1/67+HSZ3itT9FmFceCurBTHcPcp9XB 9t3t+s3d94O5LPGx05yIMt1XL/LPclMmbmo6L6PiNLg7OEHZ50OUeGraRmE4gCzxxYMh YeaH6CMph7S/QgUgzq8cZotcn0tPonPNJURSQDlu5LEMp0B1aEN5JwUOmuMlEYw8dpAh /IJuelwKGBVINYA0C2bGXz65/Do8NsowjwZxzQ3uDyAwS3AWl2HnlT5Z03sCJ2EWoFYH cLUw== X-Gm-Message-State: AOJu0Yzyr5DDaidYsu8r0ezcYjCJMixRBYzcg9BnVCdBb40Pt9/nSlY9 a+Hzw1cbCcWmYUgdv5vzHkE0yA== X-Google-Smtp-Source: AGHT+IFNSWy2rwZCRUbGigjXqK76+aU7hmS6z9JD9OaCyVNS7BDwhKHrjOvX+TmPjRx/i1sgwFpzkw== X-Received: by 2002:a1c:4b15:0:b0:3fb:e356:b60d with SMTP id y21-20020a1c4b15000000b003fbe356b60dmr5882087wma.38.1693773049765; Sun, 03 Sep 2023 13:30:49 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id 11-20020a05600c234b00b003fee8793911sm11813723wmq.44.2023.09.03.13.30.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Sep 2023 13:30:49 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 02183951bfb1 - stable/13 - Fix build for FreeBSD 13. From: Jessica Clarke In-Reply-To: Date: Sun, 3 Sep 2023 21:30:38 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1D25197C-63A0-429E-A7C9-5A662E29AD46@freebsd.org> References: <202309031849.383In8u2023677@gitrepo.freebsd.org> <3D2AC67E-C1F8-4DD0-9D7C-65AD4E283C44@freebsd.org> To: Xin Li X-Mailer: Apple Mail (2.3731.600.7) X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Rf3Lh0Fhgz4V3K On 3 Sep 2023, at 21:18, Xin Li wrote: >=20 > On 2023-09-03 12:39 PM, Jessica Clarke wrote: >> On 3 Sep 2023, at 19:49, Xin LI wrote: >>>=20 >>> The branch stable/13 has been updated by delphij: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D02183951bfb19fda7a199acaeb9223cd= 28f29de3 >>>=20 >>> commit 02183951bfb19fda7a199acaeb9223cd28f29de3 >>> Author: Xin LI >>> AuthorDate: 2023-09-03 18:49:02 +0000 >>> Commit: Xin LI >>> CommitDate: 2023-09-03 18:49:02 +0000 >>>=20 >>> Fix build for FreeBSD 13. >>>=20 >>> The minigzip utility has been removed in FreeBSD 14 but still >>> exists in FreeBSD 13. The upstream revision e9d5486e removed >>> prototype definitions, rendering the code no longer compliant >>> with WARNS=3D5. >> Uh, what on earth is upstream doing? Has this been reported / >> complained about? >=20 > I've created a PR for this https://github.com/madler/zlib/pull/855 (by = converting the functions to static ones). Oh, -Wmissing-prototypes, not calling a function without a prototype. That=E2=80=99s not a big deal. Why not let WARNS stay as 5 but build = with -Wno-missing-prototypes? Jess From nobody Sun Sep 3 20:59:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf3zW2NHSz4rJ3v; Sun, 3 Sep 2023 20:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf3zW1ngrz4Z7q; Sun, 3 Sep 2023 20:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693774759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xbcooX2+6viVbU33RSxanLB0U27l70Wk9zEHQ/Tqgb4=; b=r8cNbMokSutcFfWWQIdKivPfX1AgPUEuDdQCT0/1ODaKPQbFP6+HaB2asB+aEO/wCestHJ Wkb1m6pVCrflDvawSSZ1//5NEQ4wBOS/wLx/g4LBbsO5zziPrDCysjfuuXdIUSgZhV+/Gb WeKXIy2ar8u+nqe6SujcqnzS9+FJrtdetUFYcuuqbGUEXZIqUHEaaN7TBIBE1emJVWXEDN pCY6AO/3p3OWv8l6CqyBiyVP3vZqCkRGgeWoq5GNnXrt0F/3q+svwyK6eN0EEA7zh1NcU1 zrvgjSNxLvlV1Jiq5Alk0d19LBF9XCOrffrUt0MN9ima89tmm8+JtxroJqLm5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693774759; a=rsa-sha256; cv=none; b=Pv4whlaaJ7Y9D+hn26JAcX2sjOl7vMalVdHLmWSKb2Jq+o3zy/LmbsH1xK+pbo2czZSUXy czr/IgcpXdajeTGMkZUL+gcmyxcbIoHS7Ch+xLdelNdmM7KsyG8J5bkLZYbrRMKioSi9FN +teSZaJc4iwdOMJgTP/U2eKvI5hI1k3QQMWsoEb80tfSdGjQEbC//8tWcRignCWudOsoen +okILbHZdbyIAG/pg5YVmfyysAZL+nIDDkAoHwtdUWTkhHngyQBa9m8FTKZayFqWWZZ1hZ 5r25JTHTvFkpEpXOlEd77TZSmD4L+hrd3uTtq+dfIhj59Fxf8J+7WEzTohOGLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693774759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xbcooX2+6viVbU33RSxanLB0U27l70Wk9zEHQ/Tqgb4=; b=oPMH4YpOdpeGzr4Kwe1K0dhFaW0xYXxKyKiP9wkolRUR0UJf+oLF8MMjC0p6K3RdPoY3o/ hSG2fLOg66Gnyckz1qIwowJO41AY1MeG1FbN7Y2W/rFBXQRYCPkHUihTp47qugLbE2ACE2 tUraE5Ou3mU1O3YEmIKXzjOIPGwU9YDP5xSdCjwgwt70Jf5/YXzeoPoBTLWoNZd6Dtvji/ BhD5xna92uASAgqnYbfY5Rsugvyr5E1il0z+F2pCpdW66kYDv6w8tGzuF1lgg0YPrNyTsE cjpepqTHiKDp//NBTpParkujloq1jeAEG+iyUWQnVPjH4t9TAOrm5gQ/ba8MLw== 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 4Rf3zW0r8GzfkN; Sun, 3 Sep 2023 20:59:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 383KxJPk039802; Sun, 3 Sep 2023 20:59:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 383KxJq3039799; Sun, 3 Sep 2023 20:59:19 GMT (envelope-from git) Date: Sun, 3 Sep 2023 20:59:19 GMT Message-Id: <202309032059.383KxJq3039799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: d6fec2dacf80 - stable/14 - release: remove arm/armv6 RPI-B configuration file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d6fec2dacf80a73dbfd543615350c83fdf810015 Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=d6fec2dacf80a73dbfd543615350c83fdf810015 commit d6fec2dacf80a73dbfd543615350c83fdf810015 Author: Glen Barber AuthorDate: 2023-08-31 23:24:38 +0000 Commit: Glen Barber CommitDate: 2023-09-03 20:59:00 +0000 release: remove arm/armv6 RPI-B configuration file The arm/armv6 RPI-B images are deprecated in 15 and 14. An MFC to stable/14 will follow. Approved by: re (cperciva) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd (cherry picked from commit 82c57e2a75c7134b70eb2138ff6bbc6e55bef130) --- release/arm/RPI-B.conf | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf deleted file mode 100644 index 839348e418f7..000000000000 --- a/release/arm/RPI-B.conf +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# - -EMBEDDED_TARGET_ARCH="armv6" -EMBEDDED_TARGET="arm" -EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-rpi sysutils/rpi-firmware" -FAT_SIZE="50m" -FAT_TYPE="16" -IMAGE_SIZE="5120M" -KERNEL="RPI-B" -MD_ARGS="-x 63 -y 255" -UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi" -RPI_FIRMWARE_DIR="/usr/local/share/rpi-firmware" -OL_DIR="${RPI_FIRMWARE_DIR}/overlays" -OVERLAYS="mmc.dtbo disable-bt.dtbo" -PART_SCHEME="MBR" -export BOARDNAME="RPI-B" - -arm_install_uboot() { - UBOOT_FILES="u-boot.bin" - RPI_FIRMWARE_FILES="bootcode.bin config.txt \ - fixup.dat fixup_cd.dat fixup_db.dat fixup_x.dat \ - start.elf start_cd.elf start_db.elf start_x.elf \ - bcm2708-rpi-zero-w.dtb bcm2708-rpi-b-plus.dtb \ - bcm2708-rpi-b.dtb bcm2708-rpi-cm.dtb" - FATMOUNT="${DESTDIR%${KERNEL}}/fat" - chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" - chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT} - for _UF in ${UBOOT_FILES}; do - chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \ - ${FATMOUNT}/${_UF} - done - for _UF in ${RPI_FIRMWARE_FILES}; do - chroot ${CHROOTDIR} cp -p ${RPI_FIRMWARE_DIR}/${_UF} \ - ${FATMOUNT}/${_UF} - done - chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays - for _OL in ${OVERLAYS}; do - chroot ${CHROOTDIR} cp -p ${OL_DIR}/${_OL} \ - ${FATMOUNT}/overlays/${_OL} - done - sync - umount_loop ${CHROOTDIR}/${FATMOUNT} - chroot ${CHROOTDIR} rmdir ${FATMOUNT} - - return 0 -} From nobody Sun Sep 3 21:38:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rf4rP3VFKz4rl0h; Sun, 3 Sep 2023 21:38:13 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rf4rP2zWmz3J1r; Sun, 3 Sep 2023 21:38:13 +0000 (UTC) (envelope-from delphij@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693777093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GgkgbPmi6hJmRZBX5/Hnj72OOGq/7KohSiLJ6fjVpXw=; b=OZFjw1r3lp0fZ2YncPwMwux0lQ2CBkMf6K3nCB+n1GnArqgYx/TohMq+ig9ARLWV8sgFg5 vk9JBoyF7RGgqM0phce3wrsHJ7FWdbDY/juE5w23nonisgimgwv9it5nNm6uFMhkpgb7Oc Et/EXnUjv0JR0OdwbmyaE8iTyV4C1NbxFJ+UjLPMDBOrkLDwyZWFgdwNPWJ171jlKzToeL fJfBvrb26jrfpvYpBej921fyx0sE+SyXGgU0Yq+GhyrR7TIMmRuDppdGW45v2nHcTZp9uC 3iloStpyDnodgD0ASyls4JT8DQGyqIKDhhMhx1xxeX+J7sy/f9IKG0UGtlk6yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693777093; a=rsa-sha256; cv=none; b=rgnmIyPEQ+/+m/frWKCN8vT9XoQgMtbk5uCVT0C1Ea0ZNIpOLTmuS9yZRaOgn3mUxyOhLN J8aKrMoYLbzMWnOgDfbL0BHoHkz4bhda897EanA0q02+W6Gg4hqVcKNyOJhgapCAnj/aLB WidvHQiKhPnHXSypJF/+7cEbM61cWvyLCNzN4XyrUIOdVjky+OKTgx6JCrizEcZyvfskpz JN2pbEvYD6iwKEuT5gS+uE3xFRBl5Q+bBzFXC7/gAZ6t5TobIG5+j4dGNYFNCbK0L8d5Ti mJXjM1FVX6LDs+LC8m3vMJaKJa+xRfy5XRMty2ZEl6ZLg3djziFCb9qLhoECdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693777093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GgkgbPmi6hJmRZBX5/Hnj72OOGq/7KohSiLJ6fjVpXw=; b=fDtnJ/EXmaFf+SiCMC0qnCYeqklZLqB1O9mrupT6TaSXs6iKTZpYYyWYpFpVO7dMxJJ8tQ YTIrTJyI8xBWL1fX3mbgsaApy6nJElk42HtGnLdgK/oBJ99euzvY8Q3i9xpARbJZkyKBdd L53LdmqK77Xod0ZqzyKqAok3s9MHyTxSOPVJLh+Wf5XfczliKD+LnYTYeZgfa//mzBVMTd ynfO6PsD00o7S2kotdf8r4YFvMdZwB7EsjpwxgRz4ZP8ho8kjEHipZnLHzy//s1NUE14JV BqINthxN/i87/CQ3hF04jHfycnD0GUkbILYx7CDPMmnqPzuiH2l9sf7at0oPIQ== Received: from [100.64.10.64] (unknown [141.193.140.240]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: delphij/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rf4rN4wCSz17L; Sun, 3 Sep 2023 21:38:12 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Message-ID: <9cc70cf3-2ce5-e90c-dd53-de86dc6d2275@FreeBSD.org> Date: Sun, 3 Sep 2023 14:38:11 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Thunderbird Subject: Re: git: 02183951bfb1 - stable/13 - Fix build for FreeBSD 13. Content-Language: en-US To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-branches@freebsd.org" References: <202309031849.383In8u2023677@gitrepo.freebsd.org> <3D2AC67E-C1F8-4DD0-9D7C-65AD4E283C44@freebsd.org> <1D25197C-63A0-429E-A7C9-5A662E29AD46@freebsd.org> From: Xin Li Organization: The FreeBSD Project In-Reply-To: <1D25197C-63A0-429E-A7C9-5A662E29AD46@freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2023-09-03 1:30 PM, Jessica Clarke wrote: > On 3 Sep 2023, at 21:18, Xin Li wrote: >> >> On 2023-09-03 12:39 PM, Jessica Clarke wrote: >>> On 3 Sep 2023, at 19:49, Xin LI wrote: >>>> >>>> The branch stable/13 has been updated by delphij: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=02183951bfb19fda7a199acaeb9223cd28f29de3 >>>> >>>> commit 02183951bfb19fda7a199acaeb9223cd28f29de3 >>>> Author: Xin LI >>>> AuthorDate: 2023-09-03 18:49:02 +0000 >>>> Commit: Xin LI >>>> CommitDate: 2023-09-03 18:49:02 +0000 >>>> >>>> Fix build for FreeBSD 13. >>>> >>>> The minigzip utility has been removed in FreeBSD 14 but still >>>> exists in FreeBSD 13. The upstream revision e9d5486e removed >>>> prototype definitions, rendering the code no longer compliant >>>> with WARNS=5. >>> Uh, what on earth is upstream doing? Has this been reported / >>> complained about? >> >> I've created a PR for this https://github.com/madler/zlib/pull/855 (by converting the functions to static ones). > > Oh, -Wmissing-prototypes, not calling a function without a prototype. > That’s not a big deal. Why not let WARNS stay as 5 but build with > -Wno-missing-prototypes? I didn't think it was worth the effort as the tool is not being used and is removed in FreeBSD 14, but to your point: https://reviews.freebsd.org/D41707 From nobody Mon Sep 4 08:34:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfMPj0KNxz4sHNL; Mon, 4 Sep 2023 08:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfMPh6zDqz4JGm; Mon, 4 Sep 2023 08:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693816473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+qBhrEX+gH5rbfTiBzi2f14+0rYMar01d3P4ETlhTU=; b=eUVlViswRC2buG885e9sr6rWWUjSt3P1HGjFFLMuXhQGtNjNZfzcZoVJBJJB2xKc6GlMCq RkM1cjf48qgD9kJdwagsPEecGdlH5VOfJW22FjkMPIQpSw66bWtRQWbTM6qb1T/njCBm3J jhSnmdaVz9WBoo3aXdWLHU2kyQ7otH69Oz1jxTo+Gq+TsjIiloZn7syT5LYj4JyeNCoeab M/P6La5yl0T3dxu/66e0tZS3AbDK2JL5YuUhEvChzWb2S7gSDn1LDCYhsOSWt8dxLNX1w0 rPiDFABRLhKme7WKIoSTyuZ7AeOSUJQy6ywTjEk/M7RnC8326IblqZRwxUnIUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693816473; a=rsa-sha256; cv=none; b=My7U6J1y1udyvW7oAm8jRWcvmyq2lhq8DUbQjWTqKzDUw1htyrmFJYeyH0Uxm3RtHAyPHH eqePOr4ew+jnt6dB9Tu0XOiwlGZ4f/MEhq+sQbZRHab56Xh21VtxRwmPG5FYvcq2vH6QOi Fg/KEMuRclqqWqx3LWZo9EuhnCdaLlCcwUyVrN6kxsq0v69FQ5Cb9Nlh4FfqyqO0dFYNR6 7BAMVgIKEYdy2cksj+gqT+MjYOuzCGCmmOzzCGpa1zQUDmEwwTiPqBwL5IwMVoTovV4A13 Jf6+Ln3GDd4BNEJlsU7EBRx7AGF5Yvxv6mgKdbau/sxRrXT9iIVFEV2u0PN4YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693816473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+qBhrEX+gH5rbfTiBzi2f14+0rYMar01d3P4ETlhTU=; b=QuGJix9g9VFvwXvVeVgGth+hKf1qRLHmY/EN5SVQgL+q5Uj7R3zwjlakcR+lR6qLcn6nOJ FvdOAyIrt417LBwrbN50CjMJB/Gi8XwCdp+zhCiUOs2ayn/AOXFo+a35W4gT1TRZIxunxQ Ifv6m1fGOeXyw25lFGbo1Pfp9eSCi6hVUamck11zahCtMD2DDrvTKcWrcCv2oSDnbcRJ76 Y3FVwi4PohnRM8nZP8fDfTd1v2VD76crYEYTRp/gFj/gewHMxY55YT7Chw8I4mtU0HQajy q2w1XxteAX5lZns0sWc3GjXxm0CQaKcs6DJgdpauMl+bVRaGMNnSHOGsewhsEQ== 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 4RfMPh5xmYz10HF; Mon, 4 Sep 2023 08:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3848YWog097318; Mon, 4 Sep 2023 08:34:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3848YWod097315; Mon, 4 Sep 2023 08:34:32 GMT (envelope-from git) Date: Mon, 4 Sep 2023 08:34:32 GMT Message-Id: <202309040834.3848YWod097315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 8524dc53fd4c - main - Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f commit 8524dc53fd4c6b79d75b82cb82f3ac72fc25e85f Author: Jessica Clarke AuthorDate: 2023-09-04 08:33:27 +0000 Commit: Jessica Clarke CommitDate: 2023-09-04 08:33:27 +0000 Merge commit 4bb2416d42eb from llvm-project (by Jessica Clarke): [builtins][AArch64] Implement _sync out-of-line atomics Whilst Clang does not use these, recent GCC does, and so on systems such as FreeBSD that wish to use compiler-rt as the system runtime library but also wish to support building programs with GCC these interfaces are needed. This is a light adaptation of the code committed to GCC by Sebastian Pop , relicensed with permission for use in compiler-rt. Fixes https://github.com/llvm/llvm-project/issues/63483 Reviewed By: sebpop, MaskRay Differential Revision: https://reviews.llvm.org/D158536 Reviewed by: dim MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41716 --- .../compiler-rt/lib/builtins/aarch64/lse.S | 40 ++++++++++++++++++++-- lib/libcompiler_rt/Makefile | 2 +- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S index 5dc0d5320b5a..1fe18f4a4681 100644 --- a/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S +++ b/contrib/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S @@ -7,7 +7,7 @@ // Out-of-line LSE atomics helpers. Ported from libgcc library. // N = {1, 2, 4, 8} // M = {1, 2, 4, 8, 16} -// ORDER = {'relax', 'acq', 'rel', 'acq_rel'} +// ORDER = {'relax', 'acq', 'rel', 'acq_rel', 'sync'} // Routines implemented: // // iM __aarch64_casM_ORDER(iM expected, iM desired, iM *ptr) @@ -35,8 +35,8 @@ HIDDEN(___aarch64_have_lse_atomics) #endif // Generate mnemonics for -// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4 -// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4 +// L_cas: SIZE: 1,2,4,8,16 MODEL: 1,2,3,4,5 +// L_swp L_ldadd L_ldclr L_ldeor L_ldset: SIZE: 1,2,4,8 MODEL: 1,2,3,4,5 #if SIZE == 1 #define S b @@ -64,24 +64,44 @@ HIDDEN(___aarch64_have_lse_atomics) #define L #define M 0x000000 #define N 0x000000 +#define BARRIER #elif MODEL == 2 #define SUFF _acq #define A a #define L #define M 0x400000 #define N 0x800000 +#define BARRIER #elif MODEL == 3 #define SUFF _rel #define A #define L l #define M 0x008000 #define N 0x400000 +#define BARRIER #elif MODEL == 4 #define SUFF _acq_rel #define A a #define L l #define M 0x408000 #define N 0xc00000 +#define BARRIER +#elif MODEL == 5 +#define SUFF _sync +#ifdef L_swp +// swp has _acq semantics. +#define A a +#define L +#define M 0x400000 +#define N 0x800000 +#else +// All other _sync functions have _seq semantics. +#define A a +#define L l +#define M 0x408000 +#define N 0xc00000 +#endif +#define BARRIER dmb ish #else #error #endif // MODEL @@ -96,7 +116,12 @@ HIDDEN(___aarch64_have_lse_atomics) #endif #define NAME(BASE) GLUE4(__aarch64_, BASE, SIZE, SUFF) +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXR GLUE3(ld, xr, S) +#else #define LDXR GLUE4(ld, A, xr, S) +#endif #define STXR GLUE4(st, L, xr, S) // Define temporary registers. @@ -136,9 +161,15 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXR w(tmp1), s(1), [x2] cbnz w(tmp1), 0b 1: + BARRIER ret #else +#if MODEL == 5 +// Drop A for _sync functions. +#define LDXP GLUE2(ld, xp) +#else #define LDXP GLUE3(ld, A, xp) +#endif #define STXP GLUE3(st, L, xp) #ifdef HAS_ASM_LSE #define CASP GLUE3(casp, A, L) x0, x1, x2, x3, [x4] @@ -159,6 +190,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(cas)) STXP w(tmp2), x2, x3, [x4] cbnz w(tmp2), 0b 1: + BARRIER ret #endif END_COMPILERRT_OUTLINE_FUNCTION(NAME(cas)) @@ -180,6 +212,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(swp)) LDXR s(0), [x1] STXR w(tmp1), s(tmp0), [x1] cbnz w(tmp1), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(swp)) #endif // L_swp @@ -224,6 +257,7 @@ DEFINE_COMPILERRT_OUTLINE_FUNCTION_UNMANGLED(NAME(LDNM)) OP s(tmp1), s(0), s(tmp0) STXR w(tmp2), s(tmp1), [x1] cbnz w(tmp2), 0b + BARRIER ret END_COMPILERRT_OUTLINE_FUNCTION(NAME(LDNM)) #endif // L_ldadd L_ldclr L_ldeor L_ldset diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index 1ba94bc5eec8..f894d68e6478 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -22,7 +22,7 @@ MK_WERROR.gcc= no .if ${MACHINE_CPUARCH} == "aarch64" . for pat in cas swp ldadd ldclr ldeor ldset . for size in 1 2 4 8 16 -. for model in 1 2 3 4 +. for model in 1 2 3 4 5 . if ${pat} == "cas" || ${size} != "16" # Use .for to define lse_name, to get a special loop-local variable . for lse_name in outline_atomic_${pat}${size}_${model}.S From nobody Mon Sep 4 08:36:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfMSS6SHxz4sJ49; Mon, 4 Sep 2023 08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfMSS5wkSz4Jrv; Mon, 4 Sep 2023 08: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=1693816616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQKLxZNMze5ug/g4SazUbWgqkMRak06KRe3ysx6+RK8=; b=Rv6LRDrf+NZBxAp+r85lNNllm2SXGSjm7E+myK7yS8T8JVi9mw3xu2/Qy4VnHCaLa8IC4w xhW4Ua4XtsFrip8QC3kgxBegE4Rbh6U0E59VlPSJXDleydwmFl5RyGqQethyPe6YYAQ8dB kDYlfvJO3qonH5am4NGR+/tf7zdgdJhW9REEhIAlGZLNT+jitBfzP8ZBx4hhl39r62Hwye VxXiwaxI6PjZHxlZlkinc0p7HxJX8vIxeQ5q+H2LjdM/4LNd6fMFguDlA0LH3xJKlEsZ3/ 8YH5TKhatanfHqaRkmI/Hjk9U4hCpl/nRMpp1WauYrHezu1vUGOeFc9lbd1d+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693816616; a=rsa-sha256; cv=none; b=DXgb+LHlQ2W9f0xfBGA2YfR82CLTFkOYsFuhLhDDJT8ECH/OlVhp2Dc6ZTZWUiibbqst80 VAl3LB5521aYojmplDs283iiaWcE+++gIKOIgsSGaazrDvBRMe8qG3BQ/Hp7tGIdK7Eu1c 2UhExbrJcQ0n+ReK/mVhS3LaEM5ct7D+383qnl2dAOJ5r4wZPuBOONMEQlDpMipRv8DWK/ 6RBrhyzv44pqlfU3VUZTKLbexz0a0jqIuSTBwI96NH10llQGW5cqXptqD7snQ80R2Z6mq9 iwHaEHeP8Mul3dYWpI+Sjaq5ufoz+PcqoHuf3IORl3cwsI1fW7z8TbV+g+QxhQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693816616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQKLxZNMze5ug/g4SazUbWgqkMRak06KRe3ysx6+RK8=; b=k/dVPw3gdBQiMlij2/NVRSzCnz9JjIaD21aKHRZzBIpXq/sbRlGkwC/1v5NPKL25dxteaz q/K9Q0leduijT3t8W71t2/GDyeazGte+4f8phgCs77PxyJA+z6NjHHxKXh6tXDFeBg6qK5 VDEiC6guD/uQ6xU68kwIEqTj4uspWZI+7n1zdlVNI3pqSKRquqeWF1zD/ibdnoFnu11PDU 0xm00tug7fk30MEevkXyVPvxlzpupdiSbV147bK0vT8qoOLfDX8ziLvmbfkVluCEIA/Vc3 Dy9P2+Su4RImC+EI3UEaFW9KjyPF28eEnZd5nxUVUxFK9nxgUfFqONISI0GiNg== 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 4RfMSS4zq3z10Ts; Mon, 4 Sep 2023 08:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3848auG8097875; Mon, 4 Sep 2023 08:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3848auCb097872; Mon, 4 Sep 2023 08:36:56 GMT (envelope-from git) Date: Mon, 4 Sep 2023 08:36:56 GMT Message-Id: <202309040836.3848auCb097872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 87329215f964 - stable/13 - arm: Add missing no-ctfconvert for fw_stub.awk target List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 87329215f964a3f23643ee27807b72086f159d82 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=87329215f964a3f23643ee27807b72086f159d82 commit 87329215f964a3f23643ee27807b72086f159d82 Author: Jessica Clarke AuthorDate: 2023-08-22 20:00:37 +0000 Commit: Jessica Clarke CommitDate: 2023-09-04 08:36:41 +0000 arm: Add missing no-ctfconvert for fw_stub.awk target This target produces a C file not an object file, so using ctfconvert on it should not be attempted. This keeps it in sync with all other uses of fw_stub.awk, squashes a warning seen during the build of TEGRA124 on FreeBSD and avoids the same issue failing the build on non-FreeBSD (such errors are #ifdef'ed into being warnings on FreeBSD in ctfconvert, which should be revisited in the future). Reviewed by: manu MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41542 (cherry picked from commit c9b2751d76bd5a212fedab46512abb533e9ea695) --- sys/arm/nvidia/tegra124/files.tegra124 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/nvidia/tegra124/files.tegra124 b/sys/arm/nvidia/tegra124/files.tegra124 index 7ec57879b9c3..640889c0b240 100644 --- a/sys/arm/nvidia/tegra124/files.tegra124 +++ b/sys/arm/nvidia/tegra124/files.tegra124 @@ -45,7 +45,7 @@ arm/nvidia/drm2/tegra_bo.c optional drm2 tegra124_xusb_fw.c optional tegra124_xusb_fw \ dependency "$S/arm/nvidia/tegra124/files.tegra124" \ compile-with "${AWK} -f $S/tools/fw_stub.awk tegra124_xusb.fw:tegra124_xusb_fw -mtegra124_xusb_fw -c${.TARGET}" \ - no-implicit-rule before-depend local \ + no-ctfconvert no-implicit-rule before-depend local \ clean "tegra124_xusb_fw.c" tegra124_xusb.fwo optional tegra124_xusb_fw \ dependency "tegra124_xusb.fw" \ From nobody Mon Sep 4 10:15:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfPfZ5rPJz4rnZT; Mon, 4 Sep 2023 10:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfPfZ5N0xz3JRS; Mon, 4 Sep 2023 10:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693822550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDd5n6YLYo95kUFdjF/68DZRbJCtp341kdNitf8Mwis=; b=W0IfVPthKjOBEGoBGHOr0R1Z0D6BCP2bXZBdtLBf9g+rvMdWQl3v6b03DG//D8DJZy0Hb2 z19WmV3w0I1Om2nIc23eID3dWlwlWuyNE7XY19v5kj78dVzPsQ5jHH63tsOqcYHFv1n5Rs SGc/DrpEGbe/4T7WV0CKVbnKO59CFWEAetQ2OUYMGy77hm6Q55h6EiQpjkuvm0u0NH0iir ekAHRzLf78YN+IyM3nYpOmvdMNijnNkrjQlK98U5jhFTTjbluInMMNj9JzYrgN/lU9OT87 HRWB8peXJuiYaGVe3ug3xoXdgB0oLqDXeEzLBAxwLabfwkQsM1CZBWIseIrRhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693822550; a=rsa-sha256; cv=none; b=bTZbisML36ngOUTC5UT8PoyzwzJS4X4177UmKrt8RV40ddJ2qthV33k3/tf60z8rIUt+2n zPK4X2y8ilR70z7x2lQ6Epnf9/uOu2dssNDqXUz8GpaVxuF3teKaKEXluuyNDlFWhLVcOO OD2Nu1HO7zH43DpRVmsbs6UDHtrXcSyd2FkUzxreSX7uL0yDC0x8pL1PAMUswjqfulsdid futiIxvhjqiVNbrGiQ29v+Nin9F4RGPN+7Q+mKKR5jm/2h2WetylqSnqgO6kNCmMs1lsTC FVBrYehSOzI48w+vF5Nm3zVrHjEU9ykESrxaguV09dI7uX+lB33Hku2Vgo0jfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693822550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HDd5n6YLYo95kUFdjF/68DZRbJCtp341kdNitf8Mwis=; b=ObV+rPEbz8ohKKEA3r9Tq55rdbM3GYG9ZM9+/8WXsCLDutFUd6lwjMU5NAOG5vRfNrqbFY ouhbjys5mZdikB5+oPeXvy51IJeVAAe/XzRaylyrB8D0O1jdeLx2vzm82UmLCFnBDvLfoX mHuV31vw0Mm247dvaOLIkiNBIm7afTCnNfL2K0hbAeKCCqbyRZc0TVZ3SYanbFvFIgT3aJ ZOpv5p05UVO48t27hgCEN1pN4+9KD4P/dpiKnnt9En1XocqkaC05QIHYh/gcLF4NHeneE5 zPm9tO4P8zk4rJyJ/sQrRbzKRH1rXTAR1DUks1eK21YeHyAgOX5URUMEDf8v9w== 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 4RfPfZ4TGmz139K; Mon, 4 Sep 2023 10:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384AFonh068879; Mon, 4 Sep 2023 10:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384AFoha068876; Mon, 4 Sep 2023 10:15:50 GMT (envelope-from git) Date: Mon, 4 Sep 2023 10:15:50 GMT Message-Id: <202309041015.384AFoha068876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 2f7e72bd1c02 - main - arcmsr(4): Fix typo: rebulid -> rebuild List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f7e72bd1c024e1e8274acbe1ce57514fd444583 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=2f7e72bd1c024e1e8274acbe1ce57514fd444583 commit 2f7e72bd1c024e1e8274acbe1ce57514fd444583 Author: Mustafa Ateş Uzun AuthorDate: 2023-08-17 13:45:14 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-04 10:13:03 +0000 arcmsr(4): Fix typo: rebulid -> rebuild MFC after: 3 days Pull Request: https://github.com/freebsd/freebsd-src/pull/819 --- sys/dev/arcmsr/arcmsr.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index b43e9b8b3813..9dd3142d1933 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -1366,7 +1366,7 @@ static void arcmsr_stop_hba_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBA_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); if(!arcmsr_hba_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n" + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n" , acb->pci_unit); } } @@ -1380,7 +1380,7 @@ static void arcmsr_stop_hbb_bgrb(struct AdapterControlBlock *acb) acb->acb_flags &= ~ACB_F_MSG_START_BGRB; WRITE_CHIP_REG32(0, phbbmu->drv2iop_doorbell, ARCMSR_MESSAGE_STOP_BGRB); if(!arcmsr_hbb_wait_msgint_ready(acb)) { - printf( "arcmsr%d: wait 'stop adapter background rebulid' timeout \n" + printf( "arcmsr%d: wait 'stop adapter background rebuild' timeout \n" , acb->pci_unit); } } @@ -1394,7 +1394,7 @@ static void arcmsr_stop_hbc_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_doorbell,ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE); if(!arcmsr_hbc_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -1406,7 +1406,7 @@ static void arcmsr_stop_hbd_bgrb(struct AdapterControlBlock *acb) acb->acb_flags &= ~ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBD_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); if(!arcmsr_hbd_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -1420,7 +1420,7 @@ static void arcmsr_stop_hbe_bgrb(struct AdapterControlBlock *acb) acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); if(!arcmsr_hbe_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3367,7 +3367,7 @@ static void arcmsr_start_hba_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBA_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); if(!arcmsr_hba_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3380,7 +3380,7 @@ static void arcmsr_start_hbb_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; WRITE_CHIP_REG32(0, phbbmu->drv2iop_doorbell, ARCMSR_MESSAGE_START_BGRB); if(!arcmsr_hbb_wait_msgint_ready(acb)) { - printf( "arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf( "arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3393,7 +3393,7 @@ static void arcmsr_start_hbc_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_doorbell, ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE); if(!arcmsr_hbc_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3405,7 +3405,7 @@ static void arcmsr_start_hbd_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBD_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); if(!arcmsr_hbd_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3419,7 +3419,7 @@ static void arcmsr_start_hbe_bgrb(struct AdapterControlBlock *acb) acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); if(!arcmsr_hbe_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* From nobody Mon Sep 4 10:19:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfPl31md1z4rpg9; Mon, 4 Sep 2023 10:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfPl31LZJz3K94; Mon, 4 Sep 2023 10:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693822783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkLMIhbIqKl7SpbLcK/d8zTB8orcSuy5Yc1O6rT+0wg=; b=RwrFSCdv0qc8GNYXg0mRVQCy2/7qL996Kg91ZoEKwhZUquuFx9x6fmRXy60Lm11WGFq17E p1xuT6I0xLVMAEmV8Ma3g6X6NlcEH1N4L+sTpg2/kYwO5HCjxLVI2KxCXtt56t1yj3dqZa 2cai7YsxzSKAXyRMXW2fFFfeIIiZYIHmcwGkc/gS5VN0SJWNDv+duvcdCzr7JmppaIcyiz 0EzdYPTh7gCeQFI9CF1InHwoXPho32WBHLg0Nmp1F4TrFS4mOYfOAL3Fn6LyMZM7YIjhyC t/OLy6a5BPZHW25BixXENdIytfgaTfoXOraXVyWMJKuSkGt0n2j1m5AUAYgNDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693822783; a=rsa-sha256; cv=none; b=dM8SlPJiAHxlT3ZSF6Tp82N10fwQAQEHUNjAY2r3/8x/U6ZnynzDTEbabcgYCamsvcphPz cXhjL7+21E2r69L3Ux6R62dgilJEDMRIi0JZPpfzw5DZ0w4gWBrLa3iQ7mlZWcQ5yjWbLl 64dJkt70jdT/8b0s33FUsjqUMWq739YGf+zEQeP1sRBpcE+tCwyBUTKfLa8vXV0PfFOenJ y/V1T+vYFxiCVgi3+sgzqbyggqTuY23joyW5pkccCYUespVFb+JbbyrI+E+q1hQ4cTXErm giXj0F0QUQQLi7YbdxdDCLlHey9/nEflGL1rVpctsxvttIS0mBlzRJ9qVgIPQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693822783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkLMIhbIqKl7SpbLcK/d8zTB8orcSuy5Yc1O6rT+0wg=; b=N/hpEBr37CL5rOuQYGom5usAdxVlAm/O9v/E5SA+beYB2apT5S4fdu837soYwJRAZzUGsi ZJ3oX88urpt+n12WnXtnj2F0tXjjKOYiMwoLitF/ACspA8VXvUYvkTPFJtSAMJ8yfzWJwp F1p7zfIDx5G59nMQ+ZB1lH8ZXBclTDyxjB4c6u3COCLIEQABxn5xdk3WJoEPGrNb8F5Zch 7B74CNY1iVzv7kq4uHFt4mFkKOtZ4sgpuXJnW0TuWGrazcsHKHEfM3WccY9BPHDMx8Zz9c a/qNb/M7+eQXYLk5Hj+waA/4eA/gVY1WhEOzAFovattHDBkQcXjKzEqxxgTX5A== 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 4RfPl30JHvz12sr; Mon, 4 Sep 2023 10:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384AJg9c069488; Mon, 4 Sep 2023 10:19:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384AJglP069485; Mon, 4 Sep 2023 10:19:42 GMT (envelope-from git) Date: Mon, 4 Sep 2023 10:19:42 GMT Message-Id: <202309041019.384AJglP069485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: dbf30052ca44 - main - committers-doc.dot: move grahamperrin to alumni List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dbf30052ca44c482d564090f54538cee36be83d0 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=dbf30052ca44c482d564090f54538cee36be83d0 commit dbf30052ca44c482d564090f54538cee36be83d0 Author: Graham Perrin AuthorDate: 2023-08-26 02:47:46 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-04 10:18:07 +0000 committers-doc.dot: move grahamperrin to alumni Pull Request: https://github.com/freebsd/freebsd-src/pull/828 --- share/misc/committers-doc.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 46583e758f1b..9cc963360f4d 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -41,6 +41,7 @@ eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/10/15\2022/09/15"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02\n2021/09/21"] garys [label="Gary W. Swearingen\ngarys@FreeBSD.org\n2005/08/21\n2008/03/02"] gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2011/07/18\n2021/10/24"] +grahamperrin [label="Graham Perrin\ngrahamperrin@FreeBSD.org\n2022/06/01\n2023/08/24"] issyl0 [label="Isabell Long\nissyl0@FreeBSD.org\n2012/04/25\n2017/08/25"] jcamou [label="Jesus R. Camou\njcamou@FreeBSD.org\n2005/03/02\n2008/12/20"] jesusr [label="Jesus Rodriguez Cuesta\njesusr@FreeBSD.org\n1998/12/10\n2010/12/11"] @@ -91,7 +92,6 @@ fernape [label="Fernando Apesteguia\nfernape@FreeBSD.org\n2021/02/07"] ganbold [label="Ganbold Tsagaankhuu\nganbold@FreeBSD.org\n2008/02/26"] gbe [label="Gordon Bergling\ngbe@FreeBSD.org\n2020/06/08"] gjb [label="Glen Barber\ngjb@FreeBSD.org\n2010/09/01"] -grahamperrin [label="Graham Perrin\ngrahamperrin@FreeBSD.org\n2022/06/01"] hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2000/07/06"] jgh [label="Jason Helfman\njgh@FreeBSD.org\n2014/01/20"] joel [label="Joel Dahl\njoel@FreeBSD.org\n2005/04/05"] From nobody Mon Sep 4 10:40:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfQCQ3PT6z4rwN2; Mon, 4 Sep 2023 10:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfQCQ2zBwz3N2Q; Mon, 4 Sep 2023 10:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWGMjHf1iMgzWOmvfmNsxrSAB3nmkawLhp/2k4Ste1I=; b=Zp6ZrvQ9wQCRopdC6dqhmV25Ja99+1QkOtLqwIkFieKxx5qW/1G5+YDCzebes9qVEma1jm wSDMbS5bD5t30t2L5tGg1y78zORllnl4AsdA2Ll8zoUZzc2kbzqGXInUATglPU88M87YCp 5ZQitu8u3vH7S1ide3RR7DEOFrHF57LtqozyMKN5RIwHFGcNG8niRP3v4VWsdQcOwW+Tda rFg8mCs2RRORZcoonbfb727y2jrUsKXN7oA2tfhiPbsOc3xUpGFudbqM2Dh/UrS7JzL3jG a8dYPXKXVm8UvkcWHmFJw1/xrwhpU+g/NC9c9sykX6LM0lzutdU1nKuYoI6sTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693824050; a=rsa-sha256; cv=none; b=q2XMu2vEok0hxTofA6RjsWXPIgpLHFjkMpLNpTgb76imv+f9s7GRsTsHbk7/EGuiRahWfA CceUSf12J31ty+x9s4ej737v7djESjFpgCpDbaLkY/aonFmcB6+97Jt434msRihrz0F8io gVr7T/tHoopJ9vloKQ0Az4sqnjpsJnbvh3nmgiTpyx6Hs407zypyaZFz262PBtkjNB1teD umc8HTU8q0oURgLsvRiYNnmxqkYCi0IthpiuK8unbzoeTjlofIhL+tELNljy8vgp/cT5Yn ApxVkecY5nWpzUAQzbaqhCLNrKNjtvL3/0IZ1YXJCmePFqVlu6NA9+qzQFEMsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693824050; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tWGMjHf1iMgzWOmvfmNsxrSAB3nmkawLhp/2k4Ste1I=; b=ygY42yI2N8qT8cTbPJG1wNzN1wTpW+ASut9F7Brqdb5+9GMUPmtAw5DpJWTWhernPD08eP 8rxbmJHd9AnFbCzhgG1EWTsnv2YTzmw0KZoI2QY6kCGYr4CkbYqOZNOxcQ1weeurCdn8F/ C/YxHBrZGZ58N0pTdC4TtMuhBNob/ENsSv9vSeX8CW2LdpUVD5wdeLdW5W3wSZSe3IBm/s 8SWriaHDItfjF/oc72015YaztYancD2k8vbNMNvyhDF9lUY3uSMwumeGzm3nb5VM4pErK/ 6q6sbVgjdIXlcmmc2VDLK+aMvtNFwBTIT6MtMmw4/mhOw+6qZS9s50TdNL64Eg== 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 4RfQCQ232dz12xc; Mon, 4 Sep 2023 10:40:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384Aeoo7011162; Mon, 4 Sep 2023 10:40:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384Aeohp011159; Mon, 4 Sep 2023 10:40:50 GMT (envelope-from git) Date: Mon, 4 Sep 2023 10:40:50 GMT Message-Id: <202309041040.384Aeohp011159@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 289ba6b870f7 - main - Hyper-V: hn: use VF's capabilities when it is attached List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 289ba6b870f79d8dbd9e8022c4fa23469be11a73 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=289ba6b870f79d8dbd9e8022c4fa23469be11a73 commit 289ba6b870f79d8dbd9e8022c4fa23469be11a73 Author: Wei Hu AuthorDate: 2023-09-04 10:15:06 +0000 Commit: Wei Hu CommitDate: 2023-09-04 10:40:11 +0000 Hyper-V: hn: use VF's capabilities when it is attached Current code in hn/netvsc tries to merge (logical AND) VF and its own capability bits when a VF is attached. This results in losing some key VF features, especially in tx path. For example, the VF's txcsum, rxcsum or tso bits could be lost if any of these are not in hn/netvsc's own capablility field. Actually when VF is attached, hn just needs to use VF's caps as all the tx packets would be forwarded to the VF interface. Fix this problem by doing so. Reported by: whu Tested by: whu MFC after: 3 days Sponsored by: Microsoft --- sys/dev/hyperv/netvsc/if_hn.c | 63 +++++++--------------------------------- sys/dev/hyperv/netvsc/if_hnvar.h | 2 ++ 2 files changed, 13 insertions(+), 52 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 206a35f7bac8..7d8e1914163e 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -1261,60 +1261,21 @@ hn_ifaddr_event(void *arg, if_t ifp) } static int -hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr) +hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr __unused) { if_t ifp, vf_ifp; - uint64_t tmp; - int error; HN_LOCK_ASSERT(sc); ifp = sc->hn_ifp; vf_ifp = sc->hn_vf_ifp; /* - * Fix up requested capabilities w/ supported capabilities, - * since the supported capabilities could have been changed. - */ - ifr->ifr_reqcap &= if_getcapabilities(ifp); - /* Pass SIOCSIFCAP to VF. */ - error = ifhwioctl(SIOCSIFCAP, vf_ifp, (caddr_t)ifr, curthread); - - /* - * NOTE: - * The error will be propagated to the callers, however, it - * is _not_ useful here. - */ - - /* - * Merge VF's enabled capabilities. + * Just sync up with VF's enabled capabilities. */ - if_setcapenable(ifp, if_getcapenable(vf_ifp) & if_getcapabilities(ifp)); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP6_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); + if_setcapenable(ifp, if_getcapenable(vf_ifp)); + if_sethwassist(ifp, if_gethwassist(vf_ifp)); - tmp = if_gethwassist(vf_ifp) & CSUM_IP_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO4) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & CSUM_IP6_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - return (error); + return (0); } static int @@ -1698,6 +1659,8 @@ hn_xpnt_vf_setready(struct hn_softc *sc) sc->hn_saved_tsomax = if_gethwtsomax(ifp); sc->hn_saved_tsosegcnt = if_gethwtsomaxsegcount(ifp); sc->hn_saved_tsosegsz = if_gethwtsomaxsegsize(ifp); + sc->hn_saved_capenable = if_getcapenable(ifp); + sc->hn_saved_hwassist = if_gethwassist(ifp); /* * Intersect supported/enabled capabilities. @@ -2017,18 +1980,14 @@ hn_ifnet_detevent(void *xsc, if_t ifp) * The VF was ready; restore some settings. */ if_setcapabilities(ifp, sc->hn_saved_caps); - /* - * NOTE: - * There is _no_ need to fixup if_capenable and - * if_hwassist, since the if_capabilities before - * restoration was an intersection of the VF's - * if_capabilites and the synthetic device's - * if_capabilites. - */ + if_sethwtsomax(ifp, sc->hn_saved_tsomax); if_sethwtsomaxsegcount(sc->hn_ifp, sc->hn_saved_tsosegcnt); if_sethwtsomaxsegsize(ifp, sc->hn_saved_tsosegsz); + + if_setcapenable(ifp, sc->hn_saved_capenable); + if_sethwassist(ifp, sc->hn_saved_hwassist); } if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) { diff --git a/sys/dev/hyperv/netvsc/if_hnvar.h b/sys/dev/hyperv/netvsc/if_hnvar.h index 0d8ed6bdef19..f46adcbf9245 100644 --- a/sys/dev/hyperv/netvsc/if_hnvar.h +++ b/sys/dev/hyperv/netvsc/if_hnvar.h @@ -277,6 +277,8 @@ struct hn_softc { u_int hn_saved_tsomax; u_int hn_saved_tsosegcnt; u_int hn_saved_tsosegsz; + u_int hn_saved_capenable; + u_int hn_saved_hwassist; /* * RSC switch, default off From nobody Mon Sep 4 12:37:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfSnp3N4Xz4sVtc; Mon, 4 Sep 2023 12:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfSnp2k4Qz4GVX; Mon, 4 Sep 2023 12:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693831038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tw80CtyhY76qwwdZFP2VToTs7FS5nAyOYvkugg+3WtM=; b=p9E46rsj9wl1HJIusuD5sILvSTI3/jurbkZH0tfUdgU9CzlWiwPAFzgGmyT4OGnsHFj7or 2g1giTWeLacgKouYwZPns9+aJkbkCvDnRRjRBmpwAMgxsagPqXIhABr+aoXcmE7HyBRbTM 5BgJmGvrS6p5AWq0SHUS773DtnPAO5KiurXJBXN7VpZwKSa/hDfil8k9vYLk5ZHlVrT4wd ttbTcBSWyvX+3VZOu7HdG+ILQ3yYM/bxEzwHJ+jVRMn15y/3w52rjUd/KUtg99ErI2fxwy VQohJ4SUXed6V1EcKUUlb86R+HnfpxaZG/zx3u3SfAlBIEu14x6b71I/huI4Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693831038; a=rsa-sha256; cv=none; b=uQ6xBO5/OWaXV2nG7rbuCUwmnIV4mG7btBLQDFtItAYl/PFC/ANgdJxk19J4w1YcGSocN5 RcPZ/JfmXCamzadWRONvAkM95lYZj5MBQPOPtEGZ1yv/LmGyaM9riS4nKAP50YMN1JvKcY 3U8SkwDAcnRyD7S3wP7hLQi5B9ANW6lPpyQTsybBNyLJGyPNja49dxY99WZWTqiemESuuc we2I/F4K6lwDxjPLZOSwVh2DtkKQKfXxOy9Fz2+ACuTTk841LYVtddoMNpMD4HocUoT2Wk i1+CnM2Fw07m5XkWL6xRCJE17aNI+q3J8bVU4g8sHNerKvFSkIOhY0ASgesB6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693831038; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tw80CtyhY76qwwdZFP2VToTs7FS5nAyOYvkugg+3WtM=; b=I/hk6bc4b4WettlkWcNr/mbFZt1+DIeh4CSi3YzbnLnnGv8jJQtbCODkd0Vq2tzKP37oif 5Bdkn0g4eZgCfze0aFvLUFBBGQvSGlo5Myn9C9kU30UcxEYgQBKI5IIJRelMpkuUS12P9s o9HlEkuhTsKBWUujD+7cSSHaN5XUu9NRrDhPmx3/fXqVIv8I3LSGjtg3mdZLGdLwtI9i6E ObJyu/XizwQLvyGb8b7fQeDQdTQcjFGNUzr8/3prLyuKJEiF0KpEB1uiauOTuBMtJVUXhf dWLcnD+NCNoJCLYu54mQ4CsHbNOY7Nd/AKzp4PGACxBZBQ5ZUssG6DaKRsKVUw== 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 4RfSnp1gXlz15hc; Mon, 4 Sep 2023 12:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384CbIAc099640; Mon, 4 Sep 2023 12:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384CbIQR099637; Mon, 4 Sep 2023 12:37:18 GMT (envelope-from git) Date: Mon, 4 Sep 2023 12:37:18 GMT Message-Id: <202309041237.384CbIQR099637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 3afe6b525386 - main - ahci: add AMD device id in RAID mode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3afe6b525386af1dda7791ea2a9d718fa634d4fd Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=3afe6b525386af1dda7791ea2a9d718fa634d4fd commit 3afe6b525386af1dda7791ea2a9d718fa634d4fd Author: Andrey V. Elsukov AuthorDate: 2023-09-04 12:33:49 +0000 Commit: Andrey V. Elsukov CommitDate: 2023-09-04 12:33:49 +0000 ahci: add AMD device id in RAID mode Found on Asus ROX Strix X570-F Gaming. MFC after: 1 week --- sys/dev/ahci/ahci_pci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/ahci/ahci_pci.c b/sys/dev/ahci/ahci_pci.c index 80ab01732c7b..93a72875b502 100644 --- a/sys/dev/ahci/ahci_pci.c +++ b/sys/dev/ahci/ahci_pci.c @@ -83,6 +83,7 @@ static const struct { {0x79021022, 0x00, "AMD KERNCZ", 0}, {0x79031022, 0x00, "AMD KERNCZ", 0}, {0x79041022, 0x00, "AMD KERNCZ", 0}, + {0x79161022, 0x00, "AMD KERNCZ (RAID)", 0}, {0x06011b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06021b21, 0x00, "ASMedia ASM1060", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, {0x06111b21, 0x00, "ASMedia ASM1061", AHCI_Q_NOCCS|AHCI_Q_NOAUX}, From nobody Mon Sep 4 12:55:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfTBv3Qnlz4sb1V; Mon, 4 Sep 2023 12:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfTBv2yRtz4Jn0; Mon, 4 Sep 2023 12:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693832135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iei80lsxgfV+fe6c+3OFsoIpPHXlJA7IsO304mnoiBg=; b=Bmie3GOG/9IFWwxewMcLLp6kkSMGeCShENkpYZ+5mtvMFzw5cWNHhUy/AQ0qfY566KfDR5 4jQPmTlvghCaQ0CC2DsLH1tPJgWCfGbtKin0tjLWA5avDIjlCRPKnTLk0haeCUdSq5uw52 heV6TsUpdh2lyGZqUD5ggifUmDexx8C5C+EeRL8J7BzEWodm58iZEvfHOhiw7yHvnJzhTN xnVSVT+QKolVeXar2M6PtQAbmvuqjUAORQPtWZkH6+Vk2RvezNs4wtUCKFXGTiZCJyh79Y +uB4MEidPR6QUXV/cT0KdnegFFl/UY4QWFE4Ox7qBZFI0g4oJtwy879DDAd5RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693832135; a=rsa-sha256; cv=none; b=pg/uRfX34L/ZF6f+ikTb+ZDOSo5zdQ19pf6DIDa+kRluk2LbkKWROW5w+FJwdMI1pVHCdk o/sVQtBRqMdcWpN0RLoo7qa78tuY70SWsnfSMOh5teoG89rPxEo6Z+uzRNgrC38jZ4Hi5l F4rP42pS9k3CAIZulZHc/CBNMElDJnsc1dM6q9aqf0w76POTt1plpJiy7cxbo0xP8/YvsG eilMFK7QOsLDTIQwXdQ4qiHwSdFvKpGon54BWsO/Cdk7JNtfNkjf+S4HC7P850OADGniOo 0Ip8JrZXMKmb9mMvsl3bB4pQgR/1HGst6Jw1372lMef0sdh0+ztShwzw10Yd6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693832135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Iei80lsxgfV+fe6c+3OFsoIpPHXlJA7IsO304mnoiBg=; b=pZizhU4e7plcViZF5R/NnelahDcJAf6+FzIyVXUX4BTE9GRhFuaqYTgUHDqOZzv57P0PEQ FwXhUbnXo9wbSy1LiSI9cuPY+vCnK1jxMi+olfBomtWZ7bRr0lSPXAMYVh49W3939kMMGz xFzML2jVu5GMCiDAcJ9Qj/vTm2dKSXQYf97LTakz4fuFoJ1GcGjrom3RK+MUOsZgalwE0g apSYzLPNJfMJ4zCnrcktlvC4+dvx77spiXebY+SACqq9Fk9yunr+h9eAZPOxqQtjddIutK vEyR3WlJD/6VA1ZAa2zIN3Lcl2P0VzoRxtDI5uH4pOLN5LtJNC5M47jgNl64RA== 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 4RfTBv1vhbz16NC; Mon, 4 Sep 2023 12:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384CtZSl032836; Mon, 4 Sep 2023 12:55:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384CtZQB032833; Mon, 4 Sep 2023 12:55:35 GMT (envelope-from git) Date: Mon, 4 Sep 2023 12:55:35 GMT Message-Id: <202309041255.384CtZQB032833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: b785ac18c7d3 - stable/13 - geli: Fix geli setkey -J for detached providers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b785ac18c7d36cfa84ce8ff8705dc10edd7d2013 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b785ac18c7d36cfa84ce8ff8705dc10edd7d2013 commit b785ac18c7d36cfa84ce8ff8705dc10edd7d2013 Author: Arjan de Vet AuthorDate: 2023-08-28 14:54:18 +0000 Commit: Mark Johnston CommitDate: 2023-09-04 12:55:15 +0000 geli: Fix geli setkey -J for detached providers Clear cached_passphrase before generating a new key, otherwise the operation nonsensically tries to reuse the old passphrase. PR: 254966 Pull Request: https://github.com/freebsd/freebsd-src/pull/780 MFC after: 1 week (cherry picked from commit 88d13bf33754bd4b0c5df92eef83d6fadb9b4944) --- lib/geom/eli/geom_eli.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c index 6cbb23230fa5..1efb760830c4 100644 --- a/lib/geom/eli/geom_eli.c +++ b/lib/geom/eli/geom_eli.c @@ -1421,6 +1421,12 @@ eli_setkey_detached(struct gctl_req *req, const char *prov, bcopy(mkey, mkeydst, sizeof(mkey)); explicit_bzero(mkey, sizeof(mkey)); + /* + * The previous eli_genkey() set cached_passphrase, we do not want to + * use that for the new passphrase so always prompt for it + */ + explicit_bzero(cached_passphrase, sizeof(cached_passphrase)); + /* Generate key for Master Key encryption. */ if (eli_genkey_single(req, md, key, true) == NULL) { explicit_bzero(key, sizeof(key)); From nobody Mon Sep 4 12:55:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfTBw4bdYz4sZqL; Mon, 4 Sep 2023 12:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfTBw3yMmz4K3G; Mon, 4 Sep 2023 12:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693832136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGTA2MN+QZKsYt8KBW5QrY7xrwdSSzydj6uaDZpf2eo=; b=uo5xxTKAYT2m8qd81rl/PKYsSJMbc2zwfMQjmviDXOirRtGr46aa2JQIqwwEtFTSicH83U u+B/rKBqkEt0ZyR6b3pBD4Efgy7r5mma3Cwnz1ckcQ8J4DnRMI9jvKlsxzsJx4GzVqRc9h YKkNp+BFCVzjM3VMbTyON7nEyhnm/bBDlCjtfCIiQSElRWNSfAbeferEgAgbFPAF5fbr7W qZ4BVR+JjsTsnXaaWwntWqdf5uvNbFLGuy5bYPLHr9YdmWTM5yed5gRZtZ5eOAc2T+uynA 9rLCC9bL6+f12C7QVnOaPXlJ8BGwqmavxePpm1UwtO0B5t4lITOatD+6clkRgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693832136; a=rsa-sha256; cv=none; b=olcGgakGAAUXKsTK7Lv/Ek1DeXhS492/v778foSk87XuJjeOTWwsvo4SZE/vrsmUGj1Suc annwV99xN9UI3KpVDs3QC00+xYiUecx6jCe0QC54yhxVb9QzqM23HweBGwR41uhfpSL+gT 4fhvyEYf5xKniyqHUINU+Ulr5UDlpVk07ozEq5bwsj7PDtj/hXIL4FldzVlPoNJyLFUz9b kuSNBcvdxCdtRUK1jyIOxRo85UklJHH9qegrZ4691sWPRNE7kpLXBmR/gcboX8YIt6cekt B1tgTXKCnzZciXG18WouI3WO+Btz+g0NhQ5l4Bd5jS48ELvZs6rP/UkdthZ2vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693832136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gGTA2MN+QZKsYt8KBW5QrY7xrwdSSzydj6uaDZpf2eo=; b=id40D9tX1Fw8tHJFUMGfD0R1wBKAHZYHqIET+To5frWV7AGk9RTUUh84vuyk2DGjokAx2G 4DlQQpJjlyZiL5FHD4QiWN8svZLJqLamp/FJid6g/Pz/CWU7AF7FHneTZt9m4WofL8aTZE ES6+9BR5EeMhcxYWrQBSn2wGIwZI4nuuEyOJiZTEuuQYD+R09N5x3ogC0ea1iXDqKhYG92 uytki9lakfHdoWUgrWVZINrJYKwIBz3Fyf12OeyX6YzuJdl7sitwqMQJcy6CedLJQplknM 7dUEx0spCwwHMyAOQ7vx6U7Gz3xwzQJBB5q/UWsRyY5uqWtx+RPH8q6dLU4s7Q== 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 4RfTBw2hJHz16TS; Mon, 4 Sep 2023 12:55:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384Ctav2032896; Mon, 4 Sep 2023 12:55:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384Cta8S032893; Mon, 4 Sep 2023 12:55:36 GMT (envelope-from git) Date: Mon, 4 Sep 2023 12:55:36 GMT Message-Id: <202309041255.384Cta8S032893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 472fce62bb53 - stable/13 - geli tests: Add a regression test for geli setkey -J List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 472fce62bb536b00d7af98d4be73bb8efbdb169b Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=472fce62bb536b00d7af98d4be73bb8efbdb169b commit 472fce62bb536b00d7af98d4be73bb8efbdb169b Author: Mark Johnston AuthorDate: 2023-08-28 14:58:43 +0000 Commit: Mark Johnston CommitDate: 2023-09-04 12:55:17 +0000 geli tests: Add a regression test for geli setkey -J Make sure that it can be used to change the passphrase of both attached and detached providers. PR: 254966 MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 2b7b09ac9675023869fddbae4911c9b674b1155a) --- tests/sys/geom/class/eli/setkey_test.sh | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tests/sys/geom/class/eli/setkey_test.sh b/tests/sys/geom/class/eli/setkey_test.sh index c981b6fc266b..ce3833f5fe0c 100644 --- a/tests/sys/geom/class/eli/setkey_test.sh +++ b/tests/sys/geom/class/eli/setkey_test.sh @@ -92,6 +92,64 @@ setkey_cleanup() geli_test_cleanup } +atf_test_case setkey_passphrase cleanup +setkey_passphrase_head() +{ + atf_set "descr" "geli setkey can change the passphrase for a provider" + atf_set "require.user" "root" +} +setkey_passphrase_body() +{ + geli_test_setup + + sectors=100 + md=$(attach_md -t malloc -s `expr $sectors + 1`) + + atf_check dd if=/dev/random of=rnd bs=512 count=${sectors} status=none + hash1=`dd if=rnd bs=512 count=${sectors} status=none | md5` + atf_check_equal 0 $? + atf_check dd if=/dev/random of=pass1 bs=512 count=32 status=none + atf_check dd if=/dev/random of=pass2 bs=512 count=32 status=none + atf_check dd if=/dev/random of=pass3 bs=512 count=32 status=none + + atf_check geli init -B none -J pass1 ${md} + atf_check geli attach -j pass1 ${md} + + atf_check \ + dd if=rnd of=/dev/${md}.eli bs=512 count=${sectors} status=none + hash2=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5` + atf_check_equal 0 $? + + atf_check geli detach ${md} + + # Change from passphrase 1 to passphrase 2 for the detached provider. + atf_check -s exit:0 -o ignore geli setkey -j pass1 -J pass2 ${md} + + # Make sure that we can attach with passphrase 2 but not with + # passphrase 1. + atf_check -s not-exit:0 -e match:"Wrong key" \ + geli attach -j pass1 ${md} + atf_check -s exit:0 geli attach -j pass2 ${md} + hash3=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5` + + # Change from passphrase 2 to passphrase 3 for the attached provider. + atf_check -s exit:0 -o ignore geli setkey -j pass2 -J pass3 ${md} + hash4=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5` + atf_check geli detach ${md} + + # Make sure that we cannot attach with passphrase 2 anymore. + atf_check -s not-exit:0 -e match:"Wrong key" \ + geli attach -j pass2 ${md} + + atf_check_equal ${hash1} ${hash2} + atf_check_equal ${hash1} ${hash3} + atf_check_equal ${hash1} ${hash4} +} +setkey_passphrase_cleanup() +{ + geli_test_cleanup +} + atf_test_case setkey_readonly cleanup setkey_readonly_head() { @@ -157,6 +215,7 @@ nokey_cleanup() atf_init_test_cases() { atf_add_test_case setkey + atf_add_test_case setkey_passphrase atf_add_test_case setkey_readonly atf_add_test_case nokey } From nobody Mon Sep 4 14:11:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfVtm6nTHz4rkmT; Mon, 4 Sep 2023 14:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfVtm6Kz4z4byl; Mon, 4 Sep 2023 14:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693836704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pevfb0Ge9R4E05vEXUwXRsldc2Jxdg2I8pShLV0CHCQ=; b=eu4Fe6Ey9u5EJjB7UEB5s0Uxs2woKH1enOAc7A1JHdFxAY4aK6PRdMgmlK4BMevuttKxPc 0KpyxN1zn5mUdpO9AC6kYKM/64Ez8aV3ClXytj5e/fZd8rQMRNvSGgrW0eJGhGl7rGCI+d 21vTtuojH9+I54EkHsjjCnasE4fNJ8X/KDzOrocYUefDJZCfFlsH2wD+hIxQHY8aC2Z2KC dCvB+8CtWANlJDu0FD1x6oJJa649o+fbu8yiQkkf2fP4hHNTXozdtBPLkhPjI+YdcKhnb8 bt4qlscLGWy1FDKDFayOVroqewmXYp4FvxUaI349STyTWLd8WKqN7LtX8bAM4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693836704; a=rsa-sha256; cv=none; b=tEmw5KQSRJGLWY36PPTSuA+19EGAlWAUUWra8qBtNwf3+kX5/vUhs6mD8m5SjezA+SkMPP qmsrQWjdAYpZ0KoxYPepABGq1QdRBJQy/zOskXw1At3G2QzfXoQk6Dn6sCE1ubwcreKrwK jFh8v4AL1lUFvir7En+wfB9pWnRVxuL0uX+7Qa2JA4paxg1/3c4eFxQ4c7d1pFu2h5gP2j nxF6ooQfsdP12wBJ7I84lHuB05QSILZJ0mOgzOigc7PLqzeyUrS6fA3Ev/D3TAKBfN9+R9 WN05+W5fxn3mTIrDPhTOtSCErwA4ysQ8wo4oSflIDommZcd1T8YH/vOk33ZCKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693836704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pevfb0Ge9R4E05vEXUwXRsldc2Jxdg2I8pShLV0CHCQ=; b=u9keORqZSzWOul0sLR1gNyD3BP3oY2AQHdHAXkdBoee4TFLaV7Bp9Q8PoYcC8OoNPmKgMV pE2L+4nTUnhCM0ULmLIj/vh9V9Ah5nEl1xklIf8airzWZANwfjY7JRY39RTLbbYfAQWJ9K +wOSo28HSLwsE8eauIrztayUiYIIv45kEZgARBLpTSYu1MW6iM8lFijOWtjhv3uEoDL5fX NE8CY5F2YHeXtoHcSm93pJgkjjZ6ejlrhW4e0ZSDZUKXuvRh8/Ltc4PV+h/WUYp7QkvnDH b34tGglb9UHeASP8EVqESvSHp9zCftahgWZNgWEUOMy+ikqaidCF17DC3KjwTA== 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 4RfVtm5P0Sz18kY; Mon, 4 Sep 2023 14:11:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384EBiEe062868; Mon, 4 Sep 2023 14:11:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384EBiCu062865; Mon, 4 Sep 2023 14:11:44 GMT (envelope-from git) Date: Mon, 4 Sep 2023 14:11:44 GMT Message-Id: <202309041411.384EBiCu062865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 134d36676e94 - stable/14 - geli: Fix geli setkey -J for detached providers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 134d36676e94a42bb280a010bf36b31163fccc65 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=134d36676e94a42bb280a010bf36b31163fccc65 commit 134d36676e94a42bb280a010bf36b31163fccc65 Author: Arjan de Vet AuthorDate: 2023-08-28 14:54:18 +0000 Commit: Mark Johnston CommitDate: 2023-09-04 14:11:01 +0000 geli: Fix geli setkey -J for detached providers Clear cached_passphrase before generating a new key, otherwise the operation nonsensically tries to reuse the old passphrase. Approved by: re (kib) PR: 254966 Pull Request: https://github.com/freebsd/freebsd-src/pull/780 MFC after: 1 week (cherry picked from commit 88d13bf33754bd4b0c5df92eef83d6fadb9b4944) --- lib/geom/eli/geom_eli.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/geom/eli/geom_eli.c b/lib/geom/eli/geom_eli.c index 6cbb23230fa5..1efb760830c4 100644 --- a/lib/geom/eli/geom_eli.c +++ b/lib/geom/eli/geom_eli.c @@ -1421,6 +1421,12 @@ eli_setkey_detached(struct gctl_req *req, const char *prov, bcopy(mkey, mkeydst, sizeof(mkey)); explicit_bzero(mkey, sizeof(mkey)); + /* + * The previous eli_genkey() set cached_passphrase, we do not want to + * use that for the new passphrase so always prompt for it + */ + explicit_bzero(cached_passphrase, sizeof(cached_passphrase)); + /* Generate key for Master Key encryption. */ if (eli_genkey_single(req, md, key, true) == NULL) { explicit_bzero(key, sizeof(key)); From nobody Mon Sep 4 14:11:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfVtp0nNtz4rkkH; Mon, 4 Sep 2023 14:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfVtp04q0z4br5; Mon, 4 Sep 2023 14:11:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693836706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7KOlR/NEb0zn38ljf2wGZ20PXea0WR5gFh+JOLPiyA=; b=c9daCq4bSnsZlXZLKY4l+1W7BsPdWcOkpyDXVUL83eNKaD9nAVYeEpWvzDVvKxfQqP06HI IydxojGNjwEYEtfk8e98jmvDxAaX9ivyGx21DY1TPaG6vvcRgS5tzUPKZYlnbJ1wgqceZE trTNMmBVVRf0sUDd364mpF1ixDDVdwV2nmx5kzQjnomQ48d9ZD7p72WFJ38xdVgaWFKHO2 KLo7GqoRG1l0Hdxnw3xik7aPREM/yONxvQri1J/OYPMF19BOlQ55xOoImENpQOqCLqSxic RwNU+twgIv7Mzkx/Oup8SMPHV9RgEJgofQEzMxGCyI6WI3W+kwmKUHiwercxFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693836706; a=rsa-sha256; cv=none; b=D2ZqC6Vc4wjVfJXcmCsUa19qaDmmK63pw6tj+AzLrQzgdWahnyCtcTNfR6edKQelfqDQZ6 YOqe4diOhevujX7DDp+1aHusVWbXQKcCeK71p/9UUPiUuY2gsGbUaZusjwMqjUPXnwb3Zp EjT+3OqLkWA6nIOQD2AYNttyDeemRrixBweOSy9DR0k0uN31IkmbiKCY39ScL0u+ZEE6Y7 6l5vDng8aKivKvwqyp/f4ul1rt8AYd5izliBH1zD6AkLAWpdewvNX4e8ycrJWrsY1S0rf2 4jwmIZhcl92dwH6z3NfmW1LwXG4k/2x1xb/pAo32eY1YP7ZNq3D5pTwtpEKHWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693836706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d7KOlR/NEb0zn38ljf2wGZ20PXea0WR5gFh+JOLPiyA=; b=ViZcBRZMWy5ZG9oDhvkBLK8gc2+l2EILpr9Nml9A2y9PhLV0/bxTKwwUVmnzyEM/JeXpA+ oHP0p/bUQo0j4g4WC0WEHaTlO8JS7Guqr5a2E6ta6S9FG6U2PdJ4mvGOmwGg+Uko5+H4zc HcIGYckYfTDpUdEDLxatskSA/685PI/HQfZ3b/ZjPvIwZUafe2Lmpsu00TEgHF6s9Ijsij GsiUaq2TBXi3H4koGRXOkV25KikT4+3Iu3PKrOS+gBd1pzYkBizwu0N7KBB8kaW023Oins /hWfctQWBZ042JYCOGShHxjRbDY1mJkSrdIwDJbCNvk3AbvyeByHCTE2ty0Tfg== 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 4RfVtn6J6gz18ft; Mon, 4 Sep 2023 14:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384EBjGf062925; Mon, 4 Sep 2023 14:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384EBj2v062922; Mon, 4 Sep 2023 14:11:45 GMT (envelope-from git) Date: Mon, 4 Sep 2023 14:11:45 GMT Message-Id: <202309041411.384EBj2v062922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 34e146632e62 - stable/14 - geli tests: Add a regression test for geli setkey -J List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 34e146632e623b5f208b745a99e2fdbed22bd942 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=34e146632e623b5f208b745a99e2fdbed22bd942 commit 34e146632e623b5f208b745a99e2fdbed22bd942 Author: Mark Johnston AuthorDate: 2023-08-28 14:58:43 +0000 Commit: Mark Johnston CommitDate: 2023-09-04 14:11:04 +0000 geli tests: Add a regression test for geli setkey -J Make sure that it can be used to change the passphrase of both attached and detached providers. Approved by: re (kib) PR: 254966 MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 2b7b09ac9675023869fddbae4911c9b674b1155a) --- tests/sys/geom/class/eli/setkey_test.sh | 59 +++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/tests/sys/geom/class/eli/setkey_test.sh b/tests/sys/geom/class/eli/setkey_test.sh index c981b6fc266b..ce3833f5fe0c 100644 --- a/tests/sys/geom/class/eli/setkey_test.sh +++ b/tests/sys/geom/class/eli/setkey_test.sh @@ -92,6 +92,64 @@ setkey_cleanup() geli_test_cleanup } +atf_test_case setkey_passphrase cleanup +setkey_passphrase_head() +{ + atf_set "descr" "geli setkey can change the passphrase for a provider" + atf_set "require.user" "root" +} +setkey_passphrase_body() +{ + geli_test_setup + + sectors=100 + md=$(attach_md -t malloc -s `expr $sectors + 1`) + + atf_check dd if=/dev/random of=rnd bs=512 count=${sectors} status=none + hash1=`dd if=rnd bs=512 count=${sectors} status=none | md5` + atf_check_equal 0 $? + atf_check dd if=/dev/random of=pass1 bs=512 count=32 status=none + atf_check dd if=/dev/random of=pass2 bs=512 count=32 status=none + atf_check dd if=/dev/random of=pass3 bs=512 count=32 status=none + + atf_check geli init -B none -J pass1 ${md} + atf_check geli attach -j pass1 ${md} + + atf_check \ + dd if=rnd of=/dev/${md}.eli bs=512 count=${sectors} status=none + hash2=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5` + atf_check_equal 0 $? + + atf_check geli detach ${md} + + # Change from passphrase 1 to passphrase 2 for the detached provider. + atf_check -s exit:0 -o ignore geli setkey -j pass1 -J pass2 ${md} + + # Make sure that we can attach with passphrase 2 but not with + # passphrase 1. + atf_check -s not-exit:0 -e match:"Wrong key" \ + geli attach -j pass1 ${md} + atf_check -s exit:0 geli attach -j pass2 ${md} + hash3=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5` + + # Change from passphrase 2 to passphrase 3 for the attached provider. + atf_check -s exit:0 -o ignore geli setkey -j pass2 -J pass3 ${md} + hash4=`dd if=/dev/${md}.eli bs=512 count=${sectors} 2>/dev/null | md5` + atf_check geli detach ${md} + + # Make sure that we cannot attach with passphrase 2 anymore. + atf_check -s not-exit:0 -e match:"Wrong key" \ + geli attach -j pass2 ${md} + + atf_check_equal ${hash1} ${hash2} + atf_check_equal ${hash1} ${hash3} + atf_check_equal ${hash1} ${hash4} +} +setkey_passphrase_cleanup() +{ + geli_test_cleanup +} + atf_test_case setkey_readonly cleanup setkey_readonly_head() { @@ -157,6 +215,7 @@ nokey_cleanup() atf_init_test_cases() { atf_add_test_case setkey + atf_add_test_case setkey_passphrase atf_add_test_case setkey_readonly atf_add_test_case nokey } From nobody Mon Sep 4 15:06:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfX5W0m7Bz4s314; Mon, 4 Sep 2023 15:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfX5W0HSsz3LRF; Mon, 4 Sep 2023 15:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693839967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ysi23CWESMaz7Bct3K/3zYlLc0BDR6rgXbw2n5wvbNs=; b=nsHwEVxa7u3QQ8o8cepTuVArKDmy4lDmhJch+Z+ErHx8EYUi9ao7x1Pn4m202vOWVu61WD dckRnkz/rjqRWnRC7rttepbNU+EsCTFZcKZQnfLlSR8vgncOHP24lVcGbT2rIoeKZaxS3V tAQgGJRYNLQ3/amVjRufdnHS6eQBJdfjkTHpsdGYNis3Zz8a9egaJ7MQWiYuLRd4Dk5wni s7Mze0s1k93/H+c7vfRm4TCzMoD3FbxHnv3E4d7XlkF0sCxCR6lbIz7DYZnhJmlxd+DgoR zCnHnyfEJ9i4V1p1MayDP0v7Mf8lWLZ4a03bQdg1sYuZ+5OHX+taSG5yvkGBUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693839967; a=rsa-sha256; cv=none; b=ChuT2ELaapmum4OV1VpPx8JarvA8pmrOpW09QAZObam6qlHYdpeNu+2pueIwLcXXJyFVuX uKyYrVKjfFp5RPZMxwUvBqmrhIW1f4XwV5xEMpjwUrtQ4XM41PuDk06AL2vBJPRk4Vuyjv CdybbycdT5bv6H1Ush51TPI72nLxIU3gMS82O99oBKhLKODjmjK4DfUSu+ceSohF7Hk/Uv yvGZwlfOPsxYsZEyxvy5rVgK7AXVmiwF1PekKW/2x6Ehmyh+2mAQsTa+n/SFEaUuXDZh/H /hF4dsFR9VWgsZqn/cH/BY2uIMGh/gMur/YLx3IirAa4Yrps43/myym9xYbs7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693839967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ysi23CWESMaz7Bct3K/3zYlLc0BDR6rgXbw2n5wvbNs=; b=pKYJw4f0fWHdDs6n7WNe3F/8jZ9DmsIiSg+LRjaTKVwiTSV9QAGn3xu/vgaB0Lu7hVSW1+ fsD4mGFmXyiWH5uiUSEi7lL9VcXPaaxF4FxrdBC9eWysU33bGBAbdYjsGSXa3k1andpLK5 Qkr+VMRESJAZY+AJb4T0n41xni4ZQIh16+eTprsccGLw1dkdv5qBOU2S8Nulu+SKh3fgQy nbO+BsZcDiO2/RSLzxCCeKECmWhSTZkBSnHFc6m4FePvKYtP76du/oktYFXtmkmAOhheb2 n4IGnah9+9HqTlRC4NMyTRuXmeXazD2LaSK/VBhcqXeSFPaNhL0CqNvoSTPk9w== 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 4RfX5V6T8Lz19kD; Mon, 4 Sep 2023 15:06:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384F66Qg048316; Mon, 4 Sep 2023 15:06:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384F663e048313; Mon, 4 Sep 2023 15:06:06 GMT (envelope-from git) Date: Mon, 4 Sep 2023 15:06:06 GMT Message-Id: <202309041506.384F663e048313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 643fd7b4bc57 - main - mana: fix tso parameters and set hwassist bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 643fd7b4bc57de87ddfeb75a8f0bdb27dbb8c3ce Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=643fd7b4bc57de87ddfeb75a8f0bdb27dbb8c3ce commit 643fd7b4bc57de87ddfeb75a8f0bdb27dbb8c3ce Author: Wei Hu AuthorDate: 2023-09-04 14:53:10 +0000 Commit: Wei Hu CommitDate: 2023-09-04 15:04:00 +0000 mana: fix tso parameters and set hwassist bits The parameters for tso on mana were not set correctly. Also the hwassist bits were not set. These two cause tso on mana not work. Fixed the issues and make tso working on mana. Tested by: whu MFC after: 3 days Sponsored by: Microsoft --- sys/dev/mana/mana.h | 1 + sys/dev/mana/mana_en.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index df527df10296..9a22ea87baa3 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -186,6 +186,7 @@ struct mana_txq { */ #define MAX_MBUF_FRAGS 30 #define MANA_TSO_MAXSEG_SZ PAGE_SIZE +#define MANA_TSO_MAX_SZ IP_MAXPACKET /* mbuf data and frags dma mappings */ struct mana_mbuf_head { diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index fa49e06e4862..56fa4e51ba26 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -798,8 +798,7 @@ mana_init_port_context(struct mana_port_context *apc) uint32_t tso_maxsize; int err; - tso_maxsize = MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); + tso_maxsize = MANA_TSO_MAX_SZ; /* Create DMA tag for tx bufs */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ @@ -2712,6 +2711,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, { struct gdma_context *gc = ac->gdma_dev->gdma_context; struct mana_port_context *apc; + uint32_t hwassist; if_t ndev; int err; @@ -2774,11 +2774,21 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setcapenable(ndev, if_getcapabilities(ndev)); /* TSO parameters */ - if_sethwtsomax(ndev, MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - + if_sethwtsomax(ndev, MANA_TSO_MAX_SZ - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN)); if_sethwtsomaxsegcount(ndev, MAX_MBUF_FRAGS); if_sethwtsomaxsegsize(ndev, PAGE_SIZE); + hwassist = 0; + if (if_getcapenable(ndev) & (IFCAP_TSO4 | IFCAP_TSO6)) + hwassist |= CSUM_TSO; + if (if_getcapenable(ndev) & IFCAP_TXCSUM) + hwassist |= (CSUM_TCP | CSUM_UDP | CSUM_IP); + if (if_getcapenable(ndev) & IFCAP_TXCSUM_IPV6) + hwassist |= (CSUM_UDP_IPV6 | CSUM_TCP_IPV6); + mana_dbg(NULL, "set hwassist 0x%x\n", hwassist); + if_sethwassist(ndev, hwassist); + ifmedia_init(&apc->media, IFM_IMASK, mana_ifmedia_change, mana_ifmedia_status); ifmedia_add(&apc->media, IFM_ETHER | IFM_AUTO, 0, NULL); From nobody Mon Sep 4 19:27:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfdtY4zdpz4sJnC; Mon, 4 Sep 2023 19:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfdtY4Wqxz4Kp5; Mon, 4 Sep 2023 19: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=1693855621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/t1TNKt6zxiUDqO+/4horWOsu1R97ksR7mthzN8Xag=; b=GJ8o+06VNCfAF/DDj20SqmO+5gPegDvIuhzALaQ44aPlgaBvExqYQlwoPiJHTT+MlV7K7h MHtQIiGeX/3PVzHCDtKEzrKUkBkHos9BSgGzuVcBOWsMMCCsf0kR3mu9DoICgf+ssg1Y+U 4zYnAC88EZCDoAvTBLxlKJOtDUQkhuaBsv6AkL8gsxcHZNBPeeK/E43yDSmXXAU8A/1YlV IxTVmTxZcdhzGsXVQ51C/mgUutvjAlkqcmiews3bSjO3aVf98CwXEoz5YRyS9KQRkBHdGB 0rm8YO4WbVPgZktevm4wAAM8I78itYhI6QZ6GtPbJPmShLzCy11+IxU5N3BhnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693855621; a=rsa-sha256; cv=none; b=fS4uaw2Ly1K1geJmqziMuzOIj5Z4T7f/Q4G2ZyQWwhpthlc8mozhlVp96GqCo8Hv1rsnRP yyq99cZCYFC74IuohEQ+SAWvQ7lOXEcZDYGScO+QjZYO2eZvqGg5PtuElgMbHRAbQJMl06 RB8Vs40ZPGLFkAQVAwq+U7X2LlirqSCBVYcQguz+DpEMP2M9c5byltx4rF6ZGRFIBzRDmx DU2s1HJAgEqfE6C91yYj+hDF0BhiZ/aiXgwQg98WvE7kmt1/3KmXj9UK5tgGL3/JDIR3V+ 2w987Qfzbla8Qz3Zyq2IZbcsHjgYvGHigeakzL+41ZsmQGM1w2sMEH4NK5ct7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693855621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/t1TNKt6zxiUDqO+/4horWOsu1R97ksR7mthzN8Xag=; b=x6tylTlKGiOog4gZIvxwSYWUnDWHVBLisNbAz+NzwYA5QT0p/+dTyodIr5xD1Q6+24Fc9q jXUkWORLGTkOrfbcB/DLApCavaphBF0kqqPimX1xJKG1oHW3jK5u5qREZSFrDJXYnKW7U4 SvgnXjMi2XWjzwSZnlOyiCS5T7EYsoPqwW2IvQjTgFPUPxfOd/Oh8sAdDVOT2DqlSnXyaR 4vPkzMlyGDoS+WnwLTJUB6+aYkR1+HqnzWHW1ePIPWb6avWTNTYJ4GtcXT8omGsXfe8fFi wLXbshOHr0Y9gwe8JT9NVMd8F4uv/f94B5k4SKCBoNbJp0SqLM6x08hxBxc4iw== 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 4RfdtY3cjhz1J3v; Mon, 4 Sep 2023 19:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384JR1ka079457; Mon, 4 Sep 2023 19:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384JR1iZ079454; Mon, 4 Sep 2023 19:27:01 GMT (envelope-from git) Date: Mon, 4 Sep 2023 19:27:01 GMT Message-Id: <202309041927.384JR1iZ079454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: f49d6f583e9d - main - uefi(8): Refer to a related manual page List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f49d6f583e9df2839b420f27c44edc5c1fa276c6 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f49d6f583e9df2839b420f27c44edc5c1fa276c6 commit f49d6f583e9df2839b420f27c44edc5c1fa276c6 Author: Tom Hukins AuthorDate: 2023-08-31 09:21:40 +0000 Commit: Mitchell Horne CommitDate: 2023-09-04 19:22:30 +0000 uefi(8): Refer to a related manual page PR: 265834 Reviewed by: mhorne MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39577 --- share/man/man8/uefi.8 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man8/uefi.8 b/share/man/man8/uefi.8 index 9ee501047337..42642bb48260 100644 --- a/share/man/man8/uefi.8 +++ b/share/man/man8/uefi.8 @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 18, 2022 +.Dd August 31, 2023 .Dt UEFI 8 .Os .Sh NAME @@ -89,7 +89,7 @@ or .It .Pa loader.efi loads and boots the kernel, as described in -.Xr loader 8 . +.Xr loader.efi 8 . .El .Pp The @@ -116,6 +116,7 @@ Typical non-default kernel (optional) .Xr efidp 8 , .Xr efivar 8 , .Xr gpart 8 , +.Xr loader.efi 8 , .Xr uefisign 8 .Sh HISTORY EFI boot support for the ia64 architecture first appeared in From nobody Mon Sep 4 20:51:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rfgmg0sWxz4rpRY; Mon, 4 Sep 2023 20:52:03 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Received: from heemeyer.club (heemeyer.club [195.93.173.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rfgmd701Xz4hwt; Mon, 4 Sep 2023 20:52:01 +0000 (UTC) (envelope-from dchagin@heemeyer.club) Authentication-Results: mx1.freebsd.org; dkim=none; spf=none (mx1.freebsd.org: domain of dchagin@heemeyer.club has no SPF policy when checking 195.93.173.158) smtp.mailfrom=dchagin@heemeyer.club; dmarc=none Received: from heemeyer.club (localhost [127.0.0.1]) by heemeyer.club (8.17.2/8.16.1) with ESMTP id 384KpwuV035567; Mon, 4 Sep 2023 23:51:58 +0300 (MSK) (envelope-from dchagin@heemeyer.club) Received: (from dchagin@localhost) by heemeyer.club (8.17.2/8.16.1/Submit) id 384Kpurx035566; Mon, 4 Sep 2023 23:51:56 +0300 (MSK) (envelope-from dchagin) Date: Mon, 4 Sep 2023 23:51:56 +0300 From: Dmitry Chagin To: Warner Losh Cc: Alexey Dokuchaev , Jake Freeland , Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: af93fea71038 - main - timerfd: Move implementation from linux compat to sys/kern Message-ID: References: <202308242029.37OKTmVs091755@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spamd-Bar: - X-Spamd-Result: default: False [-1.80 / 15.00]; AUTH_NA(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.999]; FORGED_SENDER(0.30)[dchagin@freebsd.org,dchagin@heemeyer.club]; MIME_GOOD(-0.10)[text/plain]; RCVD_COUNT_TWO(0.00)[2]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; R_DKIM_NA(0.00)[]; R_SPF_NA(0.00)[no SPF record]; MIME_TRACE(0.00)[0:+]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; ASN(0.00)[asn:61400, ipnet:195.93.173.0/24, country:RU]; FREEFALL_USER(0.00)[dchagin]; ARC_NA(0.00)[]; BLOCKLISTDE_FAIL(0.00)[195.93.173.158:server fail]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[dchagin@freebsd.org,dchagin@heemeyer.club] X-Rspamd-Queue-Id: 4Rfgmd701Xz4hwt On Mon, Aug 28, 2023 at 10:19:26AM -0600, Warner Losh wrote: > Added cc for Jake > > On Mon, Aug 28, 2023 at 6:17 AM Alexey Dokuchaev wrote: > > > On Thu, Aug 24, 2023 at 08:29:48PM +0000, Warner Losh wrote: > > > commit af93fea710385b2b11f0cabd377e7ed6f3d97c34 > > > > > > timerfd: Move implementation from linux compat to sys/kern > > > > > > Move the timerfd impelemntation from linux compat code to sys/kern. > > > > Could you quickly summarize why we need these linuxish bits in FreeBSD? > > We've lived for years without it. Had expected to find the rationale > > in DR but alas. :( Thanks, > > > > I'll let Jake answer this and > > > glibc misc/tst-timerfd test fails now under Linux emulation > > I think his new review https://reviews.freebsd.org/D41600 addresses this > issue maybe > Unfortunatelly, no. misc/tst-timerfd failed due to read() is not blocked (w/o TFD_NONBLOCK flag) on non-fired timerfd From nobody Mon Sep 4 23:17:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rfl0y6rBMz4rH2K; Mon, 4 Sep 2023 23:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rfl0y68yRz3fs6; Mon, 4 Sep 2023 23:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693869474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MbhSyl8FevhJ3SrRchTaqwvahNm0EeA6MsJ8Tp9cUqo=; b=O6s0v1ko5+J98TGMJa+ObQ3CyKrpjXYt2FOQSQ5NbJayKEegs+sA84+6e2jeapUCKlmNiV 59SmSdbG8gJPAd8hF8fjfXBg3A4s/B9OUbcOsLR7xqHchGk1h4/ymEDcMgEa5dg+XprqWO X5MrHlZ9dHknf3BAKeSE+zh8cPAJ3URkXheHA26R4McnryZjEz8k/JJkEkruz0lw86wFK3 XOQbRLYvWx7TP7X6ZNpHQnzOT3em+Mn0IYMk23SeA4GiEsq5ZYxnHRqH/3/opApqzT+c9I LRAHoYRHZB0TT10tQMPqv2ATXemOi2S4KYv5Rf8cnZj1fDTUXwvxWi1yWV1LAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693869474; a=rsa-sha256; cv=none; b=YjGl7SVI/Mwic84Ru3WpV6WML7/AyOHgzNvpYNKmXHPylAjg6DmHNV3GYSBkwN/0UDPrhl KfUs19Fe0TakzyGD3OYt3PJ4kRBmB4nZJ7EG5ax/mpxCSEZj21xVPWiLKUKKuQ4ATX7x+e ENZ3uWAERf8+Bp4QjX6i17rzk7W9ydGmJMrHvRx9wvfzXNYFfsXfP+UKTe29bTFJEHYTN+ 0Xjrfqp/3J9E7+bwhKDiWjpGot04mMsNU4wPssL9E3Cnh8lFkbrLK4RlGjtl182vIzbXmy fgBVhzTQayQoqzFhVZZgDrar8fLKN6l471Zmwn5RBFaOx3JIXGXvz9sj0Uturg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693869474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MbhSyl8FevhJ3SrRchTaqwvahNm0EeA6MsJ8Tp9cUqo=; b=U7DuOXbmHYDzJDSuulZ4uxFAP978NOT3ZWlCU4HtOdrjQjkosSsiCAD6aBbmzfzFD2CjGt MRNNA2W8BTtLmBymG6vryo8etVPrdgJMXFinXh9JYQmGA+y+UrC1i+vLpCx8vlBv1w1/m+ wOnfU7kzRbHY8YKFH3woAqaZTjIE7mKT/keUx3Dm7OCRF+tPDhk/I28WTdHUzvJDPdet/7 AB3404/fK3KxnZfyBI0qsPMkH0xd3kgiE0NVC/ztxo6s7GZZ9oz4lgdpisjPcygAU1u9HQ XNz70GIM22z4KhCkSapvDz+AynqxaP/HYCItHFH8IrUkcptovnrkRVgVGO2TSw== 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 4Rfl0y577mz1Npq; Mon, 4 Sep 2023 23:17:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384NHslK068230; Mon, 4 Sep 2023 23:17:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384NHsf6068227; Mon, 4 Sep 2023 23:17:54 GMT (envelope-from git) Date: Mon, 4 Sep 2023 23:17:54 GMT Message-Id: <202309042317.384NHsf6068227@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: 03a4afbbf87d - stable/14 - src.conf.5: regen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 03a4afbbf87db763c6c37375c1549ecdd62ae58b Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=03a4afbbf87db763c6c37375c1549ecdd62ae58b commit 03a4afbbf87db763c6c37375c1549ecdd62ae58b Author: Ed Maste AuthorDate: 2023-09-04 22:17:07 +0000 Commit: Ed Maste CommitDate: 2023-09-04 23:08:34 +0000 src.conf.5: regen After defaults changed in 29a16ce065db ("release: update stable/14 following branching from main"). Approved by: re (kib) Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 15c80af095e6..4b272eb3fd7a 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd August 1, 2023 +.Dd September 4, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -913,8 +913,8 @@ to .Pa ld.lld . The system will not have a usable tool chain unless a linker is provided some other way. -.It Va WITHOUT_LLVM_ASSERTIONS -Disable debugging assertions in LLVM. +.It Va WITH_LLVM_ASSERTIONS +Enable debugging assertions in LLVM. .It Va WITH_LLVM_BINUTILS Install LLVM's binutils (without an llvm- prefix), instead of ELF Tool Chain's tools. From nobody Mon Sep 4 23:17:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rfl100sNyz4rGwf; Mon, 4 Sep 2023 23:17:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rfl0z6xf8z3ftY; Mon, 4 Sep 2023 23:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693869476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tkebuUougkdO0WGP3RxOy+VXNF4HFc5J1EfsiNUqjw4=; b=yp6fihfgqVRl8o1le3B6Y6UZxr9K4O3/T7gUdVKac7dmGu/4+bn2CNYnb7tiLrwYlVDCN9 oXoRFdTmTx9/p3NU8gvuLxxE1tk8Kj8QhxhkiSXnmPmInRTEpAQSG3e7qOhkgNlqxRJPkx joYT6s2vR7AMnpmohvQYfHs1R/XMch4G4vAqZ4ru/kfsZctAfOKyxlnhYNvU5C2QtcLzvl lREyJ6SHkiX8h+LBPl4DeNablIZL3VKdqEw8AoslWY9yWtDewOAtalNamSwo/Cfq1qMrQS xDzob+Fy6RMqfFU9G9PuLsJhLyeCz2UL5swYGhciQShyC/Umlv0UdDTPUbJrrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693869476; a=rsa-sha256; cv=none; b=nSCbMI+Fs6L8+Iga7aGpYDEUTDDnSghw4kXWInR+A36jJMbpbvD8gMyfVUUusXxMZRrCYa ZrA8hk8YpyiQW4CZlAmHK2AQQ3LD3ojoQFmSFEX7T1TIoWWre2wB4tWToDuZWAmBfWXdSS VvIXsg9xBH16f89m8SF9+mAQ1s7xzmB2K66D68XmrKnfkPgvNZfK3A56keE89r6UbQZPaJ dyWEjtQfTTPhTbcRpfwHeeP6QJ3HDTqzjSPqGGxJwrEJIG7Ag/w7nd2k3cOGgevU3YeInF 9tEYKtKrnOUC8QhXcohn8H8F57jYv7Ipy3Nep/wOfiu0+2yigNq6CGSUbAfd2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693869476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tkebuUougkdO0WGP3RxOy+VXNF4HFc5J1EfsiNUqjw4=; b=GPy0AzMBLZGUtBvTyJtSwNf+HVrADisFjoc0Q+yLgK0kS7Z7W1ZmNIxUvAN5iIgdYExBPS +AYEIF0Ec4/+E1yLz6QmqAFojwLkEbi9djCMNcyUJv6urttCsgLFO62+xRVbyIqw36yTY2 4JefzzlwOY6LSb/Sfv1HH2mIDa9TFiofTnU+j3uiZahSbgy3KJeyFsr5vOhyLtQYxFvuwr HabQEIi9Q7kM8G+sG8Mcxh8X5hKXM8TmWbp6uvokPi9nlyeKxcrj/eZRvDfCbaIyt/ObLE 0Y6cOwP/XGJWzIrIsD85ivA2oBGbfo8qjuS/nEC8UfNYsceMsuF6+MSQy31AtA== 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 4Rfl0z5f1yz1PG3; Mon, 4 Sep 2023 23:17:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384NHtip068287; Mon, 4 Sep 2023 23:17:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384NHtU3068284; Mon, 4 Sep 2023 23:17:55 GMT (envelope-from git) Date: Mon, 4 Sep 2023 23:17:55 GMT Message-Id: <202309042317.384NHtU3068284@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: 143371df7657 - stable/14 - x86: Introduce APIC ID limit by default on AMD hardware List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 143371df7657540228f12e01ba3a07eab41c3ab9 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=143371df7657540228f12e01ba3a07eab41c3ab9 commit 143371df7657540228f12e01ba3a07eab41c3ab9 Author: Ed Maste AuthorDate: 2023-08-18 03:39:08 +0000 Commit: Ed Maste CommitDate: 2023-09-04 23:08:34 +0000 x86: Introduce APIC ID limit by default on AMD hardware Lack of an AMD IOMMU driver means we cannot successfully route interrupts to APIC IDs 255 and over. Do not add the corresponding CPUs to the per-domain lists of CPUs to which interrupts can be assigned. This change should be reverted (or, at least the APIC ID limit) once we have an AMD IOMMU / interrupt remapping driver. See also commits fa5f94140a83 ("msi: handle error from BUS_REMAP_INTR in msi_assign_cpu") and 4258eb5a0d97 ("x86: handle domains with no CPUs usable for intr delivery."). Reviewed by: markj, jhb Tested by: cperciva (earlier version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41618 (cherry picked from commit 0b029e9e85943d565c72aa58353538aeac68aa36) Approved by: re (kib) --- sys/x86/x86/mp_x86.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sys/x86/x86/mp_x86.c b/sys/x86/x86/mp_x86.c index 76a1d14f371a..ddcb54b63d88 100644 --- a/sys/x86/x86/mp_x86.c +++ b/sys/x86/x86/mp_x86.c @@ -153,6 +153,11 @@ SYSCTL_INT(_machdep, OID_AUTO, hyperthreading_intr_allowed, CTLFLAG_RDTUN, &hyperthreading_intr_allowed, 0, "Allow interrupts on HTT logical CPUs"); +static int intr_apic_id_limit = -1; +SYSCTL_INT(_machdep, OID_AUTO, intr_apic_id_limit, CTLFLAG_RDTUN, + &intr_apic_id_limit, 0, + "Maximum permitted APIC ID for interrupt delivery (-1 is unlimited)"); + static struct topo_node topo_root; static int pkg_id_shift; @@ -258,6 +263,22 @@ topo_probe_amd(void) if ((amd_feature2 & AMDID2_CMP) == 0) return; + /* + * XXX Lack of an AMD IOMMU driver prevents use of APIC IDs above + * xAPIC_MAX_APIC_ID. This is a workaround so we boot and function on + * AMD systems with high thread counts, albeit with reduced interrupt + * performance. + * + * We should really set the limit to xAPIC_MAX_APIC_ID by default, and + * have the IOMMU driver increase it. That way if a driver is present + * but disabled, or is otherwise not able to route the interrupts, the + * system can fall back to a functional state. That will require a more + * substantial change though, including having the IOMMU initialize + * earlier. + */ + if (intr_apic_id_limit == -1) + intr_apic_id_limit = xAPIC_MAX_APIC_ID; + /* For families 10h and newer. */ pkg_id_shift = (cpu_procinfo2 & AMDID_COREID_SIZE) >> AMDID_COREID_SIZE_SHIFT; @@ -1170,6 +1191,8 @@ set_interrupt_apic_ids(void) continue; if (cpu_info[apic_id].cpu_disabled) continue; + if (intr_apic_id_limit >= 0 && apic_id > intr_apic_id_limit) + continue; /* Don't let hyperthreads service interrupts. */ if (cpu_info[apic_id].cpu_hyperthread && From nobody Mon Sep 4 23:37:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RflRt0mKTz4rSBw; Mon, 4 Sep 2023 23:37:46 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RflRt0FfFz4Gcj; Mon, 4 Sep 2023 23:37:46 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693870666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZPvw6TCpKAQQb/kyEYcX9huPw/w8dUrVRgbgvT9y9U=; b=lFSUKyY2D3HPULj5LwaKDGxk7WKxCni3p8NTgJs0+V39ujMXmnbEGvfMcx971WDu6iG1Q+ hV+smGuZI7fD5rhPP2K+5HlMwNtbdHRNPw88XXdyNrU6/viZeo0X6CD8gkEZlJaIbz9qWy dpKYLQY2ht07GB5E/8dPJcjxeX81s+LKEI4uIwvaAbSSI+pzZa0ll3sQwSPWS12O2+bHyi 7TWnssU5b1O2fk5Sel01fKzI+TAHROHPb4lwrOGSYSE8sdOPL8DvhnReqL2ssGFyxxU4pL hJpyH9JU5DPnQs+2qS5Bnb54p7Gq4D/zWyOLCf739JPdB8XjE2H9zkME7qY2qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693870666; a=rsa-sha256; cv=none; b=vZa40Y2/YT48OUAlRnlwqk7VpBVAWVCVPTDYnQKXYdncmC7jWIW8X5icvWH4J8kIJk1N/3 fVN8q/MLj1Oo8U5dok0TG8wzv8LpEF7KcaU7yMTKqZvODeLwSCdYc9JcVvZ1v11/IEgncO PAtyTZsVD9g/yD+Am7DBRww9yUjyKovYQiwUkTtsMmk5Ca9VVlAM7iDHH9YqPjOb8CgmTY n3sKgp4vPjwYTKepCOWL04UQ50eIbqAM1pFuOB1Z33cZnU8s3z9OxCvEk3DLOEQ3kmfm3b PHL+v7IZsCLM6X3fFRk6LtRS7tddIHoFBQMKZsQBsjJdn5l28J4qZElPzKTvPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693870666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bZPvw6TCpKAQQb/kyEYcX9huPw/w8dUrVRgbgvT9y9U=; b=S6B/iAPEqlDV9DyM6wbSa1N7d2I359nslr698Fe4eFMgX10vqp98GFIbzNJo3cM0zBopa8 NZdaSACpD6BqdqIyVF1r9OIgZD5H+kQXrX5RqRN3jGazmBx8RxhvMdfMdjZsxd8vWtZsOt hlqzHhKzBQzX2s4ZEp1ApMpVeV9jZUU6iH5bYVvOCAieaViuKRTYSPANoG1E3qRTWlFkrc utG+TiuNiL1jM8ej2a31DR08tbj6eLhDlWN9uKbMMsXC99Vz0qtzVe4774tlXha5qBpX+I Wpe4H3BQz5oC28P3gU+Wv4c05GvYVicwJHVIQOifahnnaRWIDs7LWzD8rDpeKQ== Received: from ltc.des.no (ti0187a400-1976.bb.online.no [85.166.95.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RflRs5Sw9z11YK; Mon, 4 Sep 2023 23:37:45 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.no (Postfix, from userid 1001) id A8A254B9EA; Tue, 5 Sep 2023 01:37:42 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Warner Losh Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: ea82362219ee - main - tests: Skip all tests that require mdconfig when /dev/mdctl missing In-Reply-To: <202309021940.382Je6Hn028769@gitrepo.freebsd.org> (Warner Losh's message of "Sat, 2 Sep 2023 19:40:06 GMT") References: <202309021940.382Je6Hn028769@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 05 Sep 2023 01:37:42 +0200 Message-ID: <861qfdtsqh.fsf@ltc.des.no> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Warner Losh writes: > diff --git a/tests/sys/cddl/zfs/tests/cache/cache_test.sh b/tests/sys/cdd= l/zfs/tests/cache/cache_test.sh > index 4d77d9fa56a7..79b09dd93183 100755 > --- a/tests/sys/cddl/zfs/tests/cache/cache_test.sh > +++ b/tests/sys/cddl/zfs/tests/cache/cache_test.sh > @@ -280,6 +280,7 @@ cache_010_neg_body() > . $(atf_get_srcdir)/cache.kshlib > . $(atf_get_srcdir)/cache.cfg >=20=20 > + [ -c /dev/mdctl ] || atf_skip "no /dev/mdctl to create md devices" > verify_disk_count "$DISKS" 1 > ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" > ksh93 $(atf_get_srcdir)/cache_010_neg.ksh || atf_fail "Testcase failed" the canonical way to do this would be to add atf_set "require.files" "/dev/mdctl" to the testcase head. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Sep 4 23:37:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RflS55f4tz4rSR3; Mon, 4 Sep 2023 23:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RflS558KGz4H1R; Mon, 4 Sep 2023 23:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693870677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2e5lAMB9OAzC/NpYm7s20M/SZgOQkzB78BbMFbg6V/g=; b=MN+ASbnXfIlpku0LgqG9X3CT6hLGqo2/uluxEX+u0pGdTgoHql6jtANgO80x2MCUM65bps DwzFLGgHPXlGPcnGh3SYNIrJaRqvTc2OC52Tn5ttjHZHQfI0tP+iUvqqhNGWRnZxbOzAkC Tfl03/jOIb3dG4KxdbB321LDOwDlRHqCWAtd+3y7S6i3tL7di2mWT6y152U3hrGblGnmd+ i4C35pKoFyjuvmh9Pb1ol+TQRWag5g0cOPcKtnouHM8b8F6PVDTJ0Pc5DqE4eViXIlGGHe 98zDNLhy4j3hONiQBH+f2tm7SxjMq01KNPhjfhB7MB4AcOgmZyWcCRjWtQ8cuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693870677; a=rsa-sha256; cv=none; b=Ht60+8Tnowali2tp5Y/Gt7OdNTRQeK54phSfrg4fR+a80UQjYlUJJ3YgqdmfaxHuRQYLlc w/7YasyyUGcA/J4ix02STjOfSfXUq0mfzp2jnu1q0JzFGWP/U5u2AApae9pzLhiRfo8eDJ PAqfKe9UwvU2ra+kxxkSwL6emR+6VFer4TbNmFx7zxYAZVAN/Qu8s3QnPgunFouWWDOinl +/Imy98FjA8nnoZ5jTllastnMNhsJGJrBBP8Oj1hQEL1SX6sQmzUudBLlRG1AfUvgDIRsn qPmc3ODGrzMKYt3gt6lIs3gFiqAzESOOxY9txfEC7IkW+LVJWLMBvkzS398gZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693870677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2e5lAMB9OAzC/NpYm7s20M/SZgOQkzB78BbMFbg6V/g=; b=ZFznKCniWq81WfuZFDqi6fEDKXcnuxk6vEvqH6fWH0O+diKTINgM+GB27irUf4L98XLZNP gpnBQL+6HF2352SfojbBcMEIesmu/BOLgd6ixZuFEeVwQhxyylnQvCuFlVLCwyZ0p8bS04 13GvSV1+ZAx8hAXUbgn8NDYl2o8UWU55sxJCST/ltaIZnmk7juBpZO0HPUmb0ufUWmPMwu +YoWLkRL8XLln/O7b8bqB+xkN1ZlbOsgE6mVrgegDiMIBS18mFTFOXziH4yED84jAj+ac4 AOG22now7UYHJBNCE/JrzQV4ct/zkULyc0352kBxafQRm/7KBnJh7VkbshkbnQ== 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 4RflS54FcVz1Q4H; Mon, 4 Sep 2023 23:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 384Nbvl8001513; Mon, 4 Sep 2023 23:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384NbvnE001510; Mon, 4 Sep 2023 23:37:57 GMT (envelope-from git) Date: Mon, 4 Sep 2023 23:37:57 GMT Message-Id: <202309042337.384NbvnE001510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b451dcc84f1c - main - if_vlan: Always default to 802.1q. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94 commit b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-04 23:26:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-04 23:26:18 +0000 if_vlan: Always default to 802.1q. There is no reason for this fallback to be conditional on COMPAT_FREEBSD12. PR: 273539 MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: melifaro, allanjude Differential Revision: https://reviews.freebsd.org/D41717 --- sys/net/if_vlan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 41a099c1407a..e7a290564722 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1106,11 +1106,8 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, return error; vid = vlr.vlr_tag; proto = vlr.vlr_proto; - -#ifdef COMPAT_FREEBSD12 if (proto == 0) proto = ETHERTYPE_VLAN; -#endif p = ifunit_ref(vlr.vlr_parent); if (p == NULL) return (ENXIO); @@ -2262,10 +2259,8 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ENOENT; break; } -#ifdef COMPAT_FREEBSD12 if (vlr.vlr_proto == 0) vlr.vlr_proto = ETHERTYPE_VLAN; -#endif oldmtu = ifp->if_mtu; error = vlan_config(ifv, p, vlr.vlr_tag, vlr.vlr_proto); if_rele(p); From nobody Mon Sep 4 23:58:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rflvv68fJz4rtM9 for ; Mon, 4 Sep 2023 23:58:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rflvv1jYnz4Mgj for ; Mon, 4 Sep 2023 23:58:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2bcde83ce9fso31679861fa.1 for ; Mon, 04 Sep 2023 16:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1693871913; x=1694476713; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=6X+NcYYXvIau7oCqJ4OruOWCt7nZVHUFC/yqTuy9s2g=; b=RGRz5D+InaO+ekqCE0HKnVYxvYo1Qmk4KqypAn5rGXza3uAbrIoxJhSJ7jXle4URXK Pd6iHwtV6N6nTKDWt8ND1BYeD3X/BcbOAOxbG8LbBy4uCee5ChYdgVlr6llUOEC18l2K Pt9zZYgyW3rYio3ER0K/g5v35rDnPx4nJqvJCuVAFFRbckUzykPpLrqY+97iKiq/BWXx 0TE8o2LaHjbEQpwWbfR2QtPbNzu9W4NMclxtNIWsTVI8eJCqWeKIJOsmxdwxkly6hpDl O0m8TYlTEpjHRRUDJDEs42kAexQLkFvu78YHyI65x3orIBUKOO5pXriTvaZSlwo3YC9O XnDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693871913; x=1694476713; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6X+NcYYXvIau7oCqJ4OruOWCt7nZVHUFC/yqTuy9s2g=; b=l61hAYu5QdgRUkVDa+CBwFLE2yWOvWCxhQyogjz9R5o2Djehi8FlslVNn+B4gy/BY2 kParSfQJ2yvWWd0vrMFi/DEo0DORLjG0fGES0PwKwq7PC3GJZb/Hq/+isWHPaqsGYmQ5 Br96w26BbN4hcsAiDR0aCuyg1oWUy7Yrlr4yoDKr42HKTyE8M3RBWL7G1HX1pDRDc5Dl sWyBNzK3KXsDZxoOsrAZe5FKDUzokfTqhsCsqtIzNc4cBuEpGFXUK2uNNh01hLbErCnY TgTo045PlgnJUQ/DAdg7L84IUB5+y5AIIiB2FrzbncaXYcBdkHcMs0Z6u67nUOzBwNTE 4v1A== X-Gm-Message-State: AOJu0Yzz3ueflydP/GeMlGwaQRVd9/B5chSzqh3+ZVij2yyn2xBLNCGK CraGBMKKP7suyGlH9iSgehLceViEk5IKkHZK2Rnb0w== X-Google-Smtp-Source: AGHT+IE6DtmnAA72IWe2FudxRAxVMaUKFmEf1hHB3B5OFppkcWVZmL7NMhG3oXQoonp/AJqixG0zQl06Ij+HK9EYf6U= X-Received: by 2002:a2e:9c58:0:b0:2bc:d8cb:59fe with SMTP id t24-20020a2e9c58000000b002bcd8cb59femr7156676ljj.8.1693871912110; Mon, 04 Sep 2023 16:58:32 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202309021940.382Je6Hn028769@gitrepo.freebsd.org> <861qfdtsqh.fsf@ltc.des.no> In-Reply-To: <861qfdtsqh.fsf@ltc.des.no> From: Warner Losh Date: Mon, 4 Sep 2023 17:58:20 -0600 Message-ID: Subject: Re: git: ea82362219ee - main - tests: Skip all tests that require mdconfig when /dev/mdctl missing To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000009de140060491498f" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Rflvv1jYnz4Mgj --0000000000009de140060491498f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Sep 4, 2023 at 5:37=E2=80=AFPM Dag-Erling Sm=C3=B8rgrav wrote: > Warner Losh writes: > > diff --git a/tests/sys/cddl/zfs/tests/cache/cache_test.sh > b/tests/sys/cddl/zfs/tests/cache/cache_test.sh > > index 4d77d9fa56a7..79b09dd93183 100755 > > --- a/tests/sys/cddl/zfs/tests/cache/cache_test.sh > > +++ b/tests/sys/cddl/zfs/tests/cache/cache_test.sh > > @@ -280,6 +280,7 @@ cache_010_neg_body() > > . $(atf_get_srcdir)/cache.kshlib > > . $(atf_get_srcdir)/cache.cfg > > > > + [ -c /dev/mdctl ] || atf_skip "no /dev/mdctl to create md devices= " > > verify_disk_count "$DISKS" 1 > > ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" > > ksh93 $(atf_get_srcdir)/cache_010_neg.ksh || atf_fail "Testcase > failed" > > the canonical way to do this would be to add > > atf_set "require.files" "/dev/mdctl" > > to the testcase head. > Thanks for the tip. I'll redo this for the other ATF files. I have several others in the queue... I've not been good about sleuthing out these meta-data variables. Where's the list of them kept? Also, is there a canonical way to say "I expect this result, except if I'm in a jail, then I expect that result"? There's a number of things we have tests for (like mknod) that work outside a jail, but not inside. This results in about 50 failures when kyua runs in a jail (which is my test setup for bsd-user). Warner --0000000000009de140060491498f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Sep 4, 2023 at 5:37=E2=80=AFP= M Dag-Erling Sm=C3=B8rgrav <des@freeb= sd.org> wrote:
Warner Losh <imp@FreeBSD.org> writes:
> diff --git a/tests/sys/cddl/zfs/tests/cache/cache_test.sh b/tests/sys/= cddl/zfs/tests/cache/cache_test.sh
> index 4d77d9fa56a7..79b09dd93183 100755
> --- a/tests/sys/cddl/zfs/tests/cache/cache_test.sh
> +++ b/tests/sys/cddl/zfs/tests/cache/cache_test.sh
> @@ -280,6 +280,7 @@ cache_010_neg_body()
>=C2=A0 =C2=A0 =C2=A0 =C2=A0. $(atf_get_srcdir)/cache.kshlib
>=C2=A0 =C2=A0 =C2=A0 =C2=A0. $(atf_get_srcdir)/cache.cfg
>=C2=A0
> +=C2=A0 =C2=A0 =C2=A0[ -c /dev/mdctl ] || atf_skip "no /dev/mdctl= to create md devices"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0verify_disk_count "$DISKS" 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0ksh93 $(atf_get_srcdir)/setup.ksh || atf_fai= l "Setup failed"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0ksh93 $(atf_get_srcdir)/cache_010_neg.ksh ||= atf_fail "Testcase failed"

the canonical way to do this would be to add

=C2=A0 =C2=A0 atf_set "require.files" "/dev/mdctl"

to the testcase head.

Thanks for the ti= p. I'll redo this for the other ATF files. I have several others in the= queue...

I've not been good about sleuthi= ng out these meta-data variables. Where's the list of
them ke= pt?

Also, is there a canonical way to say "I = expect this result, except if I'm in a jail, then I expect that result&= quot;?
There's a number of things we have tests for (like mkn= od) that work outside a jail, but not inside. This
results in abo= ut 50 failures when kyua runs in a jail (which is my test setup for bsd-use= r).

Warner
--0000000000009de140060491498f-- From nobody Tue Sep 5 00:11:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfmBb5kVPz4sFWW; Tue, 5 Sep 2023 00:11:19 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [IPv6:2a01:4f9:c011:3eaf::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfmBZ6MRJz4QNn; Tue, 5 Sep 2023 00:11:18 +0000 (UTC) (envelope-from des@des.no) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of des@des.no designates 2a01:4f9:c011:3eaf::2 as permitted sender) smtp.mailfrom=des@des.no; dmarc=none Received: from ltc.des.no (unknown [IPv6:2001:4647:d671:0:36e8:94ff:feca:9834]) by smtp.des.no (Postfix) with ESMTPSA id 62E074ACBE; Tue, 5 Sep 2023 00:11:07 +0000 (UTC) Received: by ltc.des.no (Postfix, from userid 1001) id D754D4CC35; Tue, 5 Sep 2023 02:11:06 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Warner Losh Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: ea82362219ee - main - tests: Skip all tests that require mdconfig when /dev/mdctl missing In-Reply-To: (Warner Losh's message of "Mon, 4 Sep 2023 17:58:20 -0600") References: <202309021940.382Je6Hn028769@gitrepo.freebsd.org> <861qfdtsqh.fsf@ltc.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 05 Sep 2023 02:11:06 +0200 Message-ID: <86wmx5scmd.fsf@ltc.des.no> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.95 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.65)[-0.652]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; BLOCKLISTDE_FAIL(0.00)[2001:4647:d671:0:36e8:94ff:feca:9834:server fail,2a01:4f9:c011:3eaf::2:server fail]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; ASN(0.00)[asn:24940, ipnet:2a01:4f9::/32, country:DE]; FREEFALL_USER(0.00)[des]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; DMARC_NA(0.00)[des.no]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4RfmBZ6MRJz4QNn Warner Losh writes: > I've not been good about sleuthing out these meta-data variables. Where's= the list of > them kept? atf-test-case(4) > Also, is there a canonical way to say "I expect this result, except if > I'm in a jail, then I expect that result"? I don't think so, but it wouldn't be difficult to add a "require.unjailed" knob, or a configuration variable which indicates whether or not the job is jailed. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From nobody Tue Sep 5 02:28:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfqF31mwWz4sSb1; Tue, 5 Sep 2023 02:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfqF31HkTz3Y0f; Tue, 5 Sep 2023 02:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693880919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXZOEmelohrhBkJ8H0FmWw3quP9rq5vk0phwRigx+1c=; b=slnc7BNepxtgNLQvQ1r9g9WUZtQ5ExiLbByDjOm1H0VpFy+mY7RNANakUpKUAVTEzGo3NS UQnGGNFSv4KTEKZcX2nm+RafIdvfI9UajAH2y0O4mbeJIWERHV09MWWW4WDm5ltoGsQX58 1PPVYGK6QftDd7mWI45FEfQ8YUwQvjAp+EAr08U0D2IvPGdog635HPBLwnzykj0ofo5rtG tSOXJNgF2atfULsfhYx5fBe50pJCKzHQNBzy8AqE1LZ88+DGsuS5FYzFBaFuVoDUodfSvq aIEWsvxwt013sJww62ygG4qr0Ytw/jKatr+3fWPQUCDzzIeeKREdS5Bajzra9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693880919; a=rsa-sha256; cv=none; b=v6y7clwkD76GK6CL3H4LoRC1nfLcTftrzIED6dt3l59KhV8BqGpmteDstoy9m1putGyePD rI+MAr9yw8Zs9EwP6a75XZMByv0cCe5t0NrlE2AlTRhlrac7K8huZybLPFr1/xIHovh9F0 090X8ubb/Id1Vh7RzzexMlEshrTM6XAzN5cihq/PFTma+KHpAjXVfRTVr324U4WMRqwchb q9GLin8nPf/X5AoGs5o7IVUKVl24VOSvp0h47IkRPsvBtBoPnKG4hLDuHZpD8FB7G0vcdT +zXh06xuZYU1tg9SaMmjuGvUYYpmMwNTfjeos1bvOEztyOWDx5vJOVj4GhAULQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693880919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iXZOEmelohrhBkJ8H0FmWw3quP9rq5vk0phwRigx+1c=; b=ymtRwUcMte1weNdh+AxOReMSJRwJtBMwDhD0Q8bRXxMNapJjazxrn6Q/AzUvow35eYt4PX EbtHo0mY5kcQpyVZ7n8sCqo0miU/2Li55SpVZtFpClgMnuvIoGtAhwo8TcllUdpTd892NE ++mJf4WRJ6c9+6ieFFjHwFEwqKGIjjpV4lKp9bCyA89Pbj7QMdYZX9Sb7oGdLgq0zW2+hE 1kojHCIor4M4fpdx3kpM+4cXZym5StBsTzFoes1aLwg5YuOs2KcvGWt8f5mWh6RChW0v8m lOjjglh9Y0PmPPD3/12ctZF0yMZlIzqKUm2kGOHuDtHsoUpvKm8MJ5DrNOby4Q== 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 4RfqF30LgJz1Lt; Tue, 5 Sep 2023 02:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3852ScBw082333; Tue, 5 Sep 2023 02:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3852ScQk082330; Tue, 5 Sep 2023 02:28:38 GMT (envelope-from git) Date: Tue, 5 Sep 2023 02:28:38 GMT Message-Id: <202309050228.3852ScQk082330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 5bc1e0c2285e - main - stand: lua: module names should permit more List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e commit 5bc1e0c2285e73fe8455bb6c72b2b40e33f5477e Author: Kyle Evans AuthorDate: 2023-09-05 02:21:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 02:28:11 +0000 stand: lua: module names should permit more The module entries should generally allow whatever is allowed as an env_var in the pattern table. Notably, we're missing periods which would allow proper entries for .dtb files in loader.conf that don't need to specify a module_name entry for it. %d in this expression is actually redundant as %w is actually "all alphanumerics," but I've included it for now to match the env_var entry. We should really remove it from both. Reported by: "aribi" on the forums via allanjude@ MFC after: 1 week --- stand/lua/config.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 3f8fbc52cb40..8fdc805ee983 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -61,7 +61,10 @@ local MSG_FAILSYN_EOLESC = "Stray escape at end of line" local MSG_FAILSYN_EOLVAR = "Unescaped $ at end of line" local MSG_FAILSYN_BADVAR = "Malformed variable expression at position '%d'" -local MODULEEXPR = '([-%w_]+)' +-- MODULEEXPR should more or less allow the exact same set of characters as the +-- env_var entries in the pattern table. This is perhaps a good target for a +-- little refactoring. +local MODULEEXPR = '([%w%d-_.]+)' local QVALEXPR = '"(.*)"' local QVALREPL = QVALEXPR:gsub('%%', '%%%%') local WORDEXPR = "([-%w%d][-%w%d_.]*)" From nobody Tue Sep 5 03:11:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfrBc6PrQz4sp8P for ; Tue, 5 Sep 2023 03:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfrBc6047z4GBv; Tue, 5 Sep 2023 03:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693883496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nYe9W2Fh7RMjB2rSwfE1Kf9Na9xG224aRScxaUOERiU=; b=sjrv4rCYTCpPnlVs0VSxqcHx/U+Nb2tKBM+PFRuNlk0fatVRDCg3V/ijCYCshvWBPH//MV aFdIbF7ERVpA7ANn724k+26U2FYk4UT0/aceiZfgUI5ivtHsN3r9vSpV++CVzD1RI8lzpf AE9zEs5C8fzN5DDez36MCiTM2teh636270bbhWodtXIWkqj+sLTj14Lfgsq8MUAYfGhVxJ 1FybtCCRGQ01Fo2B4yoKaIK9nJRvq3qcfdJMgaa42BB3jm7w85wMTI57IojQmXLFwcl3Yl UXLFKWL0a/nNcvZbc1SfKBAyUsCanXLafzHXToy2OPJKK/l6jaxLAUgs08UQtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693883496; a=rsa-sha256; cv=none; b=tlx0X6YOVB6FPZjGYJpKsa82Zw026Bc/U0cJcFKMyRRSI3J4gdcjPs1oBt9o2llaeZhPny IM/FjUOzfn8QyhkiwEpWiT/totOYKJNCHsQ3bKegmKTd7GFWi/6Rzwcs61lxlWxZcCfzAW qjaDcWlPXQGG8GOLdCm0OTjvcAAGSQSIAXkPUdCDOAkHwWDdrNFKoXdv2ytLeMzgj29ZyL 8ELFzHcsRPhzx93J5zuriO3gDb9xe6s9J0cal8v5xuiAoaL01Qt9pCRfQB3EZv2ykyv+Ri pII/b+L+fmy/GdjvxqXvu3qcmv0Olkz6PEKJ96VnX3KIBY83c8q5HtsMwnpNHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693883496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nYe9W2Fh7RMjB2rSwfE1Kf9Na9xG224aRScxaUOERiU=; b=g2ypt5Jw88yhy8oaU11KWDcLe5a8oUhU3ZEJO6Ae9beJL9B3WiCYxvg8w6YR+VGd66RPtC DeK2RDT2XPhcUkcTwUiEZIX57HgiwXdz9deSYazeGWIFhqo67dQWUy1Y3/mPOe6me7kv0p wEjw9VqiC3oEVX+SpMu+3ur/oOJFnKaLQ4Otl8CDcevqRNdkubhgMcoFq6klYpdy2cHkVr WuY9U+tIFWLkfn8F43mqV0XNEZ0AzSMEGD2hYLlpDH3dbbxAWxpyLgL0dZ2G9ua4zZUbW8 Cd5AdJF/A0KhWC20TC+OAeD0npM66MKFEb4J+3pzbpu+XESRg8g3rB2jTI5YuQ== 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 4RfrBc4nqnz2RC; Tue, 5 Sep 2023 03:11:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3853BajS060837; Tue, 5 Sep 2023 03:11:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3853BaZn060836; Tue, 5 Sep 2023 03:11:36 GMT (envelope-from git) Date: Tue, 5 Sep 2023 03:11:36 GMT Message-Id: <202309050311.3853BaZn060836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: b37eb25116f9..900147a461df - vendor/zlib - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/vendor/zlib X-Git-Reftype: branch X-Git-Commit: 900147a461df11f88acb3072821806cca8e574c9 X-Git-Oldrev: b37eb25116f96e418b265bc68e8e35f549e72fa8 X-Git-Newrev: 900147a461df11f88acb3072821806cca8e574c9 Auto-Submitted: auto-generated The branch vendor/zlib has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=b37eb25116f9..900147a461df 900147a461df examples: define functions as static ones. From nobody Tue Sep 5 03:15:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfrGn3K4Hz4sqKd; Tue, 5 Sep 2023 03:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfrGn2m0pz4Gtl; Tue, 5 Sep 2023 03:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693883713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5upkTfYjSqfNSwfaZFe+0Gdz3jpu8fDrz1aXhBafS4=; b=D3psgIRlrzWZJSQPWQLzD8+o5GJOHxIj/z6/VYejWJQLGIGHcKy5G/APgkKtxOUqxguS+w l8kOpUyE5lk8PDuDaO0sTXJdSAZxAZdJdoaRKO0dPsEF7f1VzIVRXLSL3gJK7kDJUEl2GS Kae2TBfefIfM2UvyiftoBO3Mcu0/dDdbbpTt34AGnPx3L75ieENxU+tzccIZ3svNE+N05x BUFWPPKvhEhL1CDKrpvsHK3n5JHZ5KQ0MiO1cVZvVzSBcc28yeKiSowK74oYC0zOlitP5T XV4XZVaaENxsLLDmEu+oH9QIR6VC9kMcNhD6fydtsqtL3DW7mggxDLPU3eWdxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693883713; a=rsa-sha256; cv=none; b=NBCHSJxs4dCs3ry4kQSqILdmISqI4aiszK2nPqz1WVZ6msdDP0j7RZkMe3RcV8+uGz4ktv Jvjrz8k6D3y9aG83gH5RQyPUbS55inyLwjzfEoZcoJImlRCRM7Ry72z17T+TELwwAu6E+X evGkctrWA0f6Co18G1LQJ2CEudTwVPb8aH00yxn88PAidcgDevwJuriYNy+eRTjx0/cIdi hvsA5tugjcFfht00DYn+GfGmRt5NfkBZMdZk6QvSWyLWO/j4ptWCAKiqOz9DlTXJ9kiVBa tppkH0oT8jPVCa8YkgzfdD0WD5mTNxpydc+8fyJ9Xpd00O1ZMH87+hY/jckmIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693883713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k5upkTfYjSqfNSwfaZFe+0Gdz3jpu8fDrz1aXhBafS4=; b=PiApk1Dr/HfnGKRSx6oCZyn8GHNOOzfyzL+WrrRbbQLUftuD/Y8E8FWUfwd2mOBeohF4UO N8CIGYGPOL9PXEUJG2/BpgvSoXfgS6YZa9oA/jikBdEkNp8la8VSASkvXgDBeRcIqd9taB Nk5gQx8NxFP1vv+yRofeOJlCVMUmvjyQcSsvvUggAgyVMhQZ8SiTyJ2Pvy2UvtVDB5NgVH G5BlOQSxpdq7ufAgEh9uEIKWXOn6b+lDiV1RwNBcVO8k0SUreL9Edw90BJUKPZQVdHxiWJ ruEYX/NS5G7hMva5Uczs/92mHixlFp1uT392SIyaogX4PE6zo69mt3KMxMBrIQ== 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 4RfrGn1mC9z2jp; Tue, 5 Sep 2023 03:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3853FDRk066993; Tue, 5 Sep 2023 03:15:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3853FD9e066990; Tue, 5 Sep 2023 03:15:13 GMT (envelope-from git) Date: Tue, 5 Sep 2023 03:15:13 GMT Message-Id: <202309050315.3853FD9e066990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: ef3a764bc5be - main - MFV: zlib: examples: define functions as static ones. (PR #855) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef3a764bc5bed4bc071a81e04c4d3254010274c3 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ef3a764bc5bed4bc071a81e04c4d3254010274c3 commit ef3a764bc5bed4bc071a81e04c4d3254010274c3 Merge: 5bc1e0c2285e 900147a461df Author: Xin LI AuthorDate: 2023-09-05 03:14:31 +0000 Commit: Xin LI CommitDate: 2023-09-05 03:14:31 +0000 MFV: zlib: examples: define functions as static ones. (PR #855) MFC after: 3 days sys/contrib/zlib/test/example.c | 24 ++++++++++++------------ sys/contrib/zlib/test/minigzip.c | 30 +++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) From nobody Tue Sep 5 05:22:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rfv5B31yTz4sQ5h; Tue, 5 Sep 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rfv5B2b5Xz3JpV; Tue, 5 Sep 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693891326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cU0NR8BcHPf2wEeVo7gfxk848VOKw9kT0GiNZxDLXx8=; b=ONQ8c9UicvTmLgUmO0RWbqYM5CBFonp7i0xo3woGlW75HN3XKvDZaml3kscO3KqqtIpnFu nWlx7tn/KalagSHdj3jOx9WzN3doN7kplRUE6aGPJC/c0aVLu5T6IPjVtIcSiVZsvrf6+A NxSVM5lMdi0Gwqu/1ggoHkoOOtt0pDJ2jL+0SkSc+r5QYhOi4Qt4jAnrdKwqiExeHPGobY FPvDGRfXpqedyY9QOKXLtF2RQxaevTSNRnqPARRiqIaUFxXX90a1uSptGZ769diRVTf4EC rKa9kDe+BHcnKm2RTsygstuef1GU8e+1je390zhW7Hx7lnjx3PiXeEWmhX0abA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693891326; a=rsa-sha256; cv=none; b=w7rlvt7YMCSn1+a7KdCBAuhED6rQRP37zu1BwjqvY4P6fbUZbket1r93Jrtqrd0VDrAeM8 d5k3InSktSp2/iBcj9K5DsufwOlCIesu7HsBKLHqGr9zU8KvPH4EoymfBa6CC4pboe8mw0 LliQLOAOeEovqgFVHCZK9E0FUHbem///TzNPKj6/nF/2EHCg/Xln/25VycpAeoD7dKjUY8 UBjyhEuk/kOJUDB6PL3r/sN8CSARV3FWWM0BtX0CYZfLp7VmXqN1igP7g0D4+Y9zH1Xf6U qKFIF7LPpaxQGcThgKMHbuhU3wr9E3FF+KTxz7Fv2MLp5b5OBCLX8Q61g9ISjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693891326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cU0NR8BcHPf2wEeVo7gfxk848VOKw9kT0GiNZxDLXx8=; b=BStZRqw4V1G3qw06rlj0ohm4/u7wsn4OVcvQ1M7XNXpir3cfijhpYRuk/KEqVkXUIXVlj4 EVBIQSPyXCliBuh/3Pxcs3ComCWpxApeuf8DvEQY4hon4ZGh+T1yKk6vyzfz3VVDjdYtFT d40m7BXIm8KBl5mF5UuCacb10eWZIa4XQA5JxwZ/har21D89c895xU7gGWPYhrT8D0FI/o k6GK6REkHMiau8PkhIQGjSgbih0MobTGSmMpnA21EunkvDK8QswxdECEpYsmzoO5wI/ZRg TC7/mf801dKVt7odA2VlRHfX3ap5LOmuRtTMs5dkN2GAVGnmlGUYbc63n/mnxw== 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 4Rfv5B1g4Zz5q5; Tue, 5 Sep 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3855M6gH081085; Tue, 5 Sep 2023 05:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3855M6e3081082; Tue, 5 Sep 2023 05:22:06 GMT (envelope-from git) Date: Tue, 5 Sep 2023 05:22:06 GMT Message-Id: <202309050522.3855M6e3081082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8921130e3ada - stable/14 - arm64: initialize pcb in the TBI/PAC/etc. fault case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8921130e3ada68eca92952045b9b62c869ca1526 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8921130e3ada68eca92952045b9b62c869ca1526 commit 8921130e3ada68eca92952045b9b62c869ca1526 Author: Kyle Evans AuthorDate: 2023-09-01 02:10:38 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 05:21:25 +0000 arm64: initialize pcb in the TBI/PAC/etc. fault case After 2c10be9e06d, we may jump to the bad_far label without `pcb` being set, resulting in a follow-up fault as we may dereference it immediately after the jump if td_intr_nesting_level == 0. In this branch, it should be safe to dereference `td` as we're not handling the special case mentioned below of accessing it during promotion/demotion. This seems to fix a null ptr deref I hit during my most recent pkgbase build attempt on the Windows DevKit, though that was admittedly encountered while we were on the way to a panic from an apparent use-after-free in ZFS bits. Reviewed by: andrew, markj Approved by: re (delphij) Fixes: 2c10be9e06d ("arm64: Handle translation faults for thread [..]") (cherry picked from commit 03d104888caea595960605a9ff010da7f39133dc) --- sys/arm64/arm64/trap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 15f1f5e86a08..d1a48a2fd9f4 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -277,6 +277,7 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, } else if (!ADDR_IS_CANONICAL(far)) { /* We received a TBI/PAC/etc. fault from the kernel */ error = KERN_INVALID_ADDRESS; + pcb = td->td_pcb; goto bad_far; } else if (ADDR_IS_KERNEL(far)) { /* From nobody Tue Sep 5 08:53:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfznY41Zdz4sJ9d; Tue, 5 Sep 2023 08:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfznY2mTYz3KtK; Tue, 5 Sep 2023 08:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e10hmVBwvGRKYSMfMmeX9TfcMd51j6rdL4OXG120Ra4=; b=w/HewTQHNf2lzWSTGXbBIrVz4jWwB2rb66aeX1EnOsrERywNfmLNdh3HyKkYjLjzmrzgXz qf9IHa8jI7WgGjpbMXK6Ypo1UJPMDqNubEAPn4Xme5MsLWzMQ2Ng2XdCg14qiW7CZx298m lCvYrTLaNy6b+tddm6Q+NYNY5eGMeQPyTqQPZj4LsRl4w3SzsAJK+YpuwIHyfJt0Zg+sgP L13aOSm2lKbnbfK+XpS2Dfe+HntV73GCFRMXyzN6+IXi7OWMouqOwQT0Twl41srEmklp1J aH2JM3mbVqj2dKtsy4ZInz9g7uVWaLshTyM2X/WMqRLOJ2e8bpyjYn6GbtereA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693904033; a=rsa-sha256; cv=none; b=tT+gB7061CFcTdkVNSes1Whv8BKOrPacY15gfBwk2xgBz7C3V/r5v/CmzvlkYgiKFEsV+2 Z61C3pzGuCfbt+HBWgnLObQgyMLePNMYL9CEe65G3hsbJSizXvimjnCTd9Yb3Xl+x0G9mB KlNu3g1u5rUHR4gcm452yy1f7hUMRTy0qd5YSVPBtUvjWES2kN+V6PjsN6iaJsMixrM7Xz JBOCUK9ggJD1kuRmTROnAWaLG+ltyav9pGKzzrFilwh3kxCWsOWTN/CJ1ij+ncnyudcCPv GhVu1Qh7Ar8zd5DXL4nzalrVz6/L+dUuSL/eIBmQYb3SOEIRpqrOh/Lz1LpYAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e10hmVBwvGRKYSMfMmeX9TfcMd51j6rdL4OXG120Ra4=; b=ZoQALh4AJ675tRIdETcyINoiqre9idA4T5k1A5NT/R16OZpv4ouZm3kB9nSGK5guW9suLT emrNF0Cn1iMV28zjsjVLWsYagVDs5U5EcMZEW3SR1pxbdmsji5G7mNE2LCyOBYo6vPzg/P 20UsOi5SUAymaaBW0G4osi++UMqQEPz/8nCXMeLy4m8WpWO00bywZ/lTQeIwvytdzQ+UCL TAEesMZwwSFqayycXbuIMxJfECu+7kj6mA9fsL2diJy1DgQnr3s732/uJEr6d5nkUP6eVK ZbmZxKQg5mRISYTvzwo41SkADL7cX+pPv/OfKpjmkZw+WwaGZwrCdAOCSQL/Yg== 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 4RfznY1qYJzC0P; Tue, 5 Sep 2023 08:53:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3858rrSG030610; Tue, 5 Sep 2023 08:53:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3858rrjq030607; Tue, 5 Sep 2023 08:53:53 GMT (envelope-from git) Date: Tue, 5 Sep 2023 08:53:53 GMT Message-Id: <202309050853.3858rrjq030607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 18d1c86788f6 - main - linux(4): Fix listxattr for the case when the size is 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18d1c86788f66f42c4e096142f4f8d168f68732c Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=18d1c86788f66f42c4e096142f4f8d168f68732c commit 18d1c86788f66f42c4e096142f4f8d168f68732c Author: Dmitry Chagin AuthorDate: 2023-09-05 08:51:46 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 08:51:46 +0000 linux(4): Fix listxattr for the case when the size is 0 If size is specified as zero, these calls return the current size of the list of extended attribute names (and leave list unchanged). Tested by: zirias MFC after: 1 week --- sys/compat/linux/linux_xattr.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 74b47f1cbaec..71d7ae58439e 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -173,24 +173,28 @@ listxattr(struct thread *td, struct listxattr_args *args) while (rs > 0) { keylen = (unsigned char)key[0]; pairlen = prefixlen + 1 + keylen + 1; - if (cnt + pairlen > LINUX_XATTR_LIST_MAX) { + cnt += pairlen; + if (cnt > LINUX_XATTR_LIST_MAX) { error = E2BIG; break; } - if ((args->list != NULL && cnt > args->size) || + /* + * If size is specified as zero, return the current size + * of the list of extended attribute names. + */ + if ((args->size > 0 && cnt > args->size) || pairlen >= sizeof(attrname)) { error = ERANGE; break; } ++key; - if (args->list != NULL) { + if (args->list != NULL && args->size > 0) { sprintf(attrname, "%s.%.*s", prefix, keylen, key); error = copyout(attrname, args->list, pairlen); if (error != 0) break; args->list += pairlen; } - cnt += pairlen; key += keylen; rs -= (keylen + 1); } From nobody Tue Sep 5 08:53:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RfznZ4nDnz4sJGJ; Tue, 5 Sep 2023 08:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RfznZ469bz3LLQ; Tue, 5 Sep 2023 08:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ADadii1cul/gqOB50EUusNmZI8VTwYhx71G7yk88uKs=; b=Yd90OMfaGBSwWBvN9Fk+c0jd3QxjauCNR40KojdFuk1xllrw5QEhLc82xtkLsvzZ6vLDkG 66mur6TWG/H+Mm/NAWtZ1ymD6MjgvZXFVB3NZqmUiGua5djHJ4+8g3Upd5RkBt0r8f8/nb 8AW9HkWnhX8A9g/otxRUFDWW8ZEfQZEmmIAHaEVPRjjtPgJNCfsi5+AuiDpoHtSr2ifDtj WFk8pgeZVjvcsvmyNwP/eI06Cz4PmuDfLwX83javcdY6p6iK2LmMR1YO9V+hPzNEOfi/FZ dNypmSP0XuYDfXfRL4/CauqEPeJosiOOk7bzsdEhxpkEBPVoF7PJhoMUiV+13Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693904034; a=rsa-sha256; cv=none; b=I/cxBLJPUArX6MqzSIW8LNrk3l5ARyiX0LjV/gzpeWzbvG2f7df3j/fxlhvjqOpY+O+iRT Kl+tmHqNIVEr8J7enB+8+Far8KfuijrAvpGRbrsj76MR1Vaoa8f6b3z1Himau2ux4CVZMh xRLfirw8nq1XXECwi1NGzbL5G5NOFDlmyjm9SZU4W+rJ477COmQzJ3X9ZAUutoQivl4hJm 1kqnX6/iLSMQANMmr6o8YkG5QSvL86BNGgSUbTK4R4o9xi1lyvcU4dRdz4aUH5hOyto96/ BcjzxJbVtiOUYbdJtR6L3AQVBLFrkvgbfpjq+nLxizKLTmiHqGbJTs3VlbbHpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904034; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ADadii1cul/gqOB50EUusNmZI8VTwYhx71G7yk88uKs=; b=fdzPSGFvZW1PbchT6taF81ngaT1WiIFaWzDIu0Rik5CnwhgUySDUdRMEEyABaMMquVIMMj ipHu+RhhVMysUrDzinpu9bVFgwGObnvD0c9Nx7RnEDgAt9oNwj2LGihGRGnHhNbzh1WnxS YeL26rp3f6tNs4ZT7A8UXgBLjKJEw8zCIGthJTTcFz3aOG9S2J9QisJLd1/6W194RdFuke fp70e8OHfY+UnXXavUpsXJeY8+fySrbRyBI7UpOLGk1g6bISlPDaZY5WvUnoXz6wdJFUk6 i4d/76iW9kGuQCyEuMFAZTwkP3vW0DS2tvOEjT+y7TGun9w8yyrJJ1z508Imeg== 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 4RfznZ2pbhzBVx; Tue, 5 Sep 2023 08:53:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3858rsng030661; Tue, 5 Sep 2023 08:53:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3858rsGi030658; Tue, 5 Sep 2023 08:53:54 GMT (envelope-from git) Date: Tue, 5 Sep 2023 08:53:54 GMT Message-Id: <202309050853.3858rsGi030658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 11e37048db35 - main - linux(4): Return ENOTSUP from listxattr instead of EPERM List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 11e37048db35d7fcfc285b867965de1aeefec2c8 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=11e37048db35d7fcfc285b867965de1aeefec2c8 commit 11e37048db35d7fcfc285b867965de1aeefec2c8 Author: Dmitry Chagin AuthorDate: 2023-09-05 08:52:27 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 08:52:27 +0000 linux(4): Return ENOTSUP from listxattr instead of EPERM FreeBSD does not permits manipulating extended attributes in the system namespace by unprivileged accounts, even if account has appropriate privileges to access filesystem object. In Linux the system namespace is used to preserve posix acls. Some Gnu coreutils binaries uses posix acls, eg, install, ls, cp. And fails if we unexpectedly return EPERM error from xattr system calls. In the other hands, in Linux read and write access to the system namespace depend on the policy implemented for each filesystem, so we'll mimics we're a filesystem that prohibits this for unpriveleged accounts. Reported by: zirias Tested by: zirias MFC after: 1 week --- sys/compat/linux/linux_xattr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 71d7ae58439e..6979fff9c82d 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -165,6 +165,8 @@ listxattr(struct thread *td, struct listxattr_args *args) error = kern_extattr_list_fd(td, args->fd, attrnamespace, &auio); rs = sz - auio.uio_resid; + if (error == EPERM) + break; if (error != 0 || rs == 0) continue; prefix = extattr_namespace_names[attrnamespace]; From nobody Tue Sep 5 08:53:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rfznb5gClz4sJGQ; Tue, 5 Sep 2023 08:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rfznb5BGQz3LPM; Tue, 5 Sep 2023 08:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHeqT0vCf9Zqr6m6btufzlcA6D1DA2yJOVU012o9q0c=; b=YZ3FZFQY6XzHzlnIfrhlQN3NRqHbdu2+g7gwxbUO0lKrI/mtN9GtMZzL7h/08SnrQxNQJ1 8rd/vBlCJoIEWLV0HGmmnKg3UgfVpm2GRarz/kS49tDQmdgyhTZazLUnCDRQH4QFJsi9TO HJ8n2QQXUdIW1JMhr61MSBP9nvPgN8kwXyMemHUTaJ7tendYk3qkYiyk+4htaKIyLsXxLx f+SspnzRK+nUzzzhZhYD1Xzo9lcPemTuPRUoCCBIm34lxu2d+qbJyVIu7gsOwRBiZYkLQ0 JWsZ3/0EKX1nI9TTH9jyMIzmoy29SjMGz2NnF+3FTWUXpNaWF+/+7gvNB7Z/PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693904035; a=rsa-sha256; cv=none; b=Zypn05QyhV7MgJO5Ak/uMws54s69dJN5JA7SCV2r1cUjPs1S1fWraVlmRs2PqlpbIbR6FX X6lDAuMrnOvj5ayTq3ByMKySaKkyUfDseRFVJ3OeELtAx32KmIQPrfcstkvaDk6ELHuTie uA9KvuOtL7RVF4zYPhvmjTv0lntQJb25bDvv03xCYspMC7kqnyLDoGcQsevVavsEhRrH3f aWWZbaCMY0ICi3Udf/kz+h27Bi/F3j0vuCsu98rFWIHfl8kpFLYrlTUYKHWe9Ip+Yv7tEg hHAqF/ivFaPnD/VTTrx58/4ALQhfLf8byzs4aP6qLOzUFUGqSHBSJ7d5FvURGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693904035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHeqT0vCf9Zqr6m6btufzlcA6D1DA2yJOVU012o9q0c=; b=dbROlGMC45tzHPFSLwKD6rGrNagT8c5wCExFleGHP+qmKFMLjDMZJIlRYG1HLWD8I8x/KD q5qIN1dNpeHm0iWQdm4yXof3/lO9YAjULDciWzwHbqCr48/2eVchUw5VMf/sAhPJY9Xequ 42KUraVUptTNkrDau6c1X7uZxLYQofsrXJ1KGQ+JrHFnRHBF1DwKkpLJ8nGmnESXNWsYdX dm/XFU9XHP/z3a+eNn9eblBZQEFYE9Pe+rjzikjuKhmk3EVjsiEaP8ljHEGTUoYlzorRKh BjOi4W08iY01+HtIYBAsKPkEppkiKLJKmIQxnTXBsrtpAMWq/nOkjI3hhJlgAA== 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 4Rfznb3nY1zC0Q; Tue, 5 Sep 2023 08:53:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3858rtoO030706; Tue, 5 Sep 2023 08:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3858rtbE030703; Tue, 5 Sep 2023 08:53:55 GMT (envelope-from git) Date: Tue, 5 Sep 2023 08:53:55 GMT Message-Id: <202309050853.3858rtbE030703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: aadc14bceb4e - main - linux(4): Convert flags in timerfd_create List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aadc14bceb4e94f5b75a05de96cd9619b877b030 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=aadc14bceb4e94f5b75a05de96cd9619b877b030 commit aadc14bceb4e94f5b75a05de96cd9619b877b030 Author: Vico Chen AuthorDate: 2023-09-05 08:53:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 08:53:02 +0000 linux(4): Convert flags in timerfd_create The timerfd is introduced in FreeBSD 14, and the Linux ABI timerfd is also moved to FreeBSD native timerfd, but it can't work well as Linux TFD_CLOEXEC and TFD_NONBLOCK haven't been converted to FreeBSD TFD_CLOEXEC and TFD_NONBLOCK. Reviewed by: dchagin, jfree Differential revision: https://reviews.freebsd.org/D41708 MFC after: 1 week --- sys/compat/linux/linux_event.c | 9 +++++++-- sys/compat/linux/linux_event.h | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 816c68a90f1d..e88791659f1f 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -611,13 +611,18 @@ int linux_timerfd_create(struct thread *td, struct linux_timerfd_create_args *args) { clockid_t clockid; - int error; + int error, flags; error = linux_to_native_clockid(&clockid, args->clockid); if (error != 0) return (error); + flags = 0; + if ((args->flags & LINUX_TFD_CLOEXEC) != 0) + flags |= O_CLOEXEC; + if ((args->flags & LINUX_TFD_NONBLOCK) != 0) + flags |= TFD_NONBLOCK; - return (kern_timerfd_create(td, clockid, args->flags)); + return (kern_timerfd_create(td, clockid, flags)); } int diff --git a/sys/compat/linux/linux_event.h b/sys/compat/linux/linux_event.h index fa63371b5170..8c6758fefcc9 100644 --- a/sys/compat/linux/linux_event.h +++ b/sys/compat/linux/linux_event.h @@ -54,4 +54,7 @@ #define LINUX_EFD_SEMAPHORE (1 << 0) +#define LINUX_TFD_CLOEXEC LINUX_O_CLOEXEC +#define LINUX_TFD_NONBLOCK LINUX_O_NONBLOCK + #endif /* !_LINUX_EVENT_H_ */ From nobody Tue Sep 5 10:01:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg1Hj4QPgz4srp0; Tue, 5 Sep 2023 10:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg1Hj3vlTz3fpd; Tue, 5 Sep 2023 10:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693908097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i425ELrn29YJb6tP9pw4vOhZfW1ev1zHnSt2A8zuHJU=; b=sFya6fdVVz8k/IzJxZWi9KhJJ40PSbkbyNe4i2ek3Aeto5m2xy5OiFUkN8A3uUeRpsJ2Rv EwjOSLH9scNJi/WJrj91Edl/s+4G7RLN5v5MOQtDClZLHHCt6Aft3ANmYe3b70Tb07OeQD UPwW2lNYOC74Cca+NxonyyEchwlcDBGEtWY2xzEWdRytUfYLcz7ucXzJCp3HB39YhyfGCK xklkPYBea5VJ2BrqgevcwyTzdrL6ZwsYWeDoAusXxLCYHELdKdBzBIqUJQCSgUGeiJwD7S fzZqtcZ4epGFVlp/Cw/lzKhHNRJQwhZiJmLDEbWCBBqkL67civxvZxbp/dijEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693908097; a=rsa-sha256; cv=none; b=nvODUFdL4sw0Lt2aZxNhUDyazn9jarLAkaulL421IjtqN3+y4vlCNADfyaXjL7jXv9oIE1 pgqo3mJ5dx2wVf/CvWLR4emnrfhbHxSfG2Ffz5/Jxtu877JTTTqndWy73jwTGZxIqsGgGE 6piwkbfTRP8YncSk058X4pB4fDgi7ucsWTYA/ZTGriFioKGBi+hV9iFsfzvPC907caEFA+ xZEM+AO3yPqXFLwxbFdJK5spM6P6oFYM7ttwIGTO6pmewirFKcls2GFb5HWdR+p8qgBZd3 bmZyHRZy2o3ZWiIkh0+weWYOjsC9wXak2k0TmV4Ft7rLf8vZ6zKcMAgq8ibCsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693908097; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i425ELrn29YJb6tP9pw4vOhZfW1ev1zHnSt2A8zuHJU=; b=pScRAQKTux3ODHb+QC4t99UkPnHGyzmFPclANKHsIlsmxWcfJpgbuR9u5AabVDSm2G7h+a Xjq4F84tkh9dvm9YjcnK27gnxrrUVU8wl8YMFWmj7Mn4BudmeBA/npQKnXMwcArVY334EI loQIVKynSba5ogx2M4JIU/f9qSz9GZI/9dLPiD21R9HWS3E0AKbiyz+Gbjpsmy895lsX2E GYn84MDxhYlq71lSjAfP2d3WoCUunoXb8CR04N4aUtXRL9IRpvsldDa+RGIk/ZgQyUaxK/ RwOeX8CyMwqgtGOcHivEq1W0ZKvzD7ndUdVw03SgkAk/qZz9YOomCWT8SjWs0g== 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 4Rg1Hj30qyzTKW; Tue, 5 Sep 2023 10:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385A1b7C046483; Tue, 5 Sep 2023 10:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385A1bwV046480; Tue, 5 Sep 2023 10:01:37 GMT (envelope-from git) Date: Tue, 5 Sep 2023 10:01:37 GMT Message-Id: <202309051001.385A1bwV046480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 3a02df5e27d2 - main - getdirentries.2: Reference directory(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a02df5e27d2eeabffd761ff5cb79496a6d796ea Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=3a02df5e27d2eeabffd761ff5cb79496a6d796ea commit 3a02df5e27d2eeabffd761ff5cb79496a6d796ea Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:37:14 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-05 09:39:39 +0000 getdirentries.2: Reference directory(3) MFC after: 3 days --- lib/libc/sys/getdirentries.2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 38d5c1e525b0..1c623fa59124 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -27,7 +27,7 @@ .\" .\" @(#)getdirentries.2 8.2 (Berkeley) 5/3/95 .\" -.Dd April 11, 2022 +.Dd September 5, 2023 .Dt GETDIRENTRIES 2 .Os .Sh NAME @@ -197,7 +197,8 @@ Directory unlinked but still open. .El .Sh SEE ALSO .Xr lseek 2 , -.Xr open 2 +.Xr open 2 , +.Xr directory 3 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 5 10:01:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg1Hk5pWPz4srWm; Tue, 5 Sep 2023 10:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg1Hk5Gwlz3gD8; Tue, 5 Sep 2023 10:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693908098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Yy1eVL9ZIFg+3kblrfQo1cK36NtUGuyXNDCQpOqMyM=; b=sr0b2SXDT9cUQ9NxqeesD6qpzKAfJTlIlAEPmw6TNj48r4uK6Az4vwSQKg2seKCsfwfTWU RLkxbSM1elbpxiVtlvYNnXBQwO5+RVq/oy0laT0SpqSByDSnd5GUDRN4zSoLn/FFzMLOb1 1deUtYgRp4qyavL+qlw00i+4w+DJEYbrNrTU4K/hXwKCSNachmSPnF7/AqKfa8c+1WAfmO Y5NL46L8gFZhBYRcqTJpVtOv6AwXX08UaVbcQHPdIkXzBX3J7MM+QVvyv+WZxZO4vnc4th LowN6ObK+vyaUhuBdFMwiB/40Rfd8Zphwso2JUSN8M5vicS1/N3oHYreR89YmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693908098; a=rsa-sha256; cv=none; b=iV0iwCWUVN7yJFvX+bYcncXnC7ABkYn/NYYkDq++NkdE7E3I09PxeIoVb2kQRBeYYT7q3V vAoohfsnq/TI9xyLp9j6eLOQkZ5+HPF0CqcNm+o/BlmsD8i5e9P77G3mkG20ljO1m3T7r8 csFLbosyLmH6HjW4dW2QHhVCM5dBsIMH2RGuRNhvUmmiPfabvWkvmv2ty8SvU+ZDqd6Lrv zy9ayVtkyYaFClREUL9nuoNvf0RJ2/mUhf1Na4glO6H8Jl+DqxcNyGDYIcmkG+wAmtl5FR L6wAesPF97l9GvEmgBUTZpHh4VkpyrzXvHHooTcfGymFvRzhrxYDtkAOiT264Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693908098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Yy1eVL9ZIFg+3kblrfQo1cK36NtUGuyXNDCQpOqMyM=; b=DTW+sqXdde5gr9uB7dms1adFP6t2JhJEZasMXhNtI69DgJystJcGe1lIJeiWy5njFrvC2s I37k1KYeCpAxLT2d+amvupRuXYk07JguZUTYwG/NCy19ZHLfv4YRZzzj8wcdIxkqAdUKHe jymb20Z/lgsgLN+9ftcSo5/u2TH+r6uZDNPZvQD8jmHNPhDlw1h//4A/c5TuMrvQyQ1XJm lR1AMKN7X4QQa7JfI29SgnjeAwzh8SQMuNCCLk8rvpwO4WlfCRREW45RSZ9oO3V5mRLYdr BSfSoki2b7ijf5KfeI7Ec/fQtDLvN6OydDT4ujxetfQj+ksJsgz7+JjRKU+oBQ== 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 4Rg1Hk3sKvzTV7; Tue, 5 Sep 2023 10:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385A1cra046529; Tue, 5 Sep 2023 10:01:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385A1cwr046526; Tue, 5 Sep 2023 10:01:38 GMT (envelope-from git) Date: Tue, 5 Sep 2023 10:01:38 GMT Message-Id: <202309051001.385A1cwr046526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: e8fc6a9980d9 - main - extattr.9: Improve the fragment about jail(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8fc6a9980d9367f6fd4fee795a35e104104397e Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=e8fc6a9980d9367f6fd4fee795a35e104104397e commit e8fc6a9980d9367f6fd4fee795a35e104104397e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 09:59:35 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-05 09:59:35 +0000 extattr.9: Improve the fragment about jail(8) Fixes: 315d7bbbb4e4 extattr(9): Mention system namespace restrictions MFC after: 1 week --- share/man/man9/extattr.9 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/share/man/man9/extattr.9 b/share/man/man9/extattr.9 index dc919bf4e056..3ee2ed5e2e83 100644 --- a/share/man/man9/extattr.9 +++ b/share/man/man9/extattr.9 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 1, 2023 +.Dd September 5, 2023 .Dt EXTATTR 9 .Os .Sh NAME @@ -54,9 +54,10 @@ attribute data is protected according the normal discretionary and mandatory protections associated with the data in the file or directory; system attribute data is protected such that appropriate privilege is required to directly access or manipulate these attributes. -By default processes in a +By default, processes in a .Xr jail 8 -can not access to the system attribute data unless allow.extattr +cannot access the system attribute data unless the +.Va allow.extattr configuration parameter is specified. .Pp Reads of extended attribute data may return specific contiguous regions of From nobody Tue Sep 5 13:36:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg63J5FfXz4sWnG; Tue, 5 Sep 2023 13:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg63J4lmlz3Wcs; Tue, 5 Sep 2023 13:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693920972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M1Jr6AajYin1GZ7q34tIZgjSSqiqmWVCJQ5Vh+MWZ3E=; b=TLfBJPXsZ02dkKxU0SX8C3rWP9x65qjyn+sj4LEgGnfLl6qoRWiXy/WiVun2qw9bLu8g/a kzyPwEannL+/nIDPRFEiEP7phq7X7bSa7e0MyaE33Rf3rHwa3Ncc57/IGeb3urHX24fIqa 5haWJbp5zAv5myUf7pO02aLFVgxTt7/OFlTKV0/C9jaF/v2o2E3oVZPSZt+mpxAaoufGJx pRS5aRkI/CIakhVEuK8ToFUOsAR+NSBVIXqZPxjGfVNk7budEK1oCuujKjoEvv5qGmVCDR QE3OpzqQBLs58gZ/Pxilt0XdM5cw90n5orgXzqc5pupm+P8GbWqnJzanLYD/mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693920972; a=rsa-sha256; cv=none; b=c4vs+WUhoY+7a5puiJZn1HIwfMFHECmCWvvuTVQOIQbkzqpwDisIVxikrp+cfqXMTv75TM NWv25DrEklGzAPNR9M3JqOhV/qpfquWDHmKtACQM9lddWWtV0f8H/TxpAw6D3SWaCaC+n1 apaJ/m8w5fTLNKdc3ZL5FjC65tZms3lr6E1CXQ+6kevQaiJZhImIGNK/h4XBpjv5tHuJBa KqmbKU/TPB2l7UbVnZPg2YldWlo5jcs6erQwoKo74IIfWICeN/bUEQEUYImmR1E0zwqNZ5 SSgfchY6IQgZ4bAeEu0CpVq3xh7+3KF9A6EotUSrDfTzUMZLapR+y29JAu5ayg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693920972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M1Jr6AajYin1GZ7q34tIZgjSSqiqmWVCJQ5Vh+MWZ3E=; b=Qzn7Lgo9vA6zv8VpJJnYArK96c2w/NgUSAaBwDfuo0OlOrK0YMnxy2m3U+bYsx5PLW9XjI 8F03ScKgQSh2IpAXakTvYPJrqnvzT/VTCYMPkzam9pZWfWvqWK3qAmBnQKjEMjzpG5Lbtg WlweOYdAovlBqlgStAjE+ekimUydVBF/UY7hoRiigJQiSeaOVWCJiXa84Gwvr01ZmMxKfQ RfPDcj7vakKrIG7hVKeUBTOQCC05+CgsEkjLPL4mF35tFwanrypchRm9411+Ce8JP6n2Rn NHmh8LYXvzHP1cCfYjyG6rROANpkeOWBGhfN0kYb3VjgOAg96XYShtK34B2BtQ== 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 4Rg63J3WMpzbXW; Tue, 5 Sep 2023 13:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385DaCUF094164; Tue, 5 Sep 2023 13:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385DaCuW094161; Tue, 5 Sep 2023 13:36:12 GMT (envelope-from git) Date: Tue, 5 Sep 2023 13:36:12 GMT Message-Id: <202309051336.385DaCuW094161@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: d41afb814612 - main - */string.3,arch.7,environ.7: add cross-references to simd(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d41afb814612ce005d93d2f8d127dcf6ea751cc4 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=d41afb814612ce005d93d2f8d127dcf6ea751cc4 commit d41afb814612ce005d93d2f8d127dcf6ea751cc4 Author: Robert Clausecker AuthorDate: 2023-09-02 14:27:23 +0000 Commit: Robert Clausecker CommitDate: 2023-09-05 13:33:12 +0000 */string.3,arch.7,environ.7: add cross-references to simd(7) With the new simd-dispatch framework documented in simd(7), add cross-references to the new man pages to appropriate places. Sponsored by: The FreeBSD Foundation Approved by: emaste MFC to: stable/14 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41697 --- lib/libc/string/string.3 | 5 +++-- share/man/man7/arch.7 | 5 +++-- share/man/man7/environ.7 | 12 ++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3 index a164aae01eec..b389c58acc07 100644 --- a/lib/libc/string/string.3 +++ b/lib/libc/string/string.3 @@ -29,7 +29,7 @@ .\" .\" @(#)string.3 8.2 (Berkeley) 12/11/93 .\" -.Dd December 11, 1993 +.Dd September 2, 2023 .Dt STRING 3 .Os .Sh NAME @@ -132,7 +132,8 @@ for size limitations. .Xr strsep 3 , .Xr strspn 3 , .Xr strstr 3 , -.Xr strtok 3 +.Xr strtok 3 , +.Xr simd 7 .Sh STANDARDS The .Fn strcat , diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 8e89203e4003..14c6af612087 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 12, 2023 +.Dd September 2, 2023 .Dt ARCH 7 .Os .Sh NAME @@ -431,7 +431,8 @@ it is unused outside of that scope. .El .Sh SEE ALSO .Xr src.conf 5 , -.Xr build 7 +.Xr build 7 , +.Xr simd 7 .Sh HISTORY An .Nm diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7 index 7e3437e7c6d4..8a927c0f9f3d 100644 --- a/share/man/man7/environ.7 +++ b/share/man/man7/environ.7 @@ -27,7 +27,7 @@ .\" .\" @(#)environ.7 8.3 (Berkeley) 4/19/94 .\" -.Dd August 5, 2020 +.Dd September 3, 2023 .Dt ENVIRON 7 .Os .Sh NAME @@ -66,6 +66,13 @@ are documented in the section of the appropriate manual page. .Sh ENVIRONMENT .Bl -tag -width LD_LIBRARY_PATH +.It Ev ARCHLEVEL +On +.Em amd64 , +controls the level of SIMD enhancements used. +See +.Xr simd 7 +for details. .It Ev BLOCKSIZE The size of the block units used by several disk-related commands, most notably @@ -305,7 +312,8 @@ built-in command in .Xr setlocale 3 , .Xr system 3 , .Xr termcap 3 , -.Xr termcap 5 +.Xr termcap 5 , +.Xr simd 7 .Sh HISTORY The .Nm From nobody Tue Sep 5 13:51:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg6P849Jwz4sd8G; Tue, 5 Sep 2023 13:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg6P83lPQz3ZT2; Tue, 5 Sep 2023 13:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693921900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54S6fzH/FFQftuOrILaNmJg4JBzIU1geR64DqLb8PzE=; b=T6rUHUwuyWuPE64yYWX/Wl8q4szOWuHU671nEUo8MpR81hqP6Sg1+Y1Zcg5NevNO9hf9X9 4Snbsi3NS0TH8r/N89MyjcoJ2bgdlrYvypq1gbm3YaknuG9qvg5V63R1IpGGrmu0xPao0x us5cjUQrTOLe/ceHd/mOwjJ7bj2gegRS7Sw4rny+80BZcXwj/JW6IBet1RqUQQbY8gQS08 DqjukIUVrq51a0tqAq3aEci1eqK6CbC3aDb7OQcPSXE+wh5j+JKEc/u5HTmpJEB+1ZPt9G pnNjuMoeeEeWULQtudl2RkZw2KCtNPoG0Uo53MMqvvs20ZacrOruBwF5o6fAog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693921900; a=rsa-sha256; cv=none; b=QORV29OUv67mAfguscr8doqf4r6hoHYb8kDJDm7yKJmgiAp3dFSf86LGZ+qRYdY5fKMAZm lvelZBwGgyyIcqfviEwhsXq50Xmkx1ZQiwnNWbnbmvbPId+nN5+2o8LwLzRw8u4r13ZZhI dpN/WiaXh6zeRTALdxRaEhZorsP2a0b/yQIgnkZmT1PlelxAR2ugTYu/GNpu4VXFjsLYrD c9RBsF0YmkGudwAFx3rDelpKQz0uVzJQp6qfZzaTM4ugbcxih0iq8WQEa3seqieNw84P3X +zZueQjJXzZLqJktFMdv41miPrIED5uN/LfFvSP5RhoyYjaV5J8N8o/gWDBM7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693921900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=54S6fzH/FFQftuOrILaNmJg4JBzIU1geR64DqLb8PzE=; b=pMHbMQ2I11tGVC8fdUuKYZ3Kc0vhrsDiU6pq7TRfFwH24tIJB05Ca2MNiEoLGNAK6ndej9 EjH6IiVoyVqM+Zhr5hhY6K/v2k3GlK4/zLmAgaJQaaqf91g5KHgd7PJZycuejGKfETJIsT jOs9HFBkqV54lFNHIfOaUFhkRpJlyetL5eEtLyLURoKEgpLdPnrZNdoc9MmhbOSc9pY9I4 YnSUnwX4xL6QcrNn47J+VvW4hL+vy2NUqVuxmE6Qx/WvnrOW1j5wyieAT9j65sj31VCGEC SIVO5cM8WjP1UK4Ydbd30Lu5qG/vJyme/eU9JIg/lLEvFTVMz41Vj6FDkv7jUg== 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 4Rg6P82hf5zbGJ; Tue, 5 Sep 2023 13:51:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385Dpe5o025925; Tue, 5 Sep 2023 13:51:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385Dpe2H025922; Tue, 5 Sep 2023 13:51:40 GMT (envelope-from git) Date: Tue, 5 Sep 2023 13:51:40 GMT Message-Id: <202309051351.385Dpe2H025922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 52d374a06700 - main - getdirentries.2: Improve readability of dirent members List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52d374a067002fc42409b32059ec8b8506a70429 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=52d374a067002fc42409b32059ec8b8506a70429 commit 52d374a067002fc42409b32059ec8b8506a70429 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:41:47 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-05 13:50:45 +0000 getdirentries.2: Improve readability of dirent members MFC after: 3 days --- lib/libc/sys/getdirentries.2 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 1c623fa59124..0a06cd6b947e 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -70,12 +70,12 @@ The data in the buffer is a series of .Vt dirent structures each containing the following entries: .Bd -literal -offset indent -ino_t d_fileno; -off_t d_off; -uint16_t d_reclen; -uint8_t d_type; -uint16_t d_namlen; -char d_name[MAXNAMLEN + 1]; /* see below */ +ino_t d_fileno; +off_t d_off; +uint16_t d_reclen; +uint8_t d_type; +uint16_t d_namlen; +char d_name[MAXNAMLEN + 1]; /* see below */ .Ed .Pp The From nobody Tue Sep 5 13:51:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg6P95G2Kz4sdQD; Tue, 5 Sep 2023 13:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg6P94W37z3Zkr; Tue, 5 Sep 2023 13:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693921901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OC8RFAC7sMhlnlUyIRFJ/oC0Azbkec8M+qJjzkxHqZU=; b=WZOj7SedBkFj6ZEVTO7/KiQ/3wjE5pL67xBCFMh8OKMjCePmXa2z83K8MNnsC6OS+qzVgS u0Wmll94Esl+Sjo0qRbHfaYqRmP8snSWeIlTvLcAedQHLnW8uIxCTVqIbgTUDz7Vb42vv9 y4DrP+JDYocYP85VQj59Sr0eboK8dcupG7h4O9EHrCCNUvgOZnZYPWxd/M3hQt0iCjXS4L Nv/SGoapGT11RuPQ7Tv8cpHGVc3q9IeOlB4ugLqcj12TE8VxwLFQu8xOzqhLncdBWLPcof mcmAalFAKJ5NtvbXtjKIx9beG1k5yxM16FRQHg6LHF3Ck7NuFnUvwFHxYKRJKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693921901; a=rsa-sha256; cv=none; b=iaYs+453MDBn+1D06Wd8FoJ8lYTrjbjFunfhGsi0PHezv4NflYhutA4uPbW7sdZXcQ6wBV iw6qsDU8KZy1UIFAhfYgB1fTYleBXzL6a/KjqwT3Dt2hYMOS8H2AvIyLewIqmvXcYi6q52 9goQo5Z2u8eLJ/SvBhAgwOfvfxxKQcGGvKtKsCyTDVAC4QBf3uZm43pwMZF/XrtTM8tczB NJBvFbLEktJx0cdAjxDUrZ2hPz9ru4f3CwfVaMzdvS8H8GJCjB/GwZwOUr5f3B7i+Yraqo CUmE7Ya10NE8YLPvVqyQtCed8wPRSBn1tkXPHl9SFGHKMylKh0NwgJ5fXFKpZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693921901; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OC8RFAC7sMhlnlUyIRFJ/oC0Azbkec8M+qJjzkxHqZU=; b=jiy47dYDLvVMc6VgFaXoXhtb0NvZzTVt6qmtiMJw4gglAEXjYlapbHcxJnoomrr10HwTGq V96jJaRdvRkMO+DkDe618/AdnQoWYCnhBwU2rWuVwTzLOvWuEwPxy3oM5ixpTfyTfu1Php W7FS02IsK7cIuPizMarDInbAiydfDGdT+sGVXb0SoIybW6upMwYyNFALsIJnXmOQHN0vnm zS3bspItx6LA1Wfv3pBNTLdQaQFzaNvvhpJYNyBYMIPXUIMV6GXBsmKV/WHFQj6dqbreNo yXvq9L4hphpladWM3Ul6vs72GI0+awEMH3b2fMh2XYqWpkPVaC51l8RSECv2UQ== 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 4Rg6P93TNDzbGK; Tue, 5 Sep 2023 13:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385DpfFC026187; Tue, 5 Sep 2023 13:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385DpfHc026184; Tue, 5 Sep 2023 13:51:41 GMT (envelope-from git) Date: Tue, 5 Sep 2023 13:51:41 GMT Message-Id: <202309051351.385DpfHc026184@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5b7a776f4818 - main - getdirentries.2: Reference dir(5) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b7a776f481891f10820a0b4838d0e0feb60b8ad Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b7a776f481891f10820a0b4838d0e0feb60b8ad commit 5b7a776f481891f10820a0b4838d0e0feb60b8ad Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-09-05 13:48:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-09-05 13:50:45 +0000 getdirentries.2: Reference dir(5) As a note, parts of manual pages getdirentries(2) and dir(5) should probably be consolidated. MFC after: 3 days --- lib/libc/sys/getdirentries.2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/sys/getdirentries.2 b/lib/libc/sys/getdirentries.2 index 0a06cd6b947e..74fd57f9d74f 100644 --- a/lib/libc/sys/getdirentries.2 +++ b/lib/libc/sys/getdirentries.2 @@ -198,7 +198,8 @@ Directory unlinked but still open. .Sh SEE ALSO .Xr lseek 2 , .Xr open 2 , -.Xr directory 3 +.Xr directory 3 , +.Xr dir 5 .Sh HISTORY The .Fn getdirentries From nobody Tue Sep 5 14:55:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg7pf2cLYz4rP1n; Tue, 5 Sep 2023 14:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg7pf29GXz4MW1; Tue, 5 Sep 2023 14:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqOKhrsRjQw8HEW0iHcqBKfIBbNm7lJb4/GTIdCDV7k=; b=IFj6PPfste7nlkfjOPFKw8oMKUc1LMCWBz/Ev+7A5l/5o69bwHoRRHww5IdS6yzrekPMGM c0cAZlgdMhNLUnSCz136/ilA0VLZNTm2LFEQMuOtH0PzN02qkl2Tw61h9SbJOSyW7hw2Rx f2rCNH1azTmbe9eJE5hb3yuDp9VjCK86/W6+HoidNyYKqvRfv5T5b3RSQab+lEfm0dnZjj cYjA6YjHtwNPp+e2sb1fLIVmV9THkfo5vUd7soRg+m09obHtMkt3HLGJcLL/Jcd3HQb0EN pJOtkLDkP6ltJHYWA2oddmaiswn+alO23T9pzZiTy84PO5xrmu8TTlBYUKynBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693925722; a=rsa-sha256; cv=none; b=huCJksgWPWPze5kFgcGN1qqwbMFcCnvyc6Nuor2OIrpqnCaIY6p6c8TMrO7upO6rQBjzAn dXy4HlCAA+lIjs61zxgdqB6FZ3gGoy5BASrDBPOdqRbGhsifgUllkUHtADKZZdzJAmVIvr CsHXgpEhLC5xc2OHS0dYIYepKuJgioZ+MOb/gig8Z5RdTLraoQCtkGVVW97/I0PWibEyZ5 ZNpD/0SXSdic/IKIvh4/wjIp/9QxbRUm/BEMgzUppzJ3xN3+zh3VNeJgOKp6cYrgzCq1oD 4ePdEU8YChu0t/XMsDOjvobNGdK1QOF9+NJgCPSkq+vxvnf9qP9bEzVcJFQAsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqOKhrsRjQw8HEW0iHcqBKfIBbNm7lJb4/GTIdCDV7k=; b=wrkuXpbZvSeqkqN3iBxIZ3kgAad1qfcIfFcJW5N3OhxCUAjvJpbeZi5Xqk5658cuAsWPdY aj0ibxzz8lFJP4/r6Md8oXpSDqfKMK05KMQ5EAdYOFh/m4g451veuPsqkHrmWZiRsPYYx5 GQu7nvy/sWFYP4AN4FAwy8vNwpLYwzmiLp89RvWgb5KriKgQlR7Dwpnmb2u9caArxd8g9r jXV+ePhXPnNYscT2HpqrgFe4Jx775iHVDMFCQokFwB9CbFm03Hkr4Fiv4QFcerUAP5HAP7 UJjEUuDYSIMONZ0ZLE11CvTfpct4y8FW8IMBediVp4lCHDayXbXQlGTFrTbZSw== 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 4Rg7pf15MlzcfH; Tue, 5 Sep 2023 14:55:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385EtMAr026348; Tue, 5 Sep 2023 14:55:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385EtMqJ026345; Tue, 5 Sep 2023 14:55:22 GMT (envelope-from git) Date: Tue, 5 Sep 2023 14:55:22 GMT Message-Id: <202309051455.385EtMqJ026345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: aa2dc175c0b1 - stable/14 - caroot: drop VERSION tags from certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aa2dc175c0b169979d4b90283a2e7139768160aa Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=aa2dc175c0b169979d4b90283a2e7139768160aa commit aa2dc175c0b169979d4b90283a2e7139768160aa Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 14:54:44 +0000 caroot: drop VERSION tags from certs With this change, we'll drop the "with $FreeBSD$" lines from trusted/ certs in the next update. untrusted/ will need to be done manually, but I'll likely just do them all manually, commit, then run the script and commit any legitimate updates after confirming the output matches what I did manually. Reported by: imp Reviewed by: imp Approved by: re (kib) (cherry picked from commit bbc8585ef557be36b3fda75e3a41d725aedb1c1e) --- secure/caroot/MAca-bundle.pl | 3 --- 1 file changed, 3 deletions(-) diff --git a/secure/caroot/MAca-bundle.pl b/secure/caroot/MAca-bundle.pl index 8521b620337f..4feced90d782 100755 --- a/secure/caroot/MAca-bundle.pl +++ b/secure/caroot/MAca-bundle.pl @@ -38,7 +38,6 @@ use Carp; use MIME::Base64; use Getopt::Long; -my $VERSION = '$FreeBSD$'; my $generated = '@' . 'generated'; my $inputfh = *STDIN; my $debug = 0; @@ -79,7 +78,6 @@ sub print_header($$) ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## @@ -96,7 +94,6 @@ EOFH ## It contains certificates trusted for server authentication. ## ## Extracted from nss -## with $VERSION ## ## $generated ## From nobody Tue Sep 5 14:55:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg7pg2yXnz4rP6F; Tue, 5 Sep 2023 14:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg7pg2VTrz4MSk; Tue, 5 Sep 2023 14:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925723; h=from:from:reply-to:subject:subject: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+ivlZC5gO95RKCsFymbJahl+ZtqAKQBjGOgwdYSTpY=; b=ZBAmgBTwVdeNN4HcQq3C8GtUPmAEDsnpKrZi+F082wAgMmRFlDVYPzaSAZYhxit3sR8E4L +ZmZkrySvxqeVglzfT+Smv6DqRldM9xzMLIyW8UDcNlocIDaOQT4N7gBb1lO/5c6Jkold6 Ir47ORntrkRg3JYvDren830qCpxtM77GU2f8JMQS405qjLc/yO9Fn4HtkZbmlHdyu2nKW1 kchF+0MLl5VuwBQI4XjJgO+9vOnDWg56kw0fayo5FuGGBBWV9wZtp5n7U+fjsG8hHi45eI /9tgwab3yf5FCfyGQ88Dte16DZbMcOeb7nNlO1Qp1xVmpEdgfna2AeVsrmdPfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693925723; a=rsa-sha256; cv=none; b=a+lJZ7T9qS9HNlJHZNCsZ9jQ+KXBQrTBxFavE7KWpo1wnLDstcYp8jwnFRNwGaA+j9hvbY UGswedLJhpVLO9dfB7ZQvqXRXN4PChuOMCPKNw4X3t6zh0zy7FK+v5+d1dGycaLNdaZdnK 9Q8WkLIhFNFexsVWzvVsfJGgX4sjUTJBFunEXJmMtaG0L0gUFpSnL62xs2cjcGjf6CZHZ+ uBMHKcHwI/Zi2WRk95nwuVcNexJ+tIkTyrSQgfKIsUurFUzyN2JretafU4iPR5QDHpJ+bk mFY+WuWz4NkLN9Jfom5jiNIfBVVAoDpuuvWqKldGhb8tOJW20yzK4CrVelv6ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925723; h=from:from:reply-to:subject:subject: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+ivlZC5gO95RKCsFymbJahl+ZtqAKQBjGOgwdYSTpY=; b=NTFT19KuSf5YIZr8VD8XpFnLQmMIPm1HJnj583MixmY8XuhQos06oFsBsf39NrJmZctvtG vFuq4abGBtRqIa8LZmhj/ClSUXsp7fVYDrGHlLoz/SENgQ/4uCV6/ji7lr2J1swtw8VxnK dwUP+UmVRHFtjzzbexvZNONMLoIznw9CbvOBRY/NVvY0uGi1eDGrSaOCBFwH3MSql0IJI2 X1U/bUM2h11NcwafUKgDsztrj8FtlC9nRjK7iV3kgQiBmsEsLsmmDa3G0JMlSAYWrkjA4Q J36RnQvJ4e2hM2/QUEexDM3jSATvIn9kgb7B20Ma2XFSH5g++Q8Vn7tMHihJBw== 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 4Rg7pg1bqHzd9w; Tue, 5 Sep 2023 14:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385EtNUT026405; Tue, 5 Sep 2023 14:55:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385EtNsU026402; Tue, 5 Sep 2023 14:55:23 GMT (envelope-from git) Date: Tue, 5 Sep 2023 14:55:23 GMT Message-Id: <202309051455.385EtNsU026402@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7c52963832b8 - stable/14 - caroot: drop the VERSION tag from already-processed certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7c52963832b8e827cc4a2fd9cea842c05cbddd71 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7c52963832b8e827cc4a2fd9cea842c05cbddd71 commit 7c52963832b8e827cc4a2fd9cea842c05cbddd71 Author: Kyle Evans AuthorDate: 2023-08-26 00:55:32 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 14:54:55 +0000 caroot: drop the VERSION tag from already-processed certs An update is imminent; drop these now to make it easier to audit the results. Approved by: re (kib) (cherry picked from commit 3f84d4b0fe1445bca5f3b6a70fc5641b88c31217) --- secure/caroot/trusted/ACCVRAIZ1.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 1 - secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 1 - secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem | 1 - secure/caroot/trusted/Actalis_Authentication_Root_CA.pem | 1 - secure/caroot/trusted/AffirmTrust_Commercial.pem | 1 - secure/caroot/trusted/AffirmTrust_Networking.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium.pem | 1 - secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_1.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_2.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_3.pem | 1 - secure/caroot/trusted/Amazon_Root_CA_4.pem | 1 - secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 1 - .../Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 1 - secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 1 - secure/caroot/trusted/Baltimore_CyberTrust_Root.pem | 1 - secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 1 - secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 1 - secure/caroot/trusted/CA_Disig_Root_R2.pem | 1 - secure/caroot/trusted/CFCA_EV_ROOT.pem | 1 - secure/caroot/trusted/COMODO_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/Certainly_Root_E1.pem | 1 - secure/caroot/trusted/Certainly_Root_R1.pem | 1 - secure/caroot/trusted/Certigna.pem | 1 - secure/caroot/trusted/Certigna_Root_CA.pem | 1 - secure/caroot/trusted/Certum_EC-384_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA.pem | 1 - secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem | 1 - secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 1 - secure/caroot/trusted/Comodo_AAA_Services_root.pem | 1 - secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 1 - secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 1 - secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 1 - secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 1 - secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 1 - secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 1 - secure/caroot/trusted/E-Tugra_Certification_Authority.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 1 - secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem | 1 - secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem | 1 - secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem | 1 - secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 1 - secure/caroot/trusted/GLOBALTRUST_2020.pem | 1 - secure/caroot/trusted/GTS_Root_R1.pem | 1 - secure/caroot/trusted/GTS_Root_R2.pem | 1 - secure/caroot/trusted/GTS_Root_R3.pem | 1 - secure/caroot/trusted/GTS_Root_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 1 - secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 1 - secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 1 - secure/caroot/trusted/GlobalSign_Root_E46.pem | 1 - secure/caroot/trusted/GlobalSign_Root_R46.pem | 1 - secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 1 - secure/caroot/trusted/Go_Daddy_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 1 - secure/caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_ECC_RootCA_2015.pem | 1 - .../trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2015.pem | 1 - secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem | 1 - secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 1 - secure/caroot/trusted/ISRG_Root_X1.pem | 1 - secure/caroot/trusted/ISRG_Root_X2.pem | 1 - secure/caroot/trusted/IdenTrust_Commercial_Root_CA_1.pem | 1 - secure/caroot/trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 1 - secure/caroot/trusted/Izenpe_com.pem | 1 - secure/caroot/trusted/Microsec_e-Szigno_Root_CA_2009.pem | 1 - secure/caroot/trusted/Microsoft_ECC_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/Microsoft_RSA_Root_Certificate_Authority_2017.pem | 1 - secure/caroot/trusted/NAVER_Global_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/NetLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 1 - secure/caroot/trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 1 - secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_EV_Root_Certification_Authority_RSA_R2.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_ECC.pem | 1 - secure/caroot/trusted/SSL_com_Root_Certification_Authority_RSA.pem | 1 - secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 1 - secure/caroot/trusted/SecureSign_RootCA11.pem | 1 - secure/caroot/trusted/SecureTrust_CA.pem | 1 - secure/caroot/trusted/Secure_Global_CA.pem | 1 - secure/caroot/trusted/Security_Communication_ECC_RootCA1.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA2.pem | 1 - secure/caroot/trusted/Security_Communication_RootCA3.pem | 1 - secure/caroot/trusted/Security_Communication_Root_CA.pem | 1 - secure/caroot/trusted/Starfield_Class_2_CA.pem | 1 - secure/caroot/trusted/Starfield_Root_Certificate_Authority_-_G2.pem | 1 - .../trusted/Starfield_Services_Root_Certificate_Authority_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 1 - secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_2.pem | 1 - secure/caroot/trusted/T-TeleSec_GlobalRoot_Class_3.pem | 1 - secure/caroot/trusted/TUBITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 1 - secure/caroot/trusted/TWCA_Global_Root_CA.pem | 1 - secure/caroot/trusted/TWCA_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 1 - secure/caroot/trusted/Telia_Root_CA_v2.pem | 1 - secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem | 1 - .../caroot/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem | 1 - secure/caroot/trusted/TunTrust_Root_CA.pem | 1 - secure/caroot/trusted/UCA_Extended_Validation_Root.pem | 1 - secure/caroot/trusted/UCA_Global_G2_Root.pem | 1 - secure/caroot/trusted/USERTrust_ECC_Certification_Authority.pem | 1 - secure/caroot/trusted/USERTrust_RSA_Certification_Authority.pem | 1 - secure/caroot/trusted/XRamp_Global_CA_Root.pem | 1 - secure/caroot/trusted/certSIGN_ROOT_CA.pem | 1 - secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 1 - secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 1 - secure/caroot/trusted/ePKI_Root_Certification_Authority.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 1 - secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 1 - secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 1 - secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 1 - secure/caroot/trusted/vTrus_Root_CA.pem | 1 - secure/caroot/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem | 1 - secure/caroot/untrusted/Camerfirma_Global_Chambersign_Root.pem | 1 - secure/caroot/untrusted/Certum_Root_CA.pem | 1 - secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem | 1 - secure/caroot/untrusted/Cybertrust_Global_Root.pem | 1 - secure/caroot/untrusted/D-TRUST_Root_CA_3_2013.pem | 1 - secure/caroot/untrusted/DST_Root_CA_X3.pem | 1 - secure/caroot/untrusted/EC-ACC.pem | 1 - .../caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem | 1 - secure/caroot/untrusted/GlobalSign_Root_CA_-_R2.pem | 1 - secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem | 1 - .../Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem | 1 - secure/caroot/untrusted/Network_Solutions_Certificate_Authority.pem | 1 - secure/caroot/untrusted/OISTE_WISeKey_Global_Root_GA_CA.pem | 1 - secure/caroot/untrusted/QuoVadis_Root_CA.pem | 1 - secure/caroot/untrusted/Sonera_Class_2_Root_CA.pem | 1 - secure/caroot/untrusted/Staat_der_Nederlanden_EV_Root_CA.pem | 1 - secure/caroot/untrusted/Staat_der_Nederlanden_Root_CA_-_G3.pem | 1 - secure/caroot/untrusted/SwissSign_Platinum_CA_-_G2.pem | 1 - .../Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem | 1 - .../Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem | 1 - secure/caroot/untrusted/TrustCor_ECA-1.pem | 1 - secure/caroot/untrusted/TrustCor_RootCert_CA-1.pem | 1 - secure/caroot/untrusted/TrustCor_RootCert_CA-2.pem | 1 - secure/caroot/untrusted/Trustis_FPS_Root_CA.pem | 1 - .../caroot/untrusted/VeriSign_Universal_Root_Certification_Authority.pem | 1 - .../Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem | 1 - .../Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem | 1 - 166 files changed, 166 deletions(-) diff --git a/secure/caroot/trusted/ACCVRAIZ1.pem b/secure/caroot/trusted/ACCVRAIZ1.pem index 1c96e53b8f17..dbe720481fe4 100644 --- a/secure/caroot/trusted/ACCVRAIZ1.pem +++ b/secure/caroot/trusted/ACCVRAIZ1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem index 6a64be5ce138..22f5764a5d3f 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem index 71ee49574e84..bbd47304c5c9 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem index 6114a5ccdb2d..4369ffbf1b30 100644 --- a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem +++ b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem index 7c971e1229a2..8ea77deeda58 100644 --- a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem +++ b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem index 282d1a5dcf6f..b1031ad0f348 100644 --- a/secure/caroot/trusted/AffirmTrust_Commercial.pem +++ b/secure/caroot/trusted/AffirmTrust_Commercial.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem index 830cf3f0c3c2..1d6a82f767f7 100644 --- a/secure/caroot/trusted/AffirmTrust_Networking.pem +++ b/secure/caroot/trusted/AffirmTrust_Networking.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem index 725747aafdaf..ef4c3286bf1c 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem index 6fe75939863e..1a1b7b14e7be 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_1.pem b/secure/caroot/trusted/Amazon_Root_CA_1.pem index 2aca2eee3e9b..996e32e056e9 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_1.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_2.pem b/secure/caroot/trusted/Amazon_Root_CA_2.pem index 95ca81db30bb..fbcb6a47f445 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_2.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_3.pem b/secure/caroot/trusted/Amazon_Root_CA_3.pem index 294f7dc8f0b6..1e45a816b669 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_3.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Amazon_Root_CA_4.pem b/secure/caroot/trusted/Amazon_Root_CA_4.pem index 649917b9638a..889f1dc33d52 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_4.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem index 7058d3fb6edf..b65333ef383d 100644 --- a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem +++ b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem index db4f44195dbd..12342b79afc9 100644 --- a/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem +++ b/secure/caroot/trusted/Autoridad_de_Certificacion_Firmaprofesional_CIF_A62634068.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem index 889f140decc8..5023b4465d21 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem index da44a530a038..e2b2579a9cdf 100644 --- a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem +++ b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem index 0f356d59962f..d253c062d876 100644 --- a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem +++ b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem index 0168f641fd42..c94745194a1f 100644 --- a/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_2_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem index 7ae24799e638..b86299675116 100644 --- a/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem +++ b/secure/caroot/trusted/Buypass_Class_3_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CA_Disig_Root_R2.pem b/secure/caroot/trusted/CA_Disig_Root_R2.pem index 0dda6d97e2aa..aa2b13653811 100644 --- a/secure/caroot/trusted/CA_Disig_Root_R2.pem +++ b/secure/caroot/trusted/CA_Disig_Root_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/CFCA_EV_ROOT.pem b/secure/caroot/trusted/CFCA_EV_ROOT.pem index 722499b9ed42..01bb0463a686 100644 --- a/secure/caroot/trusted/CFCA_EV_ROOT.pem +++ b/secure/caroot/trusted/CFCA_EV_ROOT.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_Certification_Authority.pem b/secure/caroot/trusted/COMODO_Certification_Authority.pem index fc3e4b554cc3..57fb36edd969 100644 --- a/secure/caroot/trusted/COMODO_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem index 5f839a858d00..792e7744bda1 100644 --- a/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_ECC_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem index 7faefe98b8bf..c467be08adde 100644 --- a/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem +++ b/secure/caroot/trusted/COMODO_RSA_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_E1.pem b/secure/caroot/trusted/Certainly_Root_E1.pem index 0750f7128ae6..286022c90cfd 100644 --- a/secure/caroot/trusted/Certainly_Root_E1.pem +++ b/secure/caroot/trusted/Certainly_Root_E1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certainly_Root_R1.pem b/secure/caroot/trusted/Certainly_Root_R1.pem index a4e6f28e33a6..c94f1f4f5e04 100644 --- a/secure/caroot/trusted/Certainly_Root_R1.pem +++ b/secure/caroot/trusted/Certainly_Root_R1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna.pem b/secure/caroot/trusted/Certigna.pem index e9104ef6c3da..87ed4d66d4eb 100644 --- a/secure/caroot/trusted/Certigna.pem +++ b/secure/caroot/trusted/Certigna.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certigna_Root_CA.pem b/secure/caroot/trusted/Certigna_Root_CA.pem index a0a7248b51ea..e7f9fd8ea2b5 100644 --- a/secure/caroot/trusted/Certigna_Root_CA.pem +++ b/secure/caroot/trusted/Certigna_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_EC-384_CA.pem b/secure/caroot/trusted/Certum_EC-384_CA.pem index 67b5d644f809..46ea4ccb4f32 100644 --- a/secure/caroot/trusted/Certum_EC-384_CA.pem +++ b/secure/caroot/trusted/Certum_EC-384_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem index 5f92008a47ab..e0141e43298e 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem index 8dcc08c17b07..57c438e0ff71 100644 --- a/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem +++ b/secure/caroot/trusted/Certum_Trusted_Network_CA_2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem index d6034eb6e081..86f0fcc8cc03 100644 --- a/secure/caroot/trusted/Certum_Trusted_Root_CA.pem +++ b/secure/caroot/trusted/Certum_Trusted_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Comodo_AAA_Services_root.pem b/secure/caroot/trusted/Comodo_AAA_Services_root.pem index b74de8633a65..2de8ec9b993a 100644 --- a/secure/caroot/trusted/Comodo_AAA_Services_root.pem +++ b/secure/caroot/trusted/Comodo_AAA_Services_root.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem index 758d61032898..56b6765b9b3e 100644 --- a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem index 76991855eaa1..9de2c038f456 100644 --- a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem +++ b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem index 5d2077a83e4c..0aa7731fe9f2 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem index d70caff62777..85d054b99954 100644 --- a/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem +++ b/secure/caroot/trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem index 517dab4f837a..b81c4744a9a6 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem index 3739c66f53eb..4993a90b08f6 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem index ee8a53c317d0..c615f8e63cc2 100644 --- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem +++ b/secure/caroot/trusted/DigiCert_Assured_ID_Root_G3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem b/secure/caroot/trusted/DigiCert_Global_Root_CA.pem index cc0b5a3e7630..cfab16709099 100644 --- a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_Global_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Global_Root_G2.pem b/secure/caroot/trusted/DigiCert_Global_Root_G2.pem index 3775aa16ce1b..78151fb4134f 100644 --- a/secure/caroot/trusted/DigiCert_Global_Root_G2.pem +++ b/secure/caroot/trusted/DigiCert_Global_Root_G2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Global_Root_G3.pem b/secure/caroot/trusted/DigiCert_Global_Root_G3.pem index 650cbb7ce8e2..a3be0dd9dc65 100644 --- a/secure/caroot/trusted/DigiCert_Global_Root_G3.pem +++ b/secure/caroot/trusted/DigiCert_Global_Root_G3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem b/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem index 45bcd8a2be14..86c98926de70 100644 --- a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem +++ b/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem index a6f2e6a0c771..28c625e6c46a 100644 --- a/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem +++ b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem index cb58c6a21418..1d3a8c4f7a12 100644 --- a/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem +++ b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem b/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem index 26d81069d1a8..4632fefb2b9b 100644 --- a/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem +++ b/secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/trusted/E-Tugra_Certification_Authority.pem index 1f5aa1a16a84..95a0ba7e8de6 100644 --- a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem +++ b/secure/caroot/trusted/E-Tugra_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem index 589b4f911531..3e58355e78a5 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem index 147ba810d1d6..d48fb141df67 100644 --- a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem index c33759f08280..2a206b3748a3 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem index ad40a3142c9a..7e79091827e3 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem index d3f94f45a7e7..947754ffb105 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem index 1bf2c8b128b3..200cee2a7463 100644 --- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem +++ b/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem b/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem index 3f6795a51478..c5f535fe7a73 100644 --- a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem +++ b/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem b/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem index 0936e508d0da..acc3636957a1 100644 --- a/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem +++ b/secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GLOBALTRUST_2020.pem b/secure/caroot/trusted/GLOBALTRUST_2020.pem index 2b9f9fc388f8..7914ff34f93b 100644 --- a/secure/caroot/trusted/GLOBALTRUST_2020.pem +++ b/secure/caroot/trusted/GLOBALTRUST_2020.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R1.pem b/secure/caroot/trusted/GTS_Root_R1.pem index 4def2f4c2b7f..6910d2801124 100644 --- a/secure/caroot/trusted/GTS_Root_R1.pem +++ b/secure/caroot/trusted/GTS_Root_R1.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R2.pem b/secure/caroot/trusted/GTS_Root_R2.pem index 4bc8cff4c812..c56351d3f7de 100644 --- a/secure/caroot/trusted/GTS_Root_R2.pem +++ b/secure/caroot/trusted/GTS_Root_R2.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R3.pem b/secure/caroot/trusted/GTS_Root_R3.pem index ca17a9220f72..10aa5af7d197 100644 --- a/secure/caroot/trusted/GTS_Root_R3.pem +++ b/secure/caroot/trusted/GTS_Root_R3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GTS_Root_R4.pem b/secure/caroot/trusted/GTS_Root_R4.pem index d8c21bf91bdc..53004c331888 100644 --- a/secure/caroot/trusted/GTS_Root_R4.pem +++ b/secure/caroot/trusted/GTS_Root_R4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem index 0b773b02b88c..c0eb35c4dfab 100644 --- a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem +++ b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem index c95e7a2cf92f..2f5b2e2db0c3 100644 --- a/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem +++ b/secure/caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_Root_CA.pem b/secure/caroot/trusted/GlobalSign_Root_CA.pem index 1fc32ec982e3..e6ccef46ed7e 100644 --- a/secure/caroot/trusted/GlobalSign_Root_CA.pem +++ b/secure/caroot/trusted/GlobalSign_Root_CA.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem b/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem index f55b379232f2..9c582e4402d3 100644 --- a/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem +++ b/secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## ## Extracted from nss -## with $FreeBSD$ ## ## @generated ## diff --git a/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem b/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem index b67daf31ec2b..b03dda654e02 100644 --- a/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem +++ b/secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem @@ -8,7 +8,6 @@ ## It contains a certificate trusted for server authentication. ## *** 1193 LINES SKIPPED *** From nobody Tue Sep 5 14:55:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg7ph5MJgz4rNvv; Tue, 5 Sep 2023 14:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg7ph3FHvz4MSx; Tue, 5 Sep 2023 14:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0n/lbtd9Ck3yNjLdgGfkhewBR9kIdC6fFC4JO1psPs=; b=ZrpR7aG/BOGCoX2URHJ5DFEtvc432q0PFNF2di8hmnMP5n4/EGgoknKebI66DrFYQhonMO X26wSlzfLB9/UXzuYFXM1iqTh/VWei2SQoPCEAwl8Cqsl+SmuewMD/7OxqT3kGcy94hr+1 QiF809O2PV/UdO1rwQR0Uf+Vl58/bFzP3Rxh6ZuC7X0zTyjvfNgw3YuRp0sPC/P1PUJqrh T8WHgjV3f0yOooYAjklXD53KRoWKeJWOqLh22+/UK/RQn1StIwaRA93JnO8m+OXEffEtQY R/jryfA8ZwEd2VZ3MOFh/4dkNXYkwuGrS9yoFueDetkoIddX729U8mZf9kmISQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693925724; a=rsa-sha256; cv=none; b=L/9zj7dYzBnA1VmHMXtrdWKoN8ZT8kkW1gucRiGhWqbbNoUkrtxOiWxwpSLftlXQv22mMx Uu3ziBPcRMGQumrlu1W1OdfHGYyblaxora693CddqX8KQf2Yrcgo9F5BIdQ8842hadIIJo xRhqHR7aEH9mUTLhvcxeFxx0flTwjwjtOEPpWc3nVim8FMF9G4y95TSvhrgQ3MIjEeL5gj EIOVM8pCJD9h8Wgk3u55YP7M3nU4FKYX6FAU0OCpeta1g1WxInW/A9DKSzOkK4BzWfItma Dh/E3e+32mnNcPc01c3uAtJQqCW/xO072cA1a+lv75q7J+8nSHghb5a58CcFgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925724; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t0n/lbtd9Ck3yNjLdgGfkhewBR9kIdC6fFC4JO1psPs=; b=u/aaC9fOZGmJnhXsGbxyYbQe1xa4fSY5k4nvC7gniILLRQvbIXXR/BRN+m3TbP8NbGQL/m DfXAZsZ2P4ki5GuvxAhRXB5wN4X9SyTRmbZdWNDofpt6zS1LVtff6whfrwmnrygFhc9TSj wOK97+Isiabj3QI0Z8TvgXLaga1vQPcIfpLfa5crNNRNGtCQMiVI4UE0wpGvDUweVY6Fzr hnSNZIv7LHgAdLwDWiO8ERAGJD1YJMfU8Yfpj24usI3K/L8BGGLVxDNwqSnTnaH0W2qU5R dSax2wJ9DrwKLf765M1uw6aNlaCsvZn3+pK1NBOa2Io8oP86GBO3hH7FzwKiwQ== 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 4Rg7ph2M4Mzd9x; Tue, 5 Sep 2023 14:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385EtOfZ026449; Tue, 5 Sep 2023 14:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385EtOpw026446; Tue, 5 Sep 2023 14:55:24 GMT (envelope-from git) Date: Tue, 5 Sep 2023 14:55:24 GMT Message-Id: <202309051455.385EtOpw026446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 5829e12051e5 - stable/14 - caroot: update the root bundle List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5829e12051e544333bc57b8331651bf1edd9e0fd Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=5829e12051e544333bc57b8331651bf1edd9e0fd commit 5829e12051e544333bc57b8331651bf1edd9e0fd Author: Kyle Evans AuthorDate: 2023-08-26 01:01:47 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 14:55:02 +0000 caroot: update the root bundle Summary: - Six (6) new roots - Four (4) distrusted roots Note that this was intentionally generated with OpenSSL 1.1.1 to avoid mixing updates and non-functional changes -- there will be some churn with OpenSSL 3. The next commit will update the current batch of trusted certs with the format OpenSSL 3 produces, which I've tested against OpenSSL 1.1.1 to be sure that that doesn't hurt us in older branches. Approved by: re (kib) (cherry picked from commit 65fd80909e196c8be2ce5e948775e9cbda2ef069) --- ObsoleteFiles.inc | 6 + .../Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem | 66 ++++++++++ .../Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem | 133 ++++++++++++++++++++ .../trusted/SSL_com_TLS_ECC_Root_CA_2022.pem | 69 +++++++++++ .../trusted/SSL_com_TLS_RSA_Root_CA_2022.pem | 137 +++++++++++++++++++++ ...ctigo_Public_Server_Authentication_Root_E46.pem | 66 ++++++++++ ...ctigo_Public_Server_Authentication_Root_R46.pem | 134 ++++++++++++++++++++ .../E-Tugra_Certification_Authority.pem | 0 .../E-Tugra_Global_Root_CA_ECC_v3.pem | 0 .../E-Tugra_Global_Root_CA_RSA_v3.pem | 0 .../Hongkong_Post_Root_CA_1.pem | 0 11 files changed, 611 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e8f6e2e1693c..bd7071031857 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,12 @@ # xargs -n1 | sort | uniq -d; # done +# 20230906: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +OLD_FILES+=usr/share/certs/trusted/Hongkong_Post_Root_CA_1.pem + # 20230902: libzfs now requires librt, moved to /lib MOVED_LIBS+=usr/lib/librt.so.1 diff --git a/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem new file mode 100644 index 000000000000..af7f2e061651 --- /dev/null +++ b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem @@ -0,0 +1,66 @@ +## +## Atos TrustedRoot Root CA ECC TLS 2021 +## +## 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: + 3d:98:3b:a6:66:3d:90:63:f7:7e:26:57:38:04:ef:00 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: CN = Atos TrustedRoot Root CA ECC TLS 2021, O = Atos, C = DE + Validity + Not Before: Apr 22 09:26:23 2021 GMT + Not After : Apr 17 09:26:22 2041 GMT + Subject: CN = Atos TrustedRoot Root CA ECC TLS 2021, O = Atos, C = DE + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:96:86:58:28:37:0a:67:d0:a0:de:24:19:19:e1: + e4:05:07:1f:97:ed:e8:64:82:b9:f6:c4:71:50:ce: + 8a:0c:ff:d7:b5:76:bb:a1:6c:93:6c:83:a2:68:6e: + a5:d9:be:2c:88:95:41:cd:5d:dd:b1:ca:83:63:83: + cc:c0:be:74:d9:e0:9d:a4:ee:4a:4e:56:e0:98:29: + 41:93:52:10:d5:24:38:02:32:67:f1:94:12:6f:ef: + d7:c5:de:2e:fd:19:80 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 76:28:25:D6:7D:E0:66:9A:7A:09:B2:6A:3B:8E:33:D7:36:D3:4F:A2 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:5b:99:29:f3:9c:31:b6:89:6b:6c:d6:bd:77:e1: + 7c:e7:51:7e:b8:3a:cd:a3:36:5f:7c:f7:3c:77:3e:e4:50:ad: + a8:e7:d2:59:0c:26:8e:30:3b:6e:08:2a:c2:a7:5a:c8:02:31: + 00:99:e3:0c:e7:a3:c3:af:d3:49:2e:46:82:23:66:5d:c9:00: + 14:12:fd:38:f4:e1:98:6b:77:29:7a:db:24:cf:65:40:bf:d2: + dc:8c:11:e8:f4:7d:7f:20:84:a9:42:e4:28 +SHA1 Fingerprint=9E:BC:75:10:42:B3:02:F3:81:F4:F7:30:62:D4:8F:C3:A7:51:B2:DD +-----BEGIN CERTIFICATE----- +MIICFTCCAZugAwIBAgIQPZg7pmY9kGP3fiZXOATvADAKBggqhkjOPQQDAzBMMS4w +LAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgRUNDIFRMUyAyMDIxMQ0w +CwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTI2MjNaFw00MTA0 +MTcwOTI2MjJaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBDQSBF +Q0MgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMHYwEAYHKoZI +zj0CAQYFK4EEACIDYgAEloZYKDcKZ9Cg3iQZGeHkBQcfl+3oZIK59sRxUM6KDP/X +tXa7oWyTbIOiaG6l2b4siJVBzV3dscqDY4PMwL502eCdpO5KTlbgmClBk1IQ1SQ4 +AjJn8ZQSb+/Xxd4u/RmAo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR2 +KCXWfeBmmnoJsmo7jjPXNtNPojAOBgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMD +aAAwZQIwW5kp85wxtolrbNa9d+F851F+uDrNozZffPc8dz7kUK2o59JZDCaOMDtu +CCrCp1rIAjEAmeMM56PDr9NJLkaCI2ZdyQAUEv049OGYa3cpetskz2VAv9LcjBHo +9H1/IISpQuQo +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem new file mode 100644 index 000000000000..7c6033b46658 --- /dev/null +++ b/secure/caroot/trusted/Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem @@ -0,0 +1,133 @@ +## +## Atos TrustedRoot Root CA RSA TLS 2021 +## +## 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: + 53:d5:cf:e6:19:93:0b:fb:2b:05:12:d8:c2:2a:a2:a4 + Signature Algorithm: sha384WithRSAEncryption + Issuer: CN = Atos TrustedRoot Root CA RSA TLS 2021, O = Atos, C = DE + Validity + Not Before: Apr 22 09:21:10 2021 GMT + Not After : Apr 17 09:21:09 2041 GMT + Subject: CN = Atos TrustedRoot Root CA RSA TLS 2021, O = Atos, C = DE + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:b6:80:0e:c4:79:bd:05:8c:7d:b0:a3:9d:4d:22: + 4d:cb:f0:41:97:4d:59:e0:d1:fe:56:8c:97:f2:d7: + bd:8f:6c:b7:23:8f:5f:d5:c4:d8:41:cb:f2:02:1e: + 71:e5:e9:f6:5e:cb:08:2a:5e:30:f2:2d:66:c7:84: + 1b:64:57:38:9d:75:2d:56:c6:2f:61:ef:96:fc:20: + 46:bd:eb:d4:7b:3f:3f:7c:47:38:04:a9:1b:aa:52: + df:13:37:d3:15:15:4e:bd:5f:7c:af:ad:63:c7:79: + dc:08:7b:d5:a0:e5:f7:5b:75:ac:80:55:99:92:61: + 9b:cd:2a:17:7d:db:8f:f4:b5:6a:ea:17:4a:64:28: + 66:15:29:6c:02:f1:6b:d5:ba:a3:33:dc:5a:67:a7: + 05:e2:bf:65:b6:16:b0:10:ed:cd:50:33:c9:70:50: + ec:19:8e:b0:c7:f2:74:5b:6b:44:c6:7d:96:b9:98: + 08:59:66:de:29:01:9b:f4:2a:6d:d3:15:3a:90:6a: + 67:f1:b4:6b:66:d9:21:eb:ca:d9:62:7c:46:10:5c: + de:75:49:67:9e:42:f9:fe:75:a9:a3:ad:ff:76:0a: + 67:40:e3:c5:f7:8d:c7:85:9a:59:9e:62:9a:6a:ed: + 45:87:98:67:b2:d5:4a:3c:d7:b4:3b:00:0d:c0:8f: + 1f:e1:40:c4:ae:6c:21:dc:49:7e:7e:ca:b2:8d:6d: + b6:bf:93:2f:a1:5c:3e:8f:ca:ed:80:8e:58:e1:db: + 57:cf:85:36:38:b2:71:a4:09:8c:92:89:08:88:48: + f1:40:63:18:b2:5b:8c:5a:e3:c3:d3:17:aa:ab:19: + a3:2c:1b:e4:d5:c6:e2:66:7a:d7:82:19:a6:3b:16: + 2c:2f:71:87:5f:45:9e:95:73:93:c2:42:81:21:13: + 96:d7:9d:bb:93:68:15:fa:9d:a4:1d:8c:f2:81:e0: + 58:06:bd:c9:b6:e3:f6:89:5d:89:f9:ac:44:a1:cb: + 6b:fa:16:f1:c7:50:3d:24:da:f7:c3:e4:87:d5:56: + f1:4f:90:30:fa:45:09:59:da:34:ce:e0:13:1c:04: + 7c:00:d4:9b:86:a4:40:bc:d9:dc:4c:57:7e:ae:b7: + 33:b6:5e:76:e1:65:8b:66:df:8d:ca:d7:98:af:ce: + 36:98:8c:9c:83:99:03:70:f3:af:74:ed:c6:0e:36: + e7:bd:ec:c1:73:a7:94:5a:cb:92:64:82:a6:00:c1: + 70:a1:6e:2c:29:e1:58:57:ec:5a:7c:99:6b:25:a4: + 90:3a:80:f4:20:9d:9a:ce:c7:2d:f9:b2:4b:29:95: + 83:e9:35:8d:a7:49:48:a7:0f:4c:19:91:d0:f5:bf: + 10:e0:71 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 74:49:99:D1:FF:B4:7A:68:45:75:C3:7E:B4:DC:CC:CE:39:33:DA:08 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: sha384WithRSAEncryption + 23:43:53:24:62:5c:6d:fd:3e:c2:cf:55:00:6c:c5:56:88:b9: + 0e:dd:3a:e2:25:0d:95:4a:97:ca:80:89:ee:2a:cd:65:f8:db: + 16:e0:09:92:e0:18:c7:78:98:bb:f3:ec:42:52:fb:a9:a4:82: + d7:4d:d8:8a:fc:e4:4e:fd:ab:90:c4:38:75:32:84:9f:ff:b3: + b0:2b:02:33:36:c0:10:90:6f:1d:9c:af:e1:69:93:ec:a3:45: + 2f:14:9f:f5:4c:2a:65:43:72:0c:f7:c3:f8:95:8b:14:f3:85: + 20:62:dd:54:53:dd:2c:dc:18:95:69:4f:83:47:70:40:33:58: + 77:12:0c:a2:eb:52:31:1e:4c:c9:a8:ce:c5:ef:c3:d1:ad:e0: + 6b:03:00:34:26:b4:54:21:35:97:01:dc:5f:1b:f1:7c:e7:55: + fa:2d:68:77:7b:d3:69:cc:d3:0e:6b:ba:4d:76:44:d6:c2:15: + 9a:26:ec:b0:c5:f5:bb:d1:7a:74:c2:6c:cd:c5:b5:5e:f6:4c: + e6:5b:2d:81:db:b3:b7:3a:97:9e:ed:cf:46:b2:50:3d:84:60: + 99:71:b5:33:b5:57:45:e6:42:47:75:6a:0e:b0:08:0c:ae:bd: + de:f7:bb:0f:58:3d:8f:03:31:e8:3d:82:50:ca:2f:5e:0c:5d: + b4:97:be:20:34:07:f4:c4:12:e1:ee:d7:b0:d9:59:2d:69:f7: + 31:04:f4:f2:f9:ab:f9:13:31:f8:01:77:0e:3d:42:23:26:cc: + 9a:72:67:51:21:7a:cc:3c:85:a8:ea:21:6a:3b:db:5a:3c:a5: + 34:9e:9a:c0:2c:df:80:9c:29:e0:df:77:94:d1:a2:80:42:ff: + 6a:4c:5b:11:d0:f5:cd:a2:be:ae:cc:51:5c:c3:d5:54:7b:0c: + ae:d6:b9:06:77:80:e2:ef:07:1a:68:cc:59:51:ad:7e:5c:67: + 6b:b9:db:e2:07:42:5b:b8:01:05:58:39:4d:e4:bb:98:a3:b1: + 32:ec:d9:a3:d6:6f:94:23:ff:3b:b7:29:65:e6:07:e9:ef:b6: + 19:ea:e7:c2:38:1d:32:88:90:3c:13:2b:6e:cc:ef:ab:77:06: + 34:77:84:4f:72:e4:81:84:f9:b9:74:34:de:76:4f:92:2a:53: + b1:25:39:db:3c:ff:e5:3e:a6:0e:e5:6b:9e:ff:db:ec:2f:74: + 83:df:8e:b4:b3:a9:de:14:4d:ff:31:a3:45:73:24:fa:95:29: + cc:12:97:04:a2:38:b6:8d:b0:f0:37:fc:c8:21:7f:3f:b3:24: + 1b:3d:8b:6e:cc:4d:b0:16:0d:96:1d:83:1f:46:c0:9b:bd:43: + 99:e7:c4:96:2e:ce:5f:c9 +SHA1 Fingerprint=18:52:3B:0D:06:37:E4:D6:3A:DF:23:E4:98:FB:5B:16:FB:86:74:48 +-----BEGIN CERTIFICATE----- +MIIFZDCCA0ygAwIBAgIQU9XP5hmTC/srBRLYwiqipDANBgkqhkiG9w0BAQwFADBM +MS4wLAYDVQQDDCVBdG9zIFRydXN0ZWRSb290IFJvb3QgQ0EgUlNBIFRMUyAyMDIx +MQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0yMTA0MjIwOTIxMTBaFw00 +MTA0MTcwOTIxMDlaMEwxLjAsBgNVBAMMJUF0b3MgVHJ1c3RlZFJvb3QgUm9vdCBD +QSBSU0EgVExTIDIwMjExDTALBgNVBAoMBEF0b3MxCzAJBgNVBAYTAkRFMIICIjAN +BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtoAOxHm9BYx9sKOdTSJNy/BBl01Z +4NH+VoyX8te9j2y3I49f1cTYQcvyAh5x5en2XssIKl4w8i1mx4QbZFc4nXUtVsYv +Ye+W/CBGvevUez8/fEc4BKkbqlLfEzfTFRVOvV98r61jx3ncCHvVoOX3W3WsgFWZ +kmGbzSoXfduP9LVq6hdKZChmFSlsAvFr1bqjM9xaZ6cF4r9lthawEO3NUDPJcFDs +GY6wx/J0W2tExn2WuZgIWWbeKQGb9Cpt0xU6kGpn8bRrZtkh68rZYnxGEFzedUln +nkL5/nWpo63/dgpnQOPF943HhZpZnmKaau1Fh5hnstVKPNe0OwANwI8f4UDErmwh +3El+fsqyjW22v5MvoVw+j8rtgI5Y4dtXz4U2OLJxpAmMkokIiEjxQGMYsluMWuPD +0xeqqxmjLBvk1cbiZnrXghmmOxYsL3GHX0WelXOTwkKBIROW1527k2gV+p2kHYzy +geBYBr3JtuP2iV2J+axEoctr+hbxx1A9JNr3w+SH1VbxT5Aw+kUJWdo0zuATHAR8 +ANSbhqRAvNncTFd+rrcztl524WWLZt+NyteYr842mIycg5kDcPOvdO3GDjbnvezB +c6eUWsuSZIKmAMFwoW4sKeFYV+xafJlrJaSQOoD0IJ2azsct+bJLKZWD6TWNp0lI +pw9MGZHQ9b8Q4HECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU +dEmZ0f+0emhFdcN+tNzMzjkz2ggwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB +DAUAA4ICAQAjQ1MkYlxt/T7Cz1UAbMVWiLkO3TriJQ2VSpfKgInuKs1l+NsW4AmS +4BjHeJi78+xCUvuppILXTdiK/ORO/auQxDh1MoSf/7OwKwIzNsAQkG8dnK/haZPs +o0UvFJ/1TCplQ3IM98P4lYsU84UgYt1UU90s3BiVaU+DR3BAM1h3Egyi61IxHkzJ +qM7F78PRreBrAwA0JrRUITWXAdxfG/F851X6LWh3e9NpzNMOa7pNdkTWwhWaJuyw +xfW70Xp0wmzNxbVe9kzmWy2B27O3Opee7c9GslA9hGCZcbUztVdF5kJHdWoOsAgM +rr3e97sPWD2PAzHoPYJQyi9eDF20l74gNAf0xBLh7tew2VktafcxBPTy+av5EzH4 +AXcOPUIjJsyacmdRIXrMPIWo6iFqO9taPKU0nprALN+AnCng33eU0aKAQv9qTFsR +0PXNor6uzFFcw9VUewyu1rkGd4Di7wcaaMxZUa1+XGdrudviB0JbuAEFWDlN5LuY +o7Ey7Nmj1m+UI/87tyll5gfp77YZ6ufCOB0yiJA8EytuzO+rdwY0d4RPcuSBhPm5 +dDTedk+SKlOxJTnbPP/lPqYO5Wue/9vsL3SD3460s6neFE3/MaNFcyT6lSnMEpcE +oji2jbDwN/zIIX8/syQbPYtuzE2wFg2WHYMfRsCbvUOZ58SWLs5fyQ== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/SSL_com_TLS_ECC_Root_CA_2022.pem b/secure/caroot/trusted/SSL_com_TLS_ECC_Root_CA_2022.pem new file mode 100644 index 000000000000..1a1f829cd2ef --- /dev/null +++ b/secure/caroot/trusted/SSL_com_TLS_ECC_Root_CA_2022.pem @@ -0,0 +1,69 @@ +## +## SSL.com TLS ECC Root CA 2022 +## +## 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: + 14:03:f5:ab:fb:37:8b:17:40:5b:e2:43:b2:a5:d1:c4 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = SSL Corporation, CN = SSL.com TLS ECC Root CA 2022 + Validity + Not Before: Aug 25 16:33:48 2022 GMT + Not After : Aug 19 16:33:47 2046 GMT + Subject: C = US, O = SSL Corporation, CN = SSL.com TLS ECC Root CA 2022 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:45:29:35:73:fa:c2:b8:23:ce:14:7d:a8:b1:4d: + a0:5b:36:ee:2a:2c:53:c3:60:09:35:b2:24:66:26: + 69:c0:b3:95:d6:5d:92:40:19:0e:c6:a5:13:70:f4: + ef:12:51:28:5d:e7:cc:bd:f9:3c:85:c1:cf:94:90: + c9:2b:ce:92:42:58:59:67:fd:94:27:10:64:8c:4f: + 04:b1:4d:49:e4:7b:4f:9b:f5:e7:08:f8:03:88:f7: + a7:c3:92:4b:19:54:81 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:89:8F:2F:A3:E8:2B:A0:14:54:7B:F3:56:B8:26:5F:67:38:0B:9C:D0 + + X509v3 Subject Key Identifier: + 89:8F:2F:A3:E8:2B:A0:14:54:7B:F3:56:B8:26:5F:67:38:0B:9C:D0 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:55:e3:22:56:e9:d7:92:24:58:4f:1e:94:32:0f: + 0c:02:36:c2:fd:ac:74:32:4e:e1:fb:1c:80:88:a3:cc:fb:d7: + eb:2b:ff:37:7d:f0:ed:d7:9e:75:6a:35:76:52:45:e0:02:31: + 00:c7:8d:6f:42:20:8f:be:b6:4d:59:ed:77:4d:29:c4:20:20: + 45:64:86:3a:50:c6:c4:ad:2d:93:f5:18:7d:72:ed:a9:cf:c4: + ac:57:36:28:08:65:df:3c:79:66:7e:a0:ea +SHA1 Fingerprint=9F:5F:D9:1A:54:6D:F5:0C:71:F0:EE:7A:BD:17:49:98:84:73:E2:39 +-----BEGIN CERTIFICATE----- +MIICOjCCAcCgAwIBAgIQFAP1q/s3ixdAW+JDsqXRxDAKBggqhkjOPQQDAzBOMQsw +CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQDDBxT +U0wuY29tIFRMUyBFQ0MgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzM0OFoXDTQ2 +MDgxOTE2MzM0N1owTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jwb3Jh +dGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgRUNDIFJvb3QgQ0EgMjAyMjB2MBAG +ByqGSM49AgEGBSuBBAAiA2IABEUpNXP6wrgjzhR9qLFNoFs27iosU8NgCTWyJGYm +acCzldZdkkAZDsalE3D07xJRKF3nzL35PIXBz5SQySvOkkJYWWf9lCcQZIxPBLFN +SeR7T5v15wj4A4j3p8OSSxlUgaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME +GDAWgBSJjy+j6CugFFR781a4Jl9nOAuc0DAdBgNVHQ4EFgQUiY8vo+groBRUe/NW +uCZfZzgLnNAwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2gAMGUCMFXjIlbp +15IkWE8elDIPDAI2wv2sdDJO4fscgIijzPvX6yv/N33w7deedWo1dlJF4AIxAMeN +b0Igj762TVntd00pxCAgRWSGOlDGxK0tk/UYfXLtqc/ErFc2KAhl3zx5Zn6g6g== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/SSL_com_TLS_RSA_Root_CA_2022.pem b/secure/caroot/trusted/SSL_com_TLS_RSA_Root_CA_2022.pem new file mode 100644 index 000000000000..090019495424 --- /dev/null +++ b/secure/caroot/trusted/SSL_com_TLS_RSA_Root_CA_2022.pem @@ -0,0 +1,137 @@ +## +## SSL.com TLS RSA Root CA 2022 +## +## 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: + 6f:be:da:ad:73:bd:08:40:e2:8b:4d:be:d4:f7:5b:91 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = SSL Corporation, CN = SSL.com TLS RSA Root CA 2022 + Validity + Not Before: Aug 25 16:34:22 2022 GMT + Not After : Aug 19 16:34:21 2046 GMT + Subject: C = US, O = SSL Corporation, CN = SSL.com TLS RSA Root CA 2022 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:d0:a4:09:72:4f:40:88:12:61:3e:35:23:9e:ee: + f6:74:cf:2f:7b:58:3d:ce:3c:0d:10:28:90:2f:97: + f7:8c:48:d8:a0:d8:25:b1:4c:b0:11:4c:17:73:50: + d0:22:4a:63:bb:81:d3:29:6e:d5:b5:09:3e:26:18: + 7f:b2:12:7f:93:98:b7:af:f0:36:bf:f2:ee:18:9e: + 9c:3b:52:c5:47:19:5d:74:f3:64:66:d5:5d:c7:68: + b4:bf:1b:1c:06:a3:bc:8f:40:23:b6:1e:c6:84:bd: + 51:c4:1b:39:c1:95:d2:29:ec:4b:ae:7b:2d:bf:39: + fd:b4:62:de:96:7b:41:c6:9c:a0:e0:06:72:fb:f0: + 07:97:09:39:81:74:af:f7:34:59:11:57:0a:c2:5b: + c1:24:f4:31:73:30:82:c6:9d:ba:02:f7:3e:7c:44: + 5f:83:0d:f3:f1:dd:20:69:16:09:50:e2:d4:55:b6: + e0:80:72:76:6e:4c:47:b7:75:55:59:b4:53:74:d9: + 94:c6:41:ad:58:8a:31:66:0f:1e:a2:1b:29:40:4e: + 2f:df:7b:e6:16:2c:2d:fc:bf:ec:f3:b4:fa:be:18: + f6:9b:49:d4:ee:05:6e:d9:34:f3:9c:f1:ec:01:8b: + d1:20:c6:0f:a0:b5:bc:17:4e:48:7b:51:c2:fc:e9: + 5c:69:37:47:66:b3:68:f8:15:28:f0:b9:d3:a4:15: + cc:5a:4f:ba:52:70:a3:12:45:dd:c6:ba:4e:fb:c2: + d0:f7:a8:52:27:6d:6e:79:b5:8c:fc:7b:8c:c1:16: + 4c:ee:80:7f:be:f0:76:be:41:53:12:33:ae:5a:38: + 42:ab:d7:0f:3e:41:8d:76:07:32:d5:ab:89:f6:4e: + 67:d9:b1:42:75:23:6e:f3:cd:42:b2:fc:55:f5:53: + 87:17:3b:c0:33:58:f1:52:d2:f9:80:a4:f0:e8:f0: + 3b:8b:38:cc:a4:c6:90:7f:0f:9c:fd:8b:d1:a3:cf: + da:83:a7:69:c9:50:36:d5:5c:05:d2:0a:41:74:db: + 63:11:37:c1:a5:a0:96:4b:1e:8c:16:12:77:ae:94: + 34:7b:1e:7f:c2:66:00:e4:aa:83:ea:8a:90:ad:ce: + 36:44:4d:d1:51:e9:bc:1f:f3:6a:05:fd:c0:74:1f: + 25:19:40:51:6e:ea:82:51:40:df:9b:b9:08:2a:06: + 02:d5:23:1c:13:d6:e9:db:db:c6:b0:7a:cb:7b:27: + 9b:fb:e0:d5:46:24:ed:10:4b:63:4b:a5:05:8f:ba: + b8:1d:2b:a6:fa:91:e2:92:52:bd:ec:eb:67:97:6d: + 9a:2d:9f:81:32:05:67:32:fb:48:08:3f:d9:25:b8: + 04:25:2f + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:FB:2E:37:EE:E3:84:7A:27:2E:CD:19:35:B1:33:7C:FF:D4:44:42:B9 + + X509v3 Subject Key Identifier: + FB:2E:37:EE:E3:84:7A:27:2E:CD:19:35:B1:33:7C:FF:D4:44:42:B9 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + Signature Algorithm: sha256WithRSAEncryption + 8d:89:6d:84:45:18:f1:4f:b3:a0:ef:68:a4:c0:1d:ac:30:bc: + 67:66:b0:9a:cd:b6:ab:22:19:66:d3:3b:41:b5:10:9d:10:ba: + 72:6e:29:24:20:1c:01:99:62:d3:96:e0:e2:fb:0c:42:d7:e1: + 5a:c4:96:4d:54:cd:8f:ca:43:53:fd:2a:b8:ea:f8:65:ca:01: + c2:ad:60:68:06:9f:39:1a:51:d9:e0:8d:26:f9:0b:4e:a5:53: + 25:7a:23:a4:1c:ce:08:1b:df:47:88:b2:ad:3e:e0:27:87:8b: + 49:8c:1f:a9:47:58:7b:96:f2:88:1d:18:ae:b3:d1:a6:0a:94: + fa:db:d3:e5:38:0a:6b:79:12:33:fb:4a:59:37:16:40:0e:bb: + de:f5:89:0c:f1:6c:d3:f7:51:6b:5e:35:f5:db:c0:26:ea:12: + 73:4e:a9:91:90:a6:17:c3:6c:2f:38:d4:a3:72:94:43:2c:62: + e1:4e:5c:32:3d:bd:4c:7d:19:47:a2:c3:49:e7:96:3f:8f:9a: + d3:3b:e4:11:d8:8b:03:dc:f6:b6:60:55:18:a6:81:51:f3:e1: + a8:15:6a:eb:e0:0b:f0:14:31:d6:b9:8c:45:3a:a8:10:d8:f0: + b9:27:eb:f7:cb:7a:ef:05:72:96:b5:c4:8f:96:73:c4:e8:56: + 73:9c:bc:69:51:63:bc:ef:67:1c:43:1a:5f:77:19:1f:18:f8: + 1c:25:29:f9:49:99:29:b6:92:3d:a2:83:37:b1:20:91:a8:9b: + 30:e9:6a:6c:b4:23:93:65:04:ab:11:f3:0e:1d:53:24:49:53: + 1d:a1:3f:9d:48:92:11:e2:7d:0d:4f:f5:d7:bd:a2:58:3e:78: + 9d:1e:1f:2b:fe:21:bb:1a:13:b6:b1:28:64:fd:b0:02:00:c7: + 6c:80:a2:bd:16:50:20:0f:72:81:5f:cc:94:ff:bb:99:e6:ba: + 90:cb:ea:f9:c6:0c:c2:ae:c5:19:ce:33:a1:6b:5c:bb:7e:7c: + 34:57:17:ad:f0:3f:ae:cd:ea:af:99:ec:2c:54:7e:8c:ce:2e: + 12:56:48:ef:17:3b:3f:4a:5e:60:d2:dc:74:36:bc:a5:43:63: + cb:0f:5b:a3:02:56:09:9e:24:2c:e1:86:81:8c:fe:ab:17:2c: + fa:c8:e2:32:1a:3a:ff:85:08:c9:83:9f:f2:4a:48:10:54:77: + 37:ed:a2:bc:40:be:e4:10:74:f7:e4:5b:bb:b9:f3:89:f9:8f: + 41:d8:c7:e4:50:90:35:80:3e:1c:b8:4d:90:d3:d4:f7:c3:b0: + a1:7e:84:ca:77:92:31:2c:b8:90:b1:82:7a:74:4e:9b:13:26: + b4:d5:50:66:54:78:ae:60 +SHA1 Fingerprint=EC:2C:83:40:72:AF:26:95:10:FF:0E:F2:03:EE:31:70:F6:78:9D:CA +-----BEGIN CERTIFICATE----- +MIIFiTCCA3GgAwIBAgIQb77arXO9CEDii02+1PdbkTANBgkqhkiG9w0BAQsFADBO +MQswCQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSUwIwYDVQQD +DBxTU0wuY29tIFRMUyBSU0EgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzQyMloX +DTQ2MDgxOTE2MzQyMVowTjELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jw +b3JhdGlvbjElMCMGA1UEAwwcU1NMLmNvbSBUTFMgUlNBIFJvb3QgQ0EgMjAyMjCC +AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANCkCXJPQIgSYT41I57u9nTP +L3tYPc48DRAokC+X94xI2KDYJbFMsBFMF3NQ0CJKY7uB0ylu1bUJPiYYf7ISf5OY +t6/wNr/y7hienDtSxUcZXXTzZGbVXcdotL8bHAajvI9AI7YexoS9UcQbOcGV0ins +S657Lb85/bRi3pZ7QcacoOAGcvvwB5cJOYF0r/c0WRFXCsJbwST0MXMwgsadugL3 +PnxEX4MN8/HdIGkWCVDi1FW24IBydm5MR7d1VVm0U3TZlMZBrViKMWYPHqIbKUBO +L9975hYsLfy/7PO0+r4Y9ptJ1O4Fbtk085zx7AGL0SDGD6C1vBdOSHtRwvzpXGk3 +R2azaPgVKPC506QVzFpPulJwoxJF3ca6TvvC0PeoUidtbnm1jPx7jMEWTO6Af77w +dr5BUxIzrlo4QqvXDz5BjXYHMtWrifZOZ9mxQnUjbvPNQrL8VfVThxc7wDNY8VLS ++YCk8OjwO4s4zKTGkH8PnP2L0aPP2oOnaclQNtVcBdIKQXTbYxE3waWglksejBYS +d66UNHsef8JmAOSqg+qKkK3ONkRN0VHpvB/zagX9wHQfJRlAUW7qglFA35u5CCoG +AtUjHBPW6dvbxrB6y3snm/vg1UYk7RBLY0ulBY+6uB0rpvqR4pJSvezrZ5dtmi2f +gTIFZzL7SAg/2SW4BCUvAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0j +BBgwFoAU+y437uOEeicuzRk1sTN8/9REQrkwHQYDVR0OBBYEFPsuN+7jhHonLs0Z +NbEzfP/UREK5MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAjYlt +hEUY8U+zoO9opMAdrDC8Z2awms22qyIZZtM7QbUQnRC6cm4pJCAcAZli05bg4vsM +QtfhWsSWTVTNj8pDU/0quOr4ZcoBwq1gaAafORpR2eCNJvkLTqVTJXojpBzOCBvf +R4iyrT7gJ4eLSYwfqUdYe5byiB0YrrPRpgqU+tvT5TgKa3kSM/tKWTcWQA673vWJ +DPFs0/dRa1419dvAJuoSc06pkZCmF8NsLzjUo3KUQyxi4U5cMj29TH0ZR6LDSeeW +P4+a0zvkEdiLA9z2tmBVGKaBUfPhqBVq6+AL8BQx1rmMRTqoENjwuSfr98t67wVy +lrXEj5ZzxOhWc5y8aVFjvO9nHEMaX3cZHxj4HCUp+UmZKbaSPaKDN7EgkaibMOlq +bLQjk2UEqxHzDh1TJElTHaE/nUiSEeJ9DU/1172iWD54nR4fK/4huxoTtrEoZP2w +AgDHbICivRZQIA9ygV/MlP+7mea6kMvq+cYMwq7FGc4zoWtcu358NFcXrfA/rs3q +r5nsLFR+jM4uElZI7xc7P0peYNLcdDa8pUNjyw9bowJWCZ4kLOGGgYz+qxcs+sji +Mho6/4UIyYOf8kpIEFR3N+2ivEC+5BB09+Rbu7nzifmPQdjH5FCQNYA+HLhNkNPU +98OwoX6EyneSMSy4kLGCenROmxMmtNVQZlR4rmA= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_E46.pem b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_E46.pem new file mode 100644 index 000000000000..964350854b3a --- /dev/null +++ b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_E46.pem @@ -0,0 +1,66 @@ +## +## Sectigo Public Server Authentication Root E46 +## +## 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: + 42:f2:cc:da:1b:69:37:44:5f:15:fe:75:28:10:b8:f4 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root E46 + Validity + Not Before: Mar 22 00:00:00 2021 GMT + Not After : Mar 21 23:59:59 2046 GMT + Subject: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root E46 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:76:fa:99:a9:6e:20:ed:f9:d7:77:e3:07:3b:a8: + db:3d:5f:38:e8:ab:55:a6:56:4f:d6:48:ea:ec:7f: + 2d:aa:c3:b2:c5:79:ec:99:61:7f:10:79:c7:02:5a: + f9:04:37:f5:34:35:2b:77:ce:7f:20:8f:52:a3:00: + 89:ec:d5:a7:a2:6d:5b:e3:4b:92:93:a0:80:f5:01: + 94:dc:f0:68:07:1e:cd:ee:fe:25:52:b5:20:43:1c: + 1b:fe:eb:19:ce:43:a3 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + D1:22:DA:4C:59:F1:4B:5F:26:38:AA:9D:D6:EE:EB:0D:C3:FB:A9:61 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: ecdsa-with-SHA384 + 30:64:02:30:27:ee:a4:5a:a8:21:bb:e9:47:97:94:89:a5:74: + 20:6d:79:4f:c8:bd:93:5e:58:18:fb:2d:1a:00:6a:c9:b8:3d: + d0:a4:4f:44:47:94:01:56:a2:f8:33:25:0c:42:df:aa:02:30: + 1d:ea:e1:2e:88:2e:e1:f9:a7:1d:02:32:4e:f2:9f:6c:55:74: + e3:ae:ae:fb:a5:1a:ee:ed:d2:fc:c2:03:11:eb:45:5c:60:10: + 3d:5c:7f:99:03:5b:6d:54:48:01:8a:73 +SHA1 Fingerprint=EC:8A:39:6C:40:F0:2E:BC:42:75:D4:9F:AB:1C:1A:5B:67:BE:D2:9A +-----BEGIN CERTIFICATE----- +MIICOjCCAcGgAwIBAgIQQvLM2htpN0RfFf51KBC49DAKBggqhkjOPQQDAzBfMQsw +CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1T +ZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwHhcN +MjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEYMBYG +A1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1YmxpYyBT +ZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAAR2+pmpbiDt+dd34wc7qNs9Xzjoq1WmVk/WSOrsfy2qw7LFeeyZYX8QeccC +WvkEN/U0NSt3zn8gj1KjAIns1aeibVvjS5KToID1AZTc8GgHHs3u/iVStSBDHBv+ +6xnOQ6OjQjBAMB0GA1UdDgQWBBTRItpMWfFLXyY4qp3W7usNw/upYTAOBgNVHQ8B +Af8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNnADBkAjAn7qRa +qCG76UeXlImldCBteU/IvZNeWBj7LRoAasm4PdCkT0RHlAFWovgzJQxC36oCMB3q +4S6ILuH5px0CMk7yn2xVdOOurvulGu7t0vzCAxHrRVxgED1cf5kDW21USAGKcw== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_R46.pem b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_R46.pem new file mode 100644 index 000000000000..e51aef002852 --- /dev/null +++ b/secure/caroot/trusted/Sectigo_Public_Server_Authentication_Root_R46.pem @@ -0,0 +1,134 @@ +## +## Sectigo Public Server Authentication Root R46 +## +## 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: + 75:8d:fd:8b:ae:7c:07:00:fa:a9:25:a7:e1:c7:ad:14 + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root R46 + Validity + Not Before: Mar 22 00:00:00 2021 GMT + Not After : Mar 21 23:59:59 2046 GMT + Subject: C = GB, O = Sectigo Limited, CN = Sectigo Public Server Authentication Root R46 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:93:be:d5:36:52:75:d8:01:23:a0:1c:47:42:49: + ee:63:b6:b7:21:fd:c4:95:d5:48:2b:26:7c:14:53: + 10:da:79:fd:2b:b7:2d:a4:d4:2c:fa:ea:32:dd:49: + c2:b9:bd:0f:48:3d:7b:5a:98:54:af:9e:5d:31:74: + 4f:07:fc:50:21:dd:a4:cf:68:4f:1b:12:63:6d:25: + 99:4c:2a:99:f3:48:30:61:fa:81:7c:1e:a7:08:4a: + dc:3e:2b:1c:1f:18:4c:71:aa:35:8c:ad:f8:6e:e8: + 3b:4a:d9:e5:94:02:d6:89:84:13:aa:6d:c8:4f:33: + cc:50:96:37:92:33:dc:5f:88:e7:9f:54:d9:48:f0: + 98:43:d6:66:fd:9f:17:38:43:c5:01:51:0b:d7:e3: + 23:0f:14:5d:5b:14:e7:4b:be:dd:f4:c8:da:03:37: + d1:d6:39:a1:21:51:30:83:b0:6d:d7:30:4e:96:5b: + 91:f0:70:24:ab:bf:45:81:64:43:0d:bd:21:3a:2f: + 3c:e9:9e:0d:cb:20:b5:42:27:cc:da:6f:9b:ee:64: + 30:90:39:cd:93:65:81:21:31:b5:23:50:33:37:22: + e3:38:ed:f8:31:30:cc:45:fe:62:f9:d1:5d:32:79: + 42:87:df:6a:cc:56:19:40:4d:ce:aa:bb:f9:b5:76: + 49:94:f1:27:f8:91:a5:83:e5:06:b3:63:0e:80:dc: + e0:12:55:80:a6:3b:66:b4:39:87:2d:c8:f0:d0:d1: + 14:e9:e4:0d:4d:0e:f6:5d:57:72:c5:3b:1c:47:56: + 9d:e2:d5:fb:81:61:8c:cc:4d:80:90:34:5b:b7:d7: + 14:75:dc:d8:04:48:9f:c0:c1:28:88:b4:e9:1c:ca: + a7:b1:f1:56:b7:7b:49:4c:59:e5:20:15:a8:84:02: + 29:fa:38:94:69:9a:49:06:8f:cd:1f:79:14:17:12: + 0c:83:7a:de:1f:b1:97:ee:f9:97:78:28:a4:c8:44: + 92:e9:7d:26:05:a6:58:72:9b:79:13:d8:11:5f:ae: + c5:38:62:34:68:b2:86:30:8e:f8:90:61:9e:32:6c: + f5:07:36:cd:a2:4c:6e:ec:8a:36:ed:f2:e6:99:15: + 44:70:c3:7c:bc:9c:39:c0:b4:e1:6b:f7:83:25:23: + 57:d9:12:80:e5:49:f0:75:0f:ef:8d:eb:1c:9b:54: + 28:b4:21:3c:fc:7c:0a:ff:ef:7b:6b:75:ff:8b:1d: + a0:19:05:ab:fa:f8:2b:81:42:e8:38:ba:bb:fb:aa: + fd:3d:e0:f3:ca:df:4e:97:97:29:ed:f3:18:56:e9: + a5:96:ac:bd:c3:90:98:b2:e0:f9:a2:d4:a6:47:43: + 7c:6d:cf + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 56:73:58:64:95:F9:92:1A:B0:12:2A:04:62:79:A1:40:15:88:21:49 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: sha384WithRSAEncryption + 2f:5c:99:3c:fc:06:5e:8c:94:2e:70:ea:d2:32:31:8d:b4:f0: + 51:d5:bc:0a:f3:64:9f:07:5e:d5:c1:73:68:64:7a:a2:b9:0e: + e8:f9:5d:85:2d:a8:37:45:aa:28:f4:96:05:50:60:a9:49:7e: + 9f:e2:99:36:29:13:44:47:6a:9d:55:20:3c:d8:9b:f1:03:32: + ba:da:40:a1:73:ea:83:a1:b7:44:a6:0e:99:01:9b:e4:bc:7f: + be:13:94:7e:ca:a6:1e:76:80:36:3d:84:06:8b:33:26:65:6d: + ca:7e:9e:fe:1f:8c:58:38:7b:1a:83:b1:0f:bc:17:11:bb:e6: + 06:cc:63:fa:81:f2:81:4c:da:0b:10:6b:a1:fa:d5:28:a5:cf: + 06:40:16:ff:7b:7d:18:5e:39:12:a4:53:9e:7e:32:42:10:a6: + 21:91:a9:1c:4e:17:7c:84:bc:9f:8c:d1:e8:df:e6:51:b9:36: + 47:3f:90:b9:c7:bc:02:dc:5b:1c:4f:0e:48:c1:25:83:9c:0a: + 3f:9e:b1:03:33:12:1a:27:ac:f7:22:6c:24:d1:01:41:f8:58: + 03:fe:25:68:22:1f:9a:5a:3c:7c:6c:9e:75:48:f3:81:f1:66: + 67:6e:4c:82:c0:ee:ba:57:0e:18:ef:2e:9a:f7:12:d8:a0:6b: + e9:05:a5:a1:e9:68:f8:bc:4c:3f:12:1e:45:e8:52:c0:a3:bf: + 12:27:79:b9:cc:31:3c:c3:f6:3a:22:16:03:a0:c9:8f:66:a4: + 5b:a2:4d:d6:81:25:06:e9:76:a4:00:0a:3e:cb:cd:35:9b:e0: + e1:38:cb:60:53:86:28:42:41:1c:44:57:e8:a8:ad:ab:45:e3: + 25:10:bc:db:3e:65:41:fb:1b:a6:97:0f:eb:b9:74:79:f9:1e: + bc:1d:57:0d:47:af:c3:2f:9f:87:46:a7:eb:26:5a:0f:56:63: + b5:62:60:6e:00:fb:e3:27:11:22:e7:fe:99:8f:34:f5:b9:e8: + c3:91:72:bd:d8:c3:1e:b9:2e:f2:91:44:51:d0:57:cd:0c:34: + d5:48:21:bf:db:13:f1:66:25:43:52:d2:70:22:36:cd:9f:c4: + 1c:75:20:ad:63:72:63:06:0f:0e:27:ce:d2:6a:0d:bc:b5:39: + 1a:e9:d1:76:7a:d1:5c:e4:e7:49:49:2d:55:37:68:f0:1a:3a: + 98:3e:54:17:87:54:e9:a6:27:50:89:7b:20:2f:3f:ff:bf:a1: + 8b:4a:47:98:ff:2b:7b:49:3e:c3:29:46:60:18:42:ab:33:29: + ba:c0:29:b9:13:89:d3:88:8a:39:41:3b:c9:fd:a6:ed:1f:f4: + 60:63:df:d2:2d:55:01:8b +SHA1 Fingerprint=AD:98:F9:F3:E4:7D:75:3B:65:D4:82:B3:A4:52:17:BB:6E:F5:E4:38 +-----BEGIN CERTIFICATE----- +MIIFijCCA3KgAwIBAgIQdY39i658BwD6qSWn4cetFDANBgkqhkiG9w0BAQwFADBf +MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQD +Ey1TZWN0aWdvIFB1YmxpYyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYw +HhcNMjEwMzIyMDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBfMQswCQYDVQQGEwJHQjEY +MBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTYwNAYDVQQDEy1TZWN0aWdvIFB1Ymxp +YyBTZXJ2ZXIgQXV0aGVudGljYXRpb24gUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQCTvtU2UnXYASOgHEdCSe5jtrch/cSV1UgrJnwUUxDa +ef0rty2k1Cz66jLdScK5vQ9IPXtamFSvnl0xdE8H/FAh3aTPaE8bEmNtJZlMKpnz +SDBh+oF8HqcIStw+KxwfGExxqjWMrfhu6DtK2eWUAtaJhBOqbchPM8xQljeSM9xf +iOefVNlI8JhD1mb9nxc4Q8UBUQvX4yMPFF1bFOdLvt30yNoDN9HWOaEhUTCDsG3X +ME6WW5HwcCSrv0WBZEMNvSE6Lzzpng3LILVCJ8zab5vuZDCQOc2TZYEhMbUjUDM3 +IuM47fgxMMxF/mL50V0yeUKH32rMVhlATc6qu/m1dkmU8Sf4kaWD5QazYw6A3OAS +VYCmO2a0OYctyPDQ0RTp5A1NDvZdV3LFOxxHVp3i1fuBYYzMTYCQNFu31xR13NgE +SJ/AwSiItOkcyqex8Va3e0lMWeUgFaiEAin6OJRpmkkGj80feRQXEgyDet4fsZfu ++Zd4KKTIRJLpfSYFplhym3kT2BFfrsU4YjRosoYwjviQYZ4ybPUHNs2iTG7sijbt +8uaZFURww3y8nDnAtOFr94MlI1fZEoDlSfB1D++N6xybVCi0ITz8fAr/73trdf+L +HaAZBav6+CuBQug4urv7qv094PPK306Xlynt8xhW6aWWrL3DkJiy4Pmi1KZHQ3xt +zwIDAQABo0IwQDAdBgNVHQ4EFgQUVnNYZJX5khqwEioEYnmhQBWIIUkwDgYDVR0P +AQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAC9c +mTz8Bl6MlC5w6tIyMY208FHVvArzZJ8HXtXBc2hkeqK5Duj5XYUtqDdFqij0lgVQ +YKlJfp/imTYpE0RHap1VIDzYm/EDMrraQKFz6oOht0SmDpkBm+S8f74TlH7Kph52 +gDY9hAaLMyZlbcp+nv4fjFg4exqDsQ+8FxG75gbMY/qB8oFM2gsQa6H61SilzwZA +Fv97fRheORKkU55+MkIQpiGRqRxOF3yEvJ+M0ejf5lG5Nkc/kLnHvALcWxxPDkjB +JYOcCj+esQMzEhonrPcibCTRAUH4WAP+JWgiH5paPHxsnnVI84HxZmduTILA7rpX +DhjvLpr3Etiga+kFpaHpaPi8TD8SHkXoUsCjvxInebnMMTzD9joiFgOgyY9mpFui +TdaBJQbpdqQACj7LzTWb4OE4y2BThihCQRxEV+ioratF4yUQvNs+ZUH7G6aXD+u5 +dHn5HrwdVw1Hr8Mvn4dGp+smWg9WY7ViYG4A++MnESLn/pmPNPW56MORcr3Ywx65 +LvKRRFHQV80MNNVIIb/bE/FmJUNS0nAiNs2fxBx1IK1jcmMGDw4nztJqDby1ORrp +0XZ60Vzk50lJLVU3aPAaOpg+VBeHVOmmJ1CJeyAvP/+/oYtKR5j/K3tJPsMpRmAY +QqszKbrAKbkTidOIijlBO8n9pu0f9GBj39ItVQGL +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/untrusted/E-Tugra_Certification_Authority.pem similarity index 100% rename from secure/caroot/trusted/E-Tugra_Certification_Authority.pem rename to secure/caroot/untrusted/E-Tugra_Certification_Authority.pem diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem similarity index 100% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem rename to secure/caroot/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem similarity index 100% rename from secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem rename to secure/caroot/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem diff --git a/secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem b/secure/caroot/untrusted/Hongkong_Post_Root_CA_1.pem similarity index 100% rename from secure/caroot/trusted/Hongkong_Post_Root_CA_1.pem rename to secure/caroot/untrusted/Hongkong_Post_Root_CA_1.pem From nobody Tue Sep 5 14:55:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg7pj5jZ2z4rPF3; Tue, 5 Sep 2023 14:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg7pj52Xqz4MlD; Tue, 5 Sep 2023 14:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XaQJHKVa7xGY1jHSunA1vMEs3eWukT4FNBXkID0OIAQ=; b=R6bEawo8l+AzgfcxxPeq82ayvF1YrQBt9rQcZo+igvOTeSXzX8U8tnawJXi7NwXpEviasC uhRMfIhmV9M5cP3kTeSu91Mn2n2M9bjdBSw3mTNm9YVhEQKUJEgPmuB16yQkzq0j+Arkzt dBjKDhY6eXuy1iCxMLV9nsC7qM8b2yWi3Uzbu5xbZ8jKdUo3akvl/Bp0HQU2nzBBVj6MhS aq1xfVKKt6aC8rXPz86OTzjRBSZqbBgamoRKpWi9+EA8mAkYwPFQk9yt1OWBIzyTnbdJy/ ggX/iaqh64/EJX7oiwM5QJ3j249lzhiorbriP9GZmT4ENMXq5NLPidjDhY1iRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693925725; a=rsa-sha256; cv=none; b=CYawHrNWfqmNmxbCK08EcAXQNeKIzoYLuX8P3oOZRD7wqDtJvHaVyMGRZIZqUWaz44JIQb lNdhMRH1iJW1uKFhl0sLOV1wRkP4H7t81oozdB/XsA+ZkreaGSJD5Lkct9C1C52ecTwTRd 1G2PgaWMYHE2ZdsZauZR2gtpHBrYBS1PUsMmw0o2fgGEP1BRYhpxFiLCRrm+7EULZ57Gpt YOmPXSDjGe6XY5/MsMRPCMbtoYozrFT7hGvHQ7DLQz0ZRNKGPlsk4VH+TSTyf8dbl92QBd nUL7SPC+PFNr80tAHvL2hdxt9M67/rdOe0rhA3ya9Re61G5tzYljINRCakN6MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693925725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XaQJHKVa7xGY1jHSunA1vMEs3eWukT4FNBXkID0OIAQ=; b=Nk5r6UwN/zVXsN7KgtCtondSZzYI6Ht+5JLDQLcVa9gatoZ8of04RUnnc06+DF4DgtooDH A/+fU2nrz2Db1g1XY5InKfiUa0R/umQvQwJg17PCFivmHHUNpvoVYLzExjTqgABELwjzmj u1RKCU8btivtTpRApq68M6mz1WDf51A2ho9SSs65ZA7okA2xosvcNy4k/Tg2/+VYhCI39W D8znDpmfHx7IVQ2tpapj0rLmewyts74OfqXWhpkg6shKVwM6yeuzVNQArTCUFjpqHSsKco lEcp7tUPcKSfoQP15D0Nuxeu0jw2RoEBHpFPhhxMOmehyWGR05w3KtAcz5P5aQ== 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 4Rg7pj45FWzdDC; Tue, 5 Sep 2023 14:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385EtP3G026500; Tue, 5 Sep 2023 14:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385EtPAh026497; Tue, 5 Sep 2023 14:55:25 GMT (envelope-from git) Date: Tue, 5 Sep 2023 14:55:25 GMT Message-Id: <202309051455.385EtPAh026497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e7109724468c - stable/14 - caroot: regenerate the root bundle with OpenSSL 3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e7109724468c0415386f20b62bfb8ed34df8e8eb Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e7109724468c0415386f20b62bfb8ed34df8e8eb commit e7109724468c0415386f20b62bfb8ed34df8e8eb Author: Kyle Evans AuthorDate: 2023-08-26 01:15:39 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 14:55:09 +0000 caroot: regenerate the root bundle with OpenSSL 3 No functional change intended. Approved by: re (kib) (cherry picked from commit 8ed0ecf8024d10e9cd21f5880723a6cec4fd4ae6) --- secure/caroot/trusted/ACCVRAIZ1.pem | 68 ++++++++++------------ secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 62 ++++++++++---------- .../AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 13 +++-- .../caroot/trusted/ANF_Secure_Server_Root_CA.pem | 64 ++++++++++---------- .../trusted/Actalis_Authentication_Root_CA.pem | 64 ++++++++++---------- secure/caroot/trusted/AffirmTrust_Commercial.pem | 33 ++++++----- secure/caroot/trusted/AffirmTrust_Networking.pem | 33 ++++++----- secure/caroot/trusted/AffirmTrust_Premium.pem | 61 +++++++++---------- secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 13 +++-- secure/caroot/trusted/Amazon_Root_CA_1.pem | 33 ++++++----- secure/caroot/trusted/Amazon_Root_CA_2.pem | 61 +++++++++---------- secure/caroot/trusted/Amazon_Root_CA_3.pem | 9 +-- secure/caroot/trusted/Amazon_Root_CA_4.pem | 13 +++-- secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 37 ++++++------ .../Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem | 13 +++-- .../Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem | 61 +++++++++---------- ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 62 ++++++++++---------- secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 61 +++++++++---------- secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 13 +++-- .../caroot/trusted/Baltimore_CyberTrust_Root.pem | 33 ++++++----- secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 61 +++++++++---------- secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 61 +++++++++---------- secure/caroot/trusted/CA_Disig_Root_R2.pem | 61 +++++++++---------- secure/caroot/trusted/CFCA_EV_ROOT.pem | 64 ++++++++++---------- .../trusted/COMODO_Certification_Authority.pem | 35 ++++++----- .../trusted/COMODO_ECC_Certification_Authority.pem | 13 +++-- .../trusted/COMODO_RSA_Certification_Authority.pem | 61 +++++++++---------- secure/caroot/trusted/Certainly_Root_E1.pem | 13 +++-- secure/caroot/trusted/Certainly_Root_R1.pem | 61 +++++++++---------- secure/caroot/trusted/Certigna.pem | 34 +++++------ secure/caroot/trusted/Certigna_Root_CA.pem | 68 ++++++++++------------ secure/caroot/trusted/Certum_EC-384_CA.pem | 13 +++-- .../caroot/trusted/Certum_Trusted_Network_CA.pem | 33 ++++++----- .../caroot/trusted/Certum_Trusted_Network_CA_2.pem | 61 +++++++++---------- secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 61 +++++++++---------- secure/caroot/trusted/Comodo_AAA_Services_root.pem | 36 ++++++------ .../caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 16 +++-- .../caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 16 +++-- .../trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 36 ++++++------ .../trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 36 ++++++------ .../caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 36 ++++++------ .../caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 33 ++++++----- .../caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 13 +++-- secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 36 ++++++------ secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 33 ++++++----- secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 13 +++-- .../trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 36 ++++++------ .../trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 13 +++-- .../trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 61 +++++++++---------- secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 61 +++++++++---------- .../Entrust_Root_Certification_Authority.pem | 36 ++++++------ .../Entrust_Root_Certification_Authority_-_EC1.pem | 13 +++-- .../Entrust_Root_Certification_Authority_-_G2.pem | 33 ++++++----- .../Entrust_Root_Certification_Authority_-_G4.pem | 61 +++++++++---------- .../Entrust_net_Premium_2048_Secure_Server_CA.pem | 33 ++++++----- secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 61 +++++++++---------- secure/caroot/trusted/GLOBALTRUST_2020.pem | 64 ++++++++++---------- secure/caroot/trusted/GTS_Root_R1.pem | 61 +++++++++---------- secure/caroot/trusted/GTS_Root_R2.pem | 61 +++++++++---------- secure/caroot/trusted/GTS_Root_R3.pem | 13 +++-- secure/caroot/trusted/GTS_Root_R4.pem | 13 +++-- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 9 +-- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 13 +++-- secure/caroot/trusted/GlobalSign_Root_CA.pem | 33 ++++++----- secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 33 ++++++----- secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 64 ++++++++++---------- secure/caroot/trusted/GlobalSign_Root_E46.pem | 13 +++-- secure/caroot/trusted/GlobalSign_Root_R46.pem | 61 +++++++++---------- secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 34 +++++------ .../Go_Daddy_Root_Certificate_Authority_-_G2.pem | 33 ++++++----- .../caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 13 +++-- .../caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 61 +++++++++---------- ...c_and_Research_Institutions_ECC_RootCA_2015.pem | 13 +++-- ...demic_and_Research_Institutions_RootCA_2015.pem | 61 +++++++++---------- secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 61 +++++++++---------- secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 64 ++++++++++---------- secure/caroot/trusted/ISRG_Root_X1.pem | 61 +++++++++---------- secure/caroot/trusted/ISRG_Root_X2.pem | 13 +++-- .../trusted/IdenTrust_Commercial_Root_CA_1.pem | 61 +++++++++---------- .../trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 61 +++++++++---------- secure/caroot/trusted/Izenpe_com.pem | 61 +++++++++---------- .../trusted/Microsec_e-Szigno_Root_CA_2009.pem | 36 ++++++------ ...crosoft_ECC_Root_Certificate_Authority_2017.pem | 13 +++-- ...crosoft_RSA_Root_Certificate_Authority_2017.pem | 61 +++++++++---------- .../NAVER_Global_Root_Certification_Authority.pem | 61 +++++++++---------- ...etLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 33 ++++++----- .../trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 33 ++++++----- .../trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 13 +++-- secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 61 +++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 62 ++++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 61 +++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 63 ++++++++++---------- secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 61 +++++++++---------- ...SSL_com_EV_Root_Certification_Authority_ECC.pem | 16 ++--- ..._com_EV_Root_Certification_Authority_RSA_R2.pem | 64 ++++++++++---------- .../SSL_com_Root_Certification_Authority_ECC.pem | 16 ++--- .../SSL_com_Root_Certification_Authority_RSA.pem | 64 ++++++++++---------- .../trusted/SSL_com_TLS_ECC_Root_CA_2022.pem | 16 ++--- .../trusted/SSL_com_TLS_RSA_Root_CA_2022.pem | 64 ++++++++++---------- secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 33 ++++++----- ...ctigo_Public_Server_Authentication_Root_E46.pem | 13 +++-- ...ctigo_Public_Server_Authentication_Root_R46.pem | 61 +++++++++---------- secure/caroot/trusted/SecureSign_RootCA11.pem | 33 ++++++----- secure/caroot/trusted/SecureTrust_CA.pem | 35 ++++++----- secure/caroot/trusted/Secure_Global_CA.pem | 35 ++++++----- .../trusted/Security_Communication_ECC_RootCA1.pem | 13 +++-- .../trusted/Security_Communication_RootCA2.pem | 33 ++++++----- .../trusted/Security_Communication_RootCA3.pem | 61 +++++++++---------- .../trusted/Security_Communication_Root_CA.pem | 33 ++++++----- secure/caroot/trusted/Starfield_Class_2_CA.pem | 34 +++++------ .../Starfield_Root_Certificate_Authority_-_G2.pem | 33 ++++++----- ...ld_Services_Root_Certificate_Authority_-_G2.pem | 33 ++++++----- secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 65 ++++++++++----------- secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 65 ++++++++++----------- .../trusted/T-TeleSec_GlobalRoot_Class_2.pem | 33 ++++++----- .../trusted/T-TeleSec_GlobalRoot_Class_3.pem | 33 ++++++----- ...BITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 33 ++++++----- secure/caroot/trusted/TWCA_Global_Root_CA.pem | 61 +++++++++---------- .../trusted/TWCA_Root_Certification_Authority.pem | 33 ++++++----- secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 61 +++++++++---------- secure/caroot/trusted/Telia_Root_CA_v2.pem | 64 ++++++++++---------- .../Trustwave_Global_Certification_Authority.pem | 61 +++++++++---------- ...ave_Global_ECC_P256_Certification_Authority.pem | 9 +-- ...ave_Global_ECC_P384_Certification_Authority.pem | 13 +++-- secure/caroot/trusted/TunTrust_Root_CA.pem | 64 ++++++++++---------- .../trusted/UCA_Extended_Validation_Root.pem | 61 +++++++++---------- secure/caroot/trusted/UCA_Global_G2_Root.pem | 61 +++++++++---------- .../USERTrust_ECC_Certification_Authority.pem | 13 +++-- .../USERTrust_RSA_Certification_Authority.pem | 61 +++++++++---------- secure/caroot/trusted/XRamp_Global_CA_Root.pem | 35 ++++++----- secure/caroot/trusted/certSIGN_ROOT_CA.pem | 33 ++++++----- secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 61 +++++++++---------- secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 12 ++-- .../trusted/ePKI_Root_Certification_Authority.pem | 61 +++++++++---------- secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 13 +++-- secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 13 +++-- secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 33 ++++++----- secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 33 ++++++----- secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 13 +++-- secure/caroot/trusted/vTrus_Root_CA.pem | 61 +++++++++---------- secure/caroot/untrusted/AddTrust_External_Root.pem | 34 +++++------ .../untrusted/AddTrust_Low-Value_Services_Root.pem | 34 +++++------ .../Camerfirma_Chambers_of_Commerce_Root.pem | 36 ++++++------ .../Camerfirma_Global_Chambersign_Root.pem | 36 ++++++------ secure/caroot/untrusted/Certum_Root_CA.pem | 33 ++++++----- .../untrusted/Chambers_of_Commerce_Root_-_2008.pem | 65 ++++++++++----------- secure/caroot/untrusted/Cybertrust_Global_Root.pem | 38 ++++++------ secure/caroot/untrusted/D-TRUST_Root_CA_3_2013.pem | 36 ++++++------ secure/caroot/untrusted/DST_Root_CA_X3.pem | 33 ++++++----- .../untrusted/E-Tugra_Certification_Authority.pem | 64 ++++++++++---------- .../untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 16 ++--- .../untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 64 ++++++++++---------- secure/caroot/untrusted/EC-ACC.pem | 34 +++++------ .../untrusted/EE_Certification_Centre_Root_CA.pem | 33 ++++++----- secure/caroot/untrusted/GeoTrust_Global_CA.pem | 36 ++++++------ .../GeoTrust_Primary_Certification_Authority.pem | 33 ++++++----- ...oTrust_Primary_Certification_Authority_-_G2.pem | 13 +++-- ...oTrust_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- secure/caroot/untrusted/GeoTrust_Universal_CA.pem | 64 ++++++++++---------- .../caroot/untrusted/GeoTrust_Universal_CA_2.pem | 64 ++++++++++---------- .../caroot/untrusted/GlobalSign_Root_CA_-_R2.pem | 38 ++++++------ .../untrusted/Global_Chambersign_Root_-_2008.pem | 65 ++++++++++----------- ...demic_and_Research_Institutions_RootCA_2011.pem | 34 +++++------ .../caroot/untrusted/Hongkong_Post_Root_CA_1.pem | 33 ++++++----- secure/caroot/untrusted/LuxTrust_Global_Root_2.pem | 65 ++++++++++----------- .../Network_Solutions_Certificate_Authority.pem | 35 ++++++----- .../untrusted/OISTE_WISeKey_Global_Root_GA_CA.pem | 33 ++++++----- secure/caroot/untrusted/QuoVadis_Root_CA.pem | 36 ++++++------ secure/caroot/untrusted/Sonera_Class_2_Root_CA.pem | 33 ++++++----- .../untrusted/Staat_der_Nederlanden_EV_Root_CA.pem | 61 +++++++++---------- .../Staat_der_Nederlanden_Root_CA_-_G2.pem | 62 ++++++++++---------- .../Staat_der_Nederlanden_Root_CA_-_G3.pem | 61 +++++++++---------- .../untrusted/SwissSign_Platinum_CA_-_G2.pem | 65 ++++++++++----------- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +++-- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +++-- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++++++----- secure/caroot/untrusted/Taiwan_GRCA.pem | 61 +++++++++---------- secure/caroot/untrusted/TrustCor_ECA-1.pem | 36 ++++++------ secure/caroot/untrusted/TrustCor_RootCert_CA-1.pem | 36 ++++++------ secure/caroot/untrusted/TrustCor_RootCert_CA-2.pem | 64 ++++++++++---------- secure/caroot/untrusted/Trustis_FPS_Root_CA.pem | 36 ++++++------ ...Public_Primary_Certification_Authority_-_G4.pem | 13 +++-- ...Public_Primary_Certification_Authority_-_G5.pem | 33 ++++++----- ...Sign_Universal_Root_Certification_Authority.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++++++----- secure/caroot/untrusted/thawte_Primary_Root_CA.pem | 33 ++++++----- .../untrusted/thawte_Primary_Root_CA_-_G2.pem | 13 +++-- .../untrusted/thawte_Primary_Root_CA_-_G3.pem | 33 ++++++----- 191 files changed, 3872 insertions(+), 3791 deletions(-) diff --git a/secure/caroot/trusted/ACCVRAIZ1.pem b/secure/caroot/trusted/ACCVRAIZ1.pem index dbe720481fe4..9c48cb1f7155 100644 --- a/secure/caroot/trusted/ACCVRAIZ1.pem +++ b/secure/caroot/trusted/ACCVRAIZ1.pem @@ -23,7 +23,7 @@ Certificate: Subject: CN = ACCVRAIZ1, OU = PKIACCV, O = ACCV, C = ES Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:9b:a9:ab:bf:61:4a:97:af:2f:97:66:9a:74:5f: d0:d9:96:fd:cf:e2:e4:66:ef:1f:1f:47:33:c2:44: @@ -65,59 +65,55 @@ Certificate: Authority Information Access: CA Issuers - URI:http://www.accv.es/fileadmin/Archivos/certificados/raizaccv1.crt OCSP - URI:http://ocsp.accv.es - X509v3 Subject Key Identifier: D2:87:B4:E3:DF:37:27:93:55:F6:56:EA:81:E5:36:CC:8C:1E:3F:BD X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:D2:87:B4:E3:DF:37:27:93:55:F6:56:EA:81:E5:36:CC:8C:1E:3F:BD - + D2:87:B4:E3:DF:37:27:93:55:F6:56:EA:81:E5:36:CC:8C:1E:3F:BD X509v3 Certificate Policies: Policy: X509v3 Any Policy User Notice: Explicit Text: CPS: http://www.accv.es/legislacion_c.htm - X509v3 CRL Distribution Points: - Full Name: URI:http://www.accv.es/fileadmin/Archivos/certificados/raizaccv1_der.crl - X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 Subject Alternative Name: email:accv@accv.es Signature Algorithm: sha1WithRSAEncryption - 97:31:02:9f:e7:fd:43:67:48:44:14:e4:29:87:ed:4c:28:66: - d0:8f:35:da:4d:61:b7:4a:97:4d:b5:db:90:e0:05:2e:0e:c6: - 79:d0:f2:97:69:0f:bd:04:47:d9:be:db:b5:29:da:9b:d9:ae: - a9:99:d5:d3:3c:30:93:f5:8d:a1:a8:fc:06:8d:44:f4:ca:16: - 95:7c:33:dc:62:8b:a8:37:f8:27:d8:09:2d:1b:ef:c8:14:27: - 20:a9:64:44:ff:2e:d6:75:aa:6c:4d:60:40:19:49:43:54:63: - da:e2:cc:ba:66:e5:4f:44:7a:5b:d9:6a:81:2b:40:d5:7f:f9: - 01:27:58:2c:c8:ed:48:91:7c:3f:a6:00:cf:c4:29:73:11:36: - de:86:19:3e:9d:ee:19:8a:1b:d5:b0:ed:8e:3d:9c:2a:c0:0d: - d8:3d:66:e3:3c:0d:bd:d5:94:5c:e2:e2:a7:35:1b:04:00:f6: - 3f:5a:8d:ea:43:bd:5f:89:1d:a9:c1:b0:cc:99:e2:4d:00:0a: - da:c9:27:5b:e7:13:90:5c:e4:f5:33:a2:55:6d:dc:e0:09:4d: - 2f:b1:26:5b:27:75:00:09:c4:62:77:29:08:5f:9e:59:ac:b6: - 7e:ad:9f:54:30:22:03:c1:1e:71:64:fe:f9:38:0a:96:18:dd: - 02:14:ac:23:cb:06:1c:1e:a4:7d:8d:0d:de:27:41:e8:ad:da: - 15:b7:b0:23:dd:2b:a8:d3:da:25:87:ed:e8:55:44:4d:88:f4: - 36:7e:84:9a:78:ac:f7:0e:56:49:0e:d6:33:25:d6:84:50:42: - 6c:20:12:1d:2a:d5:be:bc:f2:70:81:a4:70:60:be:05:b5:9b: - 9e:04:44:be:61:23:ac:e9:a5:24:8c:11:80:94:5a:a2:a2:b9: - 49:d2:c1:dc:d1:a7:ed:31:11:2c:9e:19:a6:ee:e1:55:e1:c0: - ea:cf:0d:84:e4:17:b7:a2:7c:a5:de:55:25:06:ee:cc:c0:87: - 5c:40:da:cc:95:3f:55:e0:35:c7:b8:84:be:b4:5d:cd:7a:83: - 01:72:ee:87:e6:5f:1d:ae:b5:85:c6:26:df:e6:c1:9a:e9:1e: - 02:47:9f:2a:a8:6d:a9:5b:cf:ec:45:77:7f:98:27:9a:32:5d: - 2a:e3:84:ee:c5:98:66:2f:96:20:1d:dd:d8:c3:27:d7:b0:f9: - fe:d9:7d:cd:d0:9f:8f:0b:14:58:51:9f:2f:8b:c3:38:2d:de: - e8:8f:d6:8d:87:a4:f5:56:43:16:99:2c:f4:a4:56:b4:34:b8: - 61:37:c9:c2:58:80:1b:a0:97:a1:fc:59:8d:e9:11:f6:d1:0f: - 4b:55:34:46:2a:8b:86:3b + Signature Value: + 97:31:02:9f:e7:fd:43:67:48:44:14:e4:29:87:ed:4c:28:66: + d0:8f:35:da:4d:61:b7:4a:97:4d:b5:db:90:e0:05:2e:0e:c6: + 79:d0:f2:97:69:0f:bd:04:47:d9:be:db:b5:29:da:9b:d9:ae: + a9:99:d5:d3:3c:30:93:f5:8d:a1:a8:fc:06:8d:44:f4:ca:16: + 95:7c:33:dc:62:8b:a8:37:f8:27:d8:09:2d:1b:ef:c8:14:27: + 20:a9:64:44:ff:2e:d6:75:aa:6c:4d:60:40:19:49:43:54:63: + da:e2:cc:ba:66:e5:4f:44:7a:5b:d9:6a:81:2b:40:d5:7f:f9: + 01:27:58:2c:c8:ed:48:91:7c:3f:a6:00:cf:c4:29:73:11:36: + de:86:19:3e:9d:ee:19:8a:1b:d5:b0:ed:8e:3d:9c:2a:c0:0d: + d8:3d:66:e3:3c:0d:bd:d5:94:5c:e2:e2:a7:35:1b:04:00:f6: + 3f:5a:8d:ea:43:bd:5f:89:1d:a9:c1:b0:cc:99:e2:4d:00:0a: + da:c9:27:5b:e7:13:90:5c:e4:f5:33:a2:55:6d:dc:e0:09:4d: + 2f:b1:26:5b:27:75:00:09:c4:62:77:29:08:5f:9e:59:ac:b6: + 7e:ad:9f:54:30:22:03:c1:1e:71:64:fe:f9:38:0a:96:18:dd: + 02:14:ac:23:cb:06:1c:1e:a4:7d:8d:0d:de:27:41:e8:ad:da: + 15:b7:b0:23:dd:2b:a8:d3:da:25:87:ed:e8:55:44:4d:88:f4: + 36:7e:84:9a:78:ac:f7:0e:56:49:0e:d6:33:25:d6:84:50:42: + 6c:20:12:1d:2a:d5:be:bc:f2:70:81:a4:70:60:be:05:b5:9b: + 9e:04:44:be:61:23:ac:e9:a5:24:8c:11:80:94:5a:a2:a2:b9: + 49:d2:c1:dc:d1:a7:ed:31:11:2c:9e:19:a6:ee:e1:55:e1:c0: + ea:cf:0d:84:e4:17:b7:a2:7c:a5:de:55:25:06:ee:cc:c0:87: + 5c:40:da:cc:95:3f:55:e0:35:c7:b8:84:be:b4:5d:cd:7a:83: + 01:72:ee:87:e6:5f:1d:ae:b5:85:c6:26:df:e6:c1:9a:e9:1e: + 02:47:9f:2a:a8:6d:a9:5b:cf:ec:45:77:7f:98:27:9a:32:5d: + 2a:e3:84:ee:c5:98:66:2f:96:20:1d:dd:d8:c3:27:d7:b0:f9: + fe:d9:7d:cd:d0:9f:8f:0b:14:58:51:9f:2f:8b:c3:38:2d:de: + e8:8f:d6:8d:87:a4:f5:56:43:16:99:2c:f4:a4:56:b4:34:b8: + 61:37:c9:c2:58:80:1b:a0:97:a1:fc:59:8d:e9:11:f6:d1:0f: + 4b:55:34:46:2a:8b:86:3b SHA1 Fingerprint=93:05:7A:88:15:C6:4F:CE:88:2F:FA:91:16:52:28:78:BC:53:64:17 -----BEGIN CERTIFICATE----- MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UE diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem index 22f5764a5d3f..b526b6694741 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = ES, O = FNMT-RCM, OU = AC RAIZ FNMT-RCM Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:ba:71:80:7a:4c:86:6e:7f:c8:13:6d:c0:c6:7d: 1c:00:97:8f:2c:0c:23:bb:10:9a:40:a9:1a:b7:87: @@ -72,37 +72,37 @@ Certificate: X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://www.cert.fnmt.es/dpcs/ - Signature Algorithm: sha256WithRSAEncryption - 07:90:4a:df:f3:23:4e:f0:c3:9c:51:65:9b:9c:22:a2:8a:0c: - 85:f3:73:29:6b:4d:fe:01:e2:a9:0c:63:01:bf:04:67:a5:9d: - 98:5f:fd:01:13:fa:ec:9a:62:e9:86:fe:b6:62:d2:6e:4c:94: - fb:c0:75:45:7c:65:0c:f8:b2:37:cf:ac:0f:cf:8d:6f:f9:19: - f7:8f:ec:1e:f2:70:9e:f0:ca:b8:ef:b7:ff:76:37:76:5b:f6: - 6e:88:f3:af:62:32:22:93:0d:3a:6a:8e:14:66:0c:2d:53:74: - 57:65:1e:d5:b2:dd:23:81:3b:a5:66:23:27:67:09:8f:e1:77: - aa:43:cd:65:51:08:ed:51:58:fe:e6:39:f9:cb:47:84:a4:15: - f1:76:bb:a4:ee:a4:3b:c4:5f:ef:b2:33:96:11:18:b7:c9:65: - be:18:e1:a3:a4:dc:fa:18:f9:d3:bc:13:9b:39:7a:34:ba:d3: - 41:fb:fa:32:8a:2a:b7:2b:86:0b:69:83:38:be:cd:8a:2e:0b: - 70:ad:8d:26:92:ee:1e:f5:01:2b:0a:d9:d6:97:9b:6e:e0:a8: - 19:1c:3a:21:8b:0c:1e:40:ad:03:e7:dd:66:7e:f5:b9:20:0d: - 03:e8:96:f9:82:45:d4:39:e0:a0:00:5d:d7:98:e6:7d:9e:67: - 73:c3:9a:2a:f7:ab:8b:a1:3a:14:ef:34:bc:52:0e:89:98:9a: - 04:40:84:1d:7e:45:69:93:57:ce:eb:ce:f8:50:7c:4f:1c:6e: - 04:43:9b:f9:d6:3b:23:18:e9:ea:8e:d1:4d:46:8d:f1:3b:e4: - 6a:ca:ba:fb:23:b7:9b:fa:99:01:29:5a:58:5a:2d:e3:f9:d4: - 6d:0e:26:ad:c1:6e:34:bc:32:f8:0c:05:fa:65:a3:db:3b:37: - 83:22:e9:d6:dc:72:33:fd:5d:f2:20:bd:76:3c:23:da:28:f7: - f9:1b:eb:59:64:d5:dc:5f:72:7e:20:fc:cd:89:b5:90:67:4d: - 62:7a:3f:4e:ad:1d:c3:39:fe:7a:f4:28:16:df:41:f6:48:80: - 05:d7:0f:51:79:ac:10:ab:d4:ec:03:66:e6:6a:b0:ba:31:92: - 42:40:6a:be:3a:d3:72:e1:6a:37:55:bc:ac:1d:95:b7:69:61: - f2:43:91:74:e6:a0:d3:0a:24:46:a1:08:af:d6:da:45:19:96: - d4:53:1d:5b:84:79:f0:c0:f7:47:ef:8b:8f:c5:06:ae:9d:4c: - 62:9d:ff:46:04:f8:d3:c9:b6:10:25:40:75:fe:16:aa:c9:4a: - 60:86:2f:ba:ef:30:77:e4:54:e2:b8:84:99:58:80:aa:13:8b: - 51:3a:4f:48:f6:8b:b6:b3 + Signature Value: + 07:90:4a:df:f3:23:4e:f0:c3:9c:51:65:9b:9c:22:a2:8a:0c: + 85:f3:73:29:6b:4d:fe:01:e2:a9:0c:63:01:bf:04:67:a5:9d: + 98:5f:fd:01:13:fa:ec:9a:62:e9:86:fe:b6:62:d2:6e:4c:94: + fb:c0:75:45:7c:65:0c:f8:b2:37:cf:ac:0f:cf:8d:6f:f9:19: + f7:8f:ec:1e:f2:70:9e:f0:ca:b8:ef:b7:ff:76:37:76:5b:f6: + 6e:88:f3:af:62:32:22:93:0d:3a:6a:8e:14:66:0c:2d:53:74: + 57:65:1e:d5:b2:dd:23:81:3b:a5:66:23:27:67:09:8f:e1:77: + aa:43:cd:65:51:08:ed:51:58:fe:e6:39:f9:cb:47:84:a4:15: + f1:76:bb:a4:ee:a4:3b:c4:5f:ef:b2:33:96:11:18:b7:c9:65: + be:18:e1:a3:a4:dc:fa:18:f9:d3:bc:13:9b:39:7a:34:ba:d3: + 41:fb:fa:32:8a:2a:b7:2b:86:0b:69:83:38:be:cd:8a:2e:0b: + 70:ad:8d:26:92:ee:1e:f5:01:2b:0a:d9:d6:97:9b:6e:e0:a8: + 19:1c:3a:21:8b:0c:1e:40:ad:03:e7:dd:66:7e:f5:b9:20:0d: + 03:e8:96:f9:82:45:d4:39:e0:a0:00:5d:d7:98:e6:7d:9e:67: + 73:c3:9a:2a:f7:ab:8b:a1:3a:14:ef:34:bc:52:0e:89:98:9a: + 04:40:84:1d:7e:45:69:93:57:ce:eb:ce:f8:50:7c:4f:1c:6e: + 04:43:9b:f9:d6:3b:23:18:e9:ea:8e:d1:4d:46:8d:f1:3b:e4: + 6a:ca:ba:fb:23:b7:9b:fa:99:01:29:5a:58:5a:2d:e3:f9:d4: + 6d:0e:26:ad:c1:6e:34:bc:32:f8:0c:05:fa:65:a3:db:3b:37: + 83:22:e9:d6:dc:72:33:fd:5d:f2:20:bd:76:3c:23:da:28:f7: + f9:1b:eb:59:64:d5:dc:5f:72:7e:20:fc:cd:89:b5:90:67:4d: + 62:7a:3f:4e:ad:1d:c3:39:fe:7a:f4:28:16:df:41:f6:48:80: + 05:d7:0f:51:79:ac:10:ab:d4:ec:03:66:e6:6a:b0:ba:31:92: + 42:40:6a:be:3a:d3:72:e1:6a:37:55:bc:ac:1d:95:b7:69:61: + f2:43:91:74:e6:a0:d3:0a:24:46:a1:08:af:d6:da:45:19:96: + d4:53:1d:5b:84:79:f0:c0:f7:47:ef:8b:8f:c5:06:ae:9d:4c: + 62:9d:ff:46:04:f8:d3:c9:b6:10:25:40:75:fe:16:aa:c9:4a: + 60:86:2f:ba:ef:30:77:e4:54:e2:b8:84:99:58:80:aa:13:8b: + 51:3a:4f:48:f6:8b:b6:b3 SHA1 Fingerprint=EC:50:35:07:B2:15:C4:95:62:19:E2:A8:9A:5B:42:99:2C:4C:2C:20 -----BEGIN CERTIFICATE----- MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsx diff --git a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem index bbd47304c5c9..c90964ddb4d3 100644 --- a/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem +++ b/secure/caroot/trusted/AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem @@ -43,12 +43,13 @@ Certificate: X509v3 Subject Key Identifier: 01:B9:2F:EF:BF:11:86:60:F2:4F:D0:41:6E:AB:73:1F:E7:D2:6E:49 Signature Algorithm: ecdsa-with-SHA384 - 30:66:02:31:00:ae:4a:e3:2b:40:c3:74:11:f2:95:ad:16:23: - de:4e:0c:1a:e6:5d:a5:24:5e:6b:44:7b:fc:38:e2:4f:cb:9c: - 45:17:11:4c:14:27:26:55:39:75:4a:03:cc:13:90:9f:92:02: - 31:00:fa:4a:6c:60:88:73:f3:ee:b8:98:62:a9:ce:2b:c2:d9: - 8a:a6:70:31:1d:af:b0:94:4c:eb:4f:c6:e3:d1:f3:62:a7:3c: - ff:93:2e:07:5c:49:01:67:69:12:02:72:bf:e7 + Signature Value: + 30:66:02:31:00:ae:4a:e3:2b:40:c3:74:11:f2:95:ad:16:23: + de:4e:0c:1a:e6:5d:a5:24:5e:6b:44:7b:fc:38:e2:4f:cb:9c: + 45:17:11:4c:14:27:26:55:39:75:4a:03:cc:13:90:9f:92:02: + 31:00:fa:4a:6c:60:88:73:f3:ee:b8:98:62:a9:ce:2b:c2:d9: + 8a:a6:70:31:1d:af:b0:94:4c:eb:4f:c6:e3:d1:f3:62:a7:3c: + ff:93:2e:07:5c:49:01:67:69:12:02:72:bf:e7 SHA1 Fingerprint=62:FF:D9:9E:C0:65:0D:03:CE:75:93:D2:ED:3F:2D:32:C9:E3:E5:4A -----BEGIN CERTIFICATE----- MIICbjCCAfOgAwIBAgIQYvYybOXE42hcG2LdnC6dlTAKBggqhkjOPQQDAzB4MQsw diff --git a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem index 4369ffbf1b30..158d806bffc3 100644 --- a/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem +++ b/secure/caroot/trusted/ANF_Secure_Server_Root_CA.pem @@ -23,7 +23,7 @@ Certificate: Subject: serialNumber = G63287510, C = ES, O = ANF Autoridad de Certificacion, OU = ANF CA Raiz, CN = ANF Secure Server Root CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:db:eb:6b:2b:e6:64:54:95:82:90:a3:72:a4:19: 01:9d:9c:0b:81:5f:73:49:ba:a7:ac:f3:04:4e:7b: @@ -63,8 +63,7 @@ Certificate: Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Authority Key Identifier: - keyid:9C:5F:D0:6C:63:A3:5F:93:CA:93:98:08:AD:8C:87:A5:2C:5C:C1:37 - + 9C:5F:D0:6C:63:A3:5F:93:CA:93:98:08:AD:8C:87:A5:2C:5C:C1:37 X509v3 Subject Key Identifier: 9C:5F:D0:6C:63:A3:5F:93:CA:93:98:08:AD:8C:87:A5:2C:5C:C1:37 X509v3 Key Usage: critical @@ -72,35 +71,36 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE Signature Algorithm: sha256WithRSAEncryption - 4e:1e:b9:8a:c6:a0:98:3f:6e:c3:69:c0:6a:5c:49:52:ac:cb: - 2b:5d:78:38:c1:d5:54:84:9f:93:f0:87:19:3d:2c:66:89:eb: - 0d:42:fc:cc:f0:75:85:3f:8b:f4:80:5d:79:e5:17:67:bd:35: - 82:e2:f2:3c:8e:7d:5b:36:cb:5a:80:00:29:f2:ce:2b:2c:f1: - 8f:aa:6d:05:93:6c:72:c7:56:eb:df:50:23:28:e5:45:10:3d: - e8:67:a3:af:0e:55:0f:90:09:62:ef:4b:59:a2:f6:53:f1:c0: - 35:e4:2f:c1:24:bd:79:2f:4e:20:22:3b:fd:1a:20:b0:a4:0e: - 2c:70:ed:74:3f:b8:13:95:06:51:c8:e8:87:26:ca:a4:5b:6a: - 16:21:92:dd:73:60:9e:10:18:de:3c:81:ea:e8:18:c3:7c:89: - f2:8b:50:3e:bd:11:e2:15:03:a8:36:7d:33:01:6c:48:15:d7: - 88:90:99:04:c5:cc:e6:07:f4:bc:f4:90:ed:13:e2:ea:8b:c3: - 8f:a3:33:0f:c1:29:4c:13:4e:da:15:56:71:73:72:82:50:f6: - 9a:33:7c:a2:b1:a8:1a:34:74:65:5c:ce:d1:eb:ab:53:e0:1a: - 80:d8:ea:3a:49:e4:26:30:9b:e5:1c:8a:a8:a9:15:32:86:99: - 92:0a:10:23:56:12:e0:f6:ce:4c:e2:bb:be:db:8d:92:73:01: - 66:2f:62:3e:b2:72:27:45:36:ed:4d:56:e3:97:99:ff:3a:35: - 3e:a5:54:4a:52:59:4b:60:db:ee:fe:78:11:7f:4a:dc:14:79: - 60:b6:6b:64:03:db:15:83:e1:a2:be:f6:23:97:50:f0:09:33: - 36:a7:71:96:25:f3:b9:42:7d:db:38:3f:2c:58:ac:e8:42:e1: - 0e:d8:d3:3b:4c:2e:82:e9:83:2e:6b:31:d9:dd:47:86:4f:6d: - 97:91:2e:4f:e2:28:71:35:16:d1:f2:73:fe:25:2b:07:47:24: - 63:27:c8:f8:f6:d9:6b:fc:12:31:56:08:c0:53:42:af:9c:d0: - 33:7e:fc:06:f0:31:44:03:14:f1:58:ea:f2:6a:0d:a9:11:b2: - 83:be:c5:1a:bf:07:ea:59:dc:a3:88:35:ef:9c:76:32:3c:4d: - 06:22:ce:15:e5:dd:9e:d8:8f:da:de:d2:c4:39:e5:17:81:cf: - 38:47:eb:7f:88:6d:59:1b:df:9f:42:14:ae:7e:cf:a8:b0:66: - 65:da:37:af:9f:aa:3d:ea:28:b6:de:d5:31:58:16:82:5b:ea: - bb:19:75:02:73:1a:ca:48:1a:21:93:90:0a:8e:93:84:a7:7d: - 3b:23:18:92:89:a0:8d:ac + Signature Value: + 4e:1e:b9:8a:c6:a0:98:3f:6e:c3:69:c0:6a:5c:49:52:ac:cb: + 2b:5d:78:38:c1:d5:54:84:9f:93:f0:87:19:3d:2c:66:89:eb: + 0d:42:fc:cc:f0:75:85:3f:8b:f4:80:5d:79:e5:17:67:bd:35: + 82:e2:f2:3c:8e:7d:5b:36:cb:5a:80:00:29:f2:ce:2b:2c:f1: + 8f:aa:6d:05:93:6c:72:c7:56:eb:df:50:23:28:e5:45:10:3d: + e8:67:a3:af:0e:55:0f:90:09:62:ef:4b:59:a2:f6:53:f1:c0: + 35:e4:2f:c1:24:bd:79:2f:4e:20:22:3b:fd:1a:20:b0:a4:0e: + 2c:70:ed:74:3f:b8:13:95:06:51:c8:e8:87:26:ca:a4:5b:6a: + 16:21:92:dd:73:60:9e:10:18:de:3c:81:ea:e8:18:c3:7c:89: + f2:8b:50:3e:bd:11:e2:15:03:a8:36:7d:33:01:6c:48:15:d7: + 88:90:99:04:c5:cc:e6:07:f4:bc:f4:90:ed:13:e2:ea:8b:c3: + 8f:a3:33:0f:c1:29:4c:13:4e:da:15:56:71:73:72:82:50:f6: + 9a:33:7c:a2:b1:a8:1a:34:74:65:5c:ce:d1:eb:ab:53:e0:1a: + 80:d8:ea:3a:49:e4:26:30:9b:e5:1c:8a:a8:a9:15:32:86:99: + 92:0a:10:23:56:12:e0:f6:ce:4c:e2:bb:be:db:8d:92:73:01: + 66:2f:62:3e:b2:72:27:45:36:ed:4d:56:e3:97:99:ff:3a:35: + 3e:a5:54:4a:52:59:4b:60:db:ee:fe:78:11:7f:4a:dc:14:79: + 60:b6:6b:64:03:db:15:83:e1:a2:be:f6:23:97:50:f0:09:33: + 36:a7:71:96:25:f3:b9:42:7d:db:38:3f:2c:58:ac:e8:42:e1: + 0e:d8:d3:3b:4c:2e:82:e9:83:2e:6b:31:d9:dd:47:86:4f:6d: + 97:91:2e:4f:e2:28:71:35:16:d1:f2:73:fe:25:2b:07:47:24: + 63:27:c8:f8:f6:d9:6b:fc:12:31:56:08:c0:53:42:af:9c:d0: + 33:7e:fc:06:f0:31:44:03:14:f1:58:ea:f2:6a:0d:a9:11:b2: + 83:be:c5:1a:bf:07:ea:59:dc:a3:88:35:ef:9c:76:32:3c:4d: + 06:22:ce:15:e5:dd:9e:d8:8f:da:de:d2:c4:39:e5:17:81:cf: + 38:47:eb:7f:88:6d:59:1b:df:9f:42:14:ae:7e:cf:a8:b0:66: + 65:da:37:af:9f:aa:3d:ea:28:b6:de:d5:31:58:16:82:5b:ea: + bb:19:75:02:73:1a:ca:48:1a:21:93:90:0a:8e:93:84:a7:7d: + 3b:23:18:92:89:a0:8d:ac SHA1 Fingerprint=5B:6E:68:D0:CC:15:B6:A0:5F:1E:C1:5F:AE:02:FC:6B:2F:5D:6F:74 -----BEGIN CERTIFICATE----- MIIF7zCCA9egAwIBAgIIDdPjvGz5a7EwDQYJKoZIhvcNAQELBQAwgYQxEjAQBgNV diff --git a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem index 8ea77deeda58..b71e3f700c29 100644 --- a/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem +++ b/secure/caroot/trusted/Actalis_Authentication_Root_CA.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = IT, L = Milan, O = Actalis S.p.A./03358520967, CN = Actalis Authentication Root CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:a7:c6:c4:a5:29:a4:2c:ef:e5:18:c5:b0:50:a3: 6f:51:3b:9f:0a:5a:c9:c2:48:38:0a:c2:1c:a0:18: @@ -67,40 +67,40 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:52:D8:88:3A:C8:9F:78:66:ED:89:F3:7B:38:70:94:C9:02:02:36:D0 - + 52:D8:88:3A:C8:9F:78:66:ED:89:F3:7B:38:70:94:C9:02:02:36:D0 X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 0b:7b:72:87:c0:60:a6:49:4c:88:58:e6:1d:88:f7:14:64:48: - a6:d8:58:0a:0e:4f:13:35:df:35:1d:d4:ed:06:31:c8:81:3e: - 6a:d5:dd:3b:1a:32:ee:90:3d:11:d2:2e:f4:8e:c3:63:2e:23: - 66:b0:67:be:6f:b6:c0:13:39:60:aa:a2:34:25:93:75:52:de: - a7:9d:ad:0e:87:89:52:71:6a:16:3c:19:1d:83:f8:9a:29:65: - be:f4:3f:9a:d9:f0:f3:5a:87:21:71:80:4d:cb:e0:38:9b:3f: - bb:fa:e0:30:4d:cf:86:d3:65:10:19:18:d1:97:02:b1:2b:72: - 42:68:ac:a0:bd:4e:5a:da:18:bf:6b:98:81:d0:fd:9a:be:5e: - 15:48:cd:11:15:b9:c0:29:5c:b4:e8:88:f7:3e:36:ae:b7:62: - fd:1e:62:de:70:78:10:1c:48:5b:da:bc:a4:38:ba:67:ed:55: - 3e:5e:57:df:d4:03:40:4c:81:a4:d2:4f:63:a7:09:42:09:14: - fc:00:a9:c2:80:73:4f:2e:c0:40:d9:11:7b:48:ea:7a:02:c0: - d3:eb:28:01:26:58:74:c1:c0:73:22:6d:93:95:fd:39:7d:bb: - 2a:e3:f6:82:e3:2c:97:5f:4e:1f:91:94:fa:fe:2c:a3:d8:76: - 1a:b8:4d:b2:38:4f:9b:fa:1d:48:60:79:26:e2:f3:fd:a9:d0: - 9a:e8:70:8f:49:7a:d6:e5:bd:0a:0e:db:2d:f3:8d:bf:eb:e3: - a4:7d:cb:c7:95:71:e8:da:a3:7c:c5:c2:f8:74:92:04:1b:86: - ac:a4:22:53:40:b6:ac:fe:4c:76:cf:fb:94:32:c0:35:9f:76: - 3f:6e:e5:90:6e:a0:a6:26:a2:b8:2c:be:d1:2b:85:fd:a7:68: - c8:ba:01:2b:b1:6c:74:1d:b8:73:95:e7:ee:b7:c7:25:f0:00: - 4c:00:b2:7e:b6:0b:8b:1c:f3:c0:50:9e:25:b9:e0:08:de:36: - 66:ff:37:a5:d1:bb:54:64:2c:c9:27:b5:4b:92:7e:65:ff:d3: - 2d:e1:b9:4e:bc:7f:a4:41:21:90:41:77:a6:39:1f:ea:9e:e3: - 9f:d0:66:6f:05:ec:aa:76:7e:bf:6b:16:a0:eb:b5:c7:fc:92: - 54:2f:2b:11:27:25:37:78:4c:51:6a:b0:f3:cc:58:5d:14:f1: - 6a:48:15:ff:c2:07:b6:b1:8d:0f:8e:5c:50:46:b3:3d:bf:01: - 98:4f:b2:59:54:47:3e:34:7b:78:6d:56:93:2e:73:ea:66:28: - 78:cd:1d:14:bf:a0:8f:2f:2e:b8:2e:8e:f2:14:8a:cc:e9:b5: - 7c:fb:6c:9d:0c:a5:e1:96 + Signature Value: + 0b:7b:72:87:c0:60:a6:49:4c:88:58:e6:1d:88:f7:14:64:48: + a6:d8:58:0a:0e:4f:13:35:df:35:1d:d4:ed:06:31:c8:81:3e: + 6a:d5:dd:3b:1a:32:ee:90:3d:11:d2:2e:f4:8e:c3:63:2e:23: + 66:b0:67:be:6f:b6:c0:13:39:60:aa:a2:34:25:93:75:52:de: + a7:9d:ad:0e:87:89:52:71:6a:16:3c:19:1d:83:f8:9a:29:65: + be:f4:3f:9a:d9:f0:f3:5a:87:21:71:80:4d:cb:e0:38:9b:3f: + bb:fa:e0:30:4d:cf:86:d3:65:10:19:18:d1:97:02:b1:2b:72: + 42:68:ac:a0:bd:4e:5a:da:18:bf:6b:98:81:d0:fd:9a:be:5e: + 15:48:cd:11:15:b9:c0:29:5c:b4:e8:88:f7:3e:36:ae:b7:62: + fd:1e:62:de:70:78:10:1c:48:5b:da:bc:a4:38:ba:67:ed:55: + 3e:5e:57:df:d4:03:40:4c:81:a4:d2:4f:63:a7:09:42:09:14: + fc:00:a9:c2:80:73:4f:2e:c0:40:d9:11:7b:48:ea:7a:02:c0: + d3:eb:28:01:26:58:74:c1:c0:73:22:6d:93:95:fd:39:7d:bb: + 2a:e3:f6:82:e3:2c:97:5f:4e:1f:91:94:fa:fe:2c:a3:d8:76: + 1a:b8:4d:b2:38:4f:9b:fa:1d:48:60:79:26:e2:f3:fd:a9:d0: + 9a:e8:70:8f:49:7a:d6:e5:bd:0a:0e:db:2d:f3:8d:bf:eb:e3: + a4:7d:cb:c7:95:71:e8:da:a3:7c:c5:c2:f8:74:92:04:1b:86: + ac:a4:22:53:40:b6:ac:fe:4c:76:cf:fb:94:32:c0:35:9f:76: + 3f:6e:e5:90:6e:a0:a6:26:a2:b8:2c:be:d1:2b:85:fd:a7:68: + c8:ba:01:2b:b1:6c:74:1d:b8:73:95:e7:ee:b7:c7:25:f0:00: + 4c:00:b2:7e:b6:0b:8b:1c:f3:c0:50:9e:25:b9:e0:08:de:36: + 66:ff:37:a5:d1:bb:54:64:2c:c9:27:b5:4b:92:7e:65:ff:d3: + 2d:e1:b9:4e:bc:7f:a4:41:21:90:41:77:a6:39:1f:ea:9e:e3: + 9f:d0:66:6f:05:ec:aa:76:7e:bf:6b:16:a0:eb:b5:c7:fc:92: + 54:2f:2b:11:27:25:37:78:4c:51:6a:b0:f3:cc:58:5d:14:f1: + 6a:48:15:ff:c2:07:b6:b1:8d:0f:8e:5c:50:46:b3:3d:bf:01: + 98:4f:b2:59:54:47:3e:34:7b:78:6d:56:93:2e:73:ea:66:28: + 78:cd:1d:14:bf:a0:8f:2f:2e:b8:2e:8e:f2:14:8a:cc:e9:b5: + 7c:fb:6c:9d:0c:a5:e1:96 SHA1 Fingerprint=F3:73:B3:87:06:5A:28:84:8A:F2:F3:4A:CE:19:2B:DD:C7:8E:9C:AC -----BEGIN CERTIFICATE----- MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem index b1031ad0f348..b59fd17d8d7b 100644 --- a/secure/caroot/trusted/AffirmTrust_Commercial.pem +++ b/secure/caroot/trusted/AffirmTrust_Commercial.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = US, O = AffirmTrust, CN = AffirmTrust Commercial Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:f6:1b:4f:67:07:2b:a1:15:f5:06:22:cb:1f:01: b2:e3:73:45:06:44:49:2c:bb:49:25:14:d6:ce:c3: @@ -52,21 +52,22 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha256WithRSAEncryption - 58:ac:f4:04:0e:cd:c0:0d:ff:0a:fd:d4:ba:16:5f:29:bd:7b: - 68:99:58:49:d2:b4:1d:37:4d:7f:27:7d:46:06:5d:43:c6:86: - 2e:3e:73:b2:26:7d:4f:93:a9:b6:c4:2a:9a:ab:21:97:14:b1: - de:8c:d3:ab:89:15:d8:6b:24:d4:f1:16:ae:d8:a4:5c:d4:7f: - 51:8e:ed:18:01:b1:93:63:bd:bc:f8:61:80:9a:9e:b1:ce:42: - 70:e2:a9:7d:06:25:7d:27:a1:fe:6f:ec:b3:1e:24:da:e3:4b: - 55:1a:00:3b:35:b4:3b:d9:d7:5d:30:fd:81:13:89:f2:c2:06: - 2b:ed:67:c4:8e:c9:43:b2:5c:6b:15:89:02:bc:62:fc:4e:f2: - b5:33:aa:b2:6f:d3:0a:a2:50:e3:f6:3b:e8:2e:44:c2:db:66: - 38:a9:33:56:48:f1:6d:1b:33:8d:0d:8c:3f:60:37:9d:d3:ca: - 6d:7e:34:7e:0d:9f:72:76:8b:1b:9f:72:fd:52:35:41:45:02: - 96:2f:1c:b2:9a:73:49:21:b1:49:47:45:47:b4:ef:6a:34:11: - c9:4d:9a:cc:59:b7:d6:02:9e:5a:4e:65:b5:94:ae:1b:df:29: - b0:16:f1:bf:00:9e:07:3a:17:64:b5:04:b5:23:21:99:0a:95: - 3b:97:7c:ef + Signature Value: + 58:ac:f4:04:0e:cd:c0:0d:ff:0a:fd:d4:ba:16:5f:29:bd:7b: + 68:99:58:49:d2:b4:1d:37:4d:7f:27:7d:46:06:5d:43:c6:86: + 2e:3e:73:b2:26:7d:4f:93:a9:b6:c4:2a:9a:ab:21:97:14:b1: + de:8c:d3:ab:89:15:d8:6b:24:d4:f1:16:ae:d8:a4:5c:d4:7f: + 51:8e:ed:18:01:b1:93:63:bd:bc:f8:61:80:9a:9e:b1:ce:42: + 70:e2:a9:7d:06:25:7d:27:a1:fe:6f:ec:b3:1e:24:da:e3:4b: + 55:1a:00:3b:35:b4:3b:d9:d7:5d:30:fd:81:13:89:f2:c2:06: + 2b:ed:67:c4:8e:c9:43:b2:5c:6b:15:89:02:bc:62:fc:4e:f2: + b5:33:aa:b2:6f:d3:0a:a2:50:e3:f6:3b:e8:2e:44:c2:db:66: + 38:a9:33:56:48:f1:6d:1b:33:8d:0d:8c:3f:60:37:9d:d3:ca: + 6d:7e:34:7e:0d:9f:72:76:8b:1b:9f:72:fd:52:35:41:45:02: + 96:2f:1c:b2:9a:73:49:21:b1:49:47:45:47:b4:ef:6a:34:11: + c9:4d:9a:cc:59:b7:d6:02:9e:5a:4e:65:b5:94:ae:1b:df:29: + b0:16:f1:bf:00:9e:07:3a:17:64:b5:04:b5:23:21:99:0a:95: + 3b:97:7c:ef SHA1 Fingerprint=F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7 -----BEGIN CERTIFICATE----- MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem index 1d6a82f767f7..33f7a4bebcb6 100644 --- a/secure/caroot/trusted/AffirmTrust_Networking.pem +++ b/secure/caroot/trusted/AffirmTrust_Networking.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = US, O = AffirmTrust, CN = AffirmTrust Networking Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b4:84:cc:33:17:2e:6b:94:6c:6b:61:52:a0:eb: a3:cf:79:94:4c:e5:94:80:99:cb:55:64:44:65:8f: @@ -52,21 +52,22 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha1WithRSAEncryption - 89:57:b2:16:7a:a8:c2:fd:d6:d9:9b:9b:34:c2:9c:b4:32:14: - 4d:a7:a4:df:ec:be:a7:be:f8:43:db:91:37:ce:b4:32:2e:50: - 55:1a:35:4e:76:43:71:20:ef:93:77:4e:15:70:2e:87:c3:c1: - 1d:6d:dc:cb:b5:27:d4:2c:56:d1:52:53:3a:44:d2:73:c8:c4: - 1b:05:65:5a:62:92:9c:ee:41:8d:31:db:e7:34:ea:59:21:d5: - 01:7a:d7:64:b8:64:39:cd:c9:ed:af:ed:4b:03:48:a7:a0:99: - 01:80:dc:65:a3:36:ae:65:59:48:4f:82:4b:c8:65:f1:57:1d: - e5:59:2e:0a:3f:6c:d8:d1:f5:e5:09:b4:6c:54:00:0a:e0:15: - 4d:87:75:6d:b7:58:96:5a:dd:6d:d2:00:a0:f4:9b:48:be:c3: - 37:a4:ba:36:e0:7c:87:85:97:1a:15:a2:de:2e:a2:5b:bd:af: - 18:f9:90:50:cd:70:59:f8:27:67:47:cb:c7:a0:07:3a:7d:d1: - 2c:5d:6c:19:3a:66:b5:7d:fd:91:6f:82:b1:be:08:93:db:14: - 47:f1:a2:37:c7:45:9e:3c:c7:77:af:64:a8:93:df:f6:69:83: - 82:60:f2:49:42:34:ed:5a:00:54:85:1c:16:36:92:0c:5c:fa: - a6:ad:bf:db + Signature Value: + 89:57:b2:16:7a:a8:c2:fd:d6:d9:9b:9b:34:c2:9c:b4:32:14: + 4d:a7:a4:df:ec:be:a7:be:f8:43:db:91:37:ce:b4:32:2e:50: + 55:1a:35:4e:76:43:71:20:ef:93:77:4e:15:70:2e:87:c3:c1: + 1d:6d:dc:cb:b5:27:d4:2c:56:d1:52:53:3a:44:d2:73:c8:c4: + 1b:05:65:5a:62:92:9c:ee:41:8d:31:db:e7:34:ea:59:21:d5: + 01:7a:d7:64:b8:64:39:cd:c9:ed:af:ed:4b:03:48:a7:a0:99: + 01:80:dc:65:a3:36:ae:65:59:48:4f:82:4b:c8:65:f1:57:1d: + e5:59:2e:0a:3f:6c:d8:d1:f5:e5:09:b4:6c:54:00:0a:e0:15: + 4d:87:75:6d:b7:58:96:5a:dd:6d:d2:00:a0:f4:9b:48:be:c3: + 37:a4:ba:36:e0:7c:87:85:97:1a:15:a2:de:2e:a2:5b:bd:af: + 18:f9:90:50:cd:70:59:f8:27:67:47:cb:c7:a0:07:3a:7d:d1: + 2c:5d:6c:19:3a:66:b5:7d:fd:91:6f:82:b1:be:08:93:db:14: + 47:f1:a2:37:c7:45:9e:3c:c7:77:af:64:a8:93:df:f6:69:83: + 82:60:f2:49:42:34:ed:5a:00:54:85:1c:16:36:92:0c:5c:fa: + a6:ad:bf:db SHA1 Fingerprint=29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F -----BEGIN CERTIFICATE----- MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem index ef4c3286bf1c..ec32ac850bbd 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = US, O = AffirmTrust, CN = AffirmTrust Premium Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:c4:12:df:a9:5f:fe:41:dd:dd:f5:9f:8a:e3:f6: ac:e1:3c:78:9a:bc:d8:f0:7f:7a:a0:33:2a:dc:8d: @@ -69,35 +69,36 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: sha384WithRSAEncryption - b3:57:4d:10:62:4e:3a:e4:ac:ea:b8:1c:af:32:23:c8:b3:49: - 5a:51:9c:76:28:8d:79:aa:57:46:17:d5:f5:52:f6:b7:44:e8: - 08:44:bf:18:84:d2:0b:80:cd:c5:12:fd:00:55:05:61:87:41: - dc:b5:24:9e:3c:c4:d8:c8:fb:70:9e:2f:78:96:83:20:36:de: - 7c:0f:69:13:88:a5:75:36:98:08:a6:c6:df:ac:ce:e3:58:d6: - b7:3e:de:ba:f3:eb:34:40:d8:a2:81:f5:78:3f:2f:d5:a5:fc: - d9:a2:d4:5e:04:0e:17:ad:fe:41:f0:e5:b2:72:fa:44:82:33: - 42:e8:2d:58:f7:56:8c:62:3f:ba:42:b0:9c:0c:5c:7e:2e:65: - 26:5c:53:4f:00:b2:78:7e:a1:0d:99:2d:8d:b8:1d:8e:a2:c4: - b0:fd:60:d0:30:a4:8e:c8:04:62:a9:c4:ed:35:de:7a:97:ed: - 0e:38:5e:92:2f:93:70:a5:a9:9c:6f:a7:7d:13:1d:7e:c6:08: - 48:b1:5e:67:eb:51:08:25:e9:e6:25:6b:52:29:91:9c:d2:39: - 73:08:57:de:99:06:b4:5b:9d:10:06:e1:c2:00:a8:b8:1c:4a: - 02:0a:14:d0:c1:41:ca:fb:8c:35:21:7d:82:38:f2:a9:54:91: - 19:35:93:94:6d:6a:3a:c5:b2:d0:bb:89:86:93:e8:9b:c9:0f: - 3a:a7:7a:b8:a1:f0:78:46:fa:fc:37:2f:e5:8a:84:f3:df:fe: - 04:d9:a1:68:a0:2f:24:e2:09:95:06:d5:95:ca:e1:24:96:eb: - 7c:f6:93:05:bb:ed:73:e9:2d:d1:75:39:d7:e7:24:db:d8:4e: - 5f:43:8f:9e:d0:14:39:bf:55:70:48:99:57:31:b4:9c:ee:4a: - 98:03:96:30:1f:60:06:ee:1b:23:fe:81:60:23:1a:47:62:85: - a5:cc:19:34:80:6f:b3:ac:1a:e3:9f:f0:7b:48:ad:d5:01:d9: - 67:b6:a9:72:93:ea:2d:66:b5:b2:b8:e4:3d:3c:b2:ef:4c:8c: - ea:eb:07:bf:ab:35:9a:55:86:bc:18:a6:b5:a8:5e:b4:83:6c: - 6b:69:40:d3:9f:dc:f1:c3:69:6b:b9:e1:6d:09:f4:f1:aa:50: - 76:0a:7a:7d:7a:17:a1:55:96:42:99:31:09:dd:60:11:8d:05: - 30:7e:e6:8e:46:d1:9d:14:da:c7:17:e4:05:96:8c:c4:24:b5: - 1b:cf:14:07:b2:40:f8:a3:9e:41:86:bc:04:d0:6b:96:c8:2a: - 80:34:fd:bf:ef:06:a3:dd:58:c5:85:3d:3e:8f:fe:9e:29:e0: - b6:b8:09:68:19:1c:18:43 + Signature Value: + b3:57:4d:10:62:4e:3a:e4:ac:ea:b8:1c:af:32:23:c8:b3:49: + 5a:51:9c:76:28:8d:79:aa:57:46:17:d5:f5:52:f6:b7:44:e8: + 08:44:bf:18:84:d2:0b:80:cd:c5:12:fd:00:55:05:61:87:41: + dc:b5:24:9e:3c:c4:d8:c8:fb:70:9e:2f:78:96:83:20:36:de: + 7c:0f:69:13:88:a5:75:36:98:08:a6:c6:df:ac:ce:e3:58:d6: + b7:3e:de:ba:f3:eb:34:40:d8:a2:81:f5:78:3f:2f:d5:a5:fc: + d9:a2:d4:5e:04:0e:17:ad:fe:41:f0:e5:b2:72:fa:44:82:33: + 42:e8:2d:58:f7:56:8c:62:3f:ba:42:b0:9c:0c:5c:7e:2e:65: + 26:5c:53:4f:00:b2:78:7e:a1:0d:99:2d:8d:b8:1d:8e:a2:c4: + b0:fd:60:d0:30:a4:8e:c8:04:62:a9:c4:ed:35:de:7a:97:ed: + 0e:38:5e:92:2f:93:70:a5:a9:9c:6f:a7:7d:13:1d:7e:c6:08: + 48:b1:5e:67:eb:51:08:25:e9:e6:25:6b:52:29:91:9c:d2:39: + 73:08:57:de:99:06:b4:5b:9d:10:06:e1:c2:00:a8:b8:1c:4a: + 02:0a:14:d0:c1:41:ca:fb:8c:35:21:7d:82:38:f2:a9:54:91: + 19:35:93:94:6d:6a:3a:c5:b2:d0:bb:89:86:93:e8:9b:c9:0f: + 3a:a7:7a:b8:a1:f0:78:46:fa:fc:37:2f:e5:8a:84:f3:df:fe: + 04:d9:a1:68:a0:2f:24:e2:09:95:06:d5:95:ca:e1:24:96:eb: + 7c:f6:93:05:bb:ed:73:e9:2d:d1:75:39:d7:e7:24:db:d8:4e: + 5f:43:8f:9e:d0:14:39:bf:55:70:48:99:57:31:b4:9c:ee:4a: + 98:03:96:30:1f:60:06:ee:1b:23:fe:81:60:23:1a:47:62:85: + a5:cc:19:34:80:6f:b3:ac:1a:e3:9f:f0:7b:48:ad:d5:01:d9: + 67:b6:a9:72:93:ea:2d:66:b5:b2:b8:e4:3d:3c:b2:ef:4c:8c: + ea:eb:07:bf:ab:35:9a:55:86:bc:18:a6:b5:a8:5e:b4:83:6c: + 6b:69:40:d3:9f:dc:f1:c3:69:6b:b9:e1:6d:09:f4:f1:aa:50: + 76:0a:7a:7d:7a:17:a1:55:96:42:99:31:09:dd:60:11:8d:05: + 30:7e:e6:8e:46:d1:9d:14:da:c7:17:e4:05:96:8c:c4:24:b5: + 1b:cf:14:07:b2:40:f8:a3:9e:41:86:bc:04:d0:6b:96:c8:2a: + 80:34:fd:bf:ef:06:a3:dd:58:c5:85:3d:3e:8f:fe:9e:29:e0: + b6:b8:09:68:19:1c:18:43 SHA1 Fingerprint=D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27 -----BEGIN CERTIFICATE----- MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem index 1a1b7b14e7be..19a9ffb6b45b 100644 --- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem +++ b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem @@ -42,12 +42,13 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign Signature Algorithm: ecdsa-with-SHA384 - 30:64:02:30:17:09:f3:87:88:50:5a:af:c8:c0:42:bf:47:5f: - f5:6c:6a:86:e0:c4:27:74:e4:38:53:d7:05:7f:1b:34:e3:c6: - 2f:b3:ca:09:3c:37:9d:d7:e7:b8:46:f1:fd:a1:e2:71:02:30: - 42:59:87:43:d4:51:df:ba:d3:09:32:5a:ce:88:7e:57:3d:9c: - 5f:42:6b:f5:07:2d:b5:f0:82:93:f9:59:6f:ae:64:fa:58:e5: - 8b:1e:e3:63:be:b5:81:cd:6f:02:8c:79 + Signature Value: + 30:64:02:30:17:09:f3:87:88:50:5a:af:c8:c0:42:bf:47:5f: + f5:6c:6a:86:e0:c4:27:74:e4:38:53:d7:05:7f:1b:34:e3:c6: + 2f:b3:ca:09:3c:37:9d:d7:e7:b8:46:f1:fd:a1:e2:71:02:30: + 42:59:87:43:d4:51:df:ba:d3:09:32:5a:ce:88:7e:57:3d:9c: + 5f:42:6b:f5:07:2d:b5:f0:82:93:f9:59:6f:ae:64:fa:58:e5: + 8b:1e:e3:63:be:b5:81:cd:6f:02:8c:79 SHA1 Fingerprint=B8:23:6B:00:2F:1D:16:86:53:01:55:6C:11:A4:37:CA:EB:FF:C3:BB -----BEGIN CERTIFICATE----- MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC diff --git a/secure/caroot/trusted/Amazon_Root_CA_1.pem b/secure/caroot/trusted/Amazon_Root_CA_1.pem index 996e32e056e9..5a7236d01703 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_1.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_1.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = US, O = Amazon, CN = Amazon Root CA 1 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b2:78:80:71:ca:78:d5:e3:71:af:47:80:50:74: 7d:6e:d8:d7:88:76:f4:99:68:f7:58:21:60:f9:74: @@ -53,21 +53,22 @@ Certificate: X509v3 Subject Key Identifier: 84:18:CC:85:34:EC:BC:0C:94:94:2E:08:59:9C:C7:B2:10:4E:0A:08 Signature Algorithm: sha256WithRSAEncryption - 98:f2:37:5a:41:90:a1:1a:c5:76:51:28:20:36:23:0e:ae:e6: - 28:bb:aa:f8:94:ae:48:a4:30:7f:1b:fc:24:8d:4b:b4:c8:a1: - 97:f6:b6:f1:7a:70:c8:53:93:cc:08:28:e3:98:25:cf:23:a4: - f9:de:21:d3:7c:85:09:ad:4e:9a:75:3a:c2:0b:6a:89:78:76: - 44:47:18:65:6c:8d:41:8e:3b:7f:9a:cb:f4:b5:a7:50:d7:05: - 2c:37:e8:03:4b:ad:e9:61:a0:02:6e:f5:f2:f0:c5:b2:ed:5b: - b7:dc:fa:94:5c:77:9e:13:a5:7f:52:ad:95:f2:f8:93:3b:de: - 8b:5c:5b:ca:5a:52:5b:60:af:14:f7:4b:ef:a3:fb:9f:40:95: - 6d:31:54:fc:42:d3:c7:46:1f:23:ad:d9:0f:48:70:9a:d9:75: - 78:71:d1:72:43:34:75:6e:57:59:c2:02:5c:26:60:29:cf:23: - 19:16:8e:88:43:a5:d4:e4:cb:08:fb:23:11:43:e8:43:29:72: - 62:a1:a9:5d:5e:08:d4:90:ae:b8:d8:ce:14:c2:d0:55:f2:86: - f6:c4:93:43:77:66:61:c0:b9:e8:41:d7:97:78:60:03:6e:4a: - 72:ae:a5:d1:7d:ba:10:9e:86:6c:1b:8a:b9:59:33:f8:eb:c4: - 90:be:f1:b9 + Signature Value: + 98:f2:37:5a:41:90:a1:1a:c5:76:51:28:20:36:23:0e:ae:e6: + 28:bb:aa:f8:94:ae:48:a4:30:7f:1b:fc:24:8d:4b:b4:c8:a1: + 97:f6:b6:f1:7a:70:c8:53:93:cc:08:28:e3:98:25:cf:23:a4: + f9:de:21:d3:7c:85:09:ad:4e:9a:75:3a:c2:0b:6a:89:78:76: + 44:47:18:65:6c:8d:41:8e:3b:7f:9a:cb:f4:b5:a7:50:d7:05: + 2c:37:e8:03:4b:ad:e9:61:a0:02:6e:f5:f2:f0:c5:b2:ed:5b: + b7:dc:fa:94:5c:77:9e:13:a5:7f:52:ad:95:f2:f8:93:3b:de: + 8b:5c:5b:ca:5a:52:5b:60:af:14:f7:4b:ef:a3:fb:9f:40:95: + 6d:31:54:fc:42:d3:c7:46:1f:23:ad:d9:0f:48:70:9a:d9:75: + 78:71:d1:72:43:34:75:6e:57:59:c2:02:5c:26:60:29:cf:23: + 19:16:8e:88:43:a5:d4:e4:cb:08:fb:23:11:43:e8:43:29:72: + 62:a1:a9:5d:5e:08:d4:90:ae:b8:d8:ce:14:c2:d0:55:f2:86: + f6:c4:93:43:77:66:61:c0:b9:e8:41:d7:97:78:60:03:6e:4a: + 72:ae:a5:d1:7d:ba:10:9e:86:6c:1b:8a:b9:59:33:f8:eb:c4: + 90:be:f1:b9 SHA1 Fingerprint=8D:A7:F9:65:EC:5E:FC:37:91:0F:1C:6E:59:FD:C1:CC:6A:6E:DE:16 -----BEGIN CERTIFICATE----- MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsF diff --git a/secure/caroot/trusted/Amazon_Root_CA_2.pem b/secure/caroot/trusted/Amazon_Root_CA_2.pem index fbcb6a47f445..5418e52f1cfd 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_2.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_2.pem @@ -24,7 +24,7 @@ Certificate: Subject: C = US, O = Amazon, CN = Amazon Root CA 2 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:ad:96:9f:2d:9c:4a:4c:4a:81:79:51:99:ec:8a: cb:6b:60:51:13:bc:4d:6d:06:fc:b0:08:8d:dd:19: @@ -70,35 +70,36 @@ Certificate: X509v3 Subject Key Identifier: B0:0C:F0:4C:30:F4:05:58:02:48:FD:33:E5:52:AF:4B:84:E3:66:52 Signature Algorithm: sha384WithRSAEncryption - aa:a8:80:8f:0e:78:a3:e0:a2:d4:cd:e6:f5:98:7a:3b:ea:00: - 03:b0:97:0e:93:bc:5a:a8:f6:2c:8c:72:87:a9:b1:fc:7f:73: - fd:63:71:78:a5:87:59:cf:30:e1:0d:10:b2:13:5a:6d:82:f5: - 6a:e6:80:9f:a0:05:0b:68:e4:47:6b:c7:6a:df:b6:fd:77:32: - 72:e5:18:fa:09:f4:a0:93:2c:5d:d2:8c:75:85:76:65:90:0c: - 03:79:b7:31:23:63:ad:78:83:09:86:68:84:ca:ff:f9:cf:26: - 9a:92:79:e7:cd:4b:c5:e7:61:a7:17:cb:f3:a9:12:93:93:6b: - a7:e8:2f:53:92:c4:60:58:b0:cc:02:51:18:5b:85:8d:62:59: - 63:b6:ad:b4:de:9a:fb:26:f7:00:27:c0:5d:55:37:74:99:c9: - 50:7f:e3:59:2e:44:e3:2c:25:ee:ec:4c:32:77:b4:9f:1a:e9: - 4b:5d:20:c5:da:fd:1c:87:16:c6:43:e8:d4:bb:26:9a:45:70: - 5e:a9:0b:37:53:e2:46:7b:27:fd:e0:46:f2:89:b7:cc:42:b6: - cb:28:26:6e:d9:a5:c9:3a:c8:41:13:60:f7:50:8c:15:ae:b2: - 6d:1a:15:1a:57:78:e6:92:2a:d9:65:90:82:3f:6c:02:af:ae: - 12:3a:27:96:36:04:d7:1d:a2:80:63:a9:9b:f1:e5:ba:b4:7c: - 14:b0:4e:c9:b1:1f:74:5f:38:f6:51:ea:9b:fa:2c:a2:11:d4: - a9:2d:27:1a:45:b1:af:b2:4e:71:0d:c0:58:46:d6:69:06:cb: - 53:cb:b3:fe:6b:41:cd:41:7e:7d:4c:0f:7c:72:79:7a:59:cd: - 5e:4a:0e:ac:9b:a9:98:73:79:7c:b4:f4:cc:b9:b8:07:0c:b2: - 74:5c:b8:c7:6f:88:a1:90:a7:f4:aa:f9:bf:67:3a:f4:1a:15: - 62:1e:b7:9f:be:3d:b1:29:af:67:a1:12:f2:58:10:19:53:03: - 30:1b:b8:1a:89:f6:9c:bd:97:03:8e:a3:09:f3:1d:8b:21:f1: - b4:df:e4:1c:d1:9f:65:02:06:ea:5c:d6:13:b3:84:ef:a2:a5: - 5c:8c:77:29:a7:68:c0:6b:ae:40:d2:a8:b4:ea:cd:f0:8d:4b: - 38:9c:19:9a:1b:28:54:b8:89:90:ef:ca:75:81:3e:1e:f2:64: - 24:c7:18:af:4e:ff:47:9e:07:f6:35:65:a4:d3:0a:56:ff:f5: - 17:64:6c:ef:a8:22:25:49:93:b6:df:00:17:da:58:7e:5d:ee: - c5:1b:b0:d1:d1:5f:21:10:c7:f9:f3:ba:02:0a:27:07:c5:f1: - d6:c7:d3:e0:fb:09:60:6c + Signature Value: + aa:a8:80:8f:0e:78:a3:e0:a2:d4:cd:e6:f5:98:7a:3b:ea:00: + 03:b0:97:0e:93:bc:5a:a8:f6:2c:8c:72:87:a9:b1:fc:7f:73: + fd:63:71:78:a5:87:59:cf:30:e1:0d:10:b2:13:5a:6d:82:f5: + 6a:e6:80:9f:a0:05:0b:68:e4:47:6b:c7:6a:df:b6:fd:77:32: + 72:e5:18:fa:09:f4:a0:93:2c:5d:d2:8c:75:85:76:65:90:0c: + 03:79:b7:31:23:63:ad:78:83:09:86:68:84:ca:ff:f9:cf:26: + 9a:92:79:e7:cd:4b:c5:e7:61:a7:17:cb:f3:a9:12:93:93:6b: + a7:e8:2f:53:92:c4:60:58:b0:cc:02:51:18:5b:85:8d:62:59: + 63:b6:ad:b4:de:9a:fb:26:f7:00:27:c0:5d:55:37:74:99:c9: + 50:7f:e3:59:2e:44:e3:2c:25:ee:ec:4c:32:77:b4:9f:1a:e9: + 4b:5d:20:c5:da:fd:1c:87:16:c6:43:e8:d4:bb:26:9a:45:70: + 5e:a9:0b:37:53:e2:46:7b:27:fd:e0:46:f2:89:b7:cc:42:b6: + cb:28:26:6e:d9:a5:c9:3a:c8:41:13:60:f7:50:8c:15:ae:b2: + 6d:1a:15:1a:57:78:e6:92:2a:d9:65:90:82:3f:6c:02:af:ae: + 12:3a:27:96:36:04:d7:1d:a2:80:63:a9:9b:f1:e5:ba:b4:7c: + 14:b0:4e:c9:b1:1f:74:5f:38:f6:51:ea:9b:fa:2c:a2:11:d4: + a9:2d:27:1a:45:b1:af:b2:4e:71:0d:c0:58:46:d6:69:06:cb: + 53:cb:b3:fe:6b:41:cd:41:7e:7d:4c:0f:7c:72:79:7a:59:cd: + 5e:4a:0e:ac:9b:a9:98:73:79:7c:b4:f4:cc:b9:b8:07:0c:b2: + 74:5c:b8:c7:6f:88:a1:90:a7:f4:aa:f9:bf:67:3a:f4:1a:15: + 62:1e:b7:9f:be:3d:b1:29:af:67:a1:12:f2:58:10:19:53:03: + 30:1b:b8:1a:89:f6:9c:bd:97:03:8e:a3:09:f3:1d:8b:21:f1: + b4:df:e4:1c:d1:9f:65:02:06:ea:5c:d6:13:b3:84:ef:a2:a5: + 5c:8c:77:29:a7:68:c0:6b:ae:40:d2:a8:b4:ea:cd:f0:8d:4b: + 38:9c:19:9a:1b:28:54:b8:89:90:ef:ca:75:81:3e:1e:f2:64: + 24:c7:18:af:4e:ff:47:9e:07:f6:35:65:a4:d3:0a:56:ff:f5: + 17:64:6c:ef:a8:22:25:49:93:b6:df:00:17:da:58:7e:5d:ee: + c5:1b:b0:d1:d1:5f:21:10:c7:f9:f3:ba:02:0a:27:07:c5:f1: + d6:c7:d3:e0:fb:09:60:6c SHA1 Fingerprint=5A:8C:EF:45:D7:A6:98:59:76:7A:8C:8B:44:96:B5:78:CF:47:4B:1A -----BEGIN CERTIFICATE----- MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwF diff --git a/secure/caroot/trusted/Amazon_Root_CA_3.pem b/secure/caroot/trusted/Amazon_Root_CA_3.pem index 1e45a816b669..0baa14e92de3 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_3.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_3.pem @@ -41,10 +41,11 @@ Certificate: X509v3 Subject Key Identifier: AB:B6:DB:D7:06:9E:37:AC:30:86:07:91:70:C7:9C:C4:19:B1:78:C0 Signature Algorithm: ecdsa-with-SHA256 - 30:46:02:21:00:e0:85:92:a3:17:b7:8d:f9:2b:06:a5:93:ac: - 1a:98:68:61:72:fa:e1:a1:d0:fb:1c:78:60:a6:43:99:c5:b8: - c4:02:21:00:9c:02:ef:f1:94:9c:b3:96:f9:eb:c6:2a:f8:b6: - 2c:fe:3a:90:14:16:d7:8c:63:24:48:1c:df:30:7d:d5:68:3b + Signature Value: + 30:46:02:21:00:e0:85:92:a3:17:b7:8d:f9:2b:06:a5:93:ac: + 1a:98:68:61:72:fa:e1:a1:d0:fb:1c:78:60:a6:43:99:c5:b8: + c4:02:21:00:9c:02:ef:f1:94:9c:b3:96:f9:eb:c6:2a:f8:b6: + 2c:fe:3a:90:14:16:d7:8c:63:24:48:1c:df:30:7d:d5:68:3b SHA1 Fingerprint=0D:44:DD:8C:3C:8C:1A:1A:58:75:64:81:E9:0F:2E:2A:FF:B3:D2:6E -----BEGIN CERTIFICATE----- MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5 diff --git a/secure/caroot/trusted/Amazon_Root_CA_4.pem b/secure/caroot/trusted/Amazon_Root_CA_4.pem index 889f1dc33d52..06ccb20544dc 100644 --- a/secure/caroot/trusted/Amazon_Root_CA_4.pem +++ b/secure/caroot/trusted/Amazon_Root_CA_4.pem @@ -43,12 +43,13 @@ Certificate: X509v3 Subject Key Identifier: D3:EC:C7:3A:65:6E:CC:E1:DA:76:9A:56:FB:9C:F3:86:6D:57:E5:81 Signature Algorithm: ecdsa-with-SHA384 - 30:65:02:30:3a:8b:21:f1:bd:7e:11:ad:d0:ef:58:96:2f:d6: - eb:9d:7e:90:8d:2b:cf:66:55:c3:2c:e3:28:a9:70:0a:47:0e: - f0:37:59:12:ff:2d:99:94:28:4e:2a:4f:35:4d:33:5a:02:31: - 00:ea:75:00:4e:3b:c4:3a:94:12:91:c9:58:46:9d:21:13:72: - a7:88:9c:8a:e4:4c:4a:db:96:d4:ac:8b:6b:6b:49:12:53:33: - ad:d7:e4:be:24:fc:b5:0a:76:d4:a5:bc:10 + Signature Value: + 30:65:02:30:3a:8b:21:f1:bd:7e:11:ad:d0:ef:58:96:2f:d6: + eb:9d:7e:90:8d:2b:cf:66:55:c3:2c:e3:28:a9:70:0a:47:0e: + f0:37:59:12:ff:2d:99:94:28:4e:2a:4f:35:4d:33:5a:02:31: + 00:ea:75:00:4e:3b:c4:3a:94:12:91:c9:58:46:9d:21:13:72: + a7:88:9c:8a:e4:4c:4a:db:96:d4:ac:8b:6b:6b:49:12:53:33: + ad:d7:e4:be:24:fc:b5:0a:76:d4:a5:bc:10 SHA1 Fingerprint=F6:10:84:07:D6:F8:BB:67:98:0C:C2:E2:44:C2:EB:AE:1C:EF:63:BE -----BEGIN CERTIFICATE----- MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5 diff --git a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem index b65333ef383d..736143dc94ff 100644 --- a/secure/caroot/trusted/Atos_TrustedRoot_2011.pem +++ b/secure/caroot/trusted/Atos_TrustedRoot_2011.pem @@ -23,7 +23,7 @@ Certificate: Subject: CN = Atos TrustedRoot 2011, O = Atos, C = DE Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:95:85:3b:97:6f:2a:3b:2e:3b:cf:a6:f3:29:35: be:cf:18:ac:3e:aa:d9:f8:4d:a0:3e:1a:47:b9:bc: *** 10321 LINES SKIPPED *** From nobody Tue Sep 5 16:00:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg9FR50P7z4sFN6; Tue, 5 Sep 2023 16:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg9FR4V4rz4dT5; Tue, 5 Sep 2023 16:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693929611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRBBHY2OvWTcHMjZ4TX0EWED6RZgmj16p4pdTz+CUhY=; b=T1IIcxXrw+jaZdVSxk79Wsh4y4WVYqCeQ/DaL3/B/YN5aRS7IklW3s+4RZaLMi3oQ9/Atw t3WDhRkOHrGqF7zbMMfxBKs1y4liBlOdg6Mu/NeYQco3BNa6nkN9Y1Z+gT26/SPkd3yNuw adYqTU2hvdtszap7d2syCUxUiaDTo9A2LlF8BJ4oQZ2fqdwJISAbLHtvBZnbFgfwNRnd3l 9u6KaxKwoDFT88dd4ipgDNPjyKGZwKgcuzi/iMYdmB11B6OoI7+gFYvGGEonwYb+5fpMOv oYxMgWpqu4JlgLFd1UqpI6TkY88P6prXoyTefBOtAYpBdDGcbbqLGXchBCcbGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693929611; a=rsa-sha256; cv=none; b=EuBAyaxiAp+Ud6cOiLZsiPtl5WIWOB13EK6McqRskbn7dhHG/lpCPDDRc4QSX9toBJOqt3 g7pDlIx8Bv027gfhh9bqWelHPk6hbPJz/u8AfY7EJBnUEJDU6f9F8YxZmFyLI1/vXyq6zS 2z9bIl0Mpbu9+OQudYLm2WiGbccuOF7380B8Uf0RctqdPTRaSt4CoIGlXGZEzEdENsd3bc mju33J+Sn7eR15LvfO2alKtZBq0MhJqE9S80McsPWhYsnWqfAZ6HAa5rwcf9KEFaEbDFpc 9qBoi/2m+MOuY4r1kismdasxunLMJ/lDIG9MBZjJxC5xS61GpNg5GbDvmJWGsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693929611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QRBBHY2OvWTcHMjZ4TX0EWED6RZgmj16p4pdTz+CUhY=; b=Jjal3yVbz+RjIghHK+Qad7S13QekFYnFKym5zmg/5Q2UStFockVQdWCzdT/fWKaAA3vz+4 N1T/8IGiU/R3iKbdE3qOpZhBnhmaw9ZGSdq1u/jCvSngaybSpuvAXuN/SKthTAjS/NLAwD nzdMxpugbO6YCfCGmfN0OrMTi+kgm5uLZbGW1Z7qfVm8p2ixQRwzstagpVM6NVmK5Qxcd5 MvwWFSlRTuARHGj/f2fZhKk1CQRVK+YsJCKhLKJ1WYPVq1N9E0E95WFRxWC3O/VM86lOdn cXqA0dzN7Cnn3UaA6FBUXcfa9KhVnGet3ME77Dw2I878Out3tvE0X4HGmw+HzQ== 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 4Rg9FR3Z53zfdG; Tue, 5 Sep 2023 16:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385G0BO1031843; Tue, 5 Sep 2023 16:00:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385G0Bmk031832; Tue, 5 Sep 2023 16:00:11 GMT (envelope-from git) Date: Tue, 5 Sep 2023 16:00:11 GMT Message-Id: <202309051600.385G0Bmk031832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f1c5a2e3a625 - main - virtio_random: Pipeline fetching the data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1c5a2e3a625053e2b70d5b1777d849a4d9328f2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f1c5a2e3a625053e2b70d5b1777d849a4d9328f2 commit f1c5a2e3a625053e2b70d5b1777d849a4d9328f2 Author: John-Mark Gurney AuthorDate: 2023-09-05 15:59:43 +0000 Commit: John Baldwin CommitDate: 2023-09-05 15:59:43 +0000 virtio_random: Pipeline fetching the data Queue an initial fetch of data during attach and after every read rather than synchronously fetching data and polling for completion. If data has not been returned from an previous fetch during read, just return EAGAIN rather than blocking. Co-authored-by: John Baldwin Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41656 --- sys/dev/virtio/random/virtio_random.c | 73 +++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 30 deletions(-) diff --git a/sys/dev/virtio/random/virtio_random.c b/sys/dev/virtio/random/virtio_random.c index c02b5c98cece..d54e2e6b70d4 100644 --- a/sys/dev/virtio/random/virtio_random.c +++ b/sys/dev/virtio/random/virtio_random.c @@ -54,6 +54,8 @@ struct vtrnd_softc { struct virtqueue *vtrnd_vq; eventhandler_tag eh; bool inactive; + struct sglist *vtrnd_sg; + uint32_t *vtrnd_value; }; static int vtrnd_modevent(module_t, int, void *); @@ -67,6 +69,7 @@ static int vtrnd_negotiate_features(struct vtrnd_softc *); static int vtrnd_setup_features(struct vtrnd_softc *); static int vtrnd_alloc_virtqueue(struct vtrnd_softc *); static int vtrnd_harvest(struct vtrnd_softc *, void *, size_t *); +static void vtrnd_enqueue(struct vtrnd_softc *sc); static unsigned vtrnd_read(void *, unsigned); #define VTRND_FEATURES 0 @@ -138,12 +141,17 @@ static int vtrnd_attach(device_t dev) { struct vtrnd_softc *sc, *exp; + size_t len; int error; sc = device_get_softc(dev); sc->vtrnd_dev = dev; virtio_set_feature_desc(dev, vtrnd_feature_desc); + len = sizeof(*sc->vtrnd_value) * HARVESTSIZE; + sc->vtrnd_value = malloc_aligned(len, len, M_DEVBUF, M_WAITOK); + sc->vtrnd_sg = sglist_build(sc->vtrnd_value, len, M_WAITOK); + error = vtrnd_setup_features(sc); if (error) { device_printf(dev, "cannot setup features\n"); @@ -174,6 +182,8 @@ vtrnd_attach(device_t dev) sc->inactive = false; random_source_register(&random_vtrnd); + vtrnd_enqueue(sc); + fail: if (error) vtrnd_detach(dev); @@ -185,6 +195,7 @@ static int vtrnd_detach(device_t dev) { struct vtrnd_softc *sc; + uint32_t rdlen; sc = device_get_softc(dev); KASSERT( @@ -197,7 +208,13 @@ vtrnd_detach(device_t dev) sc->eh = NULL; } random_source_deregister(&random_vtrnd); + + /* clear the queue */ + virtqueue_poll(sc->vtrnd_vq, &rdlen); + atomic_store_explicit(&g_vtrnd_softc, NULL, memory_order_release); + sglist_free(sc->vtrnd_sg); + zfree(sc->vtrnd_value, M_DEVBUF); return (0); } @@ -251,49 +268,45 @@ vtrnd_alloc_virtqueue(struct vtrnd_softc *sc) return (virtio_alloc_virtqueues(dev, 0, 1, &vq_info)); } +static void +vtrnd_enqueue(struct vtrnd_softc *sc) +{ + struct virtqueue *vq; + int error __diagused; + + vq = sc->vtrnd_vq; + + KASSERT(virtqueue_empty(vq), ("%s: non-empty queue", __func__)); + + error = virtqueue_enqueue(vq, sc, sc->vtrnd_sg, 0, 1); + KASSERT(error == 0, ("%s: virtqueue_enqueue returned error: %d", + __func__, error)); + + virtqueue_notify(vq); +} + static int vtrnd_harvest(struct vtrnd_softc *sc, void *buf, size_t *sz) { - struct sglist_seg segs[1]; - struct sglist sg; struct virtqueue *vq; - uint32_t value[HARVESTSIZE] __aligned(sizeof(uint32_t) * HARVESTSIZE); + void *cookie; uint32_t rdlen; - int error; - - _Static_assert(sizeof(value) < PAGE_SIZE, "sglist assumption"); if (sc->inactive) return (EDEADLK); - sglist_init(&sg, 1, segs); - error = sglist_append(&sg, value, *sz); - if (error != 0) - panic("%s: sglist_append error=%d", __func__, error); - vq = sc->vtrnd_vq; - KASSERT(virtqueue_empty(vq), ("%s: non-empty queue", __func__)); - - error = virtqueue_enqueue(vq, buf, &sg, 0, 1); - if (error != 0) - return (error); - - /* - * Poll for the response, but the command is likely already - * done when we return from the notify. - */ - virtqueue_notify(vq); - virtqueue_poll(vq, &rdlen); - if (rdlen > *sz) - panic("%s: random device wrote %zu bytes beyond end of provided" - " buffer %p:%zu", __func__, (size_t)rdlen - *sz, - (void *)value, *sz); - else if (rdlen == 0) + cookie = virtqueue_dequeue(vq, &rdlen); + if (cookie == NULL) return (EAGAIN); + KASSERT(cookie == sc, ("%s: cookie mismatch", __func__)); + *sz = MIN(rdlen, *sz); - memcpy(buf, value, *sz); - explicit_bzero(value, *sz); + memcpy(buf, sc->vtrnd_value, *sz); + + vtrnd_enqueue(sc); + return (0); } From nobody Tue Sep 5 16:12:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg9X14d9dz4sM4q; Tue, 5 Sep 2023 16:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg9X148GYz4j16; Tue, 5 Sep 2023 16:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693930369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jfHHl5LzJYzs7KBdG67nTE3G+8lU5XQsNehjaGVjRhM=; b=pGvbciaDzAWLj/iIVfNTgInY4JNYuhrdNEdyh2HRcPXoUlufaPRf7+OtMnTptyQFdv/JF9 ZFzB2uHz+UudGjGD60od2skNWFkbKnPqQQsuym2eNGUcohqNGNW6s2Nv56nUiNBwswDphy OqLL2eyY1p6Qt7SNvrAqQYWQOCv0W+bPWNM97PFGJ+zAwRN1Y8vUZk3Vwbi+c1l8x0de90 ofHc1yh0SAThYxWCLpEPE5e3r9rTnRXuceto9OWgTS9sD172AOTXrZ0s+ruYD0GWQJZ0sE Xp0TGRRzFTu58fcMdSgubqDVDKBy1bvoFVX4mSFD0Auhi5OQkg3tBlT2oae4Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693930369; a=rsa-sha256; cv=none; b=DZTsUpltGHJbeq+Lykxnj0msvuEtjz7ShGJXmwAPJjs/4yOMOpvFxFdnqlC8jZ+ryj47sw M+GyD2hfEgsA0t+FApSUXLP0yzkLhuPa5MHAa3vgzlFpxHee0iH8+MF60douMS66KOCC2e y6D/SDGyo4I4ncwQ9m9LplwIAYJlkh5K1jJS5rrpYKOOuur6FWiWBLjWd2rp7ovonxoiH+ 12ThSwkmzui1ZipQCKqsTHTpOrUcSjjxO+UZD1zZ7xoXHrfm7ABGfIbax60Rbw6JSHiS7O xfiM9OLcnvndsvVkk6PcmSh+jSowt7+7VmlBmNvaL/TEn1ucAuZvw3NrFZkGyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693930369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jfHHl5LzJYzs7KBdG67nTE3G+8lU5XQsNehjaGVjRhM=; b=yVi8TUY3sF4afinirHmSvFt4PiMKOHp9/Aq5+LWWtBFnP3XfSW1UGM4C1IJ6xcILMZozP7 tJdKvaq+OobXRn0JN7aD2nlup0PsOkmqvfGbe3lkXa5WmhHacwblOaasNuiqVYWX2a0Sl1 Y2wVRjA0BZxSmgZGksPiG/72/zXWeFQ1rj6g6pIpjVCpQm/HaDFLo0X4q1M37p3EJSzOZ2 nBhkloWfpwjrnv9s9qsW2r1rbkPc/3hhrPeddR0mHvpbo1exyIzs9gNKDWgn2GW0byTFl3 eCxGcSlrBt8xZjRRBy+CjHe/p1lwsAsbqKq5egeDqp2G0Wx+OIIaOxo8R/NvAA== 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 4Rg9X13DS2zftp; Tue, 5 Sep 2023 16:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385GCnAG058938; Tue, 5 Sep 2023 16:12:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385GCncx058935; Tue, 5 Sep 2023 16:12:49 GMT (envelope-from git) Date: Tue, 5 Sep 2023 16:12:49 GMT Message-Id: <202309051612.385GCncx058935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3b35d2a8af43 - main - riscv: Save gp in the trapframe in both modes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b35d2a8af43c2e3ea8cb5e1363ac87ec5eadeaf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b35d2a8af43c2e3ea8cb5e1363ac87ec5eadeaf commit 3b35d2a8af43c2e3ea8cb5e1363ac87ec5eadeaf Author: John Baldwin AuthorDate: 2023-09-05 16:04:54 +0000 Commit: John Baldwin CommitDate: 2023-09-05 16:04:54 +0000 riscv: Save gp in the trapframe in both modes Similar to d95fbf4e1a12565908b04b442263fe60c9e890b4, always save gp in the trapframe even though it is only restored when returning to user mode. This is mostly a debugging aid so that dump_regs() doesn't print out random stack garbage as the value of gp for kernel faults (e.g. sysctl debug.kdb.trap=1) as well as keeping kgdb's trapframe unwinder from reporting bogus values of $gp for lower frames. Reviewed by: mhorne, jrtc27, markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41699 --- sys/riscv/riscv/exception.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/riscv/riscv/exception.S b/sys/riscv/riscv/exception.S index 1aee009a4e00..8acb5cd691d4 100644 --- a/sys/riscv/riscv/exception.S +++ b/sys/riscv/riscv/exception.S @@ -43,9 +43,9 @@ sd ra, (TF_RA)(sp) sd tp, (TF_TP)(sp) + sd gp, (TF_GP)(sp) .if \mode == 0 /* We came from userspace. */ - sd gp, (TF_GP)(sp) .option push .option norelax /* Load the kernel's global pointer */ From nobody Tue Sep 5 16:12:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg9X25sLSz4sLnL; Tue, 5 Sep 2023 16:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg9X25J4Dz4hvV; Tue, 5 Sep 2023 16:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693930370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rgd5t/Kx2Pm/nHyI3c7NRMQQG0eDpAnIUZwR+LU/1F4=; b=w2ixLp5gmbM14v2L0A/wjSacrROZvbqUUIWzmuYv24AS6yPwBkccewZpTzUsBWW6QqbW/L 5JfqbAGsmaFY5KL+JQE0oUzKBW95KZfqNpnU7y7rYKGkif/295x6pkKOBAOII32lkazwBf Yi1AyBYnYpXdacYont+R3MOJ0MLfNi3P6iOIYJTst1em+1wLwxrMMGvJFJoRANHZjQHL0x arJZiFYkT9a5UWyxxfMpsVtfNCNt5HfnhYhZTIzFDBnTLW546PR3UxYxsneRemXO+OMClE xYiNm+IOUAw031Z/FbTnfzE8/bTi57bvPDxgzfY27BK09QHoaFWLxPhm80xc7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693930370; a=rsa-sha256; cv=none; b=TqX39/Xvngdb6lLMtJL6MTH7/iGWaVEIPtM1Ns7ZxTOgC8bhJandELCSfdv8N0PXLbrgGK QG5JWEPYc33cFTgQAHZ1g6VfxD/bxIU45om9CuNfwDG4MwvoL9Jr9TVzz/Czxy1dRy/NIj 4+JKhEMQfj75ijcmGZ3GL3q559NJULAHe4mX+L5vaxUMNbygVtjnJzhIx51ALK9Sz42/YF omIBXqpYoK7P0zoSWsWwpL65SqYso1Kp7N7L0ylUJw47fWgWmqoPB/KTqgGt4W1tUjxOWn DgnP42nYKA71A7WkXlfDY3zNW2n/rJjqz+P8C6yI5GBQfdhHwM9JhhwZ0ul4fA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693930370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rgd5t/Kx2Pm/nHyI3c7NRMQQG0eDpAnIUZwR+LU/1F4=; b=Yf1GMYXecxWc6H39d/24p9lSSxnexMEevsP/pBRfnayyyhTVHPRZqZVEpXkx8pvhNPXELn rlPtvG9H0yRCGbT9V0qJ8+DaUwFfrSit/ZmBpqNhhmEwkfOnSTFzfWWkFFgKmDSgMptnwx ggWPainCRNT+/I2HLvhMRCxoJN+Ju50cErrzPmytfnpEXrmnsmkCsarMbkCOdySHX2TuTe oD0RCg0La+mz95evsOykwpuyZhSi5tX6fHD/d8uIhN/Ep9Y3kSe+IBrT/0iTbzPEBam/Zs 2FtMbIBy64bKbvw4LAo0B45feWxf3jDe7FsQd6oXfHpAwa1jc5jIYdOTxFByGw== 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 4Rg9X24LKwzg5l; Tue, 5 Sep 2023 16:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385GCo5U058992; Tue, 5 Sep 2023 16:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385GCoLc058989; Tue, 5 Sep 2023 16:12:50 GMT (envelope-from git) Date: Tue, 5 Sep 2023 16:12:50 GMT Message-Id: <202309051612.385GCoLc058989@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 25b58f9a4a69 - main - ObsoleteFiles.inc: Add libclang_rt libraries for riscv64 for LLVM 14/15. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25b58f9a4a69012b5c1729a3895f9fb3369e2b5d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=25b58f9a4a69012b5c1729a3895f9fb3369e2b5d commit 25b58f9a4a69012b5c1729a3895f9fb3369e2b5d Author: John Baldwin AuthorDate: 2023-09-05 16:12:12 +0000 Commit: John Baldwin CommitDate: 2023-09-05 16:12:12 +0000 ObsoleteFiles.inc: Add libclang_rt libraries for riscv64 for LLVM 14/15. Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D41701 --- ObsoleteFiles.inc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b901dd2874c1..98644685d83e 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -389,13 +389,17 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a @@ -427,6 +431,7 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-i386.a @@ -435,11 +440,13 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a @@ -449,16 +456,19 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-arm.a @@ -893,7 +903,10 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.so OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.so OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-aarch64.a @@ -902,6 +915,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64.a @@ -939,6 +953,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-i386.a @@ -949,6 +964,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-arm.a @@ -956,6 +972,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64.a @@ -971,6 +988,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-arm.a @@ -978,6 +996,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a @@ -985,6 +1004,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-arm.a From nobody Tue Sep 5 16:12:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg9X36hCrz4sM6v; Tue, 5 Sep 2023 16:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg9X36Cp7z4jBs; Tue, 5 Sep 2023 16:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693930371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=De+ymqUmLz7OanCA98pqgFLgMKd2e4H1KfRCmtEyC7g=; b=burb3IaqRBC4w4SSElxUPaDni4E9AnJsgAObFdFxoVZfGrSVBH7j4VZAARjSTFYfNAKw5p otJEg87OF+c27CTLta86OocvlqUUCPB4rkDhlicr7k6+U+o4wFBJ/TYzOpZ6DGfNDMmwBq f6Pojb1QsYuexpca6dOuefcTNdFaUDoLYhf8cDtjwN+lQrWknODKI0pndoGPNlDFbk15/1 1iKzfXlh5gIQfaVL6PWiyeXFaBxBsdkkCn/OnhpXsKDdTZcIq7mer0dgn035Vs64LFeWug g/5ne9py++ISK8YuPjsmVxL6PmexZEtSnTxQLihfBlEW6f4FcEAVCR2ZdQ6rtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693930371; a=rsa-sha256; cv=none; b=ucbN33LInBEnOEIck82P5uVMZTsGfgFrYOUqN3XCCgrmQIlZre/rD7xgGz1O9ZdrSGjaj9 8ZyQiv0FcDYq8e1YPRMiGVduuuuuvP3YmuqGzYeVPd0wnCWDLIhYV3DdbCEm+QhTvuN+it CZEaabVyDrUWbQdizcZjcDwEc/2QTc5cKTQl1FdpAU4tu86ai6svapizMS4R7Vb90OaH7J nVuvRu0x4UsqLY0gU/U7Wtoh+UhfOAqmRkiwhdhM5P82ClSJ9rYfaAERV6qnVX+4BKqpxk rKBrX+9AjlvW2hj8oeJPEiq4zKEA2h/9wuScGLWia+NDxaNuHqzulfnM/jrvqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693930371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=De+ymqUmLz7OanCA98pqgFLgMKd2e4H1KfRCmtEyC7g=; b=NPzHP4L8TNvLl2+rTSTNeZxtUnu91rA7pUXBMsa1lQHopDn4fH62p8Xac95OGERuV5YABn m2q7lfaxwQ4/GfMtIlyRRM87iuqOtu/L0m3YGSWNxcaOObDwyVbtmyZR+PNKhGhFVMWQ56 tNUkK1o54v5RQ0fJmvlLyu2qP6D8wGaHtoKsfmYlpcKieRJ0tdoDwCC7UjFLBl/Sp7Qmyq KwDSSGx342UkeU4x44xY1ghrQlCMxiCtVng4CyYloxQg2jWgPivhNe6KCu0+b63pSIbX9K XlF2U9pf9HO9TRUT2kvr4KWJ/Qm0PHUobkYTE9UpRXuWXgZkbtHEEdONsomdRg== 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 4Rg9X35JG0zgBN; Tue, 5 Sep 2023 16:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385GCpdE059043; Tue, 5 Sep 2023 16:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385GCpLv059040; Tue, 5 Sep 2023 16:12:51 GMT (envelope-from git) Date: Tue, 5 Sep 2023 16:12:51 GMT Message-Id: <202309051612.385GCpLv059040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ba675bb94870 - main - riscv: Don't print zero offsets for register addresses List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba675bb94870fcb1a07018920433e9468003364c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ba675bb94870fcb1a07018920433e9468003364c commit ba675bb94870fcb1a07018920433e9468003364c Author: John Baldwin AuthorDate: 2023-09-05 16:12:27 +0000 Commit: John Baldwin CommitDate: 2023-09-05 16:12:27 +0000 riscv: Don't print zero offsets for register addresses This matches the behavior of db_printsym. Reviewed by: mhorne, markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41702 --- sys/riscv/riscv/trap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index e454beeb5245..bde402c1cc16 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -149,7 +149,10 @@ print_with_symbol(const char *name, uint64_t value) sym = db_search_symbol(value, DB_STGY_ANY, &offset); if (sym != C_DB_SYM_NULL) { db_symbol_values(sym, &sym_name, &sym_value); - printf(" (%s + 0x%lx)", sym_name, offset); + if (offset != 0) + printf(" (%s + 0x%lx)", sym_name, offset); + else + printf(" (%s)", sym_name); } } #endif From nobody Tue Sep 5 16:30:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rg9wd2YC6z4rmmx; Tue, 5 Sep 2023 16:30:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rg9wc6Y2wz4nQv; Tue, 5 Sep 2023 16:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693931440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g8jIUYeaPX7PyVfgS1kpARedemRm7ZCgKFUSyf11X1I=; b=QWBpArbh5W4GmoU0yJ0OgZvoJRveohMaqgzgnhSWuB69SgTi/WMMD6QC/72Jvz2PQI1Az8 jiZh0fiRVtpvbk99QEPw77QCUOjrbEb+Hhj8w6LrRhJ8RtohZpQsS8VKZjoxON4skkshDY PYA/E4ft8Q7JfIjPqwRMxhZpBH66bw5o3ZJtZTMQvZwIwfJ0kTXRfpBFpbReMoJ7D43YZ2 WwGHAk/1iJMSdVJuqc7GkcLTp0WzFgzCzTOrWSx9qcCcxjUulUTCmvk9/1X3AXLzYFIad1 2tbKhPuyV3LzbH583iboEXbOgH01wwBcJEkvgrJQaoPDtTeIjVcwaznMDOLuWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693931440; a=rsa-sha256; cv=none; b=J5gTUvr1QHLuDnbCh7FJqAhylzGDtCGgqAbYHcVzQpEkM2Wmb7aeh5VbaSL0GD51TjnKfM 0GTqjdDiXS77Zxthamo/OCqYc9vfk9N5/yeA/FZzROB0JOGngjCavopVkNg8AmIzAtUNWk d+Zi1WmeIl1tZOv7p3oINtYFTLgZV2O0iR+inb4PKk6LHyGI/C5qqCAqVS96BBkEuDPZTH LL0yn7Lvvr6dOpLTf36ZFcTy0ic4X5S3gjfQUNra/A6WaLGCm7p+mQMX0S3IONarF+A/aC FIuCY84VoUDWdA7j52HytPbaD03vxfVYGJZu7iYBHmatBUESH0064xQPB8R6Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693931440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g8jIUYeaPX7PyVfgS1kpARedemRm7ZCgKFUSyf11X1I=; b=cQ558o3U5DUj9D976KNfj3wxb0txxaYCNAYHtjkXz9IHP9/bC3hnMmX5B5wb5QczBwhSgX SqWHxEES7AVmKsLTOLGeaschyT6XBvxK84dWQRG5CzcMGbjD3D5npXqK2hYn+op0wHFdLl hydyvdoCOO+m/Wt1TgzWvzc+a6fK/XRRrDNjc9FTSQFxBjNiI2X/Uu7VMbIpOoQdI9IHI+ myPJ2K2c27WTgb0vElBVqxAl+fwdT7moKCP6s2XkwGmof9irmXSXf2oLrNb75v6X3HVJWg ED3M4ch0avCD+9iBCqFSwdiHYLomuBsVYPUwjmpPYsxFNMsYp99ERY8bUG2tNw== 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 4Rg9wc5WWqzgRh; Tue, 5 Sep 2023 16:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385GUe7U085816; Tue, 5 Sep 2023 16:30:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385GUeis085813; Tue, 5 Sep 2023 16:30:40 GMT (envelope-from git) Date: Tue, 5 Sep 2023 16:30:40 GMT Message-Id: <202309051630.385GUeis085813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 963629923308 - main - kthread_add(): do not allow to attach the thread to a dead or dying process List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96362992330894787a4485f0adc5e867879c5893 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=96362992330894787a4485f0adc5e867879c5893 commit 96362992330894787a4485f0adc5e867879c5893 Author: Konstantin Belousov AuthorDate: 2023-09-05 10:54:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-05 16:30:08 +0000 kthread_add(): do not allow to attach the thread to a dead or dying process Reported by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/kern_kthread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 5e32aea1f56d..6f7fd8b3d555 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -281,6 +281,10 @@ kthread_add1(void (*func)(void *), void *arg, struct proc *p, return (ENOMEM); PROC_LOCK(p); + if (p->p_state == PRS_ZOMBIE || (p->p_flag2 & P2_WEXIT) != 0) { + PROC_UNLOCK(p); + return (ESRCH); + } oldtd = FIRST_THREAD_IN_PROC(p); bzero(&newtd->td_startzero, From nobody Tue Sep 5 18:19:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgDLY5dWSz4skdZ; Tue, 5 Sep 2023 18:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgDLY57b1z4BYx; Tue, 5 Sep 2023 18:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693937989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kFu48XvBQo+tsZ30m/VoWV69jQy0mAYthsDpIZB8tg0=; b=gMvKGhfPpO3L+kfoGNSYv3nfn5K1X5dz/mn2y8iWyi8BwDQ2bnVdWmrOBVpm781N4dwzcy czpKHNXE5AUoK3B/y6+qMDeBLgXscz3seeWaI/U47K47ryPjMZdkr3yWKN1ipd95uNm9Wa VjAE6lAS4VJsu9dCnVtKydqFHPEJEacv2Zltio33fbauROnltLs1iio5I/PqSb/R7lnZcE jhhVGnqJg9wKuXJXyaBeU6zTnkN4Ne2xB3yPJmv8QdB3QMV8ensB7GhaRM+q/95dWOEVTi 4dsFaw4AJS8K0gntbNdDcKL146f6mu7HS1hkKn+9crHB7jrXjj/vS5FITmDJfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693937989; a=rsa-sha256; cv=none; b=GPLUESZS6Tw5D1vuSAqFeLDmLKjZ61ceLo+dtjYV1HV8aQPm9XMjc1DaTB6Pwpjlh/4oQe 3e3w74iFi7efnn9zj2YBU1fcXOobTeOBGtRIshKbmcd7cT2QKVR3FO42MWMrkrdY3YFon1 N7KsCNho7CnViLsX9r6k11qibBhMJImmegNEZNAAr6/r+JxOMTIQnXr22h4SINPbaX3LCp AJfyTJ1L6y9JI8C9hK5vT7gv2PhdrL3oN0bqUJY/bQfoukDrMHDsvrPpn6JSdVVLq1G5ws Z7Cz1CQ+Lc0nf1CT8789+Oy1grxWiwZF78HOIDQUvLUo3aa4P/E6TELlwCR5KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693937989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kFu48XvBQo+tsZ30m/VoWV69jQy0mAYthsDpIZB8tg0=; b=PkPgOxTCmjWy42b1YKbAnmK8nebnMe73u3aubZ+3TxrHPbgaMUEw+xSD5hQGIvETvFQMfu Q6DWF/Xz1fHd39pJy/94FqXoEU/dx8WEWEDjXaXbDhaQP8StoVQiXP/TRRTOeI5dH/szxH 4alc2Jeoy4/KghzJJyg7kRBj+zjgUxbYNnjiIRy31ZLqE1MSQaftuXqRR+o8qHqrfauBNs ZWa0sY6s4B1A5h3BSmlbA3X5eYJP4Mfv9EIBaCbrJMgvhGxuwiF6E6PX5ZF72VG97k0cpb FhzzzMEyWZZE53XKbD/X8BjdDpMVXD7+NN9ZKMD6XyLew3P+i9oAYFY1rLzWPw== 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 4RgDLY4512zjxk; Tue, 5 Sep 2023 18:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385IJnvO058389; Tue, 5 Sep 2023 18:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385IJngI058386; Tue, 5 Sep 2023 18:19:49 GMT (envelope-from git) Date: Tue, 5 Sep 2023 18:19:49 GMT Message-Id: <202309051819.385IJngI058386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 553b1a4e4eb4 - main - linux(4): Deduplicate mprotect, madvise List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 553b1a4e4eb426d2c29a033b284c13bfbab30334 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=553b1a4e4eb426d2c29a033b284c13bfbab30334 commit 553b1a4e4eb426d2c29a033b284c13bfbab30334 Author: Dmitry Chagin AuthorDate: 2023-09-05 18:15:52 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 18:15:52 +0000 linux(4): Deduplicate mprotect, madvise MFC after: 1 week --- sys/amd64/linux/linux_machdep.c | 14 -------------- sys/amd64/linux32/linux32_machdep.c | 15 --------------- sys/arm64/linux/linux_machdep.c | 15 --------------- sys/compat/linux/linux_misc.c | 17 +++++++++++++++++ sys/i386/linux/linux_machdep.c | 14 -------------- 5 files changed, 17 insertions(+), 58 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 2d2c5bb55ac8..7da1dccd6b45 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -97,20 +97,6 @@ linux_mmap2(struct thread *td, struct linux_mmap2_args *args) args->flags, args->fd, args->pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, uap->addr, uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, uap->addr, uap->len, uap->behav)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index f6b14d8e4653..fb088ae37b26 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -345,20 +344,6 @@ linux_mmap(struct thread *td, struct linux_mmap_args *args) (uint32_t)linux_args.pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 9c9d56ca9949..b9548387315b 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -77,21 +77,6 @@ linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) uap->flags, uap->fd, uap->pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, - uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_set_cloned_tls(struct thread *td, void *desc) { diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 5e692fea1ea7..b9c67d513cd3 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -348,6 +349,22 @@ linux_msync(struct thread *td, struct linux_msync_args *args) args->fl & ~LINUX_MS_SYNC)); } +int +linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) +{ + + return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, + uap->prot)); +} + +int +linux_madvise(struct thread *td, struct linux_madvise_args *uap) +{ + + return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, + uap->behav)); +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_time(struct thread *td, struct linux_time_args *args) diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 8dbcbcd2609e..7f1738cda845 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -332,20 +332,6 @@ linux_mmap(struct thread *td, struct linux_mmap_args *args) (uint32_t)linux_args.pgoff)); } -int -linux_mprotect(struct thread *td, struct linux_mprotect_args *uap) -{ - - return (linux_mprotect_common(td, PTROUT(uap->addr), uap->len, uap->prot)); -} - -int -linux_madvise(struct thread *td, struct linux_madvise_args *uap) -{ - - return (linux_madvise_common(td, PTROUT(uap->addr), uap->len, uap->behav)); -} - int linux_ioperm(struct thread *td, struct linux_ioperm_args *args) { From nobody Tue Sep 5 18:19:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgDLZ6Q7pz4skMd; Tue, 5 Sep 2023 18:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgDLZ5c84z4BNq; Tue, 5 Sep 2023 18:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693937990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+Mh4pnAkl11m79imP4/gwtIZr4R55IXw/dcia42cqM=; b=FVnr2ON47u33qvXgxm3EqbDVkPS+trVORKpT2SVCnQLB7tfxQCWArxOQuacRbdEbsAU9va jokeCdYK1q1i5G4ivq4ViXKLCej8T/Z8Gk2HNVBNzXVrUUxp1kt+AyW5SshqPKQ73A4Uv4 hWr+xRWmHUXa6h4iUx0J1TQblTuZxa1EtWGVmPUhiBfWCEI7LZW2JoVxtMXVloBl8p5Wu/ +ao8fUJcs8nv87FQQxfV6UMh2+S4n3LWhDmF77m2236usaJMvTeV7VsfC4eub9WC0PxygW USFVzvx4iO+36q79W/bx/D+od/SaumrOaZBCA55GsRyB0c92x9jcyG+V4iBvjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693937990; a=rsa-sha256; cv=none; b=aat7HNOqXtvpG+kqo68E+4N0utnrhZQ6LPgJsHnAJx+Q6KjQN1ZfQKCjoP/kt28cP+KieP ZipzOKZVaPCz8h7lsHTmXLH5DQ+cBs0pnE+8YkJVFsT3t+DjH5g9RjBFXUvj0ittDI7Sw9 +9nZNjWxaLTxl1+HSQJAK24SFpa1oiHvtYjQPKTxZokbPZHpAhu8wfESlLUJAC6/OyfGIn n8UGSPNkTZG9Mj2xpl0F3owFxI6fFLp5DxXGxjOx1OFhx9v05maLwFcmepVi2uCZ/3bYxT BtxsT6BdC3QnC7PSrabXminBggkZpNZuC9upV+qHHLoimGznruMjclH/T6DDug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693937990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9+Mh4pnAkl11m79imP4/gwtIZr4R55IXw/dcia42cqM=; b=x4dxJnj6sA1ogncJARg8MBVUTABw227zynhPssKBDOaIKr2o/X++O8gXcuskbhj1YxrQVT wO2CwiKOvKmjazgb9SgONO/HfHtZzv/nxgvUrrrej/X3LvlgR1W4UcWRB42KIjOunCjKcl PuVHMa3F9DO7CbeU/WyES6AeTK4Fh0W49HVLyoUYoIuwiQkVxxMy2Ms02OyoPfoOKEhybd D+KXxhWnTnrN9IzNrM4HZvH8DksWH9GPt1dxXhhS40/T7KfftSZ3rcOAFneI8BGnli6k5M ohIrx2ZuTiXQwA5IAklwibzQX9lDNRKhCGfC7NGmrvvgaGuEzqCg5Z0jWuSkqw== 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 4RgDLZ4jWzzk5s; Tue, 5 Sep 2023 18:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385IJoMZ058431; Tue, 5 Sep 2023 18:19:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385IJoRF058428; Tue, 5 Sep 2023 18:19:50 GMT (envelope-from git) Date: Tue, 5 Sep 2023 18:19:50 GMT Message-Id: <202309051819.385IJoRF058428@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 2a1cf1b6b55c - main - linux(4): Deduplicate mmap2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a1cf1b6b55c8326bbe85d0fdf17b0f2fb9b34ce Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2a1cf1b6b55c8326bbe85d0fdf17b0f2fb9b34ce commit 2a1cf1b6b55c8326bbe85d0fdf17b0f2fb9b34ce Author: Dmitry Chagin AuthorDate: 2023-09-05 18:16:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 18:16:39 +0000 linux(4): Deduplicate mmap2 To help porting the Linux emulation layer to a new platforms start using Linux names for conditional builds instead of architecture-specific ifdefs. MFC after: 1 week --- sys/amd64/linux/linux_machdep.c | 9 --------- sys/amd64/linux32/linux.h | 4 ++++ sys/amd64/linux32/linux32_machdep.c | 9 --------- sys/arm64/linux/linux_machdep.c | 18 ------------------ sys/compat/linux/linux_misc.c | 17 +++++++++++++++++ sys/i386/linux/linux.h | 2 ++ sys/i386/linux/linux_machdep.c | 9 --------- 7 files changed, 23 insertions(+), 45 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 7da1dccd6b45..33ce902a45bd 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -69,7 +69,6 @@ #include #include #include -#include #include #define LINUX_ARCH_AMD64 0xc000003e @@ -89,14 +88,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, args->addr, args->len, args->prot, - args->flags, args->fd, args->pgoff)); -} - int linux_iopl(struct thread *td, struct linux_iopl_args *args) { diff --git a/sys/amd64/linux32/linux.h b/sys/amd64/linux32/linux.h index 395548b3c93f..5542df1b3185 100644 --- a/sys/amd64/linux32/linux.h +++ b/sys/amd64/linux32/linux.h @@ -46,6 +46,10 @@ #define LINUX32_MAXSSIZ (64 * 1024 * 1024) /* 64MB */ #define LINUX32_MAXVMEM 0 /* Unlimited */ +#define LINUX_ARCHWANT_MMAP2PGOFF 1 /* 32-bit off_t want offset + * represented in multiples + * of page size. */ + /* * Provide a separate set of types for the Linux types. */ diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index fb088ae37b26..e10502f9bd80 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -320,15 +320,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, PTROUT(args->addr), args->len, args->prot, - args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff * - PAGE_SIZE)); -} - int linux_mmap(struct thread *td, struct linux_mmap_args *args) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index b9548387315b..3ba5683941b5 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -32,25 +32,17 @@ #include #include #include -#include #include #include #include -#include #include #include -#include #include #define LINUX_ARCH_AARCH64 0xc00000b7 -/* DTrace init */ -LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); - -/* DTrace probes */ -LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); int linux_set_upcall(struct thread *td, register_t stack) @@ -67,16 +59,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -/* LINUXTODO: deduplicate arm64 linux_mmap2 */ -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) -{ - - LIN_SDT_PROBE0(machdep, linux_mmap2, todo); - return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, - uap->flags, uap->fd, uap->pgoff)); -} - int linux_set_cloned_tls(struct thread *td, void *desc) { diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index b9c67d513cd3..cb781f3bad75 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -365,6 +365,23 @@ linux_madvise(struct thread *td, struct linux_madvise_args *uap) uap->behav)); } +int +linux_mmap2(struct thread *td, struct linux_mmap2_args *uap) +{ +#if defined(LINUX_ARCHWANT_MMAP2PGOFF) + /* + * For architectures with sizeof (off_t) < sizeof (loff_t) mmap is + * implemented with mmap2 syscall and the offset is represented in + * multiples of page size. + */ + return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, + uap->flags, uap->fd, (uint64_t)(uint32_t)uap->pgoff * PAGE_SIZE)); +#else + return (linux_mmap_common(td, PTROUT(uap->addr), uap->len, uap->prot, + uap->flags, uap->fd, uap->pgoff)); +#endif +} + #ifdef LINUX_LEGACY_SYSCALLS int linux_time(struct thread *td, struct linux_time_args *args) diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 643c240f8e37..914dc9c9ae84 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -38,6 +38,8 @@ #define LINUX_DTRACE linuxulator +#define LINUX_ARCHWANT_MMAP2PGOFF 1 + /* * Provide a separate set of types for the Linux types. */ diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 7f1738cda845..b5d42dc22162 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -308,15 +308,6 @@ linux_set_upcall(struct thread *td, register_t stack) return (0); } -int -linux_mmap2(struct thread *td, struct linux_mmap2_args *args) -{ - - return (linux_mmap_common(td, args->addr, args->len, args->prot, - args->flags, args->fd, (uint64_t)(uint32_t)args->pgoff * - PAGE_SIZE)); -} - int linux_mmap(struct thread *td, struct linux_mmap_args *args) { From nobody Tue Sep 5 18:19:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgDLc06kLz4skHP; Tue, 5 Sep 2023 18:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgDLb6h9Jz4CVM; Tue, 5 Sep 2023 18:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693937991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rY4iK98Sao7vRvCuOc+Xz/OVx8UkhskYA93F9mZ6A0=; b=VG699LQviH4Mu7OSHMCULaD82kmj74M/vU21roC962Tb/ocHskN6SYWrxcC/HR/UqfYFQo 1bwJ8KQPREDqz6p6/QKTorJHgmBK+u2nZTXVxwkcxyIwTcq7y7kVkUImkirp3gAzXJ1Lvy JPU3LHK7vqOGbJmOCuUq60uKXw8wOCoi26WUEOaHHPlioJBCfmezstRCAQAiwzF2x9MISw 95pbHTbVeHibFc5pXeFxs8VqrrHesL4giJKfxSUBiMnoI0ZYF9hqdLh0zq1DwXtx794ddc 5cx5OdxjaqSCtNspe1cRCOCj01r5QEnhOldNdpk3zlmqnoGGC8s34R0dRHb18Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693937991; a=rsa-sha256; cv=none; b=vCoZ5oPqLSkOnDCCU9n7hKSqMJO1dA7cMOHNPRz+f6wJ6w5DG1fr0p8NZur5VPTm2lD0UA l20OpWipaTy91nM8y/5ft3m7INPo6BsUNXT1oVJ3ugrpQyMQmCD4pdja9ahPhqAfDP8dV8 KR9aMjir9F4rADzPh5/0E2ELZRnR/okZyLR4g75Mf79JGxdl5irqB2dcYrmHdru2PRtLym qI/Mx9EoRZNwovYMXBvDL4F9typjKhSxxwyl40dn8HJypGq+Ek/ilvocodxv9/112+CTZV 6mWV527AbhNFloR9RUlRCLnUfyBBGd47mOnu9Eo8BXeNMO/yx3IMeveY1UWNmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693937991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rY4iK98Sao7vRvCuOc+Xz/OVx8UkhskYA93F9mZ6A0=; b=IazZuERV9tB+G4QCLve3A1eZvJE0wyLuwsmPYu8znrOSoKYS35cBxrYYYoI/kwotU89aCM R/AhwvEQelZ4U+8O5lG8O/oTCerqCGGgITxeCbWGzWZ4ONAvLZsBWVQsUjJIlU8ptCIuEE 5H2FHdIX/tU0/lPCwuSG/rEq96CTHqzV5RHY3s3YCeN4ylg2VloMsYaDVYdhxH+EAj4gwv xQMs/oIIlmSKrNsk+nJBZ0C9ijz8cMKQGcuJhfWef4ZU3K51thhc+E/+ijqicn3XPmymwY LMiUFS+kFoBei8+orND1f4uDmOyWDGavPKgc3dwfT7rqiWL7JBRaz/hWN/orhQ== 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 4RgDLb5hV3zk5t; Tue, 5 Sep 2023 18:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385IJph9058477; Tue, 5 Sep 2023 18:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385IJpLW058474; Tue, 5 Sep 2023 18:19:51 GMT (envelope-from git) Date: Tue, 5 Sep 2023 18:19:51 GMT Message-Id: <202309051819.385IJpLW058474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 20845a6994c5 - main - linux(4): Validate exec_setregs on arm64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20845a6994c548977874d1f413044d43c8474f0a Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=20845a6994c548977874d1f413044d43c8474f0a commit 20845a6994c548977874d1f413044d43c8474f0a Author: Dmitry Chagin AuthorDate: 2023-09-05 18:19:08 +0000 Commit: Dmitry Chagin CommitDate: 2023-09-05 18:19:08 +0000 linux(4): Validate exec_setregs on arm64 The lr register is cleared at the beginning of the _dl_start and _start, so there is no need to initialize it. Gnu libc _start takes an rtld_fini pointer in x0 which is set by ld.so for __libc_start_main, the kernel does not register any atexit pointers. While here fix whitespaces. MFC after: 1 week --- sys/arm64/linux/linux_sysvec.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 885ac4657380..3072732de768 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -51,7 +51,6 @@ #include #include -#include #include #include #include @@ -107,12 +106,6 @@ static void linux_exec_sysvec_init(void *param); static int linux_on_exec_vmspace(struct proc *p, struct image_params *imgp); -/* DTrace init */ -LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); - -/* DTrace probes */ -LIN_SDT_PROBE_DEFINE0(sysvec, linux_exec_setregs, todo); - LINUX_VDSO_SYM_CHAR(linux_platform); LINUX_VDSO_SYM_INTPTR(kern_timekeep_base); LINUX_VDSO_SYM_INTPTR(__user_rt_sigreturn); @@ -178,19 +171,9 @@ linux_exec_setregs(struct thread *td, struct image_params *imgp, struct trapframe *regs = td->td_frame; struct pcb *pcb = td->td_pcb; - /* LINUXTODO: validate */ - LIN_SDT_PROBE0(sysvec, linux_exec_setregs, todo); - memset(regs, 0, sizeof(*regs)); - /* glibc start.S registers function pointer in x0 with atexit. */ - regs->tf_sp = stack; -#if 0 /* LINUXTODO: See if this is used. */ - regs->tf_lr = imgp->entry_addr; -#else - regs->tf_lr = 0xffffffffffffffff; -#endif - regs->tf_elr = imgp->entry_addr; - + regs->tf_sp = stack; + regs->tf_elr = imgp->entry_addr; pcb->pcb_tpidr_el0 = 0; pcb->pcb_tpidrro_el0 = 0; WRITE_SPECIALREG(tpidrro_el0, 0); From nobody Tue Sep 5 19:09:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgFRj3Hj6z4rvVQ; Tue, 5 Sep 2023 19:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgFRj2s4Bz4QkM; Tue, 5 Sep 2023 19:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693940961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAXXQ6aUA7cqOuglqweBZ84dtWX7DJX/tlyPc1B4tN4=; b=Rb9denQEwci5JhXs0MCJlukQ1qd/JXTvovqL0kbSaTKFZlyjICnftYSaQABtKy+hdzzZMh royQkwIHX+kocr08z1sGFVHd2J9LEpcf+mb2F0wnv2PACg19wRrSxixnoFwVfbjXyYRNtU ogPZY+6hEM7w1GYYyp6adv7cTv8q6q9/itYc1kqhmsCnxeCGrdInzSIxZXpZMlXUV5k8/c tK1X1JQiDsTy6OfA6XbBwxucE+LDu6iq+gi74gHQ4IOk4ut+A3kpVejpmkR4VbjjV9Uh0h Bo+CRyCkblFMpE95blOYhFUWIm5S4fpX1KbfJ2ocuvtcmWNJ93dQHB9Sp7UWqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693940961; a=rsa-sha256; cv=none; b=t8jO7MfTDKIRx/9+f2/AB6nlEmkaRNf40y+fH+SMRf9jpNyLazUchdMjFVoruNjYs0wQlf DuigoOS/t7Y/kxKvjVVtEJWSHLvD9CScLqEaD8oHttx7Ll7Am3tHc0z5AbVeFdu9fO6zrF nyTjDt8yMpIXvu4NYwynKGhQBOT8BaDlxqhunzvDytAqtuFUHJObsJzI72QkRwYUhxOv6l lLZ32SQcCbMZNRN1t7otOsf1QygegFPoN2Gq8o0t3F6k+krItGCF6uPCwAkDy56J65Gmh1 sBTwqlbasfulFQy+pFgwUt2z70EIo2M3Kmd2VjgK1lpd+kGWXmX6XkleFquJ3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693940961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sAXXQ6aUA7cqOuglqweBZ84dtWX7DJX/tlyPc1B4tN4=; b=kcEWeIA2jRu3N5N5YbUDHFTfa0zrSMot6+jl4923vihCjNNYIaFOdbosZuYKCisFOQc8D/ e1bEdEjgXMi94nOPrC4+iqF9q7u9LErN/gsGGG2iBgji4OvTNX/B0bTdf9BdY/QP3Uve3A k6UnsMv0FT/0mLvRAzFkSvStUQVlQsyTQUfThCg1HrP2kl6e6y2Eb6SjfC9mLdPha2ksrm tmkutDMbw1p6z4sGOMFnv9Xt8YhZ3xMi1D7Qt4cwv2pHxatFGPFFFhnUOzLz5LopTyeghs BEoBv7IP2/UI/2R1GrF5StNFj5dOa67MnFgRA79hTdP6kJKtV/vWradixSV02w== 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 4RgFRj1qX0zlbZ; Tue, 5 Sep 2023 19:09:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385J9LmE042176; Tue, 5 Sep 2023 19:09:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385J9Lnf042173; Tue, 5 Sep 2023 19:09:21 GMT (envelope-from git) Date: Tue, 5 Sep 2023 19:09:21 GMT Message-Id: <202309051909.385J9Lnf042173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 3a7ffe206ce7 - main - localedef: expand the default charmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a7ffe206ce7e4741fae26432f6d6e5159207f45 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3a7ffe206ce7e4741fae26432f6d6e5159207f45 commit 3a7ffe206ce7e4741fae26432f6d6e5159207f45 Author: Kyle Evans AuthorDate: 2023-09-02 06:13:02 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 19:08:59 +0000 localedef: expand the default charmap POSIX defines a number of other control characters as well as alternative aliases for some that should be provided in the default set, so let's go ahead and add those. Reviewed by: bapt, yuripv Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D41692 --- usr.bin/localedef/charmap.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c index 44b7e3292eae..1da4d8921ecb 100644 --- a/usr.bin/localedef/charmap.c +++ b/usr.bin/localedef/charmap.c @@ -70,13 +70,49 @@ static const struct { int ch; } portable_chars[] = { { "NUL", '\0' }, + { "SOH", '\x01' }, + { "STX", '\x02' }, + { "ETX", '\x03' }, + { "EOT", '\x04' }, + { "ENQ", '\x05' }, + { "ACK", '\x06' }, + { "BEL", '\a' }, { "alert", '\a' }, + { "BS", '\b' }, { "backspace", '\b' }, + { "HT", '\t' }, { "tab", '\t' }, - { "carriage-return", '\r' }, + { "LF", '\n' }, { "newline", '\n' }, + { "VT", '\v' }, { "vertical-tab", '\v' }, + { "FF", '\f' }, { "form-feed", '\f' }, + { "CR", '\r' }, + { "carriage-return", '\r' }, + { "SO", '\x0e' }, + { "SI", '\x0f' }, + { "DLE", '\x10' }, + { "DC1", '\x11' }, + { "DC2", '\x12' }, + { "DC3", '\x13' }, + { "DC4", '\x14' }, + { "NAK", '\x15' }, + { "SYN", '\x16' }, + { "ETB", '\x17' }, + { "CAN", '\x18' }, + { "EM", '\x19' }, + { "SUB", '\x1a' }, + { "ESC", '\x1b' }, + { "FS", '\x1c' }, + { "IS4", '\x1c' }, + { "GS", '\x1d' }, + { "IS3", '\x1d' }, + { "RS", '\x1e' }, + { "IS2", '\x1e' }, + { "US", '\x1f' }, + { "IS1", '\x1f' }, + { "DEL", '\x7f' }, { "space", ' ' }, { "exclamation-mark", '!' }, { "quotation-mark", '"' }, From nobody Tue Sep 5 19:09:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgFRk3wSxz4rvjW; Tue, 5 Sep 2023 19:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgFRk3RX2z4QvQ; Tue, 5 Sep 2023 19:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693940962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gdkH7TDP2RW+IjmkxHalXrjSCwBNTdfVWSLOnoWX/4=; b=iaNOstNrLqNZQvUUfa179+Td8vBLCVu2W1SOu4mFnwlMI41FLpVEsP9GA8NmVevydEjhlM c2Tgx1yslq9E+zrC3OELHcY7Y/NiZTZkH6CoGwpd9RCT1b0NL+Q/JDOxJWe8tQ1EBhaGXw qaexeTYxPiRoq2mMdcTkcQa4prwVHvJjj2xDD0NzaEmQqCu9BC2WOiX72AYiM9nQiPOhlk 15IA7ADQV9OKHcis/8qXAk/BNt7tjIDOXxWbeeiCypurLf0vElnBFGcTzgXtdqNgYsqbMA eNF7b+2ZpA0UKvd8gsrgv/kmu8q6Ayuf5dCcut3eYxtti1zAG7MJyJNL4bWfqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693940962; a=rsa-sha256; cv=none; b=oRRjHZlJNm50NwEZkL69OCbQGmn+Zu/1G2G0cA/0St0XA267wXYSFOWlGJW++1mek7T4QW W9h1MriQj4UJgDg9xobTmn5+OrRBNVYV/YJTkXxTlMT6p9HSL1P/xedJ3HBeU9y5WZB8el BnNb2RgrVpHGuNj1MxwlIA5WBfuHW6yPY1FL8ryXC0WwXnlBlUXhU34ECa60xhFTiG9Dnt Xy8BEP9eA76WVgYM6iV4+mhBS5kism2L5yi56A0Hq1MecDiVKHqXTUgyjWCGEqTcCKecQZ 5thhR5uglMVaZsBBn2S8ajphE6XXXRFoIcYD+Lv7hdF70o1BCoat/Y/YuAxGPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693940962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/gdkH7TDP2RW+IjmkxHalXrjSCwBNTdfVWSLOnoWX/4=; b=ISX6fnaS1GPblWZr/OTEi32SH98tbg4NlQCWZ+7L9Na1FyS9dYy4kDlI+DLFvleGc/tNnH hTLAVHbp/BydJmvSh/k7rjVivwplSSqXhijcn23BiGcxFJGhyC2jfprdjWsvaDr9tAifjg UHzBS8eFQLUBItOerHzNRu9C7LupsaFoLC64CAOt1yaj4PXmuqJLey/x4Z0LX8AiDnVQN9 C0WE2qJaFNRR1EEEBfx/7r0S/Yo+IuzsjHFMKuy7lXflVs1PdNdsivOHv0O7yIF1wyse+9 PL5298blxpppA54feSOfu3NkBz1konhGlIeVjLV7DNO7loPR1YHDKdEqDVeR1Q== 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 4RgFRk2TLZzlYS; Tue, 5 Sep 2023 19:09:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385J9MQi042223; Tue, 5 Sep 2023 19:09:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385J9Mi0042220; Tue, 5 Sep 2023 19:09:22 GMT (envelope-from git) Date: Tue, 5 Sep 2023 19:09:22 GMT Message-Id: <202309051909.385J9Mi0042220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 3141e51d2e38 - main - localedef: add newlines to error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3141e51d2e38fa7b9e6d81477dfa860d087c514d Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3141e51d2e38fa7b9e6d81477dfa860d087c514d commit 3141e51d2e38fa7b9e6d81477dfa860d087c514d Author: Kyle Evans AuthorDate: 2023-09-02 06:24:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-05 19:08:59 +0000 localedef: add newlines to error messages These won't be added elsewhere, so add a little bit of room to make these messages a little easier to read. The existing set is a mixed bag, there are somewhere in the ballpark of 45, 46 printfs to stderr and 19 of those had newlines. Reviewed by: yuripv Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D41693 --- usr.bin/localedef/collate.c | 34 +++++++++++++++++----------------- usr.bin/localedef/localedef.c | 4 ++-- usr.bin/localedef/localedef.h | 2 +- usr.bin/localedef/monetary.c | 4 ++-- usr.bin/localedef/numeric.c | 2 +- usr.bin/localedef/time.c | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index d76c2c2c08b2..2a080773a95e 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -272,7 +272,7 @@ new_pri(void) maxpri = maxpri ? maxpri * 2 : 1024; prilist = realloc(prilist, sizeof (collpri_t) * maxpri); if (prilist == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return (-1); } for (i = numpri; i < maxpri; i++) { @@ -333,7 +333,7 @@ resolve_pri(int32_t ref) if (pri->pass == pass) { /* report a line with the circular symbol */ lineno = pri->lineno; - fprintf(stderr,"circular reference in order list"); + fprintf(stderr,"circular reference in order list\n"); return (-1); } if ((pri->pri < 0) || (pri->pri >= numpri)) { @@ -494,7 +494,7 @@ define_collsym(char *name) collsym_t *sym; if ((sym = calloc(1, sizeof(*sym))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } sym->name = name; @@ -541,7 +541,7 @@ get_collundef(char *name) if ((ud = RB_FIND(collundefs, &collundefs, &srch)) == NULL) { if (((ud = calloc(1, sizeof(*ud))) == NULL) || ((ud->name = strdup(name)) == NULL)) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); free(ud); return (NULL); } @@ -565,7 +565,7 @@ get_collchar(wchar_t wc, int create) cc = RB_FIND(collchars, &collchars, &srch); if ((cc == NULL) && create) { if ((cc = calloc(1, sizeof(*cc))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return (NULL); } for (i = 0; i < NUM_WT; i++) { @@ -687,7 +687,7 @@ start_order(int type) /* this is used to protect ELLIPSIS processing */ if ((lastorder == T_ELLIPSIS) && (type != T_CHAR)) { - fprintf(stderr, "character value expected"); + fprintf(stderr, "character value expected\n"); } for (i = 0; i < COLL_WEIGHTS_MAX; i++) { @@ -728,7 +728,7 @@ start_order_char(wchar_t wc) int i; if (wc < ellipsis_start) { - fprintf(stderr, "malformed range!"); + fprintf(stderr, "malformed range!\n"); return; } while (ellipsis_start < wc) { @@ -776,7 +776,7 @@ start_order_ellipsis(void) start_order(T_ELLIPSIS); if (lastorder != T_CHAR) { - fprintf(stderr, "illegal starting point for range"); + fprintf(stderr, "illegal starting point for range\n"); return; } @@ -792,12 +792,12 @@ define_collelem(char *name, wchar_t *wcs) int i; if (wcslen(wcs) >= COLLATE_STR_LEN) { - fprintf(stderr,"expanded collation element too long"); + fprintf(stderr,"expanded collation element too long\n"); return; } if ((e = calloc(1, sizeof(*e))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } e->expand = wcs; @@ -816,7 +816,7 @@ define_collelem(char *name, wchar_t *wcs) /* A character sequence can only reduce to one element. */ if ((RB_FIND(elem_by_symbol, &elem_by_symbol, e) != NULL) || (RB_FIND(elem_by_expand, &elem_by_expand, e) != NULL)) { - fprintf(stderr, "duplicate collating element definition"); + fprintf(stderr, "duplicate collating element definition\n"); free(e); return; } @@ -932,7 +932,7 @@ add_order_subst(void) if (s == NULL) { if ((s = calloc(1, sizeof(*s))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } s->key = new_pri(); @@ -976,7 +976,7 @@ static void add_subst_pri(int32_t ref) { if (curr_subst >= COLLATE_STR_LEN) { - fprintf(stderr,"substitution string is too long"); + fprintf(stderr,"substitution string is too long\n"); return; } subst_weights[curr_subst] = ref; @@ -1040,7 +1040,7 @@ add_weight(int32_t ref, int pass) return; if ((w = calloc(1, sizeof(*w))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } w->pri = srch.pri; @@ -1214,7 +1214,7 @@ dump_collate(void) RB_COUNT(temp, substs, &substs[i], n); subst_count[i] = n; if ((st = calloc(n, sizeof(collate_subst_t))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1245,7 +1245,7 @@ dump_collate(void) RB_NUMNODES(collelem_t, elem_by_expand, &elem_by_expand, chain_count); chain = calloc(chain_count, sizeof(collate_chain_t)); if (chain == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1265,7 +1265,7 @@ dump_collate(void) RB_NUMNODES(collchar_t, collchars, &collchars, n); large = calloc(n, sizeof(collate_large_t)); if (large == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c index ae0bd052b40c..5ff146d6f655 100644 --- a/usr.bin/localedef/localedef.c +++ b/usr.bin/localedef/localedef.c @@ -167,7 +167,7 @@ copy_category(char *src) } if (rv != 0) { - fprintf(stderr,"source locale data unavailable: %s", src); + fprintf(stderr,"source locale data unavailable: %s\n", src); return; } @@ -182,7 +182,7 @@ copy_category(char *src) (void) mkdir(dirname(category_file()), 0755); if (link(srcpath, category_file()) != 0) { - fprintf(stderr,"unable to copy locale data: %s", + fprintf(stderr,"unable to copy locale data: %s\n", strerror(errno)); return; } diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h index 2aece1543d5b..4b141ac8dc09 100644 --- a/usr.bin/localedef/localedef.h +++ b/usr.bin/localedef/localedef.h @@ -174,4 +174,4 @@ const char *get_wide_encoding(void); int max_wide(void); //#define _(x) gettext(x) -#define INTERR fprintf(stderr,"internal fault (%s:%d)", __FILE__, __LINE__) +#define INTERR fprintf(stderr,"internal fault (%s:%d)\n", __FILE__, __LINE__) diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c index 659c495a71fe..7a77ac7e256c 100644 --- a/usr.bin/localedef/monetary.c +++ b/usr.bin/localedef/monetary.c @@ -93,7 +93,7 @@ add_monetary_num(int n) (void) asprintf(&str, "%d", n); if (str == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } @@ -167,7 +167,7 @@ add_monetary_group(int n) (void) asprintf(&s, "%s;%d", mon.mon_grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)mon.mon_grouping); mon.mon_grouping = s; diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c index 358355fe96ae..5533b7c10e1a 100644 --- a/usr.bin/localedef/numeric.c +++ b/usr.bin/localedef/numeric.c @@ -93,7 +93,7 @@ add_numeric_group(int n) (void) asprintf(&s, "%s;%d", numeric.grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)numeric.grouping); numeric.grouping = s; diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c index 2de922a8eb12..7a56e244c921 100644 --- a/usr.bin/localedef/time.c +++ b/usr.bin/localedef/time.c @@ -104,7 +104,7 @@ add_list(const char *ptr[], char *str, int limit) return; } } - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); } void @@ -137,7 +137,7 @@ add_time_list(wchar_t *wcs) } else if (tm.pm == NULL) { tm.pm = str; } else { - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); free(str); } break; @@ -180,11 +180,11 @@ check_time_list(void) case T_ALT_DIGITS: return; default: - fprintf(stderr,"unknown list"); + fprintf(stderr,"unknown list\n"); break; } - fprintf(stderr,"too few items in list (%d)", last_kw); + fprintf(stderr,"too few items in list (%d)\n", last_kw); } void From nobody Tue Sep 5 20:37:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgHPQ332sz4sg1m; Tue, 5 Sep 2023 20:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgHPQ2W8mz3MTC; Tue, 5 Sep 2023 20:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693946250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yok/EQP09prjdpmpsb2WwhiEs3wlcQkFABn1mms6BCw=; b=pJ7JEcBgil8tnw8OUV6be5iYrKLozVsFN9/8himhlFLyLQ1CG5lQwS4shbowp7s4can6UX riXVY0wfvTY5KKpUPQiTjomM0uVdRlCB7APNpxwpdCuDEH5XxOSTKcRsbq/UKhSRPokNed QzZczYF7iNlgGypIUoi4YtRY2le4aTCiGPMC7GuzCoZlly1NVOhUzf/X02ciAdSw2peBZ0 x+hXCjaUi4K3qhR2pzCHZZrv2CIW4HrJcefDVuU4Y874QncqWlIfQ8O62wCoaHzsx/4nwg DrATVCrPuEjmOdd5C7GSVIa5JN2+aTpVPkVabe0HTDQL+1volgxc3Ur6Df1b+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693946250; a=rsa-sha256; cv=none; b=FoAd5gykHQuC2FrcKfxIfZ1O3Lxv6ghpjntOEcTySMnOX6TpnQKKOuwOC5XcmlSv2S4SN5 0govI60QvdcB02bBkdBZSpU135+fkTPn5dPLaxiiLQOq1LLvidn6aKZw276k5m6lm0rkHZ YZZmR+FVfUUV/KpI/GlC0S8wCo7AR/YKvK6o0YqgElK1iKonE3HvVGF9kGpZB8vnIpdSij W5zzPAqJv71TL1DI4yT+Yq0cyK406j5RoVhsLMZHppev3idJwAQSWAYqJFLgSz01ojz90T JVGvEd2vKmUEBeK4zjfIh2iV31iAZ4z/rfFvtO5dPyh9xbu3Hu0HZIG+VFvnIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693946250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yok/EQP09prjdpmpsb2WwhiEs3wlcQkFABn1mms6BCw=; b=sttYknPE/qJRwo4hWN/ERcbexyJ+YxloCv0gL1/mmKG/j2xFk+IhiCrU/nczdXHXln1wCM Z7wrFRBKCzqBYf8xcyoZRyX0/TMK7rXgpdSwoTbRfLo91vdAwyNrdGzlg6I/rr1PNct150 Otl7u7dpuGi1nT9qXbukQ92DyhZyECNlwqlHUeNrj49xEqRXrMjSEFXSmSbqUbRCX1S3k+ FQ6hJDZCePvOyh+nDdkvSJQIEXzjx0nhWItz+rH9Rf7asThS0Cti2XEVN2/syIO3CWztTD Q3EPplNDl/pPiCh0W+rLqWEPXyGd3VcDuxLlthEjtv/d/OBiXZilF3P3IjR8Ug== 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 4RgHPQ1SnRznpT; Tue, 5 Sep 2023 20:37:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385KbU5H090759; Tue, 5 Sep 2023 20:37:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385KbUph090756; Tue, 5 Sep 2023 20:37:30 GMT (envelope-from git) Date: Tue, 5 Sep 2023 20:37:30 GMT Message-Id: <202309052037.385KbUph090756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jamie Gritton Subject: git: 165234d55274 - main - jail.conf(5): Fix and expand description of ".include". List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 165234d5527440b7755b01554ff7633e33c0d285 Auto-Submitted: auto-generated The branch main has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=165234d5527440b7755b01554ff7633e33c0d285 commit 165234d5527440b7755b01554ff7633e33c0d285 Author: Jamie Gritton AuthorDate: 2023-09-05 20:35:54 +0000 Commit: Jamie Gritton CommitDate: 2023-09-05 20:35:54 +0000 jail.conf(5): Fix and expand description of ".include". Escape a period that caused a line not to be includesd. Also mention that glob(3) patterns may be included, and a consequence of that. PR: 273561 Reported by: crest@rlwinm.de Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41723 --- usr.sbin/jail/jail.conf.5 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5 index 33a66c85e7ea..0b82a972020c 100644 --- a/usr.sbin/jail/jail.conf.5 +++ b/usr.sbin/jail/jail.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Jun 3, 2023 +.Dd September 5, 2023 .Dt JAIL.CONF 5 .Os .Sh NAME @@ -164,11 +164,22 @@ and .Ss Includes A line of the form .Bd -literal -offset ident -.include "filename"; +\&.include "filename"; .Ed .Pp -will include another file in the configuration. The filename must be -a literal string, and cannot contain variable expansions. +will include another file (or files) in the configuration. +The filename should be either absolute, or relative to the +configuration file's directory. It cannot contain variable +expansions, but may contain +.Xr glob 3 +patterns. +.Pp +The included file must exist, though a filename glob may match zero or +more files. This allows inclusion of any/all files in a directory, +such as +.Dq /etc/jail.conf.d/*.conf , +or conditional inclusion of a single file, such as +.Dq jail.foo[.]conf . .Ss Comments The configuration file may contain comments in the common C, C++, and shell formats: From nobody Tue Sep 5 21:16:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgJGp0SDnz4s2FV; Tue, 5 Sep 2023 21:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgJGn72KKz3Yg5; Tue, 5 Sep 2023 21:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uiBEK+AK7wAq1x08CIA2ltQpSdB04ho9Rus5B1nPLs=; b=MIkSyrl9Z6RSWdlT9h99I8AuFO46yC1cZu6BykMqerMqohK8k8v14qKkXp5Y2cgyC+O3iR u8nj8enxKlN5DWn7hh5rtDuTPOgLLLYUa5S6Hep8G0aGOGWxi0FyLJse/HknduJtqMeR0a a2CNYOL4Aox3RiekE/YaDV7EWKQEAB0t6VA0EPDqguUzikA+7VSLR87iqxCXsO4lLexiHK SGOiZ9KAkzxAzTWTrXJifMGZvM/Wg7/pHrT2vxXmkEWZYNdckANgt2yyveH9fOOrNpPW5z Au3MQ+o0GI35v4ggs3IqxPDux4dwe54uxKIYvFF9zw0j9mPTG7lE+Yu+Uy7v4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693948610; a=rsa-sha256; cv=none; b=dHL3/6nbRqTRwg6RiIgb0e08i7qDr87EPT3XvRBdizbFnGFPZRh+hpwC4xyIRZJjnt40zr dU110SeT6WxdI5rLj+hicqH1axy0BD/hUvIeF8ASIOXRkR0D8QzBQ5ZlQCL669NOjZoThV pnpIf+a9hOdJsl8eTL6HW5/T3edkEZsz5r1K5XQ+JioxU90bT9NdZq/MBwzwNgRH5mJxC3 3F9TgzwC7zxutey3uLCtxjbK+S2TK3NvtBeAjJ7AyR4iy1psAEjPfrw/i3nAyDQUpSSjCW dv+ccqbQhEupPVRyiwhDySHVRCJfd9qaukZtrIT2DIlg8ROHF/iI+xrI6CVjzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9uiBEK+AK7wAq1x08CIA2ltQpSdB04ho9Rus5B1nPLs=; b=lghF7NBP6DWtkhAnPbtWKwIrQMp1f5nd40b6hCE2N12qJap5+n5P00CSqJdisK/ie1IXdn nsHGyte9GnKjNMKfpdWnWCnWQ977AYgHSC4bbyX832ndNj6z4CuhxOg+tzaO7lUqbmIz2v 06czALJl8onvdyAWt+Sn3yy3k0yQ4c6+FE3sMKDL++zkjt6K4+cPJ7OMF7MewjXzVJvZ5l qlhlUx/2yvW7Lghbu2mqTOgtnNiQGJMcix0mvJRWLDy3AYtaetslfFSUbkA32bfGVD9Cus qxnxZdkI+E6cjyQc14VBnEfulQBKES9D4Qpl4OVvhftFbuHGfU4iQFWWljyVmw== 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 4RgJGn5Y0rzpb7; Tue, 5 Sep 2023 21:16:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385LGnnI059738; Tue, 5 Sep 2023 21:16:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385LGnxM059735; Tue, 5 Sep 2023 21:16:49 GMT (envelope-from git) Date: Tue, 5 Sep 2023 21:16:49 GMT Message-Id: <202309052116.385LGnxM059735@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: aece2a4fb1b3 - main - rtw88: detach firmware from build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aece2a4fb1b3e4904b7980947c2a89a96d07f6ba Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=aece2a4fb1b3e4904b7980947c2a89a96d07f6ba commit aece2a4fb1b3e4904b7980947c2a89a96d07f6ba Author: Bjoern A. Zeeb AuthorDate: 2023-06-08 21:24:44 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-05 21:13:18 +0000 rtw88: detach firmware from build Firmware is kept in ports now and fwget will find the right one to install. MFC after: 20 days X-MFC: will see about 14/13 --- sys/modules/Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 4b98c7ed6e0d..3eff75312fd3 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -339,7 +339,6 @@ SUBDIR= \ ${_rockchip} \ rtsx \ ${_rtw88} \ - ${_rtw88fw} \ rtwn \ rtwn_pci \ rtwn_usb \ @@ -567,9 +566,6 @@ _iwlwififw= iwlwififw .endif _ossl= ossl _rtw88= rtw88 -.if ${MK_SOURCELESS_UCODE} != "no" -_rtw88fw= rtw88fw -.endif _vmware= vmware .endif From nobody Tue Sep 5 21:16:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgJGq1CRvz4s2MD; Tue, 5 Sep 2023 21:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgJGq0pPKz3YPT; Tue, 5 Sep 2023 21:16:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVBJASkxTUweSqYIVNmJBhTqDwIRGlt/fZ6jXCcK5Hk=; b=dZxGu7sw2h7A7W59dDJ7MUhElUeBoMrT5vOxoG/aP4UEvN8uKn7Z5mS17phvvYKnFFog67 pOhiZG5BUcDVHsmnCwm0nW2M+l6A2eyBhlzDixOCXU8I5ulfhMPybquUotYLN2SM/k96ZH tKRRybw4TRtB2n7cRj2vgWOqjOZtsLVuvSMIjx0p3J8YyFSQToDXHz0Bt19EyPzwjZ9t8j 05G//kpJsvX82SFayyAV+0LuYsoHdcjUPQl/KHnpr1wz5aPyTvY6tiocBVJY8u25I69kV0 p61KYOyIV814u89pTAeFKhwVInyhbdL5jmMvdnZWyntdx0+cs6doRJ4DhO94KQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693948611; a=rsa-sha256; cv=none; b=mAnGldN4ps5y9GcdWoRxIGVMzKXKl/A8jfJJLaJhZwtotLgctRum4MHVhY/QhtUApdi4OG 6Fls07T997XTn9vIFEPAzn91z/z+yH4BJ0RAFDBoZR7kQgeXDwnt+M9itJ7H0mXE+JZGZX V0DT75LhO3t1y8vZ8gW+6rGkBDRQ/Nh3Q/nj4RvSHAp2XB1s3dqHdYrJ2hcoTqjwSjyb/R YElHn2RqUQ1ClvmS2QziyHhuxq54bSBJ7KI84/AuqM2D16tBkiO3EJ+Plrb4JPcsmSMNm8 cVukIl42QQawwe4TAt+OqdVdS0PU8cwdrFTh0Kt4Wcc8VbF/hvJPtC9FEE5ezA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eVBJASkxTUweSqYIVNmJBhTqDwIRGlt/fZ6jXCcK5Hk=; b=lcO9XwkUisRz7XYNLMsnD3YXlemTsa+mkTJkGgrO0rit9M4FV6R65tGXua32scxesfNaF4 64FLOO+3xHwO9iYn7X+lY/8Tlqoe305Ckc1QgRsPlYodWXdsy5gfDNdrO1mPPwTaacZ4DA ccMfvWxr3MGDwaWN3weJp6hnd+98gyACvQ0Enzs6NKSuROD7uswZFRaDqmsa6kPx1lMk99 ZtRbwn5gKffhCjb6DWq9ARSOKq84mMOpoJDaLLlLxCtoSsUsjJMEaKEtoOa650TkytEC1p MIgvEFz2XLeMFALwTDRCK9fZ9gUDYrSBdN+VTzIZBoKpOB+rc5fqyl8WcrAnfQ== 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 4RgJGp6cvfzpb8; Tue, 5 Sep 2023 21:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385LGoKH059787; Tue, 5 Sep 2023 21:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385LGoau059784; Tue, 5 Sep 2023 21:16:50 GMT (envelope-from git) Date: Tue, 5 Sep 2023 21:16:50 GMT Message-Id: <202309052116.385LGoau059784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf94672363d6638b7268c05b4628b62bbfc8dbe5 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=cf94672363d6638b7268c05b4628b62bbfc8dbe5 commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 Author: Bjoern A. Zeeb AuthorDate: 2023-06-08 21:35:09 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-05 21:13:18 +0000 rtw88/rtw89: remove local firmware. Remove firmware from src/ in favor of the ports/packages and fwget(8). This will allow us to shrink the size of src (and installed modules). Update the rtw88 man page to reflect the change. MFC after: 20 days X-MFC: will see about 14/13 --- ObsoleteFiles.inc | 3 ++ share/doc/legal/Makefile | 3 +- share/doc/legal/realtek_rtw88/Makefile | 6 --- share/man/man4/Makefile | 1 - share/man/man4/rtw88.4 | 21 ++++++-- share/man/man4/rtw88fw.4 | 54 --------------------- .../dev/rtw88fw/LICENCE.rtlwifi_firmware.txt | 39 --------------- sys/contrib/dev/rtw88fw/README | 34 ------------- sys/contrib/dev/rtw88fw/WHENCE | 19 -------- sys/contrib/dev/rtw88fw/rtw8723d_fw.bin | Bin 28884 -> 0 bytes sys/contrib/dev/rtw88fw/rtw8821c_fw.bin | Bin 138984 -> 0 bytes sys/contrib/dev/rtw88fw/rtw8822b_fw.bin | Bin 150984 -> 0 bytes sys/contrib/dev/rtw88fw/rtw8822c_fw.bin | Bin 200312 -> 0 bytes sys/contrib/dev/rtw88fw/rtw8822c_wow_fw.bin | Bin 145224 -> 0 bytes .../dev/rtw89fw/LICENCE.rtlwifi_firmware.txt | 39 --------------- sys/contrib/dev/rtw89fw/WHENCE | 8 --- sys/contrib/dev/rtw89fw/rtw8852a_fw.bin | Bin 1423232 -> 0 bytes sys/contrib/dev/rtw89fw/rtw8852c_fw.bin | Bin 1340192 -> 0 bytes 18 files changed, 20 insertions(+), 207 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 98644685d83e..55a198db4d04 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20230905 +OLD_FILES+=usr/share/doc/legal/realtek_rtw88_firmware.LICENCE + # 20230828 MOVED_LIBS+=usr/lib/librt.so.1 diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile index 3a17e2f614e5..8e674019e9a2 100644 --- a/share/doc/legal/Makefile +++ b/share/doc/legal/Makefile @@ -4,8 +4,7 @@ SUBDIR= intel_ipw \ intel_iwlwififw \ intel_iwn \ intel_wpi \ - realtek \ - realtek_rtw88 + realtek SUBDIR_PARALLEL= diff --git a/share/doc/legal/realtek_rtw88/Makefile b/share/doc/legal/realtek_rtw88/Makefile deleted file mode 100644 index fa98e7c6094e..000000000000 --- a/share/doc/legal/realtek_rtw88/Makefile +++ /dev/null @@ -1,6 +0,0 @@ - -FILES= ${SRCTOP}/sys/contrib/dev/rtw88fw/LICENCE.rtlwifi_firmware.txt -FILESDIR= ${SHAREDIR}/doc/legal -FILESNAME= realtek_rtw88_firmware.LICENCE - -.include diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 148670072757..98fdfe428d99 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -471,7 +471,6 @@ MAN= aac.4 \ rtnetlink.4 \ rtsx.4 \ rtw88.4 \ - rtw88fw.4 \ rtwn.4 \ rtwnfw.4 \ rtwn_pci.4 \ diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4 index 6036ad62d84d..01572af8cbd3 100644 --- a/share/man/man4/rtw88.4 +++ b/share/man/man4/rtw88.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 22, 2023 +.Dd June 8, 2023 .Dt RTW88 4 .Os .Sh NAME @@ -42,10 +42,6 @@ to manually load the driver as a module at boot time: kld_list="${kld_list} if_rtw88" .Ed .Pp -The driver should automatically load any -.Xr rtw88fw 4 -firmware needed for the particular chipset. -.Pp It is discouraged to load the driver from .Xr loader 8 . .Sh DESCRIPTION @@ -61,6 +57,20 @@ the following chipsets: .It Realtek 802.11ac wireless 8822ce (RTL8822CE) .El .Pp +This driver requires firmware to be loaded before it will work. +The package +.Pa wifi-firmware-rtw88-kmod +from the +.Pa ports/net/wifi-firmware-rtw88-kmod +port needs to be installed before the driver is loaded. +Otherwise no +.Xr wlan 4 +interface can be created using +.Xr ifconfig 8 . +One can use +.Xr fwget 8 +to install the correct firmware package. +.Pp The driver uses the .\" No LinuxKPI man pages so no .Xr here. .Em linuxkpi_wlan @@ -102,6 +112,7 @@ section above. .Sh SEE ALSO .Xr rtw88fw 4 , .Xr wlan 4 , +.Xr fwget 8 , .Xr ifconfig 8 , .Xr wpa_supplicant 8 .Sh HISTORY diff --git a/share/man/man4/rtw88fw.4 b/share/man/man4/rtw88fw.4 deleted file mode 100644 index 529d283b4697..000000000000 --- a/share/man/man4/rtw88fw.4 +++ /dev/null @@ -1,54 +0,0 @@ -.\"- -.\" Copyright (c) 2022 Bjoern A. Zeeb -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd March 31, 2022 -.Dt rtw88fw 4 -.Os -.Sh NAME -.Nm rtw88fw -.Nd Firmware modules for Realtek rtw88 wireless network driver -.Sh SYNOPSIS -The -.Xr rtw88 4 -driver should auto-load any firmware needed. -It is discouraged to load the driver or firmware manually from -.Xr loader 8 . -.Sh DESCRIPTION -Multiple modules provide access to firmware for the various chipset -models supported by the -.Xr rtw88 4 -driver. -.Sh FILES -A copy of the -.Xr rtw88 4 -firmware license is installed at -.Em /usr/share/doc/legal/realtek_rtw88_firmware.LICENCE . -.Sh SEE ALSO -.Xr rtw88 4 , -.Xr firmware 9 -.Sh HISTORY -The -.Nm -firmware modules first appeared in -.Fx 14.0 . diff --git a/sys/contrib/dev/rtw88fw/LICENCE.rtlwifi_firmware.txt b/sys/contrib/dev/rtw88fw/LICENCE.rtlwifi_firmware.txt deleted file mode 100644 index d70921f49379..000000000000 --- a/sys/contrib/dev/rtw88fw/LICENCE.rtlwifi_firmware.txt +++ /dev/null @@ -1,39 +0,0 @@ -Copyright (c) 2010, Realtek Semiconductor Corporation -All rights reserved. - -Redistribution. Redistribution and use in binary form, without -modification, are permitted provided that the following conditions are -met: - -* Redistributions must reproduce the above copyright notice and the - following disclaimer in the documentation and/or other materials - provided with the distribution. -* Neither the name of Realtek Semiconductor Corporation nor the names of its - suppliers may be used to endorse or promote products derived from this - software without specific prior written permission. -* No reverse engineering, decompilation, or disassembly of this software - is permitted. - -Limited patent license. Realtek Semiconductor Corporation grants a world-wide, -royalty-free, non-exclusive license under patents it now or hereafter -owns or controls to make, have made, use, import, offer to sell and -sell ("Utilize") this software, but solely to the extent that any -such patent is necessary to Utilize the software alone, or in -combination with an operating system licensed under an approved Open -Source license as listed by the Open Source Initiative at -http://opensource.org/licenses. The patent license shall not apply to -any other combinations which include this software. No hardware per -se is licensed hereunder. - -DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. diff --git a/sys/contrib/dev/rtw88fw/README b/sys/contrib/dev/rtw88fw/README deleted file mode 100644 index 01449ca72e4c..000000000000 --- a/sys/contrib/dev/rtw88fw/README +++ /dev/null @@ -1,34 +0,0 @@ - - rtw88 firmware -================ - -This repository contains firmware images supported by Realtek's wireless -driver rtw88. And some of the devices run with more than one firmware -file. Basically, a "normal" firmware is necessary to be downloaded to -the device. -And another is called "wowlan" firmware, it should be loaded when a -device is going to suspend. Which means driver will "re-download/swap" -the firmware image. The wowlan firmware contains wake up functions that -can recognize specific events and send a wake up signal to device if -needed, and the system will resume to running state. During resume, -driver will then swap the normal firmware back, return to running state. - -If any distros or platforms do not require wowlan feature, they can -_only_ pick the normal firmware. And everything still works fine, -except that the device cannot be waken from the wireless NICs. - -Currently supported devices with corresponding firmwares: - -RTL8822BE - rtw8822b_fw.bin - -RTL8821CE - rtw8821c_fw.bin - -RTL8822CE - rtw8822c_fw.bin - rtw8822c_wow_fw.bin - -RTL8723DE - rtw8723d_fw.bin - diff --git a/sys/contrib/dev/rtw88fw/WHENCE b/sys/contrib/dev/rtw88fw/WHENCE deleted file mode 100644 index 71cb61f86a1f..000000000000 --- a/sys/contrib/dev/rtw88fw/WHENCE +++ /dev/null @@ -1,19 +0,0 @@ -Driver: rtw88 - Realtek 802.11ac WLAN driver for RTL8822BE and RTL8822CE - -Info: Sent to Larry Finger by Realtek engineer Yan-Hsuan Chuang -File: rtw88/rtw8822b_fw.bin -File: rtw88/rtw8822c_fw.bin -File: rtw88/rtw8822c_wow_fw.bin -File: rtw88/README -File: rtw88/rtw8723d_fw.bin -File: rtw88/rtw8821c_fw.bin - -Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details. - - These firmware should be put under /lib/firmware/rtw88/ - And note that the rtw88 driver is able to support wake-on-wireless LAN - for RTL8822C devices, after kernel v5.6+. So, make sure the firmware - rtw88/rtw8822c_wow_fw.bin is also packed, otherwise the firmware load - fail could be a problem. - Although RTL8723D devices are 802.11n device, they are also supported - by rtw88 because the hardware arch is similar. diff --git a/sys/contrib/dev/rtw88fw/rtw8723d_fw.bin b/sys/contrib/dev/rtw88fw/rtw8723d_fw.bin deleted file mode 100644 index ac2b9250c39e..000000000000 Binary files a/sys/contrib/dev/rtw88fw/rtw8723d_fw.bin and /dev/null differ diff --git a/sys/contrib/dev/rtw88fw/rtw8821c_fw.bin b/sys/contrib/dev/rtw88fw/rtw8821c_fw.bin deleted file mode 100644 index 8264e3480cc8..000000000000 Binary files a/sys/contrib/dev/rtw88fw/rtw8821c_fw.bin and /dev/null differ diff --git a/sys/contrib/dev/rtw88fw/rtw8822b_fw.bin b/sys/contrib/dev/rtw88fw/rtw8822b_fw.bin deleted file mode 100644 index 0934ffcc77a3..000000000000 Binary files a/sys/contrib/dev/rtw88fw/rtw8822b_fw.bin and /dev/null differ diff --git a/sys/contrib/dev/rtw88fw/rtw8822c_fw.bin b/sys/contrib/dev/rtw88fw/rtw8822c_fw.bin deleted file mode 100644 index af894bc10185..000000000000 Binary files a/sys/contrib/dev/rtw88fw/rtw8822c_fw.bin and /dev/null differ diff --git a/sys/contrib/dev/rtw88fw/rtw8822c_wow_fw.bin b/sys/contrib/dev/rtw88fw/rtw8822c_wow_fw.bin deleted file mode 100644 index 1ce74fda8bff..000000000000 Binary files a/sys/contrib/dev/rtw88fw/rtw8822c_wow_fw.bin and /dev/null differ diff --git a/sys/contrib/dev/rtw89fw/LICENCE.rtlwifi_firmware.txt b/sys/contrib/dev/rtw89fw/LICENCE.rtlwifi_firmware.txt deleted file mode 100644 index d70921f49379..000000000000 --- a/sys/contrib/dev/rtw89fw/LICENCE.rtlwifi_firmware.txt +++ /dev/null @@ -1,39 +0,0 @@ -Copyright (c) 2010, Realtek Semiconductor Corporation -All rights reserved. - -Redistribution. Redistribution and use in binary form, without -modification, are permitted provided that the following conditions are -met: - -* Redistributions must reproduce the above copyright notice and the - following disclaimer in the documentation and/or other materials - provided with the distribution. -* Neither the name of Realtek Semiconductor Corporation nor the names of its - suppliers may be used to endorse or promote products derived from this - software without specific prior written permission. -* No reverse engineering, decompilation, or disassembly of this software - is permitted. - -Limited patent license. Realtek Semiconductor Corporation grants a world-wide, -royalty-free, non-exclusive license under patents it now or hereafter -owns or controls to make, have made, use, import, offer to sell and -sell ("Utilize") this software, but solely to the extent that any -such patent is necessary to Utilize the software alone, or in -combination with an operating system licensed under an approved Open -Source license as listed by the Open Source Initiative at -http://opensource.org/licenses. The patent license shall not apply to -any other combinations which include this software. No hardware per -se is licensed hereunder. - -DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. diff --git a/sys/contrib/dev/rtw89fw/WHENCE b/sys/contrib/dev/rtw89fw/WHENCE deleted file mode 100644 index 496ef115ef0b..000000000000 --- a/sys/contrib/dev/rtw89fw/WHENCE +++ /dev/null @@ -1,8 +0,0 @@ - -Driver: rtw89 - Realtek 802.11ax WLAN driver for RTL8852A - -File: rtw89/rtw8852a_fw.bin -File: rtw89/rtw8852c_fw.bin - -Licence: Redistributable. See LICENCE.rtlwifi_firmware.txt for details. - diff --git a/sys/contrib/dev/rtw89fw/rtw8852a_fw.bin b/sys/contrib/dev/rtw89fw/rtw8852a_fw.bin deleted file mode 100644 index 00d139b3f2f1..000000000000 Binary files a/sys/contrib/dev/rtw89fw/rtw8852a_fw.bin and /dev/null differ diff --git a/sys/contrib/dev/rtw89fw/rtw8852c_fw.bin b/sys/contrib/dev/rtw89fw/rtw8852c_fw.bin deleted file mode 100644 index 86b634aeb69f..000000000000 Binary files a/sys/contrib/dev/rtw89fw/rtw8852c_fw.bin and /dev/null differ From nobody Tue Sep 5 21:16:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgJGr2fRHz4s2MG; Tue, 5 Sep 2023 21:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgJGr1rGMz3YfK; Tue, 5 Sep 2023 21:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mz9RXJjCIuC5l9z36DbgJIphms6pba+k+gliaQ6WRrA=; b=fUiv27s4Bi7ICfHi7ajzxzCmmv4x5Z72yUfovY5t80a+F+6Z9L2Z7RyDY1/9fSWMulhiCt 2AwzU5N3bNDDmuLD5mKFkDi9gUzhULflvj073vwG7Lpi8tx/VEsCovgmdTtRB+sxD73Ed9 of1IAHw8jMTT+aaL24ieFNkZpo57hVbHZZhOCQKDe/CjjSiPMpaYcCz9Tl396fix9uzSfk ze+KDFlgRWNS1gNymDpX5lsmLt+gJjAskUq9G7ggQSymYMwbqMWeg4BR6EWegya2c8/oX0 RZPclsbCY3bB+UBdF9SIAUn5BWWuHngQSuP7MioURQIzPbJ/Q6x2fzpgvCGyyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693948612; a=rsa-sha256; cv=none; b=eX7wFUgDaTh+sZLT7vLYIsaS+2KAoB7TdHXqR0lFYlraKpWPO3rZwRpiha/kgeQ8ilZ0Do +1zin7Xuhr6odj02BOSV6YpH/XRSSofTzb8Vox/6iPUwJiqGtQ06kTX51w2UqslxnndwUD 5XrBTadiFE1S4ysT5e/NEfIlWrOROxCe3u3yLGOyRru2kdzI2Pj4N4NdnzaAm9CBO4gaNq lCfvIkLqs5ChWNFQIX/OrpVUkpWYoaML5iW12KDutK/FCgXWGOnQLkk8HZlEPTknPEtUyp u3Qg6zrZ3b+B2QBwL75Y+e/r4I53FIiM/5SdKWV/EXsjVnYGumgCdMKSr6rl4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mz9RXJjCIuC5l9z36DbgJIphms6pba+k+gliaQ6WRrA=; b=goUTMoh4WuDYcC82g3dEorjVvvZBAzslKg9g99bhyFVGACzKEUGuugjugOuoIWk+H22eR8 0Igp2/eWZUjGpEHnCUX/WxIDB8eBiYyVmasG5Uxuur92QhYcIt9xCoKPvLiCc5i+I6Q4JZ y+Vn7F6NmgxnrT+aJhKebB/ETelc4iYV3GUnczW10bCEwi9TUQ45xAQfUHrrGXBxlKO673 3orQeK8w8JCjJyE8jPtl21L7iy70V08T+/z6Fjm5mnT7DpB3+94ziHzMAQfmEdTVuO4IdL K5PF4h1HDeyfkpf8YZ3auUwsBEGQtsY9xPt/GfL+0v/byOHkqtC+T1Pfskgkzw== 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 4RgJGr0pJKzpb9; Tue, 5 Sep 2023 21:16:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385LGqU8059832; Tue, 5 Sep 2023 21:16:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385LGqMn059829; Tue, 5 Sep 2023 21:16:52 GMT (envelope-from git) Date: Tue, 5 Sep 2023 21:16:52 GMT Message-Id: <202309052116.385LGqMn059829@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 712468443df1 - main - rtw88: temporary disconnect from build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 712468443df1130db8f893a5e2ce5c6a8dbf5cde Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=712468443df1130db8f893a5e2ce5c6a8dbf5cde commit 712468443df1130db8f893a5e2ce5c6a8dbf5cde Author: Bjoern A. Zeeb AuthorDate: 2023-09-05 17:34:35 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-05 21:13:19 +0000 rtw88: temporary disconnect from build As announced on freebsd-wireless [1] disconnect rtw88 from the build. Add a note to the man page about the current state but leave the man page in place for now as this is supposed to be temporary. [1] https://lists.freebsd.org/archives/freebsd-wireless/2023-September/001377.html MFC after: 20 days X-MFC: will see about 14/13 --- share/man/man4/rtw88.4 | 6 ++++-- sys/modules/Makefile | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/share/man/man4/rtw88.4 b/share/man/man4/rtw88.4 index 01572af8cbd3..24baf6a5194f 100644 --- a/share/man/man4/rtw88.4 +++ b/share/man/man4/rtw88.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2022 Bjoern A. Zeeb +.\" Copyright (c) 2022-2023 Bjoern A. Zeeb .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -22,13 +22,15 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 8, 2023 +.Dd September 5, 2023 .Dt RTW88 4 .Os .Sh NAME .Nm rtw88 .Nd Realtek IEEE 802.11n/ac wireless network driver .Sh SYNOPSIS +.Sy The driver is temporary disconnected from the build. +.Pp The driver will auto-load without any user interaction using .Xr devmatch 8 if enabled in diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3eff75312fd3..d2c5cc44705a 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -565,7 +565,7 @@ _iwlwifi= iwlwifi _iwlwififw= iwlwififw .endif _ossl= ossl -_rtw88= rtw88 +#_rtw88= rtw88 _vmware= vmware .endif From nobody Tue Sep 5 21:16:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgJGs3LB1z4s2ZC; Tue, 5 Sep 2023 21:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgJGs33d0z3Yxq; Tue, 5 Sep 2023 21:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwNvz73sg7uWjF6kRIfpIMlOOvWNq+epY17nRaznwGg=; b=ITnpQqAStJAFi+90NZnYwhIM1EGWDcQP3lA9ezzy73aqTNavEY9Mo6SsoOA6RhU6raasS6 w+efgxIrVNLC/4Te4J8qIL+SE06RultfdOB4e9b/u62k2qOLuT/EzaJjgw2Ij7WONy+Lco 7RaDTKLR20fXJQzzDjEIufNK0qRpV6M+qYZgoFxufkaI4tFcfFqhzpLEWsNAqO9ZljPdE8 MDzFozNXryZQxh+NivupfRGwO0YK9OB/t7Hgs2eMkbFzAbgkzRf7ltP0M3OQqerSBiu6nu HwV1VdjQn0NAZeRmfChLRhlQlMDn5voRFpPhYoJZDvW91KghpfyWWT13P+JkkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693948613; a=rsa-sha256; cv=none; b=U9EJeM+B8rgcYwXgiq1X4n3Qqb2+2mJkdUs1ML9eXsd97bl/zTv0Zoq+O5+dEhosvYCCDJ bkTqxKba3zV87WKlagp+rWAxtpY4DxqdWUhcvSMdTpuP0KjbVgxjKG38fMfIT5653Ws1ni GK8+098n1pleebsnqhvJGtueI/LaG3jwHRUc5RNa7uErRCLKnop+Ke2cpX6Ngxz9jZrlp2 mbpJPLl2BUCw2CWYJknr9HEmweOqDMzIJ0SpkSPHCvspng6/RkuKBK/8s7BPG+CJPNfYME whkekzNe4u9m+uBGkiOuUlJ/bDaFDilUiQxeSnSAZknAYY+1N5jmw+rMasQ60g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwNvz73sg7uWjF6kRIfpIMlOOvWNq+epY17nRaznwGg=; b=WUYboxtePLLfil6X7d2sTD1tEdMxXb+uu1Alo1UXFi7qyhtsTurA/AtvgpMlWeYObubRJE La7VH8ZMBXTkcxQ2XTVZJqAn2U6YS0kIOLqJcw/ZhgSk9eccjxf+/P8GX6YCXct/eiWj0D +3Lk+RV7wMaRePQ29/vaZDTz6+qAdJoaSdGQ8jcUQ4dNCpHrOACLy8LCGo4fp6AnJcFbXj X6KCFPgpkYQ6iTNVgZ4YDvjlDzgJfzjQ6MKmFIYz1NEPSrCblutG4G98vb/AZ+ymObUnkn 9gdUDIwwAsC+pz63BfRgY5o0KKUMq98/4ZK+hFf4ownramt0Ey5EC9ad0093Cw== 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 4RgJGs21hzzpKk; Tue, 5 Sep 2023 21:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385LGrGW059877; Tue, 5 Sep 2023 21:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385LGrHC059874; Tue, 5 Sep 2023 21:16:53 GMT (envelope-from git) Date: Tue, 5 Sep 2023 21:16:53 GMT Message-Id: <202309052116.385LGrHC059874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 90aac0d83bc9 - main - rtw88: update driver from upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90aac0d83bc9645f51ef0c2aeae6f9c0540bb031 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=90aac0d83bc9645f51ef0c2aeae6f9c0540bb031 commit 90aac0d83bc9645f51ef0c2aeae6f9c0540bb031 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 23:19:34 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-05 21:13:19 +0000 rtw88: update driver from upstream This is a combined version of updates of the rtw88 driver based on wireless-testing (wt-2023-05-11) 711dca0ca3d77414f8f346e564e9c8640147f40d (after v6.4-rc1), (wt-2023-06-09) 7bd20e011626ccc3ad53e57873452b1716fcfaaa (after v6.4-rc5), (wt-2023-07-24) 62e409149b62a285e89018e49b2e115757fb9022 (after v6.5-rc3), (wt-2023-08-06) 2a220a15be657a24868368892e3e2caba2115283 (after v6.5-rc4). This update follows other currently disconnected LinuxKPI based wireless drivers to lift them all to a same version in case someone else wants to work on this driver in parallel to predominant iwlwifi efforts. MFC after: 20 days --- sys/contrib/dev/rtw88/Makefile | 78 +++ sys/contrib/dev/rtw88/bf.c | 17 +- sys/contrib/dev/rtw88/coex.c | 93 ++- sys/contrib/dev/rtw88/coex.h | 14 +- sys/contrib/dev/rtw88/debug.c | 85 ++- sys/contrib/dev/rtw88/debug.h | 1 + sys/contrib/dev/rtw88/efuse.c | 4 +- sys/contrib/dev/rtw88/fw.c | 220 ++++-- sys/contrib/dev/rtw88/fw.h | 47 +- sys/contrib/dev/rtw88/hci.h | 9 +- sys/contrib/dev/rtw88/mac.c | 119 +++- sys/contrib/dev/rtw88/mac.h | 1 - sys/contrib/dev/rtw88/mac80211.c | 89 ++- sys/contrib/dev/rtw88/main.c | 451 +++++++++--- sys/contrib/dev/rtw88/main.h | 81 ++- sys/contrib/dev/rtw88/pci.c | 89 +-- sys/contrib/dev/rtw88/phy.c | 71 +- sys/contrib/dev/rtw88/phy.h | 2 +- sys/contrib/dev/rtw88/ps.c | 57 +- sys/contrib/dev/rtw88/ps.h | 2 + sys/contrib/dev/rtw88/reg.h | 15 + sys/contrib/dev/rtw88/regd.c | 2 + sys/contrib/dev/rtw88/rtw8723d.c | 43 +- sys/contrib/dev/rtw88/rtw8723d.h | 19 +- sys/contrib/dev/rtw88/rtw8723ds.c | 41 ++ sys/contrib/dev/rtw88/rtw8723du.c | 39 ++ sys/contrib/dev/rtw88/rtw8821c.c | 54 +- sys/contrib/dev/rtw88/rtw8821c.h | 27 + sys/contrib/dev/rtw88/rtw8821cs.c | 36 + sys/contrib/dev/rtw88/rtw8821cu.c | 53 ++ sys/contrib/dev/rtw88/rtw8822b.c | 32 +- sys/contrib/dev/rtw88/rtw8822b.h | 8 +- sys/contrib/dev/rtw88/rtw8822bs.c | 36 + sys/contrib/dev/rtw88/rtw8822bu.c | 93 +++ sys/contrib/dev/rtw88/rtw8822c.c | 37 +- sys/contrib/dev/rtw88/rtw8822c.h | 8 +- sys/contrib/dev/rtw88/rtw8822cs.c | 36 + sys/contrib/dev/rtw88/rtw8822cu.c | 47 ++ sys/contrib/dev/rtw88/sdio.c | 1404 +++++++++++++++++++++++++++++++++++++ sys/contrib/dev/rtw88/sdio.h | 178 +++++ sys/contrib/dev/rtw88/tx.c | 149 ++-- sys/contrib/dev/rtw88/tx.h | 138 ++-- sys/contrib/dev/rtw88/usb.c | 919 ++++++++++++++++++++++++ sys/contrib/dev/rtw88/usb.h | 100 +++ sys/contrib/dev/rtw88/util.c | 104 ++- sys/contrib/dev/rtw88/util.h | 11 +- sys/contrib/dev/rtw88/wow.c | 2 +- 47 files changed, 4610 insertions(+), 551 deletions(-) diff --git a/sys/contrib/dev/rtw88/Makefile b/sys/contrib/dev/rtw88/Makefile new file mode 100644 index 000000000000..fd212c09d88a --- /dev/null +++ b/sys/contrib/dev/rtw88/Makefile @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause + +obj-$(CONFIG_RTW88_CORE) += rtw88_core.o +rtw88_core-y += main.o \ + mac80211.o \ + util.o \ + debug.o \ + tx.o \ + rx.o \ + mac.o \ + phy.o \ + coex.o \ + efuse.o \ + fw.o \ + ps.o \ + sec.o \ + bf.o \ + sar.o \ + regd.o + +rtw88_core-$(CONFIG_PM) += wow.o + +obj-$(CONFIG_RTW88_8822B) += rtw88_8822b.o +rtw88_8822b-objs := rtw8822b.o rtw8822b_table.o + +obj-$(CONFIG_RTW88_8822BE) += rtw88_8822be.o +rtw88_8822be-objs := rtw8822be.o + +obj-$(CONFIG_RTW88_8822BS) += rtw88_8822bs.o +rtw88_8822bs-objs := rtw8822bs.o + +obj-$(CONFIG_RTW88_8822BU) += rtw88_8822bu.o +rtw88_8822bu-objs := rtw8822bu.o + +obj-$(CONFIG_RTW88_8822C) += rtw88_8822c.o +rtw88_8822c-objs := rtw8822c.o rtw8822c_table.o + +obj-$(CONFIG_RTW88_8822CE) += rtw88_8822ce.o +rtw88_8822ce-objs := rtw8822ce.o + +obj-$(CONFIG_RTW88_8822CS) += rtw88_8822cs.o +rtw88_8822cs-objs := rtw8822cs.o + +obj-$(CONFIG_RTW88_8822CU) += rtw88_8822cu.o +rtw88_8822cu-objs := rtw8822cu.o + +obj-$(CONFIG_RTW88_8723D) += rtw88_8723d.o +rtw88_8723d-objs := rtw8723d.o rtw8723d_table.o + +obj-$(CONFIG_RTW88_8723DE) += rtw88_8723de.o +rtw88_8723de-objs := rtw8723de.o + +obj-$(CONFIG_RTW88_8723DS) += rtw88_8723ds.o +rtw88_8723ds-objs := rtw8723ds.o + +obj-$(CONFIG_RTW88_8723DU) += rtw88_8723du.o +rtw88_8723du-objs := rtw8723du.o + +obj-$(CONFIG_RTW88_8821C) += rtw88_8821c.o +rtw88_8821c-objs := rtw8821c.o rtw8821c_table.o + +obj-$(CONFIG_RTW88_8821CE) += rtw88_8821ce.o +rtw88_8821ce-objs := rtw8821ce.o + +obj-$(CONFIG_RTW88_8821CS) += rtw88_8821cs.o +rtw88_8821cs-objs := rtw8821cs.o + +obj-$(CONFIG_RTW88_8821CU) += rtw88_8821cu.o +rtw88_8821cu-objs := rtw8821cu.o + +obj-$(CONFIG_RTW88_PCI) += rtw88_pci.o +rtw88_pci-objs := pci.o + +obj-$(CONFIG_RTW88_SDIO) += rtw88_sdio.o +rtw88_sdio-objs := sdio.o + +obj-$(CONFIG_RTW88_USB) += rtw88_usb.o +rtw88_usb-objs := usb.o diff --git a/sys/contrib/dev/rtw88/bf.c b/sys/contrib/dev/rtw88/bf.c index d207fa5c122f..16c6a1d972e5 100644 --- a/sys/contrib/dev/rtw88/bf.c +++ b/sys/contrib/dev/rtw88/bf.c @@ -30,11 +30,11 @@ void rtw_bf_disassoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, struct ieee80211_bss_conf *bss_conf) { + const struct rtw_chip_info *chip = rtwdev->chip; struct ieee80211_hw *hw = rtwdev->hw; struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv; struct rtw_bfee *bfee = &rtwvif->bfee; struct rtw_bf_info *bfinfo = &rtwdev->bf_info; - struct rtw_chip_info *chip = rtwdev->chip; struct ieee80211_sta *sta; struct ieee80211_sta_vht_cap *vht_cap; struct ieee80211_sta_vht_cap *ic_vht_cap; @@ -49,6 +49,8 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, sta = ieee80211_find_sta(vif, bssid); if (!sta) { + rcu_read_unlock(); + #if defined(__linux__) rtw_warn(rtwdev, "failed to find station entry for bss %pM\n", bssid); @@ -56,23 +58,25 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, rtw_warn(rtwdev, "failed to find station entry for bss %6D\n", bssid, ":"); #endif - goto out_unlock; + return; } ic_vht_cap = &hw->wiphy->bands[NL80211_BAND_5GHZ]->vht_cap; vht_cap = &sta->deflink.vht_cap; + rcu_read_unlock(); + if ((ic_vht_cap->cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) && (vht_cap->cap & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE)) { if (bfinfo->bfer_mu_cnt >= chip->bfer_mu_max_num) { rtw_dbg(rtwdev, RTW_DBG_BF, "mu bfer number over limit\n"); - goto out_unlock; + return; } ether_addr_copy(bfee->mac_addr, bssid); bfee->role = RTW_BFEE_MU; bfee->p_aid = (bssid[5] << 1) | (bssid[4] >> 7); - bfee->aid = bss_conf->aid; + bfee->aid = vif->cfg.aid; bfinfo->bfer_mu_cnt++; rtw_chip_config_bfee(rtwdev, rtwvif, bfee, true); @@ -80,7 +84,7 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, (vht_cap->cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE)) { if (bfinfo->bfer_su_cnt >= chip->bfer_su_max_num) { rtw_dbg(rtwdev, RTW_DBG_BF, "su bfer number over limit\n"); - goto out_unlock; + return; } sound_dim = vht_cap->cap & @@ -103,9 +107,6 @@ void rtw_bf_assoc(struct rtw_dev *rtwdev, struct ieee80211_vif *vif, rtw_chip_config_bfee(rtwdev, rtwvif, bfee, true); } - -out_unlock: - rcu_read_unlock(); } void rtw_bf_init_bfer_entry_mu(struct rtw_dev *rtwdev, diff --git a/sys/contrib/dev/rtw88/coex.c b/sys/contrib/dev/rtw88/coex.c index cac053f485c3..86467d2f8888 100644 --- a/sys/contrib/dev/rtw88/coex.c +++ b/sys/contrib/dev/rtw88/coex.c @@ -13,7 +13,7 @@ static u8 rtw_coex_next_rssi_state(struct rtw_dev *rtwdev, u8 pre_state, u8 rssi, u8 rssi_thresh) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; u8 tol = chip->rssi_tolerance; u8 next_state; @@ -36,7 +36,7 @@ static u8 rtw_coex_next_rssi_state(struct rtw_dev *rtwdev, u8 pre_state, static void rtw_coex_limited_tx(struct rtw_dev *rtwdev, bool tx_limit_en, bool ampdu_limit_en) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; u8 num_of_active_port = 1; @@ -365,7 +365,7 @@ static void rtw_coex_set_wl_pri_mask(struct rtw_dev *rtwdev, u8 bitmap, void rtw_coex_write_scbd(struct rtw_dev *rtwdev, u16 bitpos, bool set) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; u16 val = 0x2; @@ -400,7 +400,7 @@ EXPORT_SYMBOL(rtw_coex_write_scbd); static u16 rtw_coex_read_scbd(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; if (!chip->scbd_support) return 0; @@ -410,7 +410,7 @@ static u16 rtw_coex_read_scbd(struct rtw_dev *rtwdev) static void rtw_coex_check_rfk(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_rfe *coex_rfe = &coex->rfe; @@ -489,7 +489,7 @@ static void rtw_coex_monitor_bt_ctr(struct rtw_dev *rtwdev) static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; @@ -524,10 +524,10 @@ static void rtw_coex_monitor_bt_enable(struct rtw_dev *rtwdev) static void rtw_coex_update_wl_link_info(struct rtw_dev *rtwdev, u8 reason) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_traffic_stats *stats = &rtwdev->stats; bool is_5G = false; bool wl_busy = false; @@ -633,7 +633,7 @@ static struct sk_buff *rtw_coex_info_request(struct rtw_dev *rtwdev, struct rtw_coex *coex = &rtwdev->coex; struct sk_buff *skb_resp = NULL; - mutex_lock(&coex->mutex); + lockdep_assert_held(&rtwdev->mutex); rtw_fw_query_bt_mp_info(rtwdev, req); @@ -650,7 +650,6 @@ static struct sk_buff *rtw_coex_info_request(struct rtw_dev *rtwdev, } out: - mutex_unlock(&coex->mutex); return skb_resp; } @@ -706,10 +705,10 @@ static const char *rtw_coex_get_bt_status_string(u8 bt_status) static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; u8 i; u8 rssi_state; u8 rssi_step; @@ -806,7 +805,7 @@ static void rtw_coex_update_bt_link_info(struct rtw_dev *rtwdev) static void rtw_coex_update_wl_ch_info(struct rtw_dev *rtwdev, u8 type) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; struct rtw_coex_dm *coex_dm = &rtwdev->coex.dm; struct rtw_coex_stat *coex_stat = &rtwdev->coex.stat; @@ -933,7 +932,7 @@ EXPORT_SYMBOL(rtw_coex_write_indirect_reg); static void rtw_coex_coex_ctrl_owner(struct rtw_dev *rtwdev, bool wifi_control) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; const struct rtw_hw_reg *btg_reg = chip->btg_reg; if (wifi_control) { @@ -981,7 +980,7 @@ static void rtw_coex_mimo_ps(struct rtw_dev *rtwdev, bool force, bool state) static void rtw_btc_wltoggle_table_a(struct rtw_dev *rtwdev, bool force, u8 table_case) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; u8 h2c_para[6] = {0}; u32 table_wl = 0x5a5a5a5a; @@ -1065,9 +1064,9 @@ static void rtw_coex_set_table(struct rtw_dev *rtwdev, bool force, u32 table0, static void rtw_coex_table(struct rtw_dev *rtwdev, bool force, u8 type) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; struct rtw_coex_stat *coex_stat = &coex->stat; @@ -1135,9 +1134,9 @@ static void rtw_coex_power_save_state(struct rtw_dev *rtwdev, u8 ps_type, static void rtw_coex_set_tdma(struct rtw_dev *rtwdev, u8 byte1, u8 byte2, u8 byte3, u8 byte4, u8 byte5) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; u8 ps_type = COEX_PS_WIFI_NATIVE; bool ap_enable = false; @@ -1193,10 +1192,10 @@ static void rtw_coex_set_tdma(struct rtw_dev *rtwdev, u8 byte1, u8 byte2, static void rtw_coex_tdma(struct rtw_dev *rtwdev, bool force, u32 tcase) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_coex_stat *coex_stat = &coex->stat; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; u8 n, type; bool turn_on; @@ -1526,8 +1525,8 @@ static u8 rtw_coex_algorithm(struct rtw_dev *rtwdev) static void rtw_coex_action_coex_all_off(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1549,11 +1548,11 @@ static void rtw_coex_action_coex_all_off(struct rtw_dev *rtwdev) static void rtw_coex_action_freerun(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 level = 0; bool bt_afh_loss = true; @@ -1594,8 +1593,8 @@ static void rtw_coex_action_freerun(struct rtw_dev *rtwdev) static void rtw_coex_action_rf4ce(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1619,8 +1618,8 @@ static void rtw_coex_action_rf4ce(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_whql_test(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1644,10 +1643,10 @@ static void rtw_coex_action_bt_whql_test(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_relink(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; @@ -1684,11 +1683,11 @@ static void rtw_coex_action_bt_relink(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_idle(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_rfe *coex_rfe = &coex->rfe; u8 table_case = 0xff, tdma_case = 0xff; @@ -1753,10 +1752,10 @@ exit: static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; bool wl_hi_pri = false; u8 table_case, tdma_case; u32 slot_type = 0; @@ -1853,11 +1852,11 @@ static void rtw_coex_action_bt_inquiry(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_game_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; struct rtw_coex_dm *coex_dm = &coex->dm; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1901,10 +1900,10 @@ static void rtw_coex_action_bt_game_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_hfp(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -1932,10 +1931,10 @@ static void rtw_coex_action_bt_hfp(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; bool bt_multi_link_remain = false, is_toggle_table = false; @@ -2015,11 +2014,11 @@ static void rtw_coex_action_bt_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; @@ -2057,10 +2056,10 @@ static void rtw_coex_action_bt_a2dp(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dpsink(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; bool ap_enable = false; @@ -2096,10 +2095,10 @@ static void rtw_coex_action_bt_a2dpsink(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_pan(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2133,11 +2132,11 @@ static void rtw_coex_action_bt_pan(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case, interval = 0; u32 slot_type = 0; bool is_toggle_table = false; @@ -2190,10 +2189,10 @@ static void rtw_coex_action_bt_a2dp_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; bool wl_cpt_test = false, bt_cpt_test = false; @@ -2247,10 +2246,10 @@ static void rtw_coex_action_bt_a2dp_pan(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_pan_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2282,10 +2281,10 @@ static void rtw_coex_action_bt_pan_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_bt_a2dp_pan_hid(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2316,9 +2315,9 @@ static void rtw_coex_action_bt_a2dp_pan_hid(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_under5g(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; u8 table_case, tdma_case; @@ -2348,8 +2347,8 @@ static void rtw_coex_action_wl_under5g(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_only(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2372,9 +2371,9 @@ static void rtw_coex_action_wl_only(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; u8 table_case, tdma_case; @@ -2411,10 +2410,10 @@ static void rtw_coex_action_wl_native_lps(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; u32 slot_type = 0; @@ -2451,8 +2450,8 @@ static void rtw_coex_action_wl_linkscan(struct rtw_dev *rtwdev) static void rtw_coex_action_wl_not_connected(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 table_case, tdma_case; rtw_dbg(rtwdev, RTW_DBG_COEX, "[BTCoex], %s()\n", __func__); @@ -2528,8 +2527,8 @@ static void rtw_coex_action_wl_connected(struct rtw_dev *rtwdev) static void rtw_coex_run_coex(struct rtw_dev *rtwdev, u8 reason) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_dm *coex_dm = &coex->dm; struct rtw_coex_stat *coex_stat = &coex->stat; bool rf4ce_en = false; @@ -3002,9 +3001,9 @@ void rtw_coex_media_status_notify(struct rtw_dev *rtwdev, u8 type) void rtw_coex_bt_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_dm *coex_dm = &coex->dm; u32 bt_relink_time; u8 i, rsp_source = 0, type; @@ -3270,8 +3269,8 @@ static const u8 coex_bt_hidinfo_xb[] = {0x58, 0x62, 0x6f}; void rtw_coex_bt_hid_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_hid *hidinfo; struct rtw_coex_hid_info_a *hida; @@ -3360,8 +3359,8 @@ void rtw_coex_bt_hid_info_notify(struct rtw_dev *rtwdev, u8 *buf, u8 length) void rtw_coex_query_bt_hid_list(struct rtw_dev *rtwdev) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex *coex = &rtwdev->coex; - struct rtw_chip_info *chip = rtwdev->chip; struct rtw_coex_stat *coex_stat = &coex->stat; struct rtw_coex_hid *hidinfo; u8 i, handle; @@ -3582,7 +3581,7 @@ static const char *rtw_coex_get_reason_string(u8 reason) static u8 rtw_coex_get_table_index(struct rtw_dev *rtwdev, u32 wl_reg_6c0, u32 wl_reg_6c4) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; u8 ans = 0xFF; u8 n, i; @@ -3618,8 +3617,8 @@ static u8 rtw_coex_get_table_index(struct rtw_dev *rtwdev, u32 wl_reg_6c0, static u8 rtw_coex_get_tdma_index(struct rtw_dev *rtwdev, u8 *tdma_para) { + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_efuse *efuse = &rtwdev->efuse; - struct rtw_chip_info *chip = rtwdev->chip; u8 ans = 0xFF; u8 n, i, j; u8 load_cur_tab_val; @@ -3736,7 +3735,7 @@ static int rtw_coex_val_info(struct rtw_dev *rtwdev, static void rtw_coex_set_coexinfo_hw(struct rtw_dev *rtwdev, struct seq_file *m) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; const struct rtw_reg_domain *reg; char addr_info[INFO_SIZE]; int n_addr = 0; @@ -3910,7 +3909,7 @@ static const char *rtw_coex_get_wl_coex_mode(u8 coex_wl_link_mode) void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; struct rtw_dm_info *dm_info = &rtwdev->dm_info; struct rtw_coex *coex = &rtwdev->coex; struct rtw_coex_stat *coex_stat = &coex->stat; @@ -4057,7 +4056,7 @@ void rtw_coex_display_coex_info(struct rtw_dev *rtwdev, struct seq_file *m) rtwdev->stats.tx_throughput, rtwdev->stats.rx_throughput); seq_printf(m, "%-40s = %u/ %u/ %u\n", "IPS/ Low Power/ PS mode", - test_bit(RTW_FLAG_INACTIVE_PS, rtwdev->flags), + !test_bit(RTW_FLAG_POWERON, rtwdev->flags), test_bit(RTW_FLAG_LEISURE_PS_DEEP, rtwdev->flags), rtwdev->lps_conf.mode); diff --git a/sys/contrib/dev/rtw88/coex.h b/sys/contrib/dev/rtw88/coex.h index 07fa7aa34d4b..57cf29da9ea4 100644 --- a/sys/contrib/dev/rtw88/coex.h +++ b/sys/contrib/dev/rtw88/coex.h @@ -327,7 +327,7 @@ struct coex_rf_para { static inline void rtw_coex_set_init(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_init(rtwdev); } @@ -335,7 +335,7 @@ static inline void rtw_coex_set_init(struct rtw_dev *rtwdev) static inline void rtw_coex_set_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, u8 pos_type) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; if (!chip->ops->coex_set_ant_switch) return; @@ -345,28 +345,28 @@ void rtw_coex_set_ant_switch(struct rtw_dev *rtwdev, u8 ctrl_type, u8 pos_type) static inline void rtw_coex_set_gnt_fix(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_gnt_fix(rtwdev); } static inline void rtw_coex_set_gnt_debug(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_gnt_debug(rtwdev); } static inline void rtw_coex_set_rfe_type(struct rtw_dev *rtwdev) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_rfe_type(rtwdev); } static inline void rtw_coex_set_wl_tx_power(struct rtw_dev *rtwdev, u8 wl_pwr) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_wl_tx_power(rtwdev, wl_pwr); } @@ -374,7 +374,7 @@ static inline void rtw_coex_set_wl_tx_power(struct rtw_dev *rtwdev, u8 wl_pwr) static inline void rtw_coex_set_wl_rx_gain(struct rtw_dev *rtwdev, bool low_gain) { - struct rtw_chip_info *chip = rtwdev->chip; + const struct rtw_chip_info *chip = rtwdev->chip; chip->ops->coex_set_wl_rx_gain(rtwdev, low_gain); } diff --git a/sys/contrib/dev/rtw88/debug.c b/sys/contrib/dev/rtw88/debug.c index fbbd11be5eef..d745c774aa6f 100644 --- a/sys/contrib/dev/rtw88/debug.c +++ b/sys/contrib/dev/rtw88/debug.c @@ -144,7 +144,9 @@ static int rtw_debugfs_get_rf_read(struct seq_file *m, void *v) addr = debugfs_priv->rf_addr; mask = debugfs_priv->rf_mask; + mutex_lock(&rtwdev->mutex); val = rtw_read_rf(rtwdev, path, addr, mask); + mutex_unlock(&rtwdev->mutex); seq_printf(m, "rf_read path:%d addr:0x%08x mask:0x%08x val=0x%08x\n", path, addr, mask, val); @@ -181,8 +183,8 @@ static int rtw_debugfs_copy_from_user(char tmp[], int size, tmp_len = (count > size - 1 ? size - 1 : count); - if (!buffer || copy_from_user(tmp, buffer, tmp_len)) - return count; + if (copy_from_user(tmp, buffer, tmp_len)) + return -EFAULT; tmp[tmp_len] = '\0'; @@ -199,13 +201,16 @@ static ssize_t rtw_debugfs_set_read_reg(struct file *filp, char tmp[32 + 1]; u32 addr, len; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + if (ret) + return ret; num = sscanf(tmp, "%x %x", &addr, &len); if (num != 2) - return count; + return -EINVAL; if (len != 1 && len != 2 && len != 4) { rtw_warn(rtwdev, "read reg setting wrong len\n"); @@ -286,8 +291,11 @@ static ssize_t rtw_debugfs_set_rsvd_page(struct file *filp, char tmp[32 + 1]; u32 offset, page_num; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 2); + if (ret) + return ret; num = sscanf(tmp, "%d %d", &offset, &page_num); @@ -312,8 +320,11 @@ static ssize_t rtw_debugfs_set_single_input(struct file *filp, char tmp[32 + 1]; u32 input; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + if (ret) + return ret; num = kstrtoint(tmp, 0, &input); @@ -336,14 +347,17 @@ static ssize_t rtw_debugfs_set_write_reg(struct file *filp, char tmp[32 + 1]; u32 addr, val, len; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; /* write BB/MAC register */ num = sscanf(tmp, "%x %x %x", &addr, &val, &len); if (num != 3) - return count; + return -EINVAL; switch (len) { case 1: @@ -379,8 +393,11 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp, char tmp[32 + 1]; u8 param[8]; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; num = sscanf(tmp, "%hhx,%hhx,%hhx,%hhx,%hhx,%hhx,%hhx,%hhx", ¶m[0], ¶m[1], ¶m[2], ¶m[3], @@ -390,7 +407,9 @@ static ssize_t rtw_debugfs_set_h2c(struct file *filp, return -EINVAL; } + mutex_lock(&rtwdev->mutex); rtw_fw_h2c_cmd_dbg(rtwdev, param); + mutex_unlock(&rtwdev->mutex); return count; } @@ -404,17 +423,22 @@ static ssize_t rtw_debugfs_set_rf_write(struct file *filp, char tmp[32 + 1]; u32 path, addr, mask, val; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 4); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 4); + if (ret) + return ret; num = sscanf(tmp, "%x %x %x %x", &path, &addr, &mask, &val); if (num != 4) { rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n"); - return count; + return -EINVAL; } + mutex_lock(&rtwdev->mutex); rtw_write_rf(rtwdev, path, addr, mask, val); + mutex_unlock(&rtwdev->mutex); rtw_dbg(rtwdev, RTW_DBG_DEBUGFS, "write_rf path:%d addr:0x%08x mask:0x%08x, val:0x%08x\n", path, addr, mask, val); @@ -432,14 +456,17 @@ static ssize_t rtw_debugfs_set_rf_read(struct file *filp, char tmp[32 + 1]; u32 path, addr, mask; int num; + int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 3); + if (ret) + return ret; num = sscanf(tmp, "%x %x %x", &path, &addr, &mask); if (num != 3) { rtw_warn(rtwdev, "invalid args, [path] [addr] [mask] [val]\n"); - return count; + return -EINVAL; } debugfs_priv->rf_path = path; @@ -461,7 +488,9 @@ static ssize_t rtw_debugfs_set_fix_rate(struct file *filp, char tmp[32 + 1]; int ret; - rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + ret = rtw_debugfs_copy_from_user(tmp, sizeof(tmp), buffer, count, 1); + if (ret) + return ret; ret = kstrtou8(tmp, 0, &fix_rate); if (ret) { @@ -519,6 +548,8 @@ static int rtw_debug_get_rf_dump(struct seq_file *m, void *v) u32 addr, offset, data; u8 path; + mutex_lock(&rtwdev->mutex); + for (path = 0; path < rtwdev->hal.rf_path_num; path++) { seq_printf(m, "RF path:%d\n", path); for (addr = 0; addr < 0x100; addr += 4) { @@ -533,6 +564,8 @@ static int rtw_debug_get_rf_dump(struct seq_file *m, void *v) seq_puts(m, "\n"); } + mutex_unlock(&rtwdev->mutex); + return 0; } *** 7314 LINES SKIPPED *** From nobody Tue Sep 5 21:16:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgJGt4lTZz4s1xt; Tue, 5 Sep 2023 21:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgJGt42fCz3YyL; Tue, 5 Sep 2023 21:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42sSDJIVxDWstgVgvvU+DCh/+4q+ROudAZQwVQd8phg=; b=bOf1ykprhmmhnEmHMsV3m/KuFlGbHBqBhvzydCV8s04FVIH4nG3JErGdiLEA1gmZ8ZHI51 vDsFWjxnG/sDYbktsJgH/b9YUAq1rgpfzF26dr+/kDSK+ZZwhABuRiU7OI+KmAcWgmUb2E wKkr7eyqt5R1dln6oH+IIbTyLIFfwkevJLIKpfzlUTIu+OATMt2/n0cVoY+IkIazspqM2F FmPsn19/eoTqBTA2vMH4cwItq6dSH/ilrwuPlWbeLQxjmoOWSPTbH685IH8BzRdcIRfjxN wZZgZtulbTFgBZIQiCKWdmY8FGMAco8e0fRTimuv/wfQygaPBE4acA6PonrsiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693948614; a=rsa-sha256; cv=none; b=BXbH7DxHtftsYJKXhiFnPUT5ZLBiA4pWHP8XBkzCMTenJJWlN4M1p6bEG+buhqRKRyUNms 8pl2OjKlYAeWY9g9m2oVwjegrIZh/5MLzSTYAbOVSFUnx3wUFa5oLpOGt2zKHqbA4TBuaW ujs9R1Xw6X/CoR26zyMvXn+Fib4xso9yyUQnp/X2xT6Opm4lGZgKgxbG0J0uDiMyc+KtIk 8aO7Cf2SFBdIagUDzkpyKTWN4Mxy6eeiHSEYYn1fVpl1kw48/0S29HO2B7mUl08n2aBL5W wdpz1IFkbsesJpDOlqqQjQHRh38aGYE72USf1SK6+uTAD5NMvctr2l68WyXT0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693948614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=42sSDJIVxDWstgVgvvU+DCh/+4q+ROudAZQwVQd8phg=; b=WAPLPgKVNsD/mMXr6L7t/fDjcV9B0srN8mHdp6xypyDgBzxak99seUjYztiThtnDebskSW WAdIYA2xXmQ6EDfWS9rzKTWvCwX8I7cS5qjCGNkU61MqOVJNJ+thKBHCItO61BAF/9o50H ePa3f2ukK+2YXxTLE2TGaYuLPBAlnvo2f7LDlzJRzjjMhGJBmGtUI0NKZjRpiqACH3VneC 4xtfeFotyltH5kF4A1P1+xp17LJQRkNezjLovjaexkTTXrR1KOhOkRw0A3JixJGl9JgBLH QfWFBipQCpqquxt8lxVneDRz2Ap89ZIixc61/8IAhdlRmqOPxSMW/NtjSNozbQ== 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 4RgJGt31gTzpcS; Tue, 5 Sep 2023 21:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385LGsjA059923; Tue, 5 Sep 2023 21:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385LGsbV059920; Tue, 5 Sep 2023 21:16:54 GMT (envelope-from git) Date: Tue, 5 Sep 2023 21:16:54 GMT Message-Id: <202309052116.385LGsbV059920@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 815b7436a7c6 - main - iwlwifi/LinuxKPI: 802.11: update ieee80211_request_smps() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 815b7436a7c6302365b6514194d27d41cb736227 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=815b7436a7c6302365b6514194d27d41cb736227 commit 815b7436a7c6302365b6514194d27d41cb736227 Author: Bjoern A. Zeeb AuthorDate: 2023-09-05 18:02:02 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-05 21:14:25 +0000 iwlwifi/LinuxKPI: 802.11: update ieee80211_request_smps() Update ieee80211_request_smps() to the new number of arguments in LinuxKPI (which was already prepared) and update the one call in the older iwlwifi driver version. This will allow iwlwifi as-is now and rtw88 to compile in case someone else wants to work on the latter in parallel to predominant efforts on the former. Sponsored by: The FreeBSD Foundation MFC after: 20 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 13 ++----------- sys/contrib/dev/iwlwifi/mvm/utils.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index cacf9d652fd0..bc7f22f5aa15 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -2022,10 +2022,7 @@ ieee80211_ie_split(const u8 *ies, size_t ies_len, } static __inline void -ieee80211_request_smps(struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - u_int link_id, -#endif +ieee80211_request_smps(struct ieee80211_vif *vif, u_int link_id, enum ieee80211_smps_mode smps) { static const char *smps_mode_name[] = { @@ -2345,14 +2342,8 @@ ieee80211_proberesp_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif) static __inline struct sk_buff * ieee80211_nullfunc_get(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -#ifdef __FOR_LATER_DRV_UPDATE - int linkid, -#endif - bool qos) + int linkid, bool qos) { -#ifndef __FOR_LATER_DRV_UPDATE - int linkid = 0; -#endif /* Only STA needs this. Otherwise return NULL and panic bad drivers. */ if (vif->type != NL80211_IFTYPE_STATION) diff --git a/sys/contrib/dev/iwlwifi/mvm/utils.c b/sys/contrib/dev/iwlwifi/mvm/utils.c index 075ada8ba356..5370cec8140a 100644 --- a/sys/contrib/dev/iwlwifi/mvm/utils.c +++ b/sys/contrib/dev/iwlwifi/mvm/utils.c @@ -307,7 +307,7 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif, smps_mode = IEEE80211_SMPS_DYNAMIC; } - ieee80211_request_smps(vif, smps_mode); + ieee80211_request_smps(vif, 0, smps_mode); } static bool iwl_wait_stats_complete(struct iwl_notif_wait_data *notif_wait, From nobody Tue Sep 5 22:08:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgKQp66xNz4sVFH; Tue, 5 Sep 2023 22:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgKQp5QrPz4KxR; Tue, 5 Sep 2023 22:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693951730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gf8FR7UqG+6klAIjbPA8MTKPG5vBNt3vvd5Qf7IT3Y0=; b=hvCl/WADoFGbpG7fpqHS06cQRBftcIQxkppvxKxRoEQTY7735+CzCYWr0hRpbOg5YWCcqw wXdNzSRCJgusitHLa8jmjDZQ9ZJKGSNmjgf6Yy77Cnh0uPOS/raR6AkQK2dY5H1OZxRXYR AvbpI4gZEKNoXDEkhPT945PeMYbLGy4vEu33qtINhVzV5VX6y/nqUfYuh4hj2JlLRGsjBJ Ts3ZD4bH7MOeTBtAHMLtjR8UBqD2KVvK1BdF9yuYfKJe67sBs5DYnvvCli3Of10LBv6XWh ktwZyjeDDf8rrav+T77AJmgD0ua6hQEeaw6uuxEja0uHTHfb82CR6rx9PUSfEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693951730; a=rsa-sha256; cv=none; b=cljhRXI4dDTesTeqU47r9hNwDEf7mopL3h7YBZfAZ5W0BWhj2v18byQC9ahSRo0VzfU8kS re+RMyBiRskn6bGjmHOVWjyaS0E2CrYub4SIxiCobl+Av9S5zQYc0D1gZfd8Mm5mageSEu KqvCtqaBAw7u56JH/iql08MecPor1xVuDa0paUDOWjuN5jQ38FXNsX9fJnGrHu9+/avfd5 MzpX89EpdcdZNQQ4oqmTvSAUcc81g9BrSLzMwFGoEQAaUPcxBqpbhFAmkJWNQO5+cJAVvg UbGmao8zuJDgXzDFhGH+h7H5iKCr7JNOCgpTE3g1yjO0mfH8GOQd1koUVxRY2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693951730; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gf8FR7UqG+6klAIjbPA8MTKPG5vBNt3vvd5Qf7IT3Y0=; b=FmwufBoxpv3o/Px7AHgIa8FxeHow74yVojtaTv0ujHk5sjAQ09Oqx6Mft2gAsRbmCKVii6 a+M7oEkfQ1rrPJLqgjEIm8HggfVoP8o4s8N8ymVOEDEAtBLRJJXDvXN/kQAe62M1FDnBcx QK+5V/DhKjgnWgkI7pPmMdQ9MNcyHOXpvLKGcpod99im/ckC8VgerEplbB0OixaYxNetmN Mmv51j1hS2US5iKG6Rj1/Bx/QNhN6za/bohBvLCzHGc31ykswdM7sGeyL7qr80efthhepc P2XygDBL7wlpmPx8GFwOjmMwqGpe0CMVnc/UZoVE2mHMcALmihF/RYq0tm1KyQ== 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 4RgKQp4N2jzqd4; Tue, 5 Sep 2023 22:08:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385M8o0h042849; Tue, 5 Sep 2023 22:08:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385M8oAZ042846; Tue, 5 Sep 2023 22:08:50 GMT (envelope-from git) Date: Tue, 5 Sep 2023 22:08:50 GMT Message-Id: <202309052208.385M8oAZ042846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b19d8afe4dd2 - main - msun: LIBCSRCDIR is too fragile, use ${SRCTOP}/lib/libc instead List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b19d8afe4dd205f7d4bfa3282f58b73d504926db Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b19d8afe4dd205f7d4bfa3282f58b73d504926db commit b19d8afe4dd205f7d4bfa3282f58b73d504926db Author: Warner Losh AuthorDate: 2023-09-05 20:58:06 +0000 Commit: Warner Losh CommitDate: 2023-09-05 22:08:02 +0000 msun: LIBCSRCDIR is too fragile, use ${SRCTOP}/lib/libc instead LIBCSRCDIR is defined in bsd.libnames.mk, which is read in later in the Makefile than the line: .if exists(${LIBCSRCDIR}/${MACHINE_ARCH}) so we test to see if /${MARCHIN_ARCH} exists which it usually doesn't (but did for me since I mounted 13.2R SD image there). Move to defining our own LIBC_SRCTOP in terms of SRCTOP to treat these uniformily. Sponsored by: Netflix Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D41661 --- lib/libc/Makefile | 14 ++++++++------ lib/msun/Makefile | 20 +++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index a26215324332..7540eb8c21ad 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -7,12 +7,14 @@ SHLIBDIR?= /lib LIBC_SRCTOP?= ${.CURDIR} -# Pick the current architecture directory for libc. In general, this is -# named MACHINE_CPUARCH, but some ABIs are different enough to require -# their own libc, so allow a directory named MACHINE_ARCH to override this. - -.if exists(${LIBC_SRCTOP}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) -LIBC_ARCH=${MACHINE_ARCH:S/powerpc64le/powerpc64/} +# Pick the current architecture directory for libc. In general, this is named +# MACHINE_CPUARCH, but some ABIs are different enough to require their own libc, +# so allow a directory named MACHINE_ARCH to override this (though treat +# powerpc64le and powerpc64 the same). +# Note: This is copeid to msun/Makefile +M=${MACHINE_ARCH:S/powerpc64le/powerpc64/} +.if exists(${LIBC_SRCTOP}/${M}) +LIBC_ARCH=${M} .else LIBC_ARCH=${MACHINE_CPUARCH} .endif diff --git a/lib/msun/Makefile b/lib/msun/Makefile index 8bc984c2c342..9917be01d863 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -97,17 +97,27 @@ COMMON_SRCS+= s_cospi.c s_cospif.c \ s_sinpi.c s_sinpif.c \ s_tanpi.c s_tanpif.c +# LIBCSRCDIR is defined lazily, so can't be used for exists() below +LIBC_SRCTOP=${SRCTOP}/lib/libc # Location of fpmath.h and _fpmath.h -.if exists(${LIBCSRCDIR}/${MACHINE_ARCH}) -LIBC_ARCH=${MACHINE_ARCH} + +# Pick the current architecture directory for libc. In general, this is named +# MACHINE_CPUARCH, but some ABIs are different enough to require their own libc, +# so allow a directory named MACHINE_ARCH to override this (though treat +# powerpc64le and powerpc64 the same). +# Note: This is copied from libc/Makefile +M=${MACHINE_ARCH:S/powerpc64le/powerpc64/} +.if exists(${LIBC_SRCTOP}/${M}) +LIBC_ARCH=${M} .else LIBC_ARCH=${MACHINE_CPUARCH} .endif -CFLAGS+= -I${.CURDIR}/src -I${LIBCSRCDIR}/include \ - -I${LIBCSRCDIR}/${LIBC_ARCH} + +CFLAGS+= -I${.CURDIR}/src -I${LIBC_SRCTOP}/include \ + -I${LIBC_SRCTOP}/${LIBC_ARCH} SYM_MAPS+= ${.CURDIR}/Symbol.map -VERSION_DEF= ${LIBCSRCDIR}/Versions.def +VERSION_DEF= ${LIBC_SRCTOP}/Versions.def SYMBOL_MAPS= ${SYM_MAPS} # C99 long double functions From nobody Tue Sep 5 22:15:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgKZL5pzBz4sXs3; Tue, 5 Sep 2023 22:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgKZL5LwDz4MRK; Tue, 5 Sep 2023 22:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F30PriHE+s3b2ipeV7cFY/EkxN4LEaku4cIsSkvJlR8=; b=MX1O78vmvM3gWa/f37aqIEthztLOwVhL0rY66baqVj9h66EdsgwbUk8WHYqW0ojLwhXGFZ 4FvCYDVWq2i71OtoOuIjF7fa7rCZgDnsiGX3ylnDffWkWKPFLCi2r3lJzmHnPaAaaImM9x y7F/SQms8phrae2pVyshUS8+YuiDHlBuVkTm8xxNTCsohPosNIujiWbXl4YR/4nq8BViVW dEteK6kBXG7lkfpFe9kffiv0wI5SfhAR6pKz3i1jkw9ATtFm9fqlgJzWDsg1t8uo/fI9U1 VUusAlDwtSne1U2lX7eCxBqLGPmDv4w6iSkQU71GJVf+KI1os3LaXwW3fvjTZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693952122; a=rsa-sha256; cv=none; b=boocVjpjxLBJZdY3o5nFmgDgqyIXDPkb5SUfYlH3+xL7hYWVXwwyh1Xj3wdH4kIMoxbcOq qss0l4e/4uuR2eilFX7brRI23jYUwQOrxfNcpLZ7vzkKs/bwKNtos6vvN8xjoCi4S6mQZK TPdH1Tt9xiokmGbqyw15b/joerltiCNv3slmd7Unw1743+Jr2xSEvpNaH5uG8gOztwwyOj uvDI8ux+nbNJL9pm9FCeXDrBMwl3/jJVKy2Zn+V0I0mWuZxqSZG3huCuMuCl6636t2pFOM wAXFsCXidbhbKWw1Su5o1ePg49NjW/7hxdRHUnpis6lJV11xbVdaG8+JIWbN9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F30PriHE+s3b2ipeV7cFY/EkxN4LEaku4cIsSkvJlR8=; b=GSwQyUxqwHXADqb16wwAyekpWS2qdRwEhzgJdVUI/ktdmUPFpJ8dpi3PYKMbPxyGSYFgFr raGkdnFpDjMbe6G0j4wr5Pz2mFLf2jVvT+vzX6KIdNiprvBqqeL/gCS3od2aHClG/o4jYi 9hBxjvbtCxITXI2iLU2aYz0ADur6hL0ekpezDYNDBrihL+9bYY7vowVv7ExAlhNxu8CSFz esGSqRAaZPTyu4bP6tcmasrlvBBzUuvPUAWt3U4GkLJK0lgjAJrR7CnOostCuCVD5R+jQX 9lfnHy7wfd+6151qnZizAi0EfDfh8Ugj1o2laHD6RAzDzcErcm4lES/GJwRU4Q== 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 4RgKZL4QJfzrBP; Tue, 5 Sep 2023 22:15:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385MFMRF058598; Tue, 5 Sep 2023 22:15:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385MFMZh058595; Tue, 5 Sep 2023 22:15:22 GMT (envelope-from git) Date: Tue, 5 Sep 2023 22:15:22 GMT Message-Id: <202309052215.385MFMZh058595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 3814249f1e8d - main - cxgbe(4): Avoid hang on kldunload on netlink enabled kernels. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3814249f1e8dacfcd326dd7c416c528a1d88b6a1 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=3814249f1e8dacfcd326dd7c416c528a1d88b6a1 commit 3814249f1e8dacfcd326dd7c416c528a1d88b6a1 Author: Navdeep Parhar AuthorDate: 2023-09-05 18:21:03 +0000 Commit: Navdeep Parhar CommitDate: 2023-09-05 22:10:02 +0000 cxgbe(4): Avoid hang on kldunload on netlink enabled kernels. netlink(4) calls back into the driver during detach and it attempts to start an internal synchronized op recursively, causing an interruptible hang. Fix it by failing the ioctl if the VI has been marked as DOOMED by cxgbe_detach. Here's the stack for the hang for reference. #6 begin_synchronized_op #7 cxgbe_media_status #8 ifmedia_ioctl #9 cxgbe_ioctl #10 if_ioctl #11 get_operstate_ether #12 get_operstate #13 dump_iface #14 rtnl_handle_ifevent #15 rtnl_handle_ifnet_event #16 rt_ifmsg #17 if_unroute #18 if_down #19 if_detach_internal #20 if_detach #21 ether_ifdetach #22 cxgbe_vi_detach #23 cxgbe_detach #24 DEVICE_DETACH MFC after: 3 days Sponsored by: Chelsio Communications --- sys/dev/cxgbe/t4_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index 759887a2a488..a32cd9a3f2df 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3459,7 +3459,7 @@ cxgbe_media_status(if_t ifp, struct ifmediareq *ifmr) struct adapter *sc = pi->adapter; struct link_config *lc = &pi->link_cfg; - if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4med") != 0) + if (begin_synchronized_op(sc, vi , SLEEP_OK | INTR_OK, "t4med") != 0) return; PORT_LOCK(pi); From nobody Tue Sep 5 22:26:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgKpt6mKMz4sd8R; Tue, 5 Sep 2023 22:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgKpt6KrVz4Ppf; Tue, 5 Sep 2023 22:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZBqAr04GT2QXhKcn5NYcCBaIq4QggWNQNukgGqz4Uu8=; b=ETs+P/yIWWAKAha0hm0Ul2om41iUS8ctlpxz6DSf5kfde9kdLbRIgqssNUwlc3hStuBbi7 aOSNrTIsma5PIoG7IG8tUJVn7909JI+eZ/pv0W+eRa2Q0hewBG9nraWw5RzBRvityXFt+q M9whTqbFTIG/VCMIWHmAbYVgtHUPgSNI6v5gaERnYzFJoYs4RkK/xLo3GtMp4ybLRNQeo6 h53bhwJu7+9MjqLYajS/81oc54bjCy4VRxC1TwVRRZO9vb1vCzDZP/z8l+YbVIG55u4gYC QPWGLwmmWtQz/mC9AtszHoVc2R4PRtLyaS/S8J1YDihX3AsQcEH4FZMl6tnqiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693952774; a=rsa-sha256; cv=none; b=udCMUgDpI5QnGbqSwl3q6hYnv8M+SdfnXwYMew24g7wto16Lq1uOL32S00axs2Q4SPPaR1 IccHlOOKc6zOeSTsvrbyU73UG7ISAGctEX9Y3aTISGqrCDp0uKsb/ZAJFMhx6n5QJw1cpe Gt5Igmaz8d3agNyVtUxT+HFiigk2kUi3b/jRlzPWZ++4vwFKKZQe33D//VH5h3oOpTeLDz eOR+6kUP8oFXNVbDws8qa8Y94TxLIIpLDmzfC0d4bMFlmlwaF4n+OwjE0vTurr+qbTYVEz IJVGRBwtrbrGFAO4HKI3dVquB98DkWWqx/+K2AFQDWtXkXVZ0YX8l3Ukd3VQeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZBqAr04GT2QXhKcn5NYcCBaIq4QggWNQNukgGqz4Uu8=; b=PQL70PWp+HKzJRExTzJfsu6n5FBHdfg+fnFkihcF9DmHRVZEHD+KQCCkODRXzN64FOFqin qin1lv8FcER0njlZNM88++JuBojWj4kgJtMV7v00n/nw0FCZNTTlSl4CK/e2MHtySp9GgC oW0OIv/77isMLDlxwA+EgPaGePXBg/9PrUiGhzuFkrc0gnLRLxuXkWavhOXIx8CqlJI7cR SjV8LkODSQaqyrdUCGVgRwMAdprun4pkxIQ52g461iosJg8+zrylgqMP5+mVg/kvdvljA6 c9H/l6FjX4fz3O6YgnMYnNJZ9228yn4Sw3CR0BnK3fgNtBAm2iQbNGnYbjMlqA== 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 4RgKpt5HDVzrXP; Tue, 5 Sep 2023 22:26:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385MQEI8075318; Tue, 5 Sep 2023 22:26:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385MQEov075315; Tue, 5 Sep 2023 22:26:14 GMT (envelope-from git) Date: Tue, 5 Sep 2023 22:26:14 GMT Message-Id: <202309052226.385MQEov075315@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a1f506156c4d - main - timerfd: Define a locking regime List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1f506156c4db885d3cc177c93e9c8a28d535d30 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a1f506156c4db885d3cc177c93e9c8a28d535d30 commit a1f506156c4db885d3cc177c93e9c8a28d535d30 Author: Jake Freeland AuthorDate: 2023-09-05 22:10:44 +0000 Commit: Warner Losh CommitDate: 2023-09-05 22:24:41 +0000 timerfd: Define a locking regime Define a locking regime for the members of struct timerfd and document it so future code can follow the standard. The lock legend can be found in a comment above struct timerfd. Additionally, * Add assertions based on locking regime. * Fill kn_data with the expiration count when EVFILT_READ is triggered. * Report st_ctim for stat(2). * Check if file has f_type == DTYPE_TIMERFD before assigning timerfd pointer to f_data. MFC After: 3 days Reviewed by: imp, kib, markj Differential Revision: https://reviews.freebsd.org/D41600 --- sys/kern/sys_timerfd.c | 61 +++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index e4d2f10f28ef..a81b5ad0fade 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -73,28 +73,36 @@ static struct unrhdr64 tfdino_unr; #define TFD_CANCELED 4 /* Jumped, CANCEL_ON_SET=true. */ #define TFD_JUMPED (TFD_ZREAD | TFD_CANCELED) +/* + * One structure allocated per timerfd descriptor. + * + * Locking semantics: + * (t) locked by tfd_lock mtx + * (l) locked by timerfd_list_lock sx + * (c) const until freeing + */ struct timerfd { /* User specified. */ - struct itimerspec tfd_time; /* tfd timer */ - clockid_t tfd_clockid; /* timing base */ - int tfd_flags; /* creation flags */ - int tfd_timflags; /* timer flags */ + struct itimerspec tfd_time; /* (t) tfd timer */ + clockid_t tfd_clockid; /* (c) timing base */ + int tfd_flags; /* (c) creation flags */ + int tfd_timflags; /* (t) timer flags */ /* Used internally. */ - timerfd_t tfd_count; /* expiration count since last read */ - bool tfd_expired; /* true upon initial expiration */ - struct mtx tfd_lock; /* mtx lock */ - struct callout tfd_callout; /* expiration notification */ - struct selinfo tfd_sel; /* I/O alerts */ - struct timespec tfd_boottim; /* cached boottime */ - int tfd_jumped; /* timer jump status */ - LIST_ENTRY(timerfd) entry; /* entry in list */ + timerfd_t tfd_count; /* (t) expiration count since read */ + bool tfd_expired; /* (t) true upon initial expiration */ + struct mtx tfd_lock; /* tfd mtx lock */ + struct callout tfd_callout; /* (t) expiration notification */ + struct selinfo tfd_sel; /* (t) I/O alerts */ + struct timespec tfd_boottim; /* (t) cached boottime */ + int tfd_jumped; /* (t) timer jump status */ + LIST_ENTRY(timerfd) entry; /* (l) entry in list */ /* For stat(2). */ - ino_t tfd_ino; /* inode number */ - struct timespec tfd_atim; /* time of last read */ - struct timespec tfd_mtim; /* time of last settime */ - struct timespec tfd_birthtim; /* creation time */ + ino_t tfd_ino; /* (c) inode number */ + struct timespec tfd_atim; /* (t) time of last read */ + struct timespec tfd_mtim; /* (t) time of last settime */ + struct timespec tfd_birthtim; /* (c) creation time */ }; static void @@ -109,6 +117,7 @@ static inline void timerfd_getboottime(struct timespec *ts) { struct timeval tv; + getboottime(&tv); TIMEVAL_TO_TIMESPEC(&tv, ts); } @@ -274,6 +283,8 @@ filt_timerfdread(struct knote *kn, long hint) { struct timerfd *tfd = kn->kn_hook; + mtx_assert(&tfd->tfd_lock, MA_OWNED); + kn->kn_data = (int64_t)tfd->tfd_count; return (tfd->tfd_count > 0); } @@ -308,13 +319,13 @@ timerfd_stat(struct file *fp, struct stat *sb, struct ucred *active_cred) sb->st_uid = fp->f_cred->cr_uid; sb->st_gid = fp->f_cred->cr_gid; sb->st_blksize = PAGE_SIZE; - mtx_lock(&tfd->tfd_lock); - sb->st_ino = tfd->tfd_ino; sb->st_atim = tfd->tfd_atim; sb->st_mtim = tfd->tfd_mtim; - sb->st_birthtim = tfd->tfd_birthtim; mtx_unlock(&tfd->tfd_lock); + sb->st_ctim = sb->st_mtim; + sb->st_ino = tfd->tfd_ino; + sb->st_birthtim = tfd->tfd_birthtim; return (0); } @@ -342,15 +353,12 @@ static int timerfd_fill_kinfo(struct file *fp, struct kinfo_file *kif, struct filedesc *fdp) { - struct timerfd *tfd = fp->f_data; kif->kf_type = KF_TYPE_TIMERFD; - mtx_lock(&tfd->tfd_lock); kif->kf_un.kf_timerfd.kf_timerfd_clockid = tfd->tfd_clockid; kif->kf_un.kf_timerfd.kf_timerfd_flags = tfd->tfd_flags; kif->kf_un.kf_timerfd.kf_timerfd_addr = (uintptr_t)tfd; - mtx_unlock(&tfd->tfd_lock); return (0); } @@ -376,6 +384,7 @@ timerfd_curval(struct timerfd *tfd, struct itimerspec *old_value) { struct timespec curr_value; + mtx_assert(&tfd->tfd_lock, MA_OWNED); *old_value = tfd->tfd_time; if (timespecisset(&tfd->tfd_time.it_value)) { nanouptime(&curr_value); @@ -472,11 +481,11 @@ kern_timerfd_gettime(struct thread *td, int fd, struct itimerspec *curr_value) error = fget(td, fd, &cap_write_rights, &fp); if (error != 0) return (error); - tfd = fp->f_data; - if (tfd == NULL || fp->f_type != DTYPE_TIMERFD) { + if (fp->f_type != DTYPE_TIMERFD) { fdrop(fp, td); return (EINVAL); } + tfd = fp->f_data; mtx_lock(&tfd->tfd_lock); timerfd_curval(tfd, curr_value); @@ -504,11 +513,11 @@ kern_timerfd_settime(struct thread *td, int fd, int flags, error = fget(td, fd, &cap_write_rights, &fp); if (error != 0) return (error); - tfd = fp->f_data; - if (tfd == NULL || fp->f_type != DTYPE_TIMERFD) { + if (fp->f_type != DTYPE_TIMERFD) { fdrop(fp, td); return (EINVAL); } + tfd = fp->f_data; mtx_lock(&tfd->tfd_lock); getnanotime(&tfd->tfd_mtim); From nobody Tue Sep 5 22:26:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgKpw3l40z4sd3S; Tue, 5 Sep 2023 22:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgKpv6vy0z4Pw2; Tue, 5 Sep 2023 22:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yujNGwS8AznNle115dEGCIbkEpJ4jQDj4Cb9J4oHczA=; b=l1B1goO6W8nOfBOQeZq4xSp1h3M+tNd5ayx3nqgG9SbHwmX0FQa/XNxzllVWsdB7AzuqEU DJzuWNH+O5Y61OHP/QYu3cr4EaIuu7G1vF5cNtriSICRszicO2iAbMDYoGy1X9CqtyLWtm FyxkSobDn2ySqFZbaae+stfQ/am9izjNdMs/xt5tcRfGTZVtEhUvv+ppe/8M6DgIM7ZqNp VFtDkC9TBRkEFwsijX88snYnt1ihZWaGAos06x8jnLVOkmCjvrhyi3uJGPO8tFzdLZKZL0 mh3zGZDa9hy3Y1u8wi398yMei3OgpNeSZ9pBMaNLVUbzBeyNTMNWVtnTcRcYWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693952776; a=rsa-sha256; cv=none; b=dyFYTNtCefjsNTlb8trWIYE0WDW83AM63KktIAvS08uw1O1/w2rnQ7+5DcsiuMWTG4nV+F e4Guvh04EvqT68tIi5xOJdK4kJnRvlb/arOHjnqg17gmF7sBFYQNQIrKvaohuaJeImUcGn SkQc9Pk+vxNaDprRdEsFT8YJp9QQHE1+bv1pYgjkCAw78HNM0DgqD+s6SObQmoAfNn/o26 zAkIBr5zPO14wQ1lqTS82iVk78RlooY7t+gSHKMqKpA90UI9s6DbI763UltpM65+eDFHSg FYNuOW/xcWid0PTiQjXqq0VmY2J1PLU6UGyixizFXrvb2ofwALUY9mUmZ7utgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yujNGwS8AznNle115dEGCIbkEpJ4jQDj4Cb9J4oHczA=; b=dLLT3u6Vm2gE1JOYnBk1+z1tMIFk2q7pIqu2DqRwm7Y7StHDAAB/yTTK+pzRzXEj4ICkO1 y+5ayhkDW17h3Z2EJOalg0pvBQMd0i6mit9GYFk96KBmteVKPEhU7oF7iY/qXR+1r2xvKp Wo8vb41PpWcox+AZEvLvEWx9yl/X8QEdGibTaNZHdxf2aAJGRw8a3D5RjF08Ld9MtG0yjG 7Y5/P1yhDgdu0H8J65J3bnaYCXsUxsEuyXGrAWrvkDNS0AGtNUv70LmxyaJVbpSfo6xXaN 8t7L//fCpSk5nZtv9UQnokbrHwte2EPXnZrFtBAE0qXMeJkxEWrE8jKTQEDPDA== 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 4RgKpv5v1QzrCB; Tue, 5 Sep 2023 22:26:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385MQFsB075357; Tue, 5 Sep 2023 22:26:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385MQF5F075354; Tue, 5 Sep 2023 22:26:15 GMT (envelope-from git) Date: Tue, 5 Sep 2023 22:26:15 GMT Message-Id: <202309052226.385MQF5F075354@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fb5daae920ba - main - timerfd: Namespace pollution adjustments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb5daae920bae84e3eec8175bf9e46304c3b2ae6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fb5daae920bae84e3eec8175bf9e46304c3b2ae6 commit fb5daae920bae84e3eec8175bf9e46304c3b2ae6 Author: Jake Freeland AuthorDate: 2023-09-05 22:11:50 +0000 Commit: Warner Losh CommitDate: 2023-09-05 22:25:01 +0000 timerfd: Namespace pollution adjustments Do not pollute userspace with , instead declare struct thread when _KERNEL is defined. Include instead of . This causes intentional namespace pollution that mimics Linux. g/musl libcs include in their , exposing clock gettime, settime functions and CLOCK_ macro constants. Ports like Chromium expect this namespace pollution and fail without it. MFC After: 3 days Reviewed by: imp, markj Differential Revision: https://reviews.freebsd.org/D41641 --- sys/sys/timerfd.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/sys/timerfd.h b/sys/sys/timerfd.h index 8cb9939ba60f..cace3b71498c 100644 --- a/sys/sys/timerfd.h +++ b/sys/sys/timerfd.h @@ -30,8 +30,12 @@ #include #include -#include -#include +/* + * We only need , but glibc pollutes the namespace + * with . This pollution is expected by most programs, so + * reproduce it by including here. + */ +#include typedef uint64_t timerfd_t; @@ -54,6 +58,8 @@ __END_DECLS #else /* _KERNEL */ +struct thread; + int kern_timerfd_create(struct thread *td, int clockid, int flags); int kern_timerfd_gettime(struct thread *td, int fd, struct itimerspec *curr_value); From nobody Tue Sep 5 22:26:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgKpx1bBxz4sd8d; Tue, 5 Sep 2023 22:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgKpx0jlDz4PnF; Tue, 5 Sep 2023 22:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LlnJn3LC9iHqXJdwpU77yR16qnsvUB9L2ZavkwEYovM=; b=Qc1LmBl/tw976XBuJBEKrfeQ98kbYydLJXWUFmE9b5CncKtAnY7qW9xWA2snmSMg7y6bCw +/diPBkhnUe4A2T6u1PhuY9H/gDfJOXdaLCkSb3ia5wI+tt+GZ4vNaaafZSqFl6qegj9Rk OWiMsZSavNsyPDsV5oAt3AobQCIeREmr7d3Lv3gwi/VmRu7S9WzcwKpLxt9nfqz2PvOFcl lGQm1CybiQtsuUwcflrlijjAlXb+b9bO1NAc+Z3wIOTmq8+TojzTz5XYzwEiuwnAADSJyk 2sAjGTS4mB1IOjN9J1oaPPJeWStriAR8wr9n4im0PMpXpeCzu0XnaGhJLBlesA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693952777; a=rsa-sha256; cv=none; b=V2I5s/J+GmyzEce+qAWzQK4B8SUzvZXG2KwtAq48gRwDor6rGNexzPVPvD/A0WTy07dEeU XN15VRYLIJbi0wxTqcelMWjLcccPblVUxawpZoWhihH5Iqtij3m7O/FIpI36INxiJI8VWv BDVPoYFpGIu2yviX3GWw6//ukh4YUVISjxwUemsz8mQUlKV47EXsC8m3nMPRb3qV1dQ7K/ 4KqB7Z4umCMAxRqyHhwyEXyGyX9f/cJM9BaJddG8PCPL+vvOtSZtsGNTyzKAo+OaBb2aRm qazXn/gpwJKDf0lIB5/w23N7YkxZQU1WOWE1RBU9oDMmThkG7jQj0RNiV9Qjgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693952777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LlnJn3LC9iHqXJdwpU77yR16qnsvUB9L2ZavkwEYovM=; b=QQ9M6y0Aeh+zMp5Fst4CGs0Y9wN1dGlJ3cpi8k3TOYm1qa4HZZfy6chSiOwPiK13NBUiQo kODkpLxPM/ocMmMXWe7OVf0I2maCss9uzkxfbqToNNQucCmE9X4fmG7ZVeK2bImsmoPw4r iuNvRDX0Io0MAzynHOvq02dxVGrWWS+/TPeIWPeUKVGgsHm+6TMvdsK7oescRf/NbuYHyq gwiSZRGzXl/0TJIIyXBqpODrBKeH5IdvIaaG/27w0WYA+TQs5c2JSS+5uvJyZQFyNaCb05 +Y8lES3m+Qdv8EjBHDt1E+5R2VSOPsAi3YhCJoHvVE5rOPGwPcxF7TIsWpB+Xg== 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 4RgKpw6sjxzqpc; Tue, 5 Sep 2023 22:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 385MQGML075406; Tue, 5 Sep 2023 22:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385MQGbE075403; Tue, 5 Sep 2023 22:26:16 GMT (envelope-from git) Date: Tue, 5 Sep 2023 22:26:16 GMT Message-Id: <202309052226.385MQGbE075403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 918966a27479 - main - timerfd: Relocate 32-bit compat code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 918966a27479b4fb7c4c8999c4926d83c2c081e5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=918966a27479b4fb7c4c8999c4926d83c2c081e5 commit 918966a27479b4fb7c4c8999c4926d83c2c081e5 Author: Jake Freeland AuthorDate: 2023-09-05 22:13:23 +0000 Commit: Warner Losh CommitDate: 2023-09-05 22:25:07 +0000 timerfd: Relocate 32-bit compat code 32-bit compatibility code is conventionally stored in sys/compat/freebsd32. Move freebsd32_timerfd_gettime() and freebsd32_timerfd_settime() from sys/kern/sys_timerfd.c to sys/compat/freebsd32/freebsd32_misc.c. MFC After: 3 days Reviewed by: imp, markj Differential Revision; https://reviews.freebsd.org/D41640 --- sys/compat/freebsd32/freebsd32_misc.c | 55 +++++++++++++++++++++++++++++++ sys/kern/sys_timerfd.c | 61 ----------------------------------- 2 files changed, 55 insertions(+), 61 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index 22ee4897083e..c26e7b97e717 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -82,6 +82,7 @@ #include #include #include +#include #include #include #include @@ -3138,6 +3139,60 @@ freebsd32_ktimer_gettime(struct thread *td, return (error); } +int +freebsd32_timerfd_gettime(struct thread *td, + struct freebsd32_timerfd_gettime_args *uap) +{ + struct itimerspec curr_value; + struct itimerspec32 curr_value32; + int error; + + error = kern_timerfd_gettime(td, uap->fd, &curr_value); + if (error == 0) { + CP(curr_value, curr_value32, it_value.tv_sec); + CP(curr_value, curr_value32, it_value.tv_nsec); + CP(curr_value, curr_value32, it_interval.tv_sec); + CP(curr_value, curr_value32, it_interval.tv_nsec); + error = copyout(&curr_value32, uap->curr_value, + sizeof(curr_value32)); + } + + return (error); +} + +int +freebsd32_timerfd_settime(struct thread *td, + struct freebsd32_timerfd_settime_args *uap) +{ + struct itimerspec new_value, old_value; + struct itimerspec32 new_value32, old_value32; + int error; + + error = copyin(uap->new_value, &new_value32, sizeof(new_value32)); + if (error != 0) + return (error); + CP(new_value32, new_value, it_value.tv_sec); + CP(new_value32, new_value, it_value.tv_nsec); + CP(new_value32, new_value, it_interval.tv_sec); + CP(new_value32, new_value, it_interval.tv_nsec); + if (uap->old_value == NULL) { + error = kern_timerfd_settime(td, uap->fd, uap->flags, + &new_value, NULL); + } else { + error = kern_timerfd_settime(td, uap->fd, uap->flags, + &new_value, &old_value); + if (error == 0) { + CP(old_value, old_value32, it_value.tv_sec); + CP(old_value, old_value32, it_value.tv_nsec); + CP(old_value, old_value32, it_interval.tv_sec); + CP(old_value, old_value32, it_interval.tv_nsec); + error = copyout(&old_value32, uap->old_value, + sizeof(old_value32)); + } + } + return (error); +} + int freebsd32_clock_getcpuclockid2(struct thread *td, struct freebsd32_clock_getcpuclockid2_args *uap) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index a81b5ad0fade..e245baed88be 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -54,11 +54,6 @@ #include -#ifdef COMPAT_FREEBSD32 -#include -#include -#endif - static MALLOC_DEFINE(M_TIMERFD, "timerfd", "timerfd structures"); static struct mtx timerfd_list_lock; @@ -598,59 +593,3 @@ sys_timerfd_settime(struct thread *td, struct timerfd_settime_args *uap) } return (error); } - -#ifdef COMPAT_FREEBSD32 -int -freebsd32_timerfd_gettime(struct thread *td, - struct freebsd32_timerfd_gettime_args *uap) -{ - struct itimerspec curr_value; - struct itimerspec32 curr_value32; - int error; - - error = kern_timerfd_gettime(td, uap->fd, &curr_value); - if (error == 0) { - CP(curr_value, curr_value32, it_value.tv_sec); - CP(curr_value, curr_value32, it_value.tv_nsec); - CP(curr_value, curr_value32, it_interval.tv_sec); - CP(curr_value, curr_value32, it_interval.tv_nsec); - error = copyout(&curr_value32, uap->curr_value, - sizeof(curr_value32)); - } - - return (error); -} - -int -freebsd32_timerfd_settime(struct thread *td, - struct freebsd32_timerfd_settime_args *uap) -{ - struct itimerspec new_value, old_value; - struct itimerspec32 new_value32, old_value32; - int error; - - error = copyin(uap->new_value, &new_value32, sizeof(new_value32)); - if (error != 0) - return (error); - CP(new_value32, new_value, it_value.tv_sec); - CP(new_value32, new_value, it_value.tv_nsec); - CP(new_value32, new_value, it_interval.tv_sec); - CP(new_value32, new_value, it_interval.tv_nsec); - if (uap->old_value == NULL) { - error = kern_timerfd_settime(td, uap->fd, uap->flags, - &new_value, NULL); - } else { - error = kern_timerfd_settime(td, uap->fd, uap->flags, - &new_value, &old_value); - if (error == 0) { - CP(old_value, old_value32, it_value.tv_sec); - CP(old_value, old_value32, it_value.tv_nsec); - CP(old_value, old_value32, it_interval.tv_sec); - CP(old_value, old_value32, it_interval.tv_nsec); - error = copyout(&old_value32, uap->old_value, - sizeof(old_value32)); - } - } - return (error); -} -#endif From nobody Wed Sep 6 01:38:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgQ4T3bnpz4srMC; Wed, 6 Sep 2023 01:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgQ4T38Ftz3cCL; Wed, 6 Sep 2023 01:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693964297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IzmeVWV49OvJyd5a/phkrSxKWbhbFgsxMamRE/dGdzY=; b=myLFAOPCEjGup7ZI061wqOiU5yG5xECUks0qkHnCE4pwlRgBLx9iaTlqeqHMXVOBQ2FaGY XKQXv1r9O4fjmxUlgkP8NaBdySIgGFLEsdwv2fBdpxYQSJQ422bydwjrFReDlz7Hl0Hlta xoAurfkCf9Jxc3ngc2LQItx1aiYHarTfEXCpTJGszsYmPmfJ+rXVTXxfVxwUYDWyz1eHZG LeK6q0rlRE6856kvMKQLz20AvQs+oFdnc1X7TuvJXa/tKQ98nSUEZ0Rpfq0/aJeDPyhvCR zNU8ZCTrbLIRnaSOvHADg9tXZxS5wobF+uu57sBzFKPe+k1/cZjOwI/5cAUfhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693964297; a=rsa-sha256; cv=none; b=NJ5qmEUjm7GsCXbVIvh2czPKqtDgR7QoPv5iHSn3dT0+YTqsTKy8z6WO+qBxKRmh48j9y8 wiS2uQBcLTVysFzm0WeX2Ak6CiIKkWio6h4nnHwmzoOaAXM+nvlHK8oDtfNF3UC/k4GSVT JEwHuwwjnz1kdLdEAPZ+UTIlUyLmv8KlvZ8QnIvK/8Jm9RaweKNdZuXlL8mayV0JAPgNnT EAyLCF9HPN+WKpgp3npG5hferfbH2yffta8koxDmpLaXw4C1m+7NmmdMngjk0lrUYaWauK CXHi14WmHI/iLoCjQX9iZSvQUNt5ttgI3KmRx+9buoCXvBO6YGpQ44ZHvVdWWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693964297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IzmeVWV49OvJyd5a/phkrSxKWbhbFgsxMamRE/dGdzY=; b=nspjBOLCAHVXgrMOjStNusm+mDckHaD4AG9V1u9/yBbPUoCC+wUv41tEaasjDuLSRcUCUd 1WIJUkVkdoO8hAdNpA/KHoiVCqglTIEU1JFZFPYAYiCVHlKZ4NR4xQvANk0dzLkmCl7m2o 3rMAbf+QjT+/WDu1zwNIT1VSq0wRxedScJ380kMp47aFuRkKuE0dwaXqkPuGpba5mux75w r1JknGj0AGImyCNmf0phx8AAQinvp767S2cWS4svM2gPSAHYQdYxNAwnVCnvS1kzdmb1KV 1MH1SJ+a2ZlPSgVZzvU01pol2Swum78EatVhS9/4VyaOnxOFKMR1CZ/dCWcEfg== 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 4RgQ4T2F6tzwqg; Wed, 6 Sep 2023 01:38:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3861cHu9088855; Wed, 6 Sep 2023 01:38:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3861cHIc088852; Wed, 6 Sep 2023 01:38:17 GMT (envelope-from git) Date: Wed, 6 Sep 2023 01:38:17 GMT Message-Id: <202309060138.3861cHIc088852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8091b82e2916 - main - time.h: Fix visibility check for C11 and C23 features. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8091b82e291642f3034dc3fdc8689a4f4ba027da Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8091b82e291642f3034dc3fdc8689a4f4ba027da commit 8091b82e291642f3034dc3fdc8689a4f4ba027da Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 01:37:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-06 01:38:01 +0000 time.h: Fix visibility check for C11 and C23 features. __BSD_VISIBLE is always defined; we need to check if it's true. Fixes: d02489d11aed 9b5d724cad10 MFC after: 3 days Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D41733 --- include/time.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index ef55577a2f84..ff858cc1f420 100644 --- a/include/time.h +++ b/include/time.h @@ -179,13 +179,13 @@ time_t posix2time(time_t t); #include #endif -#if defined(__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2011 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ int timespec_get(struct timespec *ts, int base); -#if defined (__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2023 +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 /* ISO/IEC 9899:2024 7.29.1 Components of time */ #define TIME_MONOTONIC 2 /* monotonic time */ /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ From nobody Wed Sep 6 03:29:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgSYC599Vz4sZfJ; Wed, 6 Sep 2023 03:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgSYC4l3Kz4b9X; Wed, 6 Sep 2023 03:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693970991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=auTQ7i69sde16X8mPFNBelpQvQqPQz3gCT2CqNtDv80=; b=DQFZAl2jR8Z6JwTqcYzlhWC3BQwhgl/KnsC+S4V60RlhBnXAaFyWFlbWORuC4v+CegkZ+n cOEbwh6N8aCeQ+MEnxu/FJT5uuk7VHpUGHuPeJ+GEDUcoRg6BX1JAFtzpOmaJ46e+fTc/5 sHNe/x5aK7Vh20RaQEmHyxTq3c69WJqLpErhObTFVrhJmtL9ftCiRk3+qm4+RN/Keuy3Br tmJfrdi3YfG7WkB7u+aPVgzWd2mJuanDzyitcXKuM8NEzYVZ5WMGisCQ9r6lOAItp4sK7j /flW+VxOx4anUUi2a5+p/fZXIsraI6TiO1kkvBN7lLNlGLS3fHbTOugTcpq9uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693970991; a=rsa-sha256; cv=none; b=k0QWyfsbMKYLqBEriaTCbEUxkGTlplFmQPnvFNl8zbr2xHsYyBD7ykpo96cJP+0FVTQQrP GpjMuN96TB6/yMz2ywKQ0/LXX4/XIMjPCfwkB0SbTbxisN2jaU8qc+kB0am1/+lUYp1G5j wBBQZmQS0ZTI1i9Ww4zIvSREEZdzowFN+SISCXY5sMgb0D2cBvkr3piO+aUXb1Ux5QLWHw B0yQRX8Uv6/CuIGKX2DFhjII0c7jFvxkdFuzteYJoRm9/phV4O7d4gBkkcikmQz0ImPVkL 0p8tJ64KqkAybNowhM/n0T/zxlGH/8yOl9BaKXI6nAMwZThCy4UTDT4JuUTqog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693970991; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=auTQ7i69sde16X8mPFNBelpQvQqPQz3gCT2CqNtDv80=; b=Z0lQ+ym4PSH7ltFNDOXeSwzqDxm3IsWwOxeYvvgS8L2L8rufp4BLKby4uY1LS3wHALGF9t 8aJIFhlQtn4YTJQ24BnOzOpXrVGpB3rTSsFKU+JNmQnBMSVTS8OXryShIaeCppZZhaCF0L cRaj9NoP6oYZJKsUhk3UDReqrkmUxzhVHo/GiWekZyuZMu1QFeZ5JGRa+ornGbnM8t6zNI janM38n1l7LsEBEGwWM6tbiAAb03eXYCGKiyHJl/Yg4gqZJUO4lytQYNuPZ4RKHLrIczah +2AiTfOqW2VoaQAMkppnRvIWgGRwr38wx1AqiT5tmJ7qdDIDejNvPFnwxmMj2g== 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 4RgSYC3nbvz106P; Wed, 6 Sep 2023 03:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3863TpJY073290; Wed, 6 Sep 2023 03:29:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3863TpNY073287; Wed, 6 Sep 2023 03:29:51 GMT (envelope-from git) Date: Wed, 6 Sep 2023 03:29:51 GMT Message-Id: <202309060329.3863TpNY073287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cbea5eddb1b6 - main - split: Add missing test cases. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbea5eddb1b6ae2a101beacf00bf165517f4f2b1 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cbea5eddb1b6ae2a101beacf00bf165517f4f2b1 commit cbea5eddb1b6ae2a101beacf00bf165517f4f2b1 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 03:28:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-06 03:29:28 +0000 split: Add missing test cases. This adds test cases for c4f7198f47c1 and ac17fc816e67. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41755 --- usr.bin/split/tests/split_test.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/usr.bin/split/tests/split_test.sh b/usr.bin/split/tests/split_test.sh index 899fd028e74b..6b59b2442017 100755 --- a/usr.bin/split/tests/split_test.sh +++ b/usr.bin/split/tests/split_test.sh @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2022 Klara Systems +# Copyright (c) 2022-2023 Klara Systems # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -200,6 +200,26 @@ EOF atf_check -o file:foo-ab cat split-ab } +atf_test_case autoextend +autoextend_body() +{ + seq $((26*25+1)) >input + atf_check split -l1 input + atf_check -o inline:"$((26*25))\n" cat xyz + atf_check -o inline:"$((26*25+1))\n" cat xzaaa +} + +atf_test_case continue +continue_body() +{ + echo hello >input + atf_check split input + atf_check -o file:input cat xaa + atf_check -s exit:1 -e ignore cat xab + atf_check split -c input + atf_check -o file:input cat xab +} + atf_init_test_cases() { atf_add_test_case bytes @@ -209,4 +229,6 @@ atf_init_test_cases() atf_add_test_case numeric_suffix atf_add_test_case larger_suffix_length atf_add_test_case pattern + atf_add_test_case autoextend + atf_add_test_case continue } From nobody Wed Sep 6 03:29:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgSYD6YxMz4sZgy; Wed, 6 Sep 2023 03:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgSYD5lJLz4b5X; Wed, 6 Sep 2023 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693970992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2UTB7EbQw9yoioCGee1vwrJpDugXgmTO4CpLf/LRbVk=; b=TBPL8RpLKe65rXIlCNrOF9sWd1bHVgkT5J8y5HqG73c5FLmWBcNvgBCC9o0cnW+uqePABn kP1koxkPmNdO5m72S08Fau+naMbpXgsxpayFQX1ndM0TeaAJ4Y71+tvywROOuiA6iiXwIA nV68K0d5vLC/3IO45G+RdXHfmNIXE9U7mcvyBUu0Ad/nOTvhUSG/6E85cSqaniiKsIHaC2 wccTZi6nC3MNlMIEZhmv8fGVqHC0VOlR5uM5G78vHSwcuxsQ8ii/+/5ff5z9c7EsVhyTq6 fCw+rpWzcy824H8ycQPyqQLFj6vYs4sENDrQhYcT8gVF6aXHdZAmBHnAF/eY4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693970992; a=rsa-sha256; cv=none; b=syh5FEaPCGOmMMWQYpLQReo4U3kOT7tJugyCSGiwz9nag144hui7V1iZECr0/IeZWxnujk YYLEygUWdyMrbgkUTIQrp/9Al+345KfHUCFzqgKNjoWqE/NHNxnztAkIOeSgbS51z6Llxl 1ZYJnFcplbotQMBxSQwvEt2xmFWjqHzBGDFQagUVtlcAEUh2vnI/afbYKiMiv1x9mCRUnF srhtbTC8YkBdxDotxVCVXfT94ppTo9tMxfDMfnMhyITqr7jAu8GAUc7unApozGMq75xGe9 7Z8D/nI7aSIC7k6INJpO4zMWvo/hMVCBfDd5N/ucET/Ezo45IfcmE9P+g1Dm/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693970992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2UTB7EbQw9yoioCGee1vwrJpDugXgmTO4CpLf/LRbVk=; b=KgLQKcwIrLn+05rUf0KKgoaL9GTttZ0vwabOOVTWmE6NxvIWMmyo0y/GMRy6kb1/bdyUsx +UmECMb0m1JvLcS74pOLKikqgjH0aBBi5P4MMAqZ7v8++RA9YSEr8fnlC1b3RhTx2Cyl8x iEquulCUTkBnT5MFvJKcxO6RQOZhU7m0E4wroPQbiJF0QkJxPIX5hG1hDbbQyzWcOeM1gY CcIw0+QvUC9xVfrdH5s98F4fqgnmIMQGnFMX85XoLYwS56F/Z0VLDYNsx0xMs5yu+7eRca 0ZzPW7AkziOnpOlThG7OZUj9LYRC1RIlNW1Bbq6ROBgPPlb/5W5lrbTCY3FlwA== 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 4RgSYD4h2sz10cn; Wed, 6 Sep 2023 03:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3863Tqt5073329; Wed, 6 Sep 2023 03:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3863TqvD073326; Wed, 6 Sep 2023 03:29:52 GMT (envelope-from git) Date: Wed, 6 Sep 2023 03:29:52 GMT Message-Id: <202309060329.3863TqvD073326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 851bf856d1a7 - main - split: Code cleanup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 851bf856d1a7ad5427ea9c22639ab6f6c4a3f503 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=851bf856d1a7ad5427ea9c22639ab6f6c4a3f503 commit 851bf856d1a7ad5427ea9c22639ab6f6c4a3f503 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 03:28:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-06 03:29:31 +0000 split: Code cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41756 --- usr.bin/split/split.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index b5a457ab6ecd..6894e9e63195 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -41,7 +41,6 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; #endif #include -#include #include #include @@ -85,9 +84,9 @@ static void usage(void) __dead2; int main(int argc, char **argv) { - int ch; - int error; - char *ep, *p; + const char *p; + char *ep; + int ch, error; setlocale(LC_ALL, ""); @@ -157,17 +156,22 @@ main(int argc, char **argv) argv += optind; argc -= optind; - if (*argv != NULL) { /* Input file. */ + if (argc > 0) { /* Input file. */ if (strcmp(*argv, "-") == 0) ifd = STDIN_FILENO; else if ((ifd = open(*argv, O_RDONLY, 0)) < 0) err(EX_NOINPUT, "%s", *argv); ++argv; + --argc; } - if (*argv != NULL) /* File name prefix. */ - if (strlcpy(fname, *argv++, sizeof(fname)) >= sizeof(fname)) - errx(EX_USAGE, "file name prefix is too long"); - if (*argv != NULL) + if (argc > 0) { /* File name prefix. */ + if (strlcpy(fname, *argv, sizeof(fname)) >= sizeof(fname)) + errx(EX_USAGE, "file name prefix is too long: %s", + *argv); + ++argv; + --argc; + } + if (argc > 0) usage(); if (strlen(fname) + (unsigned long)sufflen >= sizeof(fname)) @@ -400,7 +404,6 @@ newfile(void) sufflen++; /* Reset so we start back at all 'a's in our extended suffix. */ - tfnum = 0; fnum = 0; } From nobody Wed Sep 6 03:29:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgSYG0xr2z4sZkG; Wed, 6 Sep 2023 03:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgSYF6nqMz4bMd; Wed, 6 Sep 2023 03:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693970993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fCkDKXcxz8IvJ65AZXRbk3hbgvBBpmetwc3DBHlGp9s=; b=Cz0Nix1RyFD2S4X0yivwpYDkRZesnvwN94t/UNHWoH3hdtf/fLw3HRFj/q+A57UWGUu0hN Kon9qVfHIn3uPv97d5xxrIIYMu20bR3H455P2uY1q+qJBaJk58vx24DAQJYiqwqCBu7vFR eq+LmN0oZ6vwBBpKIjvNRfG/ukG9dN2xeU3qDtCgHRA2D3wRzCEH5ZLAjYXu+hrC5HOTfi oE+7sdLPs91uM6dvPv8Nvh3WOhKbzBDih7ADlQ4TJNQW8H4bH35tWVZcgvR30hcVCOl+5R aUHSWl+RfumVUShKCxgQC/6IP8KT2zTRk4ieg5ILzTMtQLtLtyiIRmML6Y1y2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693970994; a=rsa-sha256; cv=none; b=Cms6kivCSzj4g8Hjjo1kva1xheFf71zTZhzQhIYiANCFhb5KnPgxaSQJANdzbtZ6lg9n7z TWUs8YWqs8nlP7VwXUDJljJgYXs0vhiOQCZNd07fXmE+6f5s4fciilqzH89vpyRBVPa4Wn PCzC+YJNYvrKGdTuggZmWJPWIegCPjKUFuxc11DlVPZCW8jIEJdq/yOShuNi+NmwNUoJYS Ky8h29+zqoyY4aGijim4h2hqr+gVgX/Bmd/nlYi30F8p5hUuQ/8VJBUr0c4ZUsj5we6bCh yItR495kSGsbFuNr9Mj/sEESJMOn1k8JusuGJfdP1vgY8SFn8GsAcNCbu1WECw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693970993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fCkDKXcxz8IvJ65AZXRbk3hbgvBBpmetwc3DBHlGp9s=; b=VHYebvjnzF0VGEfpc3yfznyANvdyuCHB4x4NwR6RUw38SjyYyKLUa0I78SIyN9aSh8HnkI vgcsO4hRKnf+UqCnsztl75M6RjF2GEz6g9ZASLVRnvn8SaxpWtSmtdaC25VPIq9EPysaWX wI8vP4rYynC4Gsk760UyCKOY3wsvbzA/li/F+Tgv1RifJDw8moZfIpeE9+7HyLZGLg1yg+ QgXwz+eE02Q8dED5w+BKSIMX1O2rK9xWz6LzYXIx8E217dF9QJHCtBXoNejdJObrHa5jVZ ePLqTFQ9OYL0JAJwRIJ1UwPAbIGPHg3oD21c//Ddgzwgx3JUFvVJ4MeiJJfMHw== 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 4RgSYF5j8qz10jt; Wed, 6 Sep 2023 03:29:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3863TrEU073371; Wed, 6 Sep 2023 03:29:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3863TrIf073368; Wed, 6 Sep 2023 03:29:53 GMT (envelope-from git) Date: Wed, 6 Sep 2023 03:29:53 GMT Message-Id: <202309060329.3863TrIf073368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 117c54a78ccd - main - split: Fix linecount parsing. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 117c54a78ccd214c236806721f21da750e512d3e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=117c54a78ccd214c236806721f21da750e512d3e commit 117c54a78ccd214c236806721f21da750e512d3e Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 03:28:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-06 03:29:31 +0000 split: Fix linecount parsing. The “undocumented kludge” which unfortunately can't be dropped for backward compatibility reasons was prone to segfaulting and would improperly allow a new linecount when one was already set. Fix these issues and add regression tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41757 --- usr.bin/split/split.c | 22 ++++++++++------------ usr.bin/split/tests/split_test.sh | 21 +++++++++++++++++++++ 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index 6894e9e63195..af1ed69c9482 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -91,7 +91,7 @@ main(int argc, char **argv) setlocale(LC_ALL, ""); dflag = false; - while ((ch = getopt(argc, argv, "0123456789a:b:cdl:n:p:")) != -1) + while ((ch = getopt(argc, argv, "0::1::2::3::4::5::6::7::8::9::a:b:cdl:n:p:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -99,17 +99,15 @@ main(int argc, char **argv) * Undocumented kludge: split was originally designed * to take a number after a dash. */ - if (numlines == 0) { - p = argv[optind - 1]; - if (p[0] == '-' && p[1] == ch && !p[2]) - numlines = strtol(++p, &ep, 10); - else - numlines = - strtol(argv[optind] + 1, &ep, 10); - if (numlines <= 0 || *ep) - errx(EX_USAGE, - "%s: illegal line count", optarg); - } + if (numlines != 0) + usage(); + numlines = ch - '0'; + p = optarg ? optarg : ""; + while (numlines >= 0 && *p >= '0' && *p <= '9') + numlines = numlines * 10 + *p++ - '0'; + if (numlines <= 0 || *p != '\0') + errx(EX_USAGE, "%c%s: illegal line count", ch, + optarg ? optarg : ""); break; case 'a': /* Suffix length */ if ((sufflen = strtol(optarg, &ep, 10)) <= 0 || *ep) diff --git a/usr.bin/split/tests/split_test.sh b/usr.bin/split/tests/split_test.sh index 6b59b2442017..c9b87c01618c 100755 --- a/usr.bin/split/tests/split_test.sh +++ b/usr.bin/split/tests/split_test.sh @@ -220,6 +220,25 @@ continue_body() atf_check -o file:input cat xab } +atf_test_case undocumented_kludge +undocumented_kludge_body() +{ + seq 5000 >input + atf_check split -1000 input + atf_check -o file:xae seq 4001 5000 + atf_check split -d1000 input + atf_check -o file:x04 seq 4001 5000 +} + +atf_test_case duplicate_linecount +duplicate_linecount_body() +{ + atf_check -s exit:64 -e ignore split -5 -5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -5 /dev/null + atf_check -s exit:64 -e ignore split -5 -l5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -l5 /dev/null +} + atf_init_test_cases() { atf_add_test_case bytes @@ -231,4 +250,6 @@ atf_init_test_cases() atf_add_test_case pattern atf_add_test_case autoextend atf_add_test_case continue + atf_add_test_case undocumented_kludge + atf_add_test_case duplicate_linecount } From nobody Wed Sep 6 04:09:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgTQy1wqKz4rxWt; Wed, 6 Sep 2023 04:09:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgTQx735qz3HlR; Wed, 6 Sep 2023 04:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXzrFAPIhNxCGPXH8Gm/VWLSuO1nD4iJquascAdrY0w=; b=dyTf6abNbezsP5y5n1egGIQCPakyarymZ9pim+KBBU+aTpcyvgoFuuGDz2ER4tK17+H78G 2vKgiTxEK4QCCTbP1olSWHQGbO0Hte82s5KouXflyZ6TbqOmSVh6fnkiozjSXsJT7unXY2 9j2t3mOdg+1+wgLeBUhBYCVGK/9frjFoxIXk0Y4HWq8Gn59Wu/Ngxy7yLV3u7f+ZMyJrJr Xh/cPW5B1S3XH9JJpWefCZOebCcwyNZO/0YwUVl+USVFEJF+D+LK8DvtIgC8Np5/2K5BZF w6i9aXVkfCzZ5MpkkcZfCFxaYjqd3pLlnOXYr7X92A4z1+gLAFx2LcAzOSadvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693973370; a=rsa-sha256; cv=none; b=jUT3RcSTocFMWGOUxnX+O9TfR/OFAh5hwcHbm9uAlffPphWS7cqfl37Sw2s5UTwI4w+K6F dWMH4JreUAc8jqEehSELy7AFL4/75uEDjR4Qpi3Zg6kvm1bik0pihcK4xFG2y0GnrHFAGq j9tTfNnHRmoPQSd9XHn0VViWkQqTmJvl24dh6c6JIk7JOzCfWX94457GyoaNc/ZXN9gG2Z rZpLlvDRJKtJZ37x55Zchcw1hNHWizj6Go0rwXCAZrxd2agOkwyDbUwbfaumdwAKtr85fs oe0ceNRzHLT8c4H3Y5+/b+GRhAe54VLb6FfJa1s48p3jeXp1+T5EPJHg08Gbdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973370; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NXzrFAPIhNxCGPXH8Gm/VWLSuO1nD4iJquascAdrY0w=; b=VlQroZcPRDgeh4z7hTE53aEUrji3H7GF7QP53GsbKGyHezoOVHlm+MSiE/3GvY2UbA387B v9EpR5RKPaOOrWS22b2Cy9mxkjzgAFtGI9vRAPK6sVPcjSZvG1hunSE7WGGYUTo7a9wY1D 0M/eOt6Mqct+50LWefEbTWkeSg/EGpde7RURX9vpty77WRg4aHq/AT0stJQXZzhCkZhbIP Z+6WGOh//KWd42OnPHCXvDZnybTR1TJDvUZbvrn897J7lassgYPNh5V8AXyZnMmc8s9LuY ASvd0Iix4geaMvGMCYBQQnoLthienih4HUgh+5f4PPaMGoNXYr/Uj876PWCk+w== 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 4RgTQx63f7z11Sv; Wed, 6 Sep 2023 04:09:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38649TZB040378; Wed, 6 Sep 2023 04:09:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38649TQu040375; Wed, 6 Sep 2023 04:09:29 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:09:29 GMT Message-Id: <202309060409.38649TQu040375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 494de30b63de - stable/14 - net: Remove vlan metadata on pcp / vlan encapsulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 494de30b63de9ef31587dcc3fb8e7249535e840a Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=494de30b63de9ef31587dcc3fb8e7249535e840a commit 494de30b63de9ef31587dcc3fb8e7249535e840a Author: Zhenlei Huang AuthorDate: 2023-08-30 09:36:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:07:21 +0000 net: Remove vlan metadata on pcp / vlan encapsulation For oubound traffic, the flag M_VLANTAG is set in mbuf packet header to indicate the underlaying interface do hardware VLAN tag insertion if capable, otherwise the net stack will do 802.1Q encapsulation instead. Commit 868aabb4708d introduced per-flow priority which set the priority ID in the mbuf packet header. There's a corner case that when the driver is disabled to do hardware VLAN tag insertion, and the net stack do 802.1Q encapsulation, then it will result double tagged packets if the driver do not check the enabled capability (hardware VLAN tag insertion). Unfortunately some drivers, currently known cxgbe(4) re(4) ure(4) igc(4) and vmx(4), have this issue. From a quick review for other interface drivers I believe a lot more drivers have the same issue. It makes more sense to fix in net stack than to try to change every single driver. PR: 270736 Reviewed by: kp Approved by: re (gjb) Fixes: 868aabb4708d Add IP(V6)_VLAN_PCP to set 802.1 priority per-flow MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39499 (cherry picked from commit b22aae410bc7e4e9a6b43e556dc34be72deadb65) --- sys/net/if_ethersubr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 63ea5e7591c2..ab274eeb88bf 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -446,9 +446,11 @@ ether_set_pcp(struct mbuf **mp, struct ifnet *ifp, uint8_t pcp) struct ether_header *eh; eh = mtod(*mp, struct ether_header *); - if (ntohs(eh->ether_type) == ETHERTYPE_VLAN || - ntohs(eh->ether_type) == ETHERTYPE_QINQ) + if (eh->ether_type == htons(ETHERTYPE_VLAN) || + eh->ether_type == htons(ETHERTYPE_QINQ)) { + (*mp)->m_flags &= ~M_VLANTAG; return (true); + } qtag.vid = 0; qtag.pcp = pcp; @@ -1463,6 +1465,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, if_printf(ife, "unable to prepend 802.1Q header"); return (false); } + (*mp)->m_flags &= ~M_VLANTAG; } return (true); } From nobody Wed Sep 6 04:09:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgTQz23Fxz4rxGQ; Wed, 6 Sep 2023 04:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgTQz1PcJz3Hjy; Wed, 6 Sep 2023 04:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ybhvik6qeXOZvQer8PCh2TNOnUh2NPSNBv/A+tWDIRc=; b=WwJjvGES/n/MFGpHSgGXs7gh/NSvt19JZ9ZwiU56DJsLmRih2ozlw8o6/4ygOK4BY9PESh N7THVYmp3gek/2oVop4Ct1cxIFIUl55nHnX20nWyFLbBc03edfps7BVU1bUaZuyi2k3Wav Em5oiGvgSMS0/q5SQZPAk/t5S6bmmW5Ibyk5tk+wL9czOMCLozIixhK6AR7J4NUAJmDqMC /1wS7h7WYp6zVFybWBz7mrBOKTfcj+J9s8dkdjgH/XxJkcub/oQfvbxsBH6KsDz/u8sQdN MylJweFsHEHnCJGS+jczIt2oVKCsRhhOg57xKRHS6gL7LnNfvlMVLjLC2GI/jQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693973371; a=rsa-sha256; cv=none; b=P26sbGtiY73bTdvXidO3LQoz/dZ9W1SO/qgjoKVtnViKA/P5rs8mZiW1e5QqnF9wiQ111L hXU9SOubzbnrPziP+f/9nKqFg/V/Nc17vV+SoSEUKtgVwGeoOfkYj0SJLMz/Ow3mTH16g6 q+JdzK949I+JK0eb9IPgejsb6QF0ZGRpyw2nmXep0sRah60b8mcbOKtMGtobhBltRl8kr9 pXLR9ysZwYZftbjoxElc+90eHE+QXyzkxLjx8xAa6fZVxhsZWiKMTXfPfdlWqU8LpC8V0d HU+aRfXvChyoa9nVjr0IYy29JQGV79FCsfHEyRg71/jR/gcsTiWnJuJEF04GvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ybhvik6qeXOZvQer8PCh2TNOnUh2NPSNBv/A+tWDIRc=; b=Tns0rZ2yioUF/c5UPA/9BbtDgYIo/qkYvjgsX/annQYb4nYXSgLng6ZOveWwxYLqrwIcxW yUxBz8QYG+rFT52lxxqk0muTspN5mhIs0u6PJXWDBwhzOalm1i61/R0u/m19zvkNIzJM3k EOKFqfLUe2vGwOs2gvdbaEd7qUiefdVwBsjw+BfyYLhVTFcsm9AZ++h0pnRbUVR82W+yST +XRoLGHXwqAYWxhqx95bnXAwVGiorOgQBxKqBZqdFESfne4uHVW8ayI2iJOv0co7jy3nIS cz3on0fEf3kH71DDeXplhluAC2hzC98oRKEIiQlD1RW6tH1rRADKW57bPS+/7g== 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 4RgTQz0F0Lz1186; Wed, 6 Sep 2023 04:09:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38649Ufu040450; Wed, 6 Sep 2023 04:09:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38649Ul5040447; Wed, 6 Sep 2023 04:09:30 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:09:30 GMT Message-Id: <202309060409.38649Ul5040447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 144851777eda - stable/14 - tcp: Initialize the maximum number of entries in a client cookie cache bucket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 144851777edad9522390036d3073ea656d7b648d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=144851777edad9522390036d3073ea656d7b648d commit 144851777edad9522390036d3073ea656d7b648d Author: Zhenlei Huang AuthorDate: 2023-09-02 20:34:07 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:07:49 +0000 tcp: Initialize the maximum number of entries in a client cookie cache bucket This vnet loader tunable is defined with SYSCTL_PROC, thus will not be initialized by kernel on vnet creating and will always have the default value TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT. Fix by fetching the value from the corresponding kernel environment during vnet constructing. PR: 273509 Reviewed by: #transport, tuexen Approved by: re (gjb) Fixes: c560df6f12f1 This is an implementation of the client side of TCP Fast Open (TFO) [RFC7413] MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41691 (cherry picked from commit 224aec05e732bb97a0d3c91142973b98a91238d1) --- sys/netinet/tcp_fastopen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index 9b6f9c17b05c..c31225214d1d 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -271,7 +271,7 @@ SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, autokey, static int sysctl_net_inet_tcp_fastopen_ccache_bucket_limit(SYSCTL_HANDLER_ARGS); SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, ccache_bucket_limit, - CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_NEEDGIANT, NULL, 0, &sysctl_net_inet_tcp_fastopen_ccache_bucket_limit, "IU", "Max entries per bucket in client cookie cache"); @@ -393,7 +393,8 @@ tcp_fastopen_init(void) V_tcp_fastopen_keys.newest = TCP_FASTOPEN_MAX_KEYS - 1; V_tcp_fastopen_keys.newest_psk = TCP_FASTOPEN_MAX_PSKS - 1; - /* May already be non-zero if kernel tunable was set */ + TUNABLE_INT_FETCH("net.inet.tcp.fastopen.ccache_bucket_limit", + &V_tcp_fastopen_ccache.bucket_limit); if (V_tcp_fastopen_ccache.bucket_limit == 0) V_tcp_fastopen_ccache.bucket_limit = TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT; From nobody Wed Sep 6 04:19:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgTfk4dMNz4s30T; Wed, 6 Sep 2023 04:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgTfk47WDz3LDN; Wed, 6 Sep 2023 04:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55W1KmHjsns5KBPyQvUoSkdfAUKnD/dcR3T7kmxA0dc=; b=FbqdZoyk1JFt4LPtWfmNjOdNTKHsI1JBVNqoHFL5kjDkeaCLmM4uvCn9h00TOxofWULYzX 36/ltdkWSwbk5Xvm91Lq77HoizYj10MDu3mu9sBKy6rtX1Bv73TCYrnrnMrb32DG7NiDJu JSkWZAnG7XmfW8qWzb8ZxcNvLQC2Vuq8sPcvghudiAgHzEVkeZMVED6Nv9Qo9rrNA/L2WF LUHuIw6J/tDtOtprTmsec8JGOKP3nInRVbtUv8cPk9nQGrTQHJB4QWsu6lvfMmzz+8uf01 CkvPXeQ71NpZexxO5PKW+H7+sqZdFfbp9AGXXqKZc0S4jnSA0eFbOUWrI/S+kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693973982; a=rsa-sha256; cv=none; b=osLDtc4pQXH/3Mmdey47Dot0Zu5rcqck1ecPP4vDz7B8iinjeupQyEHzuVVEjcdOoH/8vO nlvo1v7YrsMnBDtXUdaQIPDgborQBn4O0uRsOQ6R3PpWQJWiT7PJl3bYEFiNFF2JSXfxOr z/Q2bIr/gjAWjAzSVncxl8dwkvLB39tf4UJshI/u3xYKV0CLkJDX1HtC0YDe3dD1dUlvI6 VL1KgA1YKOb7cE2FpxAYg5BJJPUH9oLe2rUb9REAWdf7OeawLhQiV/XksWrFiEIzLNadnC wO9w87+EzROJjQJ9qlqeq6UI/YQV/42lUtjSH2xX0ynkgy30ZPB310O9KWPxoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55W1KmHjsns5KBPyQvUoSkdfAUKnD/dcR3T7kmxA0dc=; b=oZw+r3D6ODxgibxsGDiPoIhRCY03It3pNkyGrach3b7IVjDyGeLS6L/Jfo0HXmTIK3HeAe NpXgqKCOSFaJllirrhWv1cK4ImhBiwDDhFnw8N2JgSjHrk/Uq4EMX+zsyJ0uikNuTkK2iR fzJztnZC7M3Wy1erlCxBHKdL5Tn2LDWI8UoFRRww7x8fRRONWZ5AaKJKX1+avoizNEDYJs hOu5Z0V2rPoUj66ZUfjAYHJb8jAgX4mjWKQ5ByiQcKV65Sz9N1+7K+COxCdUe9fcnr482x 704BT61P58h+GpTiMX3L1qZCA6cM4sLnTGusBQseYST3WZoXVo+316LiS8AjUQ== 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 4RgTfk2p8bz11Ns; Wed, 6 Sep 2023 04:19:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864JgQb057452; Wed, 6 Sep 2023 04:19:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864Jg1T057449; Wed, 6 Sep 2023 04:19:42 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:19:42 GMT Message-Id: <202309060419.3864Jg1T057449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 809450c4b531 - stable/13 - geom_linux_lvm: Check the offset of physical volume header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 809450c4b53109b6ca8a87054452f2b3b8f711aa Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=809450c4b53109b6ca8a87054452f2b3b8f711aa commit 809450c4b53109b6ca8a87054452f2b3b8f711aa Author: Zhenlei Huang AuthorDate: 2023-08-22 09:20:10 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:17:49 +0000 geom_linux_lvm: Check the offset of physical volume header The LVM label is stored on any of the first four sectors, and the PV (physical volume) header is stored within the same sector following the LVM label. The current implementation does not fully check the offset of PV header, when attaching a bad formatted LVM PV the kernel may crash due to out-of-bounds memory read. PR: 266562 Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D36773 (cherry picked from commit c941b82e1c31a67a025c43cc7bd31f269fa62588) --- sys/geom/linux_lvm/g_linux_lvm.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c index 2e4bbcaa045a..dddc3ae9184e 100644 --- a/sys/geom/linux_lvm/g_linux_lvm.c +++ b/sys/geom/linux_lvm/g_linux_lvm.c @@ -67,7 +67,8 @@ static int g_llvm_read_label(struct g_consumer *, struct g_llvm_label *); static int g_llvm_read_md(struct g_consumer *, struct g_llvm_metadata *, struct g_llvm_label *); -static int llvm_label_decode(const u_char *, struct g_llvm_label *, int); +static int llvm_label_decode(const u_char *, struct g_llvm_label *, + int, u_int); static int llvm_md_decode(const u_char *, struct g_llvm_metadata *, struct g_llvm_label *); static int llvm_textconf_decode(u_char *, int, @@ -637,7 +638,8 @@ g_llvm_read_label(struct g_consumer *cp, struct g_llvm_label *ll) /* Search the four sectors for the LVM label. */ for (i = 0; i < 4; i++) { - error = llvm_label_decode(&buf[i * pp->sectorsize], ll, i); + error = llvm_label_decode(&buf[i * pp->sectorsize], ll, i, + pp->sectorsize); if (error == 0) break; /* found it */ } @@ -703,7 +705,8 @@ g_llvm_read_md(struct g_consumer *cp, struct g_llvm_metadata *md, } static int -llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector) +llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector, + u_int sectorsize) { uint64_t off; char *uuid; @@ -728,6 +731,13 @@ llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector) return (EINVAL); } + /* XXX The minimal possible size of physical volume header is 88 */ + if (ll->ll_offset < 32 || ll->ll_offset > sectorsize - 88) { + G_LLVM_DEBUG(0, "Invalid physical volume header offset %u", + ll->ll_offset); + return (EINVAL); + } + off = ll->ll_offset; /* * convert the binary uuid to string format, the format is From nobody Wed Sep 6 04:19:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgTfl5x9Cz4s3Fs; Wed, 6 Sep 2023 04:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgTfl4wN2z3LRX; Wed, 6 Sep 2023 04:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Vw9wYOzY3G2aMmyEeMRqyyUO0crJS4te1fvkSXro4Q=; b=t0XDrzAQ0LOTeRpFTYMz0SZLK8fNpfeT7I5qCMn9b1mRMskQmkPGRhoiiekIncq1GgqRzO BrjcrASWL1B9PI7liotmuGwY/VcPn66lV5r91gs8Ju6RLRpIKjdXSM+fvScP3WaYXEjYsU IcWMfp04OtnteRz9je3KJwlLGYegbkgFiVcaZjQtgzjF+N89OBNFjbAbbbsnHp9uzqCj2H GhmXc5q5kmuviaoZ8QvU6OAZW74d7jZ5VWRbFht0X0x2YF7MamCKUorE4DsGBFWdioVKdm h/eMyxS2QXPYjcrePWI5jNMFVMlIHHqLzjOFwqO609N76nmWZqQA7twKeNgd/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693973983; a=rsa-sha256; cv=none; b=JS8cYeTEnhI63rjQzmRX9AVTw+SENdtk+7PaVUn/6iS51Ba/F7btY8REzw530VpLmDJK4r 4eMSkWanpvE3rkbDEIePHQWumqZtQe6MdiRntbDJMoCwD20lC1nPb+ihNp8XEnn+qkKEQb OWpqdA56xT4w+guDAbwhBeHdk8UYIRC1Wc1IqCgX4eyf9XXFyVgaylNM44cCLNV51E+r51 O9mBvryYWo9qSv5GXu3Euq7HsOedPQXn81RRLGreOvymiOYlw2pMf2XmwaSlzhsY+H6IhE 0+8XP151MGIR9Up8EXTwu0eFFcoO73RrfzeOT/QtPsxTEhJmVUM5eg1Cqhyd/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=1693973983; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Vw9wYOzY3G2aMmyEeMRqyyUO0crJS4te1fvkSXro4Q=; b=QrYAF6Cm+7vga0qH5K40f5DIVEb3lgUf0IQsgAEQsv1yOeqcux+NWE+NYSl0upvF5CtQlJ ACHDA51EUDuhCyIwLSM/0MHD+pOVf1LoerBBIU4N7wmepJ3c5XSPsz9dT7ytPsBga8JSnC l4VBUduaQSppfrZCTb0s1ild3HbRfcpdNlIbrQLZoon/K6PDmEJ0ktzEySOzH7ZmGBF0SO bWc0KZ4ZMSdEMZh8ZvOTLWyzofNRQT2pnlNRtG6SAv0tJE5dYdZFEf+Dms1qHCiTBAVaqB EgMI/4RjmHdbCjvpmEvxPSK196g4lbleumxA+biPAryEqdnC6bPlCjZrCCw9xQ== 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 4RgTfl3Xv6z127k; Wed, 6 Sep 2023 04:19:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864Jhod057506; Wed, 6 Sep 2023 04:19:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864JhvJ057503; Wed, 6 Sep 2023 04:19:43 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:19:43 GMT Message-Id: <202309060419.3864JhvJ057503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 337475505b4c - stable/13 - net: Remove vlan metadata on pcp / vlan encapsulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 337475505b4cdf40510bd2e2788fdce5c0c47367 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=337475505b4cdf40510bd2e2788fdce5c0c47367 commit 337475505b4cdf40510bd2e2788fdce5c0c47367 Author: Zhenlei Huang AuthorDate: 2023-08-30 09:36:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:18:13 +0000 net: Remove vlan metadata on pcp / vlan encapsulation For oubound traffic, the flag M_VLANTAG is set in mbuf packet header to indicate the underlaying interface do hardware VLAN tag insertion if capable, otherwise the net stack will do 802.1Q encapsulation instead. Commit 868aabb4708d introduced per-flow priority which set the priority ID in the mbuf packet header. There's a corner case that when the driver is disabled to do hardware VLAN tag insertion, and the net stack do 802.1Q encapsulation, then it will result double tagged packets if the driver do not check the enabled capability (hardware VLAN tag insertion). Unfortunately some drivers, currently known cxgbe(4) re(4) ure(4) igc(4) and vmx(4), have this issue. From a quick review for other interface drivers I believe a lot more drivers have the same issue. It makes more sense to fix in net stack than to try to change every single driver. PR: 270736 Reviewed by: kp Fixes: 868aabb4708d Add IP(V6)_VLAN_PCP to set 802.1 priority per-flow MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39499 (cherry picked from commit b22aae410bc7e4e9a6b43e556dc34be72deadb65) (cherry picked from commit 494de30b63de9ef31587dcc3fb8e7249535e840a) --- sys/net/if_ethersubr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 87faf9f26df4..d8043f0551ff 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -442,9 +442,11 @@ ether_set_pcp(struct mbuf **mp, struct ifnet *ifp, uint8_t pcp) struct ether_header *eh; eh = mtod(*mp, struct ether_header *); - if (ntohs(eh->ether_type) == ETHERTYPE_VLAN || - ntohs(eh->ether_type) == ETHERTYPE_QINQ) + if (eh->ether_type == htons(ETHERTYPE_VLAN) || + eh->ether_type == htons(ETHERTYPE_QINQ)) { + (*mp)->m_flags &= ~M_VLANTAG; return (true); + } qtag.vid = 0; qtag.pcp = pcp; @@ -1418,6 +1420,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, if_printf(ife, "unable to prepend 802.1Q header"); return (false); } + (*mp)->m_flags &= ~M_VLANTAG; } return (true); } From nobody Wed Sep 6 04:19:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgTfm68VWz4s37r; Wed, 6 Sep 2023 04:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgTfm5kLGz3LMf; Wed, 6 Sep 2023 04:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4QuNfcDR2roKnXdBBWWBgYfMUJiupgocOWe97dQJvU=; b=iWidS/36M94H66FqNw6lYx1XYDYIAI6mqzRbOck7HTM4AZ2o5UPROpTtlRwnb5SrtycRG/ KJ2YiBlTdlyop4DGOaZ+NRZhoEgv1DHXyadHaHW+GWX4FG8fJQsBgPABqzOxs2vaxnDrOU Trr1CUb52lckBNHcEqB/HIzsicBXrpATZoU3jKyMCV2UiRSFOjHj2o/1FBPBxOGTS22TVN zDrHY5UzEgA4RezCi7INP7pedLoW3tz0izyQfcqcHrS6jsFbrR1R2OBLVfHiwG7OXRv38e HKFmTpuZOlydg1RBpELQD1lR/rLBVHrfZY2ATKUebEBqPHnqbrI0UVq8USQXFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693973984; a=rsa-sha256; cv=none; b=Wh8VUCE/o1QLcyaFKTc/c0d7oBeKby5f4/IdlFNHDaboMvK+i12UqyYgMBHQeGv9T7/uL/ 7svY7rN1MPLREN6hed6ck+voJuVwR4bTFqADPsGJi1J9TAidocLm8sEtou45g6NKt5Es3t 1SY3z1FztA5CmccawsjINVcpN/3RzQl3IcX92aFn4HC2HGrfIX+M7GrhU8Du/511V4EObg thjJwWpaof9IQ7vrwhawsaRnpougYMFyqtsi5UA48BLCIeSqVS2dwWIxYbls2YHV+lQwW2 aMttQ+gvepkEFJoScKw1okssvAblZuOGwOpga0XZ9JfKlXC24U3pSSKpzNvH1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693973984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w4QuNfcDR2roKnXdBBWWBgYfMUJiupgocOWe97dQJvU=; b=BY1MyF1ab/qFb9jL4CuYvsmUQKkBHB8kQkjO2WH0R8/8s4HOVi9/yGiU0N5BbxACeuPNp5 fdftdXrN1eS48bQv89r3rwTbDNAvbhISIlsn4MyKJuVtsvOoiNU2nkwdjkPgpknejXQdFj DJePhrjr96xGa42q6rlO9pKh9viqDnqqN/bXOKm0JPqpnxw6p4rpu18dFgpe6bAtIgVQ2g yzkqWHrmH1MRMEUofj/256nQcvLsNij+ppiSSPKms0OYqHmkLEi/uyiRpTWgN8yVygr80Q yfn7t1LRvoBa2VlYr2M3GrXQnuJ0SqzTK8y0BPmvJ9ZdMcUrAsQsOsb+2Vsd2w== 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 4RgTfm4dCkz123D; Wed, 6 Sep 2023 04:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864JiCT057572; Wed, 6 Sep 2023 04:19:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864JicP057569; Wed, 6 Sep 2023 04:19:44 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:19:44 GMT Message-Id: <202309060419.3864JicP057569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3fc299d68897 - stable/13 - tcp: Initialize the maximum number of entries in a client cookie cache bucket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fc299d68897a0748d96510de5f191f5a8249216 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3fc299d68897a0748d96510de5f191f5a8249216 commit 3fc299d68897a0748d96510de5f191f5a8249216 Author: Zhenlei Huang AuthorDate: 2023-09-02 20:34:07 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:18:29 +0000 tcp: Initialize the maximum number of entries in a client cookie cache bucket This vnet loader tunable is defined with SYSCTL_PROC, thus will not be initialized by kernel on vnet creating and will always have the default value TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT. Fix by fetching the value from the corresponding kernel environment during vnet constructing. PR: 273509 Reviewed by: #transport, tuexen Fixes: c560df6f12f1 This is an implementation of the client side of TCP Fast Open (TFO) [RFC7413] MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41691 (cherry picked from commit 224aec05e732bb97a0d3c91142973b98a91238d1) (cherry picked from commit 144851777edad9522390036d3073ea656d7b648d) --- sys/netinet/tcp_fastopen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index 4142dbda65ec..b72a8c852436 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -271,7 +271,7 @@ SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, autokey, static int sysctl_net_inet_tcp_fastopen_ccache_bucket_limit(SYSCTL_HANDLER_ARGS); SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, ccache_bucket_limit, - CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NEEDGIANT, + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_NEEDGIANT, NULL, 0, &sysctl_net_inet_tcp_fastopen_ccache_bucket_limit, "IU", "Max entries per bucket in client cookie cache"); @@ -393,7 +393,8 @@ tcp_fastopen_init(void) V_tcp_fastopen_keys.newest = TCP_FASTOPEN_MAX_KEYS - 1; V_tcp_fastopen_keys.newest_psk = TCP_FASTOPEN_MAX_PSKS - 1; - /* May already be non-zero if kernel tunable was set */ + TUNABLE_INT_FETCH("net.inet.tcp.fastopen.ccache_bucket_limit", + &V_tcp_fastopen_ccache.bucket_limit); if (V_tcp_fastopen_ccache.bucket_limit == 0) V_tcp_fastopen_ccache.bucket_limit = TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT; From nobody Wed Sep 6 04:53:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgVPG0x8kz4sLsK; Wed, 6 Sep 2023 04:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgVPG06gyz3TZr; Wed, 6 Sep 2023 04:53:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQLWareCi4mMRqHFCazoNtcjfPCBCQNzjCt0mI/9U8U=; b=LNcAWKAv5Jjdx+UabVn5uCO1srvHfTEXYonz3auz59MbgTyUcYdB7TNnrdpgt0HX7kE7ec PX7R6it9dbrVn/UGC9KzzQRGy/Mlia4q7Q5g4J23oMecb48rtybjIgDHD8cbISu/IoAnBm O8vHuEsVFmqPQ60FmzoQCk1DCwR1HxpJQe03xF4BwK0O0haxV7jcnHlpTwdTmRWrDGsRSu w/n0jKWmSMOntLWFas925qmsj8v78exYjbQVSNV4BM6q3x6oMVeDg53ozINHeiRrEWSBDg 6nYIRNRKNpf6x81axTRfmO1SuyK/soWXLBTHBxj0nEottKLLtHGVLn9rwMKhBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693975986; a=rsa-sha256; cv=none; b=jwficDSvaCASxPLodpXXebrjhvm1ovEP6xMMUCQeUVHo9Vcyaq0hm4udhFG4WXjEGxtiF3 bmC5qlpwyzjroPZEeCBKtMdb9sEQCz7YOMoYg20fluGX5NjpIy/uU+45Vss9/grUL9WrwV 5Z/0biwbb05XvrQNuzmPy0noQlIdDkfMDiRgXwQqmHcPrctwW+XD3Rn8LWpez8wCD64wlj pHWsPketGU5ow8C+6PxWRwFMug2UypHPT75YuecvFmyC/wjAQ4WyGP6TIFMtT7w/f9Cl/a LArZMNYYrCWiZD9D0V9TL+ugvEEzDXhLmornIVGNSZ45cETFojodP/Dvlc/Mbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nQLWareCi4mMRqHFCazoNtcjfPCBCQNzjCt0mI/9U8U=; b=Zb57r8YWFneaD9R6BcQDG2BCYETPYZtR3FbgjGupTqL3PVbmEZ7nf4ulZu8k8fXpGGHeI+ 0XoHw5O8RQi5aUGxv4OjZly6oWF4ktB8NO9odL48fddBFPLM7FNRHspbY6o/Ze9TOjeqf1 v+oi1mrAbDruB0dpKUfaKdeyXhiFyjVgI5VHAg0PPtTF4Ocen/0yzWm2jzqYemyL/FMhQ9 miOHfnG/NwK3GS8KqiLMKc3OCmmgZOkHRtfK3MpYEf/ES+bZM+n4MMjaVAG0uPtrHBf3qn fyCtiIPDIiKLSmiYGz5KMxmhHv02j+kqyWHeyIsauJ8NS0HPUy0jxEdM4TmmsA== 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 4RgVPF6Jbvz127K; Wed, 6 Sep 2023 04:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864r5IH022272; Wed, 6 Sep 2023 04:53:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864r5hR022269; Wed, 6 Sep 2023 04:53:05 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:53:05 GMT Message-Id: <202309060453.3864r5hR022269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 61b426a0b6a8 - stable/12 - geom_part: Check number of GPT entries and size of GPT entry List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 61b426a0b6a822c6281016a23f28443bb26b891f Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=61b426a0b6a822c6281016a23f28443bb26b891f commit 61b426a0b6a822c6281016a23f28443bb26b891f Author: Zhenlei Huang AuthorDate: 2022-10-18 15:03:02 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:32:56 +0000 geom_part: Check number of GPT entries and size of GPT entry Current specification does not have upper limit of the number of partition entries and the size of partition entry. In 799eac8c3df597179bbb3b078362f3ff03993a1a Andrey V. Elsukov introduced a limit maximum number of GPT entries to 4k, but that is for write routine (gpart create) only. When attaching disks that have large number of GPT entries exceeding the limit, or disks with large size of partition entry, it is still possible to exhaust kernel memory. 1. Reuse the limit of the maximum number of partition entries. 2. Limit the maximum size of GPT entry to 1k. In current specification (2.10) the size of GPT entry is 128 * 2^n while n >= 0, and the size - 128 is reserved. 1k should be sufficient enough for foreseen future. PR: 266548 Discussed with: imp Reviewed by: markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D36717 (cherry picked from commit 5be5d0d5cb2657d7668f4ca0f8543198cf8d759b) (cherry picked from commit e8c769b22d42fd66d0916e2a04af32ad9d306db1) --- sys/geom/part/g_part_gpt.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index 3d2fb313962f..f0890fd71cd0 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -84,6 +84,7 @@ enum gpt_state { GPT_STATE_MISSING, /* No signature found. */ GPT_STATE_CORRUPT, /* Checksum mismatch. */ GPT_STATE_INVALID, /* Nonconformant/invalid. */ + GPT_STATE_UNSUPPORTED, /* Not supported. */ GPT_STATE_OK /* Perfectly fine. */ }; @@ -147,6 +148,8 @@ static kobj_method_t g_part_gpt_methods[] = { { 0, 0 } }; +#define MAXENTSIZE 1024 + static struct g_part_scheme g_part_gpt_scheme = { "GPT", g_part_gpt_methods, @@ -525,6 +528,11 @@ gpt_read_tbl(struct g_part_gpt_table *table, struct g_consumer *cp, if (hdr == NULL) return (NULL); + if (hdr->hdr_entries > g_part_gpt_scheme.gps_maxent || + hdr->hdr_entsz > MAXENTSIZE) { + table->state[elt] = GPT_STATE_UNSUPPORTED; + return (NULL); + } pp = cp->provider; table->lba[elt] = hdr->hdr_lba_table; @@ -932,10 +940,25 @@ g_part_gpt_read(struct g_part_table *basetable, struct g_consumer *cp) /* Fail if we haven't got any good tables at all. */ if (table->state[GPT_ELT_PRITBL] != GPT_STATE_OK && table->state[GPT_ELT_SECTBL] != GPT_STATE_OK) { - printf("GEOM: %s: corrupt or invalid GPT detected.\n", - pp->name); - printf("GEOM: %s: GPT rejected -- may not be recoverable.\n", - pp->name); + if (table->state[GPT_ELT_PRITBL] == GPT_STATE_UNSUPPORTED && + table->state[GPT_ELT_SECTBL] == GPT_STATE_UNSUPPORTED && + gpt_matched_hdrs(prihdr, sechdr)) { + printf("GEOM: %s: unsupported GPT detected.\n", + pp->name); + printf( + "GEOM: %s: number of GPT entries: %u, entry size: %uB.\n", + pp->name, prihdr->hdr_entries, prihdr->hdr_entsz); + printf( + "GEOM: %s: maximum supported number of GPT entries: %u, entry size: %uB.\n", + pp->name, g_part_gpt_scheme.gps_maxent, MAXENTSIZE); + printf("GEOM: %s: GPT rejected.\n", pp->name); + } else { + printf("GEOM: %s: corrupt or invalid GPT detected.\n", + pp->name); + printf( + "GEOM: %s: GPT rejected -- may not be recoverable.\n", + pp->name); + } if (prihdr != NULL) g_free(prihdr); if (pritbl != NULL) From nobody Wed Sep 6 04:53:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgVPH2W4bz4sLnS; Wed, 6 Sep 2023 04:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgVPH17VQz3TyD; Wed, 6 Sep 2023 04:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wHDgJEtrzpfa65gJ2kN0FrhZjWBG3FoXE4HgvO0YNpM=; b=azy4aGID6lAADamlOUEK5OA9kCmk2Q/eFbkyfT2HHlAyL6HFkIaq0XdHmHkblV/fvVE7D8 8udQubQbo71WTwricnAaiFggYuvmh8GyqzF5TJeHyg2w7mmuTpw5ylmduUVDdswEuKNDwy KwIpu4Vobq4gLqJrhdkYWsOSHuwBI+4e6lgxELUCWW6hgid1vD9n4G0lJ0uGsxpJmEP4LX 9hg8jB7KFemaiToCEYt5kbd6yNmZt+ZYx5aQaW/7IJiCcnGmq0hv9z7+KZ5oaPXCx9M/dS X0FqXmQ2gaP6P2KQNncjmH0Y/wj8QNs9IaBBL7dXWZT75VE5BkhZr3u3SY7XJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693975987; a=rsa-sha256; cv=none; b=nnhFLHSdyFGQ+d/2FDlTWi4zTV+HcF6qfSussCrfD/BvjqIa0TUsRFxarWhy1OdwvGNzb8 jE7T/kj6uoyVIvHUZQMUWuFdhkMGD3yYd3jX051rPIX0OZjQXQD0R66kzrUvz2Hw/G1cnH vdaMLn+5Cw+igqRMDhwYoRn0bft8+8UokMxpkKy5oN7IapVrs0KxxlMzxOvv9VN3pKtMT9 bLh3hHkGhHH/yfg0DPYTQx0UzqNgXruG7WgiM4klCWC0mhKR1I1nK9FFhhOy++sGNr2sx1 lxFqZC/ZJLtPliGT6wMWQ/EgSbqHsosrmt9a+sBPiRnNSwVOj9VL2ePcsfdncg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wHDgJEtrzpfa65gJ2kN0FrhZjWBG3FoXE4HgvO0YNpM=; b=a3BHbXR/ns2V4Difngvk64Jswlmm0h0L7NvOiBAgQYIpmOGee6SpVP47kmQCD4aRghbsMl XbSQtMXYgEJiF9wt2AwN7UXIvYj2s95PIIDz/PDvUuj5Ykrbu9mMaOMYXq9U3lExbvh038 qoDXVqQvzrpD8zGnt2ZgAyOTQ38yeJ4WwqeqaIusYBLvk4yW8OGM6ApA9tICyonFYgUS7Z gMN1KhTLC8di6wsehEAape68NPi956CGxiX7pMvAi+eGpXku3t/wMTSQ/fYDfvH/8I2m+/ 9puDjYtdrzGrgz7FAuU+gNVhfk8gCpLUgCc+1yBRrF6J2v1fwgZknk62FpV05A== 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 4RgVPH0D0Pz12qV; Wed, 6 Sep 2023 04:53:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864r6IL022341; Wed, 6 Sep 2023 04:53:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864r6Lu022338; Wed, 6 Sep 2023 04:53:06 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:53:06 GMT Message-Id: <202309060453.3864r6Lu022338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8fdb1181ab8d - stable/12 - geom_part: Fix potential integer overflow when checking size of the table List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8fdb1181ab8d28cbf62b1917b602028e34c8c9cc Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8fdb1181ab8d28cbf62b1917b602028e34c8c9cc commit 8fdb1181ab8d28cbf62b1917b602028e34c8c9cc Author: Zhenlei Huang AuthorDate: 2022-12-21 01:04:30 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:32:56 +0000 geom_part: Fix potential integer overflow when checking size of the table `hdr_entries` and `hdr_entsz` are both uint32_t as defined in UEFI spec. Current spec does not have upper limit of the number of partition entries and the size of partition entry, it is potential that malicious or corrupted GPT header read from untrusted source contains large size of entry number or size. PR: 266548 Reviewed by: oshogbo, cem, imp, markj Approved by: kp (mentor) MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D36709 (cherry picked from commit 2e543af13ab3746c7626c53293c007c8747eff9d) (cherry picked from commit 3070bedd3dc54196f48645966eb34bd3a9bf131d) --- sys/geom/part/g_part_gpt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c index f0890fd71cd0..0fd952153e6c 100644 --- a/sys/geom/part/g_part_gpt.c +++ b/sys/geom/part/g_part_gpt.c @@ -492,7 +492,8 @@ gpt_read_hdr(struct g_part_gpt_table *table, struct g_consumer *cp, hdr->hdr_lba_table <= hdr->hdr_lba_end) goto fail; lba = hdr->hdr_lba_table + - howmany(hdr->hdr_entries * hdr->hdr_entsz, pp->sectorsize) - 1; + howmany((uint64_t)hdr->hdr_entries * hdr->hdr_entsz, + pp->sectorsize) - 1; if (lba >= last) goto fail; if (lba >= hdr->hdr_lba_start && lba <= hdr->hdr_lba_end) From nobody Wed Sep 6 04:53:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgVPJ2y7Jz4sLvk; Wed, 6 Sep 2023 04:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgVPJ263Mz3TwZ; Wed, 6 Sep 2023 04:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bv3Y4YZr//2yFEfw+8x7rxboSr64gEZ8nMjCfj5j6f4=; b=OBwtq9zYl6UBq9ge6fXb0UrkZKUvd3amgTilic+Eu+Bofb4H3wRSvsJ8sryhfMO5KnlzUo gB/pqh2tpmP428vdQClQTlF+efrwx3/96g+8n+WhzaB5i1Hq19gXvTCEW+y9esSi+TA43o vWVt0xNlfKyQGQ/eCMu0RywkW+4ecBp8+z2N/zvNmdPoE494488wjVPoLPaPwGamQ5wqxN rRe95SEkb5a5N3l2HYcAb3GapuzieiIEbM0fdxexWmZAa4VDV798Vq7hkn/Vj+s36B5wd2 PIg8AyU0oSetGksHZfXcTgDhVW0AruTavRi91tzocaawXpUnPEGwuMZl1XQMMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693975988; a=rsa-sha256; cv=none; b=A3s9xGUgjrtFcLB3l2Zwgg8GkYwllqqbmhpBj8pTO+kGViwSmIDKjL0bLPyyxDzRt9fvVF d+XDRGutjcg2U70whR9mm4Lldh0hAmNcwnxt0gQVnJkv15TabIDs33kFzu+/poCrat2dwx ywK14JVTCYc4ghFQqbv5jP/R5vzvCDNLmagEXIihka9vPiq3FYLc75fJh3C/xpIANhkDKQ jiFUm000dU7EgL7vPmmbKtNCDhYKIi8b022zJ/+vd2YsKKlQQNgMcGMz88PEeLt6TQQsZq 2+fU3QAA06FhdfburftjpR1OZW//P+zPAZW3RcSp5rG6GeoU5f1vB0n7rfgDLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bv3Y4YZr//2yFEfw+8x7rxboSr64gEZ8nMjCfj5j6f4=; b=H59xy4oadhvbdhFjYtaMiDHElS+MukMCiNObGkrg4Zz/RE6XmhzixKW43AbK2UuSyqiLd3 qEwzFTaA2PcDqoMD+L0aOmGKpKo63B++DfiVRzwrEOAbVLY0WzQ0zuc7wYCfscphZS+UaY cuLbEqBPRan0h+ZSrErrAJZ1lV8Q/NpVMQlKflBzxnpwA3s5xNWKv/pFnH9SQmtrfdmrJ/ Kmpco2QdCY8C3GZSyq3R6F45rVtyUwhod8rI0FUkpfUof5dwClBYdt54J4CwEWDlAJrpgV EbtzjFTm8Ldbkp2PvJddtCXvWSybP2VrqzOCe0Tx3MS/eFEkokipyMHISrq9KA== 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 4RgVPJ1D1Kz134n; Wed, 6 Sep 2023 04:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864r8Sv022392; Wed, 6 Sep 2023 04:53:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864r8sO022389; Wed, 6 Sep 2023 04:53:08 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:53:08 GMT Message-Id: <202309060453.3864r8sO022389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 70e32e5b52d9 - stable/12 - geom_linux_lvm: Check the offset of physical volume header List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 70e32e5b52d9b34bdc205f04a616998effc493b0 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=70e32e5b52d9b34bdc205f04a616998effc493b0 commit 70e32e5b52d9b34bdc205f04a616998effc493b0 Author: Zhenlei Huang AuthorDate: 2023-08-22 09:20:10 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:32:56 +0000 geom_linux_lvm: Check the offset of physical volume header The LVM label is stored on any of the first four sectors, and the PV (physical volume) header is stored within the same sector following the LVM label. The current implementation does not fully check the offset of PV header, when attaching a bad formatted LVM PV the kernel may crash due to out-of-bounds memory read. PR: 266562 Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D36773 (cherry picked from commit c941b82e1c31a67a025c43cc7bd31f269fa62588) (cherry picked from commit 809450c4b53109b6ca8a87054452f2b3b8f711aa) --- sys/geom/linux_lvm/g_linux_lvm.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/geom/linux_lvm/g_linux_lvm.c b/sys/geom/linux_lvm/g_linux_lvm.c index 06fdfbcf7878..c7b0239dae61 100644 --- a/sys/geom/linux_lvm/g_linux_lvm.c +++ b/sys/geom/linux_lvm/g_linux_lvm.c @@ -68,7 +68,8 @@ static int g_llvm_read_label(struct g_consumer *, struct g_llvm_label *); static int g_llvm_read_md(struct g_consumer *, struct g_llvm_metadata *, struct g_llvm_label *); -static int llvm_label_decode(const u_char *, struct g_llvm_label *, int); +static int llvm_label_decode(const u_char *, struct g_llvm_label *, + int, u_int); static int llvm_md_decode(const u_char *, struct g_llvm_metadata *, struct g_llvm_label *); static int llvm_textconf_decode(u_char *, int, @@ -631,7 +632,8 @@ g_llvm_read_label(struct g_consumer *cp, struct g_llvm_label *ll) /* Search the four sectors for the LVM label. */ for (i = 0; i < 4; i++) { - error = llvm_label_decode(&buf[i * pp->sectorsize], ll, i); + error = llvm_label_decode(&buf[i * pp->sectorsize], ll, i, + pp->sectorsize); if (error == 0) break; /* found it */ } @@ -697,7 +699,8 @@ g_llvm_read_md(struct g_consumer *cp, struct g_llvm_metadata *md, } static int -llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector) +llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector, + u_int sectorsize) { uint64_t off; char *uuid; @@ -722,6 +725,13 @@ llvm_label_decode(const u_char *data, struct g_llvm_label *ll, int sector) return (EINVAL); } + /* XXX The minimal possible size of physical volume header is 88 */ + if (ll->ll_offset < 32 || ll->ll_offset > sectorsize - 88) { + G_LLVM_DEBUG(0, "Invalid physical volume header offset %u", + ll->ll_offset); + return (EINVAL); + } + off = ll->ll_offset; /* * convert the binary uuid to string format, the format is From nobody Wed Sep 6 04:53:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgVPL0T7wz4sLvr; Wed, 6 Sep 2023 04:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgVPK38dKz3Tx3; Wed, 6 Sep 2023 04:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjUSXizhEWkk1eQ935ST4p6YooXvkSJtI/ESOEuknlU=; b=tclkfiRkGW+1GdAsubezdCF+gEXiNYJLhLZ2G885XVaKeYo+nFeOGKGYDZ/13GGozzR+zg a/RmqCbgHrdu2Ji4H4wxTksOT0E4LF78eLgZzzqKtyB5j9MUH8ylRAkmj4UBAITX+590vU 8fvvORnkWaBVd6MxT+Gaj852gQQtE2lBNPIXoCaJ/Ayaj4rQcUKAm2u+HStWjlTEAxxrPn PJwufHZhq388we1237wrcoNqrPZ6mW8tYJUPM0ip6AFZtkKfMaawM0FlnKyVn0sH0fipTL kIfpIKQzxgoxhAAwlZH7yo9nG6RHmaedGZemSlt+1WNT5fzY3TLEvX82iAhvlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693975989; a=rsa-sha256; cv=none; b=VndxmTGK6gbmyfBmsQLnxLgM7mBCU3OfKxrSVAj3t0hWpr0J24rvhdbKD3jfYntnfmDfTu cmeDazE0qblsMBQMigUOQ1u5c2p7S+wCMJHkrv8LxB4sMZNAdWrHbCTH6YG4m8s2TRkmjq Lsv3FN3hj66PGOt43Bg7abxJ75hFpsCnAvJEkk6s0JvgdBCyu6sUgu8rcwadX21Rvhoz5o nvDbRoEST0gksu8tDFEu/OjE8xmvrxP1QgNnHjk1sED2wbtYv2fNyFRPjZI2tQ7mwMYQWw 8wZJZXwvR2YE9hV6VMNL3mcFZ3EeaDE8X0yTc+zHaXSEV0O2QandjtPFiOYLow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZjUSXizhEWkk1eQ935ST4p6YooXvkSJtI/ESOEuknlU=; b=Y/JVKz7Wvj413MUB7Z25KoPX4eEbqEF+hnVq5ySUrMxCZAglzq+loMR1ULWf3RsKSlrOm7 s+LYX9OZFk9PKeu1zrhSxtggBZO8hdtbrRoSWPgNRaz9KVTk3iqqbmU1lT75jeVVECcQH5 vGLU4XyPzubIRPjikDpv39MgzfA6KHlppdwn78q0Qbt291I4vx3620vq6QsCUv6ggiBUzW wV8siGpwNp0jIg7BKM/B5IJx5gKXRYrFOdrPXccwDpA+lkmY0I9HrcE8BrMR5tiPy8MO+E PqYQZBx/Apl4a5toYqlxNl4Cb4lO8aPZf8qb9m/z+GD1qEksvfPVyg61KbTtHQ== 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 4RgVPK2GKkz127L; Wed, 6 Sep 2023 04:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864r9fF022451; Wed, 6 Sep 2023 04:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864r9NN022448; Wed, 6 Sep 2023 04:53:09 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:53:09 GMT Message-Id: <202309060453.3864r9NN022448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: c0038743d357 - stable/12 - net: Remove vlan metadata on pcp / vlan encapsulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c0038743d357da9b5ebf756f4fc3b2cf7d2ef3e9 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c0038743d357da9b5ebf756f4fc3b2cf7d2ef3e9 commit c0038743d357da9b5ebf756f4fc3b2cf7d2ef3e9 Author: Zhenlei Huang AuthorDate: 2023-08-30 09:36:38 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:32:56 +0000 net: Remove vlan metadata on pcp / vlan encapsulation For oubound traffic, the flag M_VLANTAG is set in mbuf packet header to indicate the underlaying interface do hardware VLAN tag insertion if capable, otherwise the net stack will do 802.1Q encapsulation instead. Commit 868aabb4708d introduced per-flow priority which set the priority ID in the mbuf packet header. There's a corner case that when the driver is disabled to do hardware VLAN tag insertion, and the net stack do 802.1Q encapsulation, then it will result double tagged packets if the driver do not check the enabled capability (hardware VLAN tag insertion). Unfortunately some drivers, currently known cxgbe(4) re(4) ure(4) igc(4) and vmx(4), have this issue. From a quick review for other interface drivers I believe a lot more drivers have the same issue. It makes more sense to fix in net stack than to try to change every single driver. PR: 270736 Reviewed by: kp Fixes: 868aabb4708d Add IP(V6)_VLAN_PCP to set 802.1 priority per-flow MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39499 (cherry picked from commit b22aae410bc7e4e9a6b43e556dc34be72deadb65) (cherry picked from commit 494de30b63de9ef31587dcc3fb8e7249535e840a) (cherry picked from commit 337475505b4cdf40510bd2e2788fdce5c0c47367) --- sys/net/if_ethersubr.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index ddc92535be60..f832700003ef 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -443,8 +443,11 @@ ether_set_pcp(struct mbuf **mp, struct ifnet *ifp, uint8_t pcp) struct ether_header *eh; eh = mtod(*mp, struct ether_header *); - if (ntohs(eh->ether_type) == ETHERTYPE_VLAN || - ether_8021q_frame(mp, ifp, ifp, 0, pcp)) + if (eh->ether_type == htons(ETHERTYPE_VLAN)) { + (*mp)->m_flags &= ~M_VLANTAG; + return (true); + } + if (ether_8021q_frame(mp, ifp, ifp, 0, pcp)) return (true); if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); return (false); @@ -1373,6 +1376,7 @@ ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, if_printf(ife, "unable to prepend 802.1Q header"); return (false); } + (*mp)->m_flags &= ~M_VLANTAG; } return (true); } From nobody Wed Sep 6 04:53:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgVPL5pCRz4sLxx; Wed, 6 Sep 2023 04:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgVPL49bGz3V0r; Wed, 6 Sep 2023 04:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWeZsOOuKJqWzhVIlC2nYBY+ximwpoqki2RvvXNfvZY=; b=lecyMKnPcA2nMksuJrbcaybffuyC+tdS4RGjwpYRNIzTabWwbiwLYgvR1cHVtjsYzXw+cM Px8FGvQ1ckO5cipR8M+osB8aLIoMIDZ5FEFfLB1nPdOIDJKSqkrsSFoDkAcfLi1AMPQu3W VtXoYiZyYNWFHIrFQIuO+1+wyg0eCW72mUFgvcr/V595cjcrXbPggACiOKnfsXAmM5M0hC 1bR4aiFSwbzLlaVYhDl4vGZpEqadFKwi5coA4iBc0rqv+Nbvde6vr3L/UrWXPnWlcj4x9c GFtP40ReZjRaVse69UsJeZvk0k30zOTDhb+F2wKlH2hHUL8I5eYab8wLziD5QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693975990; a=rsa-sha256; cv=none; b=RTIwfPBlZBdl7riY4mF5/2WD9vfbc3EcAxhQuUYjurf3eKc2KSlwCLvrqD8C0d4Vec3Aby zraJsxb3qK+u7HltMEIOYYhTJEYufNKPY+ta2Cv2qrVUMFEFl2F45UE1KeySGZb1iqV4Qi rCWbGyNrnzbN4JmuyR9e0BwEajxcLZ/fJes9VwCcwhVJ2dWOefFNazelyFrKWFtKYTqTte T26q/puRDmfq2iSoXO9LjYaAx03RT7SmL8ct9+Lf2uz8YcmRmDQMMRzNpIz02u5hFGEQl7 Kc5kQYe5Hbic4bt7wqEh+qGBSqH4N6xMqInp2W7MGkTGZkQiB4/2AHx8mOUAYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693975990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWeZsOOuKJqWzhVIlC2nYBY+ximwpoqki2RvvXNfvZY=; b=TYYj90nvUiXpAYNuL/k7YjQpyiwI3dXKXtAsTzKWpDCYkCMW3g3FAXD1u+ERmId3TkO/we hDhbUZOJhAvcwpjAgqpSmLaor/jeq+DS0+EZGwNB06x/MMzgT8KQxrVrQ9kMZjKY1w48tM kcxs2LkvCvGDu1Cgv4CrPBE1PTsXdnyKuFGBp6tSNW0e97HK/Kv9lH4WwpnzwELTDexeIM mmtEtMGE0SfExcZRjUS0fF1MvoDbQ+1bUN/aLxjUOuUK7LYW2/ncDAlMKoX+koxf5x1BJj DOyoPLxSrMj32yzVX6+MFSBnsVQO60yWmpewlV/EGeuBybNrO/0E6AIzyGss8Q== 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 4RgVPL357Mz134p; Wed, 6 Sep 2023 04:53:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3864rAZw022517; Wed, 6 Sep 2023 04:53:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3864rAHt022514; Wed, 6 Sep 2023 04:53:10 GMT (envelope-from git) Date: Wed, 6 Sep 2023 04:53:10 GMT Message-Id: <202309060453.3864rAHt022514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: aadedc5b3e4b - stable/12 - tcp: Initialize the maximum number of entries in a client cookie cache bucket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: aadedc5b3e4b360513f2a950135059ca01035202 Auto-Submitted: auto-generated The branch stable/12 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=aadedc5b3e4b360513f2a950135059ca01035202 commit aadedc5b3e4b360513f2a950135059ca01035202 Author: Zhenlei Huang AuthorDate: 2023-09-02 20:34:07 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 04:32:56 +0000 tcp: Initialize the maximum number of entries in a client cookie cache bucket This vnet loader tunable is defined with SYSCTL_PROC, thus will not be initialized by kernel on vnet creating and will always have the default value TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT. Fix by fetching the value from the corresponding kernel environment during vnet constructing. PR: 273509 Reviewed by: #transport, tuexen Fixes: c560df6f12f1 This is an implementation of the client side of TCP Fast Open (TFO) [RFC7413] MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41691 (cherry picked from commit 224aec05e732bb97a0d3c91142973b98a91238d1) (cherry picked from commit 144851777edad9522390036d3073ea656d7b648d) (cherry picked from commit 3fc299d68897a0748d96510de5f191f5a8249216) --- sys/netinet/tcp_fastopen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netinet/tcp_fastopen.c b/sys/netinet/tcp_fastopen.c index 396b1c9c3d01..cb78d83a11ba 100644 --- a/sys/netinet/tcp_fastopen.c +++ b/sys/netinet/tcp_fastopen.c @@ -273,7 +273,7 @@ SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, autokey, static int sysctl_net_inet_tcp_fastopen_ccache_bucket_limit(SYSCTL_HANDLER_ARGS); SYSCTL_PROC(_net_inet_tcp_fastopen, OID_AUTO, ccache_bucket_limit, - CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN, NULL, 0, + CTLFLAG_VNET | CTLTYPE_UINT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH, NULL, 0, &sysctl_net_inet_tcp_fastopen_ccache_bucket_limit, "IU", "Max entries per bucket in client cookie cache"); @@ -396,7 +396,8 @@ tcp_fastopen_init(void) V_tcp_fastopen_keys.newest = TCP_FASTOPEN_MAX_KEYS - 1; V_tcp_fastopen_keys.newest_psk = TCP_FASTOPEN_MAX_PSKS - 1; - /* May already be non-zero if kernel tunable was set */ + TUNABLE_INT_FETCH("net.inet.tcp.fastopen.ccache_bucket_limit", + &V_tcp_fastopen_ccache.bucket_limit); if (V_tcp_fastopen_ccache.bucket_limit == 0) V_tcp_fastopen_ccache.bucket_limit = TCP_FASTOPEN_CCACHE_BUCKET_LIMIT_DEFAULT; From nobody Wed Sep 6 08:13:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgZrd2zhtz4rrdx; Wed, 6 Sep 2023 08:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgZrd2Mtmz4tyn; Wed, 6 Sep 2023 08:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693988017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O5YiIfVrW6i1Ab8F0hWM5vIpGGQHW4P3gJDmiiWxyn8=; b=iznn6DqHLQeUGjAT2rOgBayjV9IDMC73w2EulbysICVQN87WKjWn8i0cmhY2XP9xPp8M+L XO0XVY0qJfcAhHo70a21KQ3OcRv/cU3ZCP/Bi2euZ6oI+2pQvtICfxMvknIGaO3dkmbQpG +Yv2rUB5mqSkkOVAPiVM7jghOAujfeZ73V5Xxv0pZDQ9yCDhIKGOQ8F0FpFlnrhjAtXSY8 3v5yw7FOGnF6QtN5a1ZQqEuAdIxipvr/6JuUzNbFSIbftfzBOkzijdzvTnEY4Ril22fjFp hPB4vuL3wPfi8PP5wPm6QkoLuUyGidS9v8zRgXWplQvyyY+MEGTPFr6x9Jdf+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693988017; a=rsa-sha256; cv=none; b=cDUU514JKubUo/7zULgDjSTDKOrELawQMNpSbDqk0y9eJO1drZ8iN7F/jkVN0D+eNwudfl qdGduMdd0zLQv52kogi0wS6FRRSy20FxpBEafd9eAScgLFUuCOQCoTBnkowJY84y33wtml Dzm0tATMMlyyGcR5uk2mJmsNxXMa76zjjPSnvMbfWptXGnXyjiMtDjqseqJaSVuUm4TOSy Q3VxrmUcxuhlKKUNLNNdbrjnh43Oa8CxhbPc4WGWsp0iQl9e/LSF+T/w7fIFUCTKTYI+3s aaLGLiqt9z8e/XFQ5vcJP9TWjU1SHxPrALv14zLXNuT5TH0rkpBBbD+CJvt4Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693988017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O5YiIfVrW6i1Ab8F0hWM5vIpGGQHW4P3gJDmiiWxyn8=; b=n6bteAx1ToKlCUUUYQBS8gXDTIl/NSfQGowd1kP74624fWdkasgQVsMR2xYzZN9EdQTRQm IbUMubJV+fcNxHYwPDHRluLObNlIe/HzDk7/+zyuIFZd25n/GBZaNEmvz4AGHlS8wpkwbQ 5VYtIAodupn9jsFD8qJI7vF/zDSV1mCMVckUu17qCDVw9ybeO5Z2Da8EJ7SU3pm80gVz77 2MCcz/jh7B/AbpzvudTIl+DYAQ/BfJFgnwSvzjsUDKUhYtGx2Dy2nolzwxQKzskvpqABVK N5xPnnGrvQu00qd9RUqexE2cT+Eqq0giQuFZYzx7wqDuexxBYhFUUzBhP3MWLw== 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 4RgZrd1QrNz17vC; Wed, 6 Sep 2023 08:13:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3868DbIa056208; Wed, 6 Sep 2023 08:13:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3868DbEU056205; Wed, 6 Sep 2023 08:13:37 GMT (envelope-from git) Date: Wed, 6 Sep 2023 08:13:37 GMT Message-Id: <202309060813.3868DbEU056205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: cb1a0aab4f3c - main - sys/dev/arcmsr: Update Areca RAID driver to version 1.50.00.06. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb1a0aab4f3ca169509ab86a67a4630e72790869 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1a0aab4f3ca169509ab86a67a4630e72790869 commit cb1a0aab4f3ca169509ab86a67a4630e72790869 Author: 黃清隆 AuthorDate: 2023-09-06 07:59:22 +0000 Commit: Xin LI CommitDate: 2023-09-06 08:11:55 +0000 sys/dev/arcmsr: Update Areca RAID driver to version 1.50.00.06. - Suppressed a harmless warning message, "arcmsr_dr_handle: target=f, lun=0, GONE!!!," which could appear a few seconds after UEFI system boot due to the boot volume UEFI initialization. - Corrected various typing errors. - Refactored arcmsr_initialize() to improve code readability. - Added support for device IDs 1883 and 1886 controllers. - Introduced support for controllers requiring host memory for the RAID 5 and 6 XOR engines. Many thanks to Areca for continuing to support FreeBSD. MFC after: 3 days --- sys/dev/arcmsr/arcmsr.c | 693 ++++++++++++++++++++++++++++++++---------------- sys/dev/arcmsr/arcmsr.h | 51 +++- 2 files changed, 507 insertions(+), 237 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index 9dd3142d1933..ea37da30db93 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -88,6 +88,8 @@ ** 1.50.00.03 05/04/2021 Ching Huang Fixed doorbell status arrived late on ARC-1886 ** 1.50.00.04 12/08/2021 Ching Huang Fixed boot up hung under ARC-1886 with no volume created ** 1.50.00.05 03/23/2023 Ching Huang Fixed reading buffer empty length error +** 1.50.00.06 08/07/2023 Ching Huang Add support adapter using system memory as XOR buffer, +** Add support device ID 1883,1886 ****************************************************************************************** */ @@ -143,7 +145,7 @@ #define arcmsr_callout_init(a) callout_init(a, /*mpsafe*/1); -#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.05 2023-03-23" +#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.06 2023-08-07" #include /* ************************************************************************** @@ -1071,7 +1073,7 @@ static void arcmsr_build_srb(struct CommandControlBlock *srb, */ static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandControlBlock *srb) { - u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr_low; + u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr; struct ARCMSR_CDB *arcmsr_cdb = (struct ARCMSR_CDB *)&srb->arcmsr_cdb; bus_dmamap_sync(acb->srb_dmat, acb->srb_dmamap, (srb->srb_flags & SRB_FLAG_WRITE) ? BUS_DMASYNC_POSTWRITE:BUS_DMASYNC_POSTREAD); @@ -1131,10 +1133,10 @@ static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandContr ARCMSR_LOCK_ACQUIRE(&acb->postDone_lock); postq_index = phbdmu->postq_index; pinbound_srb = (struct InBound_SRB *)&phbdmu->post_qbuffer[postq_index & 0xFF]; - pinbound_srb->addressHigh = srb->cdb_phyaddr_high; - pinbound_srb->addressLow = srb->cdb_phyaddr_low; + pinbound_srb->addressHigh = (u_int32_t)((srb->cdb_phyaddr >> 16) >> 16); + pinbound_srb->addressLow = (u_int32_t)srb->cdb_phyaddr; pinbound_srb->length = srb->arc_cdb_size >> 2; - arcmsr_cdb->Context = srb->cdb_phyaddr_low; + arcmsr_cdb->Context = (u_int32_t)srb->cdb_phyaddr; if (postq_index & 0x4000) { index_stripped = postq_index & 0xFF; index_stripped += 1; @@ -1742,7 +1744,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBA_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1751,7 +1753,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBB_RWBUFFER, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1], devicemap); devicemap += 4; } break; @@ -1760,7 +1762,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBC_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1768,7 +1770,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBD_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1776,7 +1778,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBE_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1813,14 +1815,15 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { { if(acb->device_map[target] & bit_check) {/* unit departed */ - printf("arcmsr_dr_handle: Target=%x, lun=%x, GONE!!!\n",target,lun); + if (target != 0x0f) + printf("arcmsr_dr_handle: Target=0x%x, lun=%x, GONE!!!\n",target,lun); arcmsr_abort_dr_ccbs(acb, target, lun); arcmsr_rescan_lun(acb, target, lun); acb->devstate[target][lun] = ARECA_RAID_GONE; } else {/* unit arrived */ - printf("arcmsr_dr_handle: Target=%x, lun=%x, Plug-IN!!!\n",target,lun); + printf("arcmsr_dr_handle: Target=0x%x, lun=%x, Plug-IN!!!\n",target,lun); arcmsr_rescan_lun(acb, target, lun); acb->devstate[target][lun] = ARECA_RAID_GOOD; } @@ -3170,7 +3173,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) return; } - if(target == 16) { + if(target == ARCMSR_VIRTUAL_DEVICE_ID) { /* virtual device for iop message transfer */ arcmsr_handle_virtual_command(acb, pccb); return; @@ -3216,7 +3219,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) else cpi->base_transfer_speed = 300000; if((acb->vendor_device_id == PCIDevVenIDARC1880) || + (acb->vendor_device_id == PCIDevVenIDARC1883) || (acb->vendor_device_id == PCIDevVenIDARC1884) || + (acb->vendor_device_id == PCIDevVenIDARC1886) || (acb->vendor_device_id == PCIDevVenIDARC1680) || (acb->vendor_device_id == PCIDevVenIDARC1214)) { @@ -3282,7 +3287,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) case XPT_GET_TRAN_SETTINGS: { struct ccb_trans_settings *cts; - if(pccb->ccb_h.target_id == 16) { + if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) { pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL; xpt_done(pccb); break; @@ -3299,7 +3304,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) cts->protocol = PROTO_SCSI; if((acb->vendor_device_id == PCIDevVenIDARC1880) || + (acb->vendor_device_id == PCIDevVenIDARC1883) || (acb->vendor_device_id == PCIDevVenIDARC1884) || + (acb->vendor_device_id == PCIDevVenIDARC1886) || (acb->vendor_device_id == PCIDevVenIDARC1680) || (acb->vendor_device_id == PCIDevVenIDARC1214)) { @@ -3344,7 +3351,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) break; } case XPT_CALC_GEOMETRY: - if(pccb->ccb_h.target_id == 16) { + if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) { pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL; xpt_done(pccb); break; @@ -4047,6 +4054,7 @@ static void arcmsr_get_hbf_config(struct AdapterControlBlock *acb) acb->firm_sdram_size = acb->msgcode_rwbuffer[3]; /*firm_sdram_size, 3, 12-15*/ acb->firm_ide_channels = acb->msgcode_rwbuffer[4]; /*firm_ide_channels, 4, 16-19*/ acb->firm_cfg_version = acb->msgcode_rwbuffer[ARCMSR_FW_CFGVER_OFFSET]; /*firm_cfg_version, 25*/ + acb->firm_PicStatus = acb->msgcode_rwbuffer[ARCMSR_FW_PICSTATUS]; /* firm_PicStatus, 30 */ if(acb->firm_numbers_queue > ARCMSR_MAX_OUTSTANDING_CMD) acb->maxOutstanding = ARCMSR_MAX_OUTSTANDING_CMD - 1; else @@ -4340,6 +4348,12 @@ static u_int32_t arcmsr_iop_confirm(struct AdapterControlBlock *acb) acb->msgcode_rwbuffer[5] = cdb_phyaddr_lo32; acb->msgcode_rwbuffer[6] = srb_phyaddr_hi32; acb->msgcode_rwbuffer[7] = COMPLETION_Q_POOL_SIZE; + if (acb->xor_mega) { + acb->msgcode_rwbuffer[8] = 0x555AA; //FreeBSD init 2 + acb->msgcode_rwbuffer[9] = 0; + acb->msgcode_rwbuffer[10] = (uint32_t)acb->xor_sgtable_phy; + acb->msgcode_rwbuffer[11] = (uint32_t)((acb->xor_sgtable_phy >> 16) >> 16); + } CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_SET_CONFIG); acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); @@ -4414,20 +4428,48 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in if((acb->adapter_type == ACB_ADAPTER_TYPE_C) || (acb->adapter_type == ACB_ADAPTER_TYPE_D) || (acb->adapter_type == ACB_ADAPTER_TYPE_E) || (acb->adapter_type == ACB_ADAPTER_TYPE_F)) { - srb_tmp->cdb_phyaddr_low = srb_phyaddr; - srb_tmp->cdb_phyaddr_high = (u_int32_t)((srb_phyaddr >> 16) >> 16); + srb_tmp->cdb_phyaddr = srb_phyaddr; } else - srb_tmp->cdb_phyaddr_low = srb_phyaddr >> 5; + srb_tmp->cdb_phyaddr = srb_phyaddr >> 5; srb_tmp->acb = acb; srb_tmp->smid = i << 16; acb->srbworkingQ[i] = acb->psrb_pool[i] = srb_tmp; srb_phyaddr = srb_phyaddr + SRB_SIZE; srb_tmp = (struct CommandControlBlock *)((unsigned long)srb_tmp + SRB_SIZE); } - if (acb->adapter_type == ACB_ADAPTER_TYPE_E) + srb_tmp = (struct CommandControlBlock *)(acb->uncacheptr + ARCMSR_SRBS_POOL_SIZE); + srb_phyaddr = (unsigned long)segs->ds_addr + ARCMSR_SRBS_POOL_SIZE; + switch (acb->adapter_type) { + case ACB_ADAPTER_TYPE_B: { + struct HBB_MessageUnit *phbbmu; + + acb->pmu = (struct MessageUnit_UNION *)srb_tmp; + phbbmu = (struct HBB_MessageUnit *)acb->pmu; + phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)acb->mem_base0; + phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)acb->mem_base1; + if (acb->vendor_device_id == PCIDevVenIDARC1203) { + phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell); + phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask); + phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell); + phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask); + } else { + phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell); + phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask); + phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell); + phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask); + } + } + break; + case ACB_ADAPTER_TYPE_D: + acb->pmu = (struct MessageUnit_UNION *)srb_tmp; + acb->pmu->muu.hbdmu.phbdmu = (struct HBD_MessageUnit *)acb->mem_base0; + break; + case ACB_ADAPTER_TYPE_E: acb->pCompletionQ = (pCompletion_Q)srb_tmp; - else if (acb->adapter_type == ACB_ADAPTER_TYPE_F) { + break; + case ACB_ADAPTER_TYPE_F: { + unsigned long host_buffer_dma; acb->pCompletionQ = (pCompletion_Q)srb_tmp; acb->completeQ_phys = srb_phyaddr; memset(acb->pCompletionQ, 0xff, COMPLETION_Q_POOL_SIZE); @@ -4435,9 +4477,62 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in acb->message_rbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x100); acb->msgcode_rwbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x200); memset((void *)acb->message_wbuffer, 0, MESG_RW_BUFFER_SIZE); + arcmsr_wait_firmware_ready(acb); + host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE; + CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1)); /* host buffer low addr, bit0:1 all buffer active */ + CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */ + CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1); /* set host buffer physical address */ + acb->firm_PicStatus = CHIP_REG_READ32(HBF_MessageUnit, 0, outbound_msgaddr1); /* get firmware spec info */ + break; + } } acb->vir2phy_offset = (unsigned long)srb_tmp - (unsigned long)srb_phyaddr; } + +static void arcmsr_map_xor_sgtable(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct AdapterControlBlock *acb = arg; + + acb->xor_sgtable_phy = (unsigned long)segs->ds_addr; + if ((nseg != 1) || ((u_int32_t)segs->ds_len != acb->init2cfg_size)) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor table seg num or size not as i wish!\n", acb->pci_unit); + return; + } +} + +static void arcmsr_map_xor_sg(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct AdapterControlBlock *acb = arg; + int i; + struct HostRamBuf *pRamBuf; + struct XorSg *pxortable = (struct XorSg *)(acb->xortable + sizeof(struct HostRamBuf)); + + if (nseg != acb->xor_mega) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor seg NUM not as i wish!\n", acb->pci_unit); + return; + } + for (i = 0; i < nseg; i++) { + if ((u_int32_t)segs->ds_len != ARCMSR_XOR_SEG_SIZE) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor seg SIZE not as i wish!\n", acb->pci_unit); + return; + } + pxortable->xorPhys = (u_int64_t)segs->ds_addr; + pxortable->xorBufLen = (u_int64_t)segs->ds_len; + pxortable++; + segs++; + } + pRamBuf = (struct HostRamBuf *)acb->xortable; + pRamBuf->hrbSignature = 0x53425248; //HRBS + pRamBuf->hrbSize = ARCMSR_XOR_SEG_SIZE * nseg; + pRamBuf->hrbRes[0] = 0; + pRamBuf->hrbRes[1] = 0; + bus_dmamap_sync(acb->xortable_dmat, acb->xortable_dmamap, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(acb->xor_dmat, acb->xor_dmamap, BUS_DMASYNC_PREWRITE); +} + /* ************************************************************************ ************************************************************************ @@ -4448,11 +4543,55 @@ static void arcmsr_free_resource(struct AdapterControlBlock *acb) if(acb->ioctl_dev != NULL) { destroy_dev(acb->ioctl_dev); } - bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap); - bus_dmamap_destroy(acb->srb_dmat, acb->srb_dmamap); - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); + if (acb->acb_flags & ACB_F_DMAMAP_SG) + bus_dmamap_unload(acb->xor_dmat, acb->xor_dmamap); + if (acb->xor_dmamap) { + bus_dmamem_free(acb->xor_dmat, acb->xorptr, acb->xor_dmamap); + } + if (acb->acb_flags & ACB_F_DMAMAP_SGTABLE) + bus_dmamap_unload(acb->xortable_dmat, acb->xortable_dmamap); + if (acb->xortable_dmamap) { + bus_dmamem_free(acb->xortable_dmat, acb->xortable, acb->xortable_dmamap); + } + if (acb->acb_flags & ACB_F_DMAMAP_SRB) + bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap); + if (acb->srb_dmamap) { + bus_dmamem_free(acb->srb_dmat, acb->uncacheptr, acb->srb_dmamap); + } + if (acb->srb_dmat) + bus_dma_tag_destroy(acb->srb_dmat); + if (acb->dm_segs_dmat) + bus_dma_tag_destroy(acb->dm_segs_dmat); + if (acb->parent_dmat) + bus_dma_tag_destroy(acb->parent_dmat); + switch(acb->adapter_type) { + case ACB_ADAPTER_TYPE_A: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_B: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + if (acb->sys_res_arcmsr[1]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(2), acb->sys_res_arcmsr[1]); + break; + case ACB_ADAPTER_TYPE_C: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_D: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_E: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_F: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + } } /* ************************************************************************ @@ -4480,21 +4619,16 @@ static void arcmsr_mutex_destroy(struct AdapterControlBlock *acb) ************************************************************************ ************************************************************************ */ -static u_int32_t arcmsr_initialize(device_t dev) +static int arcmsr_define_adapter_type(struct AdapterControlBlock *acb) { - struct AdapterControlBlock *acb = device_get_softc(dev); - u_int16_t pci_command; - int i, j,max_coherent_size; - u_int32_t vendor_dev_id; - - vendor_dev_id = pci_get_devid(dev); - acb->vendor_device_id = vendor_dev_id; - acb->sub_device_id = pci_read_config(dev, PCIR_SUBDEV_0, 2); - switch (vendor_dev_id) { - case PCIDevVenIDARC1880: - case PCIDevVenIDARC1882: - case PCIDevVenIDARC1213: - case PCIDevVenIDARC1223: { + int rc = 0; + + switch (acb->vendor_device_id) { + case PCIDevVenIDARC1880: + case PCIDevVenIDARC1882: + case PCIDevVenIDARC1883: + case PCIDevVenIDARC1213: + case PCIDevVenIDARC1223: { acb->adapter_type = ACB_ADAPTER_TYPE_C; if ((acb->sub_device_id == ARECA_SUB_DEV_ID_1883) || (acb->sub_device_id == ARECA_SUB_DEV_ID_1216) || @@ -4502,158 +4636,78 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->adapter_bus_speed = ACB_BUS_SPEED_12G; else acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE; - } - break; - case PCIDevVenIDARC1884: - acb->adapter_type = ACB_ADAPTER_TYPE_E; - acb->adapter_bus_speed = ACB_BUS_SPEED_12G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE; - acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); - break; - case PCIDevVenIDARC1886_: - case PCIDevVenIDARC1886: - acb->adapter_type = ACB_ADAPTER_TYPE_F; - acb->adapter_bus_speed = ACB_BUS_SPEED_12G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE; - acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); - break; - case PCIDevVenIDARC1214: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE; + } + break; + case PCIDevVenIDARC1884: + acb->adapter_type = ACB_ADAPTER_TYPE_E; + acb->adapter_bus_speed = ACB_BUS_SPEED_12G; + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE; + acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); + break; + case PCIDevVenIDARC1886_0: + case PCIDevVenIDARC1886_: + case PCIDevVenIDARC1886: + acb->adapter_type = ACB_ADAPTER_TYPE_F; + acb->adapter_bus_speed = ACB_BUS_SPEED_12G; + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE; + acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); + break; + case PCIDevVenIDARC1214: + case PCIDevVenIDARC1224: { acb->adapter_type = ACB_ADAPTER_TYPE_D; acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0)); - } - break; - case PCIDevVenIDARC1200: - case PCIDevVenIDARC1201: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0)); + } + break; + case PCIDevVenIDARC1200: + case PCIDevVenIDARC1201: { acb->adapter_type = ACB_ADAPTER_TYPE_B; acb->adapter_bus_speed = ACB_BUS_SPEED_3G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); - } - break; - case PCIDevVenIDARC1203: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); + } + break; + case PCIDevVenIDARC1203: { acb->adapter_type = ACB_ADAPTER_TYPE_B; acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); - } - break; - case PCIDevVenIDARC1110: - case PCIDevVenIDARC1120: - case PCIDevVenIDARC1130: - case PCIDevVenIDARC1160: - case PCIDevVenIDARC1170: - case PCIDevVenIDARC1210: - case PCIDevVenIDARC1220: - case PCIDevVenIDARC1230: - case PCIDevVenIDARC1231: - case PCIDevVenIDARC1260: - case PCIDevVenIDARC1261: - case PCIDevVenIDARC1270: - case PCIDevVenIDARC1280: - case PCIDevVenIDARC1212: - case PCIDevVenIDARC1222: - case PCIDevVenIDARC1380: - case PCIDevVenIDARC1381: - case PCIDevVenIDARC1680: - case PCIDevVenIDARC1681: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); + } + break; + case PCIDevVenIDARC1110: + case PCIDevVenIDARC1120: + case PCIDevVenIDARC1130: + case PCIDevVenIDARC1160: + case PCIDevVenIDARC1170: + case PCIDevVenIDARC1210: + case PCIDevVenIDARC1220: + case PCIDevVenIDARC1230: + case PCIDevVenIDARC1231: + case PCIDevVenIDARC1260: + case PCIDevVenIDARC1261: + case PCIDevVenIDARC1270: + case PCIDevVenIDARC1280: + case PCIDevVenIDARC1212: + case PCIDevVenIDARC1222: + case PCIDevVenIDARC1380: + case PCIDevVenIDARC1381: + case PCIDevVenIDARC1680: + case PCIDevVenIDARC1681: { acb->adapter_type = ACB_ADAPTER_TYPE_A; acb->adapter_bus_speed = ACB_BUS_SPEED_3G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE; - } - break; - default: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE; + } + break; + default: { printf("arcmsr%d:" - " unknown RAID adapter type \n", device_get_unit(dev)); - return ENOMEM; + " unknown RAID adapter type \n", acb->pci_unit); + rc = ENOMEM; } } - if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev), - /*alignemnt*/ 1, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ BUS_SPACE_MAXSIZE_32BIT, - /*nsegments*/ BUS_SPACE_UNRESTRICTED, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ NULL, - /*lockarg*/ NULL, - &acb->parent_dmat) != 0) - { - printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENOMEM; - } - - /* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */ - if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, - /*alignment*/ 1, - /*boundary*/ 0, -#ifdef PAE - /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, -#else - /*lowaddr*/ BUS_SPACE_MAXADDR, -#endif - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM, - /*nsegments*/ ARCMSR_MAX_SG_ENTRIES, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ busdma_lock_mutex, - /*lockarg*/ &acb->isr_lock, - &acb->dm_segs_dmat) != 0) - { - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENOMEM; - } + return rc; +} - /* DMA tag for our srb structures.... Allocate the freesrb memory */ - if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, - /*alignment*/ 0x20, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ max_coherent_size, - /*nsegments*/ 1, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ NULL, - /*lockarg*/ NULL, - &acb->srb_dmat) != 0) - { - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENXIO; - } - /* Allocation for our srbs */ - if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &acb->srb_dmamap) != 0) { - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", device_get_unit(dev)); - return ENXIO; - } - /* And permanently map them */ - if(bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0)) { - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", device_get_unit(dev)); - return ENXIO; - } - pci_command = pci_read_config(dev, PCIR_COMMAND, 2); - pci_command |= PCIM_CMD_BUSMASTEREN; - pci_command |= PCIM_CMD_PERRESPEN; - pci_command |= PCIM_CMD_MWRICEN; - /* Enable Busmaster */ - pci_write_config(dev, PCIR_COMMAND, pci_command, 2); +static int arcmsr_map_pcireg(device_t dev, struct AdapterControlBlock *acb) +{ switch(acb->adapter_type) { case ACB_ADAPTER_TYPE_A: { u_int32_t rid0 = PCIR_BAR(0); @@ -4662,18 +4716,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4683,47 +4737,33 @@ static u_int32_t arcmsr_initialize(device_t dev) } break; case ACB_ADAPTER_TYPE_B: { - struct HBB_MessageUnit *phbbmu; - struct CommandControlBlock *freesrb; u_int32_t rid[]={ PCIR_BAR(0), PCIR_BAR(2) }; vm_offset_t mem_base[]={0,0}; + u_int16_t i; + for(i=0; i < 2; i++) { acb->sys_res_arcmsr[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid[i], RF_ACTIVE); if(acb->sys_res_arcmsr[i] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: bus_alloc_resource %d failure!\n", acb->pci_unit, i); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[i]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: rman_get_start %d failure!\n", acb->pci_unit, i); return ENXIO; } mem_base[i] = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[i]); if(mem_base[i] == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: rman_get_virtual %d failure!\n", acb->pci_unit, i); return ENXIO; } acb->btag[i] = rman_get_bustag(acb->sys_res_arcmsr[i]); acb->bhandle[i] = rman_get_bushandle(acb->sys_res_arcmsr[i]); } - freesrb = (struct CommandControlBlock *)acb->uncacheptr; - acb->pmu = (struct MessageUnit_UNION *)((unsigned long)freesrb+ARCMSR_SRBS_POOL_SIZE); - phbbmu = (struct HBB_MessageUnit *)acb->pmu; - phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)mem_base[0]; - phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)mem_base[1]; - if (vendor_dev_id == PCIDevVenIDARC1203) { - phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell); - phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask); - phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell); - phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask); - } else { - phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell); - phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask); - phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell); - phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask); - } + acb->mem_base0 = mem_base[0]; + acb->mem_base1 = mem_base[1]; acb->rid[0] = rid[0]; acb->rid[1] = rid[1]; } @@ -4735,18 +4775,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4756,32 +4796,29 @@ static u_int32_t arcmsr_initialize(device_t dev) } break; case ACB_ADAPTER_TYPE_D: { - struct HBD_MessageUnit0 *phbdmu; u_int32_t rid0 = PCIR_BAR(0); vm_offset_t mem_base0; acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); acb->bhandle[0] = rman_get_bushandle(acb->sys_res_arcmsr[0]); - acb->pmu = (struct MessageUnit_UNION *)((unsigned long)acb->uncacheptr+ARCMSR_SRBS_POOL_SIZE); - phbdmu = (struct HBD_MessageUnit0 *)acb->pmu; - phbdmu->phbdmu = (struct HBD_MessageUnit *)mem_base0; + acb->mem_base0 = mem_base0; acb->rid[0] = rid0; } break; @@ -4792,18 +4829,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4820,23 +4857,22 @@ static u_int32_t arcmsr_initialize(device_t dev) case ACB_ADAPTER_TYPE_F: { u_int32_t rid0 = PCIR_BAR(0); vm_offset_t mem_base0; - unsigned long host_buffer_dma; acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4848,17 +4884,203 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->rid[0] = rid0; CHIP_REG_WRITE32(HBF_MessageUnit, 0, host_int_status, 0); /*clear interrupt*/ CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBEMU_DOORBELL_SYNC); /* synchronize doorbell to 0 */ - arcmsr_wait_firmware_ready(acb); - host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE; - CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1)); /* host buffer low addr, bit0:1 all buffer active */ - CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */ - CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1); /* set host buffer physical address */ } break; } - if(acb->acb_flags & ACB_F_MAPFREESRB_FAILD) { + return (0); +} + +static int arcmsr_alloc_srb(device_t dev, struct AdapterControlBlock *acb) +{ + int rc; + + if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev), + /*alignemnt*/ 1, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ BUS_SPACE_MAXSIZE_32BIT, + /*nsegments*/ BUS_SPACE_UNRESTRICTED, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->parent_dmat) != 0) + { + printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENOMEM; + } + + /* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 1, + /*boundary*/ 0, +#ifdef PAE + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, +#else + /*lowaddr*/ BUS_SPACE_MAXADDR, +#endif + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM, + /*nsegments*/ ARCMSR_MAX_SG_ENTRIES, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ busdma_lock_mutex, + /*lockarg*/ &acb->isr_lock, + &acb->dm_segs_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENOMEM; + } + + /* DMA tag for our srb structures.... Allocate the freesrb memory */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x20, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ acb->max_coherent_size, + /*nsegments*/ 1, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->srb_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for our srbs */ + if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, ARCMSR_DMA_ALLOC_FLAG, &acb->srb_dmamap) != 0) { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", acb->pci_unit); + return ENXIO; + } + /* And permanently map them */ + rc = bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, acb->max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0); + if((rc != 0) && (rc != EINPROGRESS)) { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", acb->pci_unit); + return ENXIO; + } + acb->acb_flags |= ACB_F_DMAMAP_SRB; + return (0); +} + +static int arcmsr_alloc_xor_mem(device_t dev, struct AdapterControlBlock *acb) +{ + int rc, xor_ram; + + xor_ram = (acb->firm_PicStatus >> 24) & 0x0f; + acb->xor_mega = (xor_ram - 1) * 32 + 128 + 3; + acb->init2cfg_size = sizeof(struct HostRamBuf) + (sizeof(struct XorSg) * acb->xor_mega); + /* DMA tag for XOR engine of Raid 5,6 */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x40, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ acb->init2cfg_size, + /*nsegments*/ 1, + /*maxsegsz*/ acb->init2cfg_size, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->xortable_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor table bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for xors */ + if(bus_dmamem_alloc(acb->xortable_dmat, (void **)&acb->xortable, ARCMSR_DMA_ALLOC_FLAG, &acb->xortable_dmamap) != 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: map free srb failure!\n", device_get_unit(dev)); + printf("arcmsr%d: xor table bus_dmamem_alloc failure!\n", acb->pci_unit); + return ENXIO; + } + /* And permanently map xor segs */ + rc = bus_dmamap_load(acb->xortable_dmat, acb->xortable_dmamap, acb->xortable, acb->init2cfg_size, arcmsr_map_xor_sgtable, acb, /*flags*/0); + if((rc != 0) && (rc != EINPROGRESS)) { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor table bus_dmamap_load failure!\n", acb->pci_unit); + return ENXIO; + } + acb->acb_flags |= ACB_F_DMAMAP_SGTABLE; + + /* DMA tag for XOR engine of Raid 5,6 */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x1000, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ (ARCMSR_XOR_SEG_SIZE * acb->xor_mega), + /*nsegments*/ acb->xor_mega, + /*maxsegsz*/ ARCMSR_XOR_SEG_SIZE, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->xor_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for xors */ + if(bus_dmamem_alloc(acb->xor_dmat, (void **)&acb->xorptr, ARCMSR_DMA_ALLOC_FLAG, &acb->xor_dmamap) != 0) { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor bus_dmamem_alloc failure!\n", acb->pci_unit); *** 247 LINES SKIPPED *** From nobody Wed Sep 6 10:17:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgdbD2vsdz4swKR; Wed, 6 Sep 2023 10:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgdbD2TGDz3fr9; Wed, 6 Sep 2023 10:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693995432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t6EzBKDXcmK3qg++7+991IMM1OdXv9+lQinYNZmD6AU=; b=XqGjQ+JvcEat5n4bPvM9RIetDSiuUZXuyzKgQp+RvgQnte4Vu8vMwMsLVUEjo6pk+0H1z8 8VXiPBUddEB6kiry0m0RQj0cQf3Hk0bU4VY2i30I9eC+YhYq6oNJ3fTs4IKJ3azUpocGZc fot+85IbL++8kD1CQj9iSHv0z8AeAb4POZVH6SicnxKaQzT+krxTIycvu+I/P/h91d2fLG nxg3yl9XFpIPMJkV5RKIBIzrhtSjfYa/JlComg0hHTSAtFBqkHvCnQjv00vW3/ryeFE9nA UwiwP+clmks+i9SbQ5OsaJQGVAnCK3pcZvm6aSv0trSPnkyE0vXYoqTKjYPj6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693995432; a=rsa-sha256; cv=none; b=ljFKroulgZZKIFlGS3s6C43Jc3E9VH8ZLuLnyGQuKew7kXs2zVdGSXqOR2CWM7mQOMjq1O 7RrARZgEJJ1wBEjkz8DmE7Zq4A/G9CRtWwrw1cGjAbdZqFBxe59MjR/xExMxqsUoAeCO6u TDCAYaGC7crlGhw4FsFMb6cN4kH6C5vfTdzKxyIt1sy37mbu9I1RIxsX5g6kX/FfBqetPd EqtyL2F/pycpsWHQU9L81/bypl43kBM1U0sQGe+pVrp4KvDTWuqPlAwn4AhRYotq0EeQnL iVxR+EFPT6/ou2llZqbAblm07QHe9YmPLx19AE6J34AS/iULAzFiaoTIZIgspg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693995432; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t6EzBKDXcmK3qg++7+991IMM1OdXv9+lQinYNZmD6AU=; b=IUGs4npBvhVU4BmSXWxqy058zM3r0ArYHgrhr5vgRju68YLqc8Izmt8xASCd8TnJUgN3L4 NC0OUen8wc2c+oyxDtRG76ltCVTNV+P+Am8yq7MQ+3273DkIGTB8So+NHURKMdUtB7Ag/O u4vLJPkaJcaYulFw01EGWkorRH1nsVZp7PSJW5pplaiu3X2t3FHtyJEzldAKPIXSoRDwXf ymQenzM9GOPXOmn/ZRodvHlR3RXdhhuCUDl/p0bE3WNddjl/tRkuYm+yGX1FfOPTIEehKG hP+SbCELNUOr5ufpaDP7eC1jDnGUr+3M07cXX1RhmJ1BTqbRGuRhLcwkIjs6RA== 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 4RgdbD1Xbsz1BjV; Wed, 6 Sep 2023 10:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386AHCNR054985; Wed, 6 Sep 2023 10:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386AHCx4054982; Wed, 6 Sep 2023 10:17:12 GMT (envelope-from git) Date: Wed, 6 Sep 2023 10:17:12 GMT Message-Id: <202309061017.386AHCx4054982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 49d6743da15f - main - net: Check per-flow priority code point for untagged traffic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49d6743da15fe378782e43776df8b4fd4f84c8d0 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=49d6743da15fe378782e43776df8b4fd4f84c8d0 commit 49d6743da15fe378782e43776df8b4fd4f84c8d0 Author: Zhenlei Huang AuthorDate: 2023-09-06 10:15:14 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-06 10:15:14 +0000 net: Check per-flow priority code point for untagged traffic Commit 868aabb4708d introduced per-flow priority. There's a defect in the logic for untagged traffic, it does not check M_VLANTAG set in the mbuf packet header or MTAG_8021Q/MTAG_8021Q_PCP_OUT tag set by firewall, then can result missing desired priority in the outbound packets. For mbuf packet with M_VLANTAG in header, some interfaces happen to work due to bug in the drivers mentioned in D39499. As modern interfaces have VLAN hardware offloading, the defect is barely noticeable unless the feature per-flow priority is widely tested. As a side effect of this defect, the soft padding to work around buggy bridges is bypassed. That may result in regression if soft padding is requested. PR: 273431 Discussed with: kib Fixes: 868aabb4708d Add IP(V6)_VLAN_PCP to set 802.1 priority per-flow MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39536 --- sys/net/if_ethersubr.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index ab274eeb88bf..2cbe0ea98f27 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -123,6 +123,8 @@ static int ether_resolvemulti(struct ifnet *, struct sockaddr **, struct sockaddr *); static int ether_requestencap(struct ifnet *, struct if_encap_req *); +static inline bool ether_do_pcp(struct ifnet *, struct mbuf *); + #define senderr(e) do { error = (e); goto bad;} while (0) static void @@ -470,11 +472,7 @@ ether_set_pcp(struct mbuf **mp, struct ifnet *ifp, uint8_t pcp) int ether_output_frame(struct ifnet *ifp, struct mbuf *m) { - uint8_t pcp; - - pcp = ifp->if_pcp; - if (pcp != IFNET_PCP_NONE && ifp->if_type != IFT_L2VLAN && - !ether_set_pcp(&m, ifp, pcp)) + if (ether_do_pcp(ifp, m) && !ether_set_pcp(&m, ifp, ifp->if_pcp)) return (0); if (PFIL_HOOKED_OUT(V_link_pfil_head)) @@ -1400,6 +1398,19 @@ SYSCTL_INT(_net_link_vlan, OID_AUTO, mtag_pcp, CTLFLAG_RW | CTLFLAG_VNET, &VNET_NAME(vlan_mtag_pcp), 0, "Retain VLAN PCP information as packets are passed up the stack"); +static inline bool +ether_do_pcp(struct ifnet *ifp, struct mbuf *m) +{ + if (ifp->if_type == IFT_L2VLAN) + return (false); + if (ifp->if_pcp != IFNET_PCP_NONE || (m->m_flags & M_VLANTAG) != 0) + return (true); + if (V_vlan_mtag_pcp && + m_tag_locate(m, MTAG_8021Q, MTAG_8021Q_PCP_OUT, NULL) != NULL) + return (true); + return (false); +} + bool ether_8021q_frame(struct mbuf **mp, struct ifnet *ife, struct ifnet *p, const struct ether_8021q_tag *qtag) From nobody Wed Sep 6 12:23:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RghPJ2Kf9z4rrvg; Wed, 6 Sep 2023 12:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RghPJ1drTz3H09; Wed, 6 Sep 2023 12:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694003028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJvaWPKTOUoqtSMtf7dg8aF+j2GvexOd2PIefSveAMg=; b=RT5sW2eHNqLi8Ru8n2jcu6fwz2Kds3DsLqIKl93bJfWYiRMoa1AVri/TChw+I7AI6CAkfy jqevTqXwwSLpu0ZuU5PtbOssl6EEyMo9mNLRwakbahvOMnr5iZQAjlHUwgh/fqBlELF8gn Ez3SDaQF1a8h09H9YwKOx1KWp37WbxnyCieOiPiKAR0QDO00tLJ3VvBpw9wrsGPiQ8vkB+ bIbEDNxEO2YFolI71EXLeIRHRY5eHtwTcw0Yjr72qBIrqMhD1e16Q6LFxa09NjG6dfdVyG ajniBD5s/Sn/WqIrhMTfND47j6qrmiecGjCQ87m/poBQm2sbnrsmTMF78//5og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694003028; a=rsa-sha256; cv=none; b=s3j+rzFHRcjMZM9oE/WhtZ+idCP3Gb8Xvjg8qm4jpFqKOLOVUvh0T/N0Tlh0vkt3DGkYa4 +4YvwByvKCnZ9OdPoa4NR1vADdUvSj2QVoHXltW6/MQGTKIO9GGqqbnTlZ+v7ZlxJocjqr I2cRWswED2IWdAPlZbGrbpzn5bl4qVDJc0BF/sip6tmio8IxONfGGEM23XjblnCWiI5AWN 48jGE5TbnIFjyQQ9hcej6+iYWiIGLGVHfoUlfjVZIv+A/s+vpzXnjUJQIE/f1DLeRpmbDk 0mYgvtqnQSKmQIUnj7QvIdpXZ2OdxLONnUZkTgAJKtEoVFH1bQZFWTu7VbrzcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694003028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kJvaWPKTOUoqtSMtf7dg8aF+j2GvexOd2PIefSveAMg=; b=DoK08nRBQ0qsff91+UqvFzqM+n0WurufnwqaovUchWHaaUMVIhOiU+iIltcBOdRisZSJCc bS+Cf67J343d1n5wfta5SAn46kBvg/axTI9BSRMErZHohkcImfNAzyrOGqVdopE1WQwkgQ QNPaRbZ0ofP8E+goftYck5RuACN1Tcs++ys5tP57K+tfSdHwDrV1l3gTiOXzekjxjLDtR3 mRYDM/4Mkx/QKifyePf36jMvWutuk9kV6+NqSjAN+iuDUxF+ru5qzhU6AKuPvwnNIrqbpt E8/WlGfrUX9kKEDRkMLXWrbDrgSy3271MuL4C8X+P61mInxH9t64cQfztYRyrA== 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 4RghPJ0jP0z1hW; Wed, 6 Sep 2023 12:23:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386CNmc3070406; Wed, 6 Sep 2023 12:23:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386CNmEv070403; Wed, 6 Sep 2023 12:23:48 GMT (envelope-from git) Date: Wed, 6 Sep 2023 12:23:48 GMT Message-Id: <202309061223.386CNmEv070403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 358f8a7add3c - main - sendmail: remove all m4 files with WITHOUT_SENDMAIL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 358f8a7add3c83f5f5a37b4c295e116ec511936b Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=358f8a7add3c83f5f5a37b4c295e116ec511936b commit 358f8a7add3c83f5f5a37b4c295e116ec511936b Author: Baptiste Daroussin AuthorDate: 2023-08-04 11:57:12 +0000 Commit: Baptiste Daroussin CommitDate: 2023-09-06 12:23:27 +0000 sendmail: remove all m4 files with WITHOUT_SENDMAIL --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 82ea542d7f55..99efa469c0e7 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -7252,6 +7252,7 @@ OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4 OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4 OLD_FILES+=usr/share/sendmail/cf/feature/check_cert_altnames.m4 OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4 From nobody Wed Sep 6 12:23:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RghPK3rk8z4rry6; Wed, 6 Sep 2023 12:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RghPK2vSxz3GwK; Wed, 6 Sep 2023 12:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694003029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmleF9r3C+Y56HwTZ/ebYxgdjXiLGVoEH3iGygErM/Q=; b=FeTsZX66NSgT6vhDN4TFNmSB+htKxN0Pc9Y+PzTXhWDdKuinf9KS8Sdwv7aelpfN0LODqY o/iD34kzkP9bm0SP1E/RUqHhmPjT/g9xjhYgjjK48SoqPtqy2OKNUlP53dVaJSAtV/IIfR cfcJZ2GtimdvkBM5BuqfOlGkBD7XDow57Wjk+Rj2nw2oiDe/fd1aU70XNH0n8w1FAaMNHI bfYrE3IWa9lvZ5QOghPJxCqKh2h8OHcQzw5jSUkqtYV0edfrVkRZSk9qkSAin8+5DvlDV3 /I8IdVwWGd+WfxOJ8g81aS0SkH1Xe6ZPEE6Ml8YRNA+7y0UO6/9b9vecduZbDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694003029; a=rsa-sha256; cv=none; b=ayGjPQLVmn/++jiQc10gBoq5dvhmSJh1uiZ6bjLkHqxiEcpDBOtNVjF4SU9TnY373M2weT YWHaGq2B8KVraYKRl1ltOYgc55EARXIPAW/UFFlDv8ht7KCSc3W0W4AZGyHV6ov1O+MZNH hKkti+sJCjnsrmYEEDfN7wbYNxmrPmyQag+gvhZxq5ul85Mcmoq22iAfpcm/hiNNe6PJTp JtzNWiqZs4BKXasPL82405umDh7KjQif3ii0TkJRJTgWWYho/7OjamPgSN3csuVzdvSuzH SGaHloF2qmHKsy7XTf67dRu29mOusHkrgWNQ7UtWf7ucmjVPAtM0phXymDR80w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694003029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CmleF9r3C+Y56HwTZ/ebYxgdjXiLGVoEH3iGygErM/Q=; b=mbvU+rjwEnkjLbMNNaTySKq2i1JIKde7W+jeUskIRQo/gTlHRhiO/3ONA4QBeKQhmgdCip po4p9/eC1qHe3vgHHRk8jlTdNIH45IJffefjv2QjoKT0U6VzvhArzIdtN21d41Vi6FtI8m bbqgRkZL93O5d2D9qPfmw4jr19AJJPoiJk036fE0+/VJC0hTbhxT8GTRKDhcaTZJQXBFII fEvU57htvGHaSrKqpg/ie6J9uQ3pfvYI1HDQqMu14Vhjqij7vknxi3Wr8q/WgWVjy0vPO1 p743Q25S8R1XM9q3usFglXAN6PAgA9PhVpB6wFkzCGFj5k7DYHfOyMYYcvrfNw== 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 4RghPK1yd1z1px; Wed, 6 Sep 2023 12:23:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386CNn3i070445; Wed, 6 Sep 2023 12:23:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386CNnAP070442; Wed, 6 Sep 2023 12:23:49 GMT (envelope-from git) Date: Wed, 6 Sep 2023 12:23:49 GMT Message-Id: <202309061223.386CNnAP070442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: bf986d52458a - main - pci_vendors: update to 2023-08-12 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf986d52458aaefa4d3a1d4668449cbb5c991afe Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=bf986d52458aaefa4d3a1d4668449cbb5c991afe commit bf986d52458aaefa4d3a1d4668449cbb5c991afe Author: Baptiste Daroussin AuthorDate: 2023-09-06 12:22:11 +0000 Commit: Baptiste Daroussin CommitDate: 2023-09-06 12:23:27 +0000 pci_vendors: update to 2023-08-12 --- share/misc/pci_vendors | 342 ++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 295 insertions(+), 47 deletions(-) diff --git a/share/misc/pci_vendors b/share/misc/pci_vendors index 29f7a824bbaf..d3988731c30a 100644 --- a/share/misc/pci_vendors +++ b/share/misc/pci_vendors @@ -1,8 +1,8 @@ # # List of PCI ID's # -# Version: 2023.06.19 -# Date: 2023-06-19 03:15:02 +# Version: 2023.08.12 +# Date: 2023-08-12 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at https://pci-ids.ucw.cz/. @@ -90,6 +90,8 @@ 025e d819 NVMe DC SSD E3.S 7.5mm [D5-P5336] 025e d81d NVMe DC SSD E1.L 9.5mm [D5-P5336] 0b70 NVMe DC SSD [Yorktown controller] + f1ab P41 Plus NVMe SSD (DRAM-less) + f1ac P44 Pro NVMe SSD 0270 Hauppauge computer works Inc. (Wrong ID) 0291 Davicom Semiconductor, Inc. (Wrong ID) # SpeedStream is Efficient Networks, Inc, a Siemens Company @@ -1037,8 +1039,8 @@ 15d9 1c6e AOC-SLG4-2H8M2 Storage Adapter 1d49 0505 ThinkSystem RAID 540-8i PCIe Gen4 12Gb Adapter 1d49 0506 ThinkSystem RAID 540-16i PCIe Gen4 12Gb Adapter - 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay RAID Enablement Kit - 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay RAID Enablement Kit + 1d49 0700 ThinkSystem M.2 SATA/NVMe 2-Bay Non-Hot-Swap RAID Enablement Kit + 1d49 0701 ThinkSystem 7mm SATA/NVMe 2-Bay Rear Hot-Swap RAID Enablement Kit 10e7 MegaRAID 12GSAS/PCIe Unsupported SAS38xx 1960 MegaRAID 1000 0518 MegaRAID 518 SCSI 320-2 Controller @@ -1375,6 +1377,7 @@ 1043 841b M5A88-V EVO 1043 8445 M5A78L LE 105b 0e13 N15235/A74MX mainboard / AMD SB700 + 1179 ff1e Satellite C660D-113 1179 ff50 Satellite P305D-S8995E 1458 a022 GA-770/78-series motherboard 1458 a102 GA-880GMA-USB3 @@ -2178,7 +2181,7 @@ 6640 Saturn XT [FirePro M6100] 106b 014b Tropo XT [Radeon R9 M380 Mac Edition] 6641 Saturn PRO [Radeon HD 8930M] - 6646 Bonaire XT [Radeon R9 M280X] + 6646 Bonaire XT [Radeon R9 M280X / FirePro W6150M] 6647 Saturn PRO/XT [Radeon R9 M270X/M280X] 1043 223d N551ZU laptop Radeon R9 M280X 6649 Bonaire [FirePro W5100] @@ -2240,7 +2243,7 @@ 17aa 368f Radeon R5 A230 6667 Jet ULT [Radeon R5 M230] 666f Sun LE [Radeon HD 8550M / R5 M230] - 66a0 Vega 20 [Radeon Instinct] + 66a0 Vega 20 [Radeon Pro/Radeon Instinct] 66a1 Vega 20 [Radeon Pro VII/Radeon Instinct MI50 32GB] 66a2 Vega 20 66a3 Vega 20 [Radeon Pro Vega II/Radeon Pro Vega II Duo] @@ -2898,6 +2901,7 @@ 1787 a480 Radeon RX 480 1849 5001 Phantom Gaming X RX 580 OC 1849 5030 Phantom Gaming D Radeon RX580 8G OC + 1da2 e343 Radeon RX 570 Pulse ITX 4GB 1da2 e353 Radeon RX 570 Pulse 4GB 1da2 e366 Nitro+ Radeon RX 570/580/590 1da2 e387 Radeon RX 580 Pulse 4GB @@ -3168,7 +3172,7 @@ 686e Vega 10 GLXLA 687f Vega 10 XL/XT [Radeon RX Vega 56/64] 1002 0b36 RX Vega64 - 1002 6b76 RX Vega64 + 1002 6b76 AMD Radeon RX Vega 56 8GB # ROG-STRIX-RXVEGA64-O8G-GAMING 1043 04c4 Radeon RX Vega 64 1458 230c Radeon RX VEGA 56 GAMING OC 8G @@ -3906,13 +3910,14 @@ 1eae 6901 Speedster MERC 319 AMD Radeon RX 6900 XT Black 73c3 Navi 22 73c4 Navi 22 USB - 73ce Navi22-XL SRIOV MxGPU + 73ce Navi 22-XL SRIOV MxGPU 73df Navi 22 [Radeon RX 6700/6700 XT/6750 XT / 6800M/6850M XT] 1043 16c2 Radeon RX 6800M 1458 2408 Radeon RX 6750 XT GAMING OC 12G 1462 3980 Radeon RX 6700 XT Mech 2X 12G [MSI] 1849 5219 Radeon RX 6700 XT Challenger D 1849 5222 RX 6700 XT Challenger D OC + 1da2 465e Radeon RX 6750 XT PULSE OC 1da2 e445 Sapphire Radeon RX 6700 1eae 6601 Speedster QICK 319 RX 6700 XT 73e0 Navi 23 @@ -3936,16 +3941,17 @@ 7424 Navi 24 [Radeon RX 6300] 743f Navi 24 [Radeon RX 6400/6500 XT/6500M] 1da2 e457 PULSE AMD Radeon RX 6500 XT - 7448 Navi31 [Radeon Pro W7900] + 7446 Navi 31 USB + 7448 Navi 31 [Radeon Pro W7900] 744c Navi 31 [Radeon RX 7900 XT/7900 XTX] 1da2 471e PULSE RX 7900 XTX 1da2 e471 NITRO+ RX 7900 XTX Vapor-X 1eae 7901 RX-79XMERCB9 [SPEEDSTER MERC 310 RX 7900 XTX] - 745e Navi31 [Radeon Pro W7800] - 7480 Navi 33 [Radeon RX 7700S/7600S/7600M XT] + 745e Navi 31 [Radeon Pro W7800] + 7480 Navi 33 [Radeon RX 7700S/7600/7600S/7600M XT/PRO W7600] 1849 5313 RX 7600 Challenger OC 7483 Navi 33 [Radeon RX 7600M/7600M XT] - 7489 Navi 33 + 7489 Navi 33 [Radeon Pro W7500] 7833 RS350 Host Bridge 7834 RS350 [Radeon 9100 PRO/XT IGP] 7835 RS350M [Mobility Radeon 9000 IGP] @@ -4348,6 +4354,7 @@ ab18 Vega 12 HDMI Audio ab20 Vega 20 HDMI Audio [Radeon VII] ab28 Navi 21/23 HDMI/DP Audio Controller + ab30 Navi 31 HDMI/DP Audio ab38 Navi 10 HDMI Audio ac00 Theater 506 World-Wide Analog Decoder ac01 Theater 506 World-Wide Analog Decoder @@ -5032,7 +5039,11 @@ 14b7 Family 17h-19h PCIe Dummy Host Bridge 14b9 Family 17h-19h Internal PCIe GPP Bridge 14ba Family 17h-19h PCIe GPP Bridge +# Server device + 14ca Genoa CCP/PSP 4.0 Device 14cd Family 19h USB4/Thunderbolt PCIe tunnel + 14de Phoenix PCIe Dummy Function + 14ef Family 19h USB4/Thunderbolt PCIe tunnel 1510 Family 14h Processor Root Complex 174b 1001 PURE Fusion Mini 1512 Family 14h Processor Root Port @@ -5116,6 +5127,9 @@ 15b5 Stoney NB Performance Monitor 15bc Stoney PCIe [GFX,GPP] Bridge [4:0] 15be Stoney Audio Processor + 15c4 Phoenix USB4/Thunderbolt NHI controller #1 + 15c5 Phoenix USB4/Thunderbolt NHI controller #2 + 15c7 Family 19h (Model 74h) CCP/PSP 3.0 Device 15d0 Raven/Raven2 Root Complex 103c 8615 Pavilion Laptop 15-cw1xxx 1043 876b PRIME B450M-A Motherboard @@ -5264,6 +5278,8 @@ 1665 VanGogh Data Fabric; Function 5 1666 VanGogh Data Fabric; Function 6 1667 VanGogh Data Fabric; Function 7 + 1668 Pink Sardine USB4/Thunderbolt NHI controller #1 + 1669 Pink Sardine USB4/Thunderbolt NHI controller #2 166a Cezanne Data Fabric; Function 0 166b Cezanne Data Fabric; Function 1 166c Cezanne Data Fabric; Function 2 @@ -5707,6 +5723,7 @@ 1028 215f ENT NVMe RT1 RI 7.68TB 1028 2160 ENT NVMe RT1 FIPS RI 3.84TB 1028 2161 ENT NVMe RT1 FIPS RI 7.68TB + 9602 RS780/RS880 PCI to PCI bridge (int gfx) 1029 Siemens Nixdorf IS 102a LSI Logic 0000 HYDRA @@ -6971,6 +6988,7 @@ 90dc Baikal DMA Controller 90dd Baikal Memory (DDR3/SPM) 90de Baikal USB 3.0 xHCI Host Controller + 9121 Nextorage NEM-PA NVMe SSD for PlayStation 104e Oak Technology, Inc 0017 OTI-64017 0107 OTI-107 [Spitfire] @@ -7201,6 +7219,7 @@ c350 80333 [SuperTrak EX12350] e350 80333 [SuperTrak EX24350] 105b Foxconn International, Inc. + e0c3 T99W175 5G Modem [Snapdragon X55] 105c Wipro Infotech Limited 105d Number 9 Computer Company 2309 Imagine 128 @@ -12732,8 +12751,13 @@ 2330 GH100 [H100 SXM5 80GB] 2331 GH100 [H100 PCIe] 2336 GH100 [H100] - 2339 GH100 [H100] + 2337 GH100 [H100 SXM5 64GB] + 2339 GH100 [H100 SXM5 94GB] 233a GH100 [H800L 94GB] + 233d GH100 [H100 96GB] + 2342 GH100 [GH200 120GB] + 2343 GH100 + 2345 GH100 [GH200 480GB] 2414 GA103 [GeForce RTX 3060 Ti] 2420 GA103M [GeForce RTX 3080 Ti Mobile] 2438 GA103GLM [RTX A5500 Laptop GPU] @@ -12829,6 +12853,7 @@ 26b2 AD102GL [RTX 5000 Ada Generation] 26b5 AD102GL [L40] 26b8 AD102GL [L40G] + 26b9 AD102GL [L40S] 26f5 AD102GL [L40 CNX] 2704 AD103 [GeForce RTX 4080] 2717 GN21-X11 [GeForce RTX 4090 Laptop GPU] @@ -12839,15 +12864,18 @@ 2786 AD104 [GeForce RTX 4070] 27a0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 27b0 AD104GL [RTX 4000 SFF Ada Generation] + 27b2 AD104GL [RTX 4000 Ada Generation] 27b7 AD104GL [L16] 27b8 AD104GL [L4] 27ba AD104GLM [RTX 4000 Ada Generation Laptop GPU] 27bb AD104GLM [RTX 3500 Ada Generation Laptop GPU] 27e0 AD104M [GeForce RTX 4080 Max-Q / Mobile] 2803 AD106 [GeForce RTX 4060 Ti] + 2805 AD106 [GeForce RTX 4060 Ti 16GB] 2820 AD106M [GeForce RTX 4070 Max-Q / Mobile] 2838 AD106GLM [RTX 3000 Ada Generation Laptop GPU] 2860 AD106M [GeForce RTX 4070 Max-Q / Mobile] + 2882 AD107 [GeForce RTX 4060] 28a0 AD107M [GeForce RTX 4060 Max-Q / Mobile] 28a1 AD107M [GeForce RTX 4050 Max-Q / Mobile] 28b8 AD107GLM [RTX 2000 Ada Generation Laptop GPU] @@ -13097,7 +13125,10 @@ 5288 RTS5288 PCI Express Card Reader 5289 RTL8411 PCI Express Card Reader 1043 1457 K55A Laptop + 5760 RTS5763DL x2 NVMe SSD Controller 5762 RTS5763DL NVMe SSD Controller + 5763 RTS5763DL NVMe SSD Controller (DRAM-less) + 5765 RTS5765DL NVMe SSD Controller (DRAM-less) 8029 RTL-8029(AS) 10b8 2011 EZ-Card (SMC1208) 10ec 8029 RTL-8029(AS) @@ -15293,8 +15324,8 @@ 0102 Extended IDE Controller 0103 EX-IDE Type-B 010e PXP04 NVMe SSD - 010f NVMe Controller - 0110 NVMe SSD Controller Cx5 + 010f XG3 NVMe SSD Controller + 0110 Cx5 NVMe SSD Controller 1028 1ffb Express Flash NVMe 960G (RI) U.2 (CD5) 1028 1ffc Express Flash NVMe 1.92T (RI) U.2 (CD5) 1028 1ffd Express Flash NVMe 3.84T (RI) U.2 (CD5) @@ -16410,6 +16441,7 @@ 8331 O2 Flash Memory Card 8520 SD/MMC Card Reader Controller 8621 SD/MMC Card Reader Controller + 8760 FORESEE E2M2 NVMe SSD 1218 Hybricon Corp. 1219 First Virtual Corporation 121a 3Dfx Interactive, Inc. @@ -16767,8 +16799,9 @@ 0811 SM811 LynxE 0820 SM820 Lynx3D 0910 SM910 + 2260 SM2260 NVMe SSD Controller 2262 SM2262/SM2262EN SSD Controller - 2263 SM2263EN/SM2263XT SSD Controller + 2263 SM2263EN/SM2263XT (DRAM-less) NVMe SSD Controllers 1270 Olympus Optical Co., Ltd. 1271 GW Instruments 1272 Telematics International @@ -17556,6 +17589,8 @@ 5190 9200 ECO NVMe SSD 5191 9200 PRO NVMe SSD 5192 9200 MAX NVMe SSD + 5196 9400 PRO NVMe SSD + 5197 9400 MAX NVMe SSD 51a2 7300 PRO NVMe SSD 1344 2000 960GB U.2 1344 3000 1920GB U.2 @@ -17615,8 +17650,12 @@ 51c3 7450 PRO NVMe SSD 51c4 7450 MAX NVMe SSD 1344 3000 U.3 1600GB [MTFDKCB1T6TFS/MTFDKCC1T6TFS] - 5410 2200S NVMe SSD - 5411 2450 NVMe SSD (DRAM-less) + 5404 2210 NVMe SSD [Cobain] + 5405 2300 NVMe SSD [Santana] + 5407 3400 NVMe SSD [Hendrix] + 5410 2200S NVMe SSD [Cassandra] + 5411 2450 NVMe SSD [HendrixV] (DRAM-less) + 5413 2400 NVMe SSD (DRAM-less) 5414 3460 NVMe SSD 6001 2100AI NVMe SSD [Nitro] 1345 Arescom Inc @@ -19307,15 +19346,18 @@ 144b Verint Systems Inc. 144c Catalina Research Inc 144d Samsung Electronics Co Ltd - 1600 Apple PCIe SSD + 1600 S4LN053X01 AHCI SSD Controller(Apple slot) + 9602 RS780/RS880 PCI to PCI bridge (int gfx) a544 Exynos 8890 PCIe Root Complex a575 Exynos 7420 PCIe Root Complex a5e3 Exynos 5433 PCIe Root Complex a800 XP941 PCIe SSD + a801 S4LN058A01[SSUBX] AHCI SSD Controller (Apple slot) a802 NVMe SSD Controller SM951/PM951 144d a801 PM963 2.5" NVMe PCIe SSD a804 NVMe SSD Controller SM961/PM961/SM963 144d a801 SM963 2.5" NVMe PCIe SSD + a806 NVMe SSD SM0032L a808 NVMe SSD Controller SM981/PM981/PM983 144d a801 SSD 970 EVO 1d49 403b Thinksystem U.2 PM983 NVMe SSD @@ -19341,6 +19383,7 @@ 1028 512d DC NVMe PM9A3 RI U.2 7.68TB 144d a813 General DC NVMe PM9A3 a80b NVMe SSD Controller PM9B1 + a80c NVMe SSD Controller S4LV008[Pascal] a820 NVMe SSD Controller 171X 1028 1f95 Express Flash NVMe XS1715 SSD 400GB 1028 1f96 Express Flash NVMe XS1715 SSD 800GB @@ -20469,6 +20512,7 @@ 43aa BCM43131 802.11b/g/n 43ae BCM43162 802.11ac Wireless Network Adapter 43b1 BCM4352 802.11ac Wireless Network Adapter + 1043 85ba PCE-AC56 Dual-Band Wireless PCI-E Adapter 43ba BCM43602 802.11ac Wireless LAN SoC 43bb BCM43602 802.11ac Wireless LAN SoC 43bc BCM43602 802.11ac Wireless LAN SoC @@ -20594,7 +20638,8 @@ d804 BCM58804 Stingray 100Gb Ethernet SoC f800 BCM78800 Switch ASIC [Trident5-X12] f900 BCM78900 Switch ASIC [Tomahawk5] - f903 BCM78903 Switch ASIC [Tomahawk6] + f902 BCM78902 Switch ASIC [Tomahawk5T] + f903 BCM78903 Switch ASIC [Tomahawk5] f905 BCM78905 Switch ASIC [Tomahawk5+] f910 BCM78910 Switch ASIC [Tomahawk6] f914 BCM78914 Switch ASIC [Tomahawk6] @@ -21410,6 +21455,7 @@ 101d MT2892 Family [ConnectX-6 Dx] 101e ConnectX Family mlx5Gen Virtual Function 101f MT2894 Family [ConnectX-6 Lx] + 193d 1035 NIC-ETH641F-LP-2P SFP28 2x25GbE PCIe Network Adapter 1020 MT28860 1021 MT2910 Family [ConnectX-7] 1023 CX8 Family [ConnectX-8] @@ -21542,18 +21588,25 @@ 5004 PC SN520 NVMe SSD 5005 PC SN520 NVMe SSD 5006 WD Black SN750 / PC SN730 NVMe SSD - 5007 PC SN530 NVMe SSD (DRAM-less) - 5008 PC SN530 NVMe SSD + 5007 IX SN530 NVMe SSD (DRAM-less) + 5008 PC SN530 NVMe SSD (DRAM-less) 5009 WD Blue SN550 NVMe SSD 15b7 5009 WD Blue SN550 NVMe SSD 500b PC SN530 NVMe SSD 1414 500b Xbox Series X 500d WD Ultrastar DC SN340 NVMe SSD 5011 WD PC SN810 / Black SN850 NVMe SSD - 5015 PC SN740 NVMe SSD - 5017 WD Black SN770 NVMe SSD + 5014 WD Green SN350 NVMe SSD 1 TB (DRAM-less) + 5015 PC SN740 NVMe SSD (DRAM-less) + 5016 WD PC SN740 NVMe SSD 512GB (DRAM-less) + 5017 WD Black SN770 / PC SN740 256GB / PC SN560 (DRAM-less) NVMe SSD + 5019 WD Green SN350 NVMe SSD 240GB (DRAM-less) 501a WD Blue SN570 NVMe SSD 1TB + 501d WD Blue SN550 NVMe SSD 2TB (DRAM-less) + 501e PC SN735 NVMe SSD (DRAM-less) + 501f WD PC SN735 NVMe SSD 512GB (DRAM-less) 5025 WD Blue SN570 NVMe SSD 2TB + 5026 WD PC SN735 NVMe SSD 1TB (DRAM-less) 5030 Western Digital WD Black SN850X NVMe SSD 15b8 ADDI-DATA GmbH 1001 APCI1516 SP controller (16 digi outputs) @@ -22637,8 +22690,11 @@ 9755 GL9755 SD Host Controller e763 GL9763E eMMC Controller 17aa Lenovo + 0003 LENSE20256GMSP34MEAT2TA + 0004 LENSE20512GMSP34MEAT2TA # 250GB nvme ssd from lenovo, can be found in Thinkpad x380 yoga 0005 LENSE30256GMSP34MEAT3TA + 0006 LENSE30512GMSP34MEAT3TA 3181 ThinkCentre M75n IoT 402b Intel 82599ES 10Gb 2-port Server Adapter X520-2 17ab Phillips Components @@ -22665,6 +22721,7 @@ 0105 MSM8998 PCIe Root Complex 0108 SM8150 PCIe Root Complex 0109 SA8195P PCIe Root Complex + 010e SC8280XP PCI Express Root Port 0300 MDM9x35 LTE Modem [Snapdragon X7] 0301 MDM9x45 LTE Modem [Snapdragon X12] 0302 MDM9x55 LTE Modem [Snapdragon X16] @@ -22674,6 +22731,8 @@ 1101 QCA6390 Wireless Network Adapter 1103 QCNFA765 Wireless Network Adapter 1104 QCN6024/9024/9074 Wireless Network Adapter + 1108 IPQ95xx/97xx PCI Express Root Port + 1109 QCN62xx/92xx Wireless Network Adapter 17cc NetChip Technology, Inc 2280 USB 2.0 17cd Cadence Design Systems, Inc. @@ -23604,6 +23663,7 @@ 16ff OX16C954 HOST-B 1987 Phison Electronics Corporation 5007 E7 NVMe Controller + 5008 E8 PCIe3 NVMe Controller 5012 E12 NVMe Controller 5013 PS5013 E13 NVMe Controller 5016 E16 PCIe4 NVMe Controller @@ -23661,6 +23721,7 @@ 103c 3315 NC553i 10Gb 2-port FlexFabric Converged Network Adapter 103c 337b NC554FLB 10Gb 2-port FlexFabric Converged Network Adapter 0800 ServerView iRMC HTI +19a4 Owl Cyber Defense Solutions 19a8 DAQDATA GmbH 19ac Kasten Chase Applied Research 0001 ACA2400 Crypto Accelerator @@ -23893,7 +23954,8 @@ 0050 FlashMAX III 1a84 Commex Technologies 0001 Vulcan SP HT6210 10-Gigabit Ethernet (rev 02) -1a88 MEN Mikro Elektronik +# nee MEN Mikro Elektronik +1a88 Duagon AG 4d45 Multifunction IP core 1a8a StarBridge, Inc. 1a8c Verigy Pte. Ltd. @@ -24128,6 +24190,7 @@ 000c QEMU PCIe Root port 000d QEMU XHCI Host Controller 0010 QEMU NVM Express Controller + 0013 QEMU UFS Host Controller 0100 QXL paravirtual graphic card 1af4 1100 QEMU Virtual Machine 1b37 Signal Processing Devices Sweden AB @@ -24170,7 +24233,7 @@ 1028 2112 BOSS-N1 Monolithic 1028 2113 BOSS-N1 Modular 1028 2151 BOSS-N1 Modular ET - 1028 2196 ROR-N100 + 1028 2196 ROR-N1 1b4b 2241 Santa Cruz NVMe Host Adapter 1d49 0306 ThinkSystem M.2 NVMe 2-Bay RAID Enablement Kit 1d49 0307 ThinkSystem 7mm NVMe 2-Bay Rear RAID Enablement Kit @@ -24241,7 +24304,9 @@ d430 D410/430 Quad-port E1/T1 card 1b79 Absolute Analysis 1b85 OCZ Technology Group, Inc. - 1041 RevoDrive 3 X2 PCI-Express SSD 240 GB (Marvell Controller) + 1021 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 1041 RevoDrive 3 X2 PCIe SSD 240 GB (Marvell SAS Controller) + 4018 Z Drive 6000/6300 NVME SSD 6018 RD400/400A SSD 8788 RevoDrive Hybrid 1b94 Signatec / Dynamic Signals Corp @@ -24371,7 +24436,8 @@ # Nytro 5360S (Rocinante Single Port) TCG - E3.S 1bb1 0180 Nytro 5360S TCG - E3.S 1bb1 01a1 Nytro XP7102 - 5012 FireCuda 510 SSD + 5012 FireCuda/IronWolf 510 SSD + 5013 BarraCuda Q5 NVMe SSD (DRAM-less) 5016 FireCuda 520 SSD 5018 FireCuda 530 SSD 1bb3 Bluecherry @@ -24390,7 +24456,7 @@ 0004 MAX4 1bc0 Innodisk Corporation 1001 PCIe 3TG6-P Controller - 1002 PCIe 3TE6 Controller + 1002 PCIe 3TE6 Controller (DRAM-less) 1160 PCIe 3TE2 Controller 1321 PCIe 4TG-P Controller 1322 PCIe 4TE Controller @@ -24398,6 +24464,8 @@ 5208 PCIe 3TE7 Controller 5216 PCIe 3TE8 Controller 5236 PCIe 4TG2-P Controller +1bcd Apacer Technology + 0120 NVMe SSD Drive 960GB 1bcf NEC Corporation 001c Vector Engine 1.0 1bd0 Astronics Corporation @@ -24420,6 +24488,16 @@ 1203 NG3 Series Avionics Discrete Interface 1bd4 Inspur Electronic Information Industry Co., Ltd. 0911 Arria10_PCIe_F10A1150 + 1000 NS8600G1U160 NVME SSD + 1001 NS8600G1U320 NVME SSD + 1002 NS8600G1U640 NVME SSD + 1003 NS8500G1U192 NVME SSD + 1004 NS8500G1U384 NVME SSD + 1005 NS8500G1U768 NVME SSD + 1006 NS6610G1U160, NS6510G1U192 NVME SSD + 1007 NS6610G1U320, NS6510G1U384 NVME SSD + 100c NS8510G1Uxxx, NS8610G1Uxxx NVME SSD + 100e NS8500G2Uxxxx, NS8600G2Uxxxx NVME SSD 1bee IXXAT Automation GmbH 0003 CAN-IB200/PCIe 1bef Lantiq @@ -24427,6 +24505,7 @@ 1bf4 VTI Instruments Corporation 0001 SentinelEX 7011 RX0xxx +1bfc Duagon AG 1bfd EeeTOP 1c00 Nanjing Qinheng Microelectronics Co., Ltd. 3252 CH382 PCIe Dual Port Serial Adapter @@ -24507,6 +24586,7 @@ # http://www.accensusllc.com/accensustelas2.html 0300 Telas 2.V 1c44 Enmotus Inc + 1100 Fuzedrive NVMe SSD 8000 8000 Storage IO Controller # A Western Digital Subsidiary 1c58 HGST, Inc. @@ -24517,6 +24597,7 @@ 0023 Ultrastar SN200 Series NVMe SSD 1c58 8823 Ultrastar Memory (ME200) 1c5c SK hynix + 1282 PC300 NVMe Solid State Drive 128GB 1283 PC300 NVMe Solid State Drive 256GB 1284 PC300 NVMe Solid State Drive 512GB 1285 PC300 NVMe Solid State Drive 1TB @@ -24524,11 +24605,15 @@ 1339 BC511 NVMe SSD 1504 PC400 NVMe SSD 1527 PC401 NVMe Solid State Drive 256GB + 1627 PC601 NVMe Solid State Drive 1639 PC611 NVMe Solid State Drive + 1739 BC701 NVMe Solid State Drive 174a Gold P31/BC711/PC711 NVMe Solid State Drive 1959 Platinum P41/PC801 NVMe Solid State Drive 1d59 BC901 NVMe Solid State Drive (DRAM-less) 2204 960GB TLC PCIe Gen3 x4 NVMe M.2 22110 + 2427 PE6010 NVMe Solid State Drive + 2429 PE6011 NVMe Solid State Drive 243b PE6110 NVMe Solid State Drive 1c5c 0100 PE6110 NVMe Solid State Drive 2839 PE8000 Series NVMe Solid State Drive @@ -24551,6 +24636,8 @@ 1028 2268 DC NVMe ISE PE8110 RI U.2 3840GB 1028 2269 DC NVMe ISE PE8110 RI U.2 7680GB 1c5c 0101 PE81x0 U.2/3 NVMe Solid State Drive + 284a PE8110 Series NVMe Solid State Drive + 2a49 PE9110 Series NVMe Solid State Drive 1c5f Beijing Memblaze Technology Co. Ltd. 000d PBlaze5 520/526 1c5f 0220 NVMe SSD PBlaze5 520 1920G AIC @@ -24656,10 +24743,19 @@ 0002 Clarett 1cb8 Dawning Information Industry Co., Ltd. 1cc1 ADATA Technology Co., Ltd. +# SX6000LNP + 2263 XPG SX6000 Lite NVMe SSD (DRAM-less) + 33f3 IM2P33F3 NVMe SSD (DRAM-less) 33f8 IM2P33F8ABR1 NVMe SSD 5350 XPG GAMMIX S50 NVMe SSD -# 256GB NVMe SSD - 5766 ADATA XPG GAMMIXS1 1L Media + 5762 FALCON NVMe SSD + 5766 ADATA XPG GAMMIXS1 1L Media (256 GB SSD) + 612a LEGEND 750 NVMe SSD (DRAM-less) + 613a LEGEND 840 NVMe SSD (DRAM-less) + 621a LEGEND 850 NVMe SSD (DRAM-less) + 622a LEGEND 960 NVMe SSD + 624a LEGEND 700 NVMe SSD (DRAM-less) + 627a LEGEND 800 NVMe SSD 8201 XPG SX8200 Pro PCIe Gen3x4 M.2 2280 Solid State Drive 1cc4 Shenzhen Unionmemory Information System Ltd. 1203 NVMe SSD Controller UHXXXa series @@ -24675,8 +24771,21 @@ 1cc4 e122 NVMe SSD UH711a series U.2 1920GB 1cc4 e123 NVMe SSD UH711a series U.2 3840GB 1cc4 e124 NVMe SSD UH711a series U.2 7680GB - 17ab NVMe 256G SSD device + 17a9 RPITJ1TBVME2HWD NVMe SSD 1024GB + 17aa AH631 PCIe 3.0 NVMe SSD 512GB + 17ab AH631 PCIe 3.0 NVMe SSD 256GB + 2263 AM611 PCIe 3.0 NVMe SSD 256GB + 5008 AM610 PCIe 3.0 NVMe SSD 128GB + 5012 RPITJ512PED2OWX NVMe SSD 512GB + 6201 AM620 PCIe 3.0 NVMe SSD 128GB + 6202 AM620 PCIe 3.0 NVMe SSD 256GB + 6203 AM620 PCIe 3.0 NVMe SSD 512GB + 6204 AM620 PCIe 3.0 NVMe SSD 1024GB + 6302 AM630 PCIe 4.0 NVMe SSD 256GB 6303 AM630 PCIe 4.0 x4 NVMe SSD Controller + 6304 AM630 PCIe 4.0 NVMe SSD 1024GB + 6a03 RPETJ512MKP1QDQ PCIe 4.0 NVMe SSD 512GB (DRAM-less) + 6a14 RPEYJ1T24MKN2QWY PCIe 4.0 NVMe SSD 1024GB (DRAM-less) 1cc5 Embedded Intelligence, Inc. 0100 PCIe-CAN-02 Dual CAN bus (9-pin male). PCI Express x1. 0101 PCIe-CAN-01 Single CAN bus (9-pin male). PCI Express x1. @@ -24720,6 +24829,8 @@ 1cf0 Akitio 1cf7 Subspace Dynamics 1cfa Corsair Memory, Inc +1cfd Mangstor + 6300 MX6300 series PCIe x8 NVMe SSD 1d00 Pure Storage 1d05 Tongfang Hongkong Limited 1d0f Amazon.com, Inc. @@ -24827,6 +24938,9 @@ 0015 PM4edge 0016 PM4edge User Device 1d40 Techman Electronics (Changshu) Co., Ltd. + 5501 XC100C55-xxxx NVME SSD + 5c01 XC100C5C-xxxx, XC100E5C-xxxx NVME SSD + b100 PV100C55-xxxx NVME SSD 1d44 DPT a400 PM2x24/PM3224 1d49 Lenovo @@ -24960,6 +25074,10 @@ 1d78 7204 Aliflash V2 U.2 15mm 3.84TB NVMe SSD 1d78 7208 Aliflash V2 U.2 15mm 7.68TB NVMe SSD 1d79 Transcend Information, Inc. + 2262 NVMe PCIe SSD 220S + 2263 NVMe PCIe SSD 120S/112S (DRAM-less) + 2264 NVMe PCIe SSD 250H + 5766 NVMe PCIe SSD 110Q (DRAM-less) 1d7c Aerotech, Inc. # Fiber-optic HyperWire motion control bus from Aerotech. 0001 HyperWire Adapter @@ -25015,9 +25133,12 @@ 0001 Colossus GC2 [C2] 0002 Colossus GC1 [S1] 1d97 Shenzhen Longsys Electronics Co., Ltd. + 1062 Lexar NM710 NVME SSD 1d97 Lexar NM620 NVME SSD (DRAM-less) 2263 SM2263EN/SM2263XT-based OEM SSD 2269 Lexar NM760 NVME SSD (DRAM-less) + 5216 Lexar NM620 NVME SSD (DRAM-less) + 5236 Lexar NM800 PRO NVME SSD # nee Facebook, Inc. 1d9b Meta Platforms, Inc. 0010 Networking DOM Engine @@ -25037,6 +25158,8 @@ # PCIe accelerator card for Deep Learning training tasks 1020 Gaudi2 AI Training Accelerator 1da8 Corigine, Inc. + 3800 Network Flow Processor 3800 + 3803 Network Flow Processor 3800 Virtual Function 1dad Fungible 1db2 ATP ELECTRONICS INC 1db7 Phytium Technology Co., Ltd. @@ -25064,6 +25187,9 @@ dc3c GPU_DMA Controller [X100 Series] 1dbb NGD Systems, Inc. 1dbe INNOGRIT Corporation + 5216 NVMe SSD Controller IG5216 (DRAM-less) + 5220 NVMe SSD Controller IG5220 (DRAM-less) + 5236 NVMe SSD Controller IG5236 5636 NVMe DC SSD IG5636 1dbe 0001 DONGTING-N1 DC SSD U.2 1dbe 1001 DONGHU-Z1 DC ZNS SSD U.2 @@ -25078,6 +25204,7 @@ 1dcf Beijing Sinead Technology Co., Ltd. 1dd3 Sage Microelectronics Corp. 1dd4 Swissbit AG + 0010 N-10m2 NVMe SSD 1dd8 AMD Pensando Systems 0002 DSC2 Elba Upstream Port 1dd8 5001 DSC2-200 50/100/200G 2-port 32G RAM 64G eMMC G2 Services Card @@ -25231,6 +25358,8 @@ 8003 RCEC PF 8004 RCEC VF 1dee Biwin Storage Technology Co., Ltd. + 2262 HP EX950 NVMe SSD + 2263 HP EX900 NVMe SSD (DRAM-less) 1def Ampere Computing, LLC e005 eMAG PCI Express Root Port 0 e006 eMAG PCI Express Root Port 1 @@ -25305,6 +25434,8 @@ 0208 ACE-NIC100RN Programmable Network Accelerator 1df3 0000 Maintenance Mode 1df3 0001 ENA2100RN +1df5 Shenzhen TIGO Semiconductor + 1202 kimtigo NVMe SSD (DRAM-less) 1df7 opencpi.org 0001 ml605 0002 alst4 @@ -25321,7 +25452,7 @@ 1dfc JSC NT-COM 1181 TDM 8 Port E1/T1/J1 Adapter 1e0f KIOXIA Corporation - 0001 NVMe SSD Controller BG4 + 0001 NVMe SSD Controller BG4 (DRAM-less) 0007 NVMe SSD Controller Cx6 1028 2078 DC NVMe CD6 RI 960GB 1028 2079 DC NVMe CD6 RI 1.92TB @@ -25343,9 +25474,13 @@ 1028 210f Dell Ent NVMe FIPS CM6 MU 3.2TB 1028 2110 Dell Ent NVMe FIPS CM6 MU 6.4TB 1e0f 0001 Generic NVMe CM6 + 0008 RD500/Exceria Plus/Exceria Plus G2 NVMe SSD 0009 NVMe SSD 1e0f 0001 Toshiba RC500 Series NVMe SSD 1e0f 0032 KIOXIA EXCERIA RC10 Series NVMe SSD + 000c NVMe SSD Controller BG5 (DRAM-less) + 000d NVMe SSD Controller XG7 + 0010 NVMe SSD Controller XG8 0011 NVMe SSD Controller CD7 1028 2189 DC NVMe SED CD7 RI 960GB 1028 218a DC NVMe CD7 RI 960GB @@ -25392,6 +25527,7 @@ 1028 2247 Ent NVMe CM7 E3.S MU 6.4TB 1028 2248 Ent NVMe CM7 E3.S MU 3.2TB 1028 2249 Ent NVMe CM7 E3.S MU 1.6TB + 0018 Exceria Pro NVMe SSD 001f NVMe SSD Controller CD8 1028 2223 DC NVMe CD8 U.2 SED 15.36TB 1028 2224 DC NVMe CD8 U.2 SED 7.68TB @@ -25428,6 +25564,16 @@ 8001 I20 [CloudBlazer] 8011 I10 [CloudBlazer] 8012 I10L [CloudBlazer] +# HHHL PCIe card, single slot, 3rd generation from Enflame + 8031 S6 [Enflame] +# HHHL PCIe card, single slot, 3rd generation from Enflame, 24GB device memory + 8032 S6 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame + c031 S30 [Enflame] +# HHHL PCIe card, dual slot, 3rd generation from Enflame + c032 S60 [Enflame] +# FHFL PCIe card, single slot, 3rd generation from Enflame, 48GB device memory + c033 S30 [Enflame] # nee Thinci, Inc 1e38 Blaize, Inc 0102 Xplorer X1600 @@ -25506,11 +25652,20 @@ 1e3b 008b Enterprise NVMe SSD HHHL 1.6TB (H3900) 1e3b 0091 Enterprise NVMe SSD HHHL 0.75TB (H3900) 1333 Haishen5 NVMe SSD + 1e3b 0081 Enterprise NVMe SSD U.2 3.84TB (H5100) + 1e3b 0082 Enterprise NVMe SSD U.2 7.68TB (H5100) + 1e3b 0084 Enterprise NVMe SSD U.2 3.2TB (H5300) + 1e3b 0085 Enterprise NVMe SSD U.2 6.4TB (H5300) 1e3d Burlywood, Inc 1e44 Valve Software 1e49 Yangtze Memory Technologies Co.,Ltd + 0001 ZHITAI PC005 NVMe SSD 0021 ZHITAI TiPro5000 NVMe SSD 0041 ZHITAI TiPro7000 + 0071 ZHITAI TiPlus7100 +# YMTC + 1001 PC005 NVMe SSD + 1011 PC210 NVMe SSD # YMTC PCIe/NVMe SSD 1013 PC210 1e4b MAXIO Technology (Hangzhou) Ltd. @@ -25561,6 +25716,7 @@ 1e81 a213 NVMe SSD UHXXXa series U.2 3200GB 1e81 a214 NVMe SSD UHXXXa series U.2 6400GB 1e81 f123 NVMe SSD TP6500 series U.2 3840GB + 6206 AM620 NVMe SSD 1e83 Huaqin Technology Co.Ltd 1e85 Heitec AG 1e89 ID Quantique SA @@ -25573,6 +25729,8 @@ 1002 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1e95 1101 NVMe SSD [3DNAND] 2.5" U.2 (LJ1) 1ea0 5636 TP1500 Series U.2 NVMe Datacenter SSD + 1003 CLR-8W512 NVMe SSD M.2 (DRAM-less) + 1007 CL4-8D512 NVMe SSD M.2 (DRAM-less) 9100 CL1-3D256-Q11 NVMe SSD M.2 1e96 Drut Technologies Inc. 1e9f Lynxi Technologies Co., Ltd. @@ -25585,7 +25743,7 @@ 224a IPA-PE224A CXL to Gen-Z Bridge [Sphinx] 1eab Hefei DATANG Storage Technology Co.,LTD. 300a NVMe SSD Controller 300A - 300b NVMe SSD Controller 300B + 300b NVMe SSD Controller 300B (DRAM-less) 1eac Quectel Wireless Solutions Co., Ltd. 1001 EM120R-GL LTE Modem 1002 EM160R-GL LTE Modem @@ -25652,12 +25810,16 @@ 0201 MTT S80 0202 MTT S70 0203 MTT S60 - 0211 G2D40 + 0211 MTT X200 0221 G2S80 0222 MTT S3000 0223 G2S4 0251 G2N10 02ff MTT HDMI/DP Audio + 0300 MTT S90 Engineering Sample + 0301 MTT S90 + 0323 MTT S4000 + 03ff MTT HDMI/DP Audio 1ed8 Digiteq Automotive 0101 FG4 PCIe Frame Grabber 1ed9 Myrtle.ai @@ -25714,6 +25876,8 @@ 5220 IG5220-Based NVMe SSD 5236 IG5236-Based NVMe SSD 5636 IG5636-Based NVMe SSD +1f0a Motorcomm Microelectronics. + 6801 YT6801 Gigabit Ethernet Controller 1f0f NebulaMatrix Technology 1041 D1055AS vDPA Ethernet Controller 1f0f 0001 D1055AS vDPA Ethernet Controller @@ -25744,6 +25908,8 @@ 1f2f 6115 KM660 U.2 3.2TB NVMe SSD 1f2f 6116 KM560 U.2 3.84TB NVMe SSD 1f2f 6118 KM560 U.2 7.68TB NVMe SSD +1f31 Nextorage + 4512 Nextorage NE1N NVMe SSD 1f3f 3SNIC Ltd 2100 SSSHBA SAS/SATA HBA 1f3f 0120 HBA 32 Ports @@ -25783,6 +25949,7 @@ 9032 SSSNIC SDI5.1 1f3f 00a1 Dual Port 100GE SDI5.1 1f40 Netac Technology Co.,Ltd + 2263 NVMe SSD (DRAM-less) 1f44 VVDN Technologies Private Limited 1f4b Axera Semiconductor Co., Ltd 1f52 MangoBoost Inc. @@ -25890,6 +26057,14 @@ 1fd4 SUNIX Co., Ltd. 0001 Matrix multiport serial adapter 1999 Multiport serial controller +1fde Kratos Defense & Security Solutions, Inc. + 1125 OpenEdge 1125P + 2500 OpenEdge 2500P +1fe0 Allwinmeta Co., Ltd. + 1010 AWM 1 + 2000 AWM 2 + 2010 AWM 2-M +1fe4 HippStor Technology 2000 Smart Link Ltd. 2800 SmartPCI2800 V.92 PCI Soft DFT 2001 Temporal Research Ltd @@ -25909,13 +26084,24 @@ 2010 8142 100VG/AnyLAN 2646 Kingston Technology Company, Inc. 0010 HyperX Predator PCIe AHCI SSD - 2262 KC2000 NVMe SSD +# KC2000 and KC2500 share the same DID + 2262 KC2000/KC2500 NVMe SSD 2263 A2000 NVMe SSD 5008 U-SNS8154P3 NVMe SSD + 500b DC1000M NVMe SSD + 500c OM8PCP Design-In PCIe 3 NVMe SSD (DRAM-less) 500d OM3PDP3 NVMe SSD - 500e SNVS2000G [NV1 NVMe PCIe SSD 2TB] - 5012 DC1500M U.2 Enterprise SSD - 5013 FURY Renegade NVMe SSD + 500e NV1 NVMe SSD + 5010 OM8SBP NVMe PCIe SSD (DRAM-less) + 5012 DC1500M NVMe SSD +# KC3000 and Renegade share the same DID + 5013 KC3000/Renegade NVMe SSD + 5014 Design-In PCIe 4 NVMe SSD (TLC) + 5016 OM3PGP4 NVMe SSD + 501b OM8PGP4 NVMe PCIe SSD (DRAM-less) + 501d NV2 NVMe PCIe 4 SSD 500GB (DRAM-less) + 501f FURY Renegade NVMe SSD with heatsink + 5021 Design-In PCIe 4 NVMe SSD (QLC) 270b Xantel Corporation 270f Chaintech Computer Co. Ltd 2711 AVID Technology Inc. @@ -27193,6 +27379,7 @@ 0960 80960RP (i960RP) Microprocessor/Bridge 0962 80960RM (i960RM) Bridge 0964 80960RP (i960RP) Microprocessor/Bridge + 0975 Optane NVME SSD H10 with Solid State Storage [Teton Glacier] 0998 Ice Lake IEH 09a2 Ice Lake Memory Map/VT-d 09a3 Ice Lake RAS @@ -27200,6 +27387,7 @@ 09a6 Ice Lake MSM 09a7 Ice Lake PMON MSM 09ab RST VMD Managed Controller + 09ad Optane NVME SSD H20 with Solid State Storage [Pyramid Glacier] 09c4 PAC with Intel Arria 10 GX FPGA 0a03 Haswell-ULT Thermal Subsystem 0a04 Haswell-ULT DRAM Controller @@ -28923,6 +29111,7 @@ 15fb Ethernet Connection (13) I219-LM 15fc Ethernet Connection (13) I219-V 15ff Ethernet Controller X710 for 10GBASE-T + 1014 0000 PCIe3 4-port 10GbE Base-T Adapter 1137 0000 X710TLG GbE RJ45 PCIe NIC 1137 02c1 X710T2LG 2x10 GbE RJ45 PCIe NIC 1137 02c2 X710T4LG 4x10 GbE RJ45 PCIe NIC @@ -30436,6 +30625,7 @@ 2522 NVMe Optane Memory Series 8086 3806 Optane Memory 16GB 8086 3810 Optane Memory M10 16GB + 2525 Optane NVME SSD P1600X Series 2526 Wireless-AC 9260 2530 82850 850 (Tehama) Chipset Host Bridge (MCH) 1028 00c7 Dimension 8100 @@ -32555,9 +32745,17 @@ 34aa Ice Lake-LP Serial IO SPI Controller #0 34ab Ice Lake-LP Serial IO SPI Controller #1 34b0 Ice Lake-LP PCI Express Root Port #9 + 34b1 Ice Lake-LP PCIe Port #10 + 34b4 Ice Lake-LP PCIe Port #13 + 34b5 Ice Lake-LP PCIe Port #14 34b7 Ice Lake-LP PCI Express Root Port #16 + 34b8 Ice Lake-LP PCIe Port #1 34ba Ice Lake-LP PCI Express Root Port #3 + 34bb Ice Lake-LP PCIe Port #4 34bc Ice Lake-LP PCI Express Root Port #5 + 34bd Ice Lake-LP PCIe Port #6 + 34be Ice Lake-LP PCIe Port #7 + 34bf Ice Lake-LP PCIe Port #8 34c4 Ice Lake-LP SD Host Controller 34c5 Ice Lake-LP Serial IO I2c Controller #4 34c6 Ice Lake-LP Serial IO I2c Controller #5 @@ -33348,13 +33546,29 @@ 8086 1216 WiMAX/WiFi Link 5150 ABG 8086 1311 WiMAX/WiFi Link 5150 AGN 8086 1316 WiMAX/WiFi Link 5150 ABG - 4389 WM590 Chipset LPC Controller - 438b Tiger Lake-H LPC/eSPI Controller + 4384 Q570 LPC/eSPI Controller + 4385 Z590 LPC/eSPI Controller + 4386 H570 LPC/eSPI Controller + 4387 B560 LPC/eSPI Controller + 4388 H510 LPC/eSPI Controller + 4389 WM590 LPC/eSPI Controller + 438a QM580 LPC/eSPI Controller + 438b HM570 LPC/eSPI Controller + 438c C252 LPC/eSPI Controller + 438d C256 LPC/eSPI Controller + 438e H310D LPC/eSPI Controller + 438f W580 LPC/eSPI Controller + 4390 RM590E LPC/eSPI Controller + 4391 R580E LPC/eSPI Controller 43a3 Tiger Lake-H SMBus Controller 43a4 Tiger Lake-H SPI Controller 43b0 Tiger Lake-H PCI Express Root Port #9 + 43b8 Tiger Lake-H PCIe Root Port #1 43ba Tiger Lake-H PCIe Root Port #3 + 43bb Tiger Lake-H PCIe Root Port #4 43bc Tiger Lake-H PCI Express Root Port #5 + 43c0 Tiger Lake-H PCIe Root Port #17 + 43c7 Tiger Lake-H PCIe Root Port #24 43c8 Tiger Lake-H HD Audio Controller 43d3 Tiger Lake SATA AHCI Controller 43e0 Tiger Lake-H Management Engine Interface @@ -33436,6 +33650,9 @@ 193d 4000 UN-GPU-XG310-32GB-FHFL 4908 DG1 [Iris Xe Graphics] 4909 DG1 [Iris Xe MAX 100] + 4940 4xxx Series QAT + 4942 4xxx Series QAT + 4944 4xxx Series QAT 4b00 Elkhart Lake eSPI Controller 4b23 Elkhart Lake SMBus Controller 4b24 Elkhart Lake SPI (Flash) Controller @@ -33524,6 +33741,7 @@ 5182 Alder Lake PCH eSPI Controller 1028 0b10 Precision 3571 5187 Alder Lake LPC Controller + 519d Raptor Lake LPC/eSPI Controller 51a3 Alder Lake PCH-P SMBus Host Controller 1028 0b10 Precision 3571 51a4 Alder Lake-P PCH SPI Controller @@ -33538,6 +33756,7 @@ 51c6 Alder Lake-P Serial IO I2C Controller #1 51c8 Alder Lake PCH-P High Definition Audio Controller 1028 0b10 Precision 3571 + 51ca Raptor Lake-P/U/H cAVS 51cc Alder Lake Smart Sound Technology Audio Controller 51d3 Alder Lake-P SATA AHCI Controller 1028 0b10 Precision 3571 @@ -33564,12 +33783,14 @@ *** 175 LINES SKIPPED *** From nobody Wed Sep 6 12:28:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RghW65768z4rv1F; Wed, 6 Sep 2023 12:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RghW64dm0z3JPn; Wed, 6 Sep 2023 12:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694003330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FmAC1/2UxDaP8S9/uoAJYoYFu7eaXZy6D0wkt5VstoM=; b=wcywX8IbTq31zDpgItCUpEa8e7nzuCMT+eESwbs1OuHPk7Dns1du+pE+WuC1pxRICLjcCB h+NUJRDeWszN8hXnKkIUjgVHWMyj8GDNCsFw+G0NHnXlYAMaUO+J38uhw0oYAs1lvNOIEd 9O3tFklpPaK3zT6ChGv00vdNiYplYTn0Vj4ls4+M8aSXjiPTvxVLbTISI0JiJqEzBhszfE ZXTLNXIqm5t1LYrvF7SyVP9Ju0FEK+5OUK0bRbvfpWM+vsaksQx/6OvsE8x+wMP/uf9Rq5 r7fu1vBlzH6AuEo3vzr3wyYbI0Hbb1B2L5Tsvg0Vonmllpq9z795UAq/QCAs8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694003330; a=rsa-sha256; cv=none; b=gk2Jpaf9OgVQhiG97P3G7KRUGHbAAutnxEq4w+4lkFCIGhzAD1pilmlJZGwmZaqWku4heT lvuRJhfYGMiDkgaAd8mHqAOA9XjVwaBJNzjkN2MQT2hibs6B4pOHYNgTv4lZpzBh1ULHuR 9UzfZ6JMpqdZyK9Ejj5OOdH3ORhn7SQIGxObvLWfzDGnj5qKzZ1mVfbmt1aLkytbfXLNXS S+sFzs/wdPlGMCXP9A/FOuXO188QMeAy/AiDv1eC1VebPtcsuQry2qfR1Jivf/2CI3gyRC MdoUQZQD8DmNhwUwzepol+Wy4Hb7LqGEd6GHa+JfCHihmWhgUO637PlzPVL+0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694003330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FmAC1/2UxDaP8S9/uoAJYoYFu7eaXZy6D0wkt5VstoM=; b=ZIpz9TXrlhuazid4fVFGFj9U+zQb7kOjp303meusRyfqayHB3V2SJjaTt6WaHbQbQPx8qO qGR+vd8cl/f8Ky5w+cNroHts1UPIU53CO+Uith8BvAp9kZQwl9AJZ7Zm3jozxEcVwnz4xw towThPfvODDans/U4e5N2Fxf9sW7dak6KAn59uVGhHLK+UmxcWgkXiIFO+qAwcqWVUmlXc CebiCj5ICHcgmD2SsdkEDJ9jWIJZxopbrLCUxAojIwodWHytO3VLarLZsClrE+3QnhEIVC ABoJ+k9v34vZKrr3cwZe2n4vi3sCnKD+yxNN8NSj9a2FNy/cgUeNYisElsSQGw== 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 4RghW63k6Cz1rg; Wed, 6 Sep 2023 12:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386CSolR071291; Wed, 6 Sep 2023 12:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386CSoYT071288; Wed, 6 Sep 2023 12:28:50 GMT (envelope-from git) Date: Wed, 6 Sep 2023 12:28:50 GMT Message-Id: <202309061228.386CSoYT071288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 969071be938c - main - vfs: copy_file_range() between multiple mountpoints of the same fs type List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 969071be938ca9b96f8dff003c7b43d6308849f1 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=969071be938ca9b96f8dff003c7b43d6308849f1 commit 969071be938ca9b96f8dff003c7b43d6308849f1 Author: Martin Matuska AuthorDate: 2023-09-06 11:58:10 +0000 Commit: Martin Matuska CommitDate: 2023-09-06 12:28:23 +0000 vfs: copy_file_range() between multiple mountpoints of the same fs type VOP_COPY_FILE_RANGE(9) is now caled when source and target vnodes reside on the same filesystem type (not just on the same mountpoint). The check if vnodes are on the same mountpoint must be done in the filesystem code. There are currently only three users - fusefs(5) already has this check, ZFS can handle multiple mountpoints and a check has been added to NFS client. ZFS block cloning is now possible between all snapshots and datasets of the same ZFS pool. MFC after: 1 week Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41721 --- share/man/man9/VOP_COPY_FILE_RANGE.9 | 4 ++-- sys/fs/nfsclient/nfs_clvnops.c | 7 +++++-- sys/kern/vfs_vnops.c | 8 +++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/share/man/man9/VOP_COPY_FILE_RANGE.9 b/share/man/man9/VOP_COPY_FILE_RANGE.9 index 9243210cb265..aa17670954f4 100644 --- a/share/man/man9/VOP_COPY_FILE_RANGE.9 +++ b/share/man/man9/VOP_COPY_FILE_RANGE.9 @@ -28,8 +28,8 @@ .Os .Sh NAME .Nm VOP_COPY_FILE_RANGE -.Nd copy a byte range from one file to another or within one file -in a single file system +.Nd copy a byte range within a file or from one file to another in a single +file system or between multiple file systems .Sh SYNOPSIS .In sys/param.h .In sys/vnode.h diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 1fa287a79a84..383d45ba260b 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3898,8 +3898,11 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) off_t inoff, outoff; bool consecutive, must_commit, tryoutcred; - /* NFSv4.2 Copy is not permitted for infile == outfile. */ - if (invp == outvp) { + /* + * NFSv4.2 Copy is not permitted for infile == outfile. + * TODO: copy_file_range() between multiple NFS mountpoints + */ + if (invp == outvp || invp->v_mount != outvp->v_mount) { generic_copy: return (vn_generic_copy_file_range(invp, ap->a_inoffp, outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 9fb5aee6a023..4e4161ef1a7f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3076,12 +3076,14 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, goto out; /* - * If the two vnode are for the same file system, call + * If the two vnodes are for the same file system type, call * VOP_COPY_FILE_RANGE(), otherwise call vn_generic_copy_file_range() - * which can handle copies across multiple file systems. + * which can handle copies across multiple file system types. */ *lenp = len; - if (invp->v_mount == outvp->v_mount) + if (invp->v_mount == outvp->v_mount || + strcmp(invp->v_mount->mnt_vfc->vfc_name, + outvp->v_mount->mnt_vfc->vfc_name) == 0) error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, lenp, flags, incred, outcred, fsize_td); else From nobody Wed Sep 6 13:55:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgkQb2N5dz4sgjN; Wed, 6 Sep 2023 13:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgkQb1vScz3f6M; Wed, 6 Sep 2023 13:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YHY8wXA/0eX/gCelXrF21JTU+6bafy3hbPJ0NCRAGZc=; b=yEXTl7juvyVAJTbeBwMsKz4PvDsvMD6HBMIg5IG6vP+eTmpT2E/tXD2cfjPItjJN5qiGQQ e02U0HgkchK2BVqFA8JCxgTDZ5fFD8xmmQ+XfGexE59bLF0ClitLZlE+QX4RRxnsmw8GxE 8PXNfI8UTsK8CICd18BnSpL1BF1JmDlJAxsqi++pHp6w1L0cYAnmrZe6Pbh1O5JYxJwAo2 n6LXQCZ4BXR5ZT1d5gXgyy/KCOydTo9WozAyhlg7CwH72iM5Uqyo7lMLwmUiue6t+HJNTo fnJHg/65y094NJdbxE5wVQEdiuGLZ0zKW7FIigYUUpMZp2zkvyUGHTkVdxMwcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694008503; a=rsa-sha256; cv=none; b=cjRC+FQ7GGh95D7owUX8uSM7gTXdZZzIsNMqQtB1xAXshetDDdaKhOU0DfOJx6cpciTuoN xtTzQhpusgIdb6fsQUf4jo4rckVwvi2ks5puaz88gUJdhQuR9hObFxqPSwdU7/f6YHBBv4 DGqypPu7oC2hJbH1S/uovG6UMqFE2c/tJ0OBZogncrnEJFIuLdShJbinBk00V5xnp4xZF6 1qQVkvMKN1EtKr6HFTLgPyb12OXW0Ge47xEjueU06hLY/0duZInxHLfG7Oxw+hW/yYd+LH fIl7YdgG8Pkf/osSxJZodwnm2q7Vfjpkj9uxD2B5ljjHiOZZQmxCZlNaKflk3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YHY8wXA/0eX/gCelXrF21JTU+6bafy3hbPJ0NCRAGZc=; b=yHxPxX6/1D5GeYBibN4jmphmNnBFcAtttlGI5B23E4r0sLr7pwc1HhDsZJvP7WROIDndgR lFG+gDebFE4Z6tdCCZwZRrOVUho5EAPgz6HAyfLN5V/hJSOqPyCs3YXcBNVeQmrq+Kl304 lJA7znZ1o31weep6q+1KqGL7mWU54R2JLsjm2XdMqPAcGYOjhy6vyMJMOa/wdLYZ5atLPa y4k0NuLoCsDg/hFOVR2+sfIcAMHaXqD96CsmqPZLMt2vMakK7VHgC40EYpYL+fGuelPlZL ls30mkOJp8g1mwRQaFfLuHABv94qfwBCwJwhsQWvt9KAvesXpfAVuZMvIPPp1A== 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 4RgkQb0zM7z45X; Wed, 6 Sep 2023 13:55:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Dt34E019495; Wed, 6 Sep 2023 13:55:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Dt3vf019492; Wed, 6 Sep 2023 13:55:03 GMT (envelope-from git) Date: Wed, 6 Sep 2023 13:55:03 GMT Message-Id: <202309061355.386Dt3vf019492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 56e3123fc864 - main - libcasper: reference system.fileargs service List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 56e3123fc864b6d08ee5b3752538d2f9be52027b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=56e3123fc864b6d08ee5b3752538d2f9be52027b commit 56e3123fc864b6d08ee5b3752538d2f9be52027b Author: Ed Maste AuthorDate: 2023-09-06 13:45:31 +0000 Commit: Ed Maste CommitDate: 2023-09-06 13:53:01 +0000 libcasper: reference system.fileargs service Reviewed by: oshogbo MFC after: 3 days Fixes: cdd6ea94b0a4 ("libcasper: introduce cap_fileargs...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41761 --- lib/libcasper/libcasper/libcasper.3 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/libcasper/libcasper.3 b/lib/libcasper/libcasper/libcasper.3 index c98a3044df25..ccd347232777 100644 --- a/lib/libcasper/libcasper/libcasper.3 +++ b/lib/libcasper/libcasper/libcasper.3 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 10, 2023 +.Dd September 6, 2023 .Dt LIBCASPER 3 .Os .Sh NAME @@ -212,6 +212,8 @@ Casper supports the following services in the base system: .Bl -tag -width "system.random" -compact -offset indent .It system.dns provides libc compatible DNS API +.It system.fileargs +provides an API for opening files specified on a command line .It system.grp provides a .Xr getgrent 3 @@ -272,6 +274,7 @@ functions always succeed. .Xr poll 2 , .Xr select 2 , .Xr cap_dns 3 , +.Xr cap_fileargs 3 , .Xr cap_grp 3 , .Xr cap_net 3 , .Xr cap_netdb 3 , From nobody Wed Sep 6 14:01:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgkZ60gRlz4skMq; Wed, 6 Sep 2023 14:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgkZ6088Yz3gcG; Wed, 6 Sep 2023 14:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hKRpiqUaH3c0Ii+fvK0pM2KerDxdiKcmppqxPAkLYKk=; b=EbhWejEnd3QaPScDLsT+8xcgKpfgNRsRagZ2lHRChsmhKHSrglGJwHrCZGXu7/2QhUoUd6 TmicAMeqjQh3zZBOo2krFmmFALIYppGngjz6qhkz9kMafgdCtOenmPIqRhfVpst/bSr9XG uS7A1Y0Wuj1/+k3dlvAjOSgVwE4viZZscRIOvRQ5QOAPiu4a2fn238L+suB7QwjGUIi+5U djR24cOIcdH6UvzrOTEJa4kFoUjo5UUdoIJmNFuhpEPv1L+CsAYwFdAyXY7vQJv1iiDOfp p4w0H+mnN4y35QMpqBoVEHVdBHNXoaxhd7QqhTxfuypvr7MeqW8pj+2tY7auKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694008894; a=rsa-sha256; cv=none; b=hmrEnF0DCiPhsn85g7jn3jFnlIrtML77pJFOYZQMUpZV8hcReScpFqVoqncTk+VbssC3Ek 2VYWhAF04ninI9BKMP576H/kSnOso6eO3PlHi0zXA31wI1OkRFStDGqONLVIbxsiK0G14e rpuzGm9xhdUzwN3FmTyPeeRoPWYqLydI0Qyf+XhNTFrZWLzxRuLFCtHQwFZ+C54N5DmQu+ Mkp/KXKGeG04jgaGfwOtIQzV21HotZGGMqcfcqRUkxCgk2eWFk+x1DmsruMxVRTjL1iI40 oq+hgDbn4JE2zPnLR3U6IQOtrvwMTlFEeb7rv8WxA5V12BAOGE2AZhHkDEZbSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hKRpiqUaH3c0Ii+fvK0pM2KerDxdiKcmppqxPAkLYKk=; b=WyrSblsikBZaNIxKjpesKCzQGErnGqL9MT3FGv10RyiiKWM5POQjkiLF2z67KOHI5MPyin i+BrEYMU/615GHv5ir+RHcsAdgUdfddHuBgZFpQyrrIS61jx1GL9J4Dim/yNEijEyH9pG9 wT/IdMagADk0/ws97raBtsHhNRv1ZLxJKRUPe+NH57GMUiFP52HAcP1U/uUkg4YnIzyxoc l3t+5DpeKHc7XuhpcA90l7/1GH/YSdE8EupHJAqpLmP6nfGcHcVwS/TbqnkjIsQyOo6NMS 3GHTuYS1rsWnaKa0QUrS2XmoD/OTiyjjy2RQgqZjFMwO5BVl0vGdyZa9bk2DwQ== 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 4RgkZ56LXNz4MZ; Wed, 6 Sep 2023 14:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386E1XQc030803; Wed, 6 Sep 2023 14:01:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386E1X2p030800; Wed, 6 Sep 2023 14:01:33 GMT (envelope-from git) Date: Wed, 6 Sep 2023 14:01:33 GMT Message-Id: <202309061401.386E1X2p030800@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8527bb2aee6c - main - dtrace: Fix a kernel panic in printm() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8527bb2aee6ca9013c34445de88217a954b6628d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8527bb2aee6ca9013c34445de88217a954b6628d commit 8527bb2aee6ca9013c34445de88217a954b6628d Author: Domagoj Stolfa AuthorDate: 2023-09-06 13:25:00 +0000 Commit: Mark Johnston CommitDate: 2023-09-06 14:00:59 +0000 dtrace: Fix a kernel panic in printm() When using printm(), one should always pass a scratch pointer to it. This is achieved by calling printm with memref BEGIN { printm(fixed_len, memref(ptr, var_len)); } which will return a pointer to the DTrace scratch space of size sizeof(uintptr_t) * 2. However, one can easily call printm() as follows BEGIN { printm(10, (void *)NULL); } and panic the kernel as a result. This commit does two things: (1) adds a new macro DTRACE_INSCRATCHPTR(mstate, ptr, howmany) which checks if a certain pointer is in the DTrace scratch space; (2) uses DTRACE_INSCRATCHPTR() to implement a check on printm()'s DIFO return value in order to avoid the panic and sets CPU_DTRACE_BADADDR if the address is not in the scratch space. Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41722 --- .../contrib/opensolaris/uts/common/dtrace/dtrace.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c index 02a95bfab726..ce02676e0dc1 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c +++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c @@ -515,6 +515,11 @@ do { \ ((mstate)->dtms_scratch_base + (mstate)->dtms_scratch_size - \ (mstate)->dtms_scratch_ptr >= (alloc_sz)) +#define DTRACE_INSCRATCHPTR(mstate, ptr, howmany) \ + ((ptr) >= (mstate)->dtms_scratch_base && \ + (ptr) <= \ + ((mstate)->dtms_scratch_base + (mstate)->dtms_scratch_size - (howmany))) + #define DTRACE_LOADFUNC(bits) \ /*CSTYLED*/ \ uint##bits##_t \ @@ -7739,9 +7744,24 @@ dtrace_probe(dtrace_id_t id, uintptr_t arg0, uintptr_t arg1, } case DTRACEACT_PRINTM: { - /* The DIF returns a 'memref'. */ + /* + * printm() assumes that the DIF returns a + * pointer returned by memref(). memref() is a + * subroutine that is used to get around the + * single-valued returns of DIF and is assumed + * to always be allocated in the scratch space. + * Therefore, we need to validate that the + * pointer given to printm() is in the scratch + * space in order to avoid a potential panic. + */ uintptr_t *memref = (uintptr_t *)(uintptr_t) val; + if (!DTRACE_INSCRATCHPTR(&mstate, + (uintptr_t)memref, 2 * sizeof(uintptr_t))) { + *flags |= CPU_DTRACE_BADADDR; + continue; + } + /* Get the size from the memref. */ size = memref[1]; From nobody Wed Sep 6 14:01:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgkZ71CHBz4skZk; Wed, 6 Sep 2023 14:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgkZ70sdkz3gfp; Wed, 6 Sep 2023 14:01:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8SNJrznIpTKarw1R6g463fiNF29G/L4/GnyNtN9SUE=; b=m7L9we8rCR+SeDeWugMQWCyCwzVOTB0LQgEFYBk4J1XkFxizgyDNho7ZXKakHGkMb643Q5 IumrqieIC7I2kISXqfbGV9sFunuUvPJimUcMXir4WDJZ0G1GvjvqXD07YQ1RMHWNY2+wcs ivsg6JEgK3rMfT43BhGgDoIloXIzmKtp3bX+OUOtuHpdt/WKTfG8XkfFpAytlXCb6w+csn W0M2mJz3j8HBql3/XH+LQkxCMeN8jerKdJjx7VcXq7Bjl/PvDI99yyla7sbRyzJ7JPUm+2 VjxnK/b7jsHtpxj01Fpb6UZg/8pgxAWrSBc28kYgA9PMa4T2g0mj2KGCARzwCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694008895; a=rsa-sha256; cv=none; b=UryuDuZe1pOFTSW5YnXh6QEJpMcoPKdJxIyZvh9CJdHqQq/Hi5Ia6S7vCEA3B8izf8G1HM /JYC2m6R7Wrb291wKW96T95UyyHp1TWtly05Z17Z5UaC2LaejLiRrrs4pgvdxBvIvtpDws udLduk+lGA6XvjJfO0XQbrR/g0IdotvJro3LPOgJXD+K0N/bblqzJZxrYG9aIDq9+vOrJB wib3GIaYaRNMG8dy+0OuZNwAUcdTG6rsKqsj4SmkngoT2cHboS7VzVFQ2oqqkibI3amMFO gPEOhYfklBXfcrBI5tWKIrfZ/bd1YuLWh8r5lrC3xHSEB+m9vA7X48ispkBqiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694008895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8SNJrznIpTKarw1R6g463fiNF29G/L4/GnyNtN9SUE=; b=OdqhB06b8YGUje2YCSmfoQwBN+o+NvSdkoPmjSClBEBRtW3nfjEx3IaSdGfZpAvDPKl2aG U4YvMBRwHz2nT5xC34QDrVFOSoGz1+SmzjkPxesZdRQHIxz8hoqdWxcBJ/qhcpG0gDce/7 1vXq6Q2Ba/0TQ5H8vch4GhUBBi//XOF809h5YKhz1hiNZW7+CNm0pWYjBo3TcwokOaesT6 kvJWJxyrUDlMlWQ4x4udagGtYXM0wwgC6I5OiXlR2q0QZS1HS/cGlDz6hKfsSRXw3QKPdq ffN1y2VLjeFJwLCwFFugCxO6hbwvp4h2nGxGss4U5imVqYSMON5XqUyaTnRFrQ== 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 4RgkZ6745nz3l3; Wed, 6 Sep 2023 14:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386E1Ymg030851; Wed, 6 Sep 2023 14:01:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386E1YoK030848; Wed, 6 Sep 2023 14:01:34 GMT (envelope-from git) Date: Wed, 6 Sep 2023 14:01:34 GMT Message-Id: <202309061401.386E1YoK030848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 22cf89c93888 - main - qat: Intel 4xxx Series driver API extension List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22cf89c938886d14f5796fc49f9f020c23ea8eaf Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=22cf89c938886d14f5796fc49f9f020c23ea8eaf commit 22cf89c938886d14f5796fc49f9f020c23ea8eaf Author: Piotr Kasierski AuthorDate: 2023-09-06 13:51:41 +0000 Commit: Mark Johnston CommitDate: 2023-09-06 14:00:59 +0000 qat: Intel 4xxx Series driver API extension This commit introduces: - Quick Assist API update for partial decompress and zero padding. - Refactor of UIO locking. - VF driver hotplug fix. - Minor code style fixes for firmware API. Patch co-authored by: Krzysztof Zdziarski Patch co-authored by: Michal Gulbicki Patch co-authored by: Piotr Kasierski Patch co-authored by: Karol Grzadziel Sponsored by: Intel Corporation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41613 --- share/man/man4/qat.4 | 4 +- sys/dev/qat/qat_api/common/compression/dc_dp.c | 296 ++++++++++++- .../common/compression/include/dc_datapath.h | 11 + sys/dev/qat/qat_api/common/ctrl/sal_compression.c | 8 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h | 18 +- .../qat/qat_api/firmware/include/icp_qat_fw_comp.h | 486 ++++++++++----------- .../qat_api/firmware/include/icp_qat_hw_20_comp.h | 63 ++- .../firmware/include/icp_qat_hw_20_comp_defs.h | 159 ++++++- sys/dev/qat/qat_api/include/dc/cpa_dc.h | 15 +- sys/dev/qat/qat_api/include/dc/cpa_dc_dp.h | 431 ++++++++++++++++++ sys/dev/qat/qat_api/include/icp_sal_versions.h | 2 +- sys/dev/qat/qat_common/adf_ctl_drv.c | 3 +- sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 24 +- sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c | 13 +- sys/dev/qat/qat_common/adf_pfvf_vf_proto.c | 5 + sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c | 18 +- sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c | 32 +- 17 files changed, 1221 insertions(+), 367 deletions(-) diff --git a/share/man/man4/qat.4 b/share/man/man4/qat.4 index 347f257c7aec..b0fa0b0cbc92 100644 --- a/share/man/man4/qat.4 +++ b/share/man/man4/qat.4 @@ -64,8 +64,8 @@ driver supports cryptography and compression acceleration. A complete API for offloading these operations is exposed in the kernel and may be used by any other entity directly. For details of usage and supported operations and algorithms refer to the -following documentation available from -.Lk 01.org : +following documentation available from Intel Download Center +.Lk https://downloadcenter.intel.com : .Bl -bullet -compact .It .Rs diff --git a/sys/dev/qat/qat_api/common/compression/dc_dp.c b/sys/dev/qat/qat_api/common/compression/dc_dp.c index 1bc50d89365d..8b409d9ad7ca 100644 --- a/sys/dev/qat/qat_api/common/compression/dc_dp.c +++ b/sys/dev/qat/qat_api/common/compression/dc_dp.c @@ -217,6 +217,89 @@ dcDataPlaneParamCheck(const CpaDcDpOpData *pOpData) return CPA_STATUS_SUCCESS; } +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Partial-read parameters validation utility. + * + * @description + * Basic check that all partial-read related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * + *****************************************************************************/ +static CpaStatus +dcDataPlanePartReadCheck(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData) +{ + sal_compression_service_t *pService = NULL; + + LAC_CHECK_NULL_PARAM(pPartReadData); + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_COMPRESS) { + /* Decompression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + if (pPartReadData->length > pOpData->bufferLenForData) { + QAT_UTILS_LOG( + "Partial read data length can not be greater than the destination buffer size\n"); + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} + +/** + ***************************************************************************** + * @ingroup cpaDcDp + * Zero-padding parameters validation utility. + * + * @description + * Basic check that all zero-padding related parameters provided by + * caller are valid. + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * + * @retval CPA_STATUS_SUCCESS Function executed successfully + * @retval CPA_STATUS_INVALID_PARAM Invalid parameter passed in + * @retval CPA_STATUS_NOT_SUPPORTED Feature not supported + * + *****************************************************************************/ +static CpaStatus +dcDataPlaneZeroPadCheck(CpaDcDpOpData *pOpData) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + + if (!isDcGen4x(pService)) { + /* Extended features are not supported prior Gen4 */ + return CPA_STATUS_UNSUPPORTED; + } + + if (pOpData->sessDirection == CPA_DC_DIR_DECOMPRESS) { + /* Compression specific feature */ + return CPA_STATUS_INVALID_PARAM; + } + + return CPA_STATUS_SUCCESS; +} CpaStatus cpaDcDpGetSessionSize(CpaInstanceHandle dcInstance, CpaDcSessionSetupData *pSessionData, @@ -379,8 +462,60 @@ dcDpWriteRingMsg(CpaDcDpOpData *pOpData, icp_qat_fw_comp_req_t *pCurrentQatMsg) pCurrentQatMsg->comp_pars.out_buffer_sz = pOpData->bufferLenForData; } -CpaStatus -cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +/** + ***************************************************************************** + * @ingroup cpaDcDp + * + * @description + * Updates the request decryptor with optional parameters: + * - partial read specific fields + * - zero-padding specific field + * + * @param[in] pOpData Pointer to a structure containing the + * request parameters. + * @param[in] pPartReadData Pointer to a structure containing the + * partial-read request parameters. + * @param[in] zeroPadFlag Boolean indicator containing the + * zero-padding enablement flag. + * @param[in] pCurrentQatMsg Pointer to current QAT message on the ring. + * + *****************************************************************************/ +static void +dcDpUpdateRingMsg(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + icp_qat_fw_comp_req_t *pCurrentQatMsg) +{ + sal_compression_service_t *pService = NULL; + + pService = (sal_compression_service_t *)(pOpData->dcInstance); + if (!isDcGen4x(pService)) { + return; + } + + /* Partial read settings */ + if (NULL != pPartReadData) { + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_offset = pPartReadData->dataOffset; + pCurrentQatMsg->u1.partial_decompress + .partial_decompress_length = pPartReadData->length; + ICP_QAT_FW_COMP_PART_DECOMP_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_PART_DECOMP); + } + /* Zero padding settings */ + if (CPA_TRUE == zeroPadFlag) { + ICP_QAT_FW_COMP_ZEROPAD_SET( + pCurrentQatMsg->comp_pars.req_par_flags, + ICP_QAT_FW_COMP_ZEROPAD); + } +} + +static CpaStatus +dcDpEnqueueOpBase(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -392,6 +527,20 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) return status; } + if (NULL != pPartReadData) { + status = dcDataPlanePartReadCheck(pOpData, pPartReadData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + if ((CPA_FALSE == pOpData->compressAndVerify) && (CPA_DC_DIR_COMPRESS == pOpData->sessDirection)) { return CPA_STATUS_UNSUPPORTED; @@ -422,6 +571,13 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } dcDpWriteRingMsg(pOpData, pCurrentQatMsg); + if (NULL != pPartReadData || CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData, + pPartReadData, + zeroPadFlag, + pCurrentQatMsg); + } + pSessionDesc->pendingDpStatelessCbCount++; if (CPA_TRUE == performOpNow) { @@ -432,9 +588,36 @@ cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) } CpaStatus -cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, - CpaDcDpOpData *pOpData[], - const CpaBoolean performOpNow) +cpaDcDpEnqueueOp(CpaDcDpOpData *pOpData, const CpaBoolean performOpNow) +{ + + return dcDpEnqueueOpBase(pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartRead(CpaDcDpOpData *pOpData, + CpaDcDpPartialReadData *pPartReadData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, + pPartReadData, + CPA_FALSE, + performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPad(CpaDcDpOpData *pOpData, + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBase(pOpData, NULL, CPA_TRUE, performOpNow); +} + +static CpaStatus +dcDpEnqueueOpBatchBase(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartData[], + CpaBoolean zeroPadFlag, + const CpaBoolean performOpNow) { icp_qat_fw_comp_req_t *pCurrentQatMsg = NULL; icp_comms_trans_handle trans_handle = NULL; @@ -462,6 +645,21 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return status; } + if (NULL != pPartData) { + status = + dcDataPlanePartReadCheck(pOpData[i], pPartData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + + if (CPA_TRUE == zeroPadFlag) { + status = dcDataPlaneZeroPadCheck(pOpData[i]); + if (CPA_STATUS_SUCCESS != status) { + return status; + } + } + /* Check that all instance handles and session handles are the * same */ if (pOpData[i]->dcInstance != pOpData[0]->dcInstance) { @@ -516,6 +714,18 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, for (i = 0; i < numberRequests; i++) { dcDpWriteRingMsg(pOpData[i], pCurrentQatMsg); + if (pPartData) { + dcDpUpdateRingMsg(pOpData[i], + pPartData[i], + CPA_FALSE, + pCurrentQatMsg); + } + if (CPA_TRUE == zeroPadFlag) { + dcDpUpdateRingMsg(pOpData[i], + NULL, + CPA_TRUE, + pCurrentQatMsg); + } icp_adf_getQueueNext(trans_handle, (void **)&pCurrentQatMsg); } @@ -528,6 +738,34 @@ cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, return CPA_STATUS_SUCCESS; } +CpaStatus +cpaDcDpEnqueueOpBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithPartReadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + CpaDcDpPartialReadData *pPartReadData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, pPartReadData, CPA_FALSE, performOpNow); +} + +CpaStatus +cpaDcDpEnqueueOpWithZeroPadBatch(const Cpa32U numberRequests, + CpaDcDpOpData *pOpData[], + const CpaBoolean performOpNow) +{ + return dcDpEnqueueOpBatchBase( + numberRequests, pOpData, NULL, CPA_TRUE, performOpNow); +} + CpaStatus icp_sal_DcPollDpInstance(CpaInstanceHandle dcInstance, Cpa32U responseQuota) { @@ -565,3 +803,51 @@ cpaDcDpPerformOpNow(CpaInstanceHandle dcInstance) return CPA_STATUS_SUCCESS; } + +CpaStatus +cpaDcDpIsPartReadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_part_read; + + return CPA_STATUS_SUCCESS; +} + +CpaStatus +cpaDcDpIsZeroPadSupported(const CpaInstanceHandle instanceHandle, + CpaBoolean *flag) +{ + sal_compression_service_t *pService = NULL; + dc_extd_ftrs_t *pExtendedFtrs = NULL; + + LAC_CHECK_NULL_PARAM(instanceHandle); + SAL_CHECK_INSTANCE_TYPE(instanceHandle, SAL_SERVICE_TYPE_COMPRESSION); + + pService = (sal_compression_service_t *)instanceHandle; + if (!isDcGen4x(pService)) { + *flag = CPA_FALSE; + return CPA_STATUS_SUCCESS; + } + + pExtendedFtrs = (dc_extd_ftrs_t *)&( + ((sal_service_t *)instanceHandle)->dcExtendedFeatures); + + *flag = (CpaBoolean)pExtendedFtrs->is_zero_pad; + + return CPA_STATUS_SUCCESS; +} diff --git a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h index 5bcff65c4fb3..58fb56f3c8ae 100644 --- a/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h +++ b/sys/dev/qat/qat_api/common/compression/include/dc_datapath.h @@ -196,4 +196,15 @@ typedef enum dc_cnv_mode_s { /* CNV = TRUE, CNVNR = TRUE */ } dc_cnv_mode_t; +/* Type to access extended features bit fields */ +typedef struct dc_extended_features_s { + unsigned is_cnv : 1; /* Bit<0> */ + unsigned padding : 7; + unsigned is_cnvnr : 1; /* Bit<8> */ + unsigned reserved : 2; + unsigned is_part_read : 1; /* Bit<11> */ + unsigned is_zero_pad : 1; /* Bit<12> */ + unsigned not_used : 19; +} dc_extd_ftrs_t; + #endif /* DC_DATAPATH_H_ */ diff --git a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c index f0e8d28949ff..c0f5a411d87e 100644 --- a/sys/dev/qat/qat_api/common/ctrl/sal_compression.c +++ b/sys/dev/qat/qat_api/common/ctrl/sal_compression.c @@ -52,14 +52,6 @@ /* C string null terminator size */ #define SAL_NULL_TERM_SIZE 1 -/* Type to access extended features bit fields */ -typedef struct dc_extended_features_s { - unsigned is_cnv : 1; /* Bit<0> */ - unsigned padding : 7; - unsigned is_cnvnr : 1; /* Bit<8> */ - unsigned not_used : 23; -} dc_extd_ftrs_t; - /* * Prints statistics for a compression instance */ diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h index 28dfeff6579e..b4d1f5829ba2 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h @@ -1386,21 +1386,9 @@ typedef struct icp_qat_fw_comn_resp_s { /**< Error Code constant value for submission of empty dynamic stored block to * slice */ -#define ERR_CODE_EXCEED_MAX_REQ_TIME -24 -/**< Error Code constant for exceeding max request time */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_HANDLE -20 -/**< Error Code constant for invalid handle in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_HMAC_FAILED -21 -/**< Error Code constant for failed hmac in kpt crypto service */ - -#define ERR_CODE_KPT_CRYPTO_SERVICE_FAIL_INVALID_WRAPPING_ALGO -22 -/**< Error Code constant for invalid wrapping algo in kpt crypto service */ - -#define ERR_CODE_KPT_DRNG_SEED_NOT_LOAD -23 -/**< Error Code constant for no drng seed is not loaded in kpt ecdsa signrs -/service */ +#define ERR_CODE_REGION_OUT_OF_BOUNDS -21 +/**< Error returned when decompression ends before the specified partial + * decompression region was produced */ #define ERR_CODE_MISC_ERROR -50 /**< Error Code constant for error detected but the source diff --git a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h index 5edf7022ee1d..fe1b7ad55de8 100644 --- a/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h +++ b/sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h @@ -47,6 +47,7 @@ typedef enum { } icp_qat_fw_comp_cmd_id_t; + /* * REQUEST FLAGS IN COMMON COMPRESSION * In common message it is named as SERVICE SPECIFIC FLAGS. @@ -64,7 +65,8 @@ typedef enum { * are don't care. i.e., these features are removed from QAT 2.0. */ -/** Flag usage */ + +/**< Flag usage */ #define ICP_QAT_FW_COMP_STATELESS_SESSION 0 /**< @ingroup icp_qat_fw_comp @@ -108,7 +110,7 @@ typedef enum { * Flag representing secure RAM from being used as * an intermediate buffer is ENABLED. */ -/** Flag mask & bit position */ +/**< Flag mask & bit position */ #define ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS 2 /**< @ingroup icp_qat_fw_comp @@ -148,7 +150,7 @@ typedef enum { #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS 7 /**< @ingroup icp_qat_fw_comp * Starting bit position for flag used to disable secure ram from - * being used as an intermediate buffer. */ + being used as an intermediate buffer. */ #define ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK 0x1 /**< @ingroup icp_qat_fw_comp @@ -170,7 +172,7 @@ typedef enum { * @ret_uncomp RetUnCompressed * @secure_ram Secure Ram usage * - *********************************************************************************/ + ******************************************************************************/ #define ICP_QAT_FW_COMP_FLAGS_BUILD( \ sesstype, autoselect, enhanced_asb, ret_uncomp, secure_ram) \ (((sesstype & ICP_QAT_FW_COMP_SESSION_TYPE_MASK) \ @@ -215,7 +217,7 @@ typedef enum { * * @param flags Flags to extract the session type bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SESSION_TYPE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SESSION_TYPE_BITPOS, \ @@ -230,7 +232,7 @@ typedef enum { * * @param flags Flags to extract the autoSelectBest bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_AUTO_SELECT_BEST_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_AUTO_SELECT_BEST_BITPOS, \ @@ -245,7 +247,7 @@ typedef enum { * * @param flags Flags to extract the enhanced asb bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_EN_ASB_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_ENHANCED_AUTO_SELECT_BEST_BITPOS, \ @@ -260,7 +262,7 @@ typedef enum { * * @param flags Flags to extract the Ret Uncomp bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_RET_UNCOMP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_RET_DISABLE_TYPE0_HEADER_DATA_BITPOS, \ @@ -275,21 +277,21 @@ typedef enum { * * @param flags Flags to extract the Secure Ram usage from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SECURE_RAM_USE_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_BITPOS, \ ICP_QAT_FW_COMP_DISABLE_SECURE_RAM_AS_INTMD_BUF_MASK) /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression header cd pars block * @description * Definition of the compression processing cd pars block. * The structure is a service-specific implementation of the common * structure. - ******************************************************************************/ + *****************************************************************************/ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { /**< LWs 2-5 */ struct { @@ -301,15 +303,10 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint8_t content_desc_params_sz; /**< Size of the content descriptor parameters in quad words. - * These - * parameters describe the session setup configuration info for - * the - * slices that this request relies upon i.e. the configuration - * word and - * cipher key needed by the cipher slice if there is a request - * for - * cipher - * processing. */ + * These parameters describe the session setup configuration + * info for the slices that this request relies upon i.e. the + * configuration word and cipher key needed by the cipher slice + * if there is a request for cipher processing. */ uint8_t content_desc_hdr_resrvd2; /**< Content descriptor reserved field */ @@ -324,28 +321,28 @@ typedef union icp_qat_fw_comp_req_hdr_cd_pars_s { uint32_t content_desc_resrvd4; /**< Content descriptor reserved field */ + } sl; } icp_qat_fw_comp_req_hdr_cd_pars_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Definition of the compression request parameters block * @description * Definition of the compression processing request parameters block. * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 14-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_req_params_s { /**< LW 14 */ uint32_t comp_len; /**< Size of input to process in bytes Note: Only EOP requests can be - * odd - * for decompression. IA must set LSB to zero for odd sized intermediate - * inputs */ + * odd for decompression. IA must set LSB to zero for odd sized + * intermediate inputs */ /**< LW 15 */ uint32_t out_buffer_sz; @@ -368,10 +365,10 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< CRC data structure pointer */ } crc; - /** LW 18 */ + /**< LW 18 */ uint32_t req_par_flags; - /** LW 19 */ + /**< LW 19 */ uint32_t rsrvd; } icp_qat_fw_comp_req_params_t; @@ -394,8 +391,10 @@ typedef struct icp_qat_fw_comp_req_params_s { * @param cnvnr Whether internal CNV recovery is to be performed * * ICP_QAT_FW_COMP_NO_CNV_RECOVERY * * ICP_QAT_FW_COMP_CNV_RECOVERY + * @param cnvdfx Whether CNV error injection is to be performed + * * ICP_QAT_FW_COMP_NO_CNV_DFX + * * ICP_QAT_FW_COMP_CNV_DFX * @param crc CRC Mode Flag - 0 legacy, 1 crc data struct - * *****************************************************************************/ #define ICP_QAT_FW_COMP_REQ_PARAM_FLAGS_BUILD( \ sop, eop, bfinal, cnv, cnvnr, cnvdfx, crc) \ @@ -411,21 +410,64 @@ typedef struct icp_qat_fw_comp_req_params_s { ((crc & ICP_QAT_FW_COMP_CRC_MODE_MASK) \ << ICP_QAT_FW_COMP_CRC_MODE_BITPOS)) + +/* + * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION + * + * +=====+-----+----- + --- + --- +-----+ --- + ----- + --- + ---- + -- + -- + + * | Bit |31-24| 20 | 19 | 18 | 17 | 16 | 15-7 | 6 | 5-2 | 1 | 0 | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + * |Flags|Resvd|xxHash| CRC | CNV |CNVNR| CNV | Resvd |BFin | Resvd|EOP |SOP | + * | |=0 |acc | MODE| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | | + * +=====+-----+----- + --- + ----+-----+ --- + ----- + --- + ---- + -- + -- + + */ + + +/** +***************************************************************************** +* @ingroup icp_qat_fw_comp +* Definition of the additional QAT2.0 Compression command types +* @description +* Enumeration which is used to indicate the ids of functions +* that are exposed by the Compression QAT FW service +* +*****************************************************************************/ +typedef enum { + ICP_QAT_FW_COMP_20_CMD_LZ4_COMPRESS = 3, + /*!< LZ4 Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4_DECOMPRESS = 4, + /*!< LZ4 Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_COMPRESS = 5, + /*!< LZ4S Compress Request */ + + ICP_QAT_FW_COMP_20_CMD_LZ4S_DECOMPRESS = 6, + /*!< LZ4S Decompress Request */ + + ICP_QAT_FW_COMP_20_CMD_XP10_COMPRESS = 7, + /*!< XP10 Compress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_XP10_DECOMPRESS = 8, + /*!< XP10 Decompress Request -- Placeholder */ + + ICP_QAT_FW_COMP_20_CMD_DELIMITER + /**< Delimiter type */ + +} icp_qat_fw_comp_20_cmd_id_t; + + /* * REQUEST FLAGS IN REQUEST PARAMETERS COMPRESSION * - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + - * --- + - * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 - * | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + - * | Flags | Resvd | CRC |Resvd| CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | - * SOP | - * | | =0 | Mode| =0 | | | =0 | | =0 | | | - * | | | | | | | | | | | | - * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + - * --- + + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- + ---- + --- + --- + + * | Bit | 31-20 | 19 | 18 | 17 | 16 | 15 - 7 | 6 | 5-2 | 1 | 0 | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + + * | Flags | Resvd | CRC | CNV | CNVNR | CNV |Resvd Bits|BFin |Resvd | EOP | SOP | + * | | =0 | Mode| DFX | | | =0 | | =0 | | | + * | | | | | | | | | | | | + * + ===== + ----- + --- +-----+-------+ --- + ---------+ --- | ---- + --- + --- + */ #define ICP_QAT_FW_COMP_NOT_SOP 0 @@ -434,15 +476,15 @@ typedef struct icp_qat_fw_comp_req_params_s { #define ICP_QAT_FW_COMP_SOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS Start of Packet */ + * * Flag representing that a request IS Start of Packet */ #define ICP_QAT_FW_COMP_NOT_EOP 0 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request is NOT Start of Packet */ + * Flag representing that a request is NOT Start of Packet */ #define ICP_QAT_FW_COMP_EOP 1 /**< @ingroup icp_qat_fw_comp - * Flag representing that a request IS End of Packet */ + * Flag representing that a request IS End of Packet */ #define ICP_QAT_FW_COMP_NOT_BFINAL 0 /**< @ingroup icp_qat_fw_comp @@ -484,6 +526,30 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Flag representing to use the external CRC data struct */ +#define ICP_QAT_FW_COMP_NO_XXHASH_ACC 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash will NOT be accumulated across requests */ + +#define ICP_QAT_FW_COMP_XXHASH_ACC 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating that xxHash WILL be accumulated across requests */ + +#define ICP_QAT_FW_COMP_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_NO_PART_DECOMP 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform partial de-compressing */ + +#define ICP_QAT_FW_COMP_ZEROPAD 1 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to perform zero-padding in compression request */ + +#define ICP_QAT_FW_COMP_NO_ZEROPAD 0 +/**< @ingroup icp_qat_fw_comp + * * Flag indicating to not perform zero-padding in compression request */ + #define ICP_QAT_FW_COMP_SOP_BITPOS 0 /**< @ingroup icp_qat_fw_comp * Starting bit position for SOP */ @@ -516,14 +582,6 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * Starting bit position for the CNV bit */ -#define ICP_QAT_FW_COMP_CNV_RECOVERY_MASK 0x1 -/**< @ingroup icp_qat_fw_comp - * One bit mask for the CNV Recovery bit */ - -#define ICP_QAT_FW_COMP_CNV_RECOVERY_BITPOS 17 -/**< @ingroup icp_qat_fw_comp - * Starting bit position for the CNV Recovery bit */ - #define ICP_QAT_FW_COMP_CNVNR_MASK 0x1 /**< @ingroup icp_qat_fw_comp * One bit mask for the CNV Recovery bit */ @@ -556,6 +614,22 @@ typedef struct icp_qat_fw_comp_req_params_s { /**< @ingroup icp_qat_fw_comp * One bit mask used to determine xxHash accumulate mode */ +#define ICP_QAT_FW_COMP_PART_DECOMP_BITPOS 27 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress bit */ + +#define ICP_QAT_FW_COMP_PART_DECOMP_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial de-compress mask */ + +#define ICP_QAT_FW_COMP_ZEROPAD_BITPOS 26 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad bit */ + +#define ICP_QAT_FW_COMP_ZEROPAD_MASK 0x1 +/**< @ingroup icp_qat_fw_comp + * Starting bit position for the partial zero-pad mask */ + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -565,7 +639,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the SOP bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_SOP_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_SOP_BITPOS, \ @@ -585,8 +659,9 @@ typedef struct icp_qat_fw_comp_req_params_s { QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_EOP_BITPOS, \ ICP_QAT_FW_COMP_EOP_MASK) - /** + + ****************************************************************************** * @ingroup icp_qat_fw_comp * @@ -595,7 +670,7 @@ typedef struct icp_qat_fw_comp_req_params_s { * * @param flags Flags to extract the bfinal bit from * - ******************************************************************************/ + *****************************************************************************/ #define ICP_QAT_FW_COMP_BFINAL_GET(flags) \ QAT_FIELD_GET(flags, \ ICP_QAT_FW_COMP_BFINAL_BITPOS, \ @@ -663,6 +738,70 @@ typedef struct icp_qat_fw_comp_req_params_s { ICP_QAT_FW_COMP_XXHASH_ACC_MODE_BITPOS, \ ICP_QAT_FW_COMP_XXHASH_ACC_MODE_MASK) +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the partial de-compress on/off bit + * + * @param flags Flags to extract the partial de-compress on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the partial de-compress on/off bit + * + * @param flags Flags to set the partial de-compress on/off bit to + * @param val partial de-compress on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_PART_DECOMP_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_PART_DECOMP_BITPOS, \ + ICP_QAT_FW_COMP_PART_DECOMP_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for extraction of the zero padding on/off bit + * + * @param flags Flags to extract the zero padding on/off bit from + * + ******************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_GET(flags) \ + QAT_FIELD_GET(flags, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + +/** + ****************************************************************************** + * @ingroup icp_qat_fw_comp + * + * @description + * Macro for setting of the zero-padding on/off bit + * + * @param flags Flags to set the zero-padding on/off bit to + * @param val zero-padding on/off bit + * + *****************************************************************************/ +#define ICP_QAT_FW_COMP_ZEROPAD_SET(flags, val) \ + QAT_FIELD_SET(flags, \ + val, \ + ICP_QAT_FW_COMP_ZEROPAD_BITPOS, \ + ICP_QAT_FW_COMP_ZEROPAD_MASK) + /** ****************************************************************************** * @ingroup icp_qat_fw_comp @@ -670,23 +809,23 @@ typedef struct icp_qat_fw_comp_req_params_s { * @description * Definition of the translator processing request parameters block * The structure below forms part of the Compression + Translation - * Parameters block spanning LWs 20-21, thus differing from the common + * Parameters block spanning LWs 14-23, thus differing from the common * base Parameters block structure. Unused fields must be set to 0. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_xlt_req_params_s { /**< LWs 20-21 */ uint64_t inter_buff_ptr; /**< This field specifies the physical address of an intermediate - * buffer SGL array. The array contains a pair of 64-bit - * intermediate buffer pointers to SGL buffer descriptors, one pair - * per CPM. Please refer to the CPM1.6 Firmware Interface HLD - * specification for more details. - * Placeholder for QAT2.0. */ + * buffer SGL array. The array contains a pair of 64-bit + * intermediate buffer pointers to SGL buffer descriptors, one pair + * per CPM. Please refer to the CPM1.6 Firmware Interface HLD + * specification for more details. */ + } icp_qat_fw_xlt_req_params_t; /** - ****************************************************************************** + ***************************************************************************** * @ingroup icp_qat_fw_comp * Compression header of the content descriptor block * @description @@ -697,7 +836,7 @@ typedef struct icp_qat_fw_xlt_req_params_s { * cd block, thus differing from the common base content descriptor * structure. * - ******************************************************************************/ + *****************************************************************************/ typedef struct icp_qat_fw_comp_cd_hdr_s { /**< LW 24 */ uint16_t ram_bank_flags; @@ -705,16 +844,15 @@ typedef struct icp_qat_fw_comp_cd_hdr_s { *** 1564 LINES SKIPPED *** From nobody Wed Sep 6 14:38:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RglNd3sD1z4rpFF; Wed, 6 Sep 2023 14:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RglNd32Hpz4LvN; Wed, 6 Sep 2023 14:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694011105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ra0Mq7/tIuNuAXjy9I5bO2ZaClSE5j8fPkRX0bpQsRg=; b=NQ29DgQwQYsSFwczwhxsrrU3AOxvBp4u7HNq6sL8pxf18/7Sn3I/kSSZ3lONHkUVU+3ds9 /nRLmaOTSVoUq1YcbUkxxWMvGI3UVJr9+xh/HH9XNPsRiTkcG0zvb1LcYJAcsuIFmURbHq RUEadbZolWSPuAdfaBo6xavQip2UGr+ULHtOV4P2zYqaICoj16M2ddPqZkWgKhpKAVD01b r+z5x1LCo7Nqn+RQ4rerFSWim3uovSXdu8kjVbIbTqMRKiHRREO0It72P5Xk2pR5FiK2Xg i/z3hjpBFLn30PxBxNON4CHiMXw3tvz/HzqM4aXk6sO1yBBB1yQX8WTcPVWaUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694011105; a=rsa-sha256; cv=none; b=LjJtmzPPUgUwnLuWOPw/Dv1pQW/HqJu/NN+rY6UbG41BnXFrhCahfDB590tfRsvDQduJNP f5VqIjkeN0JPv5Sn5tnoYY2TnRQIeuEaAUErtBPoT2YgJctr452zEncS8/dyCG7WgLuvd/ NYw5n+A7DIsO7iKA8f+aQFyROv9vjE+Xgmv3YHHLsrh0AOiYxq2CL1RlvJ6HSsTuUZBdRZ eNWp4ryOPOQfDiw12q/OcOYmx9Ai281bdlV+cd1NBlcT7e9e9SNN9WG/3H1VwJVS9jSiay Js5sa6sZ9wxBRdRwX9t+V7+hLr/E3BhhZ8lWrD05vT2rF8gC8tlp05yRLVTDXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694011105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ra0Mq7/tIuNuAXjy9I5bO2ZaClSE5j8fPkRX0bpQsRg=; b=G+eMeTx+oRwLlYEU8VxP5pXxUnPWAX9jog0kk+7dMx8Oxf6yO9qr4tPPteZtHHBx49LgOm sRjhBxhQPUuQG5I4+60HcZJBIfYVCCd9h0kcKr/VKIAYuvVg65J1cg+VFVKWlYEto2SCrF stqSf82FWad/zhE9sp2poQDJXxOjvVcyuaIvx3GHfNTDlnKjhh8xYBYnjaV1yZYPwLOR2P AGZ9iwKT3bEATCc8Qvxz38Gpn7CfwAjRjotvI5h+aLu4X7btHXUxmez4mRMph/3AqOnyD2 eQ0aoIrfGRZR0dXL//qX9GAS4vrgy4k3T6mB7U7B6AW9HZshD28YoUQbNxm2gw== 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 4RglNd261Wz4nR; Wed, 6 Sep 2023 14:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386EcP5X086282; Wed, 6 Sep 2023 14:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386EcPev086279; Wed, 6 Sep 2023 14:38:25 GMT (envelope-from git) Date: Wed, 6 Sep 2023 14:38:25 GMT Message-Id: <202309061438.386EcPev086279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 09b0401e91a9 - main - linuxkpi: fix iteration in __sg_alloc_table_from_pages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09b0401e91a92bcb58ea1873857b42f8211f660f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=09b0401e91a92bcb58ea1873857b42f8211f660f commit 09b0401e91a92bcb58ea1873857b42f8211f660f Author: Austin Shafer AuthorDate: 2023-09-06 14:08:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-09-06 14:37:12 +0000 linuxkpi: fix iteration in __sg_alloc_table_from_pages Commit 3f686532c9b4 tried to fix an issue with not properly starting at the first page in the sg list to prevent a panic. This worked but with the side effect of incrementing "s" during the final iteration causing it to be NULL since the list had ended. In cases non-DEBUG kernels this causes a panic with drm-5.15, since "s" is NULL when we later pass it to sg_mark_end(). This change decouples the iteration sg from the return value so that it is never incremented past the final page in the chain. MFC after: 3 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41574 --- sys/compat/linuxkpi/common/include/linux/scatterlist.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/scatterlist.h b/sys/compat/linuxkpi/common/include/linux/scatterlist.h index 0e4cc90e57a5..e462d5c649f1 100644 --- a/sys/compat/linuxkpi/common/include/linux/scatterlist.h +++ b/sys/compat/linuxkpi/common/include/linux/scatterlist.h @@ -343,7 +343,7 @@ __sg_alloc_table_from_pages(struct sg_table *sgt, { unsigned int i, segs, cur, len; int rc; - struct scatterlist *s; + struct scatterlist *s, *sg_iter; #if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51300 if (prv != NULL) { @@ -377,10 +377,18 @@ __sg_alloc_table_from_pages(struct sg_table *sgt, #endif cur = 0; - for (i = 0, s = sgt->sgl; i < sgt->orig_nents; i++) { + for_each_sg(sgt->sgl, sg_iter, sgt->orig_nents, i) { unsigned long seg_size; unsigned int j; + /* + * We need to make sure that when we exit this loop "s" has the + * last sg in the chain so we can call sg_mark_end() on it. + * Only set this inside the loop since sg_iter will be iterated + * until it is NULL. + */ + s = sg_iter; + len = 0; for (j = cur + 1; j < count; ++j) { len += PAGE_SIZE; @@ -394,8 +402,6 @@ __sg_alloc_table_from_pages(struct sg_table *sgt, size -= seg_size; off = 0; cur = j; - - s = sg_next(s); } KASSERT(s != NULL, ("s is NULL after loop in __sg_alloc_table_from_pages()")); From nobody Wed Sep 6 15:03:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RglxL004zz4s2f1; Wed, 6 Sep 2023 15:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RglxK4kCpz4Sgb; Wed, 6 Sep 2023 15:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t6xg1cVLu6yAsGjJT0kvh9BOAV+Diu6jS9w6XbGdk9o=; b=U6jaVDuIasDacrFJO1Xsbpx4RlKjabRIpeYsLMjNh6UVg7Tc2O37LVyfEQTHO2nSxZ+lu4 z1OlOOB6McI5XKcwKvOZ5F3Zw8hPhdY2DuKMmU90ND2Ku9UyCIyRqe/Hw9gVwLuA0CMfD8 s72CbOcMfkrXqRlBcxBxIsS3b0/TmJ6MCf049wRUQE2GC3yfri/TqR/R2cFbM//uDQit9/ nZvx5ZyKlusu/VS2HVsW32VXr/M2xaKWOkE0cIp22iL+uyLglKTuJ94gPwBviQkPfPwmo8 4grBzF5MezVyQ/Vr9MAgH4ux13ocRWEiwalf8mvpMWUUV2RzjUdAuikro7vrIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694012597; a=rsa-sha256; cv=none; b=Pdo3zOf9dt8BEUq55//RF3NLDREqg+FHBTb5mVlKxnR9yCqGAAU2eqxF131TS2MZsfIlDx 05aW4sBpCT7xBF1YCmrgTCgDeBJpJk++w5fkHAcoFzmnY4bwIEgz5JRImnOihwXTIVJmAa HHu6GbJLpebcOOanLvyvEoz+Rhip36PxTSqym+WgR4a9B+X8vahW81gT0pJgX8aZPDurvC sJN4w3Uh5W/6OUhD8H2DPvjErvB5TE51dti/g8iKgh54gu+ZXupuqy1aMe0T5Hl8NNN1PF fZ76OytCIRcfIwPLNhSsD4uZ5CTPCW19m4QkwAobKXEVVubrDKf/433uPLgexA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t6xg1cVLu6yAsGjJT0kvh9BOAV+Diu6jS9w6XbGdk9o=; b=HnOjCkxOA7baI18PQpG7Ma5Z5Vv6a9TogIBVjdlnjEYcmtU7V6CsCaFmnhdlzNyVzc+39Y YBBAKkDyIIRbU5+z1RFpShvoYATaV4vKSk4BLUG+Y8u/kDcDKsbaOwwMzZ4EjQrVr56H1b iZWirr+wBboMFpj8/z7X6dAWvay00tg3ejzHTg74zbGo5zt8amw92W6+tCsUFSBUbOyFsh nb7qs9mZyT3zwIIQZpcz5XdfGRypZQc3gimY4AZBo1BD6hK1/CNVc7U5UMnAF1n7g9QQvt upRZ08Sb3JLqBvJnex/oB+jISNBttFCMNVOsfmHwZsfSh9XhfH84vE3oyOUyJQ== 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 4RglxK3ppcz6HG; Wed, 6 Sep 2023 15:03:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386F3Hh7036637; Wed, 6 Sep 2023 15:03:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386F3H1f036634; Wed, 6 Sep 2023 15:03:17 GMT (envelope-from git) Date: Wed, 6 Sep 2023 15:03:17 GMT Message-Id: <202309061503.386F3H1f036634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a42a905c2afc - stable/12 - elftoolchain: stop leaving tempfiles on error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a42a905c2afc90012996a4f361d0360056db11b7 Auto-Submitted: auto-generated The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a42a905c2afc90012996a4f361d0360056db11b7 commit a42a905c2afc90012996a4f361d0360056db11b7 Author: Chris Rees AuthorDate: 2021-02-15 11:37:06 +0000 Commit: Dimitry Andric CommitDate: 2023-09-06 15:02:30 +0000 elftoolchain: stop leaving tempfiles on error Temporary files were not cleaned up, resulting in $TMPDIR or even the current directory becoming littered with ecp.* files. This happened with error and even sometimes on success! Approved by: dim MFC after: 4 weeks Accepted upstream: https://sourceforge.net/p/elftoolchain/code/3918/ Differential Revision: https://reviews.freebsd.org/D28651 (cherry picked from commit 5ac70383c8b32eeec80426e837960977971c7c2b) --- contrib/elftoolchain/elfcopy/archive.c | 31 ++++++++++---- contrib/elftoolchain/elfcopy/elfcopy.h | 1 + contrib/elftoolchain/elfcopy/main.c | 74 +++++++++++++++++++++++++++------- 3 files changed, 84 insertions(+), 22 deletions(-) diff --git a/contrib/elftoolchain/elfcopy/archive.c b/contrib/elftoolchain/elfcopy/archive.c index 9e23b831fdca..e57caad58e35 100644 --- a/contrib/elftoolchain/elfcopy/archive.c +++ b/contrib/elftoolchain/elfcopy/archive.c @@ -69,9 +69,11 @@ process_ar_obj(struct elfcopy *ecp, struct ar_obj *obj) /* Output to a temporary file. */ create_tempfile(NULL, &tempfile, &fd); - if ((ecp->eout = elf_begin(fd, ELF_C_WRITE, NULL)) == NULL) + if ((ecp->eout = elf_begin(fd, ELF_C_WRITE, NULL)) == NULL) { + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "elf_begin() failed: %s", elf_errmsg(-1)); + } elf_flagelf(ecp->eout, ELF_C_SET, ELF_F_LAYOUT); create_elf(ecp); elf_end(ecp->ein); @@ -80,27 +82,40 @@ process_ar_obj(struct elfcopy *ecp, struct ar_obj *obj) obj->buf = NULL; /* Extract archive symbols. */ - if (lseek(fd, 0, SEEK_SET) < 0) + if (lseek(fd, 0, SEEK_SET) < 0) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "lseek failed for '%s'", tempfile); - if ((ecp->eout = elf_begin(fd, ELF_C_READ, NULL)) == NULL) + } + if ((ecp->eout = elf_begin(fd, ELF_C_READ, NULL)) == NULL) { + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "elf_begin() failed: %s", elf_errmsg(-1)); + } extract_arsym(ecp); elf_end(ecp->eout); - if (fstat(fd, &sb) == -1) + if (fstat(fd, &sb) == -1) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "fstat %s failed", tempfile); - if (lseek(fd, 0, SEEK_SET) < 0) + } + if (lseek(fd, 0, SEEK_SET) < 0) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "lseek %s failed", tempfile); + } obj->size = sb.st_size; - if ((obj->maddr = malloc(obj->size)) == NULL) + if ((obj->maddr = malloc(obj->size)) == NULL) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "memory allocation failed for '%s'", tempfile); - if ((size_t) read(fd, obj->maddr, obj->size) != obj->size) + } + if ((size_t) read(fd, obj->maddr, obj->size) != obj->size) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "read failed for '%s'", tempfile); - if (unlink(tempfile)) + } + if (cleanup_tempfile(tempfile) < 0) err(EXIT_FAILURE, "unlink %s failed", tempfile); free(tempfile); + tempfile = NULL; close(fd); if (strlen(obj->name) > _MAXNAMELEN_SVR4) add_to_ar_str_table(ecp, obj->name); diff --git a/contrib/elftoolchain/elfcopy/elfcopy.h b/contrib/elftoolchain/elfcopy/elfcopy.h index b8845a574428..17d8b803156d 100644 --- a/contrib/elftoolchain/elfcopy/elfcopy.h +++ b/contrib/elftoolchain/elfcopy/elfcopy.h @@ -277,6 +277,7 @@ void add_to_symtab(struct elfcopy *_ecp, const char *_name, unsigned char _st_info, unsigned char _st_other, int _ndx_known); int add_to_inseg_list(struct elfcopy *_ecp, struct section *_sec); void adjust_addr(struct elfcopy *_ecp); +int cleanup_tempfile(char *_fn); void copy_content(struct elfcopy *_ecp); void copy_data(struct section *_s); void copy_phdr(struct elfcopy *_ecp); diff --git a/contrib/elftoolchain/elfcopy/main.c b/contrib/elftoolchain/elfcopy/main.c index 995f031dfa69..264e702ef5af 100644 --- a/contrib/elftoolchain/elfcopy/main.c +++ b/contrib/elftoolchain/elfcopy/main.c @@ -510,6 +510,27 @@ free_elf(struct elfcopy *ecp) } } +/* + * Remove a temporary file, without freeing its filename. + * + * Safe to pass NULL, will just ignore it. + */ +int +cleanup_tempfile(char *fn) +{ + int errno_save, retval; + + if (fn == NULL) + return 0; + errno_save = errno; + if ((retval = unlink(fn)) < 0) { + warn("unlink tempfile %s failed", fn); + errno = errno_save; + return retval; + } + return 0; +} + /* Create a temporary file. */ void create_tempfile(const char *src, char **fn, int *fd) @@ -656,8 +677,10 @@ create_file(struct elfcopy *ecp, const char *src, const char *dst) } #endif - if (lseek(ifd, 0, SEEK_SET) < 0) + if (lseek(ifd, 0, SEEK_SET) < 0) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "lseek failed"); + } /* * If input object is not ELF file, convert it to an intermediate @@ -677,9 +700,12 @@ create_file(struct elfcopy *ecp, const char *src, const char *dst) ecp->oed = ELFDATA2LSB; } create_tempfile(src, &elftemp, &efd); - if ((ecp->eout = elf_begin(efd, ELF_C_WRITE, NULL)) == NULL) + if ((ecp->eout = elf_begin(efd, ELF_C_WRITE, NULL)) == NULL) { + cleanup_tempfile(elftemp); + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "elf_begin() failed: %s", elf_errmsg(-1)); + } elf_flagelf(ecp->eout, ELF_C_SET, ELF_F_LAYOUT); if (ecp->itf == ETF_BINARY) create_elf_from_binary(ecp, ifd, src); @@ -687,21 +713,31 @@ create_file(struct elfcopy *ecp, const char *src, const char *dst) create_elf_from_ihex(ecp, ifd); else if (ecp->itf == ETF_SREC) create_elf_from_srec(ecp, ifd); - else + else { + cleanup_tempfile(elftemp); + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "Internal: invalid target flavour"); + } elf_end(ecp->eout); /* Open intermediate ELF object as new input object. */ close(ifd); - if ((ifd = open(elftemp, O_RDONLY)) == -1) + if ((ifd = open(elftemp, O_RDONLY)) == -1) { + cleanup_tempfile(elftemp); + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "open %s failed", src); + } close(efd); - if (unlink(elftemp) < 0) + if (cleanup_tempfile(elftemp) < 0) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "unlink %s failed", elftemp); + } free(elftemp); + elftemp = NULL; } if ((ecp->ein = elf_begin(ifd, ELF_C_READ, NULL)) == NULL) { + cleanup_tempfile(tempfile); if (fstat(ifd, &sb) == 0 && sb.st_size == 0) errx(EXIT_FAILURE, "file format not recognized"); errx(EXIT_FAILURE, "elf_begin() failed: %s", @@ -710,11 +746,14 @@ create_file(struct elfcopy *ecp, const char *src, const char *dst) switch (elf_kind(ecp->ein)) { case ELF_K_NONE: + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "file format not recognized"); case ELF_K_ELF: - if ((ecp->eout = elf_begin(ofd, ELF_C_WRITE, NULL)) == NULL) + if ((ecp->eout = elf_begin(ofd, ELF_C_WRITE, NULL)) == NULL) { + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "elf_begin() failed: %s", elf_errmsg(-1)); + } /* elfcopy(1) manage ELF layout by itself. */ elf_flagelf(ecp->eout, ELF_C_SET, ELF_F_LAYOUT); @@ -733,21 +772,21 @@ create_file(struct elfcopy *ecp, const char *src, const char *dst) * Create (another) tempfile for binary/srec/ihex * output object. */ - if (tempfile != NULL) { - if (unlink(tempfile) < 0) - err(EXIT_FAILURE, "unlink %s failed", - tempfile); - free(tempfile); - } + if (cleanup_tempfile(tempfile) < 0) + errx(EXIT_FAILURE, "unlink %s failed", + tempfile); + free(tempfile); create_tempfile(src, &tempfile, &ofd0); /* * Rewind the file descriptor being processed. */ - if (lseek(ofd, 0, SEEK_SET) < 0) + if (lseek(ofd, 0, SEEK_SET) < 0) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "lseek failed for the output object"); + } /* * Call flavour-specific conversion routine. @@ -768,11 +807,13 @@ create_file(struct elfcopy *ecp, const char *src, const char *dst) #if WITH_PE create_pe(ecp, ofd, ofd0); #else + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "PE/EFI support not enabled" " at compile time"); #endif break; default: + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "Internal: unsupported" " output flavour %d", ecp->oec); } @@ -787,6 +828,7 @@ create_file(struct elfcopy *ecp, const char *src, const char *dst) /* XXX: Not yet supported. */ break; default: + cleanup_tempfile(tempfile); errx(EXIT_FAILURE, "file format not supported"); } @@ -805,9 +847,13 @@ copy_done: in_place = 1; } - if (copy_from_tempfile(tempfile, dst, ofd, &tfd, in_place) < 0) + if (copy_from_tempfile(tempfile, dst, ofd, + &tfd, in_place) < 0) { + cleanup_tempfile(tempfile); err(EXIT_FAILURE, "creation of %s failed", dst); + } + /* 'tempfile' has been removed by copy_from_tempfile(). */ free(tempfile); tempfile = NULL; From nobody Wed Sep 6 15:07:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgm1f0JV1z4s4Yk; Wed, 6 Sep 2023 15:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgm1d6zZnz4TRP; Wed, 6 Sep 2023 15:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERtMom/CBecxS6AJFRKojVXSEd3C8q5vp75ZwUwc6y0=; b=YXvoqrIAgSC4fnWn2mf7MmUN7S4m0u/oVyLdBefjh5s7S3d45q0m16fc95EJ61OdRkw9y/ lo9AXTplGJM/CXMe7WlC4IZ0pfB1f5MhkcD5dvcNaSlNY3uyFiTyQmu6p9+MqEFPOwcZtn uRa7S6NkJvIuLwWTnOR06koOkFOMig1Dp2rb6BUxogH7lVarJLPPiYVfXXTsKX7Dpp6Z+g HJKSX1fsZDAJbW7L2CCpJ8lHk5skFEocX8M5BwuXjTg09nX1B3+oML1/d1uUQXTgS/C+Io UTB71oX/wga/OgD9oyroi/oq2zgXfzZRQ6o26Lw7OnPBGH6ewhUvbolCNISYxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694012822; a=rsa-sha256; cv=none; b=KmiWc+5S5KGN7ybC7COQIDzk2Znwm+p38gysVmtQn2Zz+0veJf9Cgz1YMh7Dj24efRjTE4 1ZFrwan1X5XFNEhGRTs6k/9s8oD6uUqQ4dNKWBR4WG6huvS8Jh6cJpvghGynHrrrYoxZvJ 5Cc4rr2rh7QmwlW+AuSFVLilbmuYCP6iOKyw9KffvPhXQDKWzBn9kvqBdeV73ZXC104Kx3 8FqfKQpEa9fAPoJ7wN4lbAMuCemI3lNRRr3HEG7L+zly5mg2T8EXdjCCMPuGL1x66Cdzji Gy+cu1a0fFhz8GfXbviItd9r6hnZURlIkDN698Jr3s2Udd0W/ZvYaZk1DVFJUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694012822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ERtMom/CBecxS6AJFRKojVXSEd3C8q5vp75ZwUwc6y0=; b=nVeQnIqeBLy5milLHuXqlP9hnUfDeSYk0Xk1RkS4YMX3EzUAS27eVDOF8VwqH2NF1H1TFC fHPcexyrh6Dzc7Yn6RPNFi/xsCZjyF8+QYVaVz7npj1fb0FuqPfFk8z9k3BiFqJgaRQTqM 8N8JpqKHj9ux4Zaxc/wPDqcZmTngffUyhYRDWdaDWByX/MxFHrUnEGZuMrGs36T1Onn3LF BVMKsv0YIX9dbl5FLzrplD600PDCL4rIWwYa5Zomr8G1uSPB0/ng6fYscNU0f7OMSrVi05 sh52CUFZw75UA4hDUDnxXSXTtZBdyWh19G4ULdfWFiqBbP7Zg9l3RQZD7RB1+w== 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 4Rgm1d62qhz5ZZ; Wed, 6 Sep 2023 15:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386F71Jv037538; Wed, 6 Sep 2023 15:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386F71FP037535; Wed, 6 Sep 2023 15:07:01 GMT (envelope-from git) Date: Wed, 6 Sep 2023 15:07:01 GMT Message-Id: <202309061507.386F71FP037535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: b37a6938e39a - main - diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b37a6938e39a7ed9542fafee671465bf719fd537 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=b37a6938e39a7ed9542fafee671465bf719fd537 commit b37a6938e39a7ed9542fafee671465bf719fd537 Author: Baptiste Daroussin AuthorDate: 2023-09-05 11:24:53 +0000 Commit: Baptiste Daroussin CommitDate: 2023-09-06 15:06:39 +0000 diff3: make the diff3 -E -m and diff3 -m behaviour match gnu diff3 In gnu diff3 3 way merging files where the new file and the target are already the same will die and show what has failed to be merged except if -E is passed in argument, in this case it will finish the merge. This difference in behaviour was breaking one of the etcupdate testcase with bsd diff3 Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41730 --- usr.bin/diff3/diff3.c | 8 +++++--- usr.bin/diff3/tests/Makefile | 2 ++ usr.bin/diff3/tests/diff3_test.sh | 32 ++++++++++++++++++++++++++++++++ usr.bin/diff3/tests/fbsdid1.txt | 5 +++++ usr.bin/diff3/tests/fbsdid2.txt | 5 +++++ 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff3/diff3.c b/usr.bin/diff3/diff3.c index e80b1d142231..380987560ee0 100644 --- a/usr.bin/diff3/diff3.c +++ b/usr.bin/diff3/diff3.c @@ -335,7 +335,8 @@ merge(int m1, int m2) change(2, &d2->old, false); } else if (Aflag || mflag) { // XXX-THJ: What does it mean for the second file to differ? - j = edit(d2, dup, j, DIFF_TYPE2); + if (eflag == EFLAG_UNMERGED) + j = edit(d2, dup, j, DIFF_TYPE2); } d2++; continue; @@ -861,7 +862,7 @@ main(int argc, char **argv) eflag = EFLAG_UNMERGED; break; case 'E': - eflag = EFLAG_UNMERGED; + eflag = EFLAG_OVERLAP; oflag = 1; break; case 'i': @@ -907,7 +908,8 @@ main(int argc, char **argv) argv += optind; if (Aflag) { - eflag = EFLAG_UNMERGED; + if (eflag == EFLAG_NONE) + eflag = EFLAG_UNMERGED; oflag = 1; } diff --git a/usr.bin/diff3/tests/Makefile b/usr.bin/diff3/tests/Makefile index df000d68cc7e..3b720586d148 100644 --- a/usr.bin/diff3/tests/Makefile +++ b/usr.bin/diff3/tests/Makefile @@ -23,5 +23,7 @@ ${PACKAGE}FILES+= \ long-ed.out \ long-A.out \ long-merge.out \ + fbsdid1.txt \ + fbsdid2.txt .include diff --git a/usr.bin/diff3/tests/diff3_test.sh b/usr.bin/diff3/tests/diff3_test.sh index 3a4fc128ca16..3cbd7dac1ed9 100755 --- a/usr.bin/diff3/tests/diff3_test.sh +++ b/usr.bin/diff3/tests/diff3_test.sh @@ -4,6 +4,7 @@ atf_test_case diff3_lesssimple atf_test_case diff3_ed atf_test_case diff3_A atf_test_case diff3_merge +atf_test_case diff3_E_merge diff3_body() { @@ -66,6 +67,36 @@ diff3_merge_body() diff3 -m -L long-m.txt -L long-o.txt -L long-y.txt $(atf_get_srcdir)/long-m.txt $(atf_get_srcdir)/long-o.txt $(atf_get_srcdir)/long-y.txt } +diff3_E_merge_body() +{ + +expected="<<<<<<< 2 +# \$FreeBSD: head/local 12000 jhb \$ +======= +# \$FreeBSD: head/local 12345 jhb \$ +>>>>>>> 3 +# \$FreeBSD: head/local 12345 jhb \$ + +this is a file + +these are some local mods to the file +" + # first test the regular test + cp $(atf_get_srcdir)/fbsdid2.txt out.txt + atf_check -s exit:1 -o inline:"${expected}" \ + diff3 -m -L 1 -L 2 -L 3 out.txt $(atf_get_srcdir)/fbsdid1.txt $(atf_get_srcdir)/fbsdid2.txt + +merged="# \$FreeBSD: head/local 12345 jhb \$ + +this is a file + +these are some local mods to the file +" + atf_check -s exit:0 -o inline:"${merged}" \ + diff3 -E -m out.txt $(atf_get_srcdir)/fbsdid1.txt $(atf_get_srcdir)/fbsdid2.txt +} + + atf_init_test_cases() { atf_add_test_case diff3 @@ -73,4 +104,5 @@ atf_init_test_cases() atf_add_test_case diff3_ed atf_add_test_case diff3_A atf_add_test_case diff3_merge + atf_add_test_case diff3_E_merge } diff --git a/usr.bin/diff3/tests/fbsdid1.txt b/usr.bin/diff3/tests/fbsdid1.txt new file mode 100644 index 000000000000..9f94660bda97 --- /dev/null +++ b/usr.bin/diff3/tests/fbsdid1.txt @@ -0,0 +1,5 @@ +# $FreeBSD: head/local 12000 jhb $ + +this is a file + +these are some local mods to the file diff --git a/usr.bin/diff3/tests/fbsdid2.txt b/usr.bin/diff3/tests/fbsdid2.txt new file mode 100644 index 000000000000..420ad975868b --- /dev/null +++ b/usr.bin/diff3/tests/fbsdid2.txt @@ -0,0 +1,5 @@ +# $FreeBSD: head/local 12345 jhb $ + +this is a file + +these are some local mods to the file From nobody Wed Sep 6 17:11:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgpnY6tt1z4sByn; Wed, 6 Sep 2023 17:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgpnY6RVHz3WSR; Wed, 6 Sep 2023 17:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694020305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sh46PjuESf/DMIkVd/ug2zS+z/b7TfdD1cGH/ILvnXk=; b=TTb2DILaHZOvPBCEVmQI53PmxvHOQ6Src/p7w6t02KpR/3DYR46BeCWzbfR8LuxhCNON8h l9e94J1T0havKA7GcyB209EEMXemHp01j2CZv57KQ3RlN4UK2voBypdfpnJLE0hDBY8Gxu oa+zJBRXOE/zZ94yDAgNmhak7kGGIdqmg5mFT5iC7VvNyzgGylijiUm234xz1ZL/tRxZz5 Q5Zir8iVeqVufiK9/qaHEod/a6+ff99o2ofySUHkPlrqqOm4biYUrPL/8idZya6hOSvv/a qPoFGjysZ6qPgDhAjDwqI3ORowrYeqhf2DqIqeK1R6f9Olz+eq2xvEhB3okS5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694020305; a=rsa-sha256; cv=none; b=gTLTBzjG8RbjgYcuyLiWIOWqscBAPNXb8Q6KLRdy9E03dwax3e0GysS1v6eXV6Spr1EGBL 9jPjDYL1V/lXttfNTZmgDRaB/5+VjAzeWfGxXCVfi5707qgDdTCVb5ASC1Nd0bOiH4JPvf lyb5CGx/MkfnCfm88/lY3QvM12n8qoU2wViJYuGq4mwIKyLrIWPMkDDkkHh4HrQOZxD1A7 fO/rpSb5cUgxxI/lQ7Os4uW9Ng5cKd+NO6zHXfbflvZ3zdN2H7OEhXYbDVRl4VGAgdKR49 Xtt9sNCuxIaGpgC7Y3KVj8UIYnIRfD4utmI77c6A0erDmfvVZW3vb/qn12Z8Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694020305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sh46PjuESf/DMIkVd/ug2zS+z/b7TfdD1cGH/ILvnXk=; b=nrA32UmzAv3+zh/PpsN+HQQ4UbKMMUK1UZa9h/sSHBpTkxp8pqT0CEasJupb/O1jfaDa4p C+3eUr9lMiRK01Yu9nVdZ+EsCTD67pGkzq264YL8yi3F29E64z1W+wPNHCG/1kGbyA1eKM QPV7FKQ6tKPsOkV0rOPVkw0HiWq7SGOCJKwO10EOc7VWVsJo7F7xiLLXL1ykUSEpuSPbAU wZYQ8W/NLAcnn4hkNF7LuI6C/3kGMhaVjIypaLqwntYIIvPjxIRdu7vdPPZnX6FUTq3+f3 YFX/GMdqzeQ04i+4AEkn+BIk6NuL/RD5a/kK/0ddIKa8UayyC5zv7ocbw0yznQ== 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 4RgpnY5VyJz9BH; Wed, 6 Sep 2023 17:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386HBjrr051285; Wed, 6 Sep 2023 17:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HBj2a051282; Wed, 6 Sep 2023 17:11:45 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:11:45 GMT Message-Id: <202309061711.386HBj2a051282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: aacbe7384221 - main - unifdef: Handle redefined symbols correctly. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aacbe7384221d2eafa326864bbbe2f22a10063ce Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=aacbe7384221d2eafa326864bbbe2f22a10063ce commit aacbe7384221d2eafa326864bbbe2f22a10063ce Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 17:11:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-06 17:11:13 +0000 unifdef: Handle redefined symbols correctly. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41758 --- contrib/unifdef/unifdef.c | 6 +++++- usr.bin/unifdef/tests/unifdef_test.sh | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index 82f6acd66038..3dd4ace7b81e 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -1550,8 +1550,12 @@ addsym2(bool ignorethis, const char *symname, const char *val) sym->value = val; r = RB_INSERT(MACROMAP, ¯o_tree, sym); assert(r == NULL); + debugsym("addsym", sym); + } else { + sym->ignore = ignorethis; + sym->value = val; + debugsym("updsym", sym); } - debugsym("addsym", sym); } static void diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index 98adef3adfdc..dfb08c187724 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -17,6 +17,27 @@ EOF atf_check -o file:f unifdef file < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 0b39d9de2e71 - releng/13.2 - freebsd-update: Fix merging already-updated files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 0b39d9de2e7170c214b39f1aca42c11d6f7c13e9 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=0b39d9de2e7170c214b39f1aca42c11d6f7c13e9 commit 0b39d9de2e7170c214b39f1aca42c11d6f7c13e9 Author: Colin Percival AuthorDate: 2023-05-05 03:00:58 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 16:56:24 +0000 freebsd-update: Fix merging already-updated files When performing an "upgrade" (moving between FreeBSD releases, as opposed to "update" which merely applies security/errata updates to the installed release) FreeBSD Update: 1. Generates a list of "files needing to be merged", namely those files which don't match the version installed in the "old" release and have paths matching the MergeChanges configuration directive (by default, /boot/device.hints and everything under /etc/). and later on, 2. Compares the currently-installed files to the versions in the "new" release, removing index entries for files which "don't need to be updated because they're not changing". Unfortunately if a file falls into both of these categories -- that is to say, if a file in /etc/ is the same as the version in the new release and not the same as the version in the old release -- the resulting "merge" step saw that the file was no longer listed as being part of the new release, resulting in the file being deleted. For the first 18 years of FreeBSD Update's existence, this never happened, since $FreeBSD$ tags resulted in "new release" files always being different from any files systems would already have installed. This commit fixes this behaviour by only placing a file into the "files needing to be merged" list if it does not match the version in the old release *or* the version in the new release. Reported by: des Reviewed by: delphij (earlier version), des, emaste Approved by: so Security: FreeBSD-EN-23:09.freebsd-update Differential Revision: https://reviews.freebsd.org/D39973 (cherry picked from commit c55b7e522629cb78adeb54bd9964304481d55eab) (cherry picked from commit 866e5c6b3ce7ca3e15a24180fa1a0dcbda7c4b0f) --- usr.sbin/freebsd-update/freebsd-update.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 4ef44d1ad000..4f779270926d 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1677,11 +1677,12 @@ fetch_inspect_system () { echo "done." } -# For any paths matching ${MERGECHANGES}, compare $1 and $2 and find any -# files which differ; generate $3 containing these paths and the old hashes. +# For any paths matching ${MERGECHANGES}, compare $2 against $1 and $3 and +# find any files with values unique to $2; generate $4 containing these paths +# and their corresponding hashes from $1. fetch_filter_mergechanges () { # Pull out the paths and hashes of the files matching ${MERGECHANGES}. - for F in $1 $2; do + for F in $1 $2 $3; do for X in ${MERGECHANGES}; do grep -E "^${X}" ${F} done | @@ -1689,9 +1690,10 @@ fetch_filter_mergechanges () { sort > ${F}-values done - # Any line in $2-values which doesn't appear in $1-values and is a - # file means that we should list the path in $3. - comm -13 $1-values $2-values | + # Any line in $2-values which doesn't appear in $1-values or $3-values + # and is a file means that we should list the path in $3. + sort $1-values $3-values | + comm -13 - $2-values | fgrep '|f|' | cut -f 1 -d '|' > $2-paths @@ -1703,10 +1705,10 @@ fetch_filter_mergechanges () { while read X; do look "${X}|" $1-values | head -1 - done < $2-paths > $3 + done < $2-paths > $4 # Clean up - rm $1-values $2-values $2-paths + rm $1-values $2-values $3-values $2-paths } # For any paths matching ${UPDATEIFUNMODIFIED}, remove lines from $[123] @@ -2711,7 +2713,7 @@ upgrade_run () { # Based on ${MERGECHANGES}, generate a file tomerge-old with the # paths and hashes of old versions of files to merge. - fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT tomerge-old + fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT INDEX-NEW tomerge-old # Based on ${UPDATEIFUNMODIFIED}, remove lines from INDEX-* which # correspond to lines in INDEX-PRESENT with hashes not appearing From nobody Wed Sep 6 17:37:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqMH6PkVz4sQds; Wed, 6 Sep 2023 17:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMH5hKkz3d0q; Wed, 6 Sep 2023 17:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=63dy905nXIIfaai72DSfYjl6cdlQlISKKsetGXrqCtE=; b=IgEPUXPIfKnXJz1emLOqppCra6YfcQr/opVB3gPSHIg1SGTUHAVBLZQgptsCclpYYmlRuU v0GLp7LISXWuiA8exHAibqGAQqsxMfNoG052buRoX+Es7dD+UhLIF5MgthRtXaK05Cwx0H SuEoFiZPD2GclAq/PdcFaC7znyx8sa+d9oKoAR8JiUpS/xXugUmG5iHJ3rV9FUbYobCJZO +JA+dqWXGtgx3UhtgoWDJSR60oMf83n3YULoFGnjk2XCJLz94oGh7kxLwoov6Xeq06tlY5 v9CnPSaAKsureEdXSGrXTuT3nRME77Zv7pHW06UDMv6GzMisJ/YYQumeTAL3mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021851; a=rsa-sha256; cv=none; b=dWnDgyx+6n4raEycGzjbvp4kmIdW5kexbmNoUqK5M26Mnzsq4fl4OzD/4hpZVRBkXO7aMR KALhHK/5jSxuHt6h7TnrBAqFGpWGE6efXkUtc6/XPkjMqp50KjV+BSJiB3sYBiQkhdAw5I ZA7xRM8K4iDH/ccKBOehIjrMIUi6pB38NfxRwttyOpbDupMcluc+P0cUtAy8e07YEHXZ+R w/Elipda31x8l4yGTh/mI9zg9m/h85Vw7/YPvsgyhmWc4chSNjDV6ES9xu9IyWJQsn0oFU nvrY8vIRjjGgC1qppp24Yup4l00GJW58/Z7frOhnrrV/jMTXgVjfW5n71VZGkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021851; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=63dy905nXIIfaai72DSfYjl6cdlQlISKKsetGXrqCtE=; b=Pt9DR0PzjAx7JT5OdTnqVm783wPVcoPEUxW5WsGrFcGG6wDuK9GTxCC+gmQ91PT7kjrqK2 FP8I5v3uUJ+o+FEWEKJ3YA8XOD2uQrPZ5cPUchf0/lR0KM8OTJBSkasPzQmAla2GK4nRGK a98p2PPEtSCWCJgu9to2eWQPemjy5dKpESh7A1Z33LiuWLAc2t4qvsDQgd56d6d/0MQyx7 J999TyPGzuLsvcPuMVIi6OQcHiVs3XO8ZUql7Zo3VpuB/MOI5fIA1tL6rtxNu1q5W9HDig 2aNRxGEQdgz+bJR53ybWTJLc28Fhz4XCiL4TzuWFCtOnnSK5k4o6MW0TRkxSVw== 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 4RgqMH4NlKzBKT; Wed, 6 Sep 2023 17:37:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386HbVmw086399; Wed, 6 Sep 2023 17:37:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HbVLG086396; Wed, 6 Sep 2023 17:37:31 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:31 GMT Message-Id: <202309061737.386HbVLG086396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: e80d2d894ff1 - releng/13.2 - pcib: Allocate the memory BAR with the MSI-X table. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: e80d2d894ff1afbdb932aac1f4ceb50922a779bb Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=e80d2d894ff1afbdb932aac1f4ceb50922a779bb commit e80d2d894ff1afbdb932aac1f4ceb50922a779bb Author: John Baldwin AuthorDate: 2023-06-19 16:15:48 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 16:57:02 +0000 pcib: Allocate the memory BAR with the MSI-X table. This is required for pci_alloc_msix() to work and to thus use MSI-X interrupts for PCI-e hotplug. Reported by: cperciva Reviewed by: cperciva Approved by: so Security: FreeBSD-EN-23:10.pci Differential Revision: https://reviews.freebsd.org/D40581 (cherry picked from commit e6b838363fb473b5e35a8ae6a1da5e15f5b52960) (cherry picked from commit 12ce57e6d3e770db9ca83a8cbaa8f332515ce3d7) --- sys/dev/pci/pci_pci.c | 23 ++++++++++++++++++----- sys/dev/pci/pcib_private.h | 1 + 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/sys/dev/pci/pci_pci.c b/sys/dev/pci/pci_pci.c index b735da657a6c..4284b1cbf567 100644 --- a/sys/dev/pci/pci_pci.c +++ b/sys/dev/pci/pci_pci.c @@ -1324,7 +1324,7 @@ static int pcib_alloc_pcie_irq(struct pcib_softc *sc) { device_t dev; - int count, error, rid; + int count, error, mem_rid, rid; rid = -1; dev = sc->dev; @@ -1336,9 +1336,17 @@ pcib_alloc_pcie_irq(struct pcib_softc *sc) */ count = pci_msix_count(dev); if (count == 1) { - error = pci_alloc_msix(dev, &count); - if (error == 0) - rid = 1; + mem_rid = pci_msix_table_bar(dev); + sc->pcie_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, + &mem_rid, RF_ACTIVE); + if (sc->pcie_mem == NULL) { + device_printf(dev, + "Failed to allocate BAR for MSI-X table\n"); + } else { + error = pci_alloc_msix(dev, &count); + if (error == 0) + rid = 1; + } } if (rid < 0 && pci_msi_count(dev) > 0) { @@ -1386,7 +1394,12 @@ pcib_release_pcie_irq(struct pcib_softc *sc) error = bus_free_resource(dev, SYS_RES_IRQ, sc->pcie_irq); if (error) return (error); - return (pci_release_msi(dev)); + error = pci_release_msi(dev); + if (error) + return (error); + if (sc->pcie_mem != NULL) + error = bus_free_resource(dev, SYS_RES_MEMORY, sc->pcie_mem); + return (error); } static void diff --git a/sys/dev/pci/pcib_private.h b/sys/dev/pci/pcib_private.h index af0b70a7add3..0dea325b6436 100644 --- a/sys/dev/pci/pcib_private.h +++ b/sys/dev/pci/pcib_private.h @@ -134,6 +134,7 @@ struct pcib_softc uint16_t pcie_link_sta; uint16_t pcie_slot_sta; uint32_t pcie_slot_cap; + struct resource *pcie_mem; struct resource *pcie_irq; void *pcie_ihand; struct task pcie_hp_task; From nobody Wed Sep 6 17:37:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqMK0ryCz4sQh9; Wed, 6 Sep 2023 17:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMJ64xSz3dDJ; Wed, 6 Sep 2023 17:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4T0C6ux9MTpWustAb7OhIgC4tp+d5hwS4H1UIZYqPk=; b=fRX1corln4j1vhv/LEdgK/rsJZy4gsLL8ja/vPH0qCUm5Hn8j85l4SHriUwroNwoqD29xe fnka4HO2pkAXEbhC9tbwTHGQOwXoJ6ULicWAFkJ951eTk7wc4jbp4sNgdQdxKxeJFJ7o1T COtcjrDYD/OCgyGBl9BNnUT6O6SDS0Qp8nwB0B/80yxYhuTA0PjKIkPWJn1Is0QnvPL/Uz Ov5eF1tlx06pwBEnkk99r0aAQhm2lwI5mYtZMjeKV7INEV3p8D2uOE5s7WIKHTFLPC/Lbl dZZ79viC0BfF3CgKnJz7fLF72JJLRSp4DUkV9QgT79cdHa4LYCggOiXk0H15zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021852; a=rsa-sha256; cv=none; b=r8W2vH2huj9BdsmWMsKpQhWbjtQjfi557dmU3r8b7OI4jqhlF8MZOV3NX0e71xvTbPUOyO M4bXknfgRKa4DQEQcq8pFsik6HkjcLtVxxD3Bkvd/VXRVo8ngTYXcXNC+EzpzT3N6sulS2 IbQH5EwqMmdY69hy4XOfSe4PRY3A/nZ+6FcgrZy0W8+vYSsx8XoQ9q9yRfhUqTah1F60NX XlIFiD6ZwXCBWLvNBM/NbpGA6qABZe4zO1eB8HoNfjh90YoyqjD1sF4RYt+yrPmP2cwMq9 9p92lAyrBINK2RpnfV4hko7UnQAxx+R/q1hnpAMnS2mQ8kbfit83xVjsnwu7mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J4T0C6ux9MTpWustAb7OhIgC4tp+d5hwS4H1UIZYqPk=; b=CEK+FgHjLEz9XaI9lwzyXTTbXCsKDYovG7bcZw6K/QoaWlSLPCM38N+GWWjoyxSlZukBNt KqAKQFIilj7LGLL5WJkJWntZ9VzIee2gE/5P8NQb+uOnYMF2AlBnwbI4Qx8D6uef+6e/Oo AOrX0pMiudOO9YUFg9dM4bo4am3nGbk8BE1CtOXXQaO5KkAwU82dE9KD6z4YZhybjYfYYW nL61BxnbNbwDU2uSp8PIq1I16y+A6Pj6e3gzODmPnSePoay+zexJjk+OMMfY5+i8KhSVqY QKmGvg0nY+EixwDbuvu46vmOhUH+AjSiHby3yc6Q+My41PwiOG9rl/qxP4h+Aw== 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 4RgqMJ57tQzBKV; Wed, 6 Sep 2023 17:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386HbWxa086444; Wed, 6 Sep 2023 17:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HbWNo086441; Wed, 6 Sep 2023 17:37:32 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:32 GMT Message-Id: <202309061737.386HbWNo086441@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 902c13c4cf68 - releng/13.2 - caroot: add new certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 902c13c4cf689db74ed85879f8fa523bb71f74de Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=902c13c4cf689db74ed85879f8fa523bb71f74de commit 902c13c4cf689db74ed85879f8fa523bb71f74de Author: Kyle Evans AuthorDate: 2023-06-25 23:47:49 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 16:57:41 +0000 caroot: add new certs Based on dates, these were likely just missed in the last update... add them now. - Twenty (20) new Approved by: so Security: FreeBSD-EN-23:11.caroot (cherry picked from commit ee0aa1ce12b3caea34477a31e9d2111a329e33b9) (cherry picked from commit 565712db0dfa62eb876147c0f605903f451725b3) --- secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 67 ++++++++++ secure/caroot/trusted/Certainly_Root_E1.pem | 66 ++++++++++ secure/caroot/trusted/Certainly_Root_R1.pem | 134 ++++++++++++++++++++ .../caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 79 ++++++++++++ .../caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 79 ++++++++++++ .../trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 67 ++++++++++ .../trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 134 ++++++++++++++++++++ .../trusted/E-Tugra_Global_Root_CA_ECC_v3.pem | 73 +++++++++++ .../trusted/E-Tugra_Global_Root_CA_RSA_v3.pem | 140 +++++++++++++++++++++ .../caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 68 ++++++++++ .../caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 136 ++++++++++++++++++++ secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 134 ++++++++++++++++++++ secure/caroot/trusted/ISRG_Root_X2.pem | 67 ++++++++++ .../trusted/Security_Communication_ECC_RootCA1.pem | 67 ++++++++++ .../trusted/Security_Communication_RootCA3.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/Telia_Root_CA_v2.pem | 138 ++++++++++++++++++++ secure/caroot/trusted/TunTrust_Root_CA.pem | 139 ++++++++++++++++++++ secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 67 ++++++++++ secure/caroot/trusted/vTrus_Root_CA.pem | 134 ++++++++++++++++++++ 20 files changed, 2059 insertions(+) diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA1.pem b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem new file mode 100644 index 000000000000..889f140decc8 --- /dev/null +++ b/secure/caroot/trusted/BJCA_Global_Root_CA1.pem @@ -0,0 +1,135 @@ +## +## BJCA Global Root CA1 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 55:6f:65:e3:b4:d9:90:6a:1b:09:d1:6c:3e:c0:6c:20 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA1 + Validity + Not Before: Dec 19 03:16:17 2019 GMT + Not After : Dec 12 03:16:17 2044 GMT + Subject: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA1 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:f1:66:08:bd:d9:c5:15:61:cb:84:04:41:a5:69: + 37:77:1d:c1:b0:7b:fa:c3:77:48:90:13:72:64:d1: + b8:7c:90:35:9d:18:79:88:e3:97:01:3c:47:81:f2: + 0e:a2:98:0d:9e:3f:37:e0:19:b2:90:f2:46:1c:92: + b1:3a:61:ce:fa:b7:46:9e:03:86:d7:33:6e:ed:f7: + 45:8c:76:37:de:6e:96:91:f7:d7:7e:2b:87:17:d5: + 8b:35:ee:84:91:72:57:dc:60:c3:c3:b9:e7:c7:67: + 24:23:4f:63:0a:63:f6:66:7d:4b:55:a7:3f:78:64: + 49:69:12:97:e0:4c:0d:d3:09:a0:32:30:3a:fa:9f: + c0:f2:9c:c5:12:2a:2e:1c:b5:04:33:da:a4:38:11: + 6a:de:c6:18:f6:47:3a:22:41:87:22:fc:c4:89:28: + 54:d8:8c:a5:30:0a:f8:17:16:ca:ac:37:fd:79:a7: + 91:17:78:38:99:ad:58:ed:b2:de:cc:89:7d:03:9c: + b3:89:65:e7:e3:3b:b1:22:86:8f:06:6d:78:07:fd: + 91:12:7f:b0:6b:1c:89:0d:f9:b8:cb:74:5b:07:c2: + c8:f4:35:d1:64:63:7a:e9:6e:9a:28:d6:30:bd:e6: + 1b:dd:15:af:84:ea:9c:c7:ca:f5:0e:ea:f2:5d:29: + 87:8f:69:73:39:be:2e:24:6f:45:21:ac:c5:d4:69: + 25:06:83:ad:7a:48:85:13:2c:0d:06:b8:6c:79:56: + fc:a3:67:32:81:f5:57:a5:ca:57:42:69:e9:5c:24: + 61:ef:e2:30:18:4e:44:98:55:6f:7a:c2:93:d8:19: + b6:de:7c:47:8a:11:4e:49:47:db:28:94:02:0b:94: + 4a:2c:f9:12:d0:4f:e8:31:7e:6c:7a:bf:a6:3f:9b: + 39:3d:02:16:a3:18:b3:67:ac:5b:3f:2c:83:2b:67: + 39:81:5c:b9:7e:94:d5:64:dd:9e:8f:6e:ae:e8:7c: + 5b:b4:d7:6a:47:48:d7:7e:b3:d4:2d:8e:56:76:4e: + cf:69:f1:6e:44:6c:d4:24:ea:8d:24:a1:18:bf:bd: + 57:fe:a9:99:35:b5:db:10:77:b8:3d:48:ba:d6:c1: + e7:f1:23:3e:d7:df:85:9d:27:3c:d4:40:bd:0a:0c: + bd:f5:e7:8d:25:d6:81:74:87:46:d4:29:75:a2:42: + 6c:f7:73:89:e7:7d:bf:7a:4a:1f:d3:22:c9:15:55: + cf:df:6f:7c:55:d0:a4:8b:07:11:37:5f:83:a6:26: + 57:a6:01:5b:7e:fe:58:68:07:a9:e9:7a:d9:b9:e8: + ff:50:1f:ab:c2:b4:c0:ce:e8:ea:fd:0f:bd:8d:4d: + b8:bc:71 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + C5:EF:ED:CC:D8:8D:21:C6:48:E4:E3:D7:14:2E:A7:16:93:E5:98:01 + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: sha256WithRSAEncryption + 52:82:ac:21:34:1f:23:f2:a2:d8:f9:b8:af:37:36:20:89:d1: + 37:03:d6:69:9f:b8:61:10:ba:a2:31:98:59:47:e8:d1:0d:25: + 1e:15:41:0c:e0:2a:55:d5:57:52:cb:f8:e4:c7:69:a3:1d:4d: + 71:02:5e:5f:21:45:60:48:5c:09:8e:49:10:c1:04:dc:a9:62: + 6b:02:f0:43:c8:4e:9d:38:49:74:c9:32:70:54:6d:c1:47:fc: + 8e:b4:36:9e:d4:9c:bd:dd:20:d6:53:c9:18:a9:b5:56:b9:76: + 8b:95:67:66:ee:bd:98:fe:ae:ef:be:6e:fb:60:f6:fd:59:c6: + 2a:1b:3f:23:4a:94:24:30:27:c8:89:bc:eb:44:24:9a:cb:3d: + be:4f:d5:7a:ce:8e:17:cb:62:c1:d9:de:1e:0e:7a:ff:43:86: + 34:52:bc:61:3f:3c:5f:bb:d9:76:b4:53:bc:97:b3:fe:8a:4c: + 12:2e:2b:f3:d7:ce:e1:a2:ff:dd:7b:70:fb:3b:a1:4d:a4:63: + 02:fd:38:97:95:3f:05:70:a0:6b:df:62:81:43:8b:b4:59:0d: + 4a:8c:54:9c:c5:bb:81:9f:cd:7d:a5:ef:0b:25:1e:3a:20:db: + 1c:fc:1f:98:67:02:0a:d4:73:44:13:db:51:84:1a:55:03:56: + e0:00:7e:74:06:ff:38:c4:72:1d:d3:a8:3f:68:31:5d:d3:09: + c7:2e:8c:5b:63:e0:e8:dc:1e:d2:ec:61:1e:f2:de:e5:ef:f6: + 99:76:60:2d:1e:94:72:71:c6:0b:2a:32:c7:92:4e:d5:46:d7: + 1d:f9:a9:19:0a:c8:fa:95:ce:6d:23:98:aa:0b:38:ad:9a:56: + 0d:6f:8d:f1:31:00:88:c1:17:9c:cd:19:36:35:fe:55:53:a0: + e0:3c:33:5f:96:5e:e2:32:e9:df:33:bb:06:4a:a9:d8:84:73: + ce:77:d2:c6:ac:71:e1:5c:a3:1d:0c:bb:0a:df:5f:e2:a3:71: + d8:da:37:5a:a0:78:2b:f4:d4:7d:eb:76:ed:f2:61:70:a5:65: + 9a:d3:89:34:18:ab:fb:72:3e:d7:b4:3d:79:5c:d8:1f:a1:33: + 7b:d9:82:50:0c:93:17:aa:6c:dc:c2:82:bb:02:57:36:af:98: + 27:2a:39:50:e1:b0:89:f5:25:97:7e:47:68:10:b4:ec:73:ca: + b3:97:d1:24:dc:f6:62:a0:28:d3:b5:a3:b8:64:b7:88:62:42: + cf:9d:53:cd:99:be:64:68:8f:4f:1e:12:48:f7:d2:29:c3:98: + 28:ca:f2:32:0b:93:8c:29:4f:3c:60:32:cd:05:96:61:ec:f2: + af:fe:b3:70:2c:2e:a6:f2 +SHA1 Fingerprint=D5:EC:8D:7B:4C:BA:79:F4:E7:E8:CB:9D:6B:AE:77:83:10:03:21:6A +-----BEGIN CERTIFICATE----- +MIIFdDCCA1ygAwIBAgIQVW9l47TZkGobCdFsPsBsIDANBgkqhkiG9w0BAQsFADBU +MQswCQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRI +T1JJVFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0ExMB4XDTE5MTIxOTAz +MTYxN1oXDTQ0MTIxMjAzMTYxN1owVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJF +SUpJTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2Jh +bCBSb290IENBMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPFmCL3Z +xRVhy4QEQaVpN3cdwbB7+sN3SJATcmTRuHyQNZ0YeYjjlwE8R4HyDqKYDZ4/N+AZ +spDyRhySsTphzvq3Rp4Dhtczbu33RYx2N95ulpH3134rhxfVizXuhJFyV9xgw8O5 +58dnJCNPYwpj9mZ9S1WnP3hkSWkSl+BMDdMJoDIwOvqfwPKcxRIqLhy1BDPapDgR +at7GGPZHOiJBhyL8xIkoVNiMpTAK+BcWyqw3/XmnkRd4OJmtWO2y3syJfQOcs4ll +5+M7sSKGjwZteAf9kRJ/sGsciQ35uMt0WwfCyPQ10WRjeulumijWML3mG90Vr4Tq +nMfK9Q7q8l0ph49pczm+LiRvRSGsxdRpJQaDrXpIhRMsDQa4bHlW/KNnMoH1V6XK +V0Jp6VwkYe/iMBhORJhVb3rCk9gZtt58R4oRTklH2yiUAguUSiz5EtBP6DF+bHq/ +pj+bOT0CFqMYs2esWz8sgytnOYFcuX6U1WTdno9uruh8W7TXakdI136z1C2OVnZO +z2nxbkRs1CTqjSShGL+9V/6pmTW12xB3uD1IutbB5/EjPtffhZ0nPNRAvQoMvfXn +jSXWgXSHRtQpdaJCbPdzied9v3pKH9MiyRVVz99vfFXQpIsHETdfg6YmV6YBW37+ +WGgHqel62bno/1Afq8K0wM7o6v0PvY1NuLxxAgMBAAGjQjBAMB0GA1UdDgQWBBTF +7+3M2I0hxkjk49cULqcWk+WYATAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE +AwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAUoKsITQfI/Ki2Pm4rzc2IInRNwPWaZ+4 +YRC6ojGYWUfo0Q0lHhVBDOAqVdVXUsv45Mdpox1NcQJeXyFFYEhcCY5JEMEE3Kli +awLwQ8hOnThJdMkycFRtwUf8jrQ2ntScvd0g1lPJGKm1Vrl2i5VnZu69mP6u775u ++2D2/VnGKhs/I0qUJDAnyIm860Qkmss9vk/Ves6OF8tiwdneHg56/0OGNFK8YT88 +X7vZdrRTvJez/opMEi4r89fO4aL/3Xtw+zuhTaRjAv04l5U/BXCga99igUOLtFkN +SoxUnMW7gZ/NfaXvCyUeOiDbHPwfmGcCCtRzRBPbUYQaVQNW4AB+dAb/OMRyHdOo +P2gxXdMJxy6MW2Pg6Nwe0uxhHvLe5e/2mXZgLR6UcnHGCyoyx5JO1UbXHfmpGQrI ++pXObSOYqgs4rZpWDW+N8TEAiMEXnM0ZNjX+VVOg4DwzX5Ze4jLp3zO7Bkqp2IRz +znfSxqxx4VyjHQy7Ct9f4qNx2No3WqB4K/TUfet27fJhcKVlmtOJNBir+3I+17Q9 +eVzYH6Eze9mCUAyTF6ps3MKCuwJXNq+YJyo5UOGwifUll35HaBC07HPKs5fRJNz2 +YqAo07WjuGS3iGJCz51TzZm+ZGiPTx4SSPfSKcOYKMryMguTjClPPGAyzQWWYezy +r/6zcCwupvI= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/BJCA_Global_Root_CA2.pem b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem new file mode 100644 index 000000000000..da44a530a038 --- /dev/null +++ b/secure/caroot/trusted/BJCA_Global_Root_CA2.pem @@ -0,0 +1,67 @@ +## +## BJCA Global Root CA2 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 2c:17:08:7d:64:2a:c0:fe:85:18:59:06:cf:b4:4a:eb + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA2 + Validity + Not Before: Dec 19 03:18:21 2019 GMT + Not After : Dec 12 03:18:21 2044 GMT + Subject: C = CN, O = BEIJING CERTIFICATE AUTHORITY, CN = BJCA Global Root CA2 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:9d:cb:80:91:8d:53:67:b5:b9:50:b1:03:f8:e5: + 49:1f:41:22:09:b0:51:52:58:d6:2b:34:8f:c5:12: + 46:14:c5:8b:2f:2c:84:ff:2c:6e:a8:d5:f1:09:e3: + 03:21:14:c4:43:3d:7c:c1:2c:c4:4b:6a:4a:cd:e9: + 87:e0:7d:f6:22:be:fa:4a:51:b8:30:8a:fd:e1:de: + 18:12:0a:f6:47:b7:e7:17:bf:27:8a:d4:41:4c:96: + 3c:60:96:c1:fd:15:1c + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + D2:4A:B1:51:7F:06:F0:D1:82:1F:4E:6E:5F:AB:83:FC:48:D4:B0:91 + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:30:1a:bc:5b:d7:fe:a9:d2:54:0e:4a:5d:d2:6d:b1: + 40:dc:f4:43:d5:d2:4a:99:19:12:56:80:f7:83:34:e1:35:4e: + 48:6d:04:0f:57:31:30:30:2d:b1:aa:9d:03:38:db:06:02:31: + 00:cb:cc:87:53:cb:7a:df:20:51:73:90:c0:a8:5b:61:d0:c5: + 50:39:fd:85:fe:c1:e3:78:f8:a6:d6:4b:bd:9b:87:8f:0f:e5: + d6:53:96:ab:3c:c8:40:da:61:f7:53:a3:f7 +SHA1 Fingerprint=F4:27:86:EB:6E:B8:6D:88:31:67:02:FB:BA:66:A4:53:00:AA:7A:A6 +-----BEGIN CERTIFICATE----- +MIICJTCCAaugAwIBAgIQLBcIfWQqwP6FGFkGz7RK6zAKBggqhkjOPQQDAzBUMQsw +CQYDVQQGEwJDTjEmMCQGA1UECgwdQkVJSklORyBDRVJUSUZJQ0FURSBBVVRIT1JJ +VFkxHTAbBgNVBAMMFEJKQ0EgR2xvYmFsIFJvb3QgQ0EyMB4XDTE5MTIxOTAzMTgy +MVoXDTQ0MTIxMjAzMTgyMVowVDELMAkGA1UEBhMCQ04xJjAkBgNVBAoMHUJFSUpJ +TkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZMR0wGwYDVQQDDBRCSkNBIEdsb2JhbCBS +b290IENBMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ3LgJGNU2e1uVCxA/jlSR9B +IgmwUVJY1is0j8USRhTFiy8shP8sbqjV8QnjAyEUxEM9fMEsxEtqSs3ph+B99iK+ ++kpRuDCK/eHeGBIK9ke35xe/J4rUQUyWPGCWwf0VHKNCMEAwHQYDVR0OBBYEFNJK +sVF/BvDRgh9Obl+rg/xI1LCRMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQD +AgEGMAoGCCqGSM49BAMDA2gAMGUCMBq8W9f+qdJUDkpd0m2xQNz0Q9XSSpkZElaA +94M04TVOSG0ED1cxMDAtsaqdAzjbBgIxAMvMh1PLet8gUXOQwKhbYdDFUDn9hf7B +43j4ptZLvZuHjw/l1lOWqzzIQNph91Oj9w== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Certainly_Root_E1.pem b/secure/caroot/trusted/Certainly_Root_E1.pem new file mode 100644 index 000000000000..0750f7128ae6 --- /dev/null +++ b/secure/caroot/trusted/Certainly_Root_E1.pem @@ -0,0 +1,66 @@ +## +## Certainly Root E1 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 06:25:33:b1:47:03:33:27:5c:f9:8d:9a:b9:bf:cc:f8 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = Certainly, CN = Certainly Root E1 + Validity + Not Before: Apr 1 00:00:00 2021 GMT + Not After : Apr 1 00:00:00 2046 GMT + Subject: C = US, O = Certainly, CN = Certainly Root E1 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:de:6f:f8:7f:1c:df:ed:f9:47:87:86:b1:a4:c0: + 8a:f8:82:97:80:ea:8f:c8:4a:5e:2a:7d:88:68:a7: + 01:62:14:91:24:7a:5c:9e:a3:17:7d:8a:86:21:34: + 18:50:1b:10:de:d0:37:4b:26:c7:19:60:80:e9:34: + bd:60:19:36:40:d6:29:87:09:3c:91:7a:f6:bc:13: + 23:dd:59:4e:04:5e:cf:c8:02:1c:18:53:c1:31:d8: + da:20:e9:44:8d:e4:76 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + F3:28:18:CB:64:75:EE:29:2A:EB:ED:AE:23:58:38:85:EB:C8:22:07 + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:31:00:b1:8e:5a:20:c3:b2:19:62:4d:de:b0:4f:df: + 6e:d2:70:8a:f1:9f:7e:6a:8c:e6:ba:de:83:69:ca:69:b3:a9: + 05:b5:96:92:17:87:c2:d2:ea:d0:7b:ce:d8:41:5b:7c:ae:02: + 30:46:de:ea:cb:5d:9a:ec:32:c2:65:16:b0:4c:30:5c:30:f3: + da:4e:73:86:06:d8:ce:89:04:48:37:37:f8:dd:33:51:9d:70: + af:7b:55:d8:01:2e:7d:05:64:0e:86:b8:91 +SHA1 Fingerprint=F9:E1:6D:DC:01:89:CF:D5:82:45:63:3E:C5:37:7D:C2:EB:93:6F:2B +-----BEGIN CERTIFICATE----- +MIIB9zCCAX2gAwIBAgIQBiUzsUcDMydc+Y2aub/M+DAKBggqhkjOPQQDAzA9MQsw +CQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0YWlu +bHkgUm9vdCBFMTAeFw0yMTA0MDEwMDAwMDBaFw00NjA0MDEwMDAwMDBaMD0xCzAJ +BgNVBAYTAlVTMRIwEAYDVQQKEwlDZXJ0YWlubHkxGjAYBgNVBAMTEUNlcnRhaW5s +eSBSb290IEUxMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE3m/4fxzf7flHh4axpMCK ++IKXgOqPyEpeKn2IaKcBYhSRJHpcnqMXfYqGITQYUBsQ3tA3SybHGWCA6TS9YBk2 +QNYphwk8kXr2vBMj3VlOBF7PyAIcGFPBMdjaIOlEjeR2o0IwQDAOBgNVHQ8BAf8E +BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU8ygYy2R17ikq6+2uI1g4 +hevIIgcwCgYIKoZIzj0EAwMDaAAwZQIxALGOWiDDshliTd6wT99u0nCK8Z9+aozm +ut6Dacpps6kFtZaSF4fC0urQe87YQVt8rgIwRt7qy12a7DLCZRawTDBcMPPaTnOG +BtjOiQRINzf43TNRnXCve1XYAS59BWQOhriR +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/Certainly_Root_R1.pem b/secure/caroot/trusted/Certainly_Root_R1.pem new file mode 100644 index 000000000000..a4e6f28e33a6 --- /dev/null +++ b/secure/caroot/trusted/Certainly_Root_R1.pem @@ -0,0 +1,134 @@ +## +## Certainly Root R1 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 8e:0f:f9:4b:90:71:68:65:33:54:f4:d4:44:39:b7:e0 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = US, O = Certainly, CN = Certainly Root R1 + Validity + Not Before: Apr 1 00:00:00 2021 GMT + Not After : Apr 1 00:00:00 2046 GMT + Subject: C = US, O = Certainly, CN = Certainly Root R1 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:d0:36:d4:1f:ea:dd:ab:e4:d1:b6:e6:fb:22:c0: + dd:13:0d:6a:7b:22:13:1c:97:3c:68:63:66:32:9c: + 03:b5:8d:a4:81:83:da:78:30:11:cf:dc:b2:2b:be: + 92:bf:8e:e4:c4:13:be:a4:68:4c:da:02:68:16:74: + be:b2:dd:04:e4:6b:2a:dd:37:1f:60:2c:db:f5:f7: + a1:7c:95:b7:0c:70:86:2e:f1:3a:ef:52:f7:cc:d3: + 9b:f9:8b:be:0e:df:31:b7:9d:68:5c:92:a6:f5:e5: + f3:0a:34:b5:ff:7b:a2:e4:87:a1:c6:af:17:00:ef: + 03:91:ed:a9:1c:4e:71:3d:d2:8b:6c:89:f4:78:86: + e6:6a:49:a0:ce:b5:d2:b0:ab:9b:f6:f4:d4:2e:e3: + 72:f9:36:c6:eb:15:b7:25:8c:3a:fc:25:0d:b3:22: + 73:21:74:c8:4a:96:61:92:f5:2f:0b:18:a5:f4:ad: + e2:ee:41:bd:01:79:fa:96:8c:8d:17:02:30:b4:f9: + af:78:1a:8c:b4:36:10:10:07:05:70:d0:f4:31:90: + 8a:51:c5:86:26:79:b2:11:88:5e:c5:f0:0a:54:cd: + 49:a6:bf:02:9c:d2:44:a7:ed:e3:78:ef:46:5e:6d: + 71:d1:79:70:1c:46:5f:51:e9:c9:37:dc:5f:7e:69: + 7b:41:df:34:45:e0:3b:84:f4:a1:8a:0a:36:9e:37: + cc:62:52:e1:89:0d:28:f9:7a:23:b1:0d:3d:3d:9a: + fd:9d:81:ef:2c:90:c0:7b:44:4e:bb:49:e0:0e:4a: + 56:92:bc:cb:b5:dd:79:17:89:91:de:61:89:74:92: + a8:e3:32:85:be:4e:85:a4:4b:59:cb:2b:c5:78:8e: + 71:54:d0:02:37:99:8c:e5:49:ea:e0:54:72:a4:11: + 06:2f:0b:8c:c1:5b:be:b5:a1:b0:53:6e:9c:b8:60: + 91:1f:59:6b:f9:2d:f4:94:0a:97:b5:ec:c5:76:03: + 54:1b:65:52:ba:4c:92:56:51:35:a0:40:d8:29:db: + ae:52:76:3b:2d:30:40:9b:8a:d0:42:56:b4:b7:88: + 01:a4:87:3b:53:96:cd:a3:16:8f:f3:66:aa:17:b1: + c7:60:e0:c1:43:05:0c:ee:9b:5b:60:6f:06:5c:87: + 5b:27:f9:40:11:9e:9c:33:c1:b7:e5:35:57:05:7f: + 27:ce:17:20:8c:1c:fc:f1:fb:da:31:29:49:ed:f5: + 0b:84:a7:4f:c1:f6:4e:c2:28:9c:fa:ee:e0:af:07: + fb:33:11:7a:21:4f:0b:21:10:b6:40:3a:ab:22:3a: + 04:9c:8b:9b:84:86:72:9a:d2:a7:a5:c4:b4:75:91: + a9:2b:23 + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + E0:AA:3F:25:8D:9F:44:5C:C1:3A:E8:2E:AE:77:4C:84:3E:67:0C:F4 + Signature Algorithm: sha256WithRSAEncryption + b9:57:af:b8:12:da:57:83:8f:68:0b:33:1d:03:53:55:f4:95: + 70:e4:2b:3d:b0:39:eb:fa:89:62:fd:f7:d6:18:04:2f:21:34: + dd:f1:68:f0:d5:96:5a:de:c2:80:a3:c1:8d:c6:6a:f7:59:77: + ae:15:64:cf:5b:79:05:77:66:ea:8c:d3:6b:0d:dd:f1:59:2c: + c1:33:a5:30:80:15:45:07:45:1a:31:22:b6:92:00:ab:99:4d: + 3a:8f:77:af:a9:22:ca:2f:63:ca:15:d6:c7:c6:f0:3d:6c:fc: + 1c:0d:98:10:61:9e:11:a2:22:d7:0a:f2:91:7a:6b:39:0e:2f: + 30:c3:36:49:9f:e0:e9:0f:02:44:50:37:94:55:7d:ea:9f:f6: + 3b:ba:94:a5:4c:e9:bc:3e:51:b4:e8:ca:92:36:54:6d:5c:25: + 28:da:dd:ad:14:fd:d3:ee:e2:22:05:eb:d0:f2:b7:68:12:d7: + 5a:8a:41:1a:c6:92:a5:5a:3b:63:45:4f:bf:e1:3a:77:22:2f: + 5c:bf:46:f9:5a:03:85:13:42:5f:ca:de:53:d7:62:b5:a6:35: + 04:c2:47:ff:99:fd:84:df:5c:ce:e9:5e:80:28:41:f2:7d:e7: + 1e:90:d8:4f:76:3e:82:3c:0d:fc:a5:03:fa:7b:1a:d9:45:1e: + 60:da:c4:8e:f9:fc:2b:c9:7b:95:c5:2a:ff:aa:89:df:82:31: + 0f:72:ff:0c:27:d7:0a:1e:56:00:50:1e:0c:90:c1:96:b5:d8: + 14:85:bb:a7:0d:16:c1:f8:07:24:1b:ba:85:a1:1a:05:09:80: + ba:95:63:c9:3a:ec:25:9f:7f:9d:ba:a4:47:15:9b:44:70:f1: + 6a:4b:d6:38:5e:43:f3:18:7e:50:6e:e9:5a:28:e6:65:e6:77: + 1b:3a:fd:1d:be:03:26:a3:db:d4:e1:bb:7e:96:27:2b:1d:ee: + a4:fb:da:25:54:13:03:de:39:c6:c3:1f:4d:90:ec:8f:1b:4a: + d2:1c:ed:85:95:38:50:79:46:d6:c1:90:50:31:a9:5c:9a:6e: + 1d:f5:33:56:8b:a7:99:d2:f2:c8:2c:33:93:92:30:c7:4e:8c: + 65:33:10:64:17:fd:24:17:96:d1:8d:c2:3a:6a:2b:eb:13:8b: + 44:f2:21:f3:4a:1a:b7:77:5f:d7:ed:88:a4:72:e5:39:1f:95: + 9d:be:67:c1:70:11:3d:bb:f4:f8:49:b7:e3:26:97:3a:9f:d2: + 5f:7c:fb:c0:99:7c:39:29:e0:7b:1d:bf:0d:a7:8f:d2:29:34: + 6e:24:15:cb:de:90:5e:bf:1a:c4:66:ea:c2:e6:ba:39:5f:8a: + 99:a9:41:59:07:b0:2c:af +SHA1 Fingerprint=A0:50:EE:0F:28:71:F4:27:B2:12:6D:6F:50:96:25:BA:CC:86:42:AF +-----BEGIN CERTIFICATE----- +MIIFRzCCAy+gAwIBAgIRAI4P+UuQcWhlM1T01EQ5t+AwDQYJKoZIhvcNAQELBQAw +PTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUNlcnRhaW5seTEaMBgGA1UEAxMRQ2Vy +dGFpbmx5IFJvb3QgUjEwHhcNMjEwNDAxMDAwMDAwWhcNNDYwNDAxMDAwMDAwWjA9 +MQswCQYDVQQGEwJVUzESMBAGA1UEChMJQ2VydGFpbmx5MRowGAYDVQQDExFDZXJ0 +YWlubHkgUm9vdCBSMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANA2 +1B/q3avk0bbm+yLA3RMNansiExyXPGhjZjKcA7WNpIGD2ngwEc/csiu+kr+O5MQT +vqRoTNoCaBZ0vrLdBORrKt03H2As2/X3oXyVtwxwhi7xOu9S98zTm/mLvg7fMbed +aFySpvXl8wo0tf97ouSHocavFwDvA5HtqRxOcT3Si2yJ9HiG5mpJoM610rCrm/b0 +1C7jcvk2xusVtyWMOvwlDbMicyF0yEqWYZL1LwsYpfSt4u5BvQF5+paMjRcCMLT5 +r3gajLQ2EBAHBXDQ9DGQilHFhiZ5shGIXsXwClTNSaa/ApzSRKft43jvRl5tcdF5 +cBxGX1HpyTfcX35pe0HfNEXgO4T0oYoKNp43zGJS4YkNKPl6I7ENPT2a/Z2B7yyQ +wHtETrtJ4A5KVpK8y7XdeReJkd5hiXSSqOMyhb5OhaRLWcsrxXiOcVTQAjeZjOVJ +6uBUcqQRBi8LjMFbvrWhsFNunLhgkR9Za/kt9JQKl7XsxXYDVBtlUrpMklZRNaBA +2CnbrlJ2Oy0wQJuK0EJWtLeIAaSHO1OWzaMWj/Nmqhexx2DgwUMFDO6bW2BvBlyH +Wyf5QBGenDPBt+U1VwV/J84XIIwc/PH72jEpSe31C4SnT8H2TsIonPru4K8H+zMR +eiFPCyEQtkA6qyI6BJyLm4SGcprSp6XEtHWRqSsjAgMBAAGjQjBAMA4GA1UdDwEB +/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTgqj8ljZ9EXME66C6u +d0yEPmcM9DANBgkqhkiG9w0BAQsFAAOCAgEAuVevuBLaV4OPaAszHQNTVfSVcOQr +PbA56/qJYv331hgELyE03fFo8NWWWt7CgKPBjcZq91l3rhVkz1t5BXdm6ozTaw3d +8VkswTOlMIAVRQdFGjEitpIAq5lNOo93r6kiyi9jyhXWx8bwPWz8HA2YEGGeEaIi +1wrykXprOQ4vMMM2SZ/g6Q8CRFA3lFV96p/2O7qUpUzpvD5RtOjKkjZUbVwlKNrd +rRT90+7iIgXr0PK3aBLXWopBGsaSpVo7Y0VPv+E6dyIvXL9G+VoDhRNCX8reU9di +taY1BMJH/5n9hN9czulegChB8n3nHpDYT3Y+gjwN/KUD+nsa2UUeYNrEjvn8K8l7 +lcUq/6qJ34IxD3L/DCfXCh5WAFAeDJDBlrXYFIW7pw0WwfgHJBu6haEaBQmAupVj +yTrsJZ9/nbqkRxWbRHDxakvWOF5D8xh+UG7pWijmZeZ3Gzr9Hb4DJqPb1OG7fpYn +Kx3upPvaJVQTA945xsMfTZDsjxtK0hzthZU4UHlG1sGQUDGpXJpuHfUzVounmdLy +yCwzk5Iwx06MZTMQZBf9JBeW0Y3COmor6xOLRPIh80oat3df1+2IpHLlOR+Vnb5n +wXARPbv0+Em34yaXOp/SX3z7wJl8OSngex2/DaeP0ik0biQVy96QXr8axGbqwua6 +OV+KmalBWQewLK8= +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem new file mode 100644 index 000000000000..758d61032898 --- /dev/null +++ b/secure/caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem @@ -0,0 +1,79 @@ +## +## D-TRUST BR Root CA 1 2020 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 7c:c9:8f:2b:84:d7:df:ea:0f:c9:65:9a:d3:4b:4d:96 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = DE, O = D-Trust GmbH, CN = D-TRUST BR Root CA 1 2020 + Validity + Not Before: Feb 11 09:45:00 2020 GMT + Not After : Feb 11 09:44:59 2035 GMT + Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST BR Root CA 1 2020 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:c6:cb:c7:28:d1:fb:84:f5:9a:ef:42:14:20:e1: + 43:6b:6e:75:ad:fc:2b:03:84:d4:76:93:25:d7:59: + 3b:41:65:6b:1e:e6:34:2a:bb:74:f6:12:ce:e8:6d: + e7:ab:e4:3c:4e:3f:44:08:8b:cd:16:71:cb:bf:92: + 99:f4:a4:d7:3c:50:54:52:90:85:83:78:94:67:67: + a3:1c:09:19:3d:75:34:85:de:ed:60:7d:c7:0c:b4: + 41:52:b9:6e:e5:ee:42 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 73:91:10:AB:FF:55:B3:5A:7C:09:25:D5:B2:BA:08:A0:6B:AB:1F:6D + 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_1_2020.crl + + Full Name: + URI:ldap://directory.d-trust.net/CN=D-TRUST%20BR%20Root%20CA%201%202020,O=D-Trust%20GmbH,C=DE?certificaterevocationlist + + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:94:90:2d:13:fa:e1:63:f8:61:63:e8:ad:85: + 78:54:91:9c:b8:93:38:3e:1a:41:da:40:16:53:42:08:ca:2f: + 8e:f1:3e:81:56:c0:aa:d8:ed:18:c4:b0:ae:f4:3e:fa:26:02: + 31:00:f3:28:e2:c6:db:2b:99:fb:b7:51:b8:24:a3:a4:94:7a: + 1a:3f:e6:36:e2:03:57:33:8a:30:cb:82:c7:d6:14:11:d5:75: + 63:5b:14:95:9c:1f:01:cf:d8:d5:72:a7:0f:3b +SHA1 Fingerprint=1F:5B:98:F0:E3:B5:F7:74:3C:ED:E6:B0:36:7D:32:CD:F4:09:41:67 +-----BEGIN CERTIFICATE----- +MIIC2zCCAmCgAwIBAgIQfMmPK4TX3+oPyWWa00tNljAKBggqhkjOPQQDAzBIMQsw +CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRS +VVNUIEJSIFJvb3QgQ0EgMSAyMDIwMB4XDTIwMDIxMTA5NDUwMFoXDTM1MDIxMTA5 +NDQ1OVowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAG +A1UEAxMZRC1UUlVTVCBCUiBSb290IENBIDEgMjAyMDB2MBAGByqGSM49AgEGBSuB +BAAiA2IABMbLxyjR+4T1mu9CFCDhQ2tuda38KwOE1HaTJddZO0Flax7mNCq7dPYS +zuht56vkPE4/RAiLzRZxy7+SmfSk1zxQVFKQhYN4lGdnoxwJGT11NIXe7WB9xwy0 +QVK5buXuQqOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFHOREKv/ +VbNafAkl1bK6CKBrqx9tMA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6g +PKA6hjhodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X2JyX3Jvb3Rf +Y2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5l +dC9DTj1ELVRSVVNUJTIwQlIlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxPPUQtVHJ1 +c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjO +PQQDAwNpADBmAjEAlJAtE/rhY/hhY+ithXhUkZy4kzg+GkHaQBZTQgjKL47xPoFW +wKrY7RjEsK70PvomAjEA8yjixtsrmfu3Ubgko6SUeho/5jbiA1czijDLgsfWFBHV +dWNbFJWcHwHP2NVypw87 +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem new file mode 100644 index 000000000000..76991855eaa1 --- /dev/null +++ b/secure/caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem @@ -0,0 +1,79 @@ +## +## D-TRUST EV Root CA 1 2020 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 5f:02:41:d7:7a:87:7c:4c:03:a3:ac:96:8d:fb:ff:d0 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = DE, O = D-Trust GmbH, CN = D-TRUST EV Root CA 1 2020 + Validity + Not Before: Feb 11 10:00:00 2020 GMT + Not After : Feb 11 09:59:59 2035 GMT + Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST EV Root CA 1 2020 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:f1:0b:dd:86:43:20:19:df:97:85:e8:22:4a:9b: + cf:9d:98:bf:b4:05:26:c9:cb:e3:a6:d2:8f:c5:9e: + 78:7b:31:89:a9:89:ad:27:3c:65:10:82:fc:df:c3: + 9d:4e:f0:33:23:c4:d2:32:f5:1c:b0:df:33:17:5d: + c5:f0:b1:8a:f9:ef:b9:b7:14:ca:29:4a:c2:0f:a9: + 7f:75:65:49:2a:30:67:f4:64:f7:d6:1a:77:da:c3: + c2:97:61:42:7b:49:ad + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Subject Key Identifier: + 7F:10:01:16:37:3A:A4:28:E4:50:F8:A4:F7:EC:6B:32:B6:FE:E9:8B + 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_1_2020.crl + + Full Name: + URI:ldap://directory.d-trust.net/CN=D-TRUST%20EV%20Root%20CA%201%202020,O=D-Trust%20GmbH,C=DE?certificaterevocationlist + + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:ca:3c:c6:2a:75:c2:5e:75:62:39:36:00:60: + 5a:8b:c1:93:99:cc:d9:db:41:3b:3b:87:99:17:3b:d5:cc:4f: + ca:22:f7:a0:80:cb:f9:b4:b1:1b:56:f5:72:d2:fc:19:d1:02: + 31:00:91:f7:30:93:3f:10:46:2b:71:a4:d0:3b:44:9b:c0:29: + 02:05:b2:41:77:51:f3:79:5a:9e:8e:14:a0:4e:42:d2:5b:81: + f3:34:6a:03:e7:22:38:50:5b:ed:19:4f:43:16 +SHA1 Fingerprint=61:DB:8C:21:59:69:03:90:D8:7C:9C:12:86:54:CF:9D:3D:F4:DD:07 +-----BEGIN CERTIFICATE----- +MIIC2zCCAmCgAwIBAgIQXwJB13qHfEwDo6yWjfv/0DAKBggqhkjOPQQDAzBIMQsw +CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSIwIAYDVQQDExlELVRS +VVNUIEVWIFJvb3QgQ0EgMSAyMDIwMB4XDTIwMDIxMTEwMDAwMFoXDTM1MDIxMTA5 +NTk1OVowSDELMAkGA1UEBhMCREUxFTATBgNVBAoTDEQtVHJ1c3QgR21iSDEiMCAG +A1UEAxMZRC1UUlVTVCBFViBSb290IENBIDEgMjAyMDB2MBAGByqGSM49AgEGBSuB +BAAiA2IABPEL3YZDIBnfl4XoIkqbz52Yv7QFJsnL46bSj8WeeHsxiamJrSc8ZRCC +/N/DnU7wMyPE0jL1HLDfMxddxfCxivnvubcUyilKwg+pf3VlSSowZ/Rk99Yad9rD +wpdhQntJraOCAQ0wggEJMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFH8QARY3 +OqQo5FD4pPfsazK2/umLMA4GA1UdDwEB/wQEAwIBBjCBxgYDVR0fBIG+MIG7MD6g +PKA6hjhodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X2V2X3Jvb3Rf +Y2FfMV8yMDIwLmNybDB5oHegdYZzbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5l +dC9DTj1ELVRSVVNUJTIwRVYlMjBSb290JTIwQ0ElMjAxJTIwMjAyMCxPPUQtVHJ1 +c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdDAKBggqhkjO +PQQDAwNpADBmAjEAyjzGKnXCXnViOTYAYFqLwZOZzNnbQTs7h5kXO9XMT8oi96CA +y/m0sRtW9XLS/BnRAjEAkfcwkz8QRitxpNA7RJvAKQIFskF3UfN5Wp6OFKBOQtJb +gfM0agPnIjhQW+0ZT0MW +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem new file mode 100644 index 000000000000..a6f2e6a0c771 --- /dev/null +++ b/secure/caroot/trusted/DigiCert_TLS_ECC_P384_Root_G5.pem @@ -0,0 +1,67 @@ +## +## DigiCert TLS ECC P384 Root G5 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 09:e0:93:65:ac:f7:d9:c8:b9:3e:1c:0b:04:2a:2e:f3 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS ECC P384 Root G5 + Validity + Not Before: Jan 15 00:00:00 2021 GMT + Not After : Jan 14 23:59:59 2046 GMT + Subject: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS ECC P384 Root G5 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:c1:44:a1:cf:11:97:50:9a:de:23:82:35:07:cd: + d0:cb:18:9d:d2:f1:7f:77:35:4f:3b:dd:94:72:52: + ed:c2:3b:f8:ec:fa:7b:6b:58:20:ec:99:ae:c9:fc: + 68:b3:75:b9:db:09:ec:c8:13:f5:4e:c6:0a:1d:66: + 30:4c:bb:1f:47:0a:3c:61:10:42:29:7c:a5:08:0e: + e0:22:e9:d3:35:68:ce:9b:63:9f:84:b5:99:4d:58: + a0:8e:f5:54:e7:95:c9 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Subject Key Identifier: + C1:51:45:50:59:AB:3E:E7:2C:5A:FA:20:22:12:07:80:88:7C:11:6A + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: ecdsa-with-SHA384 + 30:65:02:31:00:89:6a:8d:47:e7:ec:fc:6e:55:03:d9:67:6c: + 26:4e:83:c6:fd:c9:fb:2b:13:bc:b7:7a:8c:b4:65:d2:69:69: + 63:13:63:3b:26:50:2e:01:a1:79:06:91:9d:48:bf:c2:be:02: + 30:47:c3:15:7b:b1:a0:91:99:49:93:a8:3c:7c:e8:46:06:8b: + 2c:f2:31:00:94:9d:62:c8:89:bd:19:84:14:e9:a5:fb:01:b8: + 0d:76:43:8c:2e:53:cb:7c:df:0c:17:96:50 +SHA1 Fingerprint=17:F3:DE:5E:9F:0F:19:E9:8E:F6:1F:32:26:6E:20:C4:07:AE:30:EE +-----BEGIN CERTIFICATE----- +MIICGTCCAZ+gAwIBAgIQCeCTZaz32ci5PhwLBCou8zAKBggqhkjOPQQDAzBOMQsw +CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJjAkBgNVBAMTHURp +Z2lDZXJ0IFRMUyBFQ0MgUDM4NCBSb290IEc1MB4XDTIxMDExNTAwMDAwMFoXDTQ2 +MDExNDIzNTk1OVowTjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDkRpZ2lDZXJ0LCBJ +bmMuMSYwJAYDVQQDEx1EaWdpQ2VydCBUTFMgRUNDIFAzODQgUm9vdCBHNTB2MBAG +ByqGSM49AgEGBSuBBAAiA2IABMFEoc8Rl1Ca3iOCNQfN0MsYndLxf3c1TzvdlHJS +7cI7+Oz6e2tYIOyZrsn8aLN1udsJ7MgT9U7GCh1mMEy7H0cKPGEQQil8pQgO4CLp +0zVozptjn4S1mU1YoI71VOeVyaNCMEAwHQYDVR0OBBYEFMFRRVBZqz7nLFr6ICIS +B4CIfBFqMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49 +BAMDA2gAMGUCMQCJao1H5+z8blUD2WdsJk6Dxv3J+ysTvLd6jLRl0mlpYxNjOyZQ +LgGheQaRnUi/wr4CMEfDFXuxoJGZSZOoPHzoRgaLLPIxAJSdYsiJvRmEFOml+wG4 +DXZDjC5Ty3zfDBeWUA== +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem new file mode 100644 index 000000000000..cb58c6a21418 --- /dev/null +++ b/secure/caroot/trusted/DigiCert_TLS_RSA4096_Root_G5.pem @@ -0,0 +1,134 @@ +## +## DigiCert TLS RSA4096 Root G5 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 08:f9:b4:78:a8:fa:7e:da:6a:33:37:89:de:7c:cf:8a + Signature Algorithm: sha384WithRSAEncryption + Issuer: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS RSA4096 Root G5 + Validity + Not Before: Jan 15 00:00:00 2021 GMT + Not After : Jan 14 23:59:59 2046 GMT + Subject: C = US, O = "DigiCert, Inc.", CN = DigiCert TLS RSA4096 Root G5 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:b3:d0:f4:c9:79:11:9d:fd:fc:66:81:e7:cc:d5: + e4:bc:ec:81:3e:6a:35:8e:2e:b7:e7:de:af:f9:07: + 4d:cf:30:9d:ea:09:0b:99:bd:6c:57:da:18:4a:b8: + 78:ac:3a:39:a8:a6:48:ac:2e:72:e5:bd:eb:f1:1a: + cd:e7:a4:03:a9:3f:11:b4:d8:2f:89:16:fb:94:01: + 3d:bb:2f:f8:13:05:a1:78:1c:8e:28:e0:45:e0:83: + f4:59:1b:95:b3:ae:7e:03:45:e5:be:c2:42:fe:ee: + f2:3c:b6:85:13:98:32:9d:16:a8:29:c2:0b:1c:38: + dc:9f:31:77:5c:bf:27:a3:fc:27:ac:b7:2b:bd:74: + 9b:17:2d:f2:81:da:5d:b0:e1:23:17:3e:88:4a:12: + 23:d0:ea:cf:9d:de:03:17:b1:42:4a:a0:16:4c:a4: + 6d:93:e9:3f:3a:ee:3a:7c:9d:58:9d:f4:4e:8f:fc: + 3b:23:c8:6d:b8:e2:05:da:cc:eb:ec:c3:31:f4:d7: + a7:29:54:80:cf:44:5b:4c:6f:30:9e:f3:cc:dd:1f: + 94:43:9d:4d:7f:70:70:0d:d4:3a:d1:37:f0:6c:9d: + 9b:c0:14:93:58:ef:cd:41:38:75:bc:13:03:95:7c: + 7f:e3:5c:e9:d5:0d:d5:e2:7c:10:62:aa:6b:f0:3d: + 76:f3:3f:a3:e8:b0:c1:fd:ef:aa:57:4d:ac:86:a7: + 18:b4:29:c1:2c:0e:bf:64:be:29:8c:d8:02:2d:cd: + 5c:2f:f2:7f:ef:15:f4:0c:15:ac:0a:b0:f1:d3:0d: + 4f:6a:4d:77:97:01:a0:f1:66:b7:b7:ce:ef:ce:ec: + ec:a5:75:ca:ac:e3:e1:63:f7:b8:a1:04:c8:bc:7b: + 3f:5d:2d:16:22:56:ed:48:49:fe:a7:2f:79:30:25: + 9b:ba:6b:2d:3f:9d:3b:c4:17:e7:1d:2e:fb:f2:cf: + a6:fc:e3:14:2c:96:98:21:8c:b4:91:e9:19:60:83: + f2:30:2b:06:73:50:d5:98:3b:06:e9:c7:8a:0c:60: + 8c:28:f8:52:9b:6e:e1:f6:4d:bb:06:24:9b:d7:2b: + 26:3f:fd:2a:2f:71:f5:d6:24:be:7f:31:9e:0f:6d: + e8:8f:4f:4d:a3:3f:ff:35:ea:df:49:5e:41:8f:86: + f9:f1:77:79:4b:1b:b4:a3:5e:2f:fb:46:02:d0:66: + 13:5e:5e:85:4f:ce:d8:70:88:7b:ce:01:b5:96:97: + d7:cd:7d:fd:82:f8:c2:24:c1:ca:01:39:4f:8d:a2: + c1:14:40:1f:9c:66:d5:0c:09:46:d6:f2:d0:d1:48: + 76:56:3a:43:cb:b6:0a:11:39:ba:8c:13:6c:06:b5: + 9e:cf:eb + Exponent: 65537 (0x10001) + X509v3 extensions: + X509v3 Subject Key Identifier: + 51:33:1C:ED:36:40:AF:17:D3:25:CD:69:68:F2:AF:4E:23:3E:B3:41 + X509v3 Key Usage: critical + Digital Signature, Certificate Sign, CRL Sign + X509v3 Basic Constraints: critical + CA:TRUE + Signature Algorithm: sha384WithRSAEncryption + 60:a6:af:5b:5f:57:da:89:db:4b:50:a9:c4:23:35:21:ff:d0: + 61:30:84:91:b7:3f:10:cf:25:8e:c9:bf:46:34:d9:c1:21:26: + 1c:70:19:72:1e:a3:c9:87:fe:a9:43:64:96:3a:c8:53:04:0a: + b6:41:bb:c4:47:00:d9:9f:18:18:3b:b2:0e:f3:34:ea:24:f7: + dd:af:20:60:ae:92:28:5f:36:e7:5d:e4:de:c7:3c:db:50:39: + ad:bb:3d:28:4d:96:7c:76:c6:5b:f4:c1:db:14:a5:ab:19:62: + 07:18:40:5f:97:91:dc:9c:c7:ab:b5:51:0d:e6:69:53:55:cc: + 39:7d:da:c5:11:55:72:c5:3b:8b:89:f8:34:2d:a4:17:e5:17: + e6:99:7d:30:88:21:37:cd:30:17:3d:b8:f2:bc:a8:75:a0:43: + dc:3e:89:4b:90:ae:6d:03:e0:1c:a3:a0:96:09:bb:7d:a3:b7: + 2a:10:44:4b:46:07:34:63:ed:31:b9:04:ee:a3:9b:9a:ae:e6: + 31:78:f4:ea:24:61:3b:ab:58:64:ff:bb:87:27:62:25:81:df: + dc:a1:2f:f6:ed:a7:ff:7a:8f:51:2e:30:f8:a4:01:d2:85:39: + 5f:01:99:96:6f:5a:5b:70:19:46:fe:86:60:3e:ad:80:10:09: + dd:39:25:2f:58:7f:bb:d2:74:f0:f7:46:1f:46:39:4a:d8:53: + d0:f3:2e:3b:71:a5:d4:6f:fc:f3:67:e4:07:8f:dd:26:19:e1: + 8d:5b:fa:a3:93:11:9b:e9:c8:3a:c3:55:68:9a:92:e1:52:76: + 38:e8:e1:ba:bd:fb:4f:d5:ef:b3:e7:48:83:31:f0:82:21:e3: + b6:be:a7:ab:6f:ef:9f:df:4c:cf:01:b8:62:6a:23:3d:e7:09: + 4d:80:1b:7b:30:a4:c3:dd:07:7f:34:be:a4:26:b2:f6:41:e8: + 09:1d:e3:20:98:aa:37:4f:ff:f7:f1:e2:29:70:31:47:3f:74: + d0:14:16:fa:21:8a:02:d5:8a:09:94:77:2e:f2:59:28:8b:7c: + 50:92:0a:66:78:38:83:75:c4:b5:5a:a8:11:c6:e5:c1:9d:66: + 55:cf:53:c4:af:d7:75:85:a9:42:13:56:ec:21:77:81:93:5a: + 0c:ea:96:d9:49:ca:a1:08:f2:97:3b:6d:9b:04:18:24:44:8e: + 7c:01:f2:dc:25:d8:5e:86:9a:b1:39:db:f5:91:32:6a:d1:a6: + 70:8a:a2:f7:de:a4:45:85:26:a8:1e:8c:5d:29:5b:c8:4b:d8: + 9a:6a:03:5e:70:f2:85:4f:6c:4b:68:2f:ca:54:f6:8c:da:32: + fe:c3:6b:83:3f:38:c6:7e +SHA1 Fingerprint=A7:88:49:DC:5D:7C:75:8C:8C:DE:39:98:56:B3:AA:D0:B2:A5:71:35 +-----BEGIN CERTIFICATE----- +MIIFZjCCA06gAwIBAgIQCPm0eKj6ftpqMzeJ3nzPijANBgkqhkiG9w0BAQwFADBN +MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJTAjBgNVBAMT +HERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcN +NDYwMTE0MjM1OTU5WjBNMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQs +IEluYy4xJTAjBgNVBAMTHERpZ2lDZXJ0IFRMUyBSU0E0MDk2IFJvb3QgRzUwggIi +MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz0PTJeRGd/fxmgefM1eS87IE+ +ajWOLrfn3q/5B03PMJ3qCQuZvWxX2hhKuHisOjmopkisLnLlvevxGs3npAOpPxG0 +2C+JFvuUAT27L/gTBaF4HI4o4EXgg/RZG5Wzrn4DReW+wkL+7vI8toUTmDKdFqgp +wgscONyfMXdcvyej/Cestyu9dJsXLfKB2l2w4SMXPohKEiPQ6s+d3gMXsUJKoBZM +pG2T6T867jp8nVid9E6P/DsjyG244gXazOvswzH016cpVIDPRFtMbzCe88zdH5RD +nU1/cHAN1DrRN/BsnZvAFJNY781BOHW8EwOVfH/jXOnVDdXifBBiqmvwPXbzP6Po +sMH976pXTayGpxi0KcEsDr9kvimM2AItzVwv8n/vFfQMFawKsPHTDU9qTXeXAaDx +Zre3zu/O7Oyldcqs4+Fj97ihBMi8ez9dLRYiVu1ISf6nL3kwJZu6ay0/nTvEF+cd +Lvvyz6b84xQslpghjLSR6Rlgg/IwKwZzUNWYOwbpx4oMYIwo+FKbbuH2TbsGJJvX +KyY//SovcfXWJL5/MZ4PbeiPT02jP/816t9JXkGPhvnxd3lLG7SjXi/7RgLQZhNe +XoVPzthwiHvOAbWWl9fNff2C+MIkwcoBOU+NosEUQB+cZtUMCUbW8tDRSHZWOkPL +tgoRObqME2wGtZ7P6wIDAQABo0IwQDAdBgNVHQ4EFgQUUTMc7TZArxfTJc1paPKv +TiM+s0EwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN +AQEMBQADggIBAGCmr1tfV9qJ20tQqcQjNSH/0GEwhJG3PxDPJY7Jv0Y02cEhJhxw +GXIeo8mH/qlDZJY6yFMECrZBu8RHANmfGBg7sg7zNOok992vIGCukihfNudd5N7H +PNtQOa27PShNlnx2xlv0wdsUpasZYgcYQF+Xkdycx6u1UQ3maVNVzDl92sURVXLF +O4uJ+DQtpBflF+aZfTCIITfNMBc9uPK8qHWgQ9w+iUuQrm0D4ByjoJYJu32jtyoQ +REtGBzRj7TG5BO6jm5qu5jF49OokYTurWGT/u4cnYiWB39yhL/btp/96j1EuMPik +AdKFOV8BmZZvWltwGUb+hmA+rYAQCd05JS9Yf7vSdPD3Rh9GOUrYU9DzLjtxpdRv +/PNn5AeP3SYZ4Y1b+qOTEZvpyDrDVWiakuFSdjjo4bq9+0/V77PnSIMx8IIh47a+ +p6tv75/fTM8BuGJqIz3nCU2AG3swpMPdB380vqQmsvZB6Akd4yCYqjdP//fx4ilw +MUc/dNAUFvohigLVigmUdy7yWSiLfFCSCmZ4OIN1xLVaqBHG5cGdZlXPU8Sv13WF +qUITVuwhd4GTWgzqltlJyqEI8pc7bZsEGCREjnwB8twl2F6GmrE52/WRMmrRpnCK +ovfepEWFJqgejF0pW8hL2JpqA15w8oVPbEtoL8pU9ozaMv7Da4M/OMZ+ +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem new file mode 100644 index 000000000000..589b4f911531 --- /dev/null +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem @@ -0,0 +1,73 @@ +## +## E-Tugra Global Root CA ECC v3 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 26:46:19:77:31:e1:4f:6f:28:36:de:39:51:86:e6:d4:97:88:22:c1 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA ECC v3 + Validity + Not Before: Mar 18 09:46:58 2020 GMT + Not After : Mar 12 09:46:58 2045 GMT + Subject: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA ECC v3 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:8e:98:29:bf:c7:10:1e:27:db:ab:03:cc:28:2c: + d8:5e:48:19:10:29:cc:cb:59:81:cc:8c:b8:92:17: + 89:83:2a:92:f6:c3:a4:1d:4c:62:d5:9f:d6:a0:46: + dc:1c:bc:76:c1:e3:47:d0:5b:13:da:e7:a5:b3:66: + 48:e7:21:9a:4a:4f:86:0a:7d:6c:ea:4d:32:80:0a: + b2:7a:09:9b:69:4b:98:81:e2:2e:ec:02:70:96:1f: + fd:f5:46:ce:ca:dc:82 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + keyid:FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 + + X509v3 Subject Key Identifier: + FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + 30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08: + bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa: + 07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02: + 31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8: + 8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00: + ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37 +SHA1 Fingerprint=8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84 +-----BEGIN CERTIFICATE----- +MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw +gYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVn +cmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYD +VQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIEVDQyB2MzAeFw0yMDAzMTgwOTQ2 +NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMGQW5r +YXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1Z3Jh +IFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBF +Q0MgdjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQ +KczLWYHMjLiSF4mDKpL2w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YK +fWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMB +Af8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQzPUwHQYDVR0OBBYEFP+C +MXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNp +ADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/6 +7W4WAie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFx +vmjkI6TZraE3 +-----END CERTIFICATE----- diff --git a/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem new file mode 100644 index 000000000000..147ba810d1d6 --- /dev/null +++ b/secure/caroot/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem @@ -0,0 +1,140 @@ +## +## E-Tugra Global Root CA RSA v3 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 0d:4d:c5:cd:16:22:95:96:08:7e:b8:0b:7f:15:06:34:fb:79:10:34 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA RSA v3 + Validity + Not Before: Mar 18 09:07:17 2020 GMT + Not After : Mar 12 09:07:17 2045 GMT + Subject: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA RSA v3 + Subject Public Key Info: + Public Key Algorithm: rsaEncryption + RSA Public-Key: (4096 bit) + Modulus: + 00:a2:66:f0:89:b7:72:7b:ee:09:c9:63:d2:d3:43: + dd:5e:c3:a6:84:38:4a:f1:8d:81:bb:14:bd:47:e8: + 40:17:f3:3d:c3:78:45:72:a6:2e:90:de:9a:3a:d4: + 20:71:ca:bc:9f:1d:4b:97:0a:c7:31:ba:3e:d7:fe: + 25:a9:2a:8e:36:f4:d1:2f:c7:b7:a9:5d:33:dc:30: + 70:f8:40:6c:4b:b2:a6:31:61:d1:34:3c:3d:31:7a: + c7:af:c4:a7:a7:84:e1:97:a4:e8:4b:f6:17:7c:ee: + 3c:07:ed:e2:8a:57:dc:b6:fb:f8:43:25:50:ea:27: + 81:a8:86:bc:8f:52:4a:96:3a:60:1a:96:bb:fd:73: + f4:85:fd:83:fd:7f:84:6d:34:6c:7f:6a:b7:4b:01: + 03:bf:ad:69:b7:d7:32:d9:f5:57:6a:e9:86:82:3e: + a5:66:31:b3:16:3d:c2:f3:26:60:32:d3:52:1e:b0: + 6c:a4:37:3e:f4:f5:af:eb:e1:df:80:06:cf:2a:41: + e7:66:09:e1:4b:97:e7:77:bd:21:6d:29:b6:67:c3: + 2d:7e:ed:d6:79:65:d1:cf:3a:b6:d1:b1:5e:56:61: + 50:7a:5a:ce:4e:50:31:80:03:98:47:e7:e4:18:7c: + 44:5a:c6:a4:b3:3b:c6:c6:c3:3a:f0:6c:c3:8b:c8: + a4:91:05:f3:f5:d9:b6:aa:06:a1:b7:ab:e4:b1:ea: + 21:14:5c:83:a4:fc:ff:b6:50:d3:8c:12:26:99:76: *** 1237 LINES SKIPPED *** From nobody Wed Sep 6 17:37:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqML15lSz4sQTc; Wed, 6 Sep 2023 17:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMK75cbz3d5Z; Wed, 6 Sep 2023 17:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UnunL6cPInLeGeFiMpuLPSuOA04qWbFb4w81bosmALc=; b=cQ1ewEfr/7lajz46c2iqTDma9x7D6T1BVSXQLGUcDcPHIq6RKU7icyC6SGzSJthSQlJG/1 nWAz/4750NRV5EmHHp3hLOivwjl6dzd7gYGHCPhdc0HWsgUVoLvmQuguOA49htZsQuzySI GppPz15xw9r82ZKROHt5MOcSlYhcgAQIJG5hGyYEH2IrzJuPt6qc0KtCdK1mQL/T7a0olK 0FWClK3EdbuTqLE/1yORumuVAAUE98SCXcE+NI+bF46Hvp8oroFqyRKfoQ/24jvAByL3T6 h8aO393u+eICNGEQaRKFMIrGn9bAaKvbxq/AoOsjQZr1r6Y+BNSNwFdBpHRClg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021854; a=rsa-sha256; cv=none; b=CnzZU/gY8B6DnwLSZBsov65DVbkQEHTaFPN2nWrp8UcSTEUQCy0kDLy/quuCePVT+t7wsM hPGl9hlMQcFQdik+IL2iVs549wEk8vvXz7otmFWY0ulDDGCLbfCTtd8bQbRGyUeWTNDY+c bJbZlOTTW+OfDmo9wrjHuyihfPDfvOxik6dEch7J/UpzNf+MPFA+h7LPqyDpJKmu0cATt3 Uv4Sh/OYhIN5IqStUZEsyVMP2HCD9tQzoshjueCC1YpmHdNvWsAhVXM93LMyDqvUSNCYZF WsHQvE3m78GYIkc2/39WRD9V19j2UNnUxOyoKVA6utqzbsZ/QGl24ESePCnz2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UnunL6cPInLeGeFiMpuLPSuOA04qWbFb4w81bosmALc=; b=fcW9jY2/NGDzMUrPneYC3DZQvnPFqOBB++aNVg9i1GkGmCpWvGRGF3SsFTwoQIK5YtIj2A V4/Asihca3obkA/721lnG98boE9IlUT/oLEQGVczUgYi1OEz03QZxyjYJ2cQ7wvY4Ts4f+ tj1X2OGBRTqUhBqxBekis2C/3+a2Xe7sN3Nycsm7ZHi72yT8p0gagMp5OWIx1coKX3mhLk 7UKYH+G2OK02G4iHuw5j/8jsNWfgX8abv5x8VOmgY/jIqBfvSwNLV+7V/2VvZVdBUw48IM vrb9/UkXbOHXzWl8Rnkj7wkeM07VFVImXaEIE4UnRMTHeiRbTXYmoAby68+GQA== 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 4RgqMK69G5zBKW; Wed, 6 Sep 2023 17:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386HbXNe086490; Wed, 6 Sep 2023 17:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HbXXZ086487; Wed, 6 Sep 2023 17:37:33 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:33 GMT Message-Id: <202309061737.386HbXXZ086487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 41b7760991ef - releng/13.2 - pf: handle multiple IPv6 fragment headers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 41b7760991efda33f696c45d9eeaefd8bc63a847 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=41b7760991efda33f696c45d9eeaefd8bc63a847 commit 41b7760991efda33f696c45d9eeaefd8bc63a847 Author: Kristof Provost AuthorDate: 2023-07-13 08:25:49 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 16:58:39 +0000 pf: handle multiple IPv6 fragment headers With 'scrub fragment reassemble' if a packet contains multiple IPv6 fragment headers we would reassemble the packet and immediately continue processing it. That is, we'd remove the first fragment header and expect the next header to be a final header (i.e. TCP, UDP, ICMPv6, ...). However, if it's another fragment header we'd not treat the packet correctly. That is, we'd fail to recognise the payload and treat it as if it were an IPv6 fragment rather than as its actual payload. Fix this by restarting the normalisation on the reassembled packet. If there are multiple fragment headers drop the packet. Reported by: Enrico Bassetti bassetti@di.uniroma1.it (NetSecurityLab @ Sapienza University of Rome) Sponsored by: Rubicon Communications, LLC ("Netgate") Approved by: so Security: FreeBSD-SA-23:10.pf Security: CVE-2023-4809 (cherry picked from commit 76afcbb52492f9b3e72ee7d4c4ed0a54c25e1c48) (cherry picked from commit 3a0461f23a4f4fe8fc82b3445285d3d07787b016) --- sys/netpfil/pf/pf_norm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 56b30faf7e52..d4eb3c98eed5 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1216,6 +1216,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, if (sizeof(struct ip6_hdr) + IPV6_MAXPACKET < m->m_pkthdr.len) goto drop; +again: + h = mtod(m, struct ip6_hdr *); plen = ntohs(h->ip6_plen); /* jumbo payload option not supported */ if (plen == 0) @@ -1286,6 +1288,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_PASS); fragment: + if (pd->flags & PFDESC_IP_REAS) + return (PF_DROP); if (sizeof(struct ip6_hdr) + plen > m->m_pkthdr.len) goto shortpkt; @@ -1303,7 +1307,7 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_DROP); pd->flags |= PFDESC_IP_REAS; - return (PF_PASS); + goto again; shortpkt: REASON_SET(reason, PFRES_SHORT); From nobody Wed Sep 6 17:37:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqMM2D2Bz4sQkW; Wed, 6 Sep 2023 17:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMM0wWLz3dC0; Wed, 6 Sep 2023 17:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLShdMZqXhlA0bpF/xQh+hir872yWalhhohKdnKpl3o=; b=RPrZMZcWu3V4ac5H380zlMTfGDhmrmUP56zP3R/BUGBnygrdRR6RRtfe5opuncPGyzMI+M vEWf/nkoiKb0q+skizSypRKI/m7jGPVDIXcD+nRtIFzZ1axNBYdTYLcfBRz/KjkaueyVk/ RvoePPzflIi7U7a1ohiFFw5y9s13Ztl5j1RkPQ0JbpC1dfSxuRK8vuhNrV6wrRHeY8ic2L DUJJfFDauZ8zbTJfHnGfsSQloccjD0JzAco/YKEJ4u6zopBqW47M4Ac0sGqyLZUpvXzTLl Mx6wP6jp9p1amoYJQhC2fht4yl2GHyv6FZ9HLqKSokoUMVwGdfFaznUCA5B1IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021855; a=rsa-sha256; cv=none; b=f/WiDMH/KrLZoCKvd/1zZt3s8rClGhO6GjnqMCvTP7pUNM4zzNGHCMxY4hkdWELT+hijpT u3hwTVmrOuNFHXECbG3yEti9vOa1j7HsJJL2fzXuEisr3Oe77S1JxNWlbfwW9RKdnxpMsD oW2k8xaU48uWzD9vWFnD+7+DPMMlB+UX+cONlUKepTQzNiV/xGONlbdU2I3NAwiRp+5p0e J4VgWJjVOHi4mv2g6rQf8Ekhdjt8EMNOv0qzcpQS2KR9fBPMHJDq3mresl873uKhsgAaCV Nk2g2/OATD5JkEHJaz7auy8coLLoxTAXI7M4PoNt0dI+eXmF7HNGuBpXhBfpHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aLShdMZqXhlA0bpF/xQh+hir872yWalhhohKdnKpl3o=; b=BOrbSsGjoDCN40ac7SV4yOIcNBlWV9CJRR4wdjsVm0LOaHfepdHNnpKcecG3VFbXW8qqTw /px+MstDV4F99BcDmY9jnA4oWbGcwrbzuXskV249+3QwwuyTfEed/dxJX2Wa6NfX5mRDiQ qfRhYiUxCxCO9iy837ZO4HVEFRhvA90nMzt1QMXPy38m+EVf1G2s4zf86mzUkgyfYVWiEd B/FzX1u23pYOLeQKKeKWSlQe0JWQtGUytMUaO947t67Vi9+m2oW6iNlJA+WDF5aItHWq4a 6fcUJChGZirNjPmiHndJPwna2375FRyy4BkujllLG6+y/FISN0h3CqIBOel2Zw== 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 4RgqML6rRTzB8C; Wed, 6 Sep 2023 17:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386HbYes086541; Wed, 6 Sep 2023 17:37:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HbYVD086538; Wed, 6 Sep 2023 17:37:34 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:34 GMT Message-Id: <202309061737.386HbYVD086538@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 7f34ee7cc56b - releng/13.2 - net80211: fail for unicast traffic without unicast key List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 7f34ee7cc56b84cf880a5e91cf8b1011f41f1cab Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=7f34ee7cc56b84cf880a5e91cf8b1011f41f1cab commit 7f34ee7cc56b84cf880a5e91cf8b1011f41f1cab Author: domienschepers AuthorDate: 2022-11-10 00:00:00 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 17:13:25 +0000 net80211: fail for unicast traffic without unicast key Falling back to the multicast key may cause unicast traffic to leak. Instead fail when no key is found. For more information see the 'Framing Frames: Bypassing Wi-Fi Encryption by Manipulating Transmit Queues' paper. Approved by: so Security: FreeBSD-SA-23:11.wifi Security: CVE-2022-47522 (cherry picked from commit 61605e0ae5d8f34b89b8e71e393f3006f511e86a) (cherry picked from commit 6c9bcecfb296b96a383012e02bc9582260588339) --- sys/net80211/ieee80211_crypto.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index 59760d1e7d9c..f5941392465b 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -560,13 +560,17 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) /* * Multicast traffic always uses the multicast key. - * Otherwise if a unicast key is set we use that and - * it is always key index 0. When no unicast key is - * set we fall back to the default transmit key. + * + * Historically we would fall back to the default + * transmit key if there was no unicast key. This + * behaviour was documented up to IEEE Std 802.11-2016, + * 12.9.2.2 Per-MSDU/Per-A-MSDU Tx pseudocode, in the + * 'else' case but is no longer in later versions of + * the standard. Additionally falling back to the + * group key for unicast was a security risk. */ wh = mtod(m, struct ieee80211_frame *); - if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { + if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { if (vap->iv_def_txkey == IEEE80211_KEYIX_NONE) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr1, @@ -578,6 +582,8 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) return &vap->iv_nw_keys[vap->iv_def_txkey]; } + if (IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) + return NULL; return &ni->ni_ucastkey; } From nobody Wed Sep 6 17:37:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqMN2nsbz4sQn6; Wed, 6 Sep 2023 17:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMN1phQz3dLS; Wed, 6 Sep 2023 17:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSzhp4Uw2XGKne8ePw5BpgyRGqSod0YjYKl4pf9WcG0=; b=kdqLyb1VteawvB6n4RvmdDCOIIiCvWLSPy42OQEakGxK9LACDbdOXhEgGXY02tClQsMLKw svQfY07McDaboQWEGVBQgmrzTJmlG1gA/ftbJPhFUH+ECL4B6z2zBndiA1eoxlloGKNNvW +yZmGWeWn0rGiXGR0jT3iLqJZpscKSzgyYkLtZGEwW43ngoaWNsbLVr8ONIk/PXqcX36Ni Z4nU38lGVqT+agxCS38akwfpIuuA7J2eW9gbERBGE4UnmDYa444eUqW2XcJjq55hq0Jfib 1KEGCuztOJbZxe8nt9zYQ32qKZyZ/8hCnZEDFGQQlS/sHKv2V3THehco2JVRrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021856; a=rsa-sha256; cv=none; b=FQzcqBDccG10o1TZXJ2bRyJR/GNqUUpxz7vynyBXbrh9mZd793OxsgDyUYvGBPKDTcdsh+ uSe+WIscMr5XXHl/Wrh3COlYG0wYdQpLLBEGYbKwu5/ouEauk1A3KZh5ayJjVTuS9bI615 jxiYmPOwHjmUJ19+CZnKa/LsRZkAX0MvaPe5gFJiwrtsbZSqtvLnPdW3a9iP/FAc/xGEJ/ iL6kMRwWMkwdyzymonfsPiF/J8Y+9I2PJMZuMiVXWJAxmewGHykqD+zSMJWmtbNj8ZpuZp 6c9ZO9xCRupgpusiNQmJdCE//7IzMRq1KNtiyZ3XRN79LxKc2KAyeFluNkpz/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=1694021856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSzhp4Uw2XGKne8ePw5BpgyRGqSod0YjYKl4pf9WcG0=; b=IQ+Fp/ZK3Zb/QPocJesLgnUgZE99IUXnY5Pj5AqnZfqVcggRCr5565SL2pwYzF6Y/1H7XH y/Q+V0I06dxjEbJqYvnewzBdOKpK1nCSIVaeOuBZ2WgAxZUzYOjTjK4n7dkDGsyY5DB/hM fvyijJlBJBn0+aa4mzNScMwKmqHVfd79qiFJeEI7lrWFgqZW4C25WmK0B9OCgAm69RH4q2 eIDA1bG+X3D3+gP7oZtNXK93utZCpZ/S02PZ9/RMeo/hGvhTNHOoLFXJnjhM8cWCmAwILx EogoB6VAWlA9MX3NxoZahKJKwf0q3kL0Sde/7ZC2F5msqHwEQkGdCsDRAL7ArQ== 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 4RgqMN0mLrzBMc; Wed, 6 Sep 2023 17:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Hbahs086593; Wed, 6 Sep 2023 17:37:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Hba9o086590; Wed, 6 Sep 2023 17:37:36 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:36 GMT Message-Id: <202309061737.386Hba9o086590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: a1c915cc75c1 - releng/13.2 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: a1c915cc75c1b3c66e16bb52579e2abdf122eccb Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=a1c915cc75c1b3c66e16bb52579e2abdf122eccb commit a1c915cc75c1b3c66e16bb52579e2abdf122eccb Author: Gordon Tetlow AuthorDate: 2023-09-06 17:18:35 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 17:18:35 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 17 +++++++++++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 8cfa9ff88fd7..ff18a91feaf9 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,23 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20230906: + 13.2-RELEASE-p3 FreeBSD-EN-23:09.freebsd-update + FreeBSD-EN-23:10.pci + FreeBSD-EN-23:11.caroot + FreeBSD-SA-23:10.pf + FreeBSD-SA-23:11.wifi + + freebsd-update incorrectly merges files on upgrade [EN-23:09.freebsd-update] + + PCI-e hot-plug is broken with certain devices [EN-23:10.pci-update] + + Root certificate bundle update [EN-23:11.caroot] + + pf incorrectly handles multiple IPv6 fragment headers [SA-23:10.pf] + + Wi-Fi encryption bypass [SA-23:11.wifi] + 20230801: 13.2-RELEASE-p2 FreeBSD-EN-23:08.vnet FreeBSD-SA-23:06.ipv6 diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 85d2cb24a37c..31ce004e1417 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RELEASE-p2" +BRANCH="RELEASE-p3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Sep 6 17:37:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqMX6R4lz4sQwg; Wed, 6 Sep 2023 17:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMX53zkz3dtw; Wed, 6 Sep 2023 17:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZZzkmf8bodthoik7OmBAI+FLB5ouXwUMo1RO35U94c=; b=EFnhAlL3ZG9AjkpQ5A4ZlJe+qa1Mg+oNblEcI5m1s8mmi448ZPo0/8oXJHE4WRZM+Gp588 WeWjflFOkt2urUZmJ0PSTkfz5TTaUFXNn8jJ+Gl6pj2EfP6e9Ojzpoba9vk5aJ4UdGQ3j5 IAqGw3ZMPeTB26Kv6caWqshD9t/tO7jun1nMN9KgxJSj29Uui1S2h19c0w/iaZBghRgQvH ceBR2LkAgm7sIXDwU/4w4wW8iU8FXb4CUZOJIKOrPNpOJn8Q1zcVUQAWHpeq/Eg0yzCJD1 kaQY5vSuC8TSRvsXPFENN2LUXIc5TNKgKx/XwnA7nC322u8kyI+QtXy/Cz7cNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021864; a=rsa-sha256; cv=none; b=LQT2/D6fQ2xKEUWBlySzS2K66imikPrtLaFDLGofO5wuk5tW+a/Dx175QjH/Xwwg3fSR1h zmQoZCXaSy0HqFX+WcxFXmOclAwTPFDG5wWbXNHWBXcPs0dsbiUOKK8T4qvjkqaYfegzUS vSdfnPOFCw5TWuvNpoH8h/w5JoUXuI5bIiPkivDetYGBrrPnVGrkYGK/GL8DZuwr4o9PsV cMwdNHhEXxXdfHFWxcN+/iONjnv0RoCOz62W8crjt1FgNZ9IHLI2iPyhyMSn/NSPXZJypl 1NZDIF5pFmVKzQQ76630dvaMjWoZkOqbf2tlGfpzjBsLWS0WmqqjE70K/tX5qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZZzkmf8bodthoik7OmBAI+FLB5ouXwUMo1RO35U94c=; b=LJ/c808o/7cxmzsYst42iLMz03jQreo4FcSb6P4CJNASvbJ4D9GZVC0M0l8oylhiQkiUgw y6/MTbd2idNuquea1YDQan/DjQVXCD+fIcpssobC4VN2aTQBMJpNTbhDGLCqeUBKMx78cS osIkq9EFDLKsov6RlaxrzVNNkcYy0+CVTSag0jbO0HRapv6dZFbTfVyLDrH96TNdh2O2Xh Z0zaugvjighzqlUtEPDdq1O+dqRMZb1L/Dd+Xcm+PdOjNDjBFm09CSqkhiOPM8OZ9OV7R6 MWJ2opdMvcRWZEm+/T+NJJI6SZDj5FNwMmzlG7tFv76FG5JZD3Bfko2GDeCFEw== 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 4RgqMX35W3zB8D; Wed, 6 Sep 2023 17:37:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Hbihb086776; Wed, 6 Sep 2023 17:37:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HbiCT086773; Wed, 6 Sep 2023 17:37:44 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:44 GMT Message-Id: <202309061737.386HbiCT086773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 0692341b263e - releng/12.4 - pf: handle multiple IPv6 fragment headers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 0692341b263e1baa17f5bbbe1d957b7e94eb647b Auto-Submitted: auto-generated The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=0692341b263e1baa17f5bbbe1d957b7e94eb647b commit 0692341b263e1baa17f5bbbe1d957b7e94eb647b Author: Kristof Provost AuthorDate: 2023-07-28 09:39:33 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 17:19:11 +0000 pf: handle multiple IPv6 fragment headers With 'scrub fragment reassemble' if a packet contains multiple IPv6 fragment headers we would reassemble the packet and immediately continue processing it. That is, we'd remove the first fragment header and expect the next header to be a final header (i.e. TCP, UDP, ICMPv6, ...). However, if it's another fragment header we'd not treat the packet correctly. That is, we'd fail to recognise the payload and treat it as if it were an IPv6 fragment rather than as its actual payload. Fix this by restarting the normalisation on the reassembled packet. If there are multiple fragment headers drop the packet. Reported by: Enrico Bassetti bassetti@di.uniroma1.it (NetSecurityLab @ Sapienza University of Rome) Approved by: so Security: FreeBSD-SA-23:10.pf Security: CVE-2023-4809 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 76afcbb52492f9b3e72ee7d4c4ed0a54c25e1c48) (cherry picked from commit 8922b9ac0b48749be42689ea959e6a1664f96b12) --- sys/netpfil/pf/pf_norm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index ec063f82c1d9..9e936bcd1da5 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1213,6 +1213,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, if (sizeof(struct ip6_hdr) + IPV6_MAXPACKET < m->m_pkthdr.len) goto drop; +again: + h = mtod(m, struct ip6_hdr *); extoff = 0; off = sizeof(struct ip6_hdr); proto = h->ip6_nxt; @@ -1303,6 +1305,8 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_PASS); fragment: + if (pd->flags & PFDESC_IP_REAS) + return (PF_DROP); /* Jumbo payload packets cannot be fragmented. */ plen = ntohs(h->ip6_plen); if (plen == 0 || jumbolen) @@ -1324,7 +1328,7 @@ pf_normalize_ip6(struct mbuf **m0, int dir, struct pfi_kkif *kif, return (PF_DROP); pd->flags |= PFDESC_IP_REAS; - return (PF_PASS); + goto again; shortpkt: REASON_SET(reason, PFRES_SHORT); From nobody Wed Sep 6 17:37:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqMY6CgQz4sQjB; Wed, 6 Sep 2023 17:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMY531qz3dvF; Wed, 6 Sep 2023 17:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZvctPZhRUCesvohr18aFMHQijUjGXdZizLQF/kzlGo=; b=oHQio/TzqztwsKepleX51kpHatS+zavnkrKC10gDuAVmu+Fne6BusgH1n+VvWL/lm7qr5q V/DIhEVF1vyzUtotGTNO3JeWythSXfEpccH6iZamPs6XApKOed7y/rjjRpGBRQZhq4nsq+ CVUfgGlDbOuxmAU5/PjS5h9hll21ky/BRusgpZiprTutzCcf1OmVQoQ0goeN16T3/kxd0t giRjcvasC6dfwQSP2ZhpRoETVI4mlVhiTZ0MeRZqb7iU1Os+IUs+XOTJjN0ZsWAWVYbisk sfvEfWITdJwasef5AEomiDJutDt8h5mC9ZfA2igGV9SHDqRLrE17wUKa+OBoqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021865; a=rsa-sha256; cv=none; b=F58OzCrwdDu35E8cqaGSmnVOdC815S1O1ON9a30x5amAzmALWFRdfX8DNVnTEkgZON2Lxb Ox9IT2Kp+9F/2VEk/6qnw1//JPfrb8fNL8/jaIeiIxbFaiEwpuGibPFhNm4f5gv2ZgT06j GhzhbOIT8fbfXNYlkpbKlqMoa4HdyuqFr5b5IHjvqL725oknwk4aqbpkZrESXRHTl+COW/ quhzHB9/DJgr0qTAjhndtRzvJEmiOsjVK8nKMRW5pMif0LaByNgcK0f/qBSVhLWROuCJc4 4LowI7NmOerqSY2WI0Sf6nZsDRqZOSmp77QKkHwa7ax/i+yKaxI50mQVxWPXng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZvctPZhRUCesvohr18aFMHQijUjGXdZizLQF/kzlGo=; b=UlXGPfDQ71+UMTZ5y1SBwwOaHooFBGyDI8knrz8OXMQrZGdBoVxgXhBHahbuMkISxQOKGO zUCuxCW8Nn60+G0BSIlGPpXA/fuomv5BQ5zQRXWYhQdbXYqiiTeBKEn1Ab31HFlSb82UKe zcKVgZ9UTsGluJMLCPN03K6Zty529aESL8+iNRMcN6W2gSI86HsRTa9GbpKxNE3ylNt2vq ze4f+KHowY6vRDYEouEfuVn8+PVKoz/Ao/2ocKjAU0WMhnrxZA0rN7ehCUMXdOrs3YFwUv bHDLidVRC/rMiU+hl/ujTMNcwgmIBpEBUWCfmbAGV4c8jsf0F43tDIx512PdqQ== 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 4RgqMY3tDJzBMd; Wed, 6 Sep 2023 17:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Hbjxu086827; Wed, 6 Sep 2023 17:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HbjQr086824; Wed, 6 Sep 2023 17:37:45 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:45 GMT Message-Id: <202309061737.386HbjQr086824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: e020f9602809 - releng/12.4 - net80211: fail for unicast traffic without unicast key List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: e020f9602809e6973b189d6d30e325f1f92f7148 Auto-Submitted: auto-generated The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=e020f9602809e6973b189d6d30e325f1f92f7148 commit e020f9602809e6973b189d6d30e325f1f92f7148 Author: domienschepers AuthorDate: 2022-11-10 00:00:00 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 17:20:03 +0000 net80211: fail for unicast traffic without unicast key Falling back to the multicast key may cause unicast traffic to leak. Instead fail when no key is found. For more information see the 'Framing Frames: Bypassing Wi-Fi Encryption by Manipulating Transmit Queues' paper. Approved by: so Security: FreeBSD-SA-23:11.wifi Security: CVE-2022-47522 (cherry picked from commit 61605e0ae5d8f34b89b8e71e393f3006f511e86a) (cherry picked from commit 84d538470bced9b1a45064c7845c92551a15e3e1) --- sys/net80211/ieee80211_crypto.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/net80211/ieee80211_crypto.c b/sys/net80211/ieee80211_crypto.c index d565b3511170..0e605bf13a43 100644 --- a/sys/net80211/ieee80211_crypto.c +++ b/sys/net80211/ieee80211_crypto.c @@ -560,13 +560,17 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) /* * Multicast traffic always uses the multicast key. - * Otherwise if a unicast key is set we use that and - * it is always key index 0. When no unicast key is - * set we fall back to the default transmit key. + * + * Historically we would fall back to the default + * transmit key if there was no unicast key. This + * behaviour was documented up to IEEE Std 802.11-2016, + * 12.9.2.2 Per-MSDU/Per-A-MSDU Tx pseudocode, in the + * 'else' case but is no longer in later versions of + * the standard. Additionally falling back to the + * group key for unicast was a security risk. */ wh = mtod(m, struct ieee80211_frame *); - if (IEEE80211_IS_MULTICAST(wh->i_addr1) || - IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) { + if (IEEE80211_IS_MULTICAST(wh->i_addr1)) { if (vap->iv_def_txkey == IEEE80211_KEYIX_NONE) { IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_CRYPTO, wh->i_addr1, @@ -578,6 +582,8 @@ ieee80211_crypto_get_txkey(struct ieee80211_node *ni, struct mbuf *m) return &vap->iv_nw_keys[vap->iv_def_txkey]; } + if (IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) + return NULL; return &ni->ni_ucastkey; } From nobody Wed Sep 6 17:37:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqMb0kkzz4sQrY; Wed, 6 Sep 2023 17:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqMZ6T0Bz3dpV; Wed, 6 Sep 2023 17:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M2TDYvMBRjrobUWoapvglnk87fhZnJyCvXOqJgOz3v4=; b=lMf+YjQgIXnsmYCX7cDlsP1FgQ12ZgxlgQYq6akZTxComcgK+XRHM2Nn1JNjfFHMKLYirR pjC3rQ4ylZe6GjVtkhkETB0pVI515KVBLjiDlqbb/tWBRQk+GgIMlmYwBIyWlV6H+wR0tG lV8CU4C9EU1lKWTFQWe5P1Uz/lCfqzjBrUU1W1wiY3ciO6Kl4vTWtrassBDcCZX2MKqg4r jyHl8UpPd2srpYTfxrbRTMzaOO3sUHd5HKZo+CiM55rC88vcy71rGI5O8U8HTGG6N8+Y7o HLxHiU5u0edSoIQZ/CY23f7m0u/fTSxhBuPgzh1H3o7SylqfvWE+1QdjwDkkCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694021867; a=rsa-sha256; cv=none; b=lUn/Hk/MHvTkt3VvrP5UYarxi4XHRBbYFTwLMDG+G4kUi9htG6qThW7GDGzc0+5f3THoGC MeGTzrtvC82b87mz8u1dh7i1Z4fR1IPJ8ZA5sbEbozCro/vVtE8yn2u/8pFMUAbPFCEZam wQL0qs06t1TnPo3oCW7XqOA7xCvP3+zbW8oLDsAM8Es9NNOxBLmlsZ4tzUVUIQ3Jt5h+rj bBGlQgZ3pIZjPbNXmLX3fAVMM97fyKWk4wDZfXsiQsUWMBm3x48BBqdm4r9/sdiHftfSAy Z+EE7ue3eJnxqrk6txSqzYB/n8E4dT/gRAklTw+LOv9spW4tzuFsAAb9/f5ceA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694021867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M2TDYvMBRjrobUWoapvglnk87fhZnJyCvXOqJgOz3v4=; b=F8QfNENKCtKx6oKdzaJvl10veITBfN6R+9f8pqfttmgji8eD4oYFTjdws1la1LbRCd/1z8 XmRULnbc7pKXBYGoWXU2NOfFeRNCMVZUjo8EXZzs2OsLXscnbMJYza5hkHlDm9lc+3OdCn EvhoGhV1UuGfmksF74u2CLJYZfTJGvLGlTpWmdlhq9FLl++0TYr5fZXvkliYiPXBW5aHpS S8foiasYrBtr0SGM1hUSPZpqIf2FIweg+maIBrHXGjoFMqFpC4w0LVD/UXEUWlU6a4NaNz /jPrpAvv7G4FDSnJUHO7mVw5HcrIrKawRxRV3JF71duoJLDB94ETO06782j8ew== 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 4RgqMZ59fCzBKX; Wed, 6 Sep 2023 17:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386HbkjZ086872; Wed, 6 Sep 2023 17:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HbkFP086869; Wed, 6 Sep 2023 17:37:46 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:37:46 GMT Message-Id: <202309061737.386HbkFP086869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 927b6e752c24 - releng/12.4 - Add UPDATING entries and bump version. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 927b6e752c243c9fc61a44fbfddee59dce1f099b Auto-Submitted: auto-generated The branch releng/12.4 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=927b6e752c243c9fc61a44fbfddee59dce1f099b commit 927b6e752c243c9fc61a44fbfddee59dce1f099b Author: Gordon Tetlow AuthorDate: 2023-09-06 17:21:20 +0000 Commit: Gordon Tetlow CommitDate: 2023-09-06 17:21:20 +0000 Add UPDATING entries and bump version. Approved by: so --- UPDATING | 8 ++++++++ sys/conf/newvers.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index e12d21e253ca..ecde75536cbc 100644 --- a/UPDATING +++ b/UPDATING @@ -17,6 +17,14 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to the tip of head, and then rebuild without this option. The bootstrap process from older version of current across the gcc/clang cutover is a bit fragile. +20230906: + 12.4-RELEASE-p5 FreeBSD-SA-23:10.pf + FreeBSD-SA-23:11.wifi + + pf incorrectly handles multiple IPv6 fragment headers [SA-23:10.pf] + + Wi-Fi encryption bypass [SA-23:11.wifi] + 20230801: 12.4-RELEASE-p4 FreeBSD-SA-23:06.ipv6 FreeBSD-SA-23:08.ssh diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index cd51b45135d3..bb919a38da7d 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -49,7 +49,7 @@ TYPE="FreeBSD" REVISION="12.4" -BRANCH="RELEASE-p4" +BRANCH="RELEASE-p5" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Wed Sep 6 17:43:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqVN4wP7z4sTWy; Wed, 6 Sep 2023 17:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqVN4QmMz4D9L; Wed, 6 Sep 2023 17:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694022220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQ1aVJ3XkHN2iugkqk7FH3R/SkLHVJM9yh3yafn1Sgw=; b=xdQX7aTiK+il2SgnWoAtM2OGDl12VC13x7mRQXeXCCWB2iQO4QUe+60pLcglMiD4RkzKRs Q1KRUGUys2H9zKAqYnhnt0AUrNPhKJPnadumyCJ4gU8n1nJR7+z7f3EIyI1J6vL/fwi1X7 GaUZZ/b9lA123BH3MZi8G50oZEgK8KNIvVu/jUCrXPv28UbCOqJpkDczF6lzqLiZ9QXg81 uCa6QPCfBgG4TfUBSJlaBS6VAIhBa9ZAPCxGg61mHC9MveN/W6b9KsT5HUAXnZ6IymnRj1 O2sUi531/UIiCBC359/Y0GnrI/Q/C44Y+78olpJ+XM0l5ca4S8nuYSlN4MxM/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694022220; a=rsa-sha256; cv=none; b=dVw2QfBIJjy7p4hjeOufycrxwMpbeik4dp50OtAU8futbJmY+DQ/Ks3kZCo6CcrXLBRUMz RYGL4nHo6jystBveLpCzry1PWnstB8bpItMvY3fBRnQxApgJAuSVl5ySEbCdJr/90fMkrw 3QVAvCXowI1UWFqUxl///c/EAaH04nGILsP5R1HgGHdEQyzWeTlSHZZUjTRHa8T4F3A+tG QrGLcRSIvaI96Mr3Km8fo+iHklZ1bg0nJXXu/ICdBkhKyVHCWNBk5aXydMtRCSkcxYhFok xbvMonRmO5eDow35wut15OlIXwWfmRIHcqCmU8pm3V6FPR/6g+KXFXk+EoGUFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694022220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jQ1aVJ3XkHN2iugkqk7FH3R/SkLHVJM9yh3yafn1Sgw=; b=pYm0nAtoqnlCml+yHbkwYGQeScAQyMEzseBKnoI5/17OqPD1WwUwxsOH6XlG63kqP3rcoT wjuF8SduMOkL/NdqQoIp46byCzHfUQnbNWW15tt1/8E/oHRFv56vm+TF64hEBlzUj9dvWk z/LQ2XDUsc84v+gAvaFfRE7/CK0/ZbN9eAr4cSExO18i6eoBSTbhBNWH4bFkrIBxItuiUr pEsxLyeLE92IwmOhOmHq3B9KRy+ZvR2OJ/Rknt9icYPINfGaQlJufePn/6f/3mZi3X5Wci Ftj9Ry0CV7MmiaxJUMYYq82KSS4urkUL2FlHVrfVGXeJG9g1g7+Dexfl9qU1ww== 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 4RgqVN3Vw8zBYk; Wed, 6 Sep 2023 17:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Hheqb002796; Wed, 6 Sep 2023 17:43:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HheW5002793; Wed, 6 Sep 2023 17:43:40 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:43:40 GMT Message-Id: <202309061743.386HheW5002793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 9e2cafe4fb90 - main - arm64: Enable FEAT_E0PD when supported List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e2cafe4fb901214903484998adf51a6cc5e4ebb Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9e2cafe4fb901214903484998adf51a6cc5e4ebb commit 9e2cafe4fb901214903484998adf51a6cc5e4ebb Author: Andrew Turner AuthorDate: 2023-09-06 11:07:41 +0000 Commit: Andrew Turner CommitDate: 2023-09-06 17:32:49 +0000 arm64: Enable FEAT_E0PD when supported FEAT_E0PD adds two fields to the tcr_el1 special register that, when set, cause userspace access to either the top or bottom half of the address spaces without a page walk. This can be used to stop userspace probing the kernel address space as the CPU will raise an exception in the same time if the probed address is in the TLB or not. Reviewed by: kevans Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41760 --- sys/arm64/arm64/identcpu.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index fced2ffab258..e84ac338497b 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -2259,6 +2259,31 @@ cpu_features_sysinit(void *dummy __unused) /* Log features before APs are released and start printing to the dmesg. */ SYSINIT(cpu_features, SI_SUB_SMP - 1, SI_ORDER_ANY, cpu_features_sysinit, NULL); +static void +tcr_set_e0pd1(void *arg __unused) +{ + uint64_t tcr; + + tcr = READ_SPECIALREG(tcr_el1); + tcr |= TCR_E0PD1; + WRITE_SPECIALREG(tcr_el1, tcr); + isb(); +} + +/* Enable support for more recent architecture features */ +static void +cpu_feat_support(void *arg __unused) +{ + /* + * If FEAT_E0PD is supported use it to cause faults without a page + * table walk if userspace tries to access kernel memory. + */ + if (ID_AA64MMFR2_E0PD_VAL(kern_cpu_desc.id_aa64mmfr2) != + ID_AA64MMFR2_E0PD_NONE) + smp_rendezvous(NULL, tcr_set_e0pd1, NULL, NULL); +} +SYSINIT(cpu_feat_support, SI_SUB_SMP, SI_ORDER_ANY, cpu_feat_support, NULL); + #ifdef COMPAT_FREEBSD32 static u_long parse_cpu_features_hwcap32(void) From nobody Wed Sep 6 17:43:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgqVP6LnQz4sThP; Wed, 6 Sep 2023 17:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgqVP5dHkz4DhM; Wed, 6 Sep 2023 17:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694022221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7F8qFHCOMduO00dpWUuPFYt14Cnrj/ZHGOz6/54AWNM=; b=LSuto2fF2YVZTU9UIzu1wV0tR1Rbzcqn643n5qzSTBPoD4I9mPeL+o3h9CnQQEvosPjZTu PA79wdV6i5eQ6CIUFEh+bJr6qicLpc4Q/sj/Fa0B+YJCMDQiYI64QWitgiEJzsLCxL5Qbb F8mSyt0nc1DWs4nLh3/OHML8Rl90EZeL1FHvRNHfBa166jwgrPIrKwE/cb+jFhZqDRfEBA JtDFfkB0x0Pu/mR0QCD7EXxoR4EqT5QO6tEjS2/57cHKRCQWitSLCV65qH138aD3N/CLqd WQiibyrIDhcob8oyTG9lqYXuMEHW6Rjxz94U8ZRpazHs7hOFNSFG1Arn4U9rtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694022221; a=rsa-sha256; cv=none; b=sBtDJcSAwNy9b2QpnuftBU0ksToi9BfwkXYUTGNM8LsbXfNqce+GlVf2lGGMagD9fk9uLK NgfEEHawMjtEOMM/M5e7BGgxp8vnN1U/TMkiMBq20g0742Dvzl294nPpSeNRSiBhTek8x1 zXlDxkcWAeEoMQGAYVzAEI3E3flF2nCArWfsieqhC/8Vcfj3RLJJGxaTy53GKK+Hr4zBSQ z45iaUIDw6BrjhgIpxMi/KAT77krtDQ7LyUXk6SsCT1YoA/0dduDOgrJoNJcrmEQAYAdZj i33ftA6ouJ5pfWcS78lu8LzNGH78HYBj/W7xCKKDQIgUGCjTmq8Tu0R9gL6hdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694022221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7F8qFHCOMduO00dpWUuPFYt14Cnrj/ZHGOz6/54AWNM=; b=KGFADTytxGNTy5JT38E4I7nOTMGM7T+rS/T7xDCoGX/FAJt2kLllRRPpIBsFtz1hkL/2Gd KMtGNvjTspNAzBIxh/kUwkt1U+u+mPX8TYLx1Cr6Z6+K9LDa3Hvf/e+AG5+rxaXrTuJSH0 ypwVgR1LWTYWQCXCuxT30wJy/ORO0O7cJHHG/Ze9GJyS6ntIiAW5WPj8CbJsCE0JgfVTYO eoMOKH0bDLS4OsKVXpWgxIwi0B2k7ZLEDYQeC4rKZKhXC4o/Y8Dt33HxSwkjOFeIkarn8C fVRnkDO+G7dgeS2hRSSn9ZRZxGlbJgUwR/ZHtjGqKIGtM0YPZYv0RpGMGepxkA== 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 4RgqVP4k36zB90; Wed, 6 Sep 2023 17:43:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Hhfji002845; Wed, 6 Sep 2023 17:43:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386HhfHc002842; Wed, 6 Sep 2023 17:43:41 GMT (envelope-from git) Date: Wed, 6 Sep 2023 17:43:41 GMT Message-Id: <202309061743.386HhfHc002842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8f26d01f5331 - main - arm64: Fix the TCR_EPD0 definition List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f26d01f53316c055cc1116eb56ff438da50d831 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8f26d01f53316c055cc1116eb56ff438da50d831 commit 8f26d01f53316c055cc1116eb56ff438da50d831 Author: Andrew Turner AuthorDate: 2023-09-06 17:32:15 +0000 Commit: Andrew Turner CommitDate: 2023-09-06 17:32:49 +0000 arm64: Fix the TCR_EPD0 definition Sponsored by: Arm Ltd --- sys/arm64/include/armreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 5892a9b08502..034504727b39 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2167,7 +2167,7 @@ #define TCR_IRGN0_SHIFT 8 #define TCR_IRGN0_WBWA (1UL << TCR_IRGN0_SHIFT) #define TCR_EPD0_SHIFT 7 -#define TCR_EPD0 (1UL << TCR_EPD1_SHIFT) +#define TCR_EPD0 (1UL << TCR_EPD0_SHIFT) /* Bit 6 is reserved */ #define TCR_T0SZ_SHIFT 0 #define TCR_T0SZ_MASK 0x3f From nobody Wed Sep 6 18:37:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgrh023Psz4strt; Wed, 6 Sep 2023 18:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgrh01ccsz4TTV; Wed, 6 Sep 2023 18:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwTFVic/3s4up7H5vpN4Sl/ES6yt4QvKG8rlSM4weAQ=; b=H+k17A8FHEl0RIF7nmuIuCMtz2VXWus4WLYKAnoVx50TnAO97OxGo1NBFIUjFHe/68Xg5K biociB8Y/oLJelU1jMCeNs8lfp4jZ+g4yvZeRJizd6N/XqT9ql10500yvpiw0vlObgV0E1 eZX1dZwQxRJW/OQbHQRPapoMrp2UZ2XL7YnC+/dO+VyND89PrtKRO6s4tW8hWAJGHruPE2 spYEn91zqD48Wrg0WPUmuTE3fToB7fXzecqmwgaGEFe6EIqS8z0ulCrp5TENGRffJeSzw2 jOkgV+H3NK5q0TanuSmnCgM0cmEohw1layaziJA3aL19D0iMxSS9OccHUWFfaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694025424; a=rsa-sha256; cv=none; b=JLR3qfr/Ao5qC4ZLAXIER5Tid28TahLO/J2kH3JRqgnUwgRySppQIM8izm+XM9nbRWDgX2 M7+UKtipqtwWQBLEOhtFRrOoUolZK/WV0Wu0kqBOD3gbNk4WoJYxgr5JslKHtowZeiAk4p 6FgaPl9s2WG7Yxh1q6akiGmvi9b7tlrgQnAWC33SWHRZjTJzHUxdfCVKGIg7F9V+CBRZEC UzY2jybY/wUTwLtRnt/jmVq33Tlr2lxErOFQJX5pdsyHmdYwtELgBWTjxsdCtlx0iYTXvC ppfK0/UArYgRoGqz/Js/PNwDwbOky6wjJhR1y1FhHe63E7oI85uYuCWt4GVMSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BwTFVic/3s4up7H5vpN4Sl/ES6yt4QvKG8rlSM4weAQ=; b=JGxE14JJ6dDeu0u1gjNWwI5194oXNIzOntkz5J/CkLXtTW4qtedGe2mOXcCpYlw0H940K/ /CPHWFVgDO1hyAmJwLQyqWZKI9bxEZWJKcwJ24Au8NGj5nnxbn7LV1W/M+Q7rkSKlJLryg ZsOXq5oTUVK7HEW4QdLPrJ35CRO0stqwMiYQaRK86ZeUgbmZSpQuGihbYtmXZhWW2yzqr2 LJQk3nZR6NI8BwkceLyyc+9zP42xR+PshyX3hfWJfWIb4BbicYW5KCePtAZNUFvDQ0vV6E m9RRI5M+C1S1oeMyuyXgthSZF/+eS5jYuAiMdUgrqg2Cwp3z4MMT/TsvYSwxbw== 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 4Rgrh00QhxzCZt; Wed, 6 Sep 2023 18:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Ib4bL086221; Wed, 6 Sep 2023 18:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Ib3nL086218; Wed, 6 Sep 2023 18:37:03 GMT (envelope-from git) Date: Wed, 6 Sep 2023 18:37:03 GMT Message-Id: <202309061837.386Ib3nL086218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 71679cf468ba - main - init_main: Switch from SLIST to STAILQ, fix order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71679cf468ba28c0e3c88371f3fde13fccec99bd Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=71679cf468ba28c0e3c88371f3fde13fccec99bd commit 71679cf468ba28c0e3c88371f3fde13fccec99bd Author: Colin Percival AuthorDate: 2023-09-05 23:46:38 +0000 Commit: Colin Percival CommitDate: 2023-09-06 18:36:36 +0000 init_main: Switch from SLIST to STAILQ, fix order Constructing an SLIST of SYSINITs by inserting them one by one at the head of the list resulted in them being sorted in anti-stable order: When two SYSINITs tied for (subsystem, order), they were executed in the reverse order to the order in which they appeared in the linker set. Note that while this changes struct sysinit, it doesn't affect ABI since SLIST_ENTRY and STAILQ_ENTRY are compatible (in both cases a single pointer to the next element). Fixes: 9a7add6d01f3 "init_main: Switch from sysinit array to SLIST" Reported by: gallatin Reviewed by: jhb, gallatin, emaste Tested by: gallatin MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41748 --- sys/kern/init_main.c | 22 +++++++++++----------- sys/sys/kernel.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index aa82eafff9b0..a6b327339c80 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -165,7 +165,7 @@ SET_DECLARE(sysinit_set, struct sysinit); /* * The sysinit list itself. Items are removed as they are run. */ -static SLIST_HEAD(sysinitlist, sysinit) sysinit_list; +static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -194,12 +194,12 @@ sysinit_mklist(struct sysinitlist *list, struct sysinit **set, TSENTER(); TSENTER2("listify"); - SLIST_INIT(list); + STAILQ_INIT(list); for (sipp = set; sipp < set_end; sipp++) - SLIST_INSERT_HEAD(list, *sipp, next); + STAILQ_INSERT_TAIL(list, *sipp, next); TSEXIT2("listify"); TSENTER2("mergesort"); - SLIST_MERGESORT(list, NULL, sysinit_compar, sysinit, next); + STAILQ_MERGESORT(list, NULL, sysinit_compar, sysinit, next); TSEXIT2("mergesort"); TSEXIT(); } @@ -218,9 +218,9 @@ sysinit_add(struct sysinit **set, struct sysinit **set_end) sysinit_mklist(&new_list, set, set_end); /* Merge the new list into the existing one. */ - TSENTER2("SLIST_MERGE"); - SLIST_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); - TSEXIT2("SLIST_MERGE"); + TSENTER2("STAILQ_MERGE"); + STAILQ_MERGE(&sysinit_list, &new_list, NULL, sysinit_compar, sysinit, next); + TSEXIT2("STAILQ_MERGE"); TSEXIT(); } @@ -284,11 +284,11 @@ mi_startup(void) * Perform each system initialization task from the ordered list. Note * that if sysinit_list is modified (e.g. by a KLD) we will nonetheless * always perform the earlist-sorted sysinit at each step; using the - * SLIST_FOREACH macro would result in items being skipped if inserted + * STAILQ_FOREACH macro would result in items being skipped if inserted * earlier than the "current item". */ - while ((sip = SLIST_FIRST(&sysinit_list)) != NULL) { - SLIST_REMOVE_HEAD(&sysinit_list, next); + while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { + STAILQ_REMOVE_HEAD(&sysinit_list, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,7 +904,7 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); - SLIST_FOREACH(sip, &sysinit_list, next) { + STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) break; diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 12e346514d1a..62b9e6a02b3c 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -220,7 +220,7 @@ typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { enum sysinit_sub_id subsystem; /* subsystem identifier*/ enum sysinit_elem_order order; /* init order within subsystem*/ - SLIST_ENTRY(sysinit) next; /* singly-linked list */ + STAILQ_ENTRY(sysinit) next; /* singly-linked list */ sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; From nobody Wed Sep 6 18:37:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgrh13sXrz4stxZ; Wed, 6 Sep 2023 18:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgrh12Zbdz4TcM; Wed, 6 Sep 2023 18:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGTDdrkUsxoVAieKfjlduNNphL4kF64PhNyU+UE1koE=; b=SjqBZIe9/k15fgKPmRgz1J3ftmDzNYIbSph/a4gUJzB2g6lge+SpxX9UtORhMAM1Yw7onx mY2h6czIMzpOhBgc/wK6Gofq4dR7srqMbHMblV5GWaKWeBzJE//dWg/xfxrXMyO5mBFO5K 1DY4D71hfTjPjobNVUMoJ+CH+n3gY17bFltLJ8Lhvw83n+Uxv4P6eeRWWFtT8eDKwwVWrv +9RNdptk2i1GhnZ/vlm8EfbKTZTKSHfpZPU4J/L8JPtw1KKN+86yznA/MQM/FgfuYpQwdN rxJYfPBM5s7/M7rEtkteNmDW4OBRDpJIJvkreK2MZYvBcBt94D5cgPhlmTGJ4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694025425; a=rsa-sha256; cv=none; b=LI21gtnyBTuRn8pDRl5tUBJjrsULLJ5B+5b51nHywRj47OdEYuAfYNvRBUe6YTAq4v8x+V a9lzQYNR0dSt+ArBX02L4Oupl1WpqiO0UsaF1OMNc+skHjZAQf+h4QYxWkqhXbTSKSfH+s o74Gj3OSwT7qP/TPORYzGD75OVhKL/wBSkOB/yBVle+Stw3SSLdNVisc9xZyBn/sQvh1pN Zov5M5O04yEXaBBfav1qlqBt09C0j7/Dm5pTJY+ACdcvoII+RHI5IcD7Fu8Al5GMUxQQ6I a029tiu4chroOGZy+M9FaozROBKs7taDEe2ihHM0Yw72GY0AI4YB7s8/gNDM+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KGTDdrkUsxoVAieKfjlduNNphL4kF64PhNyU+UE1koE=; b=HDX0jchlXGGNE6ZhG7fBLYTdiznHAHEwfl+gT0Fj6iucOYAN74vg0fHTly7GVX9GmzhbxS xomdpIQ7AuLx+a9DbhB9LHpw30IIQIuzWJmAPBCzY+frV3sXyd/ZZpaWP+waf+iIl+lU3l UKzSMz+1bhNMf5nPN+y9l+nTLvUEl+L6tOIwHEMf/8tYZFQ8pzU1m17JFs/yVo7d3T8Ugt zaNZcM6auuMcdT/OaIhIIpt0N0zllZ3VJs9MNVS++6aY/sWvZ3RxQhAPVBdIU7DU6mx85u esdFf+Qrk6QDpbwxocNGGAZWu/oliOWQFArxiMjzckLkQwWdPwLGKLPg0SdGrA== 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 4Rgrh11Nf7zCqw; Wed, 6 Sep 2023 18:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Ib5fX086267; Wed, 6 Sep 2023 18:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Ib5AK086264; Wed, 6 Sep 2023 18:37:05 GMT (envelope-from git) Date: Wed, 6 Sep 2023 18:37:05 GMT Message-Id: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 1926d5cef6ea - main - init_main: Record completed SYSINITs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1926d5cef6eaa1302024d6471271c930ad65f9b2 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1926d5cef6eaa1302024d6471271c930ad65f9b2 commit 1926d5cef6eaa1302024d6471271c930ad65f9b2 Author: Colin Percival AuthorDate: 2023-09-05 23:47:57 +0000 Commit: Colin Percival CommitDate: 2023-09-06 18:36:36 +0000 init_main: Record completed SYSINITs When removing them from sysinit_list, append them to sysinit_done_list; print this list from 'show sysinit' along with the list of future sysinits. Reviewed by: jhb, gallatin (previous version) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41749 --- sys/kern/init_main.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index a6b327339c80..a8df9f84a29a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -163,9 +163,11 @@ SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, NULL, NULL); SET_DECLARE(sysinit_set, struct sysinit); /* - * The sysinit list itself. Items are removed as they are run. + * The sysinit lists. Items are moved to sysinit_done_list when done. */ static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; +static struct sysinitlist sysinit_done_list = + STAILQ_HEAD_INITIALIZER(sysinit_done_list); /* * Compare two sysinits; return -1, 0, or 1 if a comes before, at the same time @@ -289,6 +291,7 @@ mi_startup(void) */ while ((sip = STAILQ_FIRST(&sysinit_list)) != NULL) { STAILQ_REMOVE_HEAD(&sysinit_list, next); + STAILQ_INSERT_TAIL(&sysinit_done_list, sip, next); if (sip->subsystem == SI_SUB_DUMMY) continue; /* skip dummy task(s)*/ @@ -904,6 +907,11 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, DB_CMD_MEMSAFE) db_printf("SYSINIT vs Name(Ptr)\n"); db_printf(" Subsystem Order\n"); db_printf(" Function(Name)(Arg)\n"); + STAILQ_FOREACH(sip, &sysinit_done_list, next) { + db_show_print_syinit(sip, true); + if (db_pager_quit) + return; + } STAILQ_FOREACH(sip, &sysinit_list, next) { db_show_print_syinit(sip, true); if (db_pager_quit) From nobody Wed Sep 6 18:37:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgrhy06Dfz4sv9K; Wed, 6 Sep 2023 18:37:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgrhx6Xfqz4VBG; Wed, 6 Sep 2023 18:37:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/k7AKXZA1bqepM48+w4D+ys3YD4bLpKSu2fMP1PrFKA=; b=NbscRpmPX13eFLf79X5QQDcvoZsKWu0RyyZTjir865ySBSoZSnjyMj5v20Cajr1D22byuq WgyPgvfyCBDmZ4NW7ACF0+0JYyn1yGp+YwWBPavb05DudYyKFhrVeD7aT8PNNyQvxKegiM 6YKRn2P+SHKP2DrgITtkWLePim7yk9WKgwLoa67Hfes0OSCgDo+pamDzfDy7CMcja1/WCK 4i4P7IMGHh/jTGg9kTiBCsJCxYY/QnJZx72EGpRoIAQSCiH2h95dPli5+Pil8mYTTKMq8g DRzjZM9QRuex/+mck9SekqNc8Sehj2Gs8wiaouUymT2RCpCYO/JrkowawIUDVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694025473; a=rsa-sha256; cv=none; b=w9h8eQTwmNMHLWZsdG17yZi/+u9EZnw0NHlMBZHMwEEWOGEJ6JXu6HkwkAnh9fGdYwHBU3 8JYvVXS8fp42QRGiznsjxyHj2bEL02YFVnkKocSJWw8QKUKGV5j0ftNqAK8eRtKcXEifUn zNySPyumX1q8AqNt3qTMnxWgLQ4TmjRSGRctKqy/CLZT8xts6rhP3LI3LHDe38YEDGXk3q RvqmwevpzQbrrLkvRElT8hdIMX1Zgr2PoLGd3T4dV3OMyRvy4fJV+LdtZI8F+S1vDXwPcJ Rwlveri+Ays9f9iBYUF3BlNPwcC9A0kI25hmnhsuRdT2Q1Sz018TNrNVM9IQsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694025473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/k7AKXZA1bqepM48+w4D+ys3YD4bLpKSu2fMP1PrFKA=; b=mZYr0ylHISm7yyo6XucKTqkMp/mL/dfavSa/nndy3gJw5fjwJwjfS+O0f6N8oOkf6bHpUb d7FwBONGSmBN5QD61Cfgs3tJTuQaXaczC57YK3It5XF77/2EpzpRbEY4IG/vrKqmuku4AA 9oPW3NhrkeVCziYoqKMhTpT3xE0dj8niNy+pWd6Vc5DUPWDNYU3EptY3JyzgSkvbVMJ6O6 hvulq8hU71dccrag7FJAGJbmxjGqDVGNh4znWpIXSds6OS8Cd/0eFcNQwm0z8dayjJhHZa hGIUy0rFcjF6OTAa8HeUjA/G5yfxkxwQHqfH2HVlek9Zx89jRS8Yv4rUHEcffQ== Received: from [IPV6:2601:648:8683:a9e0:596d:20df:e8a5:a6d1] (unknown [IPv6:2601:648:8683:a9e0:596d:20df:e8a5:a6d1]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rgrhx0sDSzqb1; Wed, 6 Sep 2023 18:37:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Wed, 6 Sep 2023 11:37:51 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. Content-Language: en-US To: "Bjoern A. Zeeb" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202309052116.385LGoau059784@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202309052116.385LGoau059784@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=cf94672363d6638b7268c05b4628b62bbfc8dbe5 > > commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 > Author: Bjoern A. Zeeb > AuthorDate: 2023-06-08 21:35:09 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2023-09-05 21:13:18 +0000 > > rtw88/rtw89: remove local firmware. > > Remove firmware from src/ in favor of the ports/packages and fwget(8). > This will allow us to shrink the size of src (and installed modules). > Update the rtw88 man page to reflect the change. How does this interfact with doing an install to a machine over one of these interfaces? Will the install media need to have the suitable firmare packages pre-installed in the image? I'm not sure that's something we do today in our install images? -- John Baldwin From nobody Wed Sep 6 18:56:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgs6s6PzYz4rr43; Wed, 6 Sep 2023 18:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgs6s5wnyz4Z3t; Wed, 6 Sep 2023 18:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694026613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxYIw0NkGSZiLh5u4cb+kgD38mKPAykZ31R04Uyq9zo=; b=P46BQGlycX390rAiLpduR1dw6vI7JKekbsHF6T0biBG+34K5+nCT7nSZwjPD/SHymOCIRv yQ/gb0vlvH5ogj1qCqdQ31g1X0Tz4Su+IgfjLcDiAlsP70cs4cY4zzDW8P184o6TGr8jct YjPyXGW+3AyNCMaIZ5vQnEo/gZQqN9zw99qQDWTEeX/WaO0fxDM/eBhLXQ0Z0GRgvR7juZ d7zaaTREZEFdF+cnMdHkjJ6kqMSprg3gs6uSoIQ96m/gXIm5iKg3VR0gJMpzpcC4gaEjSR 1SKK2FvVfxj3fQO57om3gpLNsCQwGDYjhsgThb3q7nUsfycw1BEqTvLAOvuP4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694026613; a=rsa-sha256; cv=none; b=lZq4z8z1XEWnwlGDaF+/MDkXWwurRMnU3AiUa2RC5IFdO2j2MMUQ2zW5SasYor1cNPGkOY bR7eHu9WIUxA7u5Pf4DKJpRpN/8JwhCHwBavj0WCQfku/SRcpwuRLPQs6PMAht6zo03bSB jl052lXMW/UMlSC8nQoS/RN2xsyxCMpoTCloxM8q5jKmhxaGox1YQ7NA5SjOcK3+n6K+6i PQMWdyLZXOyyxIl2z9nli+EuncZHI1CVae2g/hc8NdqWhwxoKgA/ydywfe6GCzCeL2yYvU mJRKnDEyHguZnyJJw6304PXe+Ypx2d1Nl5LesPHF69R4Hbf9I7k428mWGh6UOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694026613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KxYIw0NkGSZiLh5u4cb+kgD38mKPAykZ31R04Uyq9zo=; b=cBSl8d/P9oKCIjeYBeWSgi/6eirvEAtinTsH84odkuz7SMjPKMr9GpFrwJmqj5tLK/f7LN qhF6jfw47rRRhuKsyvhlVGrdqNzOG8bM9bp2n+x5JB2ux4amLBTl9gTPu9t+6Iv+mQpd2L z9pFBvOfpdx4qFXUKcfBDP7t2KEruO4lBhWfBQMEy1CoOP2EEFsjROAMtsZzdZcJEiUofY 35pbDpLNR3i7kXH4qZodCmkWFdrBp1VdM9pgOOtOIa4/dbQbqExcS6x+Bev9kGkWNlglFc 6Bibeo6MowI6PDyrWW4TocMq3B/qjexP9cqykUjlyTVJlgu/UEiLCansOWh4aQ== 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 4Rgs6s4zm5zCsX; Wed, 6 Sep 2023 18:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386IurlB019287; Wed, 6 Sep 2023 18:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Iurm0019284; Wed, 6 Sep 2023 18:56:53 GMT (envelope-from git) Date: Wed, 6 Sep 2023 18:56:53 GMT Message-Id: <202309061856.386Iurm0019284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b7528b16c603 - main - release: remove inet blackhole sysctls from GCE config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7528b16c6039a9f0af28f8f3ccdd6ea4eb7e604 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b7528b16c6039a9f0af28f8f3ccdd6ea4eb7e604 commit b7528b16c6039a9f0af28f8f3ccdd6ea4eb7e604 Author: Ed Maste AuthorDate: 2023-09-06 00:03:25 +0000 Commit: Ed Maste CommitDate: 2023-09-06 18:56:40 +0000 release: remove inet blackhole sysctls from GCE config Other cloud images do not do this, and it can produce confusing results. Reviewed by: Jose Luis Duran, delphij MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41751 --- release/tools/gce.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index d219852b63a2..aad4a74d2e39 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -83,8 +83,6 @@ EOF cat << EOF >> ${DESTDIR}/etc/sysctl.conf net.inet.icmp.drop_redirect=1 net.inet.ip.redirect=0 -net.inet.tcp.blackhole=2 -net.inet.udp.blackhole=1 kern.ipc.soacceptqueue=1024 debug.trace_on_panic=1 debug.debugger_on_panic=0 From nobody Wed Sep 6 19:06:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgsKt0jVWz4rwhc; Wed, 6 Sep 2023 19:06:26 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgsKs6YNBz4cSb; Wed, 6 Sep 2023 19:06:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694027185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aQO5Y20DMfoJy9Lv83FJ3eNnyReplF0lvTO/pmYDLvY=; b=Rf3WcHLoZaLT5exaBenWIiCRmNmjoVi2wzNdqMMjKBH4Fn/dYUqPxIRgr6ybOAmLvORHXE Vw6SE0LjTJc1iwY6tn/9ewymCfU1lfv/9hrmE7OplOcqNnNFctZB9wbPoyJu0Cj6Jtt3wq 02Q7AE0SonRgX1Oz3ZGY+vXtzHEh1wmImjgSbwjdn8ANtZcAFrc3qDy68EgjbnyY/CYOqQ 34l+7uEcF7ZhNMRatMU+GJpwl1s9W4rsLQHGzq9fUt7hhp5ZrHVtaiM5Qi+rR+P4PI8ylr Xcvs1S2ooQilmZoPX/QDcyhx0tAXfEFfsOb4TXaAp1s9agni/U1mi70J+Fm4+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694027185; a=rsa-sha256; cv=none; b=ThlVnlits1q9snrKPMPcRNscEZk0KMb0oPAG7hegLsp7djdlWS98MlN8dSUjiYK8a5Hv/x k6oWHSejB/OSwxddEJCevYQiYYijZumGMdMLAYCrO41Qmnp3jkzU3Cy/litLLDMxNIOM+5 wKUlRZiRIynhVOuyefuoG/AANQ0hzl3rFAXTk2h8N2nKSleN/iy0Hq9XQgyQ3ls7lwtD+W xxiPHajflXXit5t2fS5qtpp/EtMFL0UhZ6i93BYYOjRg169V6RRN0jx2ZYY5EoVRPHLyLz r7BqZcWjktAmWzc9Q77j/nJn8nifZHRinWtIVo5S4Y6avq4hvf+VfWO1W7H61Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694027185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=aQO5Y20DMfoJy9Lv83FJ3eNnyReplF0lvTO/pmYDLvY=; b=pCoZsrYmjHzhgb3R8cLin9LZXSf/QYypFE1HALj/dap1qJ2u3CwX4+mage1eDJUSNXyukf 98UNehLPQsZLu7uyJqsxdjTjTozhjQC5sWteM4T1FfdiIcrosh8R2uojLBDhjrcAZurQNw OJhMrcAQn1HoeWrmaXKvx0aKFxx8yX0mLsTA0bcmoaxWeaIdC/TnqXNyv9tSKw4HWKD7GL VJMooGN6euj6qC2B23uZJdvhz/M8yotRDMcmSMGezNo1c43fp+YT6oqbNI4TP2N+bIxi1Q P9y65X7R19Z3wAJPQqGwSdDbAmaQ8Wo/pIRJstp8s653kZAVWhpZHhxkLuTodA== Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RgsKs46DFzqt4; Wed, 6 Sep 2023 19:06:25 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 1FF8B8D4A178; Wed, 6 Sep 2023 19:06:22 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 971502D029D3; Wed, 6 Sep 2023 19:06:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id fJ2HZmVvDQNQ; Wed, 6 Sep 2023 19:06:20 +0000 (UTC) Received: from strong-aiccu0.sbone.de (strong-aiccu0.sbone.de [IPv6:fde9:577b:c1a9:f491::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 3BBAB2D029D2; Wed, 6 Sep 2023 19:06:20 +0000 (UTC) Date: Wed, 6 Sep 2023 19:06:19 +0000 (UTC) From: "Bjoern A. Zeeb" To: John Baldwin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. In-Reply-To: Message-ID: <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> References: <202309052116.385LGoau059784@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Wed, 6 Sep 2023, John Baldwin wrote: > On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: >> The branch main has been updated by bz: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=cf94672363d6638b7268c05b4628b62bbfc8dbe5 >> >> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 >> Author: Bjoern A. Zeeb >> AuthorDate: 2023-06-08 21:35:09 +0000 >> Commit: Bjoern A. Zeeb >> CommitDate: 2023-09-05 21:13:18 +0000 >> >> rtw88/rtw89: remove local firmware. >> Remove firmware from src/ in favor of the ports/packages and >> fwget(8). >> This will allow us to shrink the size of src (and installed modules). >> Update the rtw88 man page to reflect the change. > > How does this interfact with doing an install to a machine over one of these > interfaces? That's nothing we support. At least we do not support netboot over wifi currently, so you'll always need another install media. How's the "bootstrapping" going to work if wireless is the only network option? > Will the install media need to have the suitable firmare packages > pre-installed in the image? Yes. Basically for all supported chipsets as if we'd ship them from src (*). But you'd likely only do this on the memstick image. (*) and then we'll one day face the problem that we may not be able to and need yet another way, but that for then. And then as a 2nd part, bsdinstall (with networking avail) needs to go and fwget from inside the installed system. All kind-of ugly incl. pkg bootstrapping, but the only way unless one wants to bring in packages on a physical install media as well. > I'm not sure that's something we do today in our install images? No, we do not. And 14.0 will not provide all of that. That's the reason I've done this in 15 after the branch and left 14/13 open as an X-MFC question. That's also the reason iwlwifi firmware is still in the tree. I've slowly been discussing some of the issues with core@, re@ and others over the last ... hmm.. 18? months -- basically since I was asked if we can stop shipping an extra ~140MB++ of wifi firmware in src and things are slowly moving in the right directions. /bz -- Bjoern A. Zeeb r15:7 From nobody Wed Sep 6 19:38:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgt300fjSz4sF4m; Wed, 6 Sep 2023 19:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgt2z6LXZz4Lgt; Wed, 6 Sep 2023 19:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694029115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38R8rHu9pNiYtRAx8w5+9XmBzH2A68UbsKx9ARAVxvg=; b=u7IBy0+TGn8pGFyGWJ06KPqseEtNsy6Uoh4BJaIefzjlB9pEOqD+udHGSC4FHLiTlfyu/h GUJoFJf11OGwMyZtg0EIBMdjVC66+datxEX2Oyrq+GwXc8QDuwIr9d1418eAifZXRI0yHY wugrwrbsHZa8qt7POeAgACEYVfT2BySPMgJIjz/XGUJqiRoPVkK87Tdfv6lEVDI1gn7UpY 4CEp2rQfIO5oV1qJt2nOuJnLtsaWQSI506LYjv3T7QJ791hwS6NdWZdfJ2CzZYLVbdRfZv 53WkKTe4hp/a968ggPY31F9fM7nAx58rI6cvwH6E33SRVlycVgLAK+4Bj4gq3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694029115; a=rsa-sha256; cv=none; b=BJk8k9DIeFAFQlWRrf8ZmPBMCNwp51F9CvxNFLnS36cPG6JjUJFa9eZw281v/7sZFUKE11 FyYjk8F5HOye0Drh7koIfo1HbGePJV+r4APHjYTRstzTXy3Dcx/xP6DAWcOLXK1dLIF7k9 WcoGoFfs6FV96atxxdYaZWLHPtWsVx06FIOzJCC8MLRTo69Ie2+CEl4eQEqL51ZBIOUCua On9NoOPUZJ1SN/YhlWXbXKk4vLiIMrfU0fL6ezwSBB1f1eY6fJ6oQOu7lgjmzvgi7Y/R1w 5Hj+1+vmpwKmxmY5vJ1oKypKifrwinwvUT3hz1J8G30iEZNQd5T40NnmgVm8fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694029115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=38R8rHu9pNiYtRAx8w5+9XmBzH2A68UbsKx9ARAVxvg=; b=Cx+BGUYSVDI4IRBExgm1YjZ8XlCClPgcxBWluPLOmmQkv/jaWIfqw3yGA74+pVYKD4n6gJ ZAZUkSSnR5L7jHtZigHrYWZVB+tpI1PqdJXS+PPpehYDCHZUEaZSh2pPvBwzz0fuQUfeH2 6c1y0zxnPHoi9lQmPLH5GD1dJqJpaBlN2r5FNodazjkzJig2tuyqGcETxyjYVUbrZ3mayI d+deevtVkl0cxKi/Fb5vrNlLfNg2B8ROJqgB26YHFHXK1+xVbTe3pPC/xbGD6m0Yg8BfpD NpB092V4drCuOAfNuQqxY+QZa31q8FmFMTeL5bTsWWzYSLdRIvNzPIoA+VyFGw== 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 4Rgt2z5Q7VzVR2; Wed, 6 Sep 2023 19:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386JcZ3W086787; Wed, 6 Sep 2023 19:38:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386JcZiV086784; Wed, 6 Sep 2023 19:38:35 GMT (envelope-from git) Date: Wed, 6 Sep 2023 19:38:35 GMT Message-Id: <202309061938.386JcZiV086784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 03a7c36ddbc0 - main - __crt_aligned_alloc_offset(): fix ov_index for backing allocation address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55 commit 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55 Author: Konstantin Belousov AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-06 19:38:15 +0000 __crt_aligned_alloc_offset(): fix ov_index for backing allocation address Wrong value of ov_index resulted in magic check failure, and refuse to free() the memory allocated with __crt_aligned_alloc_offset(). Then the TLS segments of exited threads leaked. Reported and tested by: glebius Fixes: c29ee08204ce4106d4992474005c5f2fb7d5fbf1 Sponsored by: The FreeBSD Foundation MFC after: 3 days --- libexec/rtld-elf/rtld_malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6e011e88ba5a..4b5140551675 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -188,7 +188,7 @@ __crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) x += offset; ov = cp2op((void *)x); ov1.ov_magic = AMAGIC; - ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + ov1.ov_index = x - (uintptr_t)mem + sizeof(union overhead); memcpy(ov, &ov1, sizeof(ov1)); return ((void *)x); } From nobody Wed Sep 6 20:40:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgvQT6F4Zz4snxt; Wed, 6 Sep 2023 20:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgvQT4qNXz4ccw; Wed, 6 Sep 2023 20:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694032833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bkHpv0Fe1muLquKvelq3zByt0jpw0v7nyzaW661eL+E=; b=fuxcgSzxryS0e20RvXUTpbtP6245xKhjz7rXsyRQ3OdoJ8CFUnoyd/q0eIt2CLZQt8z2Oz JaiZpxsmM6bC/OjLf/WT4o/qkaWtLJRZHUmdjR1Kvq1EXmO803lMosqYXuDkjvS7/JqaAu tPTiMIkGbvxfjdkOfHFWn4ElrCYaxyYbu10RhzzNxCd7059z3OCXJocW0Bbi8Kvwwdj4s6 laGwVf4ACyVUP4wRo3vntoFIFND/ummFmbkIoW7W7/WzYVaLOxT2FRqwgKgDbfO55zqMO6 0Sexo9EH4kg14L4r8To7nirUXFF051yWYWvsmVzFZ+GDbB0PTva+ZVc1Z/momw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694032833; a=rsa-sha256; cv=none; b=pn5DFMDweEOl9dP0+Rl+RwB95mSt2p4whfS4SzL9qWSHoe2gilcD1uU07kJopnpNeyLpul NhY9M0ZuEit51MiQF5d3yg6nmkLnKPlaOYjaDVKU7dN4kzJJAadDn5J9AAKUtJ9Hkwio5i RYMBD7NRhFXDYoe4aKPHTp8HCWvbH8j10XEzJZ01zJiPerjL3TOzQbo9nnYH/e30EHKo3i VoSFJttA9/XT3JYtvo7zJvL3ZUuYle5SI7RgCNaXuN4rWLZpaPj1XUpawbzlKZ9CgMOSos ej2oT8/XCrsJ29g95qZa4DMm7LTfGeHDLVxA+AMdZJS/RqqEb3UidDA8IaMhKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694032833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bkHpv0Fe1muLquKvelq3zByt0jpw0v7nyzaW661eL+E=; b=L15isfKQ2gU+jXcGJQiwbrKpGRmrGm7MIEfqXkygPIOS0HYGpj+MqTTC2tY1mmOtNgDQNI i2rPe5A0wCcNvkZjKPy86DUoHqPn5lqs0ndffUVG1hOh7qrPnxTYwZW16BJTINcyeVV8vC D1fAa9yPZ0P0mTkJW0DePiTDxhRpwnTOKB4IobTxur7YR3rrSHRJIebgyf7VpyggPX4f5s 5/sfHnwiutHgyNOKF7gtka7NnC7+/s4OAQ5yKr0lhC1Mx4OPvf4x4Pxjkim2CnUgJRZ62k lQJ3kyAR3ah+5OP6Q0m0vgFGPxvzMYCHXbhjh5FESQrWJsMK7rRmlH1PZ9hVPg== 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 4RgvQT3nSSzX3G; Wed, 6 Sep 2023 20:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386KeXGa094355; Wed, 6 Sep 2023 20:40:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386KeXHK094352; Wed, 6 Sep 2023 20:40:33 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:40:33 GMT Message-Id: <202309062040.386KeXHK094352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: a6506dda739c - stable/13 - sesutil: fix "fault all" with zoned jbods List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6506dda739c04186e7fe966687200cc74d36091 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=a6506dda739c04186e7fe966687200cc74d36091 commit a6506dda739c04186e7fe966687200cc74d36091 Author: Alan Somers AuthorDate: 2023-03-10 17:47:08 +0000 Commit: Alan Somers CommitDate: 2023-09-06 20:39:35 +0000 sesutil: fix "fault all" with zoned jbods Some SAS JBODs support zoning. This feature allows individual SAS targets to be accessible by only some initiator ports. One application would be connecting two servers to the same JBOD, but they wouldn't be able to see each other's disks. A zoned JBOD should also prohibit initiators from accessing SES elements corresponding to inaccessible SAS targets. It reports that by setting the element's status code to 0x8 (No Access Allowed). The bug is that when doing "sesutil (fault|locate) all ...", sesutil will attempt a ENCIOC_SETELMSTAT ioctl for every single element, even the inaccessible ones. The enclosure will reject the command, the kernel will return EINVAL, and sesutil will exit. The solution is to check the element's status, and skip trying to set it if the status is 0x8. But if the user actually supplied a ses ID, then assume that he knows what he's doing and try to set it anyway. PR: 270093 Sponsored by: Axcient Reviewed by: mav, trasz Differential Revision: https://reviews.freebsd.org/D39017 (cherry picked from commit 57dc6f5e200b10d34ccb97ccc18d06b3f0b9b933) --- usr.sbin/sesutil/sesutil.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/usr.sbin/sesutil/sesutil.c b/usr.sbin/sesutil/sesutil.c index 99f6b2de63b0..863b95a0f8b0 100644 --- a/usr.sbin/sesutil/sesutil.c +++ b/usr.sbin/sesutil/sesutil.c @@ -279,6 +279,16 @@ sesled(int argc, char **argv, bool setfault) char devnames[devnames_size]; if (all) { + encioc_elm_status_t es; + memset(&es, 0, sizeof(es)); + es.elm_idx = objp[j].elm_idx; + if (ioctl(fd, ENCIOC_GETELMSTAT, &es) < 0) { + close(fd); + xo_err(EXIT_FAILURE, + "ENCIOC_GETELMSTAT"); + } + if ((es.cstat[0] & 0xf) == SES_OBJSTAT_NOACCESS) + continue; do_led(fd, objp[j].elm_idx, objp[j].elm_type, onoff, setfault); continue; From nobody Wed Sep 6 20:44:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgvW36yt4z4sqZ9; Wed, 6 Sep 2023 20:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgvW36XZDz4f3B; Wed, 6 Sep 2023 20:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSqT0l1rn38ls/GSaX2g9mRMyZgzNmo9miRVfg9+bDU=; b=bq6rx2xKJtUBoSGlJtoScZ9T49NfbWG1Mb2N5GBhaWuuNwZL6CMrIiZc4icpWGuL8LCThg ZhIHfvAJE7E1l4lOV6zRn2OVBdDg12WKYIUjlmP7E+DuVhLw0dXNJr5iesjUx4mSR85Int 0VB/qXL0iRsuiAJvQNEicopgj0LE9toM5fv9xtrE7/dALXDoQP50RZIZAIIsFxWR9AmqTz BqtGxN4MrWPXpTe8seRSZuRxW0Q/M51fgMoQNPkCtar8oKuNq3wu56AERSef5D4WgpCj99 EpUTkgFiGzQ996qiPmEcBoQjzS6ZrEoNjrOjfQ89wXRF9xXf/eghfWh0tfmkkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033071; a=rsa-sha256; cv=none; b=L8J4yLjjwPFJM2gJao03R2ZLu7MBL2pcFyTKnnQyva3AwhqIiI6/UH7ueUKSk4BiwSW1vV glXTyegKjI9U07BxdjL8iALwCmN2hxUjdSbtvuZDu6skxvzR5MPgFkwxOo1N7Il/HepCCc PW26N0WrwvY2uLd9APyGJkw6I5POowuT1YHkI5UGDsHSLsWXkc0FaIns1uh8fG9EAteX3y tuH/j0Bt+VkE/PMZBoIB9ztpQ1SrRKD49oZ1fH0QinMLyXP1ciBrU5X8p2+mVG9XcsMHvb 0bZ66H1+pRDJahMXbEceZLG13phg6gw0R9zVWysHXZ5WdwypizHY4Kr1J9z/7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TSqT0l1rn38ls/GSaX2g9mRMyZgzNmo9miRVfg9+bDU=; b=MP93f5uo8rEwZMtAt8+OXWU+tLmscT3QE32U2ezxuZMsYvIZGKgluxNWmJSCKIa6M4vXbd s4BTZiaqcxRwCRMW16jJrAydENrrJj5xrd3fptngh14nXjFPTg1FSPxkSEdnW+7xstC37M o3eRKpLao6mIFK5cJk9lCVIlVOFTRNQRUH92SkPEIQU3nTAeo05bfXw41Mbm+miQSappA6 YEwvPPSA0OaZF4Y/FziRp8q6a4luwZkAu7S4mcS2/p/mf6WReQErcPD23vQnuwKhABUDZ8 BvboOT5ZiGQoqSEB76JWtJg6InRKVWlEM3SHC2qj+kqcX2Zl6K+sa22W3j2MYw== 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 4RgvW35bF8zWmJ; Wed, 6 Sep 2023 20:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386KiVkJ002366; Wed, 6 Sep 2023 20:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386KiVE1002362; Wed, 6 Sep 2023 20:44:31 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:44:31 GMT Message-Id: <202309062044.386KiVE1002362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 422efa7050a7 - stable/13 - Implement GEOM::rotation_rate for gmirror List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 422efa7050a7a0a75f04aed2c857a2e2ea4f51ed Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=422efa7050a7a0a75f04aed2c857a2e2ea4f51ed commit 422efa7050a7a0a75f04aed2c857a2e2ea4f51ed Author: Alan Somers AuthorDate: 2023-04-07 16:07:50 +0000 Commit: Alan Somers CommitDate: 2023-09-06 20:42:59 +0000 Implement GEOM::rotation_rate for gmirror If all of the mirror's children have the same rotation rate, report that. But if they have mixed rotation rates, or if any child has an unknown rotation rate, report "Unknown". Sponsored by: Axcient Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D39458 (cherry picked from commit 9309a460b23a8cda8d47c5f775da7fc6472d9925) --- sys/geom/mirror/g_mirror.c | 29 +++++++++++++++++++++++++++++ sys/geom/mirror/g_mirror.h | 1 + 2 files changed, 30 insertions(+) diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index 223412224cb0..14eabe242d2d 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -46,6 +46,7 @@ #include #include +#include #include FEATURE(geom_mirror, "GEOM mirroring support"); @@ -477,6 +478,10 @@ g_mirror_init_disk(struct g_mirror_softc *sc, struct g_provider *pp, error = g_getattr("GEOM::candelete", disk->d_consumer, &i); if (error == 0 && i != 0) disk->d_flags |= G_MIRROR_DISK_FLAG_CANDELETE; + error = g_getattr("GEOM::rotation_rate", disk->d_consumer, + &disk->d_rotation_rate); + if (error) + disk->d_rotation_rate = DISK_RR_UNKNOWN; if (md->md_provider[0] != '\0') disk->d_flags |= G_MIRROR_DISK_FLAG_HARDCODED; disk->d_sync.ds_consumer = NULL; @@ -1145,6 +1150,27 @@ g_mirror_kernel_dump(struct bio *bp) g_mirror_get_diskname(disk)); } +static void +g_mirror_rotation_rate(struct bio *bp) +{ + struct g_mirror_softc *sc; + struct g_mirror_disk *disk; + bool first = true; + uint16_t rr = DISK_RR_UNKNOWN; + + sc = bp->bio_to->private; + LIST_FOREACH(disk, &sc->sc_disks, d_next) { + if (first) + rr = disk->d_rotation_rate; + else if (rr != disk->d_rotation_rate) { + rr = DISK_RR_UNKNOWN; + break; + } + first = false; + } + g_handleattr(bp, "GEOM::rotation_rate", &rr, sizeof(rr)); +} + static void g_mirror_start(struct bio *bp) { @@ -1174,6 +1200,9 @@ g_mirror_start(struct bio *bp) } else if (strcmp("GEOM::kerneldump", bp->bio_attribute) == 0) { g_mirror_kernel_dump(bp); return; + } else if (!strcmp(bp->bio_attribute, "GEOM::rotation_rate")) { + g_mirror_rotation_rate(bp); + return; } /* FALLTHROUGH */ default: diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h index 3b6880ee004d..76e736584c4b 100644 --- a/sys/geom/mirror/g_mirror.h +++ b/sys/geom/mirror/g_mirror.h @@ -137,6 +137,7 @@ struct g_mirror_disk { u_int d_init_ndisks; /* Initial number of mirror components */ uint32_t d_init_slice; /* Initial slice size */ uint8_t d_init_balance;/* Initial balance */ + uint16_t d_rotation_rate;/* Disk's rotation rate */ uint64_t d_init_mediasize;/* Initial mediasize */ }; #define d_name d_consumer->provider->name From nobody Wed Sep 6 20:45:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgvWh1cY1z4sqmF; Wed, 6 Sep 2023 20:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgvWh19WLz4fL8; Wed, 6 Sep 2023 20:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P5M6giLsKD6ei32l5zV/AUyXUWRUHcPjohXe1gaZZbk=; b=PDSbGRtD3uxPwIGIcasxJwZ+56VfMGhunZwJCb22g8Alb2uQWe+hQawFsnYbahC2LgGGg5 M8zg2p1XQk22Pygt0kAj3KsHxanXEhLimMfdGL+iBrxpGf5V2nQx6uiAX/kljtxI58Brjf ILlPpWmtkU0GhCYXGBYLd2X86vwW/JiwqnPW/8B2q4eXJiow/7V8pH7BIb9p3vkUNMxVre oUC9fXAnugPdTuJ8oHDx0MQQapI5YogRS/U45JgoFNbMhHkwuA4U0kE5LeRszMQ3/gYO+t 9UIySq0aO0/Kz32Ti378HVNbszbGOk1xdi/9qgqfpr/zaHkOsD6RcS/lSH8xqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033104; a=rsa-sha256; cv=none; b=l3/kixF9Qjk9zTWG4DmzaRUdl60pAaH7unH1TUm1FEyMdfA9WYb2wJdcaVpdy5BvrEETyB mZ88bihzxGLv7NF88th38AHTSiSnCAvJLOZqy42ZC4kAMxT+elPoJ3zQFN60ZQFN7wFywr kI/TsrMkbIOhUFrotlp+kABQ0SArEqqkn+zSUDLRGmXTBmg+/Gh7vndA4LWBO0+tJtkOnG 9uixexJaBfpI9gjYG4VSo5O9nPALKVwhuzEDm0hQQiv8wbrLXEF6usVWbNhNCQQzMCiei4 pK9VeBMyuGml7mWfcovfqaj0T6O7vI7xYYU75A0zdg/NfEwyFGlSIGKk5LTasw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P5M6giLsKD6ei32l5zV/AUyXUWRUHcPjohXe1gaZZbk=; b=hGLLcSAfdBdp+bTMaJRc8hDu25FmWEKO/AX1PKgtebLuCNE66wG5O4yqAxP+HGbYZVA1Sy N2lnPQ17mu4R4mq9BhmIJ9dmBAiVR3igLwM8rZ9X1MhGUc4hMYt6Q68E9/P/9oPb7EYRs2 htuGzq1D3ObV5Eczuqwje7fN2PzxDJWatcQSmepej+Va21z5+OX8JgWh+7x5cTUcgESOte NrCeWkAQ/lmq2/tdC4+nYqsMumw35fAFiVNZpD5hXZlfe8tcY2/618kLD9lu6cRjJs5yxX /EXg67o5EgxYCOto4g5ygpE/82S8yr2xZekT6/hoSSBJ5B84GqmnE4pDYRihBg== 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 4RgvWg74YxzWk8; Wed, 6 Sep 2023 20:45:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Kj3xw002609; Wed, 6 Sep 2023 20:45:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Kj3Or002606; Wed, 6 Sep 2023 20:45:03 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:45:03 GMT Message-Id: <202309062045.386Kj3Or002606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b2c207ddfc45 - stable/13 - Fix the zfsd_autoreplace_001_neg test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b2c207ddfc459b82c0ec5d0c52ab66a9cc169257 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c207ddfc459b82c0ec5d0c52ab66a9cc169257 commit b2c207ddfc459b82c0ec5d0c52ab66a9cc169257 Author: Alan Somers AuthorDate: 2023-07-05 22:37:39 +0000 Commit: Alan Somers CommitDate: 2023-09-06 20:44:53 +0000 Fix the zfsd_autoreplace_001_neg test It only ever worked by accident. * Actually set autoreplace=off as stated in the description * Wait for the removed device to disappear from the pool before proceeding. * In the assertion, verify that the new disk does not get added, as described in the description. Sponsored by: Axcient (cherry picked from commit be092bcde96bdcfde9013d60e442cca023bfbd1b) --- tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh index 5020946feb99..2fc631074787 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_001_neg.ksh @@ -37,7 +37,7 @@ # ID: zfsd_autoreplace_001_neg # # DESCRIPTION: -# In a pool without the autoreplace property unset, a vdev will not be +# In a pool without the autoreplace property set, a vdev will not be # replaced by physical path # # STRATEGY: @@ -62,7 +62,7 @@ function verify_assertion { # 9. Verify that it does not get added to the pool for ((timeout=0; timeout<4; timeout=$timeout+1)); do - log_mustnot check_state $TESTPOOL $REMOVAL_DISK "ONLINE" + log_mustnot check_state $TESTPOOL $NEW_DISK "ONLINE" $SLEEP 5 done } @@ -81,9 +81,10 @@ log_must create_gnops $OTHER_DISKS for keyword in "${MY_KEYWORDS[@]}" ; do log_must create_gnop $REMOVAL_DISK $PHYSPATH log_must create_pool $TESTPOOL $keyword $ALLNOPS - log_must $ZPOOL set autoreplace=on $TESTPOOL + log_must $ZPOOL set autoreplace=off $TESTPOOL log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 log_must create_gnop $NEW_DISK $PHYSPATH verify_assertion destroy_pool "$TESTPOOL" From nobody Wed Sep 6 20:46:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgvY36br8z4srxn; Wed, 6 Sep 2023 20:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgvY368t1z3Bs7; Wed, 6 Sep 2023 20:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZZHk/cD28fKlJJs2EsN36tWhUNcA4QA90qDRPKME/c=; b=F7s+T0D4cgEAMWg710tMS8aaVHefoOggznnHqo/Nx7QCBJVRUvOJqHU942XnRy+2pZ90W8 gkMnfbscm+JlByp9Uoiv3yJB89HDLtp960+945xBm+n7JwfC0gH15hzR//n6lxNiBavFoo dUXadJw9XHIDjMiPrvBTCAgW2jnx5EsY/YhEwQfTkZXvUWDX8nXzFkMbRjLvJA0wYVaEC2 kesgsPIM1EjOf9lm1qKz38j5wVeWaAz0HOzE7mCtpnGwVskdXN3v5qoLY4ZhojbRuN2by/ yDEMVmT+tBQBEZcY1hkDjOsPMxyMGR1epLehCsDSLDGwSgIgWSdinm41fiUIJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033175; a=rsa-sha256; cv=none; b=DBD1L/8v0AbcFX/FR2YK3qZk4hbDeagdtn1WFGQcYu6nFLVOOKQCnN3gKr9ZqiPyOVQoJ4 N4mLCq/vBy4H0aSWC0e9/7LXgi2ndU/sCyptqisWT43Anxg+3gjic6uP/rZh1aKTuu/pI8 Nrj2+gM2p5Jqyu5Li8NM8iCGsnirtDVMNvPd2EZzgG42SdwJO2SGM4UkEJPI4wwKMHj6yZ FvO9Z61vlnIusW/RlB3dmZ/bsA5VpB8viKmfmwaOPShpWGxFzh/0m2pFAqwizBKPtTdnA0 sr4Ab1inRuiNfIjQI9nMkK17hXJop/Cq9+nswBULjSN0M8KVuEbyUyAPHThNDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033175; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7ZZHk/cD28fKlJJs2EsN36tWhUNcA4QA90qDRPKME/c=; b=g6GbwYeQhIYUGZQx3VlKtLN9bCMRd6seCr22AXXzxvOW34h6vVwrETyK+XYvaTk+mRZrVI fKmvIzNMHKNyEyJQiyDAt+PlGCvLU30ZV2GsV4YHUe4QKduXiccW8bFH+MA49k5NoTbNk3 g9hdI4thNvLkG7Vi3AUTZIXsH6wroTtszL+fETgN2EEsbPPyCWXEhFGSsIeARiDl+Nv1BQ 6pG6DvRoblCxSqVndzaXCB/pgphTTB+s8+sK08FIDkZ/nCXrTgAvLASkfnFv29xaEBkvyf hsV2aGh0im4s9QRcebuGHGmuY4VnEuYa9+Pfbk9lyVVvIoAmPP/zFMzhDDc/cA== 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 4RgvY359jmzX48; Wed, 6 Sep 2023 20:46:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386KkFH4002934; Wed, 6 Sep 2023 20:46:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386KkFsI002931; Wed, 6 Sep 2023 20:46:15 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:46:15 GMT Message-Id: <202309062046.386KkFsI002931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 14ca2bc402bb - stable/13 - During F_SETFL, don't change file flags on error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14ca2bc402bb82fb59a9aede05f62cb5e634b710 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=14ca2bc402bb82fb59a9aede05f62cb5e634b710 commit 14ca2bc402bb82fb59a9aede05f62cb5e634b710 Author: Alan Somers AuthorDate: 2023-07-09 20:48:10 +0000 Commit: Alan Somers CommitDate: 2023-09-06 20:45:11 +0000 During F_SETFL, don't change file flags on error Previously, even if the FIONBIO or FIOASYNC ioctl failed, the file's f_flags variable would still be changed. Now, kern_fcntl will restore the original flags if the ioctl fails. PR: 265736 Reported by: Yuval Pavel Zholkover Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D40955 (cherry picked from commit 6c049996ec29bad4a913b019a28f211ab84b0d3d) --- sys/kern/kern_descrip.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index ab08ca434dec..dbf4ab1828de 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -481,7 +481,7 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) struct vnode *vp; struct mount *mp; struct kinfo_file *kif; - int error, flg, kif_sz, seals, tmp; + int error, flg, kif_sz, seals, tmp, got_set, got_cleared; uint64_t bsize; off_t foffset; @@ -559,12 +559,12 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) tmp &= ~FCNTLFLAGS; tmp |= FFLAGS(arg & ~O_ACCMODE) & FCNTLFLAGS; } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); + got_set = tmp & ~flg; + got_cleared = flg & ~tmp; tmp = fp->f_flag & FNONBLOCK; error = fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); - if (error != 0) { - fdrop(fp, td); - break; - } + if (error != 0) + goto revert_f_setfl; tmp = fp->f_flag & FASYNC; error = fo_ioctl(fp, FIOASYNC, &tmp, td->td_ucred, td); if (error == 0) { @@ -574,6 +574,13 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg) atomic_clear_int(&fp->f_flag, FNONBLOCK); tmp = 0; (void)fo_ioctl(fp, FIONBIO, &tmp, td->td_ucred, td); +revert_f_setfl: + do { + tmp = flg = fp->f_flag; + tmp &= ~FCNTLFLAGS; + tmp |= got_cleared; + tmp &= ~got_set; + } while (atomic_cmpset_int(&fp->f_flag, flg, tmp) == 0); fdrop(fp, td); break; From nobody Wed Sep 6 20:47:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RgvZk6tFwz4ssRP; Wed, 6 Sep 2023 20:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RgvZk6NkHz3C5T; Wed, 6 Sep 2023 20:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5KSKdlhCIS7NrN7KImr9JOXJmYY8g2/97eO5hcFLft0=; b=q6xzasVU+owQFdYCodVJJob2eEpp+nJ+BeC18ILFxFm4KB27iZS0ZQ/4Udhxnex541fBFK XqiJATkiVEWIPAOEtrvIecfnss8SdMxRbbzKyVwnwxLyz7/bAxwQs4BW0s/Yc3AUe+NcWv eRVVIpEltwI0ANl6WsijlIj3FLKpZQQCOJ2cdawxv6j9fSmtEsx4AquLWdRphvDDYzdZ7L T50nZaEeUzfW8w5CZGo5ZogLrU9Uch/olNn9F4TWxvfnndWe29WMQKL2r/ctz580hk6qeO nx4K7jbOOKpBxmkkJ6KaiggTiELslAGoW7tjd6fZ2vuIS8gVZwGMFu+KRdMI9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694033262; a=rsa-sha256; cv=none; b=egdFnitEuYFvtuhqg5G/wQ177TcHltTsqHYbwcZ2HwnMg5PO6w2awIxjENsTbEX7zmrWm+ fc/HlbBaVWNwR9Y3kXeyJ82wR59zsr3ocxTf3c7G8zE/LO9jFs+DbeNaYgjmfhU0u4InGl Z/TlZQnlBNBk3xdh+8Lr48Mzeunq6AYCiIT8lSYK6APqHieMk830ZoyQbALBSvcbzhQG0w vzT2sPiMTo7R75JKAFzLG+p5moJLOtFmb3Ggt5763CdcbRGExRQ2BVbGVwB7o7Z83a0qmD 9GyKtBE7NWhTa8g+lFptTGFYzpLE89xDPyy645dGfm2oI9zM1yoUdj+MvdQP2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694033262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5KSKdlhCIS7NrN7KImr9JOXJmYY8g2/97eO5hcFLft0=; b=lDgbiDki8mfKdicYoU2zZdkQMZpfr13KHpuoQqkvhAq5KXHroMJdpemFuFl95lk0wrftbj ggStxU7+W02uiBbeqxCJSIGoenYOf6U47JjPOWi1979loTvKeuBHsKavIz/mwH1ZgGdpC1 m8fPGHluerkaFWRxCGCANzGPoC8o/Xc7dQJEUJvonCR+jyH3+EZ/IJzF0SYaLzxjgJirXP +/6pZJFEn8fMBffdDLOC/CW2PuV+gsUFLBRg03QGsLClPPOcHipKCUuRk/EyaMeorDYFpi LoXYbCRYowGp5SXmGdZj5u0z1yRcVtt57cvLHv9ub+vOJ9Qf0NQr5wMg13AXMw== 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 4RgvZk5S8vzX8F; Wed, 6 Sep 2023 20:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Klgkw003208; Wed, 6 Sep 2023 20:47:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386KlgxX003205; Wed, 6 Sep 2023 20:47:42 GMT (envelope-from git) Date: Wed, 6 Sep 2023 20:47:42 GMT Message-Id: <202309062047.386KlgxX003205@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 3961edfe13d8 - stable/13 - ixl.4: update link to intel-nvmupdate ports List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3961edfe13d86312adf5e0dd50ee65a3fa32e6ed Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=3961edfe13d86312adf5e0dd50ee65a3fa32e6ed commit 3961edfe13d86312adf5e0dd50ee65a3fa32e6ed Author: Alan Somers AuthorDate: 2023-08-02 00:04:12 +0000 Commit: Alan Somers CommitDate: 2023-09-06 20:47:25 +0000 ixl.4: update link to intel-nvmupdate ports Sponsored by: Axcient Reviewed by: pkubaj Differential Revision: https://reviews.freebsd.org/D41288 (cherry picked from commit ec54a31423544586061c444aa129ccda966e83f0) --- share/man/man4/ixl.4 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/share/man/man4/ixl.4 b/share/man/man4/ixl.4 index d0343d109ab4..8397bd99a5e7 100644 --- a/share/man/man4/ixl.4 +++ b/share/man/man4/ixl.4 @@ -29,7 +29,7 @@ .\" .\" * Other names and brands may be claimed as the property of others. .\" -.Dd January 19, 2021 +.Dd August 1, 2023 .Dt IXL 4 .Os .Sh NAME @@ -103,7 +103,10 @@ package. .It To update the firmware on an adapter, use the Intel Non-Volatile Memory (NVM) Update Utility; installed by the -.Em sysutils/intel-nvmupdate +.Em sysutils/intel-nvmupdate-10g , +.Em sysutils/intel-nvmupdate-40g , +or +.Em sysutils/intel-nvmupdate-100g , package. .It Drivers are provided by Intel outside of the From nobody Wed Sep 6 21:10:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgw5T07jsz4rqP9; Wed, 6 Sep 2023 21:10:53 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgw5S6mGmz3NTL; Wed, 6 Sep 2023 21:10:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694034652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DlkxEc/9MqTPKmWE+O24oC92/Wo9kWmLC9RgeQNtK/s=; b=RY243U/XONGl5of2kIzmE6v/Ic/2+82yGvFIODHc15DiOEhNSlFr3zCbvJte6+UFG9F8D6 OJECNvY3I2xGXpe2uuplygs0Z672IcdbO3FO9fumr7etPiIxhBHPsQj8kcvFa1LisH44i6 EV8+IOyFldj4nRxzo7yUcTRUnhNKvxdinM/uwLkvAEqkr+3pTh2+T2+885Ca7Zn9NVFYtk OTyp7zx56/W+7MmGOWPQj52hf8qsQWsgdM9coPovgt0e7RtKP8LKmMS5qupZnss7ztSeiy /TM8lS2TuhTIL97KnTgmFC+Al8Lh+O8Yu0tDM+NS0lIf/8xG6XsT6dMcctSDfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694034652; a=rsa-sha256; cv=none; b=X8qL34LV0Kqn+oWLtTSiQEjhDuUzhBQg98LTvDuiHv4OfIRNIK26HWcw5yCiMi6HQiMiIt xgObINJR15bHW4el+DG8n9zajiBv7zCKiQ+vUnEJtlzXZGftifzVEEQCOI55CnErXIgHt9 paTS1Uv5IUxWXJC+g73XhpvVYYLVFJYA6XzfkE4DR9dFHBzbmusZqgNu89G5jomU4N4Y1c BHKtgzVLEKhGFtrVHNmF6neELnZDJiUAAYaCaCtpREOa75mHHDjtfbE/nJH5FriVLLnAQr C6uJ2Dz1b3rYH57Mb6/TD026usz3dWqLf+LJiBvNOeK/L22JDBeod3BlH95+JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694034652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DlkxEc/9MqTPKmWE+O24oC92/Wo9kWmLC9RgeQNtK/s=; b=FVw+7CiihS6pRZhJJt1LBqriK2SDJcdXBkst3D71YkvGMjkavzadMv7C91JuYUImyZqKz1 p2sfjVCe5tPmJw7vgBAFs2gQTJATdweclyMgXgGdbwYjsZZJ014lrmXWfE85dzaFY6Bsmt DvVO/2UK13tBGof5EZJRbGp0RQEXSQhhsC2jeZHKqH7Ze/3q+zJ24xqq3osocC8zWjmvtA x/+mIpueFyfoiK9FAJTAVKdlbGIqgfNfxOIfDz+4ZNQSyqaVjwPwm4qzuK+XcT0zp/6myb koPsrgtUG35i34E52Wdji/mdCMMSIdWXsEIRUrHPSu7fber+6Axu6frFLvoFrQ== Received: from [IPV6:2601:648:8683:a9e0:20bb:5514:8449:a0ef] (unknown [IPv6:2601:648:8683:a9e0:20bb:5514:8449:a0ef]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rgw5S2gC5zs8C; Wed, 6 Sep 2023 21:10:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> Date: Wed, 6 Sep 2023 14:10:51 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.15.0 Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. Content-Language: en-US To: "Bjoern A. Zeeb" Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202309052116.385LGoau059784@gitrepo.freebsd.org> <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> From: John Baldwin In-Reply-To: <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote: > On Wed, 6 Sep 2023, John Baldwin wrote: > >> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: >>> The branch main has been updated by bz: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=cf94672363d6638b7268c05b4628b62bbfc8dbe5 >>> >>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 >>> Author: Bjoern A. Zeeb >>> AuthorDate: 2023-06-08 21:35:09 +0000 >>> Commit: Bjoern A. Zeeb >>> CommitDate: 2023-09-05 21:13:18 +0000 >>> >>> rtw88/rtw89: remove local firmware. >>> Remove firmware from src/ in favor of the ports/packages and >>> fwget(8). >>> This will allow us to shrink the size of src (and installed modules). >>> Update the rtw88 man page to reflect the change. >> >> How does this interfact with doing an install to a machine over one of these >> interfaces? > > That's nothing we support. At least we do not support netboot over wifi > currently, so you'll always need another install media. > > How's the "bootstrapping" going to work if wireless is the only network > option? To be clear, I was discussing the case you use a USB memstick, but fetch the base system and packages over the network. Or at least you need to install pkg over the network, but you need pkg to install the firmware so you can bring up the network which you did address, though it seems something we plan to fix in the future so won't be in 14.0? -- John Baldwin From nobody Wed Sep 6 21:39:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgwl61Sw4z4s7Xb for ; Wed, 6 Sep 2023 21:40:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgwl56whdz3VVR for ; Wed, 6 Sep 2023 21:40:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31dcf18f9e2so342111f8f.0 for ; Wed, 06 Sep 2023 14:40:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1694036399; x=1694641199; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=0TFWOwrIASJoIVHr8vWNiZHK+zHEQwKNB957XJeeDlA=; b=C7rrL3iGGXFiFDbpWxBVkC4ct9MKA/Pkam/Yne6Ke694w1+ERK96CNn1DMT/zppXx/ QaFJtVF7c1mCRImxEbIELSc9C7FwfSy9Ept4K418Zw7r7i21a97WCc19p/ea9K/hks1k CNyUVgG8hO1GbBJg/xpc00ihKX1Dzz3y5+AF6YCC3GRvt4YX+pToFPtph4bEzUPUxb/9 3hJMBiCOKabW/h3oOMs1mYva7C+o42TJLQOHU7BRehKW0Zm7Bhwr6tOzxcw0DfDDpNy2 LvE92GmiuP8FWBjaU1aA84wxHTM2SdVNvqaSxuuuWy/Onk0lg8Y1DP+NQNvXeNrk2n7i L1bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694036399; x=1694641199; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0TFWOwrIASJoIVHr8vWNiZHK+zHEQwKNB957XJeeDlA=; b=HI1mAZo+sfYiL3Qex7Kya34Ar3drIa76awF/ONBoHg5cnhLtvF/bsuVuUL4HjG2dtS vx3UkpVfXvWPVT5HW8rjUuL6zrdvMoaNvdURS/hwEX5MMrx9z3EvTsYuKkNS3k2xljtZ 5I7l5873oZ9nWImaBdOq4qOisf+X4yZgUZEpSVnkonlznkPp1Hj86Am9Ld7Pb4l6Vbwa LGwlBUQRe4TXNOobszbbTf6+ID8tM2pG0uMcjYXfsSXms+0XzhzFHe4bUy1FbMKGhcZB +s7rwE4LP7SiH82hHJmQPTcNa5TI2gd2KNZmQZTrslCGb9MTGqHXTIi/LjWKU2BtyuD+ I8aw== X-Gm-Message-State: AOJu0YwFXEu9a6UgxOzPLDMv78/XaMs803qMEZnAw2CW5QZuSFmCQcuy Wjo+6EjnzT/FnQFpc8++mGfSyNKCXC73RWZy8x/28A== X-Google-Smtp-Source: AGHT+IGu0gfF1KCbARMU9f4MnzB+wPvFreI2qN6cg6cN+H0CCa4uW/mVW+yJmbVxpkDwSgHHb4+hkxs94saIqStqgGk= X-Received: by 2002:a5d:5183:0:b0:319:8161:ecc6 with SMTP id k3-20020a5d5183000000b003198161ecc6mr3288505wrv.63.1694036398720; Wed, 06 Sep 2023 14:39:58 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202309052116.385LGoau059784@gitrepo.freebsd.org> <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> In-Reply-To: <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> From: Warner Losh Date: Wed, 6 Sep 2023 15:39:47 -0600 Message-ID: Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. To: John Baldwin Cc: "Bjoern A. Zeeb" , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c862410604b795b4" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Rgwl56whdz3VVR --000000000000c862410604b795b4 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Sep 6, 2023 at 3:10=E2=80=AFPM John Baldwin wrote= : > On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote: > > On Wed, 6 Sep 2023, John Baldwin wrote: > > > >> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: > >>> The branch main has been updated by bz: > >>> > >>> URL: > >>> > https://cgit.FreeBSD.org/src/commit/?id=3Dcf94672363d6638b7268c05b4628b62= bbfc8dbe5 > >>> > >>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 > >>> Author: Bjoern A. Zeeb > >>> AuthorDate: 2023-06-08 21:35:09 +0000 > >>> Commit: Bjoern A. Zeeb > >>> CommitDate: 2023-09-05 21:13:18 +0000 > >>> > >>> rtw88/rtw89: remove local firmware. > >>> Remove firmware from src/ in favor of the ports/packages a= nd > >>> fwget(8). > >>> This will allow us to shrink the size of src (and installed > modules). > >>> Update the rtw88 man page to reflect the change. > >> > >> How does this interfact with doing an install to a machine over one of > these > >> interfaces? > > > > That's nothing we support. At least we do not support netboot over wif= i > > currently, so you'll always need another install media. > > > > How's the "bootstrapping" going to work if wireless is the only network > > option? > > To be clear, I was discussing the case you use a USB memstick, but fetch > the base system and packages over the network. Or at least you need to > install pkg over the network, but you need pkg to install the firmware > so you can bring up the network which you did address, though it seems > something we plan to fix in the future so won't be in 14.0? > Yea, I don't see how this can possibly work on a memstick or any other install media, unless we ship the firmware on the media. Otherwise you don't have the network you need to install the firmware you need for the network... Warner --000000000000c862410604b795b4 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Sep 6, 2023 at 3:10=E2=80=AFP= M John Baldwin <jhb@freebsd.org&g= t; wrote:
On 9/6= /23 12:06 PM, Bjoern A. Zeeb wrote:
> On Wed, 6 Sep 2023, John Baldwin wrote:
>
>> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote:
>>> The branch main has been updated by bz:
>>>
>>> URL:
>>> https= ://cgit.FreeBSD.org/src/commit/?id=3Dcf94672363d6638b7268c05b4628b62bbfc8db= e5
>>>
>>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5
>>> Author:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org&g= t;
>>> AuthorDate: 2023-06-08 21:35:09 +0000
>>> Commit:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.org&g= t;
>>> CommitDate: 2023-09-05 21:13:18 +0000
>>>
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0rtw88/rtw89: remove local firmware.<= br> >>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Remove firmware from = src/ in favor of the ports/packages and
>>> fwget(8).
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0This will allow us to shrink the siz= e of src (and installed modules).
>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Update the rtw88 man page to reflect= the change.
>>
>> How does this interfact with doing an install to a machine over on= e of these
>> interfaces?
>
> That's nothing we support.=C2=A0 At least we do not support netboo= t over wifi
> currently, so you'll always need another install media.
>
> How's the "bootstrapping" going to work if wireless is t= he only network
> option?

To be clear, I was discussing the case you use a USB memstick, but fetch the base system and packages over the network.=C2=A0 Or at least you need t= o
install pkg over the network, but you need pkg to install the firmware
so you can bring up the network which you did address, though it seems
something we plan to fix in the future so won't be in 14.0?

Yea, I don't see how this can possibly work on= a memstick or any other install
media, unless we ship the firmwa= re on the media. Otherwise you don't have
the network you nee= d to install the firmware you need for the network...

<= div>Warner=C2=A0
--000000000000c862410604b795b4-- From nobody Wed Sep 6 21:49:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgwxr6Rxxz4sDrD; Wed, 6 Sep 2023 21:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgwxr5xHlz3Xhl; Wed, 6 Sep 2023 21:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694036960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=daHs/kaQDayRC6/HahZxdD33BTh765vo44L5XoEad0w=; b=nQLbPHwKhF5s0zjCFrDZ3vHKvgI5ZevwP24YD2SsqSsGk+dadcUFQYnGZ5wy5QSLppQgR8 0WK6H7D04muDsrB5ctXqeHypQA0aC+xigz7ZL2ouI0x5TrAPPDOqG4NcyB+5aQJk6nE8ov X0MZujq6ohZXMPVo4OFAWDI7Kz1Mf/e8uig635BkifVV79H25Je1ECUC0V9o1Lm9L9wgQc ud1OhSZIm5HkVkH+mZEkbGjxBHGIplrhEPJoW4KLbXIxvYsibNJoFfHbXuYPdokXotOo9+ 7WXT7bKsnfM5HTqYtnrzi6GwrN/Yg+CsYqCh3UFgdvQU+CX5ZI/oxZJQcwDDIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694036960; a=rsa-sha256; cv=none; b=JyG/NHCFxAY2D2fN8hJXSrdLxy4OB5sRpWhmuLQ4kfHpPr6nIA2BPZ1zrOA91I2m6WWRbU uYuP4MnnJ+Dj1md0K1gDImZD1xT5JChTKVxRthnbIiwGJnPv7pJXDnlX95ZwaguHyO3A9l A3ntYLkXbt/mAPPDeBde7Rk3PeajABDQu8UpC4nvhYdMRchrgE/Q9w3XO0yN2D+k6XTfcL qeMj0qXzlQxwed1rlWXjklRK6IjxUP73/PBRBpN+unQVCUxlW+Fo2oMT14nF9MVd209AkF gnmJvI608KL0UXCwReNTPfm08f8dyjVLjQGs4+gQERwZCazWeXTHW6BdPOFaKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694036960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=daHs/kaQDayRC6/HahZxdD33BTh765vo44L5XoEad0w=; b=GfbiFzSUMLrt4zAfKgcSFVaWjlQpq6/+rP5IqX2+QbTU5DhnCuUjIxDPo1SXDKU4/zw/2t F7MQdiOarn9v/VXtFVg5fYJ1qgBk6VqABhNj+t+koq6GY5EVeHGAUhkNlGx+Fb7qmWFRp0 yg6mU/+BMvydIfK+LOyI15LKBd70oG/fgauK2wgby6yHq0O0h9yCcii92I857uIANewThe A3dQEmlDMlF7BNOXVgKWoz/IWM8nkrtE04ooqbvFz0voeBH1KE27YSn8Blnfr1MhqbOfQV 4uZp7qW98hk4xRTf4agUBcl72XvTQFSSEyCnxrWpBwL4StpdM2Psx0A8lgN0Eg== 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 4Rgwxr50VqzYld; Wed, 6 Sep 2023 21:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LnKIC005647; Wed, 6 Sep 2023 21:49:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LnK8l005644; Wed, 6 Sep 2023 21:49:20 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:49:20 GMT Message-Id: <202309062149.386LnK8l005644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: b969a40cdf17 - stable/13 - zfsd: listen for sysevent.fs.zfs instead of misc.fs.zfs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b969a40cdf17c0242740748ec66433b7bd84f503 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=b969a40cdf17c0242740748ec66433b7bd84f503 commit b969a40cdf17c0242740748ec66433b7bd84f503 Author: Alan Somers AuthorDate: 2023-04-03 21:45:55 +0000 Commit: Alan Somers CommitDate: 2023-09-06 21:48:55 +0000 zfsd: listen for sysevent.fs.zfs instead of misc.fs.zfs At some point the names of these devd events changed. Probably it happened when importing OpenZFS. Before that, FreeBSD's sysevent_alloc method didn't create a "class" nvpair in the event, which led to log_sysevent using the event's ev_subclass field as its type. Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D39437 (cherry picked from commit 92642bba4db4bf1719758ac7233468bc09a0bd59) Fix zfsd unittests after 92642bba4db At the time we ensured that the more important functional tests were working, but neglected to update the unit tests. Sponsored by: Axcient (cherry picked from commit 2a0c0aea42092f89c2a5345991e6e3ce4cbef99a) --- cddl/usr.sbin/zfsd/case_file.cc | 6 +++--- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 6 +++--- cddl/usr.sbin/zfsd/zfsd.cc | 2 +- cddl/usr.sbin/zfsd/zfsd_event.cc | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc index e04dc4e6928d..ad3bb0ffc538 100644 --- a/cddl/usr.sbin/zfsd/case_file.cc +++ b/cddl/usr.sbin/zfsd/case_file.cc @@ -357,7 +357,7 @@ CaseFile::ReEvaluate(const ZfsEvent &event) { bool consumed(false); - if (event.Value("type") == "misc.fs.zfs.vdev_remove") { + if (event.Value("type") == "sysevent.fs.zfs.vdev_remove") { /* * The Vdev we represent has been removed from the * configuration. This case is no longer of value. @@ -365,12 +365,12 @@ CaseFile::ReEvaluate(const ZfsEvent &event) Close(); return (/*consumed*/true); - } else if (event.Value("type") == "misc.fs.zfs.pool_destroy") { + } else if (event.Value("type") == "sysevent.fs.zfs.pool_destroy") { /* This Pool has been destroyed. Discard the case */ Close(); return (/*consumed*/true); - } else if (event.Value("type") == "misc.fs.zfs.config_sync") { + } else if (event.Value("type") == "sysevent.fs.zfs.config_sync") { RefreshVdevState(); if (VdevState() < VDEV_STATE_HEALTHY) consumed = ActivateSpare(); diff --git a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc index 496be07aece9..f3fea2ca83f4 100644 --- a/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc +++ b/cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc @@ -397,7 +397,7 @@ TEST_F(ZfsEventTest, ProcessPoolEventGetsCalled) { string evString("!system=ZFS " "subsystem=ZFS " - "type=misc.fs.zfs.vdev_remove " + "type=sysevent.fs.zfs.vdev_remove " "pool_name=foo " "pool_guid=9756779504028057996 " "vdev_guid=1631193447431603339 " @@ -512,7 +512,7 @@ TEST_F(CaseFileTest, PoolDestroy) "pool_guid=456 " "subsystem=ZFS " "timestamp=1348867914 " - "type=misc.fs.zfs.pool_destroy "); + "type=sysevent.fs.zfs.pool_destroy "); m_event = Event::CreateEvent(*m_eventFactory, evString); ZfsEvent *zfs_event = static_cast(m_event); EXPECT_CALL(*m_caseFile, Close()); @@ -682,7 +682,7 @@ string ReEvaluateByGuidTest::s_evString( "pool_name=foo " "subsystem=ZFS " "timestamp=1360620391 " - "type=misc.fs.zfs.config_sync"); + "type=sysevent.fs.zfs.config_sync"); /* diff --git a/cddl/usr.sbin/zfsd/zfsd.cc b/cddl/usr.sbin/zfsd/zfsd.cc index 4d9e82008148..210cc4b85a44 100644 --- a/cddl/usr.sbin/zfsd/zfsd.cc +++ b/cddl/usr.sbin/zfsd/zfsd.cc @@ -245,7 +245,7 @@ ZfsDaemon::BuildCaseFiles() snprintf(evString, 160, "!system=ZFS subsystem=ZFS " - "type=misc.fs.zfs.config_sync sub_type=synthesized " + "type=sysevent.fs.zfs.config_sync sub_type=synthesized " "pool_name=%s pool_guid=%" PRIu64 "\n", poolname, poolGUID); event = Event::CreateEvent(GetFactory(), string(evString)); if (event != NULL) { diff --git a/cddl/usr.sbin/zfsd/zfsd_event.cc b/cddl/usr.sbin/zfsd/zfsd_event.cc index c333f57f9a18..5cb17192d8e5 100644 --- a/cddl/usr.sbin/zfsd/zfsd_event.cc +++ b/cddl/usr.sbin/zfsd/zfsd_event.cc @@ -279,7 +279,7 @@ ZfsEvent::Process() const } /* On config syncs, replay any queued events first. */ - if (Value("type").find("misc.fs.zfs.config_sync") == 0) { + if (Value("type").find("sysevent.fs.zfs.config_sync") == 0) { /* * Even if saved events are unconsumed the second time * around, drop them. Any events that still can't be @@ -290,7 +290,7 @@ ZfsEvent::Process() const CaseFile::ReEvaluateByGuid(PoolGUID(), *this); } - if (Value("type").find("misc.fs.zfs.") == 0) { + if (Value("type").find("sysevent.fs.zfs.") == 0) { /* Configuration changes, resilver events, etc. */ ProcessPoolEvent(); return (false); @@ -403,7 +403,7 @@ ZfsEvent::ProcessPoolEvent() const bool degradedDevice(false); /* The pool is destroyed. Discard any open cases */ - if (Value("type") == "misc.fs.zfs.pool_destroy") { + if (Value("type") == "sysevent.fs.zfs.pool_destroy") { Log(LOG_INFO); CaseFile::ReEvaluateByGuid(PoolGUID(), *this); return; @@ -418,7 +418,7 @@ ZfsEvent::ProcessPoolEvent() const Log(LOG_INFO); caseFile->ReEvaluate(*this); } - else if (Value("type") == "misc.fs.zfs.resilver_finish") + else if (Value("type") == "sysevent.fs.zfs.resilver_finish") { /* * It's possible to get a resilver_finish event with no @@ -429,7 +429,7 @@ ZfsEvent::ProcessPoolEvent() const CleanupSpares(); } - if (Value("type") == "misc.fs.zfs.vdev_remove" + if (Value("type") == "sysevent.fs.zfs.vdev_remove" && degradedDevice == false) { /* See if any other cases can make use of this device. */ From nobody Wed Sep 6 21:49:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgwxt0JfGz4sDd2; Wed, 6 Sep 2023 21:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgwxs6dsLz3Xj7; Wed, 6 Sep 2023 21:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694036961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyUjFdIZE7sszEMqcOXBEKNwC9Mfzvti9t4ecnve4Vc=; b=XOa8kTLtc1mwdx03UBHwR+ADb0t7C+kXJuO9Qa1N1DS43Vx9HA+7w0aROQ0DzXQ1sgDs3f yG3JN5DjURmkBZsDm0AbSBrs1MX6DwVSAUzb6BzM/7r1SPHGkMhBmfEkuu21dglYMYW4DW Y661xrmxj1ic1XPVvLlIZdbYxHMhDBzwexY67jje+ADnB93S47VZCzCJaDpoaFBeFIBMXO Xf6NfXGtATkJEaaOOIJnvLaEzcDijnH9KcpwDdx/WCVn18TrDlJUYiz3tyQhm8JcmFxzaL KW1SASQCvrVbWzWvYJlGfYUAg7dipWBwIPrK4PZMNgQ1UrPdKN3x3fqUAnOQJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694036961; a=rsa-sha256; cv=none; b=blCfkO2Oz/7KFY9eFxFbxG7dwdHJMZGMAIGkvypI+FbHMGIadliYj5mjds0w0SHSBLBiZP z2enjnelF5oE2lmXCCD5ULjLdMyeSnm43pcwbn0F5/v2EV/a0xM385YEf7FwRZyDxK9xYL bAhk+ZjJdUgeDDZ0ADqq5ZJmJ54Hv55L3Fn/QqTBMOuIq1ys/rdYOLseiSTcBOYW9cttSz xTKWGcX29f+nW8rU1TBFHOtshAU5XPCObm7PVZFPclNyiAauLubn/L2imEwiC8BXVw+LXQ T2RRivymb0wLIoBnjcPuw07OAhoAid4bkSZLQhBhfjncdXwGJ0xsxiTK+QNxQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694036961; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyUjFdIZE7sszEMqcOXBEKNwC9Mfzvti9t4ecnve4Vc=; b=xV70xRPe64yjC9KR83UIaQbCajGT6jclUJI7mNEb7hq58nTaNLhCZNjRNy1ttQifmcPMQQ pDfQvV9Sk4MqzATBTBSo3l74aoDmz9kqopPWK1lAVz85bZBW7wl3zGyakYY2KftbY09SXL /tjboWjxTk8GdCsb9M7eQm12EVFLRkTszxY5/iA9kSpBHvDWrTeZRKmWS5kIY6nhWsUtTZ 2Era72cXem8XMkgw8EhxD018B/Fa5CQJ1qCBvkkDVjXxbfbbDTvvnO0U8OyJCLPVsgU8Rf DTxSqalC0oIa3cZ3v5DxaYFuTA4VhoFufZWE7loifPXtHtbSWIxDpxcsOR45Mw== 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 4Rgwxs5kk2zXxj; Wed, 6 Sep 2023 21:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LnLgs005696; Wed, 6 Sep 2023 21:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LnLXD005693; Wed, 6 Sep 2023 21:49:21 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:49:21 GMT Message-Id: <202309062149.386LnLXD005693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: f85da5f88efc - stable/13 - Multiple fixes to the zfsd test suite List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f85da5f88efce6177d0e5be2b74c48599e5c471a Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=f85da5f88efce6177d0e5be2b74c48599e5c471a commit f85da5f88efce6177d0e5be2b74c48599e5c471a Author: Alan Somers AuthorDate: 2023-04-03 21:43:17 +0000 Commit: Alan Somers CommitDate: 2023-09-06 21:49:06 +0000 Multiple fixes to the zfsd test suite * Wait for gnop devices to disappear after "gnop destroy". Apparently that process is asynchronous now, or maybe it's just slower than it used to be. Also, after removing a gnop wait for its pool to be degraded. That isn't instant. * The zfsd tests no longer require camcontrol. This was a harmless oversight from 11ed0a95bfa76791dc6428eb2d47a986c0c6f8a3 * Fix the zfsd_degrade_001_pos test for recent zfs versions. ZFS now rate limits checksum errors to about 20 per second. But zfsd's threshold for degrading a disk is 50 per minute. So we must alternately corrupt and scrub the pool to ensure that checksum errors are generated in multiple 1-second windows, so that zfsd will see enough of them. * Fix the zfsd_fault_001_pos test in VMs And, for that matter, when using NVME or SATA disks. As originally written, the test used the da driver to inject errors. Rewrite it to use gnop vdevs. gnop can also inject errors. It works on top of any disk device, and it's also faster than using da. Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D39437 (cherry picked from commit dba2e89ea7a13469ee2e47a2a1d627ca28bb94c2) --- tests/sys/cddl/zfs/include/libgnop.kshlib | 6 ++ tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib | 29 ++++++--- .../zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh | 1 + .../zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh | 1 + .../sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh | 69 ++++------------------ .../cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh | 1 + tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh | 18 +++--- 7 files changed, 53 insertions(+), 72 deletions(-) diff --git a/tests/sys/cddl/zfs/include/libgnop.kshlib b/tests/sys/cddl/zfs/include/libgnop.kshlib index 44809385c075..f4f742fe6929 100644 --- a/tests/sys/cddl/zfs/include/libgnop.kshlib +++ b/tests/sys/cddl/zfs/include/libgnop.kshlib @@ -84,6 +84,12 @@ function destroy_gnop # Use "-f" so we can destroy a gnop with a consumer (like ZFS) gnop destroy -f ${disk}.nop + + # Wait for it to disappear + for i in `seq 5`; do + gnop status ${disk}.nop >/dev/null 2>/dev/null || break + sleep $i + done } # Destroy multiple gnop devices. Attempt to destroy them all, ignoring errors diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib b/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib index e9ea036fbbab..8456c5450d2b 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib @@ -65,19 +65,32 @@ function corrupt_pool_vdev typeset pool=$1 typeset vdev=$2 typeset file=$3 + typeset -li start=0 + typeset -li now=0 + typeset -li timeout=60 # do some IO on the pool log_must $DD if=/dev/zero of=$file bs=1024k count=64 $FSYNC $file - # scribble on the underlying file to corrupt the vdev - log_must $DD if=/dev/urandom of=$vdev bs=1024k count=64 conv=notrunc + # ZFS rate limits checksum errors to about 20 per second. So in order + # to ensure that we reach zfsd's threshold, we must alternately + # scribble and scrub. + while (( "$now" - "$start" < "$timeout" )); do + # scribble on the underlying file to corrupt the vdev + log_must $DD if=/dev/urandom of=$vdev bs=1024k count=64 conv=notrunc - # Scrub the pool to detect the corruption - log_must $ZPOOL scrub $pool - wait_until_scrubbed $pool + # Scrub the pool to detect and repair the corruption + log_must $ZPOOL scrub $pool + wait_until_scrubbed $pool + now=`date +%s` + if [ "$start" -eq 0 ]; then + start=`date +%s` + fi + check_state "$pool" "$vdev" DEGRADED && return + $SLEEP 1 + done - # ZFSD can take up to 60 seconds to degrade an array in response to - # errors (though it's usually faster). - wait_for_pool_dev_state_change 60 $vdev DEGRADED + log_must $ZPOOL status "$pool" + log_fail "ERROR: Disk $vdev not marked as DEGRADED in $pool" } diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh index 2d50c73844a5..6d009a9a8b56 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_002_pos.ksh @@ -81,6 +81,7 @@ for keyword in "${MY_KEYWORDS[@]}" ; do log_must $ZPOOL set autoreplace=on $TESTPOOL log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 log_must create_gnop $NEW_DISK $PHYSPATH verify_assertion destroy_pool "$TESTPOOL" diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh index e2af801558e0..4eb04d60809e 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_autoreplace_003_pos.ksh @@ -91,6 +91,7 @@ for keyword in "${MY_KEYWORDS[@]}" ; do log_must $ZPOOL set autoreplace=on $TESTPOOL log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 log_must create_gnop $NEW_DISK $PHYSPATH verify_assertion destroy_pool "$TESTPOOL" diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh index 3e1340b22e56..3456a328e7f9 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_fault_001_pos.ksh @@ -26,6 +26,7 @@ # . $STF_SUITE/include/libtest.kshlib +. $STF_SUITE/include/libgnop.kshlib ################################################################################ # @@ -38,8 +39,7 @@ # # # STRATEGY: -# 1. Create a storage pool. Only use the da driver (FreeBSD's SCSI disk -# driver) because it has a special interface for simulating IO errors. +# 1. Create a storage pool. Use gnop vdevs so we can inject I/O errors. # 2. Inject IO errors while doing IO to the pool. # 3. Verify that the vdev becomes FAULTED. # 4. ONLINE it and verify that it resilvers and joins the pool. @@ -56,65 +56,28 @@ verify_runnable "global" -function cleanup -{ - # Disable error injection, if still active - sysctl kern.cam.da.$TMPDISKNUM.error_inject=0 > /dev/null - - if poolexists $TESTPOOL; then - # We should not get here if the test passed. Print the output - # of zpool status to assist in debugging. - $ZPOOL status - # Clear out artificially generated errors and destroy the pool - $ZPOOL clear $TESTPOOL - destroy_pool $TESTPOOL - fi -} - log_assert "ZFS will fault a vdev that produces IO errors" -log_onexit cleanup ensure_zfsd_running -# Make sure that at least one of the disks is using the da driver, and use -# that disk for inject errors -typeset TMPDISK="" -for d in $DISKS -do - b=`basename $d` - if test ${b%%[0-9]*} == da - then - TMPDISK=$b - TMPDISKNUM=${b##da} - break - fi -done -if test -z $TMPDISK -then - log_unsupported "This test requires at least one disk to use the da driver" -fi +DISK0_NOP=${DISK0}.nop +DISK1_NOP=${DISK1}.nop +log_must create_gnops $DISK0 $DISK1 for type in "raidz" "mirror"; do log_note "Testing raid type $type" # Create a pool on the supplied disks - create_pool $TESTPOOL $type $DISKS + create_pool $TESTPOOL $type "$DISK0_NOP" "$DISK1_NOP" log_must $ZFS create $TESTPOOL/$TESTFS # Cause some IO errors writing to the pool while true; do - # Running zpool status after every dd operation is too slow. - # So we will run several dd's in a row before checking zpool - # status. sync between dd operations to ensure that the disk - # gets IO - for ((i=0; $i<64; i=$i+1)); do - sysctl kern.cam.da.$TMPDISKNUM.error_inject=1 > \ - /dev/null - $DD if=/dev/zero bs=128k count=1 >> \ - /$TESTPOOL/$TESTFS/$TESTFILE 2> /dev/null - $FSYNC /$TESTPOOL/$TESTFS/$TESTFILE - done + log_must gnop configure -e 5 -w 100 "$DISK1_NOP" + $DD if=/dev/zero bs=128k count=1 >> \ + /$TESTPOOL/$TESTFS/$TESTFILE 2> /dev/null + $FSYNC /$TESTPOOL/$TESTFS/$TESTFILE # Check to see if the pool is faulted yet $ZPOOL status $TESTPOOL | grep -q 'state: DEGRADED' if [ $? == 0 ] @@ -126,15 +89,9 @@ for type in "raidz" "mirror"; do log_must check_state $TESTPOOL $TMPDISK "FAULTED" - #find the failed disk guid - typeset FAILED_VDEV=`$ZPOOL status $TESTPOOL | - awk "/^[[:space:]]*$TMPDISK[[:space:]]*FAULTED/ {print \\$1}"` - - # Reattach the failed disk - $ZPOOL online $TESTPOOL $FAILED_VDEV > /dev/null - if [ $? != 0 ]; then - log_fail "Could not reattach $FAILED_VDEV" - fi + # Heal and reattach the failed disk + log_must gnop configure -w 0 "$DISK1_NOP" + log_must $ZPOOL online $TESTPOOL "$DISK1_NOP" # Verify that the pool resilvers and goes to the ONLINE state for (( retries=60; $retries>0; retries=$retries+1 )) diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh index dd39d90fd694..a94a3fb7ac42 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_replace_001_pos.ksh @@ -57,6 +57,7 @@ for type in "raidz" "mirror"; do # Disable the first disk. log_must destroy_gnop $REMOVAL_DISK + log_must wait_for_pool_removal 20 # Write out data to make sure we can do I/O after the disk failure log_must $DD if=/dev/zero of=$TESTDIR/$TESTFILE bs=1m count=1 diff --git a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh index 7f066a3cff21..b6dcfe97dd7b 100755 --- a/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh +++ b/tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh @@ -28,12 +28,14 @@ atf_test_case zfsd_fault_001_pos cleanup zfsd_fault_001_pos_head() { atf_set "descr" "ZFS will fault a vdev that produces IO errors" - atf_set "require.progs" "ksh93 zfs zpool zfsd" + atf_set "require.progs" "ksh93 gnop zfs zpool zfsd" atf_set "timeout" 300 } zfsd_fault_001_pos_body() { . $(atf_get_srcdir)/../../include/default.cfg + . $(atf_get_srcdir)/../hotspare/hotspare.kshlib + . $(atf_get_srcdir)/../hotspare/hotspare.cfg . $(atf_get_srcdir)/zfsd.cfg verify_disk_count "$DISKS" 2 @@ -210,7 +212,7 @@ atf_test_case zfsd_hotspare_004_pos cleanup zfsd_hotspare_004_pos_head() { atf_set "descr" "Removing a disk from a pool results in the spare activating" - atf_set "require.progs" "ksh93 gnop zpool camcontrol zfsd" + atf_set "require.progs" "ksh93 gnop zpool" atf_set "timeout" 3600 } zfsd_hotspare_004_pos_body() @@ -301,7 +303,7 @@ atf_test_case zfsd_hotspare_007_pos cleanup zfsd_hotspare_007_pos_head() { atf_set "descr" "zfsd will swap failed drives at startup" - atf_set "require.progs" "ksh93 gnop zpool camcontrol zfsd" + atf_set "require.progs" "ksh93 gnop zpool" atf_set "timeout" 3600 } zfsd_hotspare_007_pos_body() @@ -362,7 +364,7 @@ atf_test_case zfsd_autoreplace_001_neg cleanup zfsd_autoreplace_001_neg_head() { atf_set "descr" "A pool without autoreplace set will not replace by physical path" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd gnop" + atf_set "require.progs" "ksh93 zpool gnop" atf_set "timeout" 3600 } zfsd_autoreplace_001_neg_body() @@ -423,7 +425,7 @@ atf_test_case zfsd_autoreplace_003_pos cleanup zfsd_autoreplace_003_pos_head() { atf_set "descr" "A pool with autoreplace set will replace by physical path even if a spare is active" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd gnop" + atf_set "require.progs" "ksh93 zpool gnop" atf_set "timeout" 3600 } zfsd_autoreplace_003_pos_body() @@ -454,7 +456,7 @@ atf_test_case zfsd_replace_001_pos cleanup zfsd_replace_001_pos_head() { atf_set "descr" "ZFSD will automatically replace a SAS disk that disappears and reappears in the same location, with the same devname" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs gnop" + atf_set "require.progs" "ksh93 zpool zfs gnop" } zfsd_replace_001_pos_body() { @@ -483,7 +485,7 @@ atf_test_case zfsd_replace_002_pos cleanup zfsd_replace_002_pos_head() { atf_set "descr" "zfsd will reactivate a pool after all disks are failed and reappeared" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs" + atf_set "require.progs" "ksh93 zpool zfs" } zfsd_replace_002_pos_body() { @@ -512,7 +514,7 @@ atf_test_case zfsd_replace_003_pos cleanup zfsd_replace_003_pos_head() { atf_set "descr" "ZFSD will correctly replace disks that dissapear and reappear with different devnames" - atf_set "require.progs" "ksh93 zpool camcontrol zfsd zfs gnop" + atf_set "require.progs" "ksh93 zpool zfs gnop" } zfsd_replace_003_pos_body() { From nobody Wed Sep 6 21:56:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6767M3z4sJFr; Wed, 6 Sep 2023 21:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx675Zp5z3ZZn; Wed, 6 Sep 2023 21:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4CUMX35OgZQ93p62pdTf+7Uxxjh18FG0laaSUu1Jwc=; b=DifiebWLk5KWgIMSxMQKnwQiRk3T07DkE7Wn4eodGVm/sxZoRr8foBjqniYm5/blF34mmm aqnYN2cXLtmYtyJ7KzM4p8N3Hjmxth6/H4pjsRgd7sbSk2Ox+6ryhS4tYktJQ59OVeArpi d+fyDWrrjIOtH+zV9QpBSJAls1odj4ZT9zNOlHDZ2TpcZNKYZ4qNoI1J04OlBmN8lXxZVR HsGgVd5p8o1QUf63sZpojc1yRyXQwZl3r2NI+TQ6KgsYz5WucDVO4yiwCXXErkG3cernhu /DLgml6CaQiKYgpp0+VbEJdw5AMpD001n1lUtuF4wCNHQH2WVUQ7Db5PO8VKRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037391; a=rsa-sha256; cv=none; b=G+kgBW/7YpCNYYPJsliQTT12uhI680MxCqN7/iatODk2na9P/uxZBVzPuw3c1t6+X5FUkD BWU8GPXItP+B4xriot9YBDnya7WB/K2X7UscUyXer8ElE83c7hLVwPwQRqqyRRHSGJOG/p mxA/9o1hv3AN1w3etAZgQVw+J4g3+rYuSA53Cq3mRTUfb2lHZfxgigFAfWkLsQ8yuek1nJ FFZvAlQ342wRPXkSDhmZi2xzfrORL7TeD90Iv5aFHA4Tk68JxeZT/h2E86fi1pCRg31KUp TZIpLgnU0xGTfDQpNqbWTdx9dwvIbiu6vAR8ZoR2AKWqN0PIb86BRG9KYxwkzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C4CUMX35OgZQ93p62pdTf+7Uxxjh18FG0laaSUu1Jwc=; b=c4TwTq4tcm41fa+qDHDaxapeDAnv2LA0wBbVukr0ciTezPYaQvJI6w9YBP6HOB+yaf3mOD Gy4bfpLOS8bV2FLTZZ7o9xoQaNfQCfNqLJadbLiBkPZ3/2LQOGJXyphWzBwWD//ivaz574 PHJFNtxAwOgheNqTqYtBZWAlkZ59k/LIfQCuHghAo0o16QMOdqZ8/YUJcr+m6MFoWHwgEq GwOmQMee2d0igmopZ2yxrXc8u2C4bJY/DVT52c2dm7lt2cjuN9pA8Z7bi/FeoyrnmCDRN6 H3pGdFRIxljshI4neFP/eYvILVN24FGmqQRsBUBM1EU55E0+ga0iPM6M2yj6Sw== 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 4Rgx674d7CzYkB; Wed, 6 Sep 2023 21:56:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LuVPs022375; Wed, 6 Sep 2023 21:56:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LuVft022372; Wed, 6 Sep 2023 21:56:31 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:31 GMT Message-Id: <202309062156.386LuVft022372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 519395f62d29 - stable/13 - h_resolv: Fix a buffer overflow in load(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 519395f62d2966faf83990d4162cc5b39af06c75 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=519395f62d2966faf83990d4162cc5b39af06c75 commit 519395f62d2966faf83990d4162cc5b39af06c75 Author: John Baldwin AuthorDate: 2022-12-28 17:39:18 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 h_resolv: Fix a buffer overflow in load(). fgetln() returns a pointer to an array of characters that is 'len' characters long, not 'len + 1'. While here, overwriting the contents of the buffer returned by fgetln isn't really safe, so switch to using getline() instead. Note that these fixes are a subset of those applied to a near-identical copy of this function in libc's resolv_test.c in commit 2afeaad315ac19450389b8f2befdbe7c91c37818. Reviewed by: ngie Reported by: CHERI (buffer overflow) Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D37886 (cherry picked from commit d131218534977f1b2ed590380e70d59a3b20b333) --- contrib/netbsd-tests/lib/libpthread/h_resolv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/netbsd-tests/lib/libpthread/h_resolv.c b/contrib/netbsd-tests/lib/libpthread/h_resolv.c index 9c5fedcc2e7f..d8756de96d23 100644 --- a/contrib/netbsd-tests/lib/libpthread/h_resolv.c +++ b/contrib/netbsd-tests/lib/libpthread/h_resolv.c @@ -73,18 +73,18 @@ static void load(const char *fname) { FILE *fp; - size_t len; + size_t linecap; char *line; if ((fp = fopen(fname, "r")) == NULL) err(1, "Cannot open `%s'", fname); - while ((line = fgetln(fp, &len)) != NULL) { - char c = line[len]; + line = NULL; + linecap = 0; + while (getline(&line, &linecap, fp) >= 0) { char *ptr; - line[len] = '\0'; + for (ptr = strtok(line, WS); ptr; ptr = strtok(NULL, WS)) sl_add(hosts, strdup(ptr)); - line[len] = c; } (void)fclose(fp); From nobody Wed Sep 6 21:56:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6906tHz4sJJ9; Wed, 6 Sep 2023 21:56:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx686Zd2z3ZlC; Wed, 6 Sep 2023 21:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdWwSylJOobmF+gb8Sldm9c18ZcCa/r0N5Dk1mfVrfw=; b=R+dZgvnfWo1FtPQLyhNGjNr3XBTqCRzqvMXQBZTg+Qm+PnP/cik8IFBhvL+7i7koHPp7F3 8rNyMP3VYyuOlBxtWDsmr2/Ww7iGE+u0f7WKFZaQzhK123fvxj43OIePUSA4Pb9bXAJ43k VHiObYNpccAb3SkH4dbFGoorbJ7mXI9b0qXtmXu9aI929jiTlpUAlw9DPqGvvDcyhZmEsf f9hG+Kt8QQWisABuZ4cPqmwexAhff5r3ZVhhmv7VorYJJDGvcT4S9KILMBYyTb5Xs6FRW+ gM6ffwyK9s0jHoPpxfaYDztsEf4q5NXJVd+6RpiguRjQ3d77O2BFVUU7FGyLDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037392; a=rsa-sha256; cv=none; b=YNXL/pRmayveCkaC8uCsrVtC9oxL2EnnbrFJ6KaA6dvulbTLb8Meo+WuRy9CncpB8X3mAc fL2kZtIvEROCauUOgeYbvBI5SOetOJjiC0xmyOjhZ0zeIBaqYYk0vf37Fb3BRuEwQzyrwG zOikJLdLgc9GhXptQEMk4kDErKTboD5Zt4lL/m/oqO23lEBmELaGi1sfyqQ0I4hjblct0o mc3w0dnVR1xAsLcqFrskY9tnHG+8HG7YmI8kIM247Lqx9tbSZ3tvAwYy+B9HxVTX0BAfwW 3EYBWMgMqy6DUA1HYVccTH5FTwNz/mQsv+bMIXoIpnhtZ/ZAVaZ6wfAk6fFxVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YdWwSylJOobmF+gb8Sldm9c18ZcCa/r0N5Dk1mfVrfw=; b=LK0pg4LYgXWgy+QYEEfgORzxBQE9BQbM5tdCF7U+PGx05BftjTWogC5meWYNxLGT+hP9Dj HxAHGyAjoR+2FOWBNrBIr3KWkFsiSoY7DVqBjJ4L8hEzHH0FZ/bAWLSVeGQe+JabzEko++ aYxe9ZqU0hW65RNcQCw3qbwer+pdFWGXoD78ktUIphjqAZoRQt16x7RrpiXP1NBpPodA7E 54K+RqPdiGZYvALgQ6aYM/biSEVaBzQytAFQt2NlzKTcfABspcDhSS8D6aPOybeHTPjt2Z 2Oqa8/HhEQq0sG0Ch6g3APqnqmlUDpepJkf0h4UZiJyj/RF2UaGx6XhdHf+nmQ== 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 4Rgx685c6LzZ8q; Wed, 6 Sep 2023 21:56:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LuW2e022425; Wed, 6 Sep 2023 21:56:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LuW2i022422; Wed, 6 Sep 2023 21:56:32 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:32 GMT Message-Id: <202309062156.386LuW2i022422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 12e299e2ab7d - stable/13 - ccr: Retire ccr_softc member in struct adapter. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 12e299e2ab7ded962fbd4b083432f84efa3d3a60 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=12e299e2ab7ded962fbd4b083432f84efa3d3a60 commit 12e299e2ab7ded962fbd4b083432f84efa3d3a60 Author: John Baldwin AuthorDate: 2022-12-29 19:39:28 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 ccr: Retire ccr_softc member in struct adapter. Prior to Conrad's changes to replace session integer IDs with a pointer to the driver-specific state in commit 1b0909d51a8aa, the driver had to find the softc pointer from the adapter before it could locate the ccr_session structure for a completed request. Since Conrad's changes, the ccr_session pointer can now be obtained directly from the crp. Add a backpoint from ccr_session back to ccr_softc and use this in place of the ccr_softc member in cxgbe's struct adapter. Sponsored by: Chelsio Communications (cherry picked from commit 7063b9974f8a39d860b7abd03884324e71994f65) --- sys/dev/cxgbe/adapter.h | 1 - sys/dev/cxgbe/crypto/t4_crypto.c | 81 ++++++++++++++++++++-------------------- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h index ee6e23d1e43e..58ea1eb3f29a 100644 --- a/sys/dev/cxgbe/adapter.h +++ b/sys/dev/cxgbe/adapter.h @@ -942,7 +942,6 @@ struct adapter { void *iwarp_softc; /* (struct c4iw_dev *) */ struct iw_tunables iwt; void *iscsi_ulp_softc; /* (struct cxgbei_data *) */ - void *ccr_softc; /* (struct ccr_softc *) */ struct l2t_data *l2t; /* L2 table */ struct smt_data *smt; /* Source MAC Table */ struct tid_info tids; diff --git a/sys/dev/cxgbe/crypto/t4_crypto.c b/sys/dev/cxgbe/crypto/t4_crypto.c index 98930da6c1f4..7301174614d2 100644 --- a/sys/dev/cxgbe/crypto/t4_crypto.c +++ b/sys/dev/cxgbe/crypto/t4_crypto.c @@ -175,43 +175,6 @@ struct ccr_port { counter_u64_t stats_completed; }; -struct ccr_session { -#ifdef INVARIANTS - int pending; -#endif - enum { HASH, HMAC, CIPHER, ETA, GCM, CCM } mode; - struct ccr_port *port; - union { - struct ccr_session_hmac hmac; - struct ccr_session_gmac gmac; - struct ccr_session_ccm_mac ccm_mac; - }; - struct ccr_session_cipher cipher; - struct mtx lock; - - /* - * A fallback software session is used for certain GCM/CCM - * requests that the hardware can't handle such as requests - * with only AAD and no payload. - */ - crypto_session_t sw_session; - - /* - * Pre-allocate S/G lists used when preparing a work request. - * 'sg_input' contains an sglist describing the entire input - * buffer for a 'struct cryptop'. 'sg_output' contains an - * sglist describing the entire output buffer. 'sg_ulptx' is - * used to describe the data the engine should DMA as input - * via ULPTX_SGL. 'sg_dsgl' is used to describe the - * destination that cipher text and a tag should be written - * to. - */ - struct sglist *sg_input; - struct sglist *sg_output; - struct sglist *sg_ulptx; - struct sglist *sg_dsgl; -}; - struct ccr_softc { struct adapter *adapter; device_t dev; @@ -251,6 +214,44 @@ struct ccr_softc { struct sysctl_ctx_list ctx; }; +struct ccr_session { +#ifdef INVARIANTS + int pending; +#endif + enum { HASH, HMAC, CIPHER, ETA, GCM, CCM } mode; + struct ccr_softc *sc; + struct ccr_port *port; + union { + struct ccr_session_hmac hmac; + struct ccr_session_gmac gmac; + struct ccr_session_ccm_mac ccm_mac; + }; + struct ccr_session_cipher cipher; + struct mtx lock; + + /* + * A fallback software session is used for certain GCM/CCM + * requests that the hardware can't handle such as requests + * with only AAD and no payload. + */ + crypto_session_t sw_session; + + /* + * Pre-allocate S/G lists used when preparing a work request. + * 'sg_input' contains an sglist describing the entire input + * buffer for a 'struct cryptop'. 'sg_output' contains an + * sglist describing the entire output buffer. 'sg_ulptx' is + * used to describe the data the engine should DMA as input + * via ULPTX_SGL. 'sg_dsgl' is used to describe the + * destination that cipher text and a tag should be written + * to. + */ + struct sglist *sg_input; + struct sglist *sg_output; + struct sglist *sg_ulptx; + struct sglist *sg_dsgl; +}; + /* * Crypto requests involve two kind of scatter/gather lists. * @@ -1956,7 +1957,6 @@ ccr_attach(device_t dev) return (ENXIO); } sc->cid = cid; - sc->adapter->ccr_softc = sc; /* * The FID must be the first RXQ for port 0 regardless of @@ -2035,7 +2035,6 @@ ccr_detach(device_t dev) } sglist_free(sc->sg_iv_aad); free(sc->iv_aad_buf, M_CCR); - sc->adapter->ccr_softc = NULL; return (0); } @@ -2417,6 +2416,7 @@ ccr_newsession(device_t dev, crypto_session_t cses, } sc = device_get_softc(dev); + s->sc = sc; mtx_lock(&sc->lock); if (sc->detaching) { @@ -2644,7 +2644,7 @@ static int do_cpl6_fw_pld(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) { - struct ccr_softc *sc = iq->adapter->ccr_softc; + struct ccr_softc *sc; struct ccr_session *s; const struct cpl_fw6_pld *cpl; struct cryptop *crp; @@ -2664,6 +2664,7 @@ do_cpl6_fw_pld(struct sge_iq *iq, const struct rss_header *rss, else error = 0; + sc = s->sc; #ifdef INVARIANTS mtx_lock(&s->lock); s->pending--; From nobody Wed Sep 6 21:56:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6B3Pf2z4sJ4b; Wed, 6 Sep 2023 21:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6B0SZFz3Zgd; Wed, 6 Sep 2023 21:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftVxuJ/isWHQhCwuc0Zm11akAjAvrpPNJUUZQQo4HFU=; b=MRtzGtWcEfzX6FlQ3gBY6djWGJPFD3slfcIsS4std8N876bwEQ5EjlvfnGy8/hccixbRMZ pZkj3Hg821wyZ80elHfJWYnmcC1qcTU1NvUyDUJtCbcldud2dIgeUnQgA9dhOPOkskcS8v HgesZoUco3zfnaz7P1CtkQen1Tu2vSDy3/llPUFxXjUYdYa6Ji28RXRPINFPJGnVuc98iI GP6Ue1ItpjBlPbG6mtOc4EoPunWGXcxg0dmz07+N7kTHgCNJIl25BOS6yWy2sIZMN7bG8f VUZjfKOo/hOW28mrzFV5WFodhU987MsZCXqpc8ziMgm53n8FcuDuIYlsJzwpRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037394; a=rsa-sha256; cv=none; b=mgYtTdvfaAEmPNcrapBvrqu+pGoKDzTl4ZY/9zl0LyxtC4J4PpVG3GywXk5XbDZKPxV5WH +jbHnA2mLl2hvhtmlGJYxvSwVGT94K0+901Kra3OE3c7uQQKJk5wZ4dkypmxbZpYl15N+H 99g1OQyCsBwZ4WP9x5qzFo3aZmoRuSFGijLN2aYoaZvowxMwJqEUym4WwRpLatPyzWTcQe ZMV0jyjVY/7uv1XcaSARkKm5QcvuACuatZtDzpSG/PCedCsSN7MbiP8W5xEXdKd6SnjcuM tAZJWpkqd9yGJkHmFyq2l+R8h1VLiF3VgpX+4KAZCGY2hi63MGYVYf27ZhYMHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037394; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftVxuJ/isWHQhCwuc0Zm11akAjAvrpPNJUUZQQo4HFU=; b=sgQNajVlHP75ZtQ7TXVBEfeAlrAEsSmnemmwPc1f82pd3hVW8r5NHLGzR8dsBuWJZuM/x7 lJnsiuGwkPc6jjyCEuwZucw2Ta9NIfHKK/m3NGYhXayEVGqRO5fV87tt6mw3UVq08EpwQm FoMqhyJ5oAKGyDBiW+TN2FW84kOvex8gLyhTdOqIrW+yFk1Jgi9JRoL+VQRjsReyx2oyGz JGbdp7k677T1fo49sHKhSWGj/X618rB2H49gsSsm/oDX3Fz2cB2pZ6jkm0ITceno6RovPc yYog4ZuSFNTXwyq0Q/Xs0JapowTgyRhKqYXesuonTpRHjBwwFQJ+LKmnEHuJrA== 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 4Rgx696c0lzYkC; Wed, 6 Sep 2023 21:56:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LuXpc022468; Wed, 6 Sep 2023 21:56:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LuXvk022466; Wed, 6 Sep 2023 21:56:33 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:33 GMT Message-Id: <202309062156.386LuXvk022466@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 05bfa3e05896 - stable/13 - lio_listio(2): Allow LIO_READV and LIO_WRITEV. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05bfa3e0589629bc88b8da31942252af8a559441 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=05bfa3e0589629bc88b8da31942252af8a559441 commit 05bfa3e0589629bc88b8da31942252af8a559441 Author: Thomas Munro AuthorDate: 2021-08-22 09:48:59 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 lio_listio(2): Allow LIO_READV and LIO_WRITEV. Allow multiple vector IOs to be started with one system call. aio_readv() and aio_writev() already used these opcodes under the covers. This commit makes them available to user space. Being non-standard extensions, they're only visible if __BSD_VISIBLE is defined, like the functions. Reviewed by: asomers, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D31627 (cherry picked from commit f30a1ae8d5290a52e898279bafc38556bf16bed8) --- lib/libc/sys/lio_listio.2 | 16 ++++++- sys/kern/vfs_aio.c | 4 ++ sys/sys/aio.h | 4 +- tests/sys/aio/lio_test.c | 109 ++++++++++++++++++++++++++++++++++++---------- usr.bin/truss/syscalls.c | 2 +- 5 files changed, 110 insertions(+), 25 deletions(-) diff --git a/lib/libc/sys/lio_listio.2 b/lib/libc/sys/lio_listio.2 index a477da7c6177..34d2490cca01 100644 --- a/lib/libc/sys/lio_listio.2 +++ b/lib/libc/sys/lio_listio.2 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 7, 2019 +.Dd August 22, 2021 .Dt LIO_LISTIO 2 .Os .Sh NAME @@ -64,11 +64,17 @@ The following operations are supported: .It Dv LIO_READ Read data as if by a call to .Xr aio_read 2 . +.It Dv LIO_READV +Read data as if by a call to +.Xr aio_readv 2 . .It Dv LIO_NOP No operation. .It Dv LIO_WRITE Write data as if by a call to .Xr aio_write 2 . +.It Dv LIO_WRITEV +Write data as if by a call to +.Xr aio_writev 2 . .El .Pp If the @@ -203,7 +209,9 @@ structure individually by calling .Sh SEE ALSO .Xr aio_error 2 , .Xr aio_read 2 , +.Xr aio_readv 2 , .Xr aio_write 2 , +.Xr aio_writev 2 , .Xr read 2 , .Xr write 2 , .Xr sigevent 3 , @@ -214,6 +222,12 @@ The .Fn lio_listio function is expected to conform to .St -p1003.1-2001 . +The +.Dv LIO_READV +and +.Dv LIO_WRITEV +operations are +.Fx extensions, and should not be used in portable code. .Sh HISTORY The .Fn lio_listio diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index bd739ebf7b54..02014ceefdf5 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -1419,6 +1419,8 @@ aiocb_copyin(struct aiocb *ujob, struct kaiocb *kjob, int type) error = copyin(ujob, kcb, sizeof(struct aiocb)); if (error) return (error); + if (type == LIO_NOP) + type = kcb->aio_lio_opcode; if (type & LIO_VECTORED) { /* malloc a uio and copy in the iovec */ error = copyinuio(__DEVOLATILE(struct iovec*, kcb->aio_iov), @@ -1557,8 +1559,10 @@ aio_aqueue(struct thread *td, struct aiocb *ujob, struct aioliojob *lj, if (type == LIO_NOP) { switch (job->uaiocb.aio_lio_opcode) { case LIO_WRITE: + case LIO_WRITEV: case LIO_NOP: case LIO_READ: + case LIO_READV: opcode = job->uaiocb.aio_lio_opcode; break; default: diff --git a/sys/sys/aio.h b/sys/sys/aio.h index d58ee5efd3d5..e9c5bdc63c87 100644 --- a/sys/sys/aio.h +++ b/sys/sys/aio.h @@ -41,10 +41,12 @@ #define LIO_NOP 0x0 #define LIO_WRITE 0x1 #define LIO_READ 0x2 -#if defined(_KERNEL) || defined(_WANT_ALL_LIO_OPCODES) +#if __BSD_VISIBLE #define LIO_VECTORED 0x4 #define LIO_WRITEV (LIO_WRITE | LIO_VECTORED) #define LIO_READV (LIO_READ | LIO_VECTORED) +#endif +#if defined(_KERNEL) || defined(_WANT_ALL_LIO_OPCODES) #define LIO_SYNC 0x8 #define LIO_DSYNC (0x10 | LIO_SYNC) #define LIO_MLOCK 0x20 diff --git a/tests/sys/aio/lio_test.c b/tests/sys/aio/lio_test.c index 94ce07086987..a04e54a39d9b 100644 --- a/tests/sys/aio/lio_test.c +++ b/tests/sys/aio/lio_test.c @@ -208,15 +208,96 @@ ATF_TC_BODY(lio_listio_empty_nowait_thread, tc) ATF_REQUIRE_EQ(0, sem_destroy(&completions)); } +/* + * A simple check that the allowed operations work. + */ +ATF_TC_WITHOUT_HEAD(lio_listio_opcodes); +ATF_TC_BODY(lio_listio_opcodes, tc) +{ + struct aiocb write_cb, read_cb, writev_cb, readv_cb; + struct aiocb *list[] = {&write_cb, &read_cb, &writev_cb, &readv_cb}; + struct iovec writev_iov[2]; + struct iovec readv_iov[2]; + char buffer[6]; + int fd; + + fd = open("testfile", O_CREAT | O_RDWR); + ATF_REQUIRE_MSG(fd >= 0, "open: %s", strerror(errno)); + + /* We start with numbers in a file and letters in memory... */ + ATF_CHECK_EQ(6, write(fd, "123456", 6)); + memcpy(buffer, "abcdef", 6); + + /* a -> 1 */ + bzero(&write_cb, sizeof(write_cb)); + write_cb.aio_sigevent.sigev_notify = SIGEV_NONE; + write_cb.aio_fildes = fd; + write_cb.aio_lio_opcode = LIO_WRITE; + write_cb.aio_buf = &buffer[0]; + write_cb.aio_nbytes = 1; + write_cb.aio_offset = 0; + + /* b <- 2 */ + bzero(&read_cb, sizeof(read_cb)); + read_cb.aio_sigevent.sigev_notify = SIGEV_NONE; + read_cb.aio_fildes = fd; + read_cb.aio_lio_opcode = LIO_READ; + read_cb.aio_buf = &buffer[1]; + read_cb.aio_nbytes = 1; + read_cb.aio_offset = 1; + + /* d -> 3, c -> 4 */ + writev_iov[0].iov_base = &buffer[3]; + writev_iov[0].iov_len = 1; + writev_iov[1].iov_base = &buffer[2]; + writev_iov[1].iov_len = 1; + bzero(&writev_cb, sizeof(writev_cb)); + writev_cb.aio_sigevent.sigev_notify = SIGEV_NONE; + writev_cb.aio_fildes = fd; + writev_cb.aio_lio_opcode = LIO_WRITEV; + writev_cb.aio_iov = &writev_iov; + writev_cb.aio_iovcnt = 2; + writev_cb.aio_offset = 2; + + /* f <- 5, e <- 6 */ + readv_iov[0].iov_base = &buffer[5]; + readv_iov[0].iov_len = 1; + readv_iov[1].iov_base = &buffer[4]; + readv_iov[1].iov_len = 1; + bzero(&readv_cb, sizeof(readv_cb)); + readv_cb.aio_sigevent.sigev_notify = SIGEV_NONE; + readv_cb.aio_fildes = fd; + readv_cb.aio_lio_opcode = LIO_READV; + readv_cb.aio_iov = &readv_iov; + readv_cb.aio_iovcnt = 2; + readv_cb.aio_offset = 4; + + ATF_CHECK_EQ(0, lio_listio(LIO_WAIT, list, nitems(list), NULL)); + ATF_CHECK_EQ(0, aio_error(&write_cb)); + ATF_CHECK_EQ(1, aio_return(&write_cb)); + ATF_CHECK_EQ(0, aio_error(&read_cb)); + ATF_CHECK_EQ(1, aio_return(&read_cb)); + ATF_CHECK_EQ(0, aio_error(&writev_cb)); + ATF_CHECK_EQ(2, aio_return(&writev_cb)); + ATF_CHECK_EQ(0, aio_error(&readv_cb)); + ATF_CHECK_EQ(2, aio_return(&readv_cb)); + + ATF_CHECK_EQ(0, memcmp(buffer, "a2cd65", 6)); + ATF_CHECK_EQ(6, pread(fd, buffer, 6, 0)); + ATF_CHECK_EQ(0, memcmp(buffer, "a2dc56", 6)); + + close(fd); +} + + /* * Only select opcodes are allowed with lio_listio */ ATF_TC_WITHOUT_HEAD(lio_listio_invalid_opcode); ATF_TC_BODY(lio_listio_invalid_opcode, tc) { - struct aiocb sync_cb, mlock_cb, writev_cb, readv_cb; - struct aiocb *list[] = {&sync_cb, &mlock_cb, &writev_cb, &readv_cb}; - struct iovec iov; + struct aiocb sync_cb, mlock_cb; + struct aiocb *list[] = {&sync_cb, &mlock_cb}; int fd; fd = open("testfile", O_CREAT | O_RDWR); @@ -229,30 +310,13 @@ ATF_TC_BODY(lio_listio_invalid_opcode, tc) bzero(&mlock_cb, sizeof(mlock_cb)); mlock_cb.aio_lio_opcode = LIO_MLOCK; - iov.iov_base = NULL; - iov.iov_len = 0; - - bzero(&readv_cb, sizeof(readv_cb)); - readv_cb.aio_fildes = fd; - readv_cb.aio_lio_opcode = LIO_READV; - readv_cb.aio_iov = &iov; - readv_cb.aio_iovcnt = 1; - - bzero(&writev_cb, sizeof(writev_cb)); - writev_cb.aio_fildes = fd; - writev_cb.aio_lio_opcode = LIO_WRITEV; - writev_cb.aio_iov = &iov; - writev_cb.aio_iovcnt = 1; - ATF_CHECK_ERRNO(EIO, lio_listio(LIO_WAIT, list, nitems(list), NULL)); ATF_CHECK_EQ(EINVAL, aio_error(&sync_cb)); ATF_CHECK_ERRNO(EINVAL, aio_return(&sync_cb) < 0); ATF_CHECK_EQ(EINVAL, aio_error(&mlock_cb)); ATF_CHECK_ERRNO(EINVAL, aio_return(&mlock_cb) < 0); - ATF_CHECK_EQ(EINVAL, aio_error(&readv_cb)); - ATF_CHECK_ERRNO(EINVAL, aio_return(&readv_cb) < 0); - ATF_CHECK_EQ(EINVAL, aio_error(&writev_cb)); - ATF_CHECK_ERRNO(EINVAL, aio_return(&writev_cb) < 0); + + close(fd); } @@ -265,6 +329,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, lio_listio_empty_nowait_signal); ATF_TP_ADD_TC(tp, lio_listio_empty_nowait_thread); ATF_TP_ADD_TC(tp, lio_listio_empty_wait); + ATF_TP_ADD_TC(tp, lio_listio_opcodes); ATF_TP_ADD_TC(tp, lio_listio_invalid_opcode); return (atf_no_error()); diff --git a/usr.bin/truss/syscalls.c b/usr.bin/truss/syscalls.c index fff62ce7911c..010308beae3e 100644 --- a/usr.bin/truss/syscalls.c +++ b/usr.bin/truss/syscalls.c @@ -763,7 +763,7 @@ static struct xlat lio_modes[] = { }; static struct xlat lio_opcodes[] = { - X(LIO_WRITE) X(LIO_READ) X(LIO_NOP) + X(LIO_WRITE) X(LIO_READ) X(LIO_READV) X(LIO_WRITEV) X(LIO_NOP) XEND }; From nobody Wed Sep 6 21:56:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6C2Y2Mz4sJG5; Wed, 6 Sep 2023 21:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6C1TTzz3b0m; Wed, 6 Sep 2023 21:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOQx2/KAxaT4k/byyWSd78dIZf0M3pmiLQ7vWl/LdbE=; b=eoL+F73lScC3XRfIroUfjD19JKJME1wbb8reRbLgxi/FpSyubqr2+/yEnj2zx+DautlZtQ YA0twGBkXuio0ANixc/0dYtnamNvCkeLMXLxfgkeACSw8dP7idxcx8B8s+Ou6XTwKAnGZ9 Wi2bH5trE6YGBqkqZKVFyeO0+YzA9mude+EjhQviFeDnXKQrRsFvi50f5mB7sI0nZlxBrt S77UX85bb4cfG+nRuWyn2lrr4M/LzbY2/byrngUg/5LJ20lf1q3G1cxu5xIqSOWg1v7hLY jNtBAAVh6G/rk+6D7cgGx435YyOeyVmGehQbJ+dtunEU7CkiUpwylC+qFUeWyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037395; a=rsa-sha256; cv=none; b=v+j79Ayp673IAkIuDALqhKtF9x/DcHxVTeJJbUN2+9KYkYkPwqVHuJggVy4OrWAksXp/EK iGt6gTZTdS76kqGg1sH5IOIR9zhQ4BMY2E3POV+jdFygXY2wDvLfz4qkfdKGC9jDfbn0Tv dUjzyVULhpNjsvCOERrv2lbgYG0pdff4w9tSkPj2RFMtSpMjUGahXpZW/dI3KF41Eu1c/N oljtGGFHy9v7LPYO3Vu74YVoRJXeJQI31+69szDbMoRds1t2qAD4YcYU3Q4pv8j0dtFkqa mo4Tl03sfr9cPfdvfdVhgncNuhE52rCxyJAPl8KzSJ73WUcD/T6bMaEoCcNkiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sOQx2/KAxaT4k/byyWSd78dIZf0M3pmiLQ7vWl/LdbE=; b=mpAl2W0aFLH+/w0nIxSar2uNnnA56ZUs9zG0eIFMMda0awVKlTYSlHEB14+ZuUxigi3VhT 9RGmxnzRNzGTbE/+NeNG1XrkPYpITb0NQYPYJWCNLUSUwLVHQ1Qkdv420iNrHvI2sFidpM Ui//jHob5U/DgK9i8fQ6ggXX4MqXK5FsWhM57+LSb7t3YbI4Lzi8KmYLwsrx7cktEw3c7E SJaYzK1hrUUPn8MWGFpm1OvxgdbG3sJFeXvMmdsQGT7HgP5WVgGmRGEYbd8O3a/SFxl0Ln GQNAgHGvtC3INxgnEMG9kn6EwoFxw1ddRtI0rWVCZIAcwA/4l1xmhzjDBVnJoQ== 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 4Rgx6C0PzSzYmR; Wed, 6 Sep 2023 21:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LuYCo022516; Wed, 6 Sep 2023 21:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LuYnG022513; Wed, 6 Sep 2023 21:56:34 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:34 GMT Message-Id: <202309062156.386LuYnG022513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c6c0b631fa26 - stable/13 - aio: Fix up the opcode in aiocb32_copyin() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c6c0b631fa26afc22c8476f577728d65a003e801 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c6c0b631fa26afc22c8476f577728d65a003e801 commit c6c0b631fa26afc22c8476f577728d65a003e801 Author: Mark Johnston AuthorDate: 2021-09-11 16:55:32 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 aio: Fix up the opcode in aiocb32_copyin() With lio_listio(2), the opcode is specified by userspace rather than being hard-coded by the system call (e.g., aio_readv() -> LIO_READV). kern_lio_listio() calls aio_aqueue() with an opcode of LIO_NOP, which gets fixed up when the aiocb is copied in. When copying in a job request for vectored I/O, we need to dynamically allocate a uio to wrap an iovec. So aiocb_copyin() needs to get the opcode from the aiocb and then decide whether an allocation is required. We failed to do this in the COMPAT_FREEBSD32 case. Fix it. Reported by: syzbot+27eab6f2c2162f2885ee@syzkaller.appspotmail.com Reviewed by: kib, asomers Fixes: f30a1ae8d529 ("lio_listio(2): Allow LIO_READV and LIO_WRITEV.") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D31914 (cherry picked from commit 2884918c73389bebfc8025bfb267adae086ee0bd) --- sys/kern/vfs_aio.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 02014ceefdf5..5ad912ea38c4 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2829,6 +2829,8 @@ aiocb32_copyin(struct aiocb *ujob, struct kaiocb *kjob, int type) CP(job32, *kcb, aio_fildes); CP(job32, *kcb, aio_offset); CP(job32, *kcb, aio_lio_opcode); + if (type == LIO_NOP) + type = kcb->aio_lio_opcode; if (type & LIO_VECTORED) { iov32 = PTRIN(job32.aio_iov); CP(job32, *kcb, aio_iovcnt); From nobody Wed Sep 6 21:56:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6D2tJXz4sJCZ; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6D2Mg1z3Zq5; Wed, 6 Sep 2023 21:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2nLpHpHOic7Yi8QujvjEMT3GkcRBzTWswhnr+0RjUk=; b=V6zNnAKbk3fn1uvKa7F5psJf0yqe4lgiOmVc/J4hbwQOaBRc82ptGeFQKrDiaiJoM2jBo9 kChHloLWoe/uK8kGFZe/sLDqigIerPR9sH+tr450pzCbYq8WFTmOrWLtXOefKR0EkpbbmF Ua0bw0hMxoZKaIGuyi1Uj8FrzBw7yl0tcL5Jjjd7+AU80RfTf60xfTfNkudNYowdobeS5w 5f8djD77iRIOrZ4Pjy20xJGomlYsO0yrUcdRfn1Dq8IcUKedG3EtN9tjfEJRTGTsE+0Bj9 RSq7d1HyscspkuXIsHEsnkgCam2ts8hwvUGX7KyC+qTxSU0MPNKl3UitSL1gnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037396; a=rsa-sha256; cv=none; b=rMg2lGgPBRfz7+PI3QY2xjp+rqhCZ0Tnl6ylmvQXz8K2Aoje3nZde24Xiy7TVyM06ogoBp GU0q64rZosBKiA7vGoqjO5a6ffxGBu0FyKXdYI9AxCfbgVC2eByzU6D6/yL7tpVxWjBFjr 2hn1Pmr61lJFlFO+AJWzktezN9dals3IS9T1kLTnqyG2HhWyga+wP82wE/fGHuVz6qYZbt vITCyaC6G1QC2/s+RTYHQ2hcBTuCpUDk6WFwKOdGsQvHWvxKu4Kb95b7zpIm8wK5K3jS7X gSJgtx4MKnVotX+KbfYr9NWndEfQAwKFCtx/ekcUobzrfx0KbgeuGtxpSfv8eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2nLpHpHOic7Yi8QujvjEMT3GkcRBzTWswhnr+0RjUk=; b=sGb/GUP2ifp64O5OHHp82bozo70+lfAEErlrae9uoa2Zt8B/E5cL0ut7GQly7lnwvc9Rcx yCJI184AcVBYKEs+lW4DJ2tQ9ZPn9Sxe4tKrxrg/qvhme3CMYg5XIxdJqMwPlY+7CJL1uK S8Ry4PrBjwk/QzJmdRCh94D9aMqilMYXfGUkUtQ+GGNqgfMJw8S2TwuDWzVYG1HaY6jXS0 dqLJzr7BmnAiArMW29Tsz1+cysjLUJj0OUfinr4ei0yyir8mlUUNMmQPZ0cuL7WeRWHO8O u1uMwILoH7c0C2+3aPgDpg5sKfUypY1ApLH1sJ5o8c/qR2dJLTxUe32aqB2+dg== 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 4Rgx6D1NrrzYvW; Wed, 6 Sep 2023 21:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LuaHj022574; Wed, 6 Sep 2023 21:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lua9k022571; Wed, 6 Sep 2023 21:56:36 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:36 GMT Message-Id: <202309062156.386Lua9k022571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8165540af2cd - stable/13 - aio: whack "set but not used" warnings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8165540af2cd270e0dd8ffdbb72a6e2e25dbe3d5 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8165540af2cd270e0dd8ffdbb72a6e2e25dbe3d5 commit 8165540af2cd270e0dd8ffdbb72a6e2e25dbe3d5 Author: Mateusz Guzik AuthorDate: 2021-11-14 16:59:53 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 aio: whack "set but not used" warnings (cherry picked from commit e9c7ec22877f461f530dfe1cb8e17086300c0ee8) --- sys/kern/vfs_aio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 5ad912ea38c4..5ffc0b31c2ae 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -758,7 +758,6 @@ aio_process_rw(struct kaiocb *job) { struct ucred *td_savedcred; struct thread *td; - struct aiocb *cb; struct file *fp; ssize_t cnt; long msgsnd_st, msgsnd_end; @@ -778,7 +777,6 @@ aio_process_rw(struct kaiocb *job) td_savedcred = td->td_ucred; td->td_ucred = job->cred; job->uiop->uio_td = td; - cb = &job->uaiocb; fp = job->fd_file; opcode = job->uaiocb.aio_lio_opcode; @@ -2472,7 +2470,7 @@ aio_biowakeup(struct bio *bp) size_t nbytes; long bcount = bp->bio_bcount; long resid = bp->bio_resid; - int error, opcode, nblks; + int opcode, nblks; int bio_error = bp->bio_error; uint16_t flags = bp->bio_flags; @@ -2483,7 +2481,6 @@ aio_biowakeup(struct bio *bp) nbytes =bcount - resid; atomic_add_acq_long(&job->nbytes, nbytes); nblks = btodb(nbytes); - error = 0; /* * If multiple bios experienced an error, the job will reflect the * error of whichever failed bio completed last. From nobody Wed Sep 6 21:56:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6F3kGFz4sJLM; Wed, 6 Sep 2023 21:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6F3JJwz3ZqW; Wed, 6 Sep 2023 21:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BSclSMgf1/xPtvZvFq6Agdlkqzs+Y01b2mC1oQnDGR8=; b=AIKHydjAq9x1WHkDED0HGtfziww/OIQED4hpXnzj+jo1DBm2x9vytV81dyNQtx9kcPr6PE dkW/rkxcRisHR80DhDaRWjLc6dikIGc50A6CGja0dGOaIWs+BcjWOsn87I5BD+cXqCyzw8 WggwV60byFyzZKdaDrEmY9yNseSwHrEdAMeHyYfiWBLgO8K0zidgdB+JofA87nZovypf7j Y94W0G4cFjluL8Pn/juudwRnZjPafw4ZhqcsxavoGcTSDs8FRg743KuajVBEQ49wkPWtE4 6amgYkPaUdN0ppQ0ptdOSjT494LtHCAJfrmBi04RNpqVQ4AntRMCJ/vriGxAFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037397; a=rsa-sha256; cv=none; b=CQzYs60y3MO7bqhtoF7dnJYXptK1aCE3/n5C69XHj5FCw/4KT7rs/PY2VRlSzYueR02vkm PNcA2CUtfcNK/GaiAXBMsR9VCVpjg+vo3Q3bEyN2hjR2sPb+kL64ZqNEesn2r0AX3Vs8+r ronxT0mwGSo1qelCsY3sV8DY/oottI+PQSmMqQpOTQCpfyUao145f+OyTy+tMJDkE12EhM VleIVxp2xNQKkIvEj480cuZgKeq9W2eACyB4U6vMMPb9IvNJDivElnMFVNedRZqkJUUvjd Tf6GSX5zwVsHX2d6abOVE0F0+PkC+/4WqP5POLm45+8S8eIk5iZfccI3XUMVtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BSclSMgf1/xPtvZvFq6Agdlkqzs+Y01b2mC1oQnDGR8=; b=O5QEaxrvvjFGwsw0wgmjKwak2v9DwGFbQIbIBUkrdcjg/lV13IbyP2+ZDNrDtUEudhs0+r nAWobum2zfNIaub5VRXD2/9gwaeYCdnpO/TxahjEHjd6yEJJYrYAXwNIBRFvB74kbAAUuw g1XTABz1Vtlwp0nyMeeb/YR63zMpR5HtHHWZSL/XTtEKeHo45nMfR1dj3TsKlFcJyBzMya iO2gN2wlKJIBkVmb2MttVXINz3hjobLQ4pYQ8DCa9mE+kiIdwGD8V+4MIOOwaXUyHV0rbs c9uFMLn+9qv7pWZXkx5C5d/ne8VeRrkaWfYivF48n3zcmFhGWBXNFwOqqu/pnQ== 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 4Rgx6F2PdwzZ4t; Wed, 6 Sep 2023 21:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LubNi022628; Wed, 6 Sep 2023 21:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lub2k022625; Wed, 6 Sep 2023 21:56:37 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:37 GMT Message-Id: <202309062156.386Lub2k022625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5febbe8a14ca - stable/13 - aio: Fix a test and set race in aio_biowakeup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5febbe8a14ca293f031236a77054f734b1ff5b7e Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5febbe8a14ca293f031236a77054f734b1ff5b7e commit 5febbe8a14ca293f031236a77054f734b1ff5b7e Author: Keith Reynolds AuthorDate: 2023-02-15 18:56:39 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 aio: Fix a test and set race in aio_biowakeup. Use atomic_fetchadd in place of separate atomic_subtract / atomic_load. Reviewed by: markj Sponsored by: HPE TidalScale Differential Revision: https://reviews.freebsd.org/D38559 (cherry picked from commit 40734fc57ec0158690e9f03284229553b050b8ea) --- sys/kern/vfs_aio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 5ffc0b31c2ae..7ca0848c5f46 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2491,10 +2491,9 @@ aio_biowakeup(struct bio *bp) atomic_add_int(&job->outblock, nblks); else atomic_add_int(&job->inblock, nblks); - atomic_subtract_int(&job->nbio, 1); - if (atomic_load_int(&job->nbio) == 0) { + if (atomic_fetchadd_int(&job->nbio, -1) == 1) { if (atomic_load_int(&job->error)) aio_complete(job, -1, job->error); else From nobody Wed Sep 6 21:56:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6G53BVz4sJCh; Wed, 6 Sep 2023 21:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6G4Hm0z3bC8; Wed, 6 Sep 2023 21:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8ThXeH+6cTPVwjx5CZnGzgDVy3qMCIxYGjyWVgTDCw=; b=mvh+YZq3u8cvHdO1wgFjh0tITe/RfGsvXEGi0Hzm1B4Ritja4fhj6sqDtn7WFfueb6AxE7 HDZgMYdZRGLwxokt4pHzDbyUA9oHZkD7AXcJ7IcZ7AGzCX0siEcG0entnE1b8vv8CGcZQL KkxrnXnoHtNNnJkILoSzF+HN/zC9irBM0a6M5gMpydWXPNQLN/owvYK/SWg0m5YyR8YThq Kd5rmB3g3UNwCY5mT2wptumbKJwngBXgdQ8i3MxZr4qGCqNpfK2xND3DJP2XC00Q/j07PI LWSMLSkxltkHoy1rmMHPEM8Ph8x1crvJtIZnjMb5CLeszZAO/vLjPhQGoC7Kaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037398; a=rsa-sha256; cv=none; b=M3vwlH/QPA1QvIoIyc7E2R6ITWQMPLF4Eob9XDuukHgwy27mnY2BqSDLaZFw6gEoQC3FII h8xdv+ItSjby+1tOLKyc0N1xr0+xtIfN+kPkR06JPp7D79HzDd066ZM8kk7YMaszKPLw0G /D9xdfQ4BOsoDr2OVMMv1sBDRMJj8qS1rtlRZgXwKbXCBVi4Dc4zuxb+SsTZysXlm7yvI4 +odxGTf5b+W4wJC+nvvR/WP1eQMtIiiP5OLpTGM9deijeIbgueC2Sq1pjns9IMyBbPmjWT 97upjjTbcznzu4M0xXSFErcS6dstML6Z7Li7NpbHzrOTNtEZzrTMVbEapLGAyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037398; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8ThXeH+6cTPVwjx5CZnGzgDVy3qMCIxYGjyWVgTDCw=; b=k81fcx9OTQprqphkro8ZfQTYjhIzhr9OdAUSgYwxXGFQf12TAGXb19ATvV646rXFGb6zV9 YLsZ0CiezDQqENspHYz3QuEAWKMOavsEJ47sskcSffEccRw2DzRpS1SRWpKtZqNtbqQdYu Mj0qwXk7bpOvm71njqT9GPNFxTXoC/GxkfPv/XdJEVpI+6X2/GvigpofdeR7MAzm72JNTk UXlIGlX+vVTiwRPNWZ57Pp/YZO97BJ3toyxiQxJ0daD0bOsV7B4HqT4oAVFoNtm+pcj0oa 8JhUOGVMouctqheg84cjnXBl/j3tlZA7yT8S4E5igNfoiNnSM0VDTtdbYLyAdA== 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 4Rgx6G3NpRzYvX; Wed, 6 Sep 2023 21:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LucCJ022667; Wed, 6 Sep 2023 21:56:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LucqA022664; Wed, 6 Sep 2023 21:56:38 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:38 GMT Message-Id: <202309062156.386LucqA022664@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3070a1850683 - stable/13 - aio_biowakeup: Various style fixes. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3070a18506838c7a038446fd0489acd7dd23dcec Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3070a18506838c7a038446fd0489acd7dd23dcec commit 3070a18506838c7a038446fd0489acd7dd23dcec Author: John Baldwin AuthorDate: 2023-02-15 18:57:08 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 aio_biowakeup: Various style fixes. (cherry picked from commit cca6d6160f14a6a8dcb1e3caa0759ddbd0f68555) --- sys/kern/vfs_aio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 7ca0848c5f46..0fbe094d8f44 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -2478,9 +2478,10 @@ aio_biowakeup(struct bio *bp) aio_biocleanup(bp); - nbytes =bcount - resid; + nbytes = bcount - resid; atomic_add_acq_long(&job->nbytes, nbytes); nblks = btodb(nbytes); + /* * If multiple bios experienced an error, the job will reflect the * error of whichever failed bio completed last. @@ -2492,7 +2493,6 @@ aio_biowakeup(struct bio *bp) else atomic_add_int(&job->inblock, nblks); - if (atomic_fetchadd_int(&job->nbio, -1) == 1) { if (atomic_load_int(&job->error)) aio_complete(job, -1, job->error); From nobody Wed Sep 6 21:56:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6J008gz4sJ75; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6H5HMGz3bCQ; Wed, 6 Sep 2023 21:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y6+PZGbGD++BDT922AoyeHp0YovyKvc3rUnAchQmKac=; b=qBB1jghfSELdi3zYVV4eix05uP2aRW+OYTb7W2/H4KpH4IDPKv6OhMU3u8cq7ZN12tRXiz kwvZMlr0SAC2sbSSQg7sT7/8F1QE5ULDaCxOu59kweV19odL8Aeiqsj6XVf1u2HLesxgN1 LOVvsArOVYJDCy8UoI5CgoyfJfJIrJDG7axKM9GYM3B2WZwIwsiXVTSYUJLV5UJ1s4w6Ao Yzil4hqp7UgVu48h2OBs3WDyBGpoABWLRIaYTkSOpfkHsX4uC1BFyfv0xZYdQfj1mALn3J Ugb8oG8+XAUhiTPl/LVvXkJkAasjDGyz31rKOyJb1KGq+gmuk22W+Da+0SUoyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037399; a=rsa-sha256; cv=none; b=SDqzJgEWtrGp6JQGtK3kYP2ofIuGGyQGtrOyymLI/NC7ex+EMh8KD/tYfU3gxx5arA/+Me sdkfBY8+klfQ+DZhhcdhBNvibWMlkwRG60WX7eiXwsjSQ2Uj2zTAjFc57YHAtnqaEZCJav kJOA4YPk3Txc4BUcxV84d7F1EIVbRDQf7mWAAjot/4EppF+yIzh5TIA+/FEQoNcTAoXvhY sjhBeG2wLr726+O0Lolc26xBKkuK/uC3VnRstMKeJia1sHoE9HLTfe7qxGmJXg1zkPdqJa GtNYWW3s5E9LfL5iq78oYly6KNefFQB7qYoCgNza3DluhHyI5ChdlaOLXk2J6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037399; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y6+PZGbGD++BDT922AoyeHp0YovyKvc3rUnAchQmKac=; b=wOcYDZou1Fm9/fdfOnRSEcFBCDEjKlBRDg79MCYDMBs3BnQ3EV8J6csvQzmeJaBWyY+Mbw Nv1NovvEG36s2UCpEknUPBwkdBC2O+ne7G5xNWXL22Kzp8ou1PzjcVMSKJiLlRnf9mkrZq OsLAQ4BxIpQ2/CWdTQc6BDQNXC9UxDAbkzBT9Y3z6uDd1ZYS8vOws/2eF+oAOU8quVEaLK bTr8ZUZV1V5T5TtViamoG0HOhk3o7+zXQImETMDbEighInTrzfEB2+1NGbSepcR5QCUNLN 6QpyTCWvtvw2+Nhc0Er4Os3eTEkp2aJoE9biMpFMwDzDnejxLEKIjHYRdTEe2w== 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 4Rgx6H4PDYzZ6D; Wed, 6 Sep 2023 21:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LudpU022715; Wed, 6 Sep 2023 21:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Ludqj022712; Wed, 6 Sep 2023 21:56:39 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:39 GMT Message-Id: <202309062156.386Ludqj022712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fe6953f70fab - stable/13 - aio: Fix more synchronization issues in aio_biowakeup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fe6953f70fab1f89de198d3dbc885d6f89a44883 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fe6953f70fab1f89de198d3dbc885d6f89a44883 commit fe6953f70fab1f89de198d3dbc885d6f89a44883 Author: John Baldwin AuthorDate: 2023-02-15 21:32:52 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 aio: Fix more synchronization issues in aio_biowakeup. - Use atomic_store to set job->error. atomic_set does an or operation, not assignment. - Use refcount_* to manage job->nbio. This ensures proper memory barriers are present so that the last bio won't see a possibly stale value of job->error. - Don't re-read job->error after reading it via atomic_load. Reported by: markj (1) Reviewed by: mjg, markj Differential Revision: https://reviews.freebsd.org/D38611 (cherry picked from commit 98844e99d40a90ae89d84762e07150af3a8f89bd) --- sys/kern/vfs_aio.c | 11 ++++++----- sys/sys/aio.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 0fbe094d8f44..1bdd32ed7969 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -1279,7 +1279,7 @@ aio_qbio(struct proc *p, struct kaiocb *job) } bios = malloc(sizeof(struct bio *) * iovcnt, M_TEMP, M_WAITOK); - atomic_store_int(&job->nbio, iovcnt); + refcount_init(&job->nbio, iovcnt); for (i = 0; i < iovcnt; i++) { struct vm_page** pages; struct bio *bp; @@ -2487,15 +2487,16 @@ aio_biowakeup(struct bio *bp) * error of whichever failed bio completed last. */ if (flags & BIO_ERROR) - atomic_set_int(&job->error, bio_error); + atomic_store_int(&job->error, bio_error); if (opcode & LIO_WRITE) atomic_add_int(&job->outblock, nblks); else atomic_add_int(&job->inblock, nblks); - if (atomic_fetchadd_int(&job->nbio, -1) == 1) { - if (atomic_load_int(&job->error)) - aio_complete(job, -1, job->error); + if (refcount_release(&job->nbio)) { + bio_error = atomic_load_int(&job->error); + if (bio_error != 0) + aio_complete(job, -1, bio_error); else aio_complete(job, atomic_load_long(&job->nbytes), 0); } diff --git a/sys/sys/aio.h b/sys/sys/aio.h index e9c5bdc63c87..a1aa96efed09 100644 --- a/sys/sys/aio.h +++ b/sys/sys/aio.h @@ -149,7 +149,7 @@ struct kaiocb { aio_handle_fn_t *handle_fn; /* (c) backend handle function */ union { /* Backend-specific data fields */ struct { /* BIO backend */ - int nbio; /* Number of remaining bios */ + volatile u_int nbio; /* Number of remaining bios */ int error; /* Worst error of all bios */ long nbytes; /* Bytes completed so far */ }; From nobody Wed Sep 6 21:56:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6J6qQfz4sJLW; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6J67lfz3b9X; Wed, 6 Sep 2023 21:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E8NAOe8UQNyzXbgmrGbdAC8LZ+jlGkt4/tLOCawQUC0=; b=QoT3T7zjhkkCmIskQA3ahao5wO/cO+FCMfa7U66XJfayGgMvGnZ5jt+1tqH/D10KiOTJ2b s5hBlQM+ODIjK9reijHoe305VhMeunoBacidWgB2DrXYvWsigBy0Yhuiui59AFl64CQqxy tTXrLSsZGifY0b9P6bmq4U7uWdmWUUezhCsxMeo3rijtF2J4I03kbvqFAl68rjRdguJqXq tPgJ89SkzGQT9BUhLW4c2TVk9qDNC3w1W5Xtoi9lq7bXN9FrWCJVZ/Ra5HRJclrVRYtQRt tYCCjGrNmz5+VH85sZZKn+i58QUsXju23nxfW0OiysCrD0m0tYuD3CseTDluhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037400; a=rsa-sha256; cv=none; b=vMLF+xNAWC+gWCYUIeOCk+0nwLB1clXuzOWsoQNMIRdp0VUxaCFuAoih3RjNzemU/zvBGS M/L9E3RZCb6aiQdaaoOg5jMSfzYajVwaAOBE1FiNlFyn/lcH6wHbBAzLlk2rWNoZ2yH8Bj W6LJyIldBJrAJ1BxYywsV++zxX8v9bP5JfHiprkmwaNc2A6fKDs1kATMGT0MZo1M72FD2D uvLkWdeMLTFFp4OV7feDRXQRgw7WTVVDB0ObzYfecQH9gZ0ot/BOWmCsJYmtnax8kSo+9p QD8mRZlLBIcrv8+zn7CnFV+wLkZ63L+MS1WxCbUwTp6BuIMhsuhBeozAt3BGUQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E8NAOe8UQNyzXbgmrGbdAC8LZ+jlGkt4/tLOCawQUC0=; b=qvUDBAAGtum431P++rAryYM0mTv1kmqoz/xD19gxzGaqo+i6lsJJTRHKs8uULrEFlEZybw FvvtZ/llyegJ5fu4S1xrs1CTZJBVIY+i41Y2+aGfu7HcZJTYFHktzSnlv+coYYJ6LRwG1T Q5VGKYq2HDYP+OxQr6qU+ydArj4fVJWtxsFnQpOWCcOKUcIjvxSZr3fY1oFpwra6zJh/67 oELKt10vGnsW6rIzcs/SghWKfYpPqkE8Xpt/KfzbfZIA3h8ECWBwvNqHi8n44CNhnPCiBk Z6dQBpj632eNXFmSrk9hFQmc1bx+g5k7Ywe2IR6fEv6P0qJn3MxCxF51uhc+Iw== 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 4Rgx6J4tNszZ6F; Wed, 6 Sep 2023 21:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LueZ6022769; Wed, 6 Sep 2023 21:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lueal022766; Wed, 6 Sep 2023 21:56:40 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:40 GMT Message-Id: <202309062156.386Lueal022766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a3105e25800c - stable/13 - cxgbe: Don't leak memory resource if t4iov attach fails. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a3105e25800cfc8c8eccffb002cfbd2358a18ab1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a3105e25800cfc8c8eccffb002cfbd2358a18ab1 commit a3105e25800cfc8c8eccffb002cfbd2358a18ab1 Author: John Baldwin AuthorDate: 2023-02-15 21:34:00 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 cxgbe: Don't leak memory resource if t4iov attach fails. Co-authored by: np Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D38580 (cherry picked from commit d2070e5fa983281e94a338d6e87eb29c7dd28505) --- sys/dev/cxgbe/t4_iov.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/t4_iov.c b/sys/dev/cxgbe/t4_iov.c index ac58f9ca0a70..b063bda233b9 100644 --- a/sys/dev/cxgbe/t4_iov.c +++ b/sys/dev/cxgbe/t4_iov.c @@ -192,6 +192,7 @@ t4iov_attach(device_t dev) { struct t4iov_softc *sc; uint32_t pl_rev, whoami; + int error; sc = device_get_softc(dev); sc->sc_dev = dev; @@ -215,10 +216,18 @@ t4iov_attach(device_t dev) sc->sc_main = pci_find_dbsf(pci_get_domain(dev), pci_get_bus(dev), pci_get_slot(dev), 4); - if (sc->sc_main == NULL) + if (sc->sc_main == NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, sc->regs_rid, + sc->regs_res); return (ENXIO); - if (T4_IS_MAIN_READY(sc->sc_main) == 0) - return (t4iov_attach_child(dev)); + } + if (T4_IS_MAIN_READY(sc->sc_main) == 0) { + error = t4iov_attach_child(dev); + if (error != 0) + bus_release_resource(dev, SYS_RES_MEMORY, sc->regs_rid, + sc->regs_res); + return (error); + } return (0); } From nobody Wed Sep 6 21:56:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6L136Rz4sJ54; Wed, 6 Sep 2023 21:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6K71znz3bLZ; Wed, 6 Sep 2023 21:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7becYbUlCeAPrBTt/XCV/rzrdQHK0WFRgVkcYmlwxk=; b=Pp04m97oYY6lOTZ37AuL18yZXWg5PvaSuZjFznF098Rgyt3tKaq3alPKvza5ssn/6o2pgs C04k+qoqy0mSMh6/B1bjOZIHS8uWTRUuq3acaew2wTAgNIQ22QF5wjZXaTOKOSlqmJ0snp m/JGD8yOCAJ6PWeE0XUYQ5xuWQVg8WH7J/ox5cSNFHjWcm3gGGUgsjHz8S9dQo1xJbJAVX KMt4TeQPqabMtJA1sJL7oEkbwKwgEgBfMzF59vAj3swzI9g4V24meWDPXy+cNi1nRDjAtg kXyNDSKL2tlR+VJ65rlHtCOOphmH/6r1foIf48Qgp0vdJjttl47iRUPRbXqJYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037402; a=rsa-sha256; cv=none; b=efCQ6AbGhRHtGPIkPZmqLay77Bm8MEMaP0kigO7SBNuMLCrjwEFHLtabGD5+O4T+T5ft6w DqJGDfqKsHg56S0F9SwjGJEzt9uV286Z9zFa/s63QeUncQuwgObYOI/uMgFluaWBCa+R7C h/mzJAkx+DQOrAeCrjLKOwBQ6wFwvgkIJKWudk6t3y81Sk/g2BK9jbFyvprxyXQ9eDK3Ye v3HLsXEChYUBTF8HFZZ+YVw+uLpQndT7C+WOOP8xY5b+9bToivmv8BGRz5ES11+bXGokVY rRtCU6VEBiT1x4qhbjzeB9dlkyN8qQVnIqkEFwJHgignC/4oYZind0tX1SMtQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7becYbUlCeAPrBTt/XCV/rzrdQHK0WFRgVkcYmlwxk=; b=MxBjNnIcoIqyjc/S/KRm5Ry4OmXBOwawNLfApYczHOBvaUBp8pkkRXJCL9zQY+JAx9ISiw QvbKvQY7URd6P3hfyoiZlRnThtCAn3oScym1ojLOh7NmShM+XhYr2XAKEpK9H2xLqAUIVs SYCkeuVr7dLhv5D+O4+SZ6RwVvvMWFwuOikf7d2W7yvTz+3WWUfF0cQDRpQq0ksPC1VG6z ZCOAIgqImQZlwZhnu2At+qJphj0qcvuNl762cfQMWxHDa18r2PusHdK3TCCCME1HwgN69K ktodhd74lRDlco1A3KxHWTv7J13yn7M0rnIcKq1oK2lByAIHq7NV7Nt7eUpS0w== 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 4Rgx6K65RMzYvY; Wed, 6 Sep 2023 21:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Luf6D022814; Wed, 6 Sep 2023 21:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Luf3Z022811; Wed, 6 Sep 2023 21:56:41 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:41 GMT Message-Id: <202309062156.386Luf3Z022811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f66e0b086c7b - stable/13 - Remove /usr/lib/dtrace/ipfw.d for WITHOUT_DTRACE. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f66e0b086c7b58e98b0bb4e660a83dfdf0b879b1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f66e0b086c7b58e98b0bb4e660a83dfdf0b879b1 commit f66e0b086c7b58e98b0bb4e660a83dfdf0b879b1 Author: John Baldwin AuthorDate: 2023-03-22 02:06:40 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 Remove /usr/lib/dtrace/ipfw.d for WITHOUT_DTRACE. Reviewed by: brooks Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D39099 (cherry picked from commit 1ad3cafcd34eaf65f002c0c5242374a61d4a9b54) --- tools/build/mk/OptionalObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 5fc676579cb4..498e90d57e91 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -917,6 +917,7 @@ OLD_FILES+=usr/lib/dtrace/drti.o OLD_FILES+=usr/lib/dtrace/errno.d OLD_FILES+=usr/lib/dtrace/io.d OLD_FILES+=usr/lib/dtrace/ip.d +OLD_FILES+=usr/lib/dtrace/ipfw.d OLD_FILES+=usr/lib/dtrace/mbuf.d OLD_FILES+=usr/lib/dtrace/psinfo.d .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" From nobody Wed Sep 6 21:56:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6M1pdkz4sJ2V; Wed, 6 Sep 2023 21:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6M1B7Pz3bGg; Wed, 6 Sep 2023 21:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eq+xx2E9IbimjWhgZOkX9i6zPHTzO0s10oyVhH242Ps=; b=ezu1shfk1fA4izQGAOakXIC0VqQrW2MXVup4aLxxqRa8NZqVqHzH1vPtoVyMqXWySrIG5l Z9TECUh2mGcNUN7xBp6HJW67pcY7yBMJalPnb5XBvnAE5I2Q94WuxJ1xLLkbEp6hwXmj+Y GSbsX8WHaNIaRf6Hlx7U0JwpZZHwi+tbIJWKBR16iWlfunl0sZrujX1wdoxJK5SeBhY75i wwqrZDVaPNWdZvm7R7ZCgcSJ9XeMReKKcXKPhZ4Khg5yFtDjrQtjCKdvCAGwXHnqk4uq/n OpmFAl7GYGbxXaJ+Avz62uQ+IuH/DJcxisltO5n/wiRvi48IguxPlhZYyj4+ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037403; a=rsa-sha256; cv=none; b=tH4li+4usPtSM01bGmoKvWW3jwX1bgwohVuAn12e5DVvFNOkzD7cpN/6Mf3xeyqllADGkc 9zdcuqntRRF+waWPIWEizu7kW5gNfhmNN22KB++3zCNJHVZB+WV09QtU1im+IsqV23N9bE 4obzoAI3S3ViBLTu0I/A1l3vIm3OH6g2lk669VuliGeeGDtp1qdsRoA58PW+VyxZpsY94C WSoh48H+b/v6m0XSP/T3Z3T/QOjBYD3Ty/VyHQz6L9hKMKd9UEpQXmH3/J6Rmp+dnZQ1ku HoTKeQSeS1DvDFpDxsvqFz9SYmwQKnvW00nHSqbpI1yH/nCN3DKxqOq0PwweKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eq+xx2E9IbimjWhgZOkX9i6zPHTzO0s10oyVhH242Ps=; b=XkZ2CPeCzhQhv/pdtdJanK/Pqx357PNoLznHui91pZG4DG9q6rknFylogtRSvqqNjC8KEL Of1tftMlcoQNV8Q7qd7Z/nFS3Ui9NRb1cBIHHdfbekhiUDs8qTXvpBcSAmObgxDaNbDqTi veU0Mcoi5Z4/ECbdmFW9VbBlqjjlSdgOYGxsA+PQhOiZZqHLn5FsCePxHQTFIhSxFkb+mb +Fj+1kwVyA65t4yTjp93saIeN1rDQCG8dTuOVcsKB5CZdk8qz/tzord4duILnpoCQB7i8+ aUWkOXzgE0O+B9m7TzMuDdg6FrVilg43u+O9C/YWlICBfYasBOOV4yRxnd1mqQ== 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 4Rgx6L72X1zYrt; Wed, 6 Sep 2023 21:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lug0T022862; Wed, 6 Sep 2023 21:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LugsS022859; Wed, 6 Sep 2023 21:56:42 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:42 GMT Message-Id: <202309062156.386LugsS022859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b086848fc086 - stable/13 - libpfctl: Don't pass stack garbage to free. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b086848fc0862468cba5d736f60f2882b2119c30 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b086848fc0862468cba5d736f60f2882b2119c30 commit b086848fc0862468cba5d736f60f2882b2119c30 Author: John Baldwin AuthorDate: 2023-03-22 19:33:59 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 libpfctl: Don't pass stack garbage to free. GCC 9 on stable/12 reports a -Wmaybe-uninitialized error for the call to free in _pfctl_clear_states. Reviewed by: mjg Differential Revision: https://reviews.freebsd.org/D39198 (cherry picked from commit 48c519be0e8005aedc817b1bc1101ad32b67a67a) --- lib/libpfctl/libpfctl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index ae0e63818335..6ade20fcd990 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -922,7 +922,6 @@ static int _pfctl_clear_states(int dev, const struct pfctl_kill *kill, unsigned int *killed, uint64_t ioctlval) { - struct pfioc_nv nv; nvlist_t *nvl; int ret; @@ -945,7 +944,6 @@ _pfctl_clear_states(int dev, const struct pfctl_kill *kill, *killed = nvlist_get_number(nvl, "killed"); nvlist_destroy(nvl); - free(nv.data); return (ret); } From nobody Wed Sep 6 21:56:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6N4brGz4sJK0; Wed, 6 Sep 2023 21:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6N24kpz3bKC; Wed, 6 Sep 2023 21:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MAm4SlH5VVVNF2GN2cG9mhiXswX+7ctk1PXIDP+w17U=; b=yo0mJOmCEavXwgoHj8mrrtCDftfD9m8H9oYj1leYwX/c6JOGSFVMrx2kzl7kdzKbIAMeSU iG9nnt01yWwxj57ZwJhv83kTmP/TwPTBS+kmQCjs5nvzZoVPGYtXQgCHaIDuShsSZn4BuJ iTiL8EvmnHU4ayHsQ6Afu8AsYpPGGoIRQR33YaZJtIhqqLhKb6ZFZwNrScWGnUwaV71lGn KxCvQJen460wbShshbnmvNzi6IzAjQKsyfzIBmB614ySfmXhcpp+8f22sey/EyF8Z5CJuw 8YGCHsX6U9Twa/34v+Yim9sDXn0RBkqISabTnu/iDyN6rIYDfyZzyrVPf/Xy9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037404; a=rsa-sha256; cv=none; b=sm7NnAPV9CrDcEJWsKkgRIRu1eQ9z77SshrNs83YW1qpAcToX8VFeiSKKSiJrh2hXVUZwp kLPWq2S+oUxZjiclXIkm8bdtEdYvMp8PglyZS6nDSlWsHzSTQWR5OGCq4/iP3xayezT5on 2u9mqh+VB/RggHNeh6PdXH3FUIEWCO/ijUQBfay2t/8C66k3OGouTrmQ2ZIz5deQKuRoeg u6VGywrvaEQlyt402X/APET19K5T8gKdemBdFTgWyUmMA+alPQjoLGCrxh/yXmccsrlfW3 A1NfhFggPNCbVxrKT9sRRTAlmP9m1QbEzYm/6jFxWqRjmxx0ocsbu4DGEEy3VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MAm4SlH5VVVNF2GN2cG9mhiXswX+7ctk1PXIDP+w17U=; b=nms5oIvXw2Ae2BqBd/kPCV9YJWcQc57oxzHJKsh4iEjacVGNl2sYHJabG/ZQBLHf2rjyUJ HKFsl/us0na3HclwOjpU24fBL3M6Zl/yMpxt95k1aVwsYtpSTQTTz1Q1ueA1jSpUkmVw4r N4AXMwXzsTJb5KxnTPxAQB07OHpSISqztslnTna58YG8qItWjQafvpqKyLzZxwG2JdZCFB beWL9ES3IMiWXC6uUhpT1dEQuTXAGFotYXX9/ugwEvdwdN5vUORO4/w/V+krfKJ2Cdua6A +e1xdTjX5pD8/qlZAYSfSrxrCItipYLI2PP27738O/iW8fbhClNhIwPoRRw+lg== 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 4Rgx6N0vkczYmS; Wed, 6 Sep 2023 21:56:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LuiGg022904; Wed, 6 Sep 2023 21:56:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Luinp022901; Wed, 6 Sep 2023 21:56:44 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:44 GMT Message-Id: <202309062156.386Luinp022901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 21ccba43f511 - stable/13 - ptrace: Clear TDB_BORN during PT_DETACH. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 21ccba43f511cc4089899619b5a85e6d83a200dc Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=21ccba43f511cc4089899619b5a85e6d83a200dc commit 21ccba43f511cc4089899619b5a85e6d83a200dc Author: John Baldwin AuthorDate: 2023-06-07 19:26:57 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 ptrace: Clear TDB_BORN during PT_DETACH. If a debugger detaches from a process that has a new thread that has not yet executed, the new thread will raise a SIGTRAP signal to report it's thread birth event even after the detach. With the debugger detached, this results in a SIGTRAP sent to the process and typically a core dump. Fix this by clearing TDB_BORN from any new threads during detach. Bump __FreeBSD_version for debuggers to notice when the fix is present. Reported by: GDB's testsuite Reviewed by: kib, markj (previous version) Differential Revision: https://reviews.freebsd.org/D39856 (cherry picked from commit 653738e895ba022be1179a95a85089e7bc66dbbe) --- sys/kern/kern_fork.c | 2 +- sys/kern/sys_process.c | 2 +- sys/sys/param.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 157eba2b3fbc..e3148763b460 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1195,7 +1195,7 @@ fork_return(struct thread *td, struct trapframe *frame) td->td_dbgflags &= ~TDB_STOPATFORK; } PROC_UNLOCK(p); - } else if (p->p_flag & P_TRACED || td->td_dbgflags & TDB_BORN) { + } else if (p->p_flag & P_TRACED) { /* * This is the start of a new thread in a traced * process. Report a system call exit event. diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c index 6f53f1ae43b4..2eaeabb6a5f9 100644 --- a/sys/kern/sys_process.c +++ b/sys/kern/sys_process.c @@ -1288,7 +1288,7 @@ kern_ptrace(struct thread *td, int req, pid_t pid, void *addr, int data) SIGSTOP); } td3->td_dbgflags &= ~(TDB_XSIG | TDB_FSTP | - TDB_SUSPEND); + TDB_SUSPEND | TDB_BORN); } if ((p->p_flag2 & P2_PTRACE_FSTP) != 0) { diff --git a/sys/sys/param.h b/sys/sys/param.h index 376d1aaa2187..ba64cfa4b5df 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -59,7 +59,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1302507 /* Master, propagated to newvers */ +#define __FreeBSD_version 1302508 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Wed Sep 6 21:56:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6P3JKzz4sJK3; Wed, 6 Sep 2023 21:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6P2qvFz3bb4; Wed, 6 Sep 2023 21:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RoASV7r5l4x1PooNoWKBg2Vf8ahxhLQ0w71n1gLDieI=; b=tpVefrMKO4mUYjBIUKVo6hHYbZ6e1HMsFtmpkEP6//sXD52T/Bl4GvQ6PM2DikVbGsi1yV 3zU4bgikkuJbezGA94b1Kagx4d6iz5AqN8ylWMASwz5I0OYVSLKVHCGG2HpnPPcFqpEeZU 7wF6tg298saI/yuc3tdE37JcXxBJNDGwphCyqaKXqGpPcWlJbWITRjiRDcYbRmDEvCBwf4 J5LmVJ3f79X+Ei3s/8aMMWO4n8Ddlq3wXVhnaPMP2qhqodlo8OTqzOkPOuRSXNw0vFh4hO LgJ3gXwyZfUErcvs7BcQJ4K77udow9XLdTvoxtNqQUirVJUT+4nSFdlcO4jzQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037405; a=rsa-sha256; cv=none; b=ijZutYCbxGoIW+9A0uVGKjCbxbv+yJjCUDWrjr6fZVYRBcpem7/9UZJTSYId133/Srmv6r BHODfP0TJM8mfMlgW0S5RjgAtESX/BtXNs5fqwcTv+zsfGV8N+0cuxGEw5fpDw8GnXoQ3I pAdZad37YVavcScanjAiwgwRh/DIMsTanrHEOfXjJftzQOaFYiMuJuKQvWuZhMBlW22y8w dIjWqPjCBM4dJMYhYWY1KJPJusp1vXbsEuKkzvBtXiF0jmh6KaxklWVpiTIbSEZOfadKSi StTSs2fYIAjKhBdUVNzkoL1W2zL9Oq1LeZBGacIyGOvUijUhYfaXB1yrwsYIPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037405; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RoASV7r5l4x1PooNoWKBg2Vf8ahxhLQ0w71n1gLDieI=; b=A8Anigt++ikd9o6NdraiqpvacJvvw8l376kkw4uNn/flSXO286Del6RnGEtOSnaBuFfz7/ Da8BGcWDMbzMxMNlIA+KJiOuO8UITtYPmFOc7k6c5IJBPHuisXmHXR7eQ63fnyjFOxccXi VhVkFm0dEa3CEOnSJTSdJXo1+GiUuQnxCR6lTIq7JVCT+/90WUSQqgOXyS/RKorC/B2y7p J1uRmeqM5P+TpTQ/CDY2hw6rvLvVIerkVblpgWcYOvO/9G3zGcEzt+8SpM/W8k7euguG4j ib1iu2UhK/Pi0/XWPdXGtH45ALNVvNWp7nAURoU4VH2IQ/YoI/N74GQOcDQQRA== 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 4Rgx6P1xYWzYrv; Wed, 6 Sep 2023 21:56:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LujRt022955; Wed, 6 Sep 2023 21:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LujPm022952; Wed, 6 Sep 2023 21:56:45 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:45 GMT Message-Id: <202309062156.386LujPm022952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 202c1d762186 - stable/13 - udf: Reject read requests with an invalid length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 202c1d76218695ec094f289dbb23e96310eae2c1 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=202c1d76218695ec094f289dbb23e96310eae2c1 commit 202c1d76218695ec094f289dbb23e96310eae2c1 Author: John Baldwin AuthorDate: 2023-08-04 23:40:19 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:09 +0000 udf: Reject read requests with an invalid length - If the size is negative or if rounding it up to a multiple of the block size overflows, fail the read request with ERANGE. - While here, add a sanity check that the ICB length for the root directory is at least as long as a minimum-sized file entry. PR: 257768 Reported by: Robert Morris MFC after: 1 week Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41220 (cherry picked from commit c70e615051b00671d54651d99af5cdec4b091d92) --- sys/fs/udf/udf.h | 4 +++- sys/fs/udf/udf_vfsops.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h index 31e63f1ffb05..c8f5191546c2 100644 --- a/sys/fs/udf/udf.h +++ b/sys/fs/udf/udf.h @@ -95,8 +95,10 @@ struct ifid { MALLOC_DECLARE(M_UDFFENTRY); static __inline int -udf_readdevblks(struct udf_mnt *udfmp, int sector, int size, struct buf **bp) +udf_readdevblks(struct udf_mnt *udfmp, daddr_t sector, int size, struct buf **bp) { + if (size < 0 || size + udfmp->bmask < size) + return (ERANGE); return (RDSECTOR(udfmp->im_devvp, sector, (size + udfmp->bmask) & ~udfmp->bmask, bp)); } diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index eb9e6f3fc370..efc216bc7635 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -480,6 +480,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) */ sector = le32toh(udfmp->root_icb.loc.lb_num) + udfmp->part_start; size = le32toh(udfmp->root_icb.len); + if (size < UDF_FENTRY_SIZE) { + printf("Invalid root directory file entry length %u\n", + size); + goto bail; + } if ((error = udf_readdevblks(udfmp, sector, size, &bp)) != 0) { printf("Cannot read sector %d\n", sector); goto bail; From nobody Wed Sep 6 21:56:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6Q4nNSz4sJGd; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6Q3wXPz3bN6; Wed, 6 Sep 2023 21:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUFjpx+9RO0gGnnRFKWOgSy8rBFlbaBqD796XoKUqas=; b=FrEQ354lZjpcY0aRo+LrILwdBKnIFYTzIakonR46ERVEvs+p1x5QhwF32IXkehXmSrXmUs xwvazjjrDwuAZ2rhZ4IXwDr3nle+bnd7z7PSY5SfDU5TIyyBVX/C9u/Tf8lvSEx95h/R3p irPxEqIo/PKe7YnbAYcFuKE5MuEGuj3cTABbczyIEzn8QYoS5LCalr5kXZNkIuVmyTeA+P Uig35WxcwURfAnqYzDFVgj1BO8qkamHSrypMgS9atxm3pdtntSvceA+eFVCxGBoq2BSn1P I85nRkz4UuB80TOHGYh9SA2cxV+e7XTUdZUIISzjzYUe2FxWO17A3IW/ARw2CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037406; a=rsa-sha256; cv=none; b=jkzR/j9nTrIxPZbbg6x5PGmsb65SIQp8xwvuCLw/Wdq5d0rI45ijkAVccHHpdRd8v3IqtH KoamnFl7PlAtoqqaH17+1cvLlaxNyXq7y7V4aqo+6/t9fAZ+//QgJuu5gZbfm2STjbWEzY i7BRx/PfTwwGMIp/Z/B6jQLstev4ehxZEkJbHkUVM1tEFndoozveZdz+BRPYSv6L0IlUIg FguU7YlvT3aKpOPhXI10RHzR2TV4EdargZt2mrOO3OWtW+Pfhv7lt7TxvBWn/Kh59mqp2C WsMxl+H5n0H9bbd3vw8MdoxROnTU7rbkUFfbL+NrJzvT1scWjWvGNWN9DmpETw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037406; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gUFjpx+9RO0gGnnRFKWOgSy8rBFlbaBqD796XoKUqas=; b=ubL6BWbAwg0v1PWJhE/ZTNJMswj87ntFs/tlpKgo31akpwU0wK8u1yp9EGJprYX850jtmp H9nGkXXf6xoDX9JY5t/q91l4BfeIqEOsi8M7zgMhVsRKDR1YZb0yOFC5mxtMj7yFF9euvI 6COJ14OQjvObVJNxnfpQyMwWCzcPMc8Bud2omzGKEyZGZ5oLAHIB87IFNaKfcyAvaOifpP sQ5RMNFZp7pwHaE4vdLEwll260XGTLz7oCrtZRUrvUGzjkpeeyQgY9u+c/kVBupLZwEYjp 8L0NwUMkpR4jvrQrAfmuHIUQTMRJZJPg4Kmdo9MJk54ZJtSp2X1ViWmcGNrWgQ== 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 4Rgx6Q30kGzZ4v; Wed, 6 Sep 2023 21:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LukEb023019; Wed, 6 Sep 2023 21:56:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Luklj023016; Wed, 6 Sep 2023 21:56:46 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:46 GMT Message-Id: <202309062156.386Luklj023016@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 63f07c05de4e - stable/13 - g_raid concat: Fail requests to read beyond the end of the volume List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 63f07c05de4eed513054c5b3d1981eb4fffe5ae6 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=63f07c05de4eed513054c5b3d1981eb4fffe5ae6 commit 63f07c05de4eed513054c5b3d1981eb4fffe5ae6 Author: John Baldwin AuthorDate: 2023-08-04 23:41:05 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:10 +0000 g_raid concat: Fail requests to read beyond the end of the volume Previously a debug kernel would trigger an assertion failure if an I/O request attempted to read off the end of a concat volume, but a non-debug kernel would use an invalid sub-disk to try to complete the request eventually resulting in some sort of fault in the kernel. Instead, turn the assertions into explicit checks that fail requests beyond the end of the volume with EIO. For requests which run over the end of the volume, return a short request. PR: 257838 Reported by: Robert Morris Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41222 (cherry picked from commit 4c89c0127dcadaa0d337c23d028f3fea5e76317a) --- sys/geom/raid/tr_concat.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c index 159d1d76f688..9bdd37526d6a 100644 --- a/sys/geom/raid/tr_concat.c +++ b/sys/geom/raid/tr_concat.c @@ -238,8 +238,10 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp) offset -= vol->v_subdisks[no].sd_size; no++; } - KASSERT(no < vol->v_disks_count, - ("Request starts after volume end (%ju)", bp->bio_offset)); + if (no >= vol->v_disks_count) { + g_raid_iodone(bp, EIO); + return; + } bioq_init(&queue); do { sd = &vol->v_subdisks[no]; @@ -265,10 +267,8 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp) addr += length; offset = 0; no++; - KASSERT(no < vol->v_disks_count || remain == 0, - ("Request ends after volume end (%ju, %ju)", - bp->bio_offset, bp->bio_length)); - } while (remain > 0); + } while (remain > 0 && no < vol->v_disks_count); + bp->bio_completed = bp->bio_length - remain; while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -306,8 +306,8 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, void *virtual, offset -= vol->v_subdisks[no].sd_size; no++; } - KASSERT(no < vol->v_disks_count, - ("Request starts after volume end (%ju)", boffset)); + if (no >= vol->v_disks_count) + return (EIO); do { sd = &vol->v_subdisks[no]; length = MIN(sd->sd_size - offset, remain); @@ -319,10 +319,9 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, void *virtual, addr += length; offset = 0; no++; - KASSERT(no < vol->v_disks_count || remain == 0, - ("Request ends after volume end (%ju, %zu)", - boffset, blength)); - } while (remain > 0); + } while (remain > 0 && no < vol->v_disks_count); + if (remain > 0) + return (EIO); return (0); } @@ -338,7 +337,6 @@ g_raid_tr_iodone_concat(struct g_raid_tr_object *tr, g_destroy_bio(bp); pbp->bio_inbed++; if (pbp->bio_children == pbp->bio_inbed) { - pbp->bio_completed = pbp->bio_length; g_raid_iodone(pbp, pbp->bio_error); } } From nobody Wed Sep 6 21:56:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6R6BBWz4sJ7Y; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6R5MbQz3bsL; Wed, 6 Sep 2023 21:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wUjPHHOB0+sU4vN5pFyP6GYHNF4uIf/ZCqPZA40fUyI=; b=jbXCglgsUSqD5f4hroX9hvsYR2kmjBWvmc6/O5c5ye9fEiir3U63fUlwwHEC7nvlks1piA CgKJk/2va5SnRC8V/JekDVvXHBr+jhSkL18AjZYakMtFDRGNmyL1VC0zqjCXLqZGlys8SI BYGmN+s6K3kt1lfhuBVGd+161u83/Fd175WRc0LkzYv6YmRcTthUzpU2EC9fyVnoD/hQrT tCz9KeU3ctBlH+b3zaTeiqjC/kYF8iTCFgm/nbG93Ah1qQrzcyjKNTgcivuDK/cLizuppt iFmfHFB3gsN50+clSws7wKb9r3kakJhz6SiEf35HGwV4rgiRKpIa/ewKmpXbxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037407; a=rsa-sha256; cv=none; b=N/zEwsSGEYZL+PUnYFcYVxZXm/k4oOWA0kLdqInl8anxkwuJWHJIHTO9L5KTyuT2FUemlX NZj4LCGOdoMSUU/C+XC0T13FxWqvJRmOmvVETcAt245l3rOVdCBUApAQvjgu40He28V653 RioMOXcY71X6RaNajyGTU814lfWJjwtLZ0H73l3Z0NA/SmaCJ3ibEQ0HZkKIiD7oh7gYM3 5GkMIPqXooTrUJvNvtC3AfK5TeB1I+5PrEDYOqMhQG6EHRAU+8+iunMV/eeef81GGyyds+ 4PjqP0LkcamizNzGxK1g4H5t+4SokAOscddrhnqtINizNM4RJhNE/dPUaTc8FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037407; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wUjPHHOB0+sU4vN5pFyP6GYHNF4uIf/ZCqPZA40fUyI=; b=E9ZavlXneao4mzDGfFuV7r5Mmw2awBW3PQEBidqKTXpGpNT1j+3s8dnDYg9kHFqGrdWjHo ck6690Ogxaf6B2cVpRJrEVATcMX6l8wcxVCDgyhfNUILLku/uB+GXECGGLk8PFZO+62rQl 0a8H5Guu/RcnFQVELLXL5W6SgX8+vcSRjOIZZj7fIcnpDmgJ/iPoT3R3coCoDQ1pxwfZA5 45NB2Sec1ETbsMunE4IFi09t78K7xlu1KnrWEnrh2w5D5h84hr1TrEgRTQbBRUjUSYUYIO DapaeGTZ+O7/QIGuljA5cwSopuZSpkP/32z/TlKmMVBAxvdQ5Utz1rNTKOF+Mw== 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 4Rgx6R40qfzYvZ; Wed, 6 Sep 2023 21:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386LulWR023077; Wed, 6 Sep 2023 21:56:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lul9E023074; Wed, 6 Sep 2023 21:56:47 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:47 GMT Message-Id: <202309062156.386Lul9E023074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 983819d21799 - stable/13 - cd9660: Reject volumes with small logical block sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 983819d217999303770876885250e70a89ad2687 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=983819d217999303770876885250e70a89ad2687 commit 983819d217999303770876885250e70a89ad2687 Author: John Baldwin AuthorDate: 2023-08-04 23:41:50 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:10 +0000 cd9660: Reject volumes with small logical block sizes ISO9660 permits specifying a logical block size that is any power of 2 greater than or equal to 512. The geom disk layer requires requests to be aligned on sector boundaries of the provider. With a volume that uses a logical block size smaller than the underlying disk sector size (e.g. a logical block size of 512 or 1024 on a CD which uses 2048 byte sectors), the current cd9660 vfs can issue requests for partial sectors, or on non-sector boundaries. Fixing this properly would require wrapping all of the calls to bread*/bwrite* in cd9660 vfs to roundup requests to be on sector boundaries which can include both the length, but also the starting sector number (and thus requiring use of an offset relative to b_data in the resulting buf). These images do not seem to be common however given that no one has fixed this in cd9660's vfs in the past few decades, so just reject them during mount with an error. If such images are found to be used in the wild in practice, then the larger fix can be applied. PR: 258063 Reported by: Robert Morris Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41228 (cherry picked from commit 4af849d71f69306432941d91fa46c3c303059d63) --- sys/fs/cd9660/cd9660_vfsops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 08c0fbb78b1d..90a8996c9651 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -336,6 +336,13 @@ iso_mountfs(devvp, mp) goto out; } + if (logical_block_size < cp->provider->sectorsize) { + printf("cd9660: Unsupported logical block size %u\n", + logical_block_size); + error = EINVAL; + goto out; + } + rootp = (struct iso_directory_record *) (high_sierra? pri_sierra->root_directory_record: From nobody Wed Sep 6 21:56:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6S6JCWz4sJ32; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6S5kCwz3bqs; Wed, 6 Sep 2023 21:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P729HjTOlpUT0afTv4KKwxNZX1b5eGvDvtHnMfFQXu8=; b=TbzPFnCqa25GA4MvS4FgBZmWnE73Fequ5jUAxwVxjJYU835S0OWT8YLwx0IWS484E0ZMyz c2yh4n/JhU4RYNYQ/ioC8kCPJzTOW47mmYNUzhvHkbWvrOovogyfIDMIebxSkpQ+swUFLK OF6p6bWUDdRQdWwlb/gu6ZRCJUs1Fx62V6+yLJy4BbTPhpr/94lVuuwEzvIBdIPDFlk75G n6cKKqFTDsKxCOclGqAbW44Nz8B5KrEOtsnf/4YmdeUihdPlNG/eIauoDHXEsoBL3o+x8D 03sy1vLZs1x+0RHNTgMSoI7ImfvaNhaTk9VZntXZ+3zQ43XCtgnSscSOO1wLZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037408; a=rsa-sha256; cv=none; b=NrxX+JCYExBcunISz7XfGmHJ6HdfonOiCVA5L7kUsomddGkGOL1tyH7oUUBnQT6Q3FhXU7 MbEnFJJXId4eipGI+91Ge1M3zE81yx6LfODnfC9zOl4z0gvnI/3N9UC1Te8pEGDIzudY/7 PcN3WCbAULed2JTCwkoGm/jDQkHCCi0W2fqagIjwz8Xy9BGXIXtae9g+KjRNuP6LP/l28k YMB0ZFVIGqpUYPJjfmorK7IxcTyTYRNqWIah/Q4qaSzwgPGyQs+kJw0FXWcrJsEI1aaKY0 Cew8DbKp0Q4N6YyENASrgcjmk7vqRHnHnw0Yg4ekrCHgIRsS3u16OuFkizl8+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=1694037408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P729HjTOlpUT0afTv4KKwxNZX1b5eGvDvtHnMfFQXu8=; b=CO0ZEt7Psxk1ascCXAvBv2JdoOw1WtJ2n6TLlVEWvCiQQIH17E/Fe9uCaEI0DJDB4Q6Nve uFk6FPpM71jDCZtSyHfXQ+IjN/Hb/mFT/L8Y37czxmRG3hvxPJHOY50S0vAltXlomGdNws yJepquK4BLcZpFN85xHDyU+ib6ZNFwSVjhLja85sSr6moUf5egridEguBr9PeMyN9WPK6u Ui+2taeahtsL1SNKKZgZISrR5DZIdoRkrpbU8Ae1kxNhownn7GJESofDSYFQeQ+Wd41gF3 83IzfHE1/u1Xrda9sYflHIXfRI4GVVD3aeST1RdqnY/L5H/Ny+DTEcFY00IHjg== 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 4Rgx6S4qS0zYvb; Wed, 6 Sep 2023 21:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lumn7023125; Wed, 6 Sep 2023 21:56:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LumYJ023122; Wed, 6 Sep 2023 21:56:48 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:48 GMT Message-Id: <202309062156.386LumYJ023122@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5b8178fa46a7 - stable/13 - netsmb: Add bounds checking to smb_t2_placedata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b8178fa46a766ece29aafcceed3c3db01f51a0b Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5b8178fa46a766ece29aafcceed3c3db01f51a0b commit 5b8178fa46a766ece29aafcceed3c3db01f51a0b Author: John Baldwin AuthorDate: 2023-08-04 23:42:41 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:10 +0000 netsmb: Add bounds checking to smb_t2_placedata Verify that the requested region of the mbuf chain is not beyond the end of the chain before trimming it from the end. If it is out of bounds, fail with an error (EPROTO). While here, properly handle the case that the amount of data at the end of the chain might span more than one mbuf by using m_adj to drop the extra bytes rather than assuming m_len of the last mbuf can be adjusted directly. PR: 258504 Reported by: Robert Morris Co-authored-by: Robert Morris MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41229 (cherry picked from commit aca3d65fedffbbe71399a88d33ea8ecf550177eb) --- sys/netsmb/smb_rq.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c index b701ce5fc1a3..71f6e221ace9 100644 --- a/sys/netsmb/smb_rq.c +++ b/sys/netsmb/smb_rq.c @@ -423,12 +423,18 @@ static int smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count, struct mdchain *mdp) { - struct mbuf *m, *m0; + struct mbuf *m0; int len; + len = m_length(mtop, NULL); + if (offset + count > len) + return (EPROTO); + m0 = m_split(mtop, offset, M_WAITOK); - len = m_length(m0, &m); - m->m_len -= len - count; + if (len != offset + count) { + len -= offset + count; + m_adj(m0, -len); + } if (mdp->md_top == NULL) { md_initm(mdp, m0); } else From nobody Wed Sep 6 21:56:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6V1tzMz4sJMH; Wed, 6 Sep 2023 21:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6T6th6z3bt6; Wed, 6 Sep 2023 21:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ja+y/kOtSk0rvFdAdoStA1yxe6dRsZSfVmGzjnEV/uw=; b=lgKEcs03fWMD9HMVT6+IMpJvkdTc8/mXno/wTPpIEkLfVdiA6aKD+uTjj1938cqhrvyc+d YbP+J7iJzks3fONCCuu/jeXvk9sHml+wWei3/0Z5OKABLBMQk4/FqXY2GLbvnmJ7rwFUTp UWjylgxHvjxmGPCHQi0/rtCz2m179Q80Wfhk/4xy1s25uE/HECB6dMk4fOFJZlUEUHhfCy 77Rtab5BdnsK44peQOMFW+79/TDQvkhM8G3hRGzq65N1McaJCTDTVZH6KP+CYCzYU8/DwB 09zJtt6GkjJiKqgK8Wy7MV8gcki+2U+jfz+/khG/DfxFZfm9pYNL5cvnNs3fxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037410; a=rsa-sha256; cv=none; b=uRvdbuuV2w/vDTUPt/CO23UZn1eC+M3fuCR7gbZyoZb+wegnus83B876fdrGiK0ZxlLj2k 7dmVtArJHTckt0Dt3gVWe3YzyXIvTT7cZRjT0NL/BVZVuT+Cr9d0XE4GKz3Y/uaH86eIau eYDldExZ3+fhorIFmbDzIdt6HexLPM3mvDLOynetikFjxVAmQawkiFQwX50B9FNt1q0PKL r/0oJJGJskj5gaEfaEYXCrUqmnloDGOgKjx/bRBKvAUlsNvz7Nhsop3Mm907hYPUjkbrzC /OrPTMeileK87dTu0OSYjsOTNhPqiWo0smOEn0pUiiVRsRC4Oq9a5y00V2MHuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037410; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ja+y/kOtSk0rvFdAdoStA1yxe6dRsZSfVmGzjnEV/uw=; b=FSrydtbKGwyyZqX1Q49icF09lCKjXiXSiotT5L75wphVpKQpko3pEczaWaMCw9v3i+KH12 DeqiZ9gQWDR5yfa/r2FHvW67vdCg0ltnglFHaEVphz0K0pM0q2lPptnjnIyhZdkgDrD6zQ 8NeJ9mWpMePly0HNAbntqYSoBLsWKSD5LDL6lMeG/svRuzo4KS8ViqJdHH9tkvWvFj6LnO yEvIM4pfQOIwoIbC5y4ovBVwdMKAUI6Xy3SLt27T+QJq1HnlnaHp8jf1rbypPT1ylFzYjN iUWSyxNBy2EHOkq1s2FjVokCSZ2to9+PIobwUFewEGL2bgEP6rxImo7YSmXwhA== 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 4Rgx6T5yRCzYvc; Wed, 6 Sep 2023 21:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lunao023176; Wed, 6 Sep 2023 21:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LunRt023173; Wed, 6 Sep 2023 21:56:49 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:49 GMT Message-Id: <202309062156.386LunRt023173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c2cd285bfe41 - stable/13 - sys: Add a deprecation warning for 32-bit kernels. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c2cd285bfe41574490e5f2c11b113e5fb8536a55 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c2cd285bfe41574490e5f2c11b113e5fb8536a55 commit c2cd285bfe41574490e5f2c11b113e5fb8536a55 Author: John Baldwin AuthorDate: 2023-08-16 16:48:51 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:10 +0000 sys: Add a deprecation warning for 32-bit kernels. Per recent discussions on arch@ and at the BSDCan developer summit, we are considering removing support for 32-bit platforms (in some form) for 15.0 (at the earliest). A final decision on what will ship in 15.0 will be made closer to the release of 15.0. However, we should communicate the potential deprecation in 14.0 to provide notice to users. This commit adds a warning during boot on 32-bit kernels that they are deprecated and may be removed in 15.0. More details will be included in a followup commit to RELNOTES. Reviewed by: brooks, imp, emaste Differential Revision: https://reviews.freebsd.org/D41163 (cherry picked from commit 41582f28ddf7b42b713b270d41e8da80160b69a3) --- sys/kern/init_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 4a8dc8ac45f1..73d78ad16df3 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -386,6 +386,15 @@ SYSINIT(diagwarn2, SI_SUB_LAST, SI_ORDER_FIFTH, print_caddr_t, diag_warn); #endif +#if __SIZEOF_LONG__ == 4 +static char ilp32_warn[] = + "WARNING: 32-bit kernels are deprecated and may be removed in FreeBSD 15.0.\n"; +SYSINIT(ilp32warn, SI_SUB_COPYRIGHT, SI_ORDER_FIFTH, + print_caddr_t, ilp32_warn); +SYSINIT(ilp32warn2, SI_SUB_LAST, SI_ORDER_FIFTH, + print_caddr_t, ilp32_warn); +#endif + static int null_fetch_syscall_args(struct thread *td __unused) { From nobody Wed Sep 6 21:56:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6W1VFLz4sJMN; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6W0bfnz3btR; Wed, 6 Sep 2023 21:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=igFWaOSNZc3WpQ+qZ1wu4VO1MhcoQ6tODAiptrQuWYM=; b=NFrxdsPxRlGaZ2fcoIBH2sHhGJ34EjCda9juP3uPxwp6CT8SpgQb3DEa4vMdwhiinsNSm0 1gBiEg2zb7ELeeFhvRnuYJgsXb/NV/heaU6eKfdscBvnrZXVWwwhYIvWb84UKv3CzGHymf TRz/Tc7Y/N1+U6Bqk6/Nhe/TBtWJMJ6FzgzrLj4BpE120B/Y8lz05HBd3DgSZ3QdNg9AUd 3DUt8EAPnaRDS5zIiXDcICg48TKtjqzlrqGsZ9GWUj6ySF+NS/6Q8lqw1QVN5EXQvE+2Lx ZhismxT+9WulwAnPlH/8th4sKzX1adxECe/qKTSepMGm9IcEKxasZrJ176YOLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037411; a=rsa-sha256; cv=none; b=yswunDKgOoyILLBOlnLomDH7S5PhkDY2NKQ9kw+DprteUke38PRyiHVIUcwSvLd3oFdF5X d36Y6pDOitqD0ySznCfNQ9Jiv+Geu5tc7Wksc+wKdnwAaQSEGhsTBAjnySIcXj35Z4h0Fx QZUUrIzkxg/5ZOWigNr4ONKbowub6IU0A4tqxRa2e8djwXfI3ZN6vt0Pbw9/nRw/d6bzp2 MepcQL66Iej7nDpruAMewCzqpp2xZS+CTc4thX0KWFHQ3g1CaJS9PzRrKb42qFVusAu6Gk qaTC1Prui938PtyQ24dLJbyTWGMA2JUU/rahAMigpgkZp+stKyx3tTN+8XadyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=igFWaOSNZc3WpQ+qZ1wu4VO1MhcoQ6tODAiptrQuWYM=; b=kcvymTOzR6TTFQgd7YDbxRxVIJqWoQFtgSzftIkqW3teLhIR5BuF6YHS/LHglGQq0tv88w xu2Clm/k1MmCYjyAwj1zq4cnNcnCa25U92jch3cGAPKeAxjRSxmjd6MU3XwnioepWwiRRH f1lz7UX8kmu4ED3yzs8ooBegtBD759AGM5KiOdNgZZEFNa9KTsvd+XOcBqYqlmsoC69eip bg0XuOmAE7uDeYKYdH3lIEeYrLu2cpCK0M3//CpGdyrFyozw8Kwy3f60maSXdjYKUbXGgh HEjfOwCNAoQP2GlTxCTkofSHSvBKZgPJdVckknsXMrMTAQ6v5fhl/vHF3vNSjw== 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 4Rgx6V6nmlzYvd; Wed, 6 Sep 2023 21:56:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Luowi023236; Wed, 6 Sep 2023 21:56:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LuoKG023233; Wed, 6 Sep 2023 21:56:50 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:50 GMT Message-Id: <202309062156.386LuoKG023233@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a11b9463ff58 - stable/13 - bhyve: Store the FreeBSD OUI in little-endian in the controller data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a11b9463ff582a3ec95d85ddecf930c5a84bee2a Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a11b9463ff582a3ec95d85ddecf930c5a84bee2a commit a11b9463ff582a3ec95d85ddecf930c5a84bee2a Author: John Baldwin AuthorDate: 2023-08-17 18:30:50 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:10 +0000 bhyve: Store the FreeBSD OUI in little-endian in the controller data Section 7.10.3 of the NVME 1.4b specification states that the IEEE OUI in the identify controller structure is stored in little-endian format (unlike the embedded OUI in EUI64 identifiers). Reviewed by: corvink, chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41487 (cherry picked from commit 18974bd616ae141c8721b8b01eb634670f5ccd56) --- usr.sbin/bhyve/pci_nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 2a4ce332fd1a..073b37d4d6d9 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -527,9 +527,9 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->rab = 4; /* FreeBSD OUI */ - cd->ieee[0] = 0x58; + cd->ieee[0] = 0xfc; cd->ieee[1] = 0x9c; - cd->ieee[2] = 0xfc; + cd->ieee[2] = 0x58; cd->mic = 0; From nobody Wed Sep 6 21:56:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6X2b08z4sJ7r; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6X20hGz3bpb; Wed, 6 Sep 2023 21:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfOMwzV9WVkBfhlFbqLYo+ISRhlotdolTDTu8jjoXw8=; b=P5utrUwgkNvVEuE08452c8Wja3nPvHcnqVLZO+GkvdWaRZ55/qRAvn0+c0ediWJ14ZL/BU MJ4TLLBxLN4pW5EinwCSUGHHobNe1mBlXiYOtG3Du4xIdaAj3Rp/VjX9GVmNSVaVcTiKA9 0hDkrslvBvCJGW0nFVPkRdDucHgNBO0JL03DeyIfc95xOOniOCFWetDdVBqM5ffcGWz3Lv 8qTDH3tpe5ds9KLGNxki+fm0Uvdp65/AsNp4pq1t0PwW4x13AquK1MkyDqqocs9l2wuOTL x1YjpdFCaaApi+QLY9U/6Xd7aQ8ARX0HcjVjU4Js1LCZEnvJ8L41DOWdtXUl6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037412; a=rsa-sha256; cv=none; b=pYjjeJAI8Wa5/bnNEFaFea83milcOQH97FlZwBTWkse85eM9Uk+WYoSZzWuY2WLEw9x6SB RhfQ2LCt9VCD6VlMLnNk4oC7XoASGdOyxBr20Wk8BSYUX07kLfkzJGtLCIF5SrAnOBiwjQ y+YZ+ZSS6MWPQAlccCugdZhEdKTAJdVWyVH0+KEmL5PDuqQZgh/XdFtAMYCu1qzcAT5HLb kiTNOtFZtufscHJCUH9JNCWw8T5GxOjBe8HbkufXzfA6LFvdH8wyLQ1V0Pdb2OQ+/f7gnB ZD23sGRT+IgYTQVWpruo7iwdYS3FacHlZTKOUG5TQi7pQCkGIz2yh4KF9mFrqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfOMwzV9WVkBfhlFbqLYo+ISRhlotdolTDTu8jjoXw8=; b=S41/K/sM8cfZQ0vFMyb0BCZhHnD18CVSUcVcya/5CFfPtHWvCnorN4wTwkKtMecZHSEsZQ TAXPZ1yymZdC3JzMYvQYmLpaDi+kYu79cwXBG/TpQ8HKRnJZwEPxVbLjtLdBDcOHL5ZxwV lnZHr4sX7IatGbHgmRCBUphGZaLh4fTLd3Sva0uQIdftlGuO31qbuK41XlPrnWR3pVxCp0 uBJzMfoW8bAGm6vVIfTQQB6HCnqs6T+L8MnoNykn3xlnDxUJjsm2RNWA1hO+7VSoKSxuYC tskh4ha9MrZHCYw2sT98aefPbCMjm26Nps3aOa9mcbjI1ZQy9J1DKrCjtQ5k5w== 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 4Rgx6X14JrzZ8r; Wed, 6 Sep 2023 21:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Luqul023281; Wed, 6 Sep 2023 21:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LuqOL023278; Wed, 6 Sep 2023 21:56:52 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:52 GMT Message-Id: <202309062156.386LuqOL023278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5fd4a966624f - stable/13 - pcm: Turn SND_DECLARE_FILE into a no-op. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5fd4a966624f43171d25aa3031b1c5eb644ceb76 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5fd4a966624f43171d25aa3031b1c5eb644ceb76 commit 5fd4a966624f43171d25aa3031b1c5eb644ceb76 Author: John Baldwin AuthorDate: 2023-08-18 20:04:33 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:10 +0000 pcm: Turn SND_DECLARE_FILE into a no-op. SND_DECLARE_FILE originally added lines to the output of /dev/sndstat listing the $FreeBSD$ strings for individual files, but only if the value of hw.snd.verbose was raised to 3. With the switch to Git these strings became meaningless as they were now all identical and no longer contained the path (which was implicitly included previously via the keyword expansion). This commit removes all of the infrastructure to support file version strings from /dev/sndstat, but preserves the KPI/KBI by turning the SND_DECLARE_FILE macro into a nop and changing the backing sysinit functions into null functions and is suitable for merging to stable/13. A future commit will remove SND_DECLARE_FILE entirely. Reviewed by: kbowling, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41498 (cherry picked from commit cbe53bd975b7fa05eb5165c5d6bbcb7b4b37407f) --- sys/dev/sound/pcm/sndstat.c | 65 ++++++++++----------------------------------- sys/dev/sound/pcm/sound.h | 15 +++-------- 2 files changed, 17 insertions(+), 63 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 4ee73c176909..c227c8adce99 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -38,7 +38,6 @@ SND_DECLARE_FILE(""); -#define SS_TYPE_MODULE 0 #define SS_TYPE_PCM 1 #define SS_TYPE_MIDI 2 #define SS_TYPE_SEQUENCER 3 @@ -240,21 +239,16 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler) const char *devtype; int type, unit; - if (dev) { - unit = device_get_unit(dev); - devtype = device_get_name(dev); - if (!strcmp(devtype, "pcm")) - type = SS_TYPE_PCM; - else if (!strcmp(devtype, "midi")) - type = SS_TYPE_MIDI; - else if (!strcmp(devtype, "sequencer")) - type = SS_TYPE_SEQUENCER; - else - return (EINVAL); - } else { - type = SS_TYPE_MODULE; - unit = -1; - } + unit = device_get_unit(dev); + devtype = device_get_name(dev); + if (!strcmp(devtype, "pcm")) + type = SS_TYPE_PCM; + else if (!strcmp(devtype, "midi")) + type = SS_TYPE_MIDI; + else if (!strcmp(devtype, "sequencer")) + type = SS_TYPE_SEQUENCER; + else + return (EINVAL); ent = malloc(sizeof *ent, M_DEVBUF, M_WAITOK | M_ZERO); ent->dev = dev; @@ -285,10 +279,9 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler) return (0); } -int -sndstat_registerfile(char *str) +void +sndstat_registerfile(void *dummy __unused) { - return (sndstat_register(NULL, str, NULL)); } int @@ -311,24 +304,9 @@ sndstat_unregister(device_t dev) return (error); } -int -sndstat_unregisterfile(char *str) +void +sndstat_unregisterfile(void *dummy __unused) { - struct sndstat_entry *ent; - int error = ENXIO; - - SNDSTAT_LOCK(); - TAILQ_FOREACH(ent, &sndstat_devlist, link) { - if (ent->dev == NULL && ent->str == str) { - TAILQ_REMOVE(&sndstat_devlist, ent, link); - free(ent, M_DEVBUF); - error = 0; - break; - } - } - SNDSTAT_UNLOCK(); - - return (error); } /************************************************************************/ @@ -354,8 +332,6 @@ sndstat_prepare(struct sndstat_file *pf_self) /* generate list of installed devices */ k = 0; TAILQ_FOREACH(ent, &sndstat_devlist, link) { - if (ent->dev == NULL) - continue; d = device_get_softc(ent->dev); if (!PCM_REGISTERED(d)) continue; @@ -391,19 +367,6 @@ sndstat_prepare(struct sndstat_file *pf_self) if (k == 0) sbuf_printf(s, "No devices installed from userspace.\n"); - /* append any file versions */ - if (snd_verbose >= 3) { - k = 0; - TAILQ_FOREACH(ent, &sndstat_devlist, link) { - if (ent->dev == NULL && ent->str != NULL) { - if (!k++) - sbuf_printf(s, "\nFile Versions:\n"); - sbuf_printf(s, "%s\n", ent->str); - } - } - if (k == 0) - sbuf_printf(s, "\nNo file versions.\n"); - } sbuf_finish(s); return (sbuf_len(s)); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index cbcf0a1312eb..ffb71aec6716 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -346,20 +346,11 @@ void snd_mtxassert(void *m); typedef int (*sndstat_handler)(struct sbuf *s, device_t dev, int verbose); int sndstat_register(device_t dev, char *str, sndstat_handler handler); -int sndstat_registerfile(char *str); +void sndstat_registerfile(void *); int sndstat_unregister(device_t dev); -int sndstat_unregisterfile(char *str); +void sndstat_unregisterfile(void *); -#define SND_DECLARE_FILE(version) \ - _SND_DECLARE_FILE(__LINE__, version) - -#define _SND_DECLARE_FILE(uniq, version) \ - __SND_DECLARE_FILE(uniq, version) - -#define __SND_DECLARE_FILE(uniq, version) \ - static char sndstat_vinfo[] = version; \ - SYSINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_registerfile, sndstat_vinfo); \ - SYSUNINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_unregisterfile, sndstat_vinfo); +#define SND_DECLARE_FILE(version) /* usage of flags in device config entry (config file) */ #define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */ From nobody Wed Sep 6 21:56:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6Y42Cqz4sJNw; Wed, 6 Sep 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6Y35QZz3c7Q; Wed, 6 Sep 2023 21:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2dbDbFyqr+puIWcdg3363522zM2pDFIfu/jnM2bunpE=; b=APt2UsfFSrFI2Z4dPBPcURIprcyJyWf2ZDjv5NizF7AuIYDOplQPXHo1gN7wa/yxhVqZId HvdH/mI1dpC3tJLlWKu4m6YDUYN7o9egO4UI7Q9umYUVZ7biWdLkoOaj/qCt1jFw3Rcgp1 bxzbF38dX7kUNw9xc/9vriTB8gje91gvbMBppflSJ3NcjgCgomQW0lWhDk3Qiwh1mgg0IN 8hlqQFYfACCopu0nuqzYyn8Xp+M/3B3eE0yxFcSR9IG8qcuGZ8KK7Lanr3+u7BhFjJZUFC bYc97HV2Z9jbt9s/sWsXKjzUI4Xz5PxO8sU6ASvdnJzOA/Pry86WnAvm6GdTUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037413; a=rsa-sha256; cv=none; b=nYuw0UdxuiUAjMIsJxwJJA7Euh5k6IpDsvWorjpPZgG22JoajyZn6bXA2WLmhdST4VlYOf e4S5zFQMrKEmDIkNwsWgPLvwfF8TM9tJMj/3AymF/i/gtH21zxBglbDhTbxg0lNu9ggb5t yn2a6DIvAJm2PebxYDw9qnpg4J14JAFmZ7DEPhdbaTxTE6RfBuIco9HL22mO5bGI+6XSiz 9LgBmkLpeLnXH5rQSRjvy5utPpTC9mG0wE3Ls/Gkhrh1Qy7d5D16i0OK9paHLOXsARwXh0 QGw1IvWWAgQS3Ap4u00zZ6lok8B5BpPQESUEz2rmfLc0Ty5VV6HH2CxGTD9oow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2dbDbFyqr+puIWcdg3363522zM2pDFIfu/jnM2bunpE=; b=KSd9MIgoM8k5l/FzxsPVDRdQ5qMTjyvvY+FQZEVl32XUDWQrezydV0gG+JxrrU+PyUfPnb 4dWNcOJ72wk7zUXcxytA5lXfktzsijBOihdmuL3h7TZgw8dJptGXJoRlHNE7e50opT6R/Y byJN5Swlj2piKB07HKJkHJkUyRNGcIx0uioXDGql82YNnDRMvxGi4/E/mQQNZNtGZO18yi PN+Dg3VT+MA178rAiAD5lwF0Af/LRpfgGGGrErtcGdOJHQwk7VGfTjq1yqWYg4covyxeaY ngA8pGUdiebe2b3xMTRan5NmqvbxZ0r2axVA7tJsSqlD5HQXToxqTliJdl6Yfg== 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 4Rgx6Y2BTfzZ8s; Wed, 6 Sep 2023 21:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lur5H023332; Wed, 6 Sep 2023 21:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386LurRC023329; Wed, 6 Sep 2023 21:56:53 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:56:53 GMT Message-Id: <202309062156.386LurRC023329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: cd81ea62ff7c - stable/13 - cxgbe ddp: Trim stale function prototype List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd81ea62ff7cd20689e3fef110964cd8c114ac0e Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cd81ea62ff7cd20689e3fef110964cd8c114ac0e commit cd81ea62ff7cd20689e3fef110964cd8c114ac0e Author: John Baldwin AuthorDate: 2023-08-23 21:29:02 +0000 Commit: John Baldwin CommitDate: 2023-09-06 21:56:10 +0000 cxgbe ddp: Trim stale function prototype Sponsored by: Chelsio Communications (cherry picked from commit 0677f5ccbb5befcd535d200c45c5fa71f9082cbf) --- sys/dev/cxgbe/tom/t4_tom.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tom.h b/sys/dev/cxgbe/tom/t4_tom.h index 76e6b689339a..2fa218c1a717 100644 --- a/sys/dev/cxgbe/tom/t4_tom.h +++ b/sys/dev/cxgbe/tom/t4_tom.h @@ -502,8 +502,6 @@ int t4_write_page_pods_for_buf(struct adapter *, struct toepcb *, int t4_write_page_pods_for_sgl(struct adapter *, struct toepcb *, struct ppod_reservation *, struct ctl_sg_entry *, int, int, struct mbufq *); void t4_free_page_pods(struct ppod_reservation *); -int t4_soreceive_ddp(struct socket *, struct sockaddr **, struct uio *, - struct mbuf **, struct mbuf **, int *); int t4_aio_queue_ddp(struct socket *, struct kaiocb *); void t4_ddp_mod_load(void); void t4_ddp_mod_unload(void); From nobody Wed Sep 6 21:57:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6h6gQQz4sJ84; Wed, 6 Sep 2023 21:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6h5Lltz3cQy; Wed, 6 Sep 2023 21:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ld1Ap1Zh2PtfsLiQr+QRx8mKf54uFlczrF4/gRjwVOc=; b=ROw7e9Wy+eucLgVqZANkTBpYW+vzyoSJBzU1p+MrkLN8vdRaUJ53zfrhVkHp0WcVn1X4HU EHjhTvK9jESyi+YaSX8tecGZ/UrxFLujNeUSmYEVpyJPRGhx0tiFncjdRcWsdKL9nrzvFT tPs/i9d7O//sUuGQCfVUrMJf7X1VGxp0hG5zhul8mmOlfbcV4sxrye2Cnkap92Vo6jJzTn fw5/4lylpU9WVnsfCxo7oKPMUlJBsA9Z5z5M48sQM6NT5octBdh3iGHbiljK10sr0c3jOO CuAVDsMTcwhyyKN74+fPpSJ4xgQUdE9ACCfMKKvrk9oUTFCI/owdPOZspKc1rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037420; a=rsa-sha256; cv=none; b=F2T/cVixjugTArhAvDYxXA8hLdW+TtB6z0xGrcb72tXzdT7L/d1DY2Z55CbFDTjU2cUXhn ZBPT5WvTeynluVYbvl6qaOcwlsPdBgfP1n9+IDAurSYT6HXzs6dsq0epuJ+xBWVSAQtydK cbeKT/sReNutDvmP3gHQAVmMsj0i2N7zCMm/hN72kNbWYgSTLE+2nQaIACQne+liO/LQS6 QFc9vclXPg/rpHwGL+AzuQF419MhnMUsSE5xAQWNrWLAPrO/RMIaNJpqbl3+lHQfLt9Xqp ns1k9vXckIJYfGYsNN9NriiU8s2CSX6plpwdmociIZ1b4jNUiuhMfjSJ5P09+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=1694037420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ld1Ap1Zh2PtfsLiQr+QRx8mKf54uFlczrF4/gRjwVOc=; b=OQrToXkQCR6fy8OY2RvgPBtWbYjdYmF8HnkTaseibsQFIB2P/Br7OTK3TFMS+cJ8tJoF0U AEA+rcOnkuKWd0LFqxmFScAf3sl5wpqu9A3ka4abih7zPbHE/tWRRnZcQEYa/VfgZ3JjpJ PhdT7+DI5uFTSgWDDSe2ggLz//g4n2EA7Otx3C8WlGLMyhBBvIbVKmt7NCS43s16lqJfDY h7Ti8JsWNvG7Ksj6Croe86nCtlRpJ3ztZ5CmUKwyauk3NjGoQW61ycoMfWQ3umzh0yGd33 4Oa7OVjMwNneWA/b4S4AxwcL+TsThNZz9a6L3z/+sqPBf5u58TcMIZbTaZyu5w== 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 4Rgx6h4Q44zZ4w; Wed, 6 Sep 2023 21:57:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lv0Ng023622; Wed, 6 Sep 2023 21:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lv08g023619; Wed, 6 Sep 2023 21:57:00 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:57:00 GMT Message-Id: <202309062157.386Lv08g023619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f9c32827759b - stable/12 - libpfctl: Don't pass stack garbage to free. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f9c32827759b2e1dda97d91f69d70673f5c9393b Auto-Submitted: auto-generated The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f9c32827759b2e1dda97d91f69d70673f5c9393b commit f9c32827759b2e1dda97d91f69d70673f5c9393b Author: John Baldwin AuthorDate: 2023-03-22 19:33:59 +0000 Commit: John Baldwin CommitDate: 2023-09-06 20:02:00 +0000 libpfctl: Don't pass stack garbage to free. GCC 9 on stable/12 reports a -Wmaybe-uninitialized error for the call to free in _pfctl_clear_states. Reviewed by: mjg Differential Revision: https://reviews.freebsd.org/D39198 (cherry picked from commit 48c519be0e8005aedc817b1bc1101ad32b67a67a) --- lib/libpfctl/libpfctl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index a095cdd1e54b..8917ee166473 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -923,7 +923,6 @@ static int _pfctl_clear_states(int dev, const struct pfctl_kill *kill, unsigned int *killed, uint64_t ioctlval) { - struct pfioc_nv nv; nvlist_t *nvl; int ret; @@ -946,7 +945,6 @@ _pfctl_clear_states(int dev, const struct pfctl_kill *kill, *killed = nvlist_get_number(nvl, "killed"); nvlist_destroy(nvl); - free(nv.data); return (ret); } From nobody Wed Sep 6 21:57:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6j75P2z4sJPB; Wed, 6 Sep 2023 21:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6j6LV6z3ccW; Wed, 6 Sep 2023 21:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VMfFO796Z/cj4bOlXVfxPil3Suyp0zvuRpbX0jKndo=; b=tF7C4g4NBPozf1jG4SkOCi8nCHMI5T8ASRBxDLK16rciETyHaGaZPmlkySnq7CKp5dHhGn biwNZ/nEHU2Jf0AsOMDI8Vg8CsJVjYt0Y9/esqMYqDLivfnqaiqcd6PCVZZVwMPsq+OrfQ JvuGkpFC25Y5ApBGZQ5UOTShLdtcsZeYlTN+sp/jVsP7kEMSaMn1a3Em2yyOncrU3Fj+IG iG4I9iqFxaG1nJutuA5wMo76bey0oH3y16uRXAHFhMR6JkqXo8qBbKCxlSP3QF5qRYJqtN PFg0WNLPsDuLN5R/enRy/TA+Er7ULNctzgREOJuCd/fJ3bo/LLgVyTanB44XKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037421; a=rsa-sha256; cv=none; b=lEQhDvu649HRbqT4flSvSmcfJI0ecjcJzqOhQBKoo6SuipLBZphrOTq4ohNAqHs+q0XLnH nP79O0RHmA4/7qjz+097Nb74SP4lxHh0pZ1rhtvFhMbkPlaY5P7UsNxSz5YMjh0NFtI3r4 MpvmrxmrMSoJhekIqI0qGCQ1dtMAWBAek+JoZdfqzQXCv9z1b4FtqQCX/5xoYIKlA6Ux0b mDWLdaHRXiFMgdarc9NWULrhsrwl9fufb0z8s9oSA3Q3v7bJz8KgOCA8zp7NGfEUiqRuep whPIM0c9RlY+3LBKNFId+L1aYyf8ofK1dNaix5RPMCk1QH4N4tzwtAgjJ/c3xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VMfFO796Z/cj4bOlXVfxPil3Suyp0zvuRpbX0jKndo=; b=a3jf+Bx6s0M7+I3Q5Fb4fewAudCrvgGevLelwerUUkEq65Krgc6HAFX5P3fLVndb+7weYj mJKQPXVze2Bzpq81zbM1LoYZcLPx8nfi8NW5m6Vst1QBT3JZC+W7/ZYN6AqXP6OGDKv3e1 +8WDHoKxT+dTYqGsQ+UvORYwEbddbdmegZhjQANF/xkI66/U5t1rOKrupxz9jNRcD557Xu 9H2Anwii29Eu7VxlAfM1p9N9K95j22H+i0cKiwPlzMpGS3bF0WQnA/1Slxzup+Ntuq+Ymp CazcJb2Ez1ExU3QVv/QPxv3lgM2ipVKdmUFk7enYX1+Ko3xg+Qbash/2sObs4Q== 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 4Rgx6j5DCMzZ6J; Wed, 6 Sep 2023 21:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lv1Ub023673; Wed, 6 Sep 2023 21:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lv1Nm023670; Wed, 6 Sep 2023 21:57:01 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:57:01 GMT Message-Id: <202309062157.386Lv1Nm023670@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0db7f4b419db - stable/12 - udf: Reject read requests with an invalid length List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0db7f4b419dbaa2c23a737393d35564cd0b2f35a Auto-Submitted: auto-generated The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0db7f4b419dbaa2c23a737393d35564cd0b2f35a commit 0db7f4b419dbaa2c23a737393d35564cd0b2f35a Author: John Baldwin AuthorDate: 2023-08-04 23:40:19 +0000 Commit: John Baldwin CommitDate: 2023-09-06 20:02:33 +0000 udf: Reject read requests with an invalid length - If the size is negative or if rounding it up to a multiple of the block size overflows, fail the read request with ERANGE. - While here, add a sanity check that the ICB length for the root directory is at least as long as a minimum-sized file entry. PR: 257768 Reported by: Robert Morris MFC after: 1 week Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41220 (cherry picked from commit c70e615051b00671d54651d99af5cdec4b091d92) --- sys/fs/udf/udf.h | 4 +++- sys/fs/udf/udf_vfsops.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h index 33bf4539c41b..507c75692433 100644 --- a/sys/fs/udf/udf.h +++ b/sys/fs/udf/udf.h @@ -97,8 +97,10 @@ struct ifid { MALLOC_DECLARE(M_UDFFENTRY); static __inline int -udf_readdevblks(struct udf_mnt *udfmp, int sector, int size, struct buf **bp) +udf_readdevblks(struct udf_mnt *udfmp, daddr_t sector, int size, struct buf **bp) { + if (size < 0 || size + udfmp->bmask < size) + return (ERANGE); return (RDSECTOR(udfmp->im_devvp, sector, (size + udfmp->bmask) & ~udfmp->bmask, bp)); } diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c index af249e91ed9d..0e450da83808 100644 --- a/sys/fs/udf/udf_vfsops.c +++ b/sys/fs/udf/udf_vfsops.c @@ -478,6 +478,11 @@ udf_mountfs(struct vnode *devvp, struct mount *mp) */ sector = le32toh(udfmp->root_icb.loc.lb_num) + udfmp->part_start; size = le32toh(udfmp->root_icb.len); + if (size < UDF_FENTRY_SIZE) { + printf("Invalid root directory file entry length %u\n", + size); + goto bail; + } if ((error = udf_readdevblks(udfmp, sector, size, &bp)) != 0) { printf("Cannot read sector %d\n", sector); goto bail; From nobody Wed Sep 6 21:57:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6l0Z6Vz4sJKq; Wed, 6 Sep 2023 21:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6k70Gvz3cS7; Wed, 6 Sep 2023 21:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkVUFwTIE1/Q4g9HxHzOSon26LUEnsv4so5/eXG7Itg=; b=HYtfnacvNSsOnXfL/zpXerKJHEo7pw2ywErvrCZ0RzDbiaFDy7uBZU42TjVQ4Zr2Sx52Vo pAf5mgViDIt435nuXGfwu6HUkdSprPCGAWnut8fSFn+gLJAPgy/Kl59Gi5mFdTlWIZlZdi JnMhMbt5hdnK2yhFYo6FK1DKRoMrReWl5WfsJOoKDudfOVlhk3b+Irfy74rR1uhjNRA3ZJ 6BGfhg1uLOnShHrLLHo+D2SO2N84RPlQ+BY4mPNG3Z3H+2M+SgY1iPbU7nYP4I3kxvpnY8 Znia78rDuhPzSlkwlpxG0mVvNLrgzCgtqIjzdwi9U6Kfd6XUNpqnBMgXQ9ng5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037423; a=rsa-sha256; cv=none; b=h3r6gHrISitAN8UY5bpmilc2OpzP0Pv9/c9McIo6prZdzVz94KFeK7bvAaXkN49n05oKFR pjhxLBfxKsjENLKC7QfkDIp02OUA2Yno4DqXgd2TsozVUQePB8IxyMwGu3vp1Y82n3cSV6 NfQczf+Yqlibo2xIBcPI418eDKQJWQaBOJrlFgxGqc5pimgQx6/85so66C5nlJuu0tZ6M+ m2cXvgkpQul+Wr4Fm+Jx8gTgovt70Upjar3H+jYuPOvGJycLNkJDIGhRXRpZKn65wgg2s8 kwYrP1B/80m4eayXg6fJhDvcrLigui+PkV2hjmEmGwtrEnN/ihPG+/7MnbMWPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pkVUFwTIE1/Q4g9HxHzOSon26LUEnsv4so5/eXG7Itg=; b=fRh+TZLX36FtRB3WYwvGVM438QarJWr57XmeM086acYVcfqHmlWLLZUu2oTzJ7GKR0xVP8 iZ7UIdgfZu65eIbMB/Jgh9/kwcLKjfWPdhVMJ12NPaVUks6OMbsED65kdRDG1+8mALr1ix dG9Lxy2D0zkVKZ3B8fZ2Snpn7yCkCwbKSqQ2TArN5iSekJzpiVZtVZyV16L1hfWoEwHpiU YvUHK7EjBLvYaWb0+EoBq9BPy453Z9/Be0Gk5e4k/1DWuJrJkXQaKt9ZxCnHyAY2lH3CmI +jgn8PK3CrQMngE+fJ/uj/RTzVPxgqryBNJkzbHtwt/tqDWlo/YBJL8rQIgRkA== 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 4Rgx6k65WpzYrw; Wed, 6 Sep 2023 21:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lv2lk023736; Wed, 6 Sep 2023 21:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lv2gr023733; Wed, 6 Sep 2023 21:57:02 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:57:02 GMT Message-Id: <202309062157.386Lv2gr023733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0f6ffc7ff301 - stable/12 - g_raid concat: Fail requests to read beyond the end of the volume List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0f6ffc7ff3018d54857c361d251d0c89ab88ec0e Auto-Submitted: auto-generated The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0f6ffc7ff3018d54857c361d251d0c89ab88ec0e commit 0f6ffc7ff3018d54857c361d251d0c89ab88ec0e Author: John Baldwin AuthorDate: 2023-08-04 23:41:05 +0000 Commit: John Baldwin CommitDate: 2023-09-06 20:02:51 +0000 g_raid concat: Fail requests to read beyond the end of the volume Previously a debug kernel would trigger an assertion failure if an I/O request attempted to read off the end of a concat volume, but a non-debug kernel would use an invalid sub-disk to try to complete the request eventually resulting in some sort of fault in the kernel. Instead, turn the assertions into explicit checks that fail requests beyond the end of the volume with EIO. For requests which run over the end of the volume, return a short request. PR: 257838 Reported by: Robert Morris Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41222 (cherry picked from commit 4c89c0127dcadaa0d337c23d028f3fea5e76317a) --- sys/geom/raid/tr_concat.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c index 97d7111fe801..1e9a803b2054 100644 --- a/sys/geom/raid/tr_concat.c +++ b/sys/geom/raid/tr_concat.c @@ -240,8 +240,10 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp) offset -= vol->v_subdisks[no].sd_size; no++; } - KASSERT(no < vol->v_disks_count, - ("Request starts after volume end (%ju)", bp->bio_offset)); + if (no >= vol->v_disks_count) { + g_raid_iodone(bp, EIO); + return; + } bioq_init(&queue); do { sd = &vol->v_subdisks[no]; @@ -267,10 +269,8 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp) addr += length; offset = 0; no++; - KASSERT(no < vol->v_disks_count || remain == 0, - ("Request ends after volume end (%ju, %ju)", - bp->bio_offset, bp->bio_length)); - } while (remain > 0); + } while (remain > 0 && no < vol->v_disks_count); + bp->bio_completed = bp->bio_length - remain; while ((cbp = bioq_takefirst(&queue)) != NULL) { sd = cbp->bio_caller1; cbp->bio_caller1 = NULL; @@ -308,8 +308,8 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, offset -= vol->v_subdisks[no].sd_size; no++; } - KASSERT(no < vol->v_disks_count, - ("Request starts after volume end (%ju)", boffset)); + if (no >= vol->v_disks_count) + return (EIO); do { sd = &vol->v_subdisks[no]; length = MIN(sd->sd_size - offset, remain); @@ -321,10 +321,9 @@ g_raid_tr_kerneldump_concat(struct g_raid_tr_object *tr, addr += length; offset = 0; no++; - KASSERT(no < vol->v_disks_count || remain == 0, - ("Request ends after volume end (%ju, %zu)", - boffset, blength)); - } while (remain > 0); + } while (remain > 0 && no < vol->v_disks_count); + if (remain > 0) + return (EIO); return (0); } @@ -340,7 +339,6 @@ g_raid_tr_iodone_concat(struct g_raid_tr_object *tr, g_destroy_bio(bp); pbp->bio_inbed++; if (pbp->bio_children == pbp->bio_inbed) { - pbp->bio_completed = pbp->bio_length; g_raid_iodone(pbp, pbp->bio_error); } } From nobody Wed Sep 6 21:57:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6m3JcHz4sJTv; Wed, 6 Sep 2023 21:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6m0tltz3cft; Wed, 6 Sep 2023 21:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QCXy6MrhcDg8im6dxQmA8oc1vBq5DLr0XeRvFqNYe2Q=; b=I/NpIOIZqAEVghyT6JaXaKvhOSpW2MPjXltrz9anlbBrgj55cq0U2/50NSGkCybN+PoejA XE/iTV+kx2baVo8YPujKMGdiH6aZNARzZ1PrxFsv0ri/Cd2/u6AfoWibD1BQ1H1v2j44F0 s1t/u8UHHtsce/E0ba2rgOO9lioqcgC93Q+f54kioG9Vcbf0gl4b834PfXcDH3ezB9NdcJ L3OC5AA5nWzAn1QdxrRfbNMWOsEvqrBgcJ5TgE3WwErD+nrbjcCb+MVqrGD592X1DpT/Ns Wa78VhVHiZLqJr+ccvjfk2/8syzNJDthyGJ3p1rR8d68dT9L5W+C74jnHYYtuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037424; a=rsa-sha256; cv=none; b=WXf1kA2DNJgLKOSbVwKOuQzJSv/tjL8VYdJYaktbPtrFK0Ue6blwCLQJ4KUJsMBtzzqFNh U9znHM/I/bURO5y94fwg78bAS96nX/Li/hbg+6BJnUhCCUfeKTHc44bgse4KbHIkCMnyMw 07uwhTyTSbV/jXoJ8mfe1PIJ/WtyfZV4aGqtshrxO8nO1v5lk/dcQ7eAAx860KDl2+plRI VUzTZvnlBjfvZv4Rd+AlEqAKd/eRQ8mYpe/Kr0UN321L1wF9v4QDnuPyxwODHy9aD17XNQ 2vSBd44R1nQhanyYEjHHp0WepJR+d6rrYcbWKYoHjkNY2/rGwkBJSIWd/lPfqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QCXy6MrhcDg8im6dxQmA8oc1vBq5DLr0XeRvFqNYe2Q=; b=Www01zJGA5sC9Q71I7mULpTZQi7w0wG/h0Df+wSTHvl0Wm1SUcrHDg0qXyNkcgLz21wbbR Y6DCnHaFkjLsdbEs31IuW5suaV72DU+c8jyz1+2KJyMqGSNUTF0BG4VUaE2woSJLIjT4Qf zTxrGaY8fDlHHmxVfvKAIED0ppT4kkn4vfQ2xs9RiFBpJNJOtfmZ1rcRCLJlcKsLOjZDYL pDbUiPgNzYzF2c7SOTezOVrQg1piORXeFu6FEW229MvVhEa4JRD7wBLbBrMP+UAB178bCY txTW5EuCyKMGQ8klIZPXiA2GqogssdvQJCPpVzl2KtRs3c1Q8pnMOd2PQwRxSg== 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 4Rgx6m00LvzZ6K; Wed, 6 Sep 2023 21:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lv3il023797; Wed, 6 Sep 2023 21:57:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lv3N1023794; Wed, 6 Sep 2023 21:57:03 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:57:03 GMT Message-Id: <202309062157.386Lv3N1023794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 16f142865cb8 - stable/12 - cd9660: Reject volumes with small logical block sizes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 16f142865cb8190c733271969aa243a2fc934093 Auto-Submitted: auto-generated The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=16f142865cb8190c733271969aa243a2fc934093 commit 16f142865cb8190c733271969aa243a2fc934093 Author: John Baldwin AuthorDate: 2023-08-04 23:41:50 +0000 Commit: John Baldwin CommitDate: 2023-09-06 20:03:05 +0000 cd9660: Reject volumes with small logical block sizes ISO9660 permits specifying a logical block size that is any power of 2 greater than or equal to 512. The geom disk layer requires requests to be aligned on sector boundaries of the provider. With a volume that uses a logical block size smaller than the underlying disk sector size (e.g. a logical block size of 512 or 1024 on a CD which uses 2048 byte sectors), the current cd9660 vfs can issue requests for partial sectors, or on non-sector boundaries. Fixing this properly would require wrapping all of the calls to bread*/bwrite* in cd9660 vfs to roundup requests to be on sector boundaries which can include both the length, but also the starting sector number (and thus requiring use of an offset relative to b_data in the resulting buf). These images do not seem to be common however given that no one has fixed this in cd9660's vfs in the past few decades, so just reject them during mount with an error. If such images are found to be used in the wild in practice, then the larger fix can be applied. PR: 258063 Reported by: Robert Morris Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41228 (cherry picked from commit 4af849d71f69306432941d91fa46c3c303059d63) --- sys/fs/cd9660/cd9660_vfsops.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index d1fbd0100668..f9fb30face42 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -340,6 +340,13 @@ iso_mountfs(devvp, mp) goto out; } + if (logical_block_size < cp->provider->sectorsize) { + printf("cd9660: Unsupported logical block size %u\n", + logical_block_size); + error = EINVAL; + goto out; + } + rootp = (struct iso_directory_record *) (high_sierra? pri_sierra->root_directory_record: From nobody Wed Sep 6 21:57:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rgx6n4Snxz4sJHC; Wed, 6 Sep 2023 21:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rgx6n1qQqz3cb5; Wed, 6 Sep 2023 21:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6tleK0HLX/FyZX1ipJlHF+KtPeRLT/Rua3H55gLV9Kw=; b=Ji2pnfYVO58ONPdXd28qutWANcofNr5GQoIETQ1we4urvSkmexcAhYftos2jaN+81axC+8 M2jnG1MMNGP4Hy4LOUPK/nMjz/2ucjTZOdpulBWEHkp2LVI1cjQibclnO13b04MCaiJlLu loE7kNKwjE2mX9EofDOKb8gmi5//gpdo8vXseQz0Ku29JeIKAQvtm8S4QOl4MzHbVqsRKm nId0tNF2vDMKHVz27QDb1CAcDmebysMaCKhDQKRkvukAaFT48oxvdWDNgS9aAzRW8nJEIP rhtrokaIW522CtkrqcKzie/+jGc5X1+Ef8Xw67jAM3iBYcmOvZXANkUAk+0d8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694037425; a=rsa-sha256; cv=none; b=n3Axb33HIMDVRtMwYWx/IjTtUtw5zxDBdq+LeJ+DBw4mDzhCnNpQzvczE6ATPrA9IwXJlr 9iW0zF2Bt7+HpT2xs2JDOiOsvJKg8ImK/Io0MLfHIL+aP56iZGHVtv7Tn2+D3xsW57TccF GVw/r9PQChBA8dYCLiUrdixo/H0qzg8LDXDYbwV26jGy9ZZJ+FXUYCyoJ1QQwIiUgzsgy7 iINAxK0U3ASnA1TphC7AoLPvCgeowrPmFY6dBqs80iG0s3CzmYEzobpH72FqQ1TbH3LZO2 z8oTq/vP4hvwYhp+QUpwwGPkXXkeJ93lwuRUjiIDuHy6N5X3tsuFCw+/wvkNZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694037425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6tleK0HLX/FyZX1ipJlHF+KtPeRLT/Rua3H55gLV9Kw=; b=BXyp3Z3L8QJl6Y1nzGthx7ZBsceTGyJo1iITx2ALq98BHtwJZUCg+z52Hiw1l2iCz2JZ3v N740/L0qAWSsCpO+NuckJqumNse46FUEHvz7L6HZ+aSyTUe70zgu98nsT7x8RYEQyomtJN 2Aei775vJYphTO8OaiWhNIt4MASmzWVX8XcscObmJWUsEkNUK7u8+QPc+VsfpeN6ZfZHND gNXSwXaGE2t4f5pyHE5EPzp0E/rAi2KQkPrVIT/qLbtWaUoJiTWg+BrdwFOy03zBoeMz80 eQ2LUtQ+KGxsfliX2y+MhpUjwIdAzZSwPicIs7HCWtv8MiwBaZpfMFIGd/cYWA== 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 4Rgx6n0wvkzZ6L; Wed, 6 Sep 2023 21:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 386Lv5Yf023843; Wed, 6 Sep 2023 21:57:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 386Lv5GR023840; Wed, 6 Sep 2023 21:57:05 GMT (envelope-from git) Date: Wed, 6 Sep 2023 21:57:05 GMT Message-Id: <202309062157.386Lv5GR023840@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: dd66ba430cb9 - stable/12 - netsmb: Add bounds checking to smb_t2_placedata List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: dd66ba430cb9d4c53fdd583fa2f20521552d58ff Auto-Submitted: auto-generated The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dd66ba430cb9d4c53fdd583fa2f20521552d58ff commit dd66ba430cb9d4c53fdd583fa2f20521552d58ff Author: John Baldwin AuthorDate: 2023-08-04 23:42:41 +0000 Commit: John Baldwin CommitDate: 2023-09-06 20:03:18 +0000 netsmb: Add bounds checking to smb_t2_placedata Verify that the requested region of the mbuf chain is not beyond the end of the chain before trimming it from the end. If it is out of bounds, fail with an error (EPROTO). While here, properly handle the case that the amount of data at the end of the chain might span more than one mbuf by using m_adj to drop the extra bytes rather than assuming m_len of the last mbuf can be adjusted directly. PR: 258504 Reported by: Robert Morris Co-authored-by: Robert Morris MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41229 (cherry picked from commit aca3d65fedffbbe71399a88d33ea8ecf550177eb) --- sys/netsmb/smb_rq.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/netsmb/smb_rq.c b/sys/netsmb/smb_rq.c index 5a2ec0e7214a..c55dd1d91891 100644 --- a/sys/netsmb/smb_rq.c +++ b/sys/netsmb/smb_rq.c @@ -426,12 +426,18 @@ static int smb_t2_placedata(struct mbuf *mtop, u_int16_t offset, u_int16_t count, struct mdchain *mdp) { - struct mbuf *m, *m0; + struct mbuf *m0; int len; + len = m_length(mtop, NULL); + if (offset + count > len) + return (EPROTO); + m0 = m_split(mtop, offset, M_WAITOK); - len = m_length(m0, &m); - m->m_len -= len - count; + if (len != offset + count) { + len -= offset + count; + m_adj(m0, -len); + } if (mdp->md_top == NULL) { md_initm(mdp, m0); } else From nobody Thu Sep 7 01:12:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh1SK12cpz4rvgj; Thu, 7 Sep 2023 01:12:33 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh1SK0ZwDz3GQ2; Thu, 7 Sep 2023 01:12:33 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694049153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5kGkveKA2D+qoOZJT6jagBnKmCB59osv+Q+6POSSH7k=; b=LPWtNzqUqLEhrmk8xfNQJGs9X168qGNceRpX3Ro0WgS0jb42CWG9RFrs/rBaNSEKfwnrk3 4F0YVvIAVJYjrtSpAjaREI9t+rfdlfLlTvzbQ6/MxRCOEdV0JF0a5svE0q6WJRMUIi5UCj djo/dZeq+o6X9Yo2Sa/sQMDY93zO7K8Hh8emgt5TugxRingh7wNfW0ky6z+RjzdTBEajth wuyqpD7yUpYFIJpstlgBUO14M/MzTuftTkbTjC9wSVn//DDNWa6ffhdhNcnZ/i5jsD0swY gqzCTCmQWfyePbA8xUrB3K39oDKXLcyQvtdIiIV73xeM2iqD5Yzhqz4Q2C2ndw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694049153; a=rsa-sha256; cv=none; b=FADdetImfE03XbLYBBiK9Vujj9mzfyulcZRNNScgRkAn5Sbltf5P2bBq8Ua3+ImNwwYSb0 wnLtNpLS4SVyCxLKzrIjZrQH98IuDHBwOSdegxhID6i+94U3uI2HtpdjB7AeTFl3LLmjgE VFa20HagMJOOPpGs5FeQwe5cX7uq8TNhg0yPi7mhkbPWEGoeCuU/7rMsL6msOEeCic1b/t mqL3oY5ZBLyKFgKcR7K/BenE8p6Qo2RplyY0Sx/ZbmXPakOTLW6gMUThZEASE5PdM47Ntw rjhYaieEmDdhguRA3kSSD+9dwQj8cukRTMalxmKzR67rNcOogfv34UB1Rvoglw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694049153; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5kGkveKA2D+qoOZJT6jagBnKmCB59osv+Q+6POSSH7k=; b=ErQuUV69dFNq7wknqWdgacED+mWv/VarZE7Huu4c+DrVMCtleqFJ8HajpyydfXPq17JDfP hsNXN/I1jy21Y/ZA/rvj+GJUlIyYng8D8L0yD08VhdxS+Kt3mgjSomwIaTFxVvQdKQaY1u 22GUenCAKj6egHnHkKIvBZ4o+Dtl4nZhS0Csxjvxdg0YWt53pYL3H42CdSAfdk3BzQW6TU c5cAqSfT2Rxocyx+Cbkh12qKAnF+V50l2I2LZ+Yr9UAcHF+Bnsv3hbyJ6BhLU/co3eri9o PoFNJrTyxBl1C3gKLx0rwhnoFIFBQ90x6QCzecaBFnZYqrDD+OYKlxdhV7OZeg== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Rh1SH3QtQzyGQ; Thu, 7 Sep 2023 01:12:31 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 1926d5cef6ea - main - init_main: Record completed SYSINITs From: Zhenlei Huang In-Reply-To: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> Date: Thu, 7 Sep 2023 09:12:22 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5BC96D9F-E4C4-4D34-B7B3-41576AD296DA@FreeBSD.org> References: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> To: Colin Percival X-Mailer: Apple Mail (2.3696.120.41.1.4) > On Sep 7, 2023, at 2:37 AM, Colin Percival = wrote: >=20 > The branch main has been updated by cperciva: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D1926d5cef6eaa1302024d6471271c930= ad65f9b2 >=20 > commit 1926d5cef6eaa1302024d6471271c930ad65f9b2 > Author: Colin Percival > AuthorDate: 2023-09-05 23:47:57 +0000 > Commit: Colin Percival > CommitDate: 2023-09-06 18:36:36 +0000 >=20 > init_main: Record completed SYSINITs >=20 > When removing them from sysinit_list, append them to = sysinit_done_list; > print this list from 'show sysinit' along with the list of future > sysinits. So the `sysinit_done_list` is for DDB only. >=20 > Reviewed by: jhb, gallatin (previous version) > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D41749 > --- > sys/kern/init_main.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) >=20 > diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c > index a6b327339c80..a8df9f84a29a 100644 > --- a/sys/kern/init_main.c > +++ b/sys/kern/init_main.c > @@ -163,9 +163,11 @@ SYSINIT(placeholder, SI_SUB_DUMMY, SI_ORDER_ANY, = NULL, NULL); > SET_DECLARE(sysinit_set, struct sysinit); >=20 > /* > - * The sysinit list itself. Items are removed as they are run. > + * The sysinit lists. Items are moved to sysinit_done_list when = done. > */ > static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; > +static struct sysinitlist sysinit_done_list =3D > + STAILQ_HEAD_INITIALIZER(sysinit_done_list); Then it should be wrapped around with #ifdef DDB and #endif >=20 > /* > * Compare two sysinits; return -1, 0, or 1 if a comes before, at the = same time > @@ -289,6 +291,7 @@ mi_startup(void) > */ > while ((sip =3D STAILQ_FIRST(&sysinit_list)) !=3D NULL) { > STAILQ_REMOVE_HEAD(&sysinit_list, next); > + STAILQ_INSERT_TAIL(&sysinit_done_list, sip, next); Ditto. >=20 > if (sip->subsystem =3D=3D SI_SUB_DUMMY) > continue; /* skip dummy task(s)*/ > @@ -904,6 +907,11 @@ DB_SHOW_COMMAND_FLAGS(sysinit, db_show_sysinit, = DB_CMD_MEMSAFE) > db_printf("SYSINIT vs Name(Ptr)\n"); > db_printf(" Subsystem Order\n"); > db_printf(" Function(Name)(Arg)\n"); > + STAILQ_FOREACH(sip, &sysinit_done_list, next) { > + db_show_print_syinit(sip, true); > + if (db_pager_quit) > + return; > + } > STAILQ_FOREACH(sip, &sysinit_list, next) { > db_show_print_syinit(sip, true); > if (db_pager_quit) Best regards, Zhenlei From nobody Thu Sep 7 01:46:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh2D64pMWz4sGd2 for ; Thu, 7 Sep 2023 01:47:02 +0000 (UTC) (envelope-from cperciva@freebsd.org) Received: from mail.tarsnap.com (mail.tarsnap.com [54.86.246.204]) by mx1.freebsd.org (Postfix) with SMTP id 4Rh2D56P0tz3Q6J for ; Thu, 7 Sep 2023 01:47:01 +0000 (UTC) (envelope-from cperciva@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: (qmail 55916 invoked from network); 7 Sep 2023 01:46:59 -0000 Received: from unknown (HELO dell7390.daemonology.net) (127.0.0.1) by mail.tarsnap.com with SMTP; 7 Sep 2023 01:46:59 -0000 Received: (qmail 494 invoked from network); 7 Sep 2023 01:46:59 -0000 Received: from unknown (HELO ?127.0.0.1?) (127.0.0.1) by localhost with SMTP; 7 Sep 2023 01:46:59 -0000 Message-ID: Date: Wed, 6 Sep 2023 18:46:59 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: 1926d5cef6ea - main - init_main: Record completed SYSINITs Content-Language: en-US To: Zhenlei Huang Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" References: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> <5BC96D9F-E4C4-4D34-B7B3-41576AD296DA@FreeBSD.org> From: Colin Percival In-Reply-To: <5BC96D9F-E4C4-4D34-B7B3-41576AD296DA@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:14618, ipnet:54.86.0.0/16, country:US] X-Rspamd-Queue-Id: 4Rh2D56P0tz3Q6J On 9/6/23 18:12, Zhenlei Huang wrote: >> On Sep 7, 2023, at 2:37 AM, Colin Percival wrote: >> init_main: Record completed SYSINITs >> >> When removing them from sysinit_list, append them to sysinit_done_list; >> print this list from 'show sysinit' along with the list of future >> sysinits. > > So the `sysinit_done_list` is for DDB only. Well... sort of. You can open up kgdb and run 'p sysinit_done_list'. >> static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; >> +static struct sysinitlist sysinit_done_list = >> + STAILQ_HEAD_INITIALIZER(sysinit_done_list); > > Then it should be wrapped around with #ifdef DDB and #endif I considered that, but since we're literally talking about 2 pointers of memory I figured it wasn't worth making it conditional. -- Colin Percival FreeBSD Deputy Release Engineer & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Sep 7 03:35:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh4cx3Hxfz4rxrN; Thu, 7 Sep 2023 03:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh4cx2kBWz4PqC; Thu, 7 Sep 2023 03:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694057713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HYRS6idMn4qubjkJv1GAYvxrTUSpCt7I+ko4NYy5PhA=; b=W8JVuMgkYKa+6EK3L6I/cFe79+1DMXg5O19JtHHrLSrb8EKcMK+3ZWtcXDtDxsG45xAP28 5c/lMT8V0zsNRJ8pQQvJDA8FCiFZCjBINcBAbxDp04D6RxQgapawXAM0i0P35wcpGFp9+K SwcHhK5y66GWhUTm6h8fVNm9JkLuFbHjbB8l99WvLuKC4ylpW7gl+SvNqSkjFjeMgdFSKJ WI45z1kNTFtTLaIt+P5W3+xs3CYjf0BtvlH7jywQz3xXXHVPD491QzJDSBsbKjmEzafk9o Lp5oypvLMvnpOpypi2AgjKjkv3pIrYt6G8o98JNK8Ws+xLCjanZerPruYS8wkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694057713; a=rsa-sha256; cv=none; b=srdOIsz+83zX3H0vgg/l46Ytb0hCGrq1bec5dZDFM6VPnjtqPi/1T1aHrRvi9/FW6EqoYA P46eIxDUsUuocm0+ylXa8JC+Ff0iDF00dcIA0To2BaQ8X+wiT378qITsvJ+BDRrSxHBzCq QKZfV975mBmc3/pXOcMYJsibMUHn3WUFuq+Hq001NHKuZ8kZLJoYU96d9S88z2beTeylIi QRlyl0ozHUYQ3hzom3YzaDyNxYusvFkUZrcZ/32OEBcFwckHJ7CsG0JcFIHLuUkq+OXrYp rGVseJV6JysoA9A5H13+a0kwctRyyX6CboXgWbyjzbpcgjtLYeO2SI+Bi7qN+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=1694057713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HYRS6idMn4qubjkJv1GAYvxrTUSpCt7I+ko4NYy5PhA=; b=nCRQl7I7IPBhrQFXe3vjn+fdyb4WQ5PkFDxbtYNwaoz99bwLhgYiog+JcEugGuzeHAp83k 4vBbdomyJawy6UME13IQP2FgFzdXy0wJb0ZLpka7JDTyPtDLYtDlSfGX85iiM58UU3qQtZ i4yfZDqSQCily0mdsdJ8ssJy8Hi2TKll8zgbFNjHbGFOBF0r22Sw36/Vkt8Y8rZvl971XE f3f0nztYornTZ+65J40hmXfbRu9kNhuF5io3KSaYhixogmdt6VD42lFErkgcIQZYiQiHnQ o5SGkiN8A5L+I2dJ97mh9BnlMT9Ep89TkRgCfs6qr2i3u+//dv4VDNIbFWtFkA== 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 4Rh4cx0Zfkzk9r; Thu, 7 Sep 2023 03:35:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3873ZCuP088518; Thu, 7 Sep 2023 03:35:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3873ZCMC088516; Thu, 7 Sep 2023 03:35:12 GMT (envelope-from git) Date: Thu, 7 Sep 2023 03:35:12 GMT Message-Id: <202309070335.3873ZCMC088516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 73e5df026288 - stable/14 - OptionalObsoleteFiles.inc: Add libprivate{cbor,fido2}_p.a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73e5df026288891134e9fa205ab30455abdd5c01 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=73e5df026288891134e9fa205ab30455abdd5c01 commit 73e5df026288891134e9fa205ab30455abdd5c01 Author: John Baldwin AuthorDate: 2023-08-25 23:22:01 +0000 Commit: John Baldwin CommitDate: 2023-09-07 03:33:32 +0000 OptionalObsoleteFiles.inc: Add libprivate{cbor,fido2}_p.a Two more profile libraries that should be removed by WITHOUT_PROFILE. Found when upgrading a stable/13 VM to stable/14. Approved by: re (gjb) (cherry picked from commit 023ef8015ee6c4e76b63db310800a0f2512fea72) --- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 470f18346dc5..82ea542d7f55 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -6991,9 +6991,11 @@ OLD_FILES+=usr/lib/libprivateatf-c++_p.a OLD_FILES+=usr/lib/libprivateatf-c_p.a OLD_FILES+=usr/lib/libprivateauditd_p.a OLD_FILES+=usr/lib/libprivatebsdstat_p.a +OLD_FILES+=usr/lib/libprivatecbor_p.a OLD_FILES+=usr/lib/libprivatedevdctl_p.a OLD_FILES+=usr/lib/libprivateevent_p.a OLD_FILES+=usr/lib/libprivateevent1_p.a +OLD_FILES+=usr/lib/libprivatefido2_p.a OLD_FILES+=usr/lib/libprivategmock_main_p.a OLD_FILES+=usr/lib/libprivategmock_p.a OLD_FILES+=usr/lib/libprivategtest_main_p.a From nobody Thu Sep 7 03:35:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh4cy3Dk4z4ryHb; Thu, 7 Sep 2023 03:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh4cy2T0Tz4Ps4; Thu, 7 Sep 2023 03:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694057714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aETfXwBOW+qe0AgbcDvH+EiKxROHRLTkv5ESTfd81l0=; b=n/mZWxS4CC0SBA+5h/7DKjGsn7aTR9knxiPVY9dkRJRIdTliLhysFwswHzlEu05cOID1xr ffca4CkubV5nHpggqnl1/5C79HpgdUahEvI9D0cQ59xZ5ES8IJrBnM8h6azbARXG7XlU+Z xVTHaCZ2zUKzEIi/LLYjIPSFreBggmK1p51VixyeaikE4g6GE4wdNANRB5aD0FtKHbiVFM i6shSsA2+rJrEIYXNXt1cR1qCZWENrqMej00tYJaG359IIMccs42I66Rb9/B0x8oaJMtza utmNxokHBWa7CE479N3fUrD7TkEZxDG8WRwzl/XZqvxVE9t/CCTUTFzh+OzPKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694057714; a=rsa-sha256; cv=none; b=FerF5BsayzIBkuQZcCHbb0wUZ1HBhOXwBBnRQm/KV0cTzzMy3x9giB2RiAGdOcW4Ajix2N VlqH/cAKEHZT/WO1JvA9h/RoQsF8sfiAOC9bV/NJqdMrQirVy8lLg3YmDZPPUCkagsKbxi DaIlnm1iOS/Wttx9QkdWVAfitZwfSxUJ41/qvCTVg9wAZu6izgLd+xtZBkJ6nZ2Bv9/5DR vRr/KOKHdUiUnQJS/aMdBulKu9iekW4wXlD1CtqzRHxBV4yr92aIJt3LJgaxLQoKWetndT VGA1FEx6BfpD/5X1x2oVigAJEczAE8mL1+9fPVCdqeARrG1qSpnyvnIGuaFA3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694057714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aETfXwBOW+qe0AgbcDvH+EiKxROHRLTkv5ESTfd81l0=; b=svzddzKTBnfYZ6//evelliYv14HR1rUh117SpvVPTwBuV9nUJx35sy9HXUyEMQ5SGBXr3q ehu11bJmThqyF/4FrYTJURalqLY5GF6quPsC2N4jOrt+JC9/iN8XjYU5McHsWyYHETHfiz G9LogIHslo20gDBui0azVGaa6fw25XTPTtrnV0b1RH6uKN6tHEAdBVmiX9pJyY/KMFi9Mq ryBmRDmp+MuIrgL5cUxQTWdhLD5DVt2UkPoRXKJEkBj0JP5VqIeWIPVEsCW2ea+b12xP1q DQRDncgogb5AGg+MBv1BEFfXTGD3OoQgRRQADqkcqQPWDazvYpYiMaGBlPU9oQ== 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 4Rh4cy1Qxvzk2s; Thu, 7 Sep 2023 03:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3873ZEWU088573; Thu, 7 Sep 2023 03:35:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3873ZEXQ088570; Thu, 7 Sep 2023 03:35:14 GMT (envelope-from git) Date: Thu, 7 Sep 2023 03:35:14 GMT Message-Id: <202309070335.3873ZEXQ088570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9deb9bca9c47 - stable/14 - ObsoleteFiles.inc: Add libclang_rt libraries for riscv64 for LLVM 14/15. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9deb9bca9c470002688390bccf88ae147a25176f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9deb9bca9c470002688390bccf88ae147a25176f commit 9deb9bca9c470002688390bccf88ae147a25176f Author: John Baldwin AuthorDate: 2023-09-05 16:12:12 +0000 Commit: John Baldwin CommitDate: 2023-09-07 03:34:10 +0000 ObsoleteFiles.inc: Add libclang_rt libraries for riscv64 for LLVM 14/15. Reviewed by: dim Approved by: re (gjb) Differential Revision: https://reviews.freebsd.org/D41701 (cherry picked from commit 25b58f9a4a69012b5c1729a3895f9fb3369e2b5d) --- ObsoleteFiles.inc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index bd7071031857..a59151dad4ea 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -386,13 +386,17 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-riscv64.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.so OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a @@ -424,6 +428,7 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-i386.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-i386.a @@ -432,11 +437,13 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a @@ -446,16 +453,19 @@ OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a +OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-arm.a @@ -890,7 +900,10 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-x86_64.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-riscv64.so OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.so OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-aarch64.a @@ -899,6 +912,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-powerpc64.a @@ -936,6 +950,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-i386.a @@ -946,6 +961,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-arm.a @@ -953,6 +969,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-powerpc64.a @@ -968,6 +985,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-arm.a @@ -975,6 +993,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a @@ -982,6 +1001,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-powerpc64le.a +OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-riscv64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-aarch64.a OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-arm.a From nobody Thu Sep 7 06:33:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8Zz25J2z4sggw; Thu, 7 Sep 2023 06:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8Zz1cYvz4Jlm; Thu, 7 Sep 2023 06:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9JGG6+5n3kLOFvspSeXbYyzJzrZFAzbg0g7Q0LlWTy8=; b=QiO5Yq0ZXSWwj1cfBlJOLaNPj35ejuMrCdzaxSpvsnXcqjMatnX16XOWqNTffs+u1n3fYS rsKvtTxOpbzR960G9nwWv09ABC4FJU0Rw+yT3kR5LfM+1zbG0e17WJTeQVqcJdcbtulPKf bk8nRGcU7IAAb/SKx6Uqc/VFbXOMh87rJjtcATJgXR0zSZUOBBSUNwzVM5C56WDNgIKzh7 7yiGH5u7paF8rI/vy727DF75pRzhiHPw63jkNocmDKCOa19ksL6V+0aZ/WvT2xBIpcU4XA D11ssde7+05nHdMeRPVftsd8+Zx7+HgcskCPUDZKlnTOuNBHskVfMAAthBh79Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068427; a=rsa-sha256; cv=none; b=U9MC0TWm6gNQu3lnmlX3PFznc1e+sqylVvRNaHBOqjZ5baWBWHOtbRRW98oNuChb8RaVlX II9/Fk0UhCBFRKHkREWGdaYrMP/YNJaqClIAPq0rgPxz7+y9DEn79OMSzsYf1mWhTPR3La eBMSBE33spsDxoLv5kPU1Yrf5rIcWIuNM4Tl+ljg+n34A7q0a2jc7D47mKf4Xnr1wrCisj erb88zzSIeUV3KK4my8PZozhAc37WX7Li4vhE/eiQCDuA2dyIwnmlRxtcy5mQd9W5HXMUZ 4LTXA645Ugk5TxAWXsXiq8VWTqElw/eTheCX3v+NYgiV4RYEeChY/gH65p6cVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9JGG6+5n3kLOFvspSeXbYyzJzrZFAzbg0g7Q0LlWTy8=; b=VKzgRRkUZGSLiSxtOQu8BAf03/HS2IlwKf4ZfT8VaYrZ5Y/CD8DSLVhi0fkiT7kaz+dTKH 0gGnmiCbge3RFJdW5OvKUE+aoGsGgP0+hcuP9DzJg1x5j3l4DlLXToL7qwR4wWvL5HybkB 5l4BrzCIOAH++zoZuFu9Z+eIo6HUKhN8q3TB2XnatW4djp5CEbz4O8t6yrpvQVENOE4rbw BvQSHBfCcGp5tkKmjIwL5Xj2JBWlZaXVRoDrONt2v31JgalM8GyVba8OpNfrkGHrA3fezJ jRhttFU7Z3NvDaq48qSycF/wqnbzDc3YC3N/v5xGMKiEWfqFU1VzvnUe4lfmvQ== 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 4Rh8Zz0jMszpBV; Thu, 7 Sep 2023 06:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876XlYt086756; Thu, 7 Sep 2023 06:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876Xlwb086753; Thu, 7 Sep 2023 06:33:47 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:33:47 GMT Message-Id: <202309070633.3876Xlwb086753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: 035f7c9a3653 - main - switch groff parameter -man to -mandoc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 035f7c9a3653d91564a5513f1311aa3b6e14a17e Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=035f7c9a3653d91564a5513f1311aa3b6e14a17e commit 035f7c9a3653d91564a5513f1311aa3b6e14a17e Author: Wolfram Schneider AuthorDate: 2023-09-07 06:28:24 +0000 Commit: Wolfram Schneider CommitDate: 2023-09-07 06:28:24 +0000 switch groff parameter -man to -mandoc groff 1.23.0 changed the semantics of the -man parameter, and many manual pages are not rendered. The -mandoc parameter brings back the old behavior, as in groff 1.22.4 and earlier. PR: 273565, 273245 Reviewed by: emaste, bapt MFC after: 1 week for all supported branches (stable/12, 13, 14) Differential Revision: https://reviews.freebsd.org/D41737 --- usr.bin/man/man.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/man/man.sh b/usr.bin/man/man.sh index dd327cc5d1d8..b18895a91d96 100755 --- a/usr.bin/man/man.sh +++ b/usr.bin/man/man.sh @@ -1071,11 +1071,11 @@ do_whatis() { # User's PATH setting decides on the groff-suite to pick up. EQN=eqn -NROFF='groff -S -P-h -Wall -mtty-char -man' +NROFF='groff -S -P-h -Wall -mtty-char -mandoc' PIC=pic REFER=refer TBL=tbl -TROFF='groff -S -man' +TROFF='groff -S -mandoc' VGRIND=vgrind LOCALE=/usr/bin/locale From nobody Thu Sep 7 06:36:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8fg4MvJz4sjCL; Thu, 7 Sep 2023 06:36: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8fg3kGdz4Kjk; Thu, 7 Sep 2023 06:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IbTSCLdynxCr5HB01XM8FXk9FIWUaEyyRuqhcn+OwGo=; b=XJiTU8rF+sFcc3CX9LreK2rYAJhz98pvpNYept10sOCz5fBqsVe+46IBhxYzYoyQIw7klH VUwVF9QjbaClleaqFikBj6iOZ0ev6IBdPTGZoN1tSD3tFopbi2WqeM5XS+YLhhajDgySJa 80lrBQtxqFBM8mi64G/y9mw2liQxmws1wbXzyESI/PRtN/RkWUnP6+SupbtxM2SlEHpHWp nraO21P6F3rn+IYClanrkDMEta5m37C6TlkrOfq/XJyF2lM/h6XQ/9Vikd0b6IsWKORZN+ atg/kKnLV9zpNbEsYXrPo5Ult2ggZjhRJ8vfIx2oe6LSM6zOgMB+wmnbJV2F3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068619; a=rsa-sha256; cv=none; b=E+/divKb7vlZSuuUN/Mt3J7mH6dNDv5eNeBPWUNyby67i+PDD3WagW/U/76+8nWSAHSGma ZTxQXOaHmqFwaED6Y01KhZbBMAnrem0lfLpvxjOYTcHv6NF7LTjbVm4njPfAkgQWNEflUE w9gnTFlbcJDzE3eah22Seq2mU+I1nMOykBVHH9jgbINglYQuep/2PjlsX3+qxTsZbxLyz3 OWr9MN5G3/SQtjtpEekUxqeMccjOyXDCihib9KkvAtxMNUSKSTh8lfUOf2Khe5JBGEXVAr sd3+X9DjXd3us7ITwCFYibSoa/au+zPigL1Uxv1GysnoAQOf7uoJK5s2yJpAyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IbTSCLdynxCr5HB01XM8FXk9FIWUaEyyRuqhcn+OwGo=; b=EpLwf0yDs4jFHeekVlBcaTHIHB6WgOhiFceBCxkpaIJw/WcC5G+AXAKRmT1SkETw8Omejb pbV2pn/Ito+PhHUPhp/NlUuJQyC732AsGJAUR0lcNXhpPCTC94Rue4zTIZivS69Vl/nGLR qMiweMUDmTqbkyeKodM8hUxfqfu92h90FhsJKEaZKtUVLnyGa3Y+3C1gY43l3cnUmzhlaB 5gpV7jZs6viAhEBbf0NmdABkWVB3gqZw72sNKd5X6eaVRAEON2XuY6TNYNvA04jV6OQxsA UvZuA4OrZIWbxkbFN0UOX3LsrM+E1fGasM62yQxqoxRuDtPPdr1nbxjEIs6D7Q== 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 4Rh8fg2pq9zpDq; Thu, 7 Sep 2023 06:36:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876axaP087367; Thu, 7 Sep 2023 06:36:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876axkW087364; Thu, 7 Sep 2023 06:36:59 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:36:59 GMT Message-Id: <202309070636.3876axkW087364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 2322159a2b7e - main - Update HISTORY section. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2322159a2b7eb41bb34cafd1b24182735c183367 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=2322159a2b7eb41bb34cafd1b24182735c183367 commit 2322159a2b7eb41bb34cafd1b24182735c183367 Author: David E. O'Brien AuthorDate: 2023-09-07 06:36:27 +0000 Commit: David E. O'Brien CommitDate: 2023-09-07 06:36:27 +0000 Update HISTORY section. --- share/man/man5/style.Makefile.5 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/share/man/man5/style.Makefile.5 b/share/man/man5/style.Makefile.5 index 122b38cb19a4..cc5d2f6bb28a 100644 --- a/share/man/man5/style.Makefile.5 +++ b/share/man/man5/style.Makefile.5 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2002-2003 David O'Brien +.\" Copyright (c) 2002-2003, 2023 David O'Brien .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -262,10 +262,12 @@ SRCS= foo.c .Xr make.conf 5 , .Xr style 9 .Sh HISTORY -This manual page is inspired from the same source as +This manual page is inspired from the .Xr style 9 -manual page in -.Fx . +manual page and first appeared in +.Fx 5.1 . +.Sh AUTHORS +.An David O'Brien Aq deo@NUXI.org .Sh BUGS There are few hard and fast style rules here. The style of many things is too dependent on the context of the whole makefile, From nobody Thu Sep 7 06:41:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8mN1wXyz4slQv; Thu, 7 Sep 2023 06:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8mN1VVSz4M6x; Thu, 7 Sep 2023 06:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JhadLKC7qqw0ZfttLVJKCzDm73JazZK7bfTQpHJdVi8=; b=QLjHdFRpYjERQRAed6Y5/xgEx2rkJ+/LbQXcGSIa3xTT/PaU2v+RwtqOE1HPDWeUReYPE8 O3/8O9SG6AMakvH4GHCM8kyKuBPc6sxBq3VMWDw+GlpLLfIk6Cr7m7c1jhAqw0prqAZJPW ZQh/3MJ3A8mdUle9MKeCo1PByGUpUPeE8gmQzO27otFa6BamjqnUOqA7MeQDCKlVcObTah xZAe/c8M+DnbFq9qFyFPRyFCknyoFBdmO9tMdksL7ZuZYngeesKy212/jmRfxxhowTtikQ TGK0BeDFUaj4Gv1EY6ZI1abVOwMnm7Jrxuu4kBUBYHKMjGXzXsXYC1Vw/JP8qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068916; a=rsa-sha256; cv=none; b=UbTNoxkaJj4BKHSP3Z9g3T5SA39hxZ9gby2ka0g+sUafvn5sqtwY/kRosOrBDbXygWfGIM DmYR1v6/MhcL4EscCdqAzTVd+5/T/fAPGTSDErBJ61KvFMC2kl10YMys0ArfN7kQLuj6Le 4jKEiE5D/a1MRRNcktoK+HWlEXUZuCpW99f7tzUQ7i0jvvwFSIgtIiUlngGVwhIbGi/TS3 wYxTo0OsZxgxhhF1zXxSfP+XFW8D9iki5Fl6jBWVLXKaaaVTmoOopE6DZMXfFskhSKNG1e JVWYzRF+86RkUVcmwq6kOg9+6osloTkuAyAcHQ3A360Qau9ikoO0zM0JXaVnag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JhadLKC7qqw0ZfttLVJKCzDm73JazZK7bfTQpHJdVi8=; b=sIykUn8/N4vD/FWaXFzsQFxOZK9Wi9XKZurnsd47rM5iuZtE19k7Z2La+aouYL6tO+PczJ n2BX+QNFubsgvZYCkY8TvDUWoh2FgoJ7EcB5wF9xgANeldiDUcM1MAvzm3lAnXwOkzCr3H lNHFKajJ4ycm3vNL8bc1XcR2AjWBbAsMOvt56+Me6PpDmr68Uz9S0JvD+MtIY1gZix3ej9 0jZ9tHRYxMJ5jYv4FVkIfIck6EvMSnMozGaO1DhCM2KJKyo5A78MATWJOaNy5rHENnZsUu h9lBYQZzKwGxS9FheZR2qJwG0028ipANq/kK4b30L0Q7hAI7N6VnWfyC3sKxzQ== 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 4Rh8mN0ZmCzpYQ; Thu, 7 Sep 2023 06:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876ftH2002071; Thu, 7 Sep 2023 06:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876ftRJ002068; Thu, 7 Sep 2023 06:41:55 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:41:55 GMT Message-Id: <202309070641.3876ftRJ002068@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4ec9ee991276 - main - libc: Add a wide version of snprintf_test. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ec9ee9912765ac4ca57353999caa92a23283d8e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4ec9ee9912765ac4ca57353999caa92a23283d8e commit 4ec9ee9912765ac4ca57353999caa92a23283d8e Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:30 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 06:40:14 +0000 libc: Add a wide version of snprintf_test. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41726 --- lib/libc/tests/stdio/Makefile | 1 + lib/libc/tests/stdio/snprintf_test.c | 21 +++--- lib/libc/tests/stdio/swprintf_test.c | 140 +++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 10 deletions(-) diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile index f7383e5b3ef4..2a8a4e69a6c4 100644 --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -18,6 +18,7 @@ ATF_TESTS_C+= printfloat_test ATF_TESTS_C+= scanfloat_test ATF_TESTS_C+= snprintf_test ATF_TESTS_C+= sscanf_test +ATF_TESTS_C+= swprintf_test ATF_TESTS_C+= swscanf_test SRCS.fopen2_test= fopen_test.c diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 0c335bc1a512..10d938435b96 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -12,18 +12,19 @@ #include -#define SNPRINTF_TEST(output, format, ...) \ +#ifndef nitems +#define nitems(a) (sizeof(a) / sizeof(a[0])) +#endif + +#define SNPRINTF_TEST(output, format, ...) \ do { \ char buf[256]; \ - assert(output == NULL || strlen(output) < sizeof(buf)); \ - int ret = snprintf(buf, sizeof(buf), format, __VA_ARGS__); \ - if (output == NULL) { \ - ATF_CHECK_EQ(-1, ret); \ - } else { \ - ATF_CHECK_EQ(strlen(output), ret); \ - if (ret > 0) { \ - ATF_CHECK_STREQ(output, buf); \ - } \ + assert(strlen(output) < nitems(buf)); \ + int ret = snprintf(buf, nitems(buf), format, \ + __VA_ARGS__); \ + ATF_CHECK_EQ(strlen(output), ret); \ + if (ret > 0) { \ + ATF_CHECK_EQ(0, strcmp(output, buf)); \ } \ } while (0) diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c new file mode 100644 index 000000000000..23859b5cd2e1 --- /dev/null +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -0,0 +1,140 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include +#include +#include +#include + +#include + +#ifndef nitems +#define nitems(a) (sizeof(a) / sizeof(a[0])) +#endif + +#define SWPRINTF_TEST(output, format, ...) \ + do { \ + wchar_t buf[256]; \ + assert(wcslen(L##output) < nitems(buf)); \ + int ret = swprintf(buf, nitems(buf), L##format, \ + __VA_ARGS__); \ + ATF_CHECK_EQ(wcslen(L##output), ret); \ + if (ret > 0) { \ + ATF_CHECK_EQ(0, wcscmp(L##output, buf)); \ + } \ + } while (0) + +ATF_TC_WITHOUT_HEAD(swprintf_b); +ATF_TC_BODY(swprintf_b, tc) +{ + SWPRINTF_TEST("0", "%b", 0); + SWPRINTF_TEST(" 0", "%12b", 0); + SWPRINTF_TEST("000000000000", "%012b", 0); + SWPRINTF_TEST("1", "%b", 1); + SWPRINTF_TEST(" 1", "%12b", 1); + SWPRINTF_TEST("000000000001", "%012b", 1); + SWPRINTF_TEST("1111111111111111111111111111111", "%b", INT_MAX); + SWPRINTF_TEST("0", "%#b", 0); + SWPRINTF_TEST(" 0", "%#12b", 0); + SWPRINTF_TEST("000000000000", "%#012b", 0); + SWPRINTF_TEST("0b1", "%#b", 1); + SWPRINTF_TEST(" 0b1", "%#12b", 1); + SWPRINTF_TEST("0b0000000001", "%#012b", 1); + SWPRINTF_TEST("0b1111111111111111111111111111111", "%#b", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(swprintf_B); +ATF_TC_BODY(swprintf_B, tc) +{ + SWPRINTF_TEST("0", "%B", 0); + SWPRINTF_TEST(" 0", "%12B", 0); + SWPRINTF_TEST("000000000000", "%012B", 0); + SWPRINTF_TEST("1", "%B", 1); + SWPRINTF_TEST(" 1", "%12B", 1); + SWPRINTF_TEST("000000000001", "%012B", 1); + SWPRINTF_TEST("1111111111111111111111111111111", "%B", INT_MAX); + SWPRINTF_TEST("0", "%#B", 0); + SWPRINTF_TEST(" 0", "%#12B", 0); + SWPRINTF_TEST("000000000000", "%#012B", 0); + SWPRINTF_TEST("0B1", "%#B", 1); + SWPRINTF_TEST(" 0B1", "%#12B", 1); + SWPRINTF_TEST("0B0000000001", "%#012B", 1); + SWPRINTF_TEST("0B1111111111111111111111111111111", "%#B", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(swprintf_d); +ATF_TC_BODY(swprintf_d, tc) +{ + SWPRINTF_TEST("0", "%d", 0); + SWPRINTF_TEST(" 0", "%12d", 0); + SWPRINTF_TEST("000000000000", "%012d", 0); + SWPRINTF_TEST("1", "%d", 1); + SWPRINTF_TEST(" 1", "%12d", 1); + SWPRINTF_TEST("000000000001", "%012d", 1); + SWPRINTF_TEST("2147483647", "%d", INT_MAX); + SWPRINTF_TEST(" 2147483647", "%12d", INT_MAX); + SWPRINTF_TEST("002147483647", "%012d", INT_MAX); + SWPRINTF_TEST("2,147,483,647", "%'d", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(swprintf_x); +ATF_TC_BODY(swprintf_x, tc) +{ + SWPRINTF_TEST("0", "%x", 0); + SWPRINTF_TEST(" 0", "%12x", 0); + SWPRINTF_TEST("000000000000", "%012x", 0); + SWPRINTF_TEST("1", "%x", 1); + SWPRINTF_TEST(" 1", "%12x", 1); + SWPRINTF_TEST("000000000001", "%012x", 1); + SWPRINTF_TEST("7fffffff", "%x", INT_MAX); + SWPRINTF_TEST(" 7fffffff", "%12x", INT_MAX); + SWPRINTF_TEST("00007fffffff", "%012x", INT_MAX); + SWPRINTF_TEST("0", "%#x", 0); + SWPRINTF_TEST(" 0", "%#12x", 0); + SWPRINTF_TEST("000000000000", "%#012x", 0); + SWPRINTF_TEST("0x1", "%#x", 1); + SWPRINTF_TEST(" 0x1", "%#12x", 1); + SWPRINTF_TEST("0x0000000001", "%#012x", 1); + SWPRINTF_TEST("0x7fffffff", "%#x", INT_MAX); + SWPRINTF_TEST(" 0x7fffffff", "%#12x", INT_MAX); + SWPRINTF_TEST("0x007fffffff", "%#012x", INT_MAX); +} + +ATF_TC_WITHOUT_HEAD(swprintf_X); +ATF_TC_BODY(swprintf_X, tc) +{ + SWPRINTF_TEST("0", "%X", 0); + SWPRINTF_TEST(" 0", "%12X", 0); + SWPRINTF_TEST("000000000000", "%012X", 0); + SWPRINTF_TEST("1", "%X", 1); + SWPRINTF_TEST(" 1", "%12X", 1); + SWPRINTF_TEST("000000000001", "%012X", 1); + SWPRINTF_TEST("7FFFFFFF", "%X", INT_MAX); + SWPRINTF_TEST(" 7FFFFFFF", "%12X", INT_MAX); + SWPRINTF_TEST("00007FFFFFFF", "%012X", INT_MAX); + SWPRINTF_TEST("0", "%#X", 0); + SWPRINTF_TEST(" 0", "%#12X", 0); + SWPRINTF_TEST("000000000000", "%#012X", 0); + SWPRINTF_TEST("0X1", "%#X", 1); + SWPRINTF_TEST(" 0X1", "%#12X", 1); + SWPRINTF_TEST("0X0000000001", "%#012X", 1); + SWPRINTF_TEST("0X7FFFFFFF", "%#X", INT_MAX); + SWPRINTF_TEST(" 0X7FFFFFFF", "%#12X", INT_MAX); + SWPRINTF_TEST("0X007FFFFFFF", "%#012X", INT_MAX); +} + +ATF_TP_ADD_TCS(tp) +{ + setlocale(LC_NUMERIC, "en_US.UTF-8"); + ATF_TP_ADD_TC(tp, swprintf_b); + ATF_TP_ADD_TC(tp, swprintf_B); + ATF_TP_ADD_TC(tp, swprintf_d); + ATF_TP_ADD_TC(tp, swprintf_x); + ATF_TP_ADD_TC(tp, swprintf_X); + return (atf_no_error()); +} From nobody Thu Sep 7 06:41:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8mP3ljdz4slM7; Thu, 7 Sep 2023 06:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8mP2vRfz4MCc; Thu, 7 Sep 2023 06:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awqXBSOro9GMNNz6K6ddBFT0s/iZRE/2o7HupfKuhgU=; b=FFk4XQliQZqZ7Y1G+hVhcerIY0F2eEHCJ/5yIfX0vrKVuXZj6NFmK/fSyS8rzhgN//NN29 8qUcASKhgcbw/nCKihKPiFcwUtjrCCCy7bxJuO8bpQKHPe6bNbtodxIN6roNCtl+J1nMNR M9auXj8B2aW2Bwc1YxNV1xh1OVvRDz1+qMEd3iUEUBAkCEtxcbv6qB6jLKngAGd1exD/xo 3I4OTmKEnZTEiIsBnpivxCeYympEdM6IJ7P2lC1hMn95VoyhVAYLQF4CWdOsEtx5lRLWZC Bx67zUTTU7Fyz1eRqw3aJ5BPHfFWCALstORKD9qBjv3z8eK4iB9yHPuRIFLrNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068917; a=rsa-sha256; cv=none; b=KIbD2i1SIUjwDshJ/h4Iw84btb4Is3WTYIBYSZCUpUFzT3W0DG2dSFlgHVNpDmXdx/iE6O PFB/dvhL3rAHYwhE4C+CGaOYn+FSHoeuQ+eRkaCDugzSGmZp55zmGhPzRveBe3zOef85JS DMUsodkqWTSg/NemTwpsKh5LNxVLLHI+jsQW87cWAnK5uVQxmJ71g7B2R0zh+2RC+00LG5 cADhNzCJEXSRvEYrlK7DCLhKDPs+hh2S//SZkGiPckC3hSUmJv2lTk3di5yb68S5pAfhtV 6uWOLoZsqq9DU92cNMYgsw3sYjYIer1jgK+amlt8017UG02HgRR+I1uAUEUdbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=awqXBSOro9GMNNz6K6ddBFT0s/iZRE/2o7HupfKuhgU=; b=HnWseXV9HjaF3HUdTLg+Z7Y+8nf1xHdj3Yy93U4Mru2nuL+RHtkKmMkRU5LRkG4PranmIS srDi3maY2DWXUX2B8qnqMKea2YmtDPOwDTI0bVuX1mL4zhIO4N6NWP0NHDpHNXSwa2l6TB n6w23eOdch0Nd4m+gwJJ9J4MMWSPSRJDYF225KvP+iOEN1sSXLTCSsfbnHAw4dYQV8IUaq uo6V6n88xIRiDUHmFgkO7u4aiSuJEJQ/HoWjVcVKmxY11scVWyrzGZGCO7u2oGWCNNkVXD PfOUWdo8AsEvKNwbe59WJxErvSLbwEBWz92j8g7GpLD97hFSZ6dew0WItG1nCg== 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 4Rh8mP1cJ6zpNK; Thu, 7 Sep 2023 06:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876fvKh002128; Thu, 7 Sep 2023 06:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876fvck002125; Thu, 7 Sep 2023 06:41:57 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:41:57 GMT Message-Id: <202309070641.3876fvck002125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 294bd2827e61 - main - libc: Suppress format checks on printf() / scanf() tests. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294bd2827e61a78041f6613f4b82235fcc454157 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=294bd2827e61a78041f6613f4b82235fcc454157 commit 294bd2827e61a78041f6613f4b82235fcc454157 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 06:40:14 +0000 libc: Suppress format checks on printf() / scanf() tests. Reviewed by: jrtc27, markj, emaste Differential Revision: https://reviews.freebsd.org/D41727 --- lib/libc/tests/stdio/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile index 2a8a4e69a6c4..7716a60c0e6b 100644 --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -38,9 +38,15 @@ LIBADD.eintr_test+= md LIBADD.printfloat_test+= m LIBADD.scanfloat_test+= m +# Older toolchains won't understand C23 %b, %wN, %wfN +PROG_OVERRIDE_VARS+= NO_WFORMAT +NO_WFORMAT.snprintf_test= +NO_WFORMAT.sscanf_test= +NO_WFORMAT.swprintf_test= +NO_WFORMAT.swscanf_test= + .if ${COMPILER_TYPE} == "gcc" # 90: use of assignment suppression and length modifier together in scanf format -PROG_OVERRIDE_VARS+= NO_WFORMAT NO_WFORMAT.scanfloat_test= .endif From nobody Thu Sep 7 06:41:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8mR057Lz4slCj; Thu, 7 Sep 2023 06:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8mQ3kbtz4M7w; Thu, 7 Sep 2023 06:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3mYLQylpdh3BpvTaYjorxtgz7tO/VRUSPXLlFkQNmy8=; b=jX+nlav4K3/zb7OPHpuh3ThgBzhr8DXtRStto8LSBMRrvG6LHEehUZB5A+5qxSdtbvWK3o J4S2u+cscFC5uR1p5CErhdIXy4ihfN+kppENio9eO1bplOPZ6ahwpt2650w/XOkBu8iwpe 0ycjqeDWKeVtqUpOEsjHDrSMAwZhYopOIPE10rNEU02GOF0NNGeR9DD2ec9fl3mXS+zd3H NrT6QxuaDx4zlUb0EJrSV3ONsDpvbo62GMxsvAuOxPOIx/NLiCFkQzVGSfwLcRzmJZmtip OtbT8J5t4ys7yIBq3dX1kTVrP0eOYUGEERItaW8ac2zYSkyaA5O23/IfPQje+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068918; a=rsa-sha256; cv=none; b=uSOn+mmy8SIJWtp1dMq52qRNhhuhELXPjAUO4Nzd9O+xML24n4EzLn4nVL7Bo7fLm+fAU+ HB+RnUKlYzW1eLg3cnbSGPv+UCIY0Cc3dD/XMz3ZwGT72SwAjS46PPm7hI1kiTtVRZ8Yw2 b0I3hRzXTl12XC9l/6ER0+pWPeRO98JWroVKUfnn3uNiAhtMRHa6IXfJGI91wh4cbkIUKY mtEkX42o1DA0xgCWjcZgky468SqHBIzs3KtXtatPgEuoCGb1TULFlFwJfXgbrk6NxhifJr Hj2CBeF14aK0An2f22FGLS4oOnP/Q4bxIjvdpHUDqVBLPSqs48LGFgwDd5itOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3mYLQylpdh3BpvTaYjorxtgz7tO/VRUSPXLlFkQNmy8=; b=aRu4gAOLGPhnvYD7Svd3LuJenGLcorie6RbGjzaIpRmOm7QVVC9LcW0eBjX+LoWjxtdT43 qYPUIfNNcHTU9AMc7nIoW48lqCq6AmHaQmIFUa0jOK2y3o3V5c22d+vD5U/T7uJJUQMbdn B0CqQXlLtDx76gZJZgbElg+gxSL8hGNs3cMFE+R9+xeKmxczbUi8HyCr94fQvDEnqNask6 t+3xboJN0gCmjhLgKgP3ppQ+iI0oXsaGv34RQ2oXV4YteFyeQQMILlI6pNayZmf0lLVdRk iQNKSejRyOfvOUkR1P+J0JhTU+z3CZ6iKsHVlqXIq1sm+zVRtcex6ECWFdgvTg== 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 4Rh8mQ2ddkzpGj; Thu, 7 Sep 2023 06:41:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876fwXQ002167; Thu, 7 Sep 2023 06:41:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876fw0a002164; Thu, 7 Sep 2023 06:41:58 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:41:58 GMT Message-Id: <202309070641.3876fw0a002164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bce0bef3c6ab - main - libc: Implement N2680. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce0bef3c6abab92c7ac8cc23b7cc632a382721e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bce0bef3c6abab92c7ac8cc23b7cc632a382721e commit bce0bef3c6abab92c7ac8cc23b7cc632a382721e Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 06:40:14 +0000 libc: Implement N2680. This adds specific width length modifiers in the form of wN and wfN (where N is 8, 16, 32, or 64) which allow printing intN_t and int_fastN_t without resorting to casts or PRI macros. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41725 --- lib/libc/stdio/printf.3 | 4 +++- lib/libc/stdio/printflocal.h | 1 + lib/libc/stdio/scanf.3 | 30 +++++++++++++++++++++++++++++- lib/libc/stdio/vfprintf.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ lib/libc/stdio/vfscanf.c | 40 ++++++++++++++++++++++++++++++++++++++++ lib/libc/stdio/vfwprintf.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ lib/libc/stdio/vfwscanf.c | 40 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 201 insertions(+), 2 deletions(-) diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index 110851e2a421..a7b0c7399e2e 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -31,7 +31,7 @@ .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 .\" -.Dd August 21, 2023 +.Dd September 5, 2023 .Dt PRINTF 3 .Os .Sh NAME @@ -342,6 +342,8 @@ conversion: .It Cm ll No (ell ell) Ta Vt "long long" Ta Vt "unsigned long long" Ta Vt "long long *" .It Cm j Ta Vt intmax_t Ta Vt uintmax_t Ta Vt "intmax_t *" .It Cm t Ta Vt ptrdiff_t Ta (see note) Ta Vt "ptrdiff_t *" +.It Cm w Ns Ar N Ta Vt intN_t Ta Vt uintN_t Ta Vt "intN_t *" +.It Cm wf Ns Ar N Ta Vt int_fastN_t Ta Vt uint_fastN_t Ta Vt "int_fastN_t *" .It Cm z Ta (see note) Ta Vt size_t Ta (see note) .It Cm q Em (deprecated) Ta Vt quad_t Ta Vt u_quad_t Ta Vt "quad_t *" .El diff --git a/lib/libc/stdio/printflocal.h b/lib/libc/stdio/printflocal.h index 3594f75d0050..f3d0d3e9e216 100644 --- a/lib/libc/stdio/printflocal.h +++ b/lib/libc/stdio/printflocal.h @@ -49,6 +49,7 @@ #define PTRDIFFT 0x800 /* ptrdiff_t */ #define INTMAXT 0x1000 /* intmax_t */ #define CHARINT 0x2000 /* print char using int format */ +#define FASTINT 0x4000 /* int_fastN_t */ /* * Macros for converting digits to letters and vice versa diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3 index 6cefdb133983..b8d2360c5e76 100644 --- a/lib/libc/stdio/scanf.3 +++ b/lib/libc/stdio/scanf.3 @@ -31,7 +31,7 @@ .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 .\" -.Dd August 21, 2023 +.Dd September 5, 2023 .Dt SCANF 3 .Os .Sh NAME @@ -217,6 +217,34 @@ and the next pointer is a pointer to a .Vt ptrdiff_t (rather than .Vt int ) . +.It Cm w Ns Ar N +.Po +where +.Ar N +is 8, 16, 32, or 64 +.Pc +Indicates that the conversion will be one of +.Cm bdioux +or +.Cm n +and the next pointer is a pointer to a +.Vt intN_t +(rather than +.Vt int ) . +.It Cm wf Ns Ar N +.Po +where +.Ar N +is 8, 16, 32, or 64 +.Pc +Indicates that the conversion will be one of +.Cm bdioux +or +.Cm n +and the next pointer is a pointer to a +.Vt int_fastN_t +(rather than +.Vt int ) . .It Cm z Indicates that the conversion will be one of .Cm bdioux diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 5e5a9b5e31c1..8ce77626fb6f 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -610,6 +610,49 @@ reswitch: switch (ch) { case 't': flags |= PTRDIFFT; goto rflag; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(CHARINT|SHORTINT|LONGINT|LLONGINT|INTMAXT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= CHARINT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORTINT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LLONGINT; + fmt += 2; + } else { + if (flags & FASTINT) { + flags &= ~FASTINT; + fmt--; + } + goto invalid; + } + goto rflag; case 'z': flags |= SIZET; goto rflag; @@ -932,6 +975,7 @@ number: if ((dprec = prec) >= 0) default: /* "%?" prints ?, unless ? is NUL */ if (ch == '\0') goto done; +invalid: /* pretend it was %c with argument ch */ cp = buf; *cp = ch; diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index 9727c9e70c34..fa2e865f33f9 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -75,6 +75,7 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #define SUPPRESS 0x08 /* *: suppress assignment */ #define POINTER 0x10 /* p: void * (as hex) */ #define NOSKIP 0x20 /* [ or c: do not skip blanks */ +#define FASTINT 0x200 /* wfN: int_fastN_t */ #define LONGLONG 0x400 /* ll: long long (+ deprecated q: quad) */ #define INTMAXT 0x800 /* j: intmax_t */ #define PTRDIFFT 0x1000 /* t: ptrdiff_t */ @@ -555,6 +556,45 @@ literal: case 't': flags |= PTRDIFFT; goto again; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(SHORTSHORT|SHORT|LONG|LONGLONG|SIZET|INTMAXT|PTRDIFFT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= SHORTSHORT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LONGLONG; + fmt += 2; + } else { + goto match_failure; + } + goto again; case 'z': flags |= SIZET; goto again; diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index 259a86467ea7..d298ed03f521 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -681,6 +681,49 @@ reswitch: switch (ch) { case 't': flags |= PTRDIFFT; goto rflag; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(CHARINT|SHORTINT|LONGINT|LLONGINT|INTMAXT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= CHARINT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORTINT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LLONGINT; + fmt += 2; + } else { + if (flags & FASTINT) { + flags &= ~FASTINT; + fmt--; + } + goto invalid; + } + goto rflag; case 'z': flags |= SIZET; goto rflag; @@ -993,6 +1036,7 @@ number: if ((dprec = prec) >= 0) default: /* "%?" prints ?, unless ? is NUL */ if (ch == '\0') goto done; +invalid: /* pretend it was %c with argument ch */ cp = buf; *cp = ch; diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c index b03c9dba0699..e2c730b5e7a9 100644 --- a/lib/libc/stdio/vfwscanf.c +++ b/lib/libc/stdio/vfwscanf.c @@ -73,6 +73,7 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #define SUPPRESS 0x08 /* *: suppress assignment */ #define POINTER 0x10 /* p: void * (as hex) */ #define NOSKIP 0x20 /* [ or c: do not skip blanks */ +#define FASTINT 0x200 /* wfN: int_fastN_t */ #define LONGLONG 0x400 /* ll: long long (+ deprecated q: quad) */ #define INTMAXT 0x800 /* j: intmax_t */ #define PTRDIFFT 0x1000 /* t: ptrdiff_t */ @@ -539,6 +540,45 @@ literal: case 't': flags |= PTRDIFFT; goto again; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(SHORTSHORT|SHORT|LONG|LONGLONG|SIZET|INTMAXT|PTRDIFFT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= SHORTSHORT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LONGLONG; + fmt += 2; + } else { + goto match_failure; + } + goto again; case 'z': flags |= SIZET; goto again; From nobody Thu Sep 7 06:41:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8mS0nS2z4slJv; Thu, 7 Sep 2023 06:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8mR43Z9z4MD4; Thu, 7 Sep 2023 06:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ziakp4WCmgXpiRhZifoWjlaxquNjarcgZNRI2bnllhk=; b=WRafzHm0Fp04hb21qMnTYrzxzCBpJBxXw5xHzRft0PpekhGtisTbrE1e2jqX8vaTWE0XiH dn79B7K7cZ/yz9b2vRSoTs8BbDrMiRwc/1HgKAZTJttMji7iBRV5Hsq8IU6D/aF2FZksc7 qLZFAKpX59gDJyFmaBwXxC7iVgBJ3w1lfcgNJpQHFg/p9dtFwMp2XZH9XUm6bHwJaRlw/k yMJp/H2sZ/e1mWTc9eepivYJg/8shdpGyYXbXUldBP1hRLSVMCNKAbr1fQ8YnLWSbaQMUf Fwk88tAHq6hwxESkosQyeYmyNpsDtSCCSEj5jPS0+FxkvcNolHeQLBBgBOd8Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068919; a=rsa-sha256; cv=none; b=ogWTOVQh++EX/CBN7bOiF4lsW/eJOzfa1h7D4fHGFgqAxjoN87uf9SwhTxPG4aLXizq8Im U5wHhM9xJLoOPRae9S+c4CWGa8nPDpngXzka3NDGepW183+fId91PjYORqMJC+62pVTMsu Ipsw6Pn4Jz0Ec0g0VA9wDvZcH47LH1do9p99y6TCXnJnxb72MrtvZJws4i8y4S4yfqnKgm uUZzFpVSJm+iDbpFtCFcZCvK30RzVqtN2EMgobcGugUjytMqW2JX0s8OXTx5tcOlSvxJW0 sFN+AI1E8qiw+8XVNf8nSieyFOzJ0Yaq9Vt700a/pJTZVzQyutH/JD0ZPPH9jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ziakp4WCmgXpiRhZifoWjlaxquNjarcgZNRI2bnllhk=; b=smS6Pn7FsV80BIqVcNmcbA/LJCDNVY4fnHjnTsQhDpygULVkdijhaIBA+UpgHF6uNkbk54 Eo1XmtHB6T7CJaYPTe9DK/OWGizXKNO5SAKwZXqV29JRHGpKPtM+qCOmR1EL2/kofvdmw6 mmVNpptj9UL3Jx2IjO7zW7xLgAN6b5l133Dz64cDUjwylVjTJ1+ZCGmAVIHO+QMajTgzrX vpeCrK4kjC3vQsBVnkg9wVNkoRvakeg24A3eeE2BKwkd2VxnUas20iY2sfR5Nw7s2uuHjh kA+T7ojZOkJSVxTR4ARyunKwWC8EjyRIOKq4cIl/ZfnTqFv/WZcQ9avvVDt2ow== 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 4Rh8mR38TczpXt; Thu, 7 Sep 2023 06:41:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876fx2L002865; Thu, 7 Sep 2023 06:41:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876fxe5002854; Thu, 7 Sep 2023 06:41:59 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:41:59 GMT Message-Id: <202309070641.3876fxe5002854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 12b1c1e3fb44 - main - libc: Add test cases for N2680. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 12b1c1e3fb446021a881d9815465137843fca50b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=12b1c1e3fb446021a881d9815465137843fca50b commit 12b1c1e3fb446021a881d9815465137843fca50b Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 06:40:14 +0000 libc: Add test cases for N2680. This adds test cases for %wN and %wfN to the printf(3) and scanf(3) tests. While here, fix a few nits in the N2630 test cases. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41743 --- lib/libc/tests/stdio/snprintf_test.c | 66 ++++++++++++++++++++++++++++++++ lib/libc/tests/stdio/sscanf_test.c | 65 ++++++++++++++++++++++++++++++++ lib/libc/tests/stdio/swprintf_test.c | 66 ++++++++++++++++++++++++++++++++ lib/libc/tests/stdio/swscanf_test.c | 73 ++++++++++++++++++++++++++++++++++-- 4 files changed, 267 insertions(+), 3 deletions(-) diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 10d938435b96..323356b37a7d 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -127,6 +127,70 @@ ATF_TC_BODY(snprintf_X, tc) SNPRINTF_TEST("0X007FFFFFFF", "%#012X", INT_MAX); } +ATF_TC_WITHOUT_HEAD(snprintf_wN); +ATF_TC_BODY(snprintf_wN, tc) +{ + SNPRINTF_TEST("0", "%w8d", (int8_t)0); + SNPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); + SNPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SNPRINTF_TEST("0", "%w8u", (uint8_t)0); + SNPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); + + SNPRINTF_TEST("0", "%w16d", (int16_t)0); + SNPRINTF_TEST("-32768", "%w16d", (int16_t)SHRT_MIN); + SNPRINTF_TEST("32767", "%w16d", (int16_t)SHRT_MAX); + SNPRINTF_TEST("0", "%w16u", (uint16_t)0); + SNPRINTF_TEST("65535", "%w16u", (uint16_t)USHRT_MAX); + + SNPRINTF_TEST("0", "%w32d", (int32_t)0); + SNPRINTF_TEST("-2147483648", "%w32d", (int32_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%w32d", (int32_t)INT_MAX); + SNPRINTF_TEST("0", "%w32u", (uint32_t)0); + SNPRINTF_TEST("4294967295", "%w32u", (uint32_t)UINT_MAX); + + SNPRINTF_TEST("0", "%w64d", (int64_t)0); + SNPRINTF_TEST("-9223372036854775808", "%w64d", (int64_t)LLONG_MIN); + SNPRINTF_TEST("9223372036854775807", "%w64d", (int64_t)LLONG_MAX); + SNPRINTF_TEST("0", "%w64u", (uint64_t)0); + SNPRINTF_TEST("18446744073709551615", "%w64u", (uint64_t)ULLONG_MAX); + + SNPRINTF_TEST("wd", "%wd", 0); + SNPRINTF_TEST("w1d", "%w1d", 0); + SNPRINTF_TEST("w128d", "%w128d", 0); +} + +ATF_TC_WITHOUT_HEAD(snprintf_wfN); +ATF_TC_BODY(snprintf_wfN, tc) +{ + SNPRINTF_TEST("0", "%wf8d", (int_fast8_t)0); + SNPRINTF_TEST("-2147483648", "%wf8d", (int_fast8_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%wf8d", (int_fast8_t)INT_MAX); + SNPRINTF_TEST("0", "%wf8u", (uint8_t)0); + SNPRINTF_TEST("4294967295", "%wf8u", (uint_fast8_t)UINT_MAX); + + SNPRINTF_TEST("0", "%wf16d", (int_fast16_t)0); + SNPRINTF_TEST("-2147483648", "%wf16d", (int_fast16_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%wf16d", (int_fast16_t)INT_MAX); + SNPRINTF_TEST("0", "%wf16u", (uint16_t)0); + SNPRINTF_TEST("4294967295", "%wf16u", (uint_fast16_t)UINT_MAX); + + SNPRINTF_TEST("0", "%wf32d", (int_fast32_t)0); + SNPRINTF_TEST("-2147483648", "%wf32d", (int_fast32_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%wf32d", (int_fast32_t)INT_MAX); + SNPRINTF_TEST("0", "%wf32u", (uint32_t)0); + SNPRINTF_TEST("4294967295", "%wf32u", (uint_fast32_t)UINT_MAX); + + SNPRINTF_TEST("0", "%wf64d", (int_fast64_t)0); + SNPRINTF_TEST("-9223372036854775808", "%wf64d", (int_fast64_t)LLONG_MIN); + SNPRINTF_TEST("9223372036854775807", "%wf64d", (int_fast64_t)LLONG_MAX); + SNPRINTF_TEST("0", "%wf64u", (uint64_t)0); + SNPRINTF_TEST("18446744073709551615", "%wf64u", (uint_fast64_t)ULLONG_MAX); + + SNPRINTF_TEST("wfd", "%wfd", 0); + SNPRINTF_TEST("wf1d", "%wf1d", 0); + SNPRINTF_TEST("wf128d", "%wf128d", 0); +} + ATF_TP_ADD_TCS(tp) { setlocale(LC_NUMERIC, "en_US.UTF-8"); @@ -135,5 +199,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, snprintf_d); ATF_TP_ADD_TC(tp, snprintf_x); ATF_TP_ADD_TC(tp, snprintf_X); + ATF_TP_ADD_TC(tp, snprintf_wN); + ATF_TP_ADD_TC(tp, snprintf_wfN); return (atf_no_error()); } diff --git a/lib/libc/tests/stdio/sscanf_test.c b/lib/libc/tests/stdio/sscanf_test.c index 462b4a6586da..e916873d38c3 100644 --- a/lib/libc/tests/stdio/sscanf_test.c +++ b/lib/libc/tests/stdio/sscanf_test.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include @@ -237,6 +238,68 @@ ATF_TC_BODY(sscanf_i, tc) } } +ATF_TC_WITHOUT_HEAD(sscanf_wN); +ATF_TC_BODY(sscanf_wN, tc) +{ + const char x00[] = "0x00"; + const char x7f[] = "0x7fffffffffffffff"; + const char xff[] = "0xffffffffffffffff"; + +#define SSCANF_WN_TEST(N, imin, umax) \ + do { \ + int##N##_t i; \ + uint##N##_t u; \ + ATF_CHECK_EQ(1, sscanf(x00, "%w" #N "i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, sscanf(x7f, "%w" #N "i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, sscanf(x00, "%w" #N "x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, sscanf(xff, "%w" #N "x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SSCANF_WN_TEST(8, -1, UCHAR_MAX); + SSCANF_WN_TEST(16, -1, USHRT_MAX); + SSCANF_WN_TEST(32, -1, UINT_MAX); + SSCANF_WN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SSCANF_WN_TEST + + ATF_CHECK_EQ(0, sscanf(x00, "%wi", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%w1i", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%w128i", (int *)NULL)); +} + +ATF_TC_WITHOUT_HEAD(sscanf_wfN); +ATF_TC_BODY(sscanf_wfN, tc) +{ + const char x00[] = "0x00"; + const char x7f[] = "0x7fffffffffffffff"; + const char xff[] = "0xffffffffffffffff"; + +#define SSCANF_WFN_TEST(N, imin, umax) \ + do { \ + int_fast##N##_t i; \ + uint_fast##N##_t u; \ + ATF_CHECK_EQ(1, sscanf(x00, "%wf" #N "i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, sscanf(x7f, "%wf" #N "i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, sscanf(x00, "%wf" #N "x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, sscanf(xff, "%wf" #N "x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SSCANF_WFN_TEST(8, -1, UINT_MAX); + SSCANF_WFN_TEST(16, -1, UINT_MAX); + SSCANF_WFN_TEST(32, -1, UINT_MAX); + SSCANF_WFN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SSCANF_WFN_TEST + + ATF_CHECK_EQ(0, sscanf(x00, "%wfi", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%wf1i", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%wf128i", (int *)NULL)); +} + /* * Test termination cases: non-numeric character, fixed width, EOF */ @@ -261,6 +324,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, sscanf_d); ATF_TP_ADD_TC(tp, sscanf_x); ATF_TP_ADD_TC(tp, sscanf_i); + ATF_TP_ADD_TC(tp, sscanf_wN); + ATF_TP_ADD_TC(tp, sscanf_wfN); ATF_TP_ADD_TC(tp, sscanf_termination); return (atf_no_error()); } diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index 23859b5cd2e1..f5dde349412b 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -128,6 +128,70 @@ ATF_TC_BODY(swprintf_X, tc) SWPRINTF_TEST("0X007FFFFFFF", "%#012X", INT_MAX); } +ATF_TC_WITHOUT_HEAD(swprintf_wN); +ATF_TC_BODY(swprintf_wN, tc) +{ + SWPRINTF_TEST("0", "%w8d", (int8_t)0); + SWPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); + SWPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SWPRINTF_TEST("0", "%w8u", (uint8_t)0); + SWPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); + + SWPRINTF_TEST("0", "%w16d", (int16_t)0); + SWPRINTF_TEST("-32768", "%w16d", (int16_t)SHRT_MIN); + SWPRINTF_TEST("32767", "%w16d", (int16_t)SHRT_MAX); + SWPRINTF_TEST("0", "%w16u", (uint16_t)0); + SWPRINTF_TEST("65535", "%w16u", (uint16_t)USHRT_MAX); + + SWPRINTF_TEST("0", "%w32d", (int32_t)0); + SWPRINTF_TEST("-2147483648", "%w32d", (int32_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%w32d", (int32_t)INT_MAX); + SWPRINTF_TEST("0", "%w32u", (uint32_t)0); + SWPRINTF_TEST("4294967295", "%w32u", (uint32_t)UINT_MAX); + + SWPRINTF_TEST("0", "%w64d", (int64_t)0); + SWPRINTF_TEST("-9223372036854775808", "%w64d", (int64_t)LLONG_MIN); + SWPRINTF_TEST("9223372036854775807", "%w64d", (int64_t)LLONG_MAX); + SWPRINTF_TEST("0", "%w64u", (uint64_t)0); + SWPRINTF_TEST("18446744073709551615", "%w64u", (uint64_t)ULLONG_MAX); + + SWPRINTF_TEST("wd", "%wd", 0); + SWPRINTF_TEST("w1d", "%w1d", 0); + SWPRINTF_TEST("w128d", "%w128d", 0); +} + +ATF_TC_WITHOUT_HEAD(swprintf_wfN); +ATF_TC_BODY(swprintf_wfN, tc) +{ + SWPRINTF_TEST("0", "%wf8d", (int_fast8_t)0); + SWPRINTF_TEST("-2147483648", "%wf8d", (int_fast8_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%wf8d", (int_fast8_t)INT_MAX); + SWPRINTF_TEST("0", "%wf8u", (uint8_t)0); + SWPRINTF_TEST("4294967295", "%wf8u", (uint_fast8_t)UINT_MAX); + + SWPRINTF_TEST("0", "%wf16d", (int_fast16_t)0); + SWPRINTF_TEST("-2147483648", "%wf16d", (int_fast16_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%wf16d", (int_fast16_t)INT_MAX); + SWPRINTF_TEST("0", "%wf16u", (uint16_t)0); + SWPRINTF_TEST("4294967295", "%wf16u", (uint_fast16_t)UINT_MAX); + + SWPRINTF_TEST("0", "%wf32d", (int_fast32_t)0); + SWPRINTF_TEST("-2147483648", "%wf32d", (int_fast32_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%wf32d", (int_fast32_t)INT_MAX); + SWPRINTF_TEST("0", "%wf32u", (uint32_t)0); + SWPRINTF_TEST("4294967295", "%wf32u", (uint_fast32_t)UINT_MAX); + + SWPRINTF_TEST("0", "%wf64d", (int_fast64_t)0); + SWPRINTF_TEST("-9223372036854775808", "%wf64d", (int_fast64_t)LLONG_MIN); + SWPRINTF_TEST("9223372036854775807", "%wf64d", (int_fast64_t)LLONG_MAX); + SWPRINTF_TEST("0", "%wf64u", (uint64_t)0); + SWPRINTF_TEST("18446744073709551615", "%wf64u", (uint_fast64_t)ULLONG_MAX); + + SWPRINTF_TEST("wfd", "%wfd", 0); + SWPRINTF_TEST("wf1d", "%wf1d", 0); + SWPRINTF_TEST("wf128d", "%wf128d", 0); +} + ATF_TP_ADD_TCS(tp) { setlocale(LC_NUMERIC, "en_US.UTF-8"); @@ -136,5 +200,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, swprintf_d); ATF_TP_ADD_TC(tp, swprintf_x); ATF_TP_ADD_TC(tp, swprintf_X); + ATF_TP_ADD_TC(tp, swprintf_wN); + ATF_TP_ADD_TC(tp, swprintf_wfN); return (atf_no_error()); } diff --git a/lib/libc/tests/stdio/swscanf_test.c b/lib/libc/tests/stdio/swscanf_test.c index 10eaf786e5fa..f7ad30b963a7 100644 --- a/lib/libc/tests/stdio/swscanf_test.c +++ b/lib/libc/tests/stdio/swscanf_test.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include @@ -11,6 +12,8 @@ #include +#define L(s) L ## s + static const struct swscanf_test_case { wchar_t input[8]; struct { @@ -150,7 +153,7 @@ static const struct swscanf_test_case { #define SWSCANF_TEST(string, format, expret, expval, explen) \ do { \ int ret = 0, val = 0, len = 0; \ - ret = swscanf(string, format "%n", &val, &len); \ + ret = swscanf(string, format L"%n", &val, &len); \ ATF_CHECK_EQ(expret, ret); \ if (expret && ret) { \ ATF_CHECK_EQ(expval, val); \ @@ -238,6 +241,68 @@ ATF_TC_BODY(swscanf_i, tc) } } +ATF_TC_WITHOUT_HEAD(swscanf_wN); +ATF_TC_BODY(swscanf_wN, tc) +{ + const wchar_t x00[] = L"0x00"; + const wchar_t x7f[] = L"0x7fffffffffffffff"; + const wchar_t xff[] = L"0xffffffffffffffff"; + +#define SWSCANF_WN_TEST(N, imin, umax) \ + do { \ + int##N##_t i; \ + uint##N##_t u; \ + ATF_CHECK_EQ(1, swscanf(x00, L"%w" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, swscanf(x7f, L"%w" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, swscanf(x00, L"%w" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, swscanf(xff, L"%w" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SWSCANF_WN_TEST(8, -1, UCHAR_MAX); + SWSCANF_WN_TEST(16, -1, USHRT_MAX); + SWSCANF_WN_TEST(32, -1, UINT_MAX); + SWSCANF_WN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SWSCANF_WN_TEST + + ATF_CHECK_EQ(0, swscanf(x00, L"%wi", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%w1i", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%w128i", (int *)NULL)); +} + +ATF_TC_WITHOUT_HEAD(swscanf_wfN); +ATF_TC_BODY(swscanf_wfN, tc) +{ + const wchar_t x00[] = L"0x00"; + const wchar_t x7f[] = L"0x7fffffffffffffff"; + const wchar_t xff[] = L"0xffffffffffffffff"; + +#define SWSCANF_WFN_TEST(N, imin, umax) \ + do { \ + int_fast##N##_t i; \ + uint_fast##N##_t u; \ + ATF_CHECK_EQ(1, swscanf(x00, L"%wf" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, swscanf(x7f, L"%wf" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, swscanf(x00, L"%wf" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, swscanf(xff, L"%wf" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SWSCANF_WFN_TEST(8, -1, UINT_MAX); + SWSCANF_WFN_TEST(16, -1, UINT_MAX); + SWSCANF_WFN_TEST(32, -1, UINT_MAX); + SWSCANF_WFN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SWSCANF_WFN_TEST + + ATF_CHECK_EQ(0, swscanf(x00, L"%wfi", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%wf1i", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%wf128i", (int *)NULL)); +} + /* * Test termination cases: non-numeric character, fixed width, EOF */ @@ -245,9 +310,9 @@ ATF_TC_WITHOUT_HEAD(swscanf_termination); ATF_TC_BODY(swscanf_termination, tc) { int a = 0, b = 0, c = 0; - char d = 0; + wchar_t d = 0; - ATF_CHECK_EQ(4, swscanf(L"3.1415", L"%d%c%2d%d", &a, &d, &b, &c)); + ATF_CHECK_EQ(4, swscanf(L"3.1415", L"%d%lc%2d%d", &a, &d, &b, &c)); ATF_CHECK_EQ(3, a); ATF_CHECK_EQ(14, b); ATF_CHECK_EQ(15, c); @@ -262,6 +327,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, swscanf_d); ATF_TP_ADD_TC(tp, swscanf_x); ATF_TP_ADD_TC(tp, swscanf_i); + ATF_TP_ADD_TC(tp, swscanf_wN); + ATF_TP_ADD_TC(tp, swscanf_wfN); ATF_TP_ADD_TC(tp, swscanf_termination); return (atf_no_error()); } From nobody Thu Sep 7 06:42:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8mS5kVWz4slML; Thu, 7 Sep 2023 06:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8mS4k0jz4MPb; Thu, 7 Sep 2023 06:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/AcwKSOgeg67SECf+XL2MoOJCodmjGzxHVCFacoG4c=; b=Cs2OpVTmSoHxsPobZ1PiVnsugWpE/CCDjr5mRA/KKLTHDx+a/k2nRELCJ8Pam1jK1MNxDh RdLcWGj2yYXKm1dKpsX081/yPAeCT8PbyCQCvcYGfGh5JSLu8AZRFhjuBGMWXW/+/1ZuTw ST4eHY0bG0LYFKXW9mlQw8ow1rHMS0ZUxSWsiKgOQe4sXf44MDrSiAIleWm4bCMszI7m3N bTGGgcCaMGruChoqlFxJMEjgybTbbAWkx1gCntjunHgqXnF6GgqXcXibmWMXun/dkgnXcE gL4WcFNjROYBgyrhNS3qUHPCfu1ufa79pVJNzzuY2tRoZM5nNXBD6hfwn0gPwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068920; a=rsa-sha256; cv=none; b=XyVk5Q8pqVwczYj2RB5tgoASW7N9NB67OPXxDM9+s1PTWBzFmK7Y+8AuiS1Q8OVZcR70ff zczCXfxtDDw4jKJdyXsF6C3veeZ9fLuOUKhLzRds9O8DQyZ8aXhmvKhOSq5tIF2tpTgYFB UfMK302ba4G0IjhNGYTp8tehfyvEhlTPF3efPE5D/DBG5Z7YswFyCVXPPmq7ilAKmMnUVe yKjzMgj1qcK0EtD//AShaQC7E5cHtbhP989uWK7RoacO5fapnXr/Aoq/0niBBk4BcTB+8I sN1XY5b6GcARR3HkbiBRNR6/2e2/sGC+1kb/dqWYTbuPS0EYgJC+VOc0ctBZ4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X/AcwKSOgeg67SECf+XL2MoOJCodmjGzxHVCFacoG4c=; b=ArSE6bai2sCZXuNjFxRM4UdxflKLJmgC4PEUrKgyZiJ7mFLINq/5h4fIXj4wd9l4WHevI+ 8uYIsU0NTuIqL9U7h6JLpI7Ha2Wc/MccYwr8gMRs0HxpqUpMMreX8HS8wShmrdUwi7XiEB vwZY3qSHpM+j/hYHmCBdRCRMLCUosaIdmMPwKrgPrXaViMkzlSJD7T/JmrZITUXZmvMemi KOSyYMgAd3pbhp68J8QDhkST4+ndnthSvhR6EtTfXc7rj1XFMTveOLYfHAAgm2zf1YN0Dv Ymi6Bi5HTv/y/J0YeKe31RgUAPRrCMlMMgfA4lLopNNCcLxkzUTHdBMUYQLpiw== 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 4Rh8mS3l0zzpYV; Thu, 7 Sep 2023 06:42:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876g0MW003090; Thu, 7 Sep 2023 06:42:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876g0h0003087; Thu, 7 Sep 2023 06:42:00 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:42:00 GMT Message-Id: <202309070642.3876g0h0003087@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e6615b10347c - main - include: Implement N2867. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6615b10347caf67f5bc12c9a8e30b8ddd9860ae Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e6615b10347caf67f5bc12c9a8e30b8ddd9860ae commit e6615b10347caf67f5bc12c9a8e30b8ddd9860ae Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 06:40:14 +0000 include: Implement N2867. This adds macros for checked addition, subtraction, and multiplication with semantics similar to the builtins gcc and clang have had for years. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D41734 --- include/Makefile | 2 +- include/stdckdint.h | 40 +++++++++++++++++ share/man/man3/Makefile | 4 ++ share/man/man3/stdckdint.3 | 106 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 151 insertions(+), 1 deletion(-) diff --git a/include/Makefile b/include/Makefile index 1d7651216cf9..bc1cfd96dfc9 100644 --- a/include/Makefile +++ b/include/Makefile @@ -30,7 +30,7 @@ INCS= a.out.h ar.h assert.h bitstring.h byteswap.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h \ res_update.h resolv.h runetype.h sched.h \ search.h semaphore.h setjmp.h \ - signal.h spawn.h stab.h stdalign.h stdbool.h stddef.h \ + signal.h spawn.h stab.h stdalign.h stdbool.h stdckdint.h stddef.h \ stdnoreturn.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ diff --git a/include/stdckdint.h b/include/stdckdint.h new file mode 100644 index 000000000000..af3074dded89 --- /dev/null +++ b/include/stdckdint.h @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef __STDC_VERSION_STDCKDINT_H__ +#define __STDC_VERSION_STDCKDINT_H__ 202311L + +#include + +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 + +#if __GNUC_PREREQ__(5, 1) || __has_builtin(__builtin_add_overflow) +#define ckd_add(result, a, b) \ + (_Bool)__builtin_add_overflow((a), (b), (result)) +#else +#define ckd_add(result, a, b) \ + _Static_assert(0, "checked addition not supported") +#endif + +#if __GNUC_PREREQ__(5, 1) || __has_builtin(__builtin_sub_overflow) +#define ckd_sub(result, a, b) \ + (_Bool)__builtin_sub_overflow((a), (b), (result)) +#else +#define ckd_sub(result, a, b) \ + _Static_assert(0, "checked subtraction not supported") +#endif + +#if __GNUC_PREREQ__(5, 1) || __has_builtin(__builtin_mul_overflow) +#define ckd_mul(result, a, b) \ + (_Bool)__builtin_mul_overflow((a), (b), (result)) +#else +#define ckd_mul(result, a, b) \ + _Static_assert(0, "checked multiplication not supported") +#endif + +#endif + +#endif diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 5aec58492b8f..7fff5eedd5fb 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -29,6 +29,7 @@ MAN= arb.3 \ snl.3 \ stats.3 \ stdarg.3 \ + stdckdint.3 \ sysexits.3 \ tgmath.3 \ timeradd.3 \ @@ -310,6 +311,9 @@ MLINKS+= stdarg.3 va_arg.3 \ stdarg.3 va_end.3 \ stdarg.3 varargs.3 \ stdarg.3 va_start.3 +MLINKS+= stdckdint.3 ckd_add.3 \ + stdckdint.3 ckd_sub.3 \ + stdckdint.3 ckd_mul.3 MLINKS+= timeradd.3 timerclear.3 \ timeradd.3 timercmp.3 \ timeradd.3 timerisset.3 \ diff --git a/share/man/man3/stdckdint.3 b/share/man/man3/stdckdint.3 new file mode 100644 index 000000000000..e3593472c08b --- /dev/null +++ b/share/man/man3/stdckdint.3 @@ -0,0 +1,106 @@ +.\"- +.\" Copyright (c) 2023 Dag-Erling Smørgrav +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd September 5, 2023 +.Dt STDCKDINT 3 +.Os +.Sh NAME +.Nm stdckdint +.Nd checked integer arithmetic +.Sh SYNOPSIS +.In stdckdint.h +.Ft bool +.Fn ckd_add "type1 *result" "type2 a" "type3 b" +.Ft bool +.Fn ckd_sub "type1 *result" "type2 a" "type3 b" +.Ft bool +.Fn ckd_mul "type1 *result" "type2 a" "type3 b" +.Sh DESCRIPTION +The function-like macros +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +perform checked integer addition, subtraction, and multiplication, +respectively. +If the result of adding, subtracting, or multiplying +.Fa a +and +.Fa b +as if their respective types had infinite range fits in +.Ft type1 , +it is stored in the location pointed to by +.Fa result +and the macro evaluates to +.Dv false . +Otherwise, the macro evaluates to +.Dv true +and the contents of the location pointed to by +.Fa result +is the result of the operation wrapped to the range of +.Ft type1 . +.Sh RETURN VALUES +The +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +macros evaluate to +.Dv true +if the requested operation overflowed the result type and +.Dv false +otherwise. +.Sh EXAMPLES +.Bd -literal -offset indent +#include +#include +#include + +int main(void) +{ + int result; + + assert(!ckd_add(&result, INT_MAX, 0)); + assert(result == INT_MAX); + assert(ckd_add(&result, INT_MAX, 1)); + assert(result == INT_MIN); + + assert(!ckd_sub(&result, INT_MIN, 0)); + assert(result == INT_MIN); + assert(ckd_sub(&result, INT_MIN, 1)); + assert(result == INT_MAX); + + assert(!ckd_mul(&result, INT_MAX / 2, 2)); + assert(result == INT_MAX - 1); + assert(ckd_mul(&result, INT_MAX / 2 + 1, 2)); + assert(result == INT_MIN); + + return 0; +} +.Ed +.\" .Sh STANDARDS +.\" The +.\" .Nm ckd_add , +.\" .Nm ckd_sub , +.\" and +.\" .Nm ckd_mul +.\" macros conform to +.\" .St -isoC-23 . +.Sh HISTORY +The +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +macros were first introduced in +.Fx 14.0 . +.Sh AUTHORS +The +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +macros and this manual page were written by +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . From nobody Thu Sep 7 06:42:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8mT65X1z4slMP; Thu, 7 Sep 2023 06:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8mT5c4qz4MVh; Thu, 7 Sep 2023 06:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtMX9HGMWkA3RS3471IN8zFnPeAA1nFvsq9FfnAnwu0=; b=DnZYHLM9hCgbSDY26cbKQq9NObQEklkEgOE1r2yk7X0qAwu0SmOm/gjfu6clt0x9LwMvRs 69ud4Za1zQ+rR58UGVL2ec0ieVhA2R3k5fc2uavPeY1XMge0qAeQDaQLQaJb4yCLaCD5f8 fEczSgPp856qK09Qm9ZYtRlJAnDRiwScEqkhzNvPxbJy/ZdFhhSZEiwPDaILeB4QnzDuMz SpG9768GPryrgKClZjfXbKjJvOW1efu7AidMIIsKVV2zemMj3zPioFSpqwWDcCJFtug7Av sxxpo00uYj/u6TpvInyypxF8s+8jIeWF6Kh2J3Aui1aeOLMVIuJbpHEWN+p8+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068921; a=rsa-sha256; cv=none; b=qb7XcXbqTX9BWQb6rz+kJVnFlrK9CinFKG3QXASafIamSLKkz8eRZp78JJS3f/3U3LsVDX 9CY+HlkqSTIShUxxW7PqXsY5oO87qo8oCfe1m8ehiGIQ4WW2uUihrZj/J62i3GwIslcpSI T9rHYP4VHHKU1sC/2OBZBRK+LtnZ13qQ0LPb9EhRReC6BVDhlUsFP3RyWbEvaY8MeolumV MmJ9FPvD05FxDZbmp3vTjY4LNUaYHnv/qu8u2wMt5dxon9NZwsaCTgljKpAL3OfWyN/b7r IQCE/7migjJHzVccLMCjxElTsRzsO6mDQ+UD7OL/FaGGX7sSrfGShbosK7neyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068921; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DtMX9HGMWkA3RS3471IN8zFnPeAA1nFvsq9FfnAnwu0=; b=Q3gW4g0O8bjYwYRQqsAV/7mE48BtJ7PcPJ22dL1ss8r9iLbeQbBK5fvh7iQmXrsKNJwXh4 FzcWSrzzhGFgDm1qC6PaqH1DFUZsd8k7UmjRovtROZ3xw+9ugIeuayvlWYijKU2zi58HQJ FLSgDYHXQMMyS1nbjLN8XWe5Md/aompVT5ZWZPXJL5Owgc3dYyadj5se+1ybm+cn20dPJE ZLkdcJQiJZGe7J7OniDVtTJ0jTR5SfHWraCfKacK+lQDsXSU/33/Q8THGVrIT7atw5KCPA gjOTyxX0tAq8h9TREnYKbaebxmqzDqF1jooIiW5bsCJXdPzD8vbp4RGTLQZaCw== 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 4Rh8mT4jCqzpNN; Thu, 7 Sep 2023 06:42:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876g1Qp003135; Thu, 7 Sep 2023 06:42:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876g1Ax003132; Thu, 7 Sep 2023 06:42:01 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:42:01 GMT Message-Id: <202309070642.3876g1Ax003132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4fbb9c43aa44 - main - include: Add tests for N2867. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fbb9c43aa44d9145151bb5f77d302ba01fb7551 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4fbb9c43aa44d9145151bb5f77d302ba01fb7551 commit 4fbb9c43aa44d9145151bb5f77d302ba01fb7551 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:59 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 06:40:14 +0000 include: Add tests for N2867. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41735 --- etc/mtree/BSD.tests.dist | 2 ++ tests/Makefile | 1 + tests/include/Makefile | 7 ++++++ tests/include/stdckdint_test.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index fb755b4001ac..04dc24d772c8 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -278,6 +278,8 @@ .. .. .. + include + .. lib atf libatf-c diff --git a/tests/Makefile b/tests/Makefile index bd20d063ca71..09c0fbc62a2e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -9,6 +9,7 @@ KYUAFILE= yes SUBDIR+= etc SUBDIR+= examples +SUBDIR+= include SUBDIR+= sys SUBDIR+= atf_python diff --git a/tests/include/Makefile b/tests/include/Makefile new file mode 100644 index 000000000000..e98d08da1f2b --- /dev/null +++ b/tests/include/Makefile @@ -0,0 +1,7 @@ +.include + +TESTSDIR= ${TESTSBASE}/include + +ATF_TESTS_C+= stdckdint_test + +.include diff --git a/tests/include/stdckdint_test.c b/tests/include/stdckdint_test.c new file mode 100644 index 000000000000..89262bbd5500 --- /dev/null +++ b/tests/include/stdckdint_test.c @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include + +ATF_TC_WITHOUT_HEAD(ckd_add); +ATF_TC_BODY(ckd_add, tc) +{ + int result; + + ATF_CHECK(!ckd_add(&result, INT_MAX, 0)); + ATF_CHECK_EQ(INT_MAX, result); + ATF_CHECK(ckd_add(&result, INT_MAX, 1)); + ATF_CHECK_EQ(INT_MIN, result); +} + +ATF_TC_WITHOUT_HEAD(ckd_sub); +ATF_TC_BODY(ckd_sub, tc) +{ + int result; + + ATF_CHECK(!ckd_sub(&result, INT_MIN, 0)); + ATF_CHECK_EQ(INT_MIN, result); + ATF_CHECK(ckd_sub(&result, INT_MIN, 1)); + ATF_CHECK_EQ(INT_MAX, result); +} + +ATF_TC_WITHOUT_HEAD(ckd_mul); +ATF_TC_BODY(ckd_mul, tc) +{ + int result; + + ATF_CHECK(!ckd_mul(&result, INT_MAX / 2, 2)); + ATF_CHECK_EQ(INT_MAX - 1, result); + ATF_CHECK(ckd_mul(&result, INT_MAX / 2 + 1, 2)); + ATF_CHECK_EQ(INT_MIN, result); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, ckd_add); + ATF_TP_ADD_TC(tp, ckd_sub); + ATF_TP_ADD_TC(tp, ckd_mul); + return (atf_no_error()); + +} From nobody Thu Sep 7 06:42:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rh8mW09YYz4slGT; Thu, 7 Sep 2023 06:42:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rh8mV6SbFz4MWL; Thu, 7 Sep 2023 06:42:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=imTXKF3Fc2TIC6yfiZRtV7kpX/f5BeE62mZKRu1dBJQ=; b=GOnP3nhCtWcLF6avVFTJpWEb4/1lsoq+7tmETxHqMcYC4zmsTjXAF0TcX61o0kmhK95e0h x5HWqfEEhHzaSB1rihHxlPhrslR2vSwPOzMpu77NdbKd+SDGL69EB8e/le5OFWTV8sE15O zuw86aI7CQg4sJhuzHdvasIVRjk2RSs/iYLdT7I+ixLhbF3ba5+ooCZFF4dVSQdejxmW4q 59XF700EjAmYi8QYvKyd9rfGySCAZpNqyvPX73IssQlON/15baUnVApoP5ktD5tmHrXyFs wyR/5/6EckUQPQOh+kHpumZskFRm9ExIGM38QVdSVSThCKuuxvT65nBLtdfbag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694068922; a=rsa-sha256; cv=none; b=VRAQPIcbEt2Id5u6KOkq+90Tvvk6EHyd+sdj4RyF9T6/CP0f+drfpRmdT0L5ya6BuvVql0 r5sMIMgYu5DbVDu6JzZZtPPNkVHcjqW0EK7oBOQe3E6eBG5v8nH21BvnVyplAsLYS6buye P+211nbEpETI9XWDQNAj9GPDPsIQQRIGhwPtBAixRVF8QnXOvcKWSenxFCWN/SbS1KkCaX ncQVqyseOe6QLNeJcv4oNmu78eEKURZaQWnkZuORNTRnv3ykC49h/vXfCmPPyF2WbGgy8Q Y7TdXkysr5rHn4NwLVrhn7KkJgs0n6sEoR+8rjdmNfKO7SHvjHXlXa7WvFRFjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694068922; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=imTXKF3Fc2TIC6yfiZRtV7kpX/f5BeE62mZKRu1dBJQ=; b=U5gjlGQjRyVlyhTuz0MpuzYXY1g8F5w5QFD9ZKFhZljWav+wCnjkULncla3TgLb6AT/n+g zBkIIZJc2WekuYVwrhMHDwXeOMNP9IlVxBug3F7KQP8FXBYsuL+B7FM62kk8SX0fGT7bDG Vukk6K9EpMj/wo3836cHok0BdtZvtHW3S47ATG9ehjdKZu/0nfY+lHr51kT+oILNCNylG+ 9r0FcKHiH6Sb1SkOL8xSSeF/46PhXuexsFLeDR0848ksYSzarCUI9GKF31oeBW1zD27gKY EMKt6Zv1ZeYSqYb7yvfo85DEdHdQRTfaWhx5TrwpsNadUjzsphwtER9GezW5Ww== 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 4Rh8mV5WG8zpXw; Thu, 7 Sep 2023 06:42:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3876g2Qf003180; Thu, 7 Sep 2023 06:42:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3876g2xH003177; Thu, 7 Sep 2023 06:42:02 GMT (envelope-from git) Date: Thu, 7 Sep 2023 06:42:02 GMT Message-Id: <202309070642.3876g2xH003177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cb8dd292c7ec - main - less: We have now. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb8dd292c7ec53391dfa25847858dd7ef895f94e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cb8dd292c7ec53391dfa25847858dd7ef895f94e commit cb8dd292c7ec53391dfa25847858dd7ef895f94e Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:15:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 06:40:14 +0000 less: We have now. Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D41736 --- usr.bin/less/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/less/defines.h b/usr.bin/less/defines.h index 018d98a48162..ed9c2603970c 100644 --- a/usr.bin/less/defines.h +++ b/usr.bin/less/defines.h @@ -327,7 +327,7 @@ #define HAVE_STAT_INO 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDCKDINT_H */ +#define HAVE_STDCKDINT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 From nobody Thu Sep 7 07:40:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhB3Q0rrNz4s4vV; Thu, 7 Sep 2023 07:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhB3P6gTQz3DkQ; Thu, 7 Sep 2023 07:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694072401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0inK4Ql4AGDo2+uUpa6tuTdXmhPOtsyvLvlUjFsf5Vc=; b=yhck6qrpROCAYX4N1cFJRs9sx0USmiX+cOvvxba03jNBDEs/M5vPazlwEVoZ95OVk1vQjy wYw9zg2BVxabze2b0j4rMtBuqkOiZNjwXAgHN4ZHz6mH70BfXdA2XfaM0ON/nUOnY9cf4Y VcGVKf/OsjZI7WxyTur8ZnvTqxvg3rXT7+PmW/eEYt6pljR2GPKp1KKdaieQyLhTnfOGBX JfszCvjb5CAzrn8TZDo3mFSBcKxDPvpuxqATWYG7F2kZ6AyvcBRzbQ1j7gidSgvrnvyN0V VTocbNbBhNnQSQNpAJvu6Kzr79aJwlMbnwDnfBW0z2y0J7BBA204gAFvppAi5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694072401; a=rsa-sha256; cv=none; b=KEl9B3fm0CiIva3H33MyCadwwzaFQ7fbIRXTDUoWiyMebHdJOSXReElqOxn/lgeBfXa1DC QVfnHXjrl2pivnPJCY0Skr9lGbgwPveA4aaeD6Aw4GlSmzx1s2qXb4IC522NFEzgluYEij 9UupbOL+yZGDZPcvUPIET88CcRCuzxGzYrY7EwZfc1X2skxcVBL4W+TyPEl3neYVWo2sly J30Rflk/SSrpVFrpWZ9dMJTA7IdgtIGhMnTQ5rioRFak286Ep22VErEU9v2Lt3Jux0/NZt gAmZwOKzLMNeq5UgwAySy62S2b0J6vKtLdsPMKId1lSsty9Vw+8k6hCvck1EbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694072401; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0inK4Ql4AGDo2+uUpa6tuTdXmhPOtsyvLvlUjFsf5Vc=; b=eNfwDgs5kuLqq2U+e532/V3HEDXku/iqef3mWig7PeYzfGu48Fz5VlA27X9HRGI2t07A88 L6L/h5wbU7hUI+PDo5inHpK0SFxdLSnxHm3Q/lCFrjG5XQLuR5DhB1zWky2LkXsWnWt9bg LAwAnpcQ+rL2vWlNg/ODMCiPBXO4QExPX228Z1+Z91EMfOBB+kPmp+9sqXzVMpoP7kRoGk wULGawJ81FhDJXjIp9BYYj8gQk+r73dN3xFVEAeKHF35EAIE+US9o9xHPTuFpwAs4Bopyl RSYHsD54bcOxcW+Q0JGeiCBBfx/1Qwtgn0JzIJviqHhwuOkV4HG8S5ZUwQgwzg== 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 4RhB3P5jyLzqnX; Thu, 7 Sep 2023 07:40:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3877e1Wv088718; Thu, 7 Sep 2023 07:40:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3877e1Ig088711; Thu, 7 Sep 2023 07:40:01 GMT (envelope-from git) Date: Thu, 7 Sep 2023 07:40:01 GMT Message-Id: <202309070740.3877e1Ig088711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 60b37f216180 - stable/14 - vfs: copy_file_range() between multiple mountpoints of the same fs type List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 60b37f2161800f5b7e46ea8a0dd6d33aa4db5cd4 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=60b37f2161800f5b7e46ea8a0dd6d33aa4db5cd4 commit 60b37f2161800f5b7e46ea8a0dd6d33aa4db5cd4 Author: Martin Matuska AuthorDate: 2023-09-06 11:58:10 +0000 Commit: Martin Matuska CommitDate: 2023-09-07 07:39:40 +0000 vfs: copy_file_range() between multiple mountpoints of the same fs type VOP_COPY_FILE_RANGE(9) is now caled when source and target vnodes reside on the same filesystem type (not just on the same mountpoint). The check if vnodes are on the same mountpoint must be done in the filesystem code. There are currently only three users - fusefs(5) already has this check, ZFS can handle multiple mountpoints and a check has been added to NFS client. ZFS block cloning is now possible between all snapshots and datasets of the same ZFS pool. This is an early MFC due to release schedule. Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41721 Approved by: re (gjb) (cherry picked from commit 969071be938ca9b96f8dff003c7b43d6308849f1) --- share/man/man9/VOP_COPY_FILE_RANGE.9 | 4 ++-- sys/fs/nfsclient/nfs_clvnops.c | 7 +++++-- sys/kern/vfs_vnops.c | 8 +++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/share/man/man9/VOP_COPY_FILE_RANGE.9 b/share/man/man9/VOP_COPY_FILE_RANGE.9 index 9243210cb265..aa17670954f4 100644 --- a/share/man/man9/VOP_COPY_FILE_RANGE.9 +++ b/share/man/man9/VOP_COPY_FILE_RANGE.9 @@ -28,8 +28,8 @@ .Os .Sh NAME .Nm VOP_COPY_FILE_RANGE -.Nd copy a byte range from one file to another or within one file -in a single file system +.Nd copy a byte range within a file or from one file to another in a single +file system or between multiple file systems .Sh SYNOPSIS .In sys/param.h .In sys/vnode.h diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 1fa287a79a84..383d45ba260b 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3898,8 +3898,11 @@ nfs_copy_file_range(struct vop_copy_file_range_args *ap) off_t inoff, outoff; bool consecutive, must_commit, tryoutcred; - /* NFSv4.2 Copy is not permitted for infile == outfile. */ - if (invp == outvp) { + /* + * NFSv4.2 Copy is not permitted for infile == outfile. + * TODO: copy_file_range() between multiple NFS mountpoints + */ + if (invp == outvp || invp->v_mount != outvp->v_mount) { generic_copy: return (vn_generic_copy_file_range(invp, ap->a_inoffp, outvp, ap->a_outoffp, ap->a_lenp, ap->a_flags, diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 9fb5aee6a023..4e4161ef1a7f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -3076,12 +3076,14 @@ vn_copy_file_range(struct vnode *invp, off_t *inoffp, struct vnode *outvp, goto out; /* - * If the two vnode are for the same file system, call + * If the two vnodes are for the same file system type, call * VOP_COPY_FILE_RANGE(), otherwise call vn_generic_copy_file_range() - * which can handle copies across multiple file systems. + * which can handle copies across multiple file system types. */ *lenp = len; - if (invp->v_mount == outvp->v_mount) + if (invp->v_mount == outvp->v_mount || + strcmp(invp->v_mount->mnt_vfc->vfc_name, + outvp->v_mount->mnt_vfc->vfc_name) == 0) error = VOP_COPY_FILE_RANGE(invp, inoffp, outvp, outoffp, lenp, flags, incred, outcred, fsize_td); else From nobody Thu Sep 7 12:36:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhJdJ01Flz4sfWL; Thu, 7 Sep 2023 12:36:20 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhJdH6gs9z3Y67; Thu, 7 Sep 2023 12:36:19 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694090179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=bu300rOZ9oOBRNPqLj1CFbBXR3ltGHoQ3dkIpQPMo+k=; b=MWYKY0qMrB0HfbkoX7hLjk/Jj3X6agBFuQ00CFA0Rq8orAjpRIdn9w+iayBbTcyqGYqP87 sbfF9WYxbL0eAeDcL12zBfvPm90sWo+56/Ppby3huFeIdfhD3N8kaf12h69N8cL/qovUEq rQKI5XtfQpvtZApvMdPC5t8bLtsYgUVOC2nFsgdagIAPdjxMHyMOqsTB+ic9YSzQ1ymOOr 6xZ4wnn9kd/Q7wuHCKGipmf7bv+51w7tlCqcGL2ij3qlblwcs1ptOO4JS/aNlF1m819Q5L 0MKey+NkiqnoIcKJrFBb4IAU5bqAx556GPz1TfyyL8La+aGsmrmg1dqTkSVDnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694090179; a=rsa-sha256; cv=none; b=BCwvsGRwbHu2EJsVLn0J4+H5RMJlCr9FLRVT0oF9uvrP8J+rSdehuFG9ldIG5uvCt1jxov hSsexTqubFPXociXSN6Sl/rN7Ir2m+O5c122WTxtW+2MPCYs4+NyfW8WLEmHk++KaEB0H4 jaMpfwQFed8o9KQzxUMKnP/Zv/RMsr3umHVfgrBnEB5e7JUMgxH8ukaRskRxJNOyayXdz5 k5W8MrVZV6LoDOjQY0fcMkYdGYJCvO8qdLFKhc9S9XpHyEpjxzOWByEUeLGOX284OYJNrj bamL0juvM97bw+9u89vgMW59fgD/K6JAs75FRdSiQnPjX467yRibTVX3YDZQ9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694090179; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=bu300rOZ9oOBRNPqLj1CFbBXR3ltGHoQ3dkIpQPMo+k=; b=sHf8bud6JPK6xAPmn9SPXI7hf2OGcQjkNGF0hMt5sCE/JhpxZ6dgOohotRhNrlobh0W5Kf IUvG4V6xO37g+MGx3SyTcW6d3SVvchrwd42u0DUCZRt/FboreSVlnJimICba1EXsb+Zh2B +yYq3jjLd5DgtrnYbnx9Grg/ZpzcPDO9QDdtUanlZSgV+3whYYoZzzpOu0gianTs4HZKwC HOve6j2JCRrY3Ku4K0AzJEKfomqPuzoc//XrOqXDUlysZqVAcFNX6BwO8AWdzuwnLzEuwf cf4ERwv9jUDdOKy3HJyMwKbW87BHGJJBvUjOVOAFDDTLpUJqge/vO/aq0BOamA== Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RhJdH4N0Jz1B1K; Thu, 7 Sep 2023 12:36:19 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id DD17A8D4A179; Thu, 7 Sep 2023 12:36:16 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 04BE12D029D2; Thu, 7 Sep 2023 12:36:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id FszcdvmIr3b1; Thu, 7 Sep 2023 12:36:15 +0000 (UTC) Received: from strong-aiccu0.sbone.de (strong-aiccu0.sbone.de [IPv6:fde9:577b:c1a9:f491::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id B51EF2D029D1; Thu, 7 Sep 2023 12:36:14 +0000 (UTC) Date: Thu, 7 Sep 2023 12:36:13 +0000 (UTC) From: "Bjoern A. Zeeb" To: John Baldwin cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. In-Reply-To: <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> Message-ID: <4sr8n9or-q731-1945-893s-no953r283756@SerrOFQ.bet> References: <202309052116.385LGoau059784@gitrepo.freebsd.org> <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Wed, 6 Sep 2023, John Baldwin wrote: > On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote: >> On Wed, 6 Sep 2023, John Baldwin wrote: >> >>> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: >>>> The branch main has been updated by bz: >>>> >>>> URL: >>>> https://cgit.FreeBSD.org/src/commit/?id=cf94672363d6638b7268c05b4628b62bbfc8dbe5 >>>> >>>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 >>>> Author: Bjoern A. Zeeb >>>> AuthorDate: 2023-06-08 21:35:09 +0000 >>>> Commit: Bjoern A. Zeeb >>>> CommitDate: 2023-09-05 21:13:18 +0000 >>>> >>>> rtw88/rtw89: remove local firmware. >>>> Remove firmware from src/ in favor of the ports/packages and >>>> fwget(8). >>>> This will allow us to shrink the size of src (and installed >>>> modules). >>>> Update the rtw88 man page to reflect the change. >>> >>> How does this interfact with doing an install to a machine over one of >>> these >>> interfaces? >> >> That's nothing we support. At least we do not support netboot over wifi >> currently, so you'll always need another install media. >> >> How's the "bootstrapping" going to work if wireless is the only network >> option? > > To be clear, I was discussing the case you use a USB memstick, but fetch > the base system and packages over the network. Understood. Not sure we actually support the former; I guess I am not using the installer too much. > Or at least you need to > install pkg over the network, but you need pkg to install the firmware > so you can bring up the network which you did address, though it seems > something we plan to fix in the future so won't be in 14.0? Yes. We plan to sort this out but I'd say it's unlikely for 14.0. And to be clear, it was me who raised exactly these "botstrapping" installer concerns in the first place. At the moment we will first need stable drivers to be able to do any networking in first place. Once that is sorted, installing mobile devices with just them and no other means of networking will be addressed. I'd assume some other "fallout" will improve some installer bits along when this happens and that we'll want enough and brought testing for it. /bz -- Bjoern A. Zeeb r15:7 From nobody Thu Sep 7 13:22:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhKfP2sC3z4rsfP for ; Thu, 7 Sep 2023 13:22:21 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhKfN6G6jz4H2K for ; Thu, 7 Sep 2023 13:22:20 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-522dd6b6438so1215167a12.0 for ; Thu, 07 Sep 2023 06:22:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1694092939; x=1694697739; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=YNSku54EQ6HtcMdL5h75EjaMPhjmPh3rTJBbm6BVpxk=; b=q2pdsIi/mk2XQCsH9ocXe9p4qGw57BXGG7+IJ1VxmxBBi1oft996oE2hcOTijBq9Yv 1gIKtVUsS2I8/jsW+cS09uWTuM7u8TgXDxfmQ0lIt7vayY7BtpvmhfSnS0WKscNQP4ag 3esZIn4Ri2Fe0GM19Hc9flMc2snmeClF8VkNJwMjhenfqx5kfx7GtRVUC8NYDoO6uSLY FUCC6WIyYeJ7gOJOm/YAyCbguY5lzyDL/+98eAX1P3zhhNsUHzX7902TO25WXypvPpqT buggPpWET5CB9ZjpJlJJdkKFcK1cb58rKjUDdRjHhKZUIOXQaCH2nHt5r2Lj+thJj4zQ tuDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694092939; x=1694697739; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=YNSku54EQ6HtcMdL5h75EjaMPhjmPh3rTJBbm6BVpxk=; b=QRmcc1fyi++DbUFGQEqgNw2z7343cdvso/2Y/UsizjwaF0m3bZ5sb6LOZjOtLyGvUb p+X814orqASQ8jTLvLLROMmIDhsTtHjRJkkSP7OV8KF2HCTBWyZZ1edbLQP02mNIinJG OiLmmH4FsrSqn5BRBomxnAwSuU3UjjNo+oDVxao05dSqXYqnC72dNkLAgTKd5i4BRgOq 5AXZvavXATt8pj6g3gRG9zDrtxGaRlkBKWp/lmPXhupAErMNDjQtveaLOUWIHaNS7ewz x/qnULK5v2gZuYSxCBVz3qiajs2mYTfkJsfBxVKjNx2mZtpKO/vYgf6Kq//74UojfDay qCXw== X-Gm-Message-State: AOJu0Yxfnpm3G3Rk740P8weQYthu/DxVI1DMYxvThXKtLFGPrg1/vmWg 5ofoPZpK6DeogGGlG4wNoGdvx9EbUub7Om/S6N5I8vJVFeXs6sSH X-Google-Smtp-Source: AGHT+IG3j+YbdOTz934VXt0Sq8Ogp8c7JOdymwn5GGEu6DJtqsaUdfhndBLKjFzg2I3FLzZx4IZBWAKwkBK+yuLxKTA= X-Received: by 2002:aa7:df0c:0:b0:522:6e3f:b65 with SMTP id c12-20020aa7df0c000000b005226e3f0b65mr4291983edy.33.1694092939277; Thu, 07 Sep 2023 06:22:19 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202309052116.385LGoau059784@gitrepo.freebsd.org> <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> <4sr8n9or-q731-1945-893s-no953r283756@SerrOFQ.bet> In-Reply-To: <4sr8n9or-q731-1945-893s-no953r283756@SerrOFQ.bet> From: Warner Losh Date: Thu, 7 Sep 2023 07:22:07 -0600 Message-ID: Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. To: "Bjoern A. Zeeb" Cc: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000dcd05f0604c4bf55" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4RhKfN6G6jz4H2K --000000000000dcd05f0604c4bf55 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Sep 7, 2023 at 6:36=E2=80=AFAM Bjoern A. Zeeb wrot= e: > On Wed, 6 Sep 2023, John Baldwin wrote: > > > On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote: > >> On Wed, 6 Sep 2023, John Baldwin wrote: > >> > >>> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: > >>>> The branch main has been updated by bz: > >>>> > >>>> URL: > >>>> > https://cgit.FreeBSD.org/src/commit/?id=3Dcf94672363d6638b7268c05b4628b62= bbfc8dbe5 > >>>> > >>>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 > >>>> Author: Bjoern A. Zeeb > >>>> AuthorDate: 2023-06-08 21:35:09 +0000 > >>>> Commit: Bjoern A. Zeeb > >>>> CommitDate: 2023-09-05 21:13:18 +0000 > >>>> > >>>> rtw88/rtw89: remove local firmware. > >>>> Remove firmware from src/ in favor of the ports/packages > and > >>>> fwget(8). > >>>> This will allow us to shrink the size of src (and installed > >>>> modules). > >>>> Update the rtw88 man page to reflect the change. > >>> > >>> How does this interfact with doing an install to a machine over one o= f > >>> these > >>> interfaces? > >> > >> That's nothing we support. At least we do not support netboot over wi= fi > >> currently, so you'll always need another install media. > >> > >> How's the "bootstrapping" going to work if wireless is the only networ= k > >> option? > > > > To be clear, I was discussing the case you use a USB memstick, but fetc= h > > the base system and packages over the network. > > Understood. Not sure we actually support the former; I guess I am not > using the installer too much. > > > > Or at least you need to > > install pkg over the network, but you need pkg to install the firmware > > so you can bring up the network which you did address, though it seems > > something we plan to fix in the future so won't be in 14.0? > > Yes. We plan to sort this out but I'd say it's unlikely for 14.0. > > And to be clear, it was me who raised exactly these "botstrapping" > installer concerns in the first place. > > At the moment we will first need stable drivers to be able to do any > networking in first place. Once that is sorted, installing mobile > devices with just them and no other means of networking will be > addressed. > Yea, the rtw88 driver is stable enough for me to do a network install over it. So now people with -current can't do that any more and have to do hokey things to get the firmware or other packages to the laptop before they can do anything. This is not really going to make people happy and will generate a fair number of complaints. I'd assume some other "fallout" will improve some installer bits along > when this happens and that we'll want enough and brought testing for it. > It sounds rather premature to remove it from -current if there's no support in the installer, and nothing in place that adds the packages to the installation media with no firm plans or timelines to address that. Warner --000000000000dcd05f0604c4bf55 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Sep 7, 2023 at 6:36=E2=80=AFA= M Bjoern A. Zeeb <bz@freebsd.org&g= t; wrote:
On Wed= , 6 Sep 2023, John Baldwin wrote:

> On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote:
>> On Wed, 6 Sep 2023, John Baldwin wrote:
>>
>>> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote:
>>>> The branch main has been updated by bz:
>>>>
>>>> URL:
>>>> h= ttps://cgit.FreeBSD.org/src/commit/?id=3Dcf94672363d6638b7268c05b4628b62bbf= c8dbe5
>>>>
>>>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5
>>>> Author:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.o= rg>
>>>> AuthorDate: 2023-06-08 21:35:09 +0000
>>>> Commit:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@FreeBSD.o= rg>
>>>> CommitDate: 2023-09-05 21:13:18 +0000
>>>>
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0rtw88/rtw89: remove local firmwa= re.
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Remove firmware f= rom src/ in favor of the ports/packages and
>>>> fwget(8).
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0This will allow us to shrink the= size of src (and installed
>>>> modules).
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Update the rtw88 man page to ref= lect the change.
>>>
>>> How does this interfact with doing an install to a machine ove= r one of
>>> these
>>> interfaces?
>>
>> That's nothing we support.=C2=A0 At least we do not support ne= tboot over wifi
>> currently, so you'll always need another install media.
>>
>> How's the "bootstrapping" going to work if wireless = is the only network
>> option?
>
> To be clear, I was discussing the case you use a USB memstick, but fet= ch
> the base system and packages over the network.

Understood.=C2=A0 Not sure we actually support the former;=C2=A0 I guess I = am not
using the installer too much.


> Or at least you need to
> install pkg over the network, but you need pkg to install the firmware=
> so you can bring up the network which you did address, though it seems=
> something we plan to fix in the future so won't be in 14.0?

Yes.=C2=A0 We plan to sort this out but I'd say it's unlikely for 1= 4.0.

And to be clear, it was me who raised exactly these "botstrapping"= ;
installer concerns in the first place.

At the moment we will first need stable drivers to be able to do any
networking in first place.=C2=A0 =C2=A0Once that is sorted, installing mobi= le
devices with just them and no other means of networking will be
addressed.

Yea, the rtw88 driver is sta= ble enough for me to do a network install
over it. So now people = with -current can't do that any more and have
to do hokey thi= ngs to get the firmware or other packages to the laptop
before th= ey can do anything. This is not really going to make people
happy= and will generate a fair number of complaints.

I'd assume some other "= fallout" will improve some installer bits along
when this happens and that we'll want enough and brought testing for it= .

It sounds rather premature to remove = it from -current if there's no support
in the installer, and = nothing in place that adds the packages to the installation
media= with no firm plans or timelines to address that.

= Warner
--000000000000dcd05f0604c4bf55-- From nobody Thu Sep 7 13:38:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhL0x4sCRz4s3f7; Thu, 7 Sep 2023 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhL0x4FHyz4LQ8; Thu, 7 Sep 2023 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694093905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0TfuFoD3deyCcDM2N3nBBdyULmjZsO6rEighEYxGAc=; b=eoJcf8g35xToLtA2MAkNFmlVZGqFehhxU2SpwuP/42WUZRe21tmFepFFkrRMdavIYDj0LO JXjKj0Ypr45We4ulUlUzCf7DbrlZdjXZWCLLzDWA91nrGWoPW7pMssxPsEWXCxYOPW5aaA QPLyW8m3BhjaFwYkrpFIuNuuJLZR3lrK3dgq/cTNjZoW7A7BbrfC0KxBc79gpwMzqTD3ib O3rkIr5kD3+jtr3tK8GPWvQmj/MCclSgPaEYTfVcCd0usnAEl27aTNwJwLgjGCY/jRwe4U /wUkrK3CzLP3QDnlqSNRwQdusv0lToqUeKL5+lcpvRI+++//o5DC696+I2johQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694093905; a=rsa-sha256; cv=none; b=aRDC47el7eCx+LZBU19kYCPqdaWF2H69E8V2GLP6MxMAfs0EqN05fDxptmRHzdZOVBh2+/ tnTlOxMH5trS0LHB/b3kZtWanhZjTF0FmdEeF0ru3ZDDF2k5Zvh8k8QkMQ5pov7yIEdytW BQ2jRN9GTkp91MofQb6IiHi71dbHVnHfg1BuyLJ2c3RzzIOHFU17VVELj0ouvya+kFP+Sn p8lBgQDQD65bCOyq7qxrMx69lQX4ccFJWH71bPiSUck1zeUoXtKxRYLye5yqhRf5JA+Dba Xc8VeXh4PJ2LdgmtR/aJPO/APr3sM3/sdguvbFCbpLj2O4sGDXjfpyVRikfeNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694093905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0TfuFoD3deyCcDM2N3nBBdyULmjZsO6rEighEYxGAc=; b=sGxsDdKZCidLhbgTCb3M08wZmweofJdpFxQKOOAZOsAR8qisk2zlHi8srHZpIK2atgAZBC kXyWUY5aNylXaZV/lwGITA4tC+z+sgNLcc3SumW1IVHTyHNSUePwUYcYtkLHuO+rkNoNEn q5XrQgM4KL/1nJK3PVWFSJUB7efce1zDApFrAHA9oPdKV7hHaX0CL0ujQPSoKEiucHqxMb sH9SinQnc+miuNK6wC36h4satMs5L1t6Gd6kY1w9hw2c46v6OL6UXBJuHHwERFj1OvjSuM HUKZtRBxYzpdSRdh4CuxZw7mmAnDbyjhompGS3tmHF3y8vgi+xRSdt0/TdqFOw== 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 4RhL0x3Fhxz11f1; Thu, 7 Sep 2023 13:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387DcPQY082654; Thu, 7 Sep 2023 13:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387DcPYE082651; Thu, 7 Sep 2023 13:38:25 GMT (envelope-from git) Date: Thu, 7 Sep 2023 13:38:25 GMT Message-Id: <202309071338.387DcPYE082651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5f62584a9adb - main - gve: Make LRO work for jumbo packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f62584a9adb7887bae33af617cfa4f43017abf8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5f62584a9adb7887bae33af617cfa4f43017abf8 commit 5f62584a9adb7887bae33af617cfa4f43017abf8 Author: Shailend Chand AuthorDate: 2023-09-07 13:28:26 +0000 Commit: Mark Johnston CommitDate: 2023-09-07 13:28:26 +0000 gve: Make LRO work for jumbo packets Each Rx descriptor points to a packet buffer of size 2K, which means that MTUs greater than 2K see multi-descriptor packets. The TCP-hood of such packets was being incorrectly determined by looking for a flag on the last descriptor instead of the first descriptor. Also fixed and progressed the version number. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41754 --- sys/dev/gve/gve.h | 1 + sys/dev/gve/gve_main.c | 8 ++++---- sys/dev/gve/gve_rx.c | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h index 61781cddee94..c446199dff2d 100644 --- a/sys/dev/gve/gve.h +++ b/sys/dev/gve/gve.h @@ -164,6 +164,7 @@ struct gve_rx_ctx { struct mbuf *mbuf_tail; uint32_t total_size; uint8_t frag_cnt; + bool is_tcp; bool drop_pkt; }; diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index c3ee6d5c3433..cd7849778bce 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -31,10 +31,10 @@ #include "gve.h" #include "gve_adminq.h" -#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.0\n" -#define GVE_VERSION_MAJOR 0 -#define GVE_VERSION_MINOR 9 -#define GVE_VERSION_SUB 0 +#define GVE_DRIVER_VERSION "GVE-FBSD-1.0.1\n" +#define GVE_VERSION_MAJOR 1 +#define GVE_VERSION_MINOR 0 +#define GVE_VERSION_SUB 1 #define GVE_DEFAULT_RX_COPYBREAK 256 diff --git a/sys/dev/gve/gve_rx.c b/sys/dev/gve/gve_rx.c index f5d8fd7a7b75..9be96cf1ee3a 100644 --- a/sys/dev/gve/gve_rx.c +++ b/sys/dev/gve/gve_rx.c @@ -546,6 +546,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, if (is_first_frag) { mbuf->m_pkthdr.rcvif = priv->ifp; + ctx->is_tcp = desc->flags_seq & GVE_RXF_TCP; if (gve_needs_rss(desc->flags_seq)) { gve_set_rss_type(desc->flags_seq, mbuf); @@ -567,7 +568,7 @@ gve_rx(struct gve_priv *priv, struct gve_rx_ring *rx, struct gve_rx_desc *desc, do_if_input = true; if (((if_getcapenable(priv->ifp) & IFCAP_LRO) != 0) && /* LRO is enabled */ - (desc->flags_seq & GVE_RXF_TCP) && /* pkt is a TCP pkt */ + (ctx->is_tcp) && /* pkt is a TCP pkt */ ((mbuf->m_pkthdr.csum_flags & CSUM_DATA_VALID) != 0) && /* NIC verified csum */ (rx->lro.lro_cnt != 0) && /* LRO resources exist */ (tcp_lro_rx(&rx->lro, mbuf, 0) == 0)) From nobody Thu Sep 7 13:45:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhL8n3mH2z4s7Rx; Thu, 7 Sep 2023 13:45:13 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhL8n3Fycz4NLf; Thu, 7 Sep 2023 13:45:13 +0000 (UTC) (envelope-from bz@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694094313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S8WsjM2Jdu9GXYZONM/EHAjAczDn8WYWSEIZBon55fg=; b=mijGK/ench8tJcfB9tVBcozTkbWuLLfR/GbjBz5u64r5yjx/wcOCPfEcHhy0BYP7xZwmw/ 6qHdzn2QAC0ooPWMwQfBwPe4I3CHi9+GXgX+2Wob33OdbeOr/gHiEt0IneWJjssMPugkb1 paMqZjzWLQBVjvsp5NeHAgm3qVRlxmTn8B1AVXuWkQhyOiRvqGHEBdqDL4iXHAliyhkzXd wKwvO02Jw60hetZCTD0Keyu0jIE0j7jX/13KZPKyR9h0CD2g6IsxNv9+qdAbWnHrAYFMbf 8yVF/NmdHoDtArNvDm72MH6K0TsDSE6C7k9i5/JIck66Xos1ao+oLhCo1a9KOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694094313; a=rsa-sha256; cv=none; b=Kvieb1XwkjvrS0S2k6VmayJUE+wuSZzE3PLxgsUPtSpp09BAdNqQZj9963uJJgvGDr2+NA N/EQLVxScSr4bWcepsT4/DqEURfkOLSJgxJZLOgcQDRhfOdQqU75rXz8sWDgREdJ/hH/Xs XL/MV4wn8/0Wnk23OC29sv3BrlFpO8S8e0ECthVBku1Z2Ne6ytrSqw0x1+G5oV/mV/u0MP nUk8hPKrm3e7dNDbPtccxP5uGuPd99V/NZ//e5iv3HjUXGd4+uD2qqVBB0IqCaoaLBGFht Lxqlk3ylItkKOiOEDbc6svtVHQ2Z1BLhVxbK9l0HlJNSbYn8hzmWTl6fLbmgOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694094313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=S8WsjM2Jdu9GXYZONM/EHAjAczDn8WYWSEIZBon55fg=; b=NLdMPIjdPVm0mZ0IZ5NGK3WUVeAZw+axFWTFob4rDDOiMfXv3qitK7YDGXoVCL309twD+v tNeIxQ/OLjldwhAiLSFczvlXI4wXkA4ARm4UY0AT8D4dyGomf0vjBn87MsVyTfjd38g+KX xWI/CW8GJscOrLmdTo+GRfBcaa7zIvBw6ycqiRJ1czXJqzHp7DrPyRvc61iRGbcTCjGmvj 5djwVh5JkZ95MMW3tZg7w6hwzN9FzKubdxP4GfsPk7pSbdylogUbwUEHcOsxj0mQK3ejvf oN1pwWVsj/d2sx7aLU/sCFAUlF7aOrS6oNI3s9NYfBGpBLGUZTkqdgEj4r/gmA== Received: from mx1.sbone.de (mx1.sbone.de [IPv6:2a01:4f8:13b:39f::9f:25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RhL8n0v49z1Bfp; Thu, 7 Sep 2023 13:45:13 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 9EFC38D4A142; Thu, 7 Sep 2023 13:45:11 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 73D832D029D2; Thu, 7 Sep 2023 13:45:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 8j2PCGDosWe1; Thu, 7 Sep 2023 13:45:09 +0000 (UTC) Received: from strong-aiccu0.sbone.de (strong-aiccu0.sbone.de [IPv6:fde9:577b:c1a9:f491::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id D4DED2D029D1; Thu, 7 Sep 2023 13:45:08 +0000 (UTC) Date: Thu, 7 Sep 2023 13:45:07 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: John Baldwin , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. In-Reply-To: Message-ID: <5o323300-6053-0s28-692r-6oro7qq5n9p8@serrofq.bet> References: <202309052116.385LGoau059784@gitrepo.freebsd.org> <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> <4sr8n9or-q731-1945-893s-no953r283756@SerrOFQ.bet> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="1098556516-1839976615-1694094309=:2448" This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-1839976615-1694094309=:2448 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT On Thu, 7 Sep 2023, Warner Losh wrote: > On Thu, Sep 7, 2023 at 6:36 AM Bjoern A. Zeeb wrote: > >> On Wed, 6 Sep 2023, John Baldwin wrote: >> >>> On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote: >>>> On Wed, 6 Sep 2023, John Baldwin wrote: >>>> >>>>> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: >>>>>> The branch main has been updated by bz: >>>>>> >>>>>> URL: >>>>>> >> https://cgit.FreeBSD.org/src/commit/?id=cf94672363d6638b7268c05b4628b62bbfc8dbe5 >>>>>> >>>>>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 >>>>>> Author: Bjoern A. Zeeb >>>>>> AuthorDate: 2023-06-08 21:35:09 +0000 >>>>>> Commit: Bjoern A. Zeeb >>>>>> CommitDate: 2023-09-05 21:13:18 +0000 >>>>>> >>>>>> rtw88/rtw89: remove local firmware. >>>>>> Remove firmware from src/ in favor of the ports/packages >> and >>>>>> fwget(8). >>>>>> This will allow us to shrink the size of src (and installed >>>>>> modules). >>>>>> Update the rtw88 man page to reflect the change. >>>>> >>>>> How does this interfact with doing an install to a machine over one of >>>>> these >>>>> interfaces? >>>> >>>> That's nothing we support. At least we do not support netboot over wifi >>>> currently, so you'll always need another install media. >>>> >>>> How's the "bootstrapping" going to work if wireless is the only network >>>> option? >>> >>> To be clear, I was discussing the case you use a USB memstick, but fetch >>> the base system and packages over the network. >> >> Understood. Not sure we actually support the former; I guess I am not >> using the installer too much. >> >> >>> Or at least you need to >>> install pkg over the network, but you need pkg to install the firmware >>> so you can bring up the network which you did address, though it seems >>> something we plan to fix in the future so won't be in 14.0? >> >> Yes. We plan to sort this out but I'd say it's unlikely for 14.0. >> >> And to be clear, it was me who raised exactly these "botstrapping" >> installer concerns in the first place. >> >> At the moment we will first need stable drivers to be able to do any >> networking in first place. Once that is sorted, installing mobile >> devices with just them and no other means of networking will be >> addressed. >> > > Yea, the rtw88 driver is stable enough for me to do a network install > over it. So now people with -current can't do that any more and have > to do hokey things to get the firmware or other packages to the laptop > before they can do anything. This is not really going to make people > happy and will generate a fair number of complaints. > > I'd assume some other "fallout" will improve some installer bits along >> when this happens and that we'll want enough and brought testing for it. >> > > It sounds rather premature to remove it from -current if there's no support > in the installer, and nothing in place that adds the packages to the > installation > media with no firm plans or timelines to address that. You do understand that I also disconnected rtw88 from main? Please read the announcement and/or fill the gap. /bz -- Bjoern A. Zeeb r15:7 --1098556516-1839976615-1694094309=:2448-- From nobody Thu Sep 7 14:22:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhLzz6nzFz4sXCH for ; Thu, 7 Sep 2023 14:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhLzz6KkPz4ZTK; Thu, 7 Sep 2023 14:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694096559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fx/xXoeKpe7pdv7/ama40MNqCP2Vh14xo27US60NXwM=; b=gZlFeXUHUN/WCelaQpPHxWth0lhQL3FwwZLZqiIf8EjaQhYtjplCAwzk9c2oeOcMnWR26k ViCUqXaV7bTDEfxI5ltTF0ZWfpsaS2Ayyikts89xEb4GI8EWR9ahkOsYB0ubLY6O4AzlBb UYBZyhZfk45AAJX8yinH/bTRF993SIUWWWv2mFmxT2BtGWIa8dl8oui2tGmQtdxiDI3jtW RzhRCNyQ1qbixuncsukaTugxKRSowiHo5C7grAHWXVUvO2W1DQKm6va7fczrpSEioia5AG 0nJmnNgNKMa+QbgUFRT2NAmBM9uA9x60vUwlZh1QXlUs8pk0u3AD+BzWtcg7cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694096559; a=rsa-sha256; cv=none; b=vxhNUYOVfTnYw0sSmGEYaBoDrsv5DI4cRy5KGPN0AH8ghG1skwcfaBstgh9nLGbq9MJJ9R +IDeY6eXuICE9Y+YtARo1cdAHp1lQa3waWr+GviJ44sNv2caR2fhedtXSdtpmB34Qr9hdD s42a3QpCYOmcsU6V9NSSyXq0pMPoX1lKvzDWMMF7mIgviREp/3lzqUShAb7WABdRszd9DQ OzC00y6Cilno1kFRNoTi35CpEJ5mpRH93Ndrgk9OAVSOzTaIDrfoVuD6MqfcreJhgGTxxx 66kKPTwTCO6Kz0/a2B1kKCN8o63pSPGE7RJHTmV1uhAYd8HTjQGMNxKmftleGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694096559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fx/xXoeKpe7pdv7/ama40MNqCP2Vh14xo27US60NXwM=; b=JRYz3SPfO44I2HF9/QV72si2x44wCqMSbU7jljpr3Q8AGXgyVmPN6qJidPltWjD6Aqrqit xk3lOoZfxBYDGFX9g+4XOI+NqCCaz/H3bth5jHt/j2SF4X6JAriGrtEq/x2XlDuptycqT1 xp+n/82x+TJdzYFMq+CnpZUdBTexYyk38g/JwPvEdKisLVBVXTvIPfT/24MZBBB1x+UWOd YLjw75CHKQmg2A1htGKMEhqJAr6UTpACJHBvTcr7YNDQAnq0injuRW/AJQ8MYx9bKBx5jw BKOQL2vkDqZm1MjQzmPPhVpQlhoZQpinGvzLTO4e19g5RxVvlSY3n7KCllDCtg== 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 4RhLzz55ktz12lb; Thu, 7 Sep 2023 14:22:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387EMdmI066328; Thu, 7 Sep 2023 14:22:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387EMdIu066327; Thu, 7 Sep 2023 14:22:39 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:22:39 GMT Message-Id: <202309071422.387EMdIu066327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: 80517d0d48d9..a5913a473bb0 - vendor/libarchive - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/libarchive X-Git-Reftype: branch X-Git-Commit: a5913a473bb0b6e194a2fe0e55d3166e0eed8aaf X-Git-Oldrev: 80517d0d48d96fdd3e9c80d30eb30289d5004133 X-Git-Newrev: a5913a473bb0b6e194a2fe0e55d3166e0eed8aaf Auto-Submitted: auto-generated The branch vendor/libarchive has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=80517d0d48d9..a5913a473bb0 a5913a473bb0 Update vendor/libarchive to libarchive/libarchive@1b4e0d0f9 From nobody Thu Sep 7 14:36:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMJS741Mz4sg6v; Thu, 7 Sep 2023 14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMJS6dqDz4g8j; Thu, 7 Sep 2023 14: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=1694097416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HvxY+98mEQIg+VgkDEJOuVhw34VhMgE5SQKUqnLVeIE=; b=VH8X/6x7rQPrxCNnZy7uMIYFBv8uGO6/U2A+F2PPqOkTzFQCQrU1aw2e0zPM70x+TRpoZG WZl+gBdolR3zpm2+DrC+pUFeEpVTLPyO2oUUtO8uJKowtrtX8HmdbojXncFp00L/QhBgps KGcUT8bsxXDx242o/C6A4kKm3eq2uPYWL1m6dQH9IgE3ja2DOhywpE7LCcQVjiPntaDEaY AKIf5TdpwSp9W8LXtWTAgwEXxLazVR7WR8W8zvOCDStIm2GZHf8uHj+pvUNqZTMYovircg L1fUF6hRIa42A9zu5wVhKKYbJhHxHCRN5rskXUzCwZ0V2P+Zbuy5W4BCBQYkcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694097416; a=rsa-sha256; cv=none; b=VTzfJZzV9FUz4z6KIRp+dKMBSfBnDkHyLsOXcdVvKM3StBSYfuwO5yuBGOkNnplrfYQJ7j 8f2Z1PdK0tupFUwKCZlH4PMt6/tHSqUEWwZzugvBH55fj8IHVb0qnOybvA3nah9xXzGvQd 4payKZ8FNxfyjBI4C8cg1QJ/9wMOGmXkOgGeyOsUIYIC4B+Fif1PJUpdHAP0jI5/DO8+rU ECuMmrVRXIMSz8TGAebJsjsmtmL4gokKi7UEFWewfJYTzCA4azeGlNGlYSkLpnrTIwIqNb Uu5JIQnHLIeeFEYbrIKkLBcj39bqA9S+EsFyaKcWVOfX89JiM4Hmy1wiPEDKJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694097416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HvxY+98mEQIg+VgkDEJOuVhw34VhMgE5SQKUqnLVeIE=; b=nvShenPngksd6K/2Ff7rlp1ln/iMjJSqwKmkQHLyn29uosFBWb/fnxEPkyNgiD7gJ/K4Bv GRnHFPw/Mq+hL7F3xNgbUzgnX9SA7IPdAJ7tSKQRpBS7u4eenzs+M5nehqxM8l7UASEfRj gYWDpj6lktuEFanxD150nVo0nTZ3Mndl6aS6Vr968ZlTfv1SrAFZEuA3F2AZLZnZuVNCx+ sjvaCDiwDp9kiC8SUm8R39NowE2jR++tu/6UnszBsDUbzBfKu2g2fgUDpSjdcW2ptB1XL+ +Cci0agO6WK7pYimXfvfwn2CzDEhn4SAwB/hRMAwHf/HS8k2ZsBc5OUxDqjanw== 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 4RhMJS5drZz13PQ; Thu, 7 Sep 2023 14:36:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Eaukq083052; Thu, 7 Sep 2023 14:36:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Eaugx083049; Thu, 7 Sep 2023 14:36:56 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:36:56 GMT Message-Id: <202309071436.387Eaugx083049@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ee12faa062c0 - main - bspatch: use C23 overflow checking math now that it is available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee12faa062c04a49bf6fe4e6867bad8606e2413f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ee12faa062c04a49bf6fe4e6867bad8606e2413f commit ee12faa062c04a49bf6fe4e6867bad8606e2413f Author: Ed Maste AuthorDate: 2023-09-05 16:35:31 +0000 Commit: Ed Maste CommitDate: 2023-09-07 14:36:50 +0000 bspatch: use C23 overflow checking math now that it is available Reviewed by: des Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41771 --- usr.bin/bsdiff/bspatch/bspatch.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/usr.bin/bsdiff/bspatch/bspatch.c b/usr.bin/bsdiff/bspatch/bspatch.c index a596ab1837dd..d7fabddabbfe 100644 --- a/usr.bin/bsdiff/bspatch/bspatch.c +++ b/usr.bin/bsdiff/bspatch/bspatch.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -64,15 +65,8 @@ add_off_t(off_t a, off_t b) { off_t result; -#if __GNUC__ >= 5 || \ - (defined(__has_builtin) && __has_builtin(__builtin_add_overflow)) - if (__builtin_add_overflow(a, b, &result)) + if (ckd_add(&result, a, b)) errx(1, "Corrupt patch"); -#else - if ((b > 0 && a > OFF_MAX - b) || (b < 0 && a < OFF_MIN - b)) - errx(1, "Corrupt patch"); - result = a + b; -#endif return result; } From nobody Thu Sep 7 14:51:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMch4268z4snX1; Thu, 7 Sep 2023 14:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMch3Syyz4kNY; Thu, 7 Sep 2023 14:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3PoWO8JC7Yr7iHssORAzlYI6AUoUS61wgY+Xxde/XF0=; b=OaizkoYyjtXurUA0SRmsMvSin+csWi1sYWatjie2O2MLyvgF6p75txEhvp6pIcRw+tIRIS GS96Gdtjv13Trcx9mgpx4ff3b/YOEQgDrNXtgGpXp9ehrFoc8fjCMcDqXfdVbTSV2/J4sR Q4Rro0jS2jpf+zxyY5f1yQNbJwXk5lg8Fyt0dwKm26+y4mcw87cYS2I/HzumPpWGt11+Yv W8461UWw0z776bKW1styJcwto9SJBVa+rz6pnMJ+/ypSrIdJD8nxXyiBM2XGETZoFXsCPl +bQRdc7uhq2+X5ZBIDq0iIcPU+oxE+Xq+TxrrHPPWM9b3JalAl+HpDieal1tqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098260; a=rsa-sha256; cv=none; b=cQ9j9+9Q1hn1QwyUjPO9yvi//AV5pP/0CQ82EDqRVPOa3FIZJoMvXjOfJlkyIwBjE8D+XQ YKa1uqDnLE56yJEmzanXvVzVj6ubtgzj886ZoRLRsSD5aObVJQxzOckbRFIhV5ScPTmJMH J/xCm5tLqE7uFkjA1xuFfScIpinmwATE3+RiU4VG3w5MINpGjpcbkbyNdhHOACWisFK5Rb ajVODmwj0odwQxoReNZa4QEpxHJDf4NJGYuuMSH8LOdA6sCLI8LnuCgN0rK7D08HDK66i+ AHLCrzuLzHSxoTf63ZvPynFjGeJs7xcAdfQI3Uxipx6x8Wo+JgObbLrtIArYrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3PoWO8JC7Yr7iHssORAzlYI6AUoUS61wgY+Xxde/XF0=; b=OElytRkZ2M6AdhMMMaeau6ePnGs8kQ5G+e9ZAG9GUP/MGLwpkKgzrLIJxKAXmUXg5Idvre hBfgJwQaAiw3T1Ptbp6Md7WfqDGyO3ETtLzibmewbtV5gzRJtuVjWEnCYOwRF08pfcp0YB rP+AtmDMrGKOfzblA10sNlDm/ljszoy33uPU8lQeANbJjZJ6sDx79q7ZETg/FdMbbWd6XW rZZBl846zAMYHc4wuSwGNfj1KI2QKWwyaBJESzEfZfk4pPR3bcPtuz/bjQ56uMqj4tFHj+ Mhyyo4n6MZ8MEbKX1Hdcb9VZOnfRHJfeik2eL9SaHYSUtRfYZj0pTMv2p66zmg== 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 4RhMch2LSxz13JT; Thu, 7 Sep 2023 14:51:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ep0IL010342; Thu, 7 Sep 2023 14:51:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ep0Qf010339; Thu, 7 Sep 2023 14:51:00 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:51:00 GMT Message-Id: <202309071451.387Ep0Qf010339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e441e0cf8ec9 - stable/13 - indent: Restore and document -ps / -nps option. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e441e0cf8ec93e009249d0c978bee110797f313d Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e441e0cf8ec93e009249d0c978bee110797f313d commit e441e0cf8ec93e009249d0c978bee110797f313d Author: Dag-Erling Smørgrav AuthorDate: 2023-06-29 13:56:28 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 08:56:23 +0000 indent: Restore and document -ps / -nps option. Sponsored by: Klara, Inc. Reviewed by: pauamma_gundo.com, pstef, kevans Differential Revision: https://reviews.freebsd.org/D40788 (cherry picked from commit b5b9eaa96274a9c40b06999cadc777c8aeb71d09) --- usr.bin/indent/args.c | 2 ++ usr.bin/indent/indent.1 | 10 +++++++++- usr.bin/indent/indent_globs.h | 2 ++ usr.bin/indent/lexi.c | 8 +++++--- usr.bin/indent/tests/Makefile | 3 +++ usr.bin/indent/tests/ps.0 | 4 ++++ usr.bin/indent/tests/ps.0.pro | 1 + usr.bin/indent/tests/ps.0.stdout | 8 ++++++++ 8 files changed, 34 insertions(+), 4 deletions(-) diff --git a/usr.bin/indent/args.c b/usr.bin/indent/args.c index c54c5b9fde5f..2f8ea7659128 100644 --- a/usr.bin/indent/args.c +++ b/usr.bin/indent/args.c @@ -153,12 +153,14 @@ struct pro { {"npcs", PRO_BOOL, false, OFF, &opt.proc_calls_space}, {"npro", PRO_SPECIAL, 0, IGN, 0}, {"npsl", PRO_BOOL, true, OFF, &opt.procnames_start_line}, + {"nps", PRO_BOOL, false, OFF, &opt.pointer_as_binop}, {"nsc", PRO_BOOL, true, OFF, &opt.star_comment_cont}, {"nsob", PRO_BOOL, false, OFF, &opt.swallow_optional_blanklines}, {"nut", PRO_BOOL, true, OFF, &opt.use_tabs}, {"nv", PRO_BOOL, false, OFF, &opt.verbose}, {"pcs", PRO_BOOL, false, ON, &opt.proc_calls_space}, {"psl", PRO_BOOL, true, ON, &opt.procnames_start_line}, + {"ps", PRO_BOOL, false, ON, &opt.pointer_as_binop}, {"sc", PRO_BOOL, true, ON, &opt.star_comment_cont}, {"sob", PRO_BOOL, false, ON, &opt.swallow_optional_blanklines}, {"st", PRO_SPECIAL, 0, STDIN, 0}, diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1 index b6f10824c6f7..68c0fad2c021 100644 --- a/usr.bin/indent/indent.1 +++ b/usr.bin/indent/indent.1 @@ -29,7 +29,7 @@ .\" .\" @(#)indent.1 8.1 (Berkeley) 7/1/93 .\" -.Dd June 11, 2018 +.Dd June 28, 2023 .Dt INDENT 1 .Os .Sh NAME @@ -77,6 +77,7 @@ .Op Fl npro .Op Fl P Ns Ar file .Op Fl pcs | Fl npcs +.Op Fl ps | Fl nps .Op Fl psl | Fl npsl .Op Fl \&sc | Fl nsc .Bk -words @@ -420,6 +421,13 @@ all procedure calls will have a space inserted between the name and the `('. The default is .Fl npcs . +.It Fl ps , nps +If true +.Pq Fl ps +the pointer dereference operator (`->') is treated like any other +binary operator. +The default is +.Fl nps . .It Fl psl , npsl If true .Pq Fl psl diff --git a/usr.bin/indent/indent_globs.h b/usr.bin/indent/indent_globs.h index ba2afefefd8e..640ba1bf48ec 100644 --- a/usr.bin/indent/indent_globs.h +++ b/usr.bin/indent/indent_globs.h @@ -199,6 +199,8 @@ struct options { * lined-up code within the margin */ int lineup_to_parens; /* if true, continued code within parens * will be lined up to the open paren */ + int pointer_as_binop; /* if true, the pointer dereference operator + * will be treated as a binary operator */ int proc_calls_space; /* If true, procedure calls look like: * foo (bar) rather than foo(bar) */ int procnames_start_line; /* if true, the names of procedures diff --git a/usr.bin/indent/lexi.c b/usr.bin/indent/lexi.c index 9fb7cf30afb7..7ad1ddc74fff 100644 --- a/usr.bin/indent/lexi.c +++ b/usr.bin/indent/lexi.c @@ -490,9 +490,11 @@ stop_lit: else if (*buf_ptr == '>') { /* check for operator -> */ *e_token++ = *buf_ptr++; - unary_delim = false; - code = unary_op; - state->want_blank = false; + if (!opt.pointer_as_binop) { + unary_delim = false; + code = unary_op; + state->want_blank = false; + } } break; /* buffer overflow will be checked at end of * switch */ diff --git a/usr.bin/indent/tests/Makefile b/usr.bin/indent/tests/Makefile index 57e7c4db71b1..2369999e268d 100644 --- a/usr.bin/indent/tests/Makefile +++ b/usr.bin/indent/tests/Makefile @@ -44,6 +44,9 @@ ${PACKAGE}FILES+= types_from_file.0.list ${PACKAGE}FILES+= types_from_file.0.pro ${PACKAGE}FILES+= wchar.0 ${PACKAGE}FILES+= wchar.0.stdout +${PACKAGE}FILES+= ps.0 +${PACKAGE}FILES+= ps.0.stdout +${PACKAGE}FILES+= ps.0.pro ATF_TESTS_SH+= functional_test diff --git a/usr.bin/indent/tests/ps.0 b/usr.bin/indent/tests/ps.0 new file mode 100644 index 000000000000..0dc72ccfddf2 --- /dev/null +++ b/usr.bin/indent/tests/ps.0 @@ -0,0 +1,4 @@ +struct s { int i; }; +void f(struct s *p) { + p->i--; +} diff --git a/usr.bin/indent/tests/ps.0.pro b/usr.bin/indent/tests/ps.0.pro new file mode 100644 index 000000000000..5fdebee73785 --- /dev/null +++ b/usr.bin/indent/tests/ps.0.pro @@ -0,0 +1 @@ +-ps diff --git a/usr.bin/indent/tests/ps.0.stdout b/usr.bin/indent/tests/ps.0.stdout new file mode 100644 index 000000000000..08f421e984ff --- /dev/null +++ b/usr.bin/indent/tests/ps.0.stdout @@ -0,0 +1,8 @@ +struct s { + int i; +}; +void +f(struct s *p) +{ + p -> i--; +} From nobody Thu Sep 7 14:51:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMcj4h9vz4snR1; Thu, 7 Sep 2023 14:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMcj470Bz4kYj; Thu, 7 Sep 2023 14:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U1TWzP/us5vi9LJlgVsUiD3BldLgpMjoJOFzNW+vlSs=; b=hzTqy2FuFiTOPqd6Jgv5iLFZQEgGaN4DiFV41OAiLYHZP6wuMr+kGcgVn2PRxuOB2w2nyI t+BWykeCWr4WzNLhw7wx8v29pLP1/pCbdrnaRU4f27IZ3oAwF0S4i/fQVwUFsfXrj1ldjA 5AGxAW9earYh4qwpGbJau+hjGsk6CO1whACrl0U611JZT238UUrywChr+GpQXeZeWRRcCc cnCcdzBh8ZEN5YLaklbgxY7uOjXTzoAiwmCaQ10R+zfjouliGeW6bMSXLlpre5V4t+YB/V F0rw31y8aa8SKww+m10tPHknGT3Uag+tvUhQugeZqyeqOJriKrYmphvrH7GqGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098261; a=rsa-sha256; cv=none; b=aQcdI/BJ5C9amRXlSHQyLuFas9fVG73bsZok6D9kAGi9GAvAb0hRswjdolXrBwkT2rlVdI MdRLpd6WnCgzKTWXCPEo8bQZ5HC56CLMoRG3FmIpqMHu3RmAIrsYP0rXkYVasJBFRbcQyS wCcKJkdwhbRgiL50iXoJj1EC7qmZPDmI9/fNbDkPdpnvxgh9E5cANyjN+K0VyV4l+qR3N2 BQitfDg05nUjPMFlmonmaWYzPaSGb28whOaIAT+iqLGMCwu71iu9dbFVnuFoUU0QY7ERTz cb9+IQK++SLGhrTCFzZK3utStWGTkwIE0KOvbQzmF9KUmvbI2qKznpC2L1I2lA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098261; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U1TWzP/us5vi9LJlgVsUiD3BldLgpMjoJOFzNW+vlSs=; b=OKxrmMpIrjmPXTYiM1UnqRyV1y3o0QLtmsoiJndCYpjsbTUuRX+EYrQMkYSbyKl7SRRhWz PyWszZWX9BroNPvN0OlBg2SGLZejGH5wowszsrXTvZRX+kdC1wFtNhiHgRiHyGbq04cn6R v0f2UBOK9MyEUdxs/tzoDx38C5DSwP2hA8HYY5tkM2W+5zTzvHGBfVH4mIFJN8Ei0egt5d kpruHPB4jHPDXewbvNh5dzvaJi4+2q6nMF7MkOrF879aKoSM0pgWLw8szCRf+FgizCWnOb nyrEZgQspmZfvSRctmejN91v0lvFSjd2V8lLLVeKGoEWZfzg0bABrh2YnAWpCg== 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 4RhMcj2p4mz13hk; Thu, 7 Sep 2023 14:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ep1xq011584; Thu, 7 Sep 2023 14:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ep1bH011570; Thu, 7 Sep 2023 14:51:01 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:51:01 GMT Message-Id: <202309071451.387Ep1bH011570@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e4dee290ff0b - stable/13 - stdbuf: Code cleanup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e4dee290ff0b37b96d9f0b83b109b3cd6d50450c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e4dee290ff0b37b96d9f0b83b109b3cd6d50450c commit e4dee290ff0b37b96d9f0b83b109b3cd6d50450c Author: Dag-Erling Smørgrav AuthorDate: 2023-06-29 15:30:05 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 08:56:25 +0000 stdbuf: Code cleanup. * Factor out path-setting code. * Normalize usage(). * Remove unnecessary switch case. Sponsored by: Klara, Inc. Reviewed by: kevans, imp Differential Revision: https://reviews.freebsd.org/D40799 (cherry picked from commit 78baa632092a87707481a47f47bfd45de9a072ef) libstdbuf: Add proper SEE ALSO section. Sponsored by: Klara, Inc. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D40800 (cherry picked from commit c09909ed889f4722e68b192e206dff1b03182edb) --- lib/libstdbuf/libstdbuf.3 | 7 +++++-- usr.bin/stdbuf/stdbuf.c | 52 +++++++++++++++++++++++------------------------ 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/lib/libstdbuf/libstdbuf.3 b/lib/libstdbuf/libstdbuf.3 index 6f3256c88e18..4857f7096499 100644 --- a/lib/libstdbuf/libstdbuf.3 +++ b/lib/libstdbuf/libstdbuf.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 28, 2012 +.Dd June 29, 2023 .Dt LIBSTDBUF 3 .Os .Sh NAME @@ -80,9 +80,12 @@ output will not stall until the full buffer fills. STDBUF_1=L awk '$2 > 1 || $3 > 1' | cat -n .Ed .Pp -See also the manpage of +See .Xr stdbuf 1 for a simpler way to do this. +.Sh SEE ALSO +.Xr rtld 1 , +.Xr stdbuf 1 .Sh HISTORY The .Nm diff --git a/usr.bin/stdbuf/stdbuf.c b/usr.bin/stdbuf/stdbuf.c index 02716ad60b06..6b09bb6149f5 100644 --- a/usr.bin/stdbuf/stdbuf.c +++ b/usr.bin/stdbuf/stdbuf.c @@ -34,22 +34,38 @@ #define LIBSTDBUF "/usr/lib/libstdbuf.so" #define LIBSTDBUF32 "/usr/lib32/libstdbuf.so" -extern char *__progname; +static int +appendenv(const char *key, const char *value) +{ + char *curval, *newpair; + int ret; + + curval = getenv(key); + if (curval == NULL) + ret = asprintf(&newpair, "%s=%s", key, value); + else + ret = asprintf(&newpair, "%s=%s:%s", key, curval, value); + if (ret > 0) + ret = putenv(newpair); + if (ret < 0) + warn("Failed to set environment variable: %s", key); + return (ret); +} static void -usage(int s) +usage(void) { - fprintf(stderr, "Usage: %s [-e 0|L|B|] [-i 0|L|B|] [-o 0|L|B|] " - " [args ...]\n", __progname); - exit(s); + fprintf(stderr, + "usage: stdbuf [-e 0|L|B|] [-i 0|L|B|] [-o 0|L|B|] " + " [args ...]\n"); + exit(1); } int main(int argc, char *argv[]) { char *ibuf, *obuf, *ebuf; - char *preload0, *preload1; int i; ibuf = obuf = ebuf = NULL; @@ -64,9 +80,8 @@ main(int argc, char *argv[]) case 'o': obuf = optarg; break; - case '?': default: - usage(1); + usage(); break; } } @@ -85,25 +100,8 @@ main(int argc, char *argv[]) warn("Failed to set environment variable: %s=%s", "_STDBUF_E", ebuf); - preload0 = getenv("LD_PRELOAD"); - if (preload0 == NULL) - i = asprintf(&preload1, "LD_PRELOAD=" LIBSTDBUF); - else - i = asprintf(&preload1, "LD_PRELOAD=%s:%s", preload0, - LIBSTDBUF); - - if (i < 0 || putenv(preload1) == -1) - warn("Failed to set environment variable: LD_PRELOAD"); - - preload0 = getenv("LD_32_PRELOAD"); - if (preload0 == NULL) - i = asprintf(&preload1, "LD_32_PRELOAD=" LIBSTDBUF32); - else - i = asprintf(&preload1, "LD_32_PRELOAD=%s:%s", preload0, - LIBSTDBUF32); - - if (i < 0 || putenv(preload1) == -1) - warn("Failed to set environment variable: LD_32_PRELOAD"); + appendenv("LD_PRELOAD", LIBSTDBUF); + appendenv("LD_32_PRELOAD", LIBSTDBUF32); execvp(argv[0], argv); err(2, "%s", argv[0]); From nobody Thu Sep 7 14:51:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMck5N1Rz4sngk; Thu, 7 Sep 2023 14:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMck4qRSz4klr; Thu, 7 Sep 2023 14:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m4M+j/+UNsPHO+9oeKNgibiRJppKg86gS5nvGXun8d0=; b=qcqsZWmmjtmdVWTTi0nl2Qd64Ok7xEzEMF7tDcAeZBWKBZ4O4HOauI9I6WFIsQ0b8ormr0 cWrtzl8RM6pJ5ZNcIUUZX/0YHGge/ofQdCC46fYeYY2kgSKQSN7O0W1XqAFxX+1zlaUX7b 4qAuwO6HeGumlSqzVM15fjRAKh8an3uR18+/S6FkaFBriL6hWSj4sANsXxE4A24r2XoIBs 8xFGvzjB2xOh0ovyvrYNY/pW2XvOgI59wBGVmfNCboWSH6XQldw1MdJ7QnkbaZySWVTq71 cP+QOjGtvuuU6FX287PI8n0maF/9+Xm2HlDP6zdbeuDmPt1j8bO14ezCXUcXqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098262; a=rsa-sha256; cv=none; b=NvRq9N3bpTVkptj2QAykKSmpczA9zN6SsPfprwAVzmqu43afdBZmDtMaZp0cGPzHk8mc4z zhkSu43F2xbUw0Smn4zePxRtBfGwByQ/G+jaHg1b8y+Oq6VV9qMiS/ifCP+YePfGBwFrP1 7Q4c13+ejqBGy3phFdsnmZUSS6GnCkWtcBql4656zvWN55Q8fsbGZ5QtJAu8uxycnOjnU6 0+M1XA18ED3+0pYFyhkzG1/8N24Lz3R/hShOQZwpTwH05H2NslawFvTQA6ZUpv8av1KzVF nJEZLgVRZv+BtkQkk/pTfS1r+uK7PKe7+5OpiZAxx1QRBh9NUfHrrM904BY8bA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098262; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m4M+j/+UNsPHO+9oeKNgibiRJppKg86gS5nvGXun8d0=; b=Vvhfb1dl+/ZOOR+jLxNTYHLpfcLzPluSfabUZu1cIvHulIJ3+WysNJ4YcPvb/RNIozCpbg xVbcVHHwcCuSBnXb9xxKgSiAUVewv7U2t8OLoXGvC8O73q2neR9mJEtGtXq1BovN94Zp9n WyutOFcAqzwdd6Dm58ZCrCZjNSjn2fa8Ya5ONOfRchOH9jdqvmIbghWQqeN0EbBkF7m1LJ h1KGsmqPgDyIMEg7p7O5pK2jlwvwpqV/A9xU4m9s+H9bbC+XGz8qN9f9iAWgdFi0h63NUw 4h0TLccpiqjhQAy/a9PcVHAXBB8IZ/jqYHmJLCMDWilswU8mvQmbVPcwgm8X5Q== 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 4RhMck3XlSz13Tt; Thu, 7 Sep 2023 14:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ep2LH012950; Thu, 7 Sep 2023 14:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ep2Zn012947; Thu, 7 Sep 2023 14:51:02 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:51:02 GMT Message-Id: <202309071451.387Ep2Zn012947@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 15991a682445 - stable/13 - xargs: fix -R so that it accepts negative numbers again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 15991a68244562e3aabca3defb542ec5ca684116 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=15991a68244562e3aabca3defb542ec5ca684116 commit 15991a68244562e3aabca3defb542ec5ca684116 Author: Daniel Tameling AuthorDate: 2023-07-13 20:06:14 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 08:56:26 +0000 xargs: fix -R so that it accepts negative numbers again fbc445addf9 converted the parsing of arguments to strtonum but made the accepted range for -R too restrictive. As documented in the man page, it should accept negative numbers. Added a test for this, which was provided by Jose Luis Duran. Fixes: fbc445addf9 MFC after: 1 week Reviewed by: des, kevans Differential Revision: https://reviews.freebsd.org/D41021 (cherry picked from commit 202adb2236104141dc02d512084a3cc4bbe734c7) xargs: disallow -R0 and -L0 Both cases were interpreted as these flags are unset. This meant that -R0 got converted to -R5 and that -L0 didn't have any effect at all. Since make at most 0 replacements isn't useful and since call utility for every 0 lines read doesn't make sense, throw an error for these two cases. MFC after: 1 week Reviewed by: des, kevans Differential Revision: https://reviews.freebsd.org/D41022 (cherry picked from commit 1048a870e3b6973a5be1193f3b45e6e867e8e1c0) xargs: Prevent overflow in linelen calculation if nargs is large. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41023 (cherry picked from commit eab91d008165e7bbf8ca7b87eabe4dc8bf3da191) xargs: Fix test case count. MFC after: 1 week Sponsored by: Klara, Inc. (cherry picked from commit c65845d0bb2d17dc283ae5928f25e68212a30842) xargs: Install missing test output. Fixes: eab91d008165e7bbf8ca7b87eabe4dc8bf3da191 MFC after: 1 week Reviewed by: des Differential Revision: https://reviews.freebsd.org/D41033 (cherry picked from commit d234c8228ced5ea3aa86bd2e9eca79b87d8e6441) xargs tests: Disable the test added in commit eab91d008165 This test has been triggering OOM kills in CI runs since it triggers an allocation of 16GB. Temporarily disable the test until the problem is solved one way or another. (cherry picked from commit 2682a15527241278c9aa46c4907d3b07460b8ec0) --- usr.bin/xargs/tests/Makefile | 2 ++ usr.bin/xargs/tests/regress.R-1.out | 4 ++++ usr.bin/xargs/tests/regress.n2147483647.out | 1 + usr.bin/xargs/tests/regress.sh | 6 +++++- usr.bin/xargs/xargs.c | 8 +++++--- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile index bfb2d171ba52..50545c11f90e 100644 --- a/usr.bin/xargs/tests/Makefile +++ b/usr.bin/xargs/tests/Makefile @@ -14,9 +14,11 @@ ${PACKAGE}FILES+= regress.J.out ${PACKAGE}FILES+= regress.L.out ${PACKAGE}FILES+= regress.P1.out ${PACKAGE}FILES+= regress.R.out +${PACKAGE}FILES+= regress.R-1.out ${PACKAGE}FILES+= regress.in ${PACKAGE}FILES+= regress.n1.out ${PACKAGE}FILES+= regress.n2.out +${PACKAGE}FILES+= regress.n2147483647.out ${PACKAGE}FILES+= regress.n2P0.out ${PACKAGE}FILES+= regress.n3.out ${PACKAGE}FILES+= regress.normal.out diff --git a/usr.bin/xargs/tests/regress.R-1.out b/usr.bin/xargs/tests/regress.R-1.out new file mode 100644 index 000000000000..7bdf58090c60 --- /dev/null +++ b/usr.bin/xargs/tests/regress.R-1.out @@ -0,0 +1,4 @@ +The quick brown quick brown quick brown quick brownquick brown quick brown quick brown +The fox jumped fox jumped fox jumped fox jumpedfox jumped fox jumped fox jumped +The over the lazy over the lazy over the lazy over the lazyover the lazy over the lazy over the lazy +The dog dog dog dogdog dog dog diff --git a/usr.bin/xargs/tests/regress.n2147483647.out b/usr.bin/xargs/tests/regress.n2147483647.out new file mode 100644 index 000000000000..cc32a92a2199 --- /dev/null +++ b/usr.bin/xargs/tests/regress.n2147483647.out @@ -0,0 +1 @@ +quick brown fox jumped over the lazy dog diff --git a/usr.bin/xargs/tests/regress.sh b/usr.bin/xargs/tests/regress.sh index a0b4a98a2dd3..9b4839d2a8ec 100644 --- a/usr.bin/xargs/tests/regress.sh +++ b/usr.bin/xargs/tests/regress.sh @@ -1,5 +1,5 @@ -echo 1..20 +echo 1..21 REGRESSION_START($1) @@ -9,8 +9,12 @@ REGRESSION_TEST(`J', `xargs -J% echo The % again. <${SRCDIR}/regress.in') REGRESSION_TEST(`L', `xargs -L3 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`P1', `xargs -P1 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`R', `xargs -I% -R1 echo The % % % %% % % <${SRCDIR}/regress.in') +REGRESSION_TEST(`R-1', `xargs -I% -R-1 echo The % % % %% % % <${SRCDIR}/regress.in') REGRESSION_TEST(`n1', `xargs -n1 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`n2', `xargs -n2 echo <${SRCDIR}/regress.in') +# This test may consume a large amount of memory, making it unsuited to CI +# environments. Disable it for now. +#REGRESSION_TEST(`n2147483647', `xargs -n2147483647 <${SRCDIR}/regress.in') REGRESSION_TEST(`n2P0',`xargs -n2 -P0 echo <${SRCDIR}/regress.in | sort') REGRESSION_TEST(`n3', `xargs -n3 echo <${SRCDIR}/regress.in') REGRESSION_TEST(`0', `xargs -0 -n1 echo <${SRCDIR}/regress.0.in') diff --git a/usr.bin/xargs/xargs.c b/usr.bin/xargs/xargs.c index 01308e3ea29f..51f42ba2c842 100644 --- a/usr.bin/xargs/xargs.c +++ b/usr.bin/xargs/xargs.c @@ -172,7 +172,7 @@ main(int argc, char *argv[]) replstr = optarg; break; case 'L': - Lflag = (int)strtonum(optarg, 0, INT_MAX, &errstr); + Lflag = (int)strtonum(optarg, 1, INT_MAX, &errstr); if (errstr) errx(1, "-%c %s: %s", ch, optarg, errstr); break; @@ -198,9 +198,11 @@ main(int argc, char *argv[]) pflag = 1; break; case 'R': - Rflag = (int)strtonum(optarg, 0, INT_MAX, &errstr); + Rflag = (int)strtonum(optarg, INT_MIN, INT_MAX, &errstr); if (errstr) errx(1, "-%c %s: %s", ch, optarg, errstr); + if (!Rflag) + errx(1, "-%c %s: %s", ch, optarg, "must be non-zero"); break; case 'r': /* GNU compatibility */ @@ -253,7 +255,7 @@ main(int argc, char *argv[]) * the maximum arguments to be read from stdin and the trailing * NULL. */ - linelen = 1 + argc + nargs + 1; + linelen = 1 + argc + (size_t)nargs + 1; if ((av = bxp = malloc(linelen * sizeof(char *))) == NULL) errx(1, "malloc failed"); From nobody Thu Sep 7 14:51:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMcl6zzWz4snKT; Thu, 7 Sep 2023 14:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMcl62kLz4krh; Thu, 7 Sep 2023 14:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5FGXTWYlOLunk7ystgQc7eD9HfPo3ZOhdphx4YMKgY=; b=LiceYciy9+bfE14w8XMrBOyWQqnfRCFqq3fMHCeyn2PAkwGEeJvffKAJ/yowVUEMCmD7cz ZNQFcYSGYXGSxEXFcvmr/BMap3ptMZ8jJxurcH42aA1x70rk3eZM2tLIguV2Dh5GAIPITj BWb6vIJXh1rDgog4sr225I9utB9Zr4VuKDG3vReLc538oMoJl08c3bdpIDrlKsB9RVKTCK hq6QvGaOMvx/CBmzJDupUE7KP7Q65Cr0xCDee9+OExpwjAc+vm+1Haee42/cZnmLbErFNy 7MWuPof/93x3paRu+JAI2idfne68vmtq5rwFKgIg7xsZFFuNeusJVYucx3tukg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098263; a=rsa-sha256; cv=none; b=BQYTeG+1GTa2igun3LzpAeLf1B3Z9uzPEZyduYdwZPxhGjpvIQyLpCDP3d1glMZWIxkhpX jFGBVdzdsKVPcwhmPkB7dZlVeUWmb2BiZPN1OX3Q+VcHHYHEBvS9+Em5LjOiWzP5oyuazO XWHAFPgHBRPoF8b+SnxRuFwj+b1qBh3Ds8vnTULiHufQWSf6m45I2eub1Ei/lYlGNcbeLB nOT7LfLcvEcQnxZaqzJ5qAtDTv/tC1kc+gtOFaSURaoDqJ6IvmHyMo/yfG0FAvvbRKT+8j ooEvFnQHvaqvkFnUUo8SB1NUcacyYnyF88S3kwRqcEJGt/0eHz94rKXbBLHL7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q5FGXTWYlOLunk7ystgQc7eD9HfPo3ZOhdphx4YMKgY=; b=Ctd80X0hHIzNOxag5KEdvb+rLuAZxPXjiJ8+5TiKXwAfTZkVXus6Yt6hu/WOdAPuDoQAUq ODZXBcjActdYNjOz0o9qGSJ6djg4p2tNYe+rnJ2GqBFXAh2oU0E7BEGyUuueEFXpuY+593 3CO62Vk4QGTh3TTdiYUv/enDIBOCiyf4Tckuu7kxF12O8QCS1mStpbi6e7NQQenvjfwlCF PIjCIDtjvM2hMTNi5SNwty5kiE1DsX5EY+agua10RXqJGv+OdJ1fSizvYHwVXVImb3nnCI eaPXQyEYdynrGuGTJfOrZEcmSMkuAVph9BDrGFurn1wXCC85HXH8bSS+nxKyeA== 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 4RhMcl4v7cz13Z2; Thu, 7 Sep 2023 14:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ep3CK013010; Thu, 7 Sep 2023 14:51:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ep32Y013007; Thu, 7 Sep 2023 14:51:03 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:51:03 GMT Message-Id: <202309071451.387Ep32Y013007@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0c9caeb8694f - stable/13 - unifdef: Fix case where a multiline comment follows a directive. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0c9caeb8694f278819cf9c1c8171e2985b2d5685 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0c9caeb8694f278819cf9c1c8171e2985b2d5685 commit 0c9caeb8694f278819cf9c1c8171e2985b2d5685 Author: Dag-Erling Smørgrav AuthorDate: 2023-07-19 14:25:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 08:57:19 +0000 unifdef: Fix case where a multiline comment follows a directive. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41026 (cherry picked from commit a122c3c49278f8247296fdc1c097129e4862e472) --- usr.bin/unifdef/tests/Makefile | 1 + usr.bin/unifdef/tests/unifdef_test.sh | 22 ++++++++++++++++++++++ usr.bin/unifdef/unifdef.c | 5 +++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/usr.bin/unifdef/tests/Makefile b/usr.bin/unifdef/tests/Makefile index fc8e5d46dabe..a75d405c9d3a 100644 --- a/usr.bin/unifdef/tests/Makefile +++ b/usr.bin/unifdef/tests/Makefile @@ -1,6 +1,7 @@ PACKAGE= tests +ATF_TESTS_SH= unifdef_test NETBSD_ATF_TESTS_SH= basic_test ${PACKAGE}FILES+= d_basic.in diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh new file mode 100644 index 000000000000..98adef3adfdc --- /dev/null +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -0,0 +1,22 @@ +# +# Copyright (c) 2023 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +atf_test_case hash_comment +hash_comment_head() { + atf_set descr "multiline comment follows directive" +} +hash_comment_body() { + cat >f < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cf1b93786f87 - stable/13 - Add 'contrib/unifdef/' from commit '0da44885831dc0a43c4ca6ff04a2430993cc0a80' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf1b93786f876d500dadc1cf65bee663be3a4d35 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cf1b93786f876d500dadc1cf65bee663be3a4d35 commit cf1b93786f876d500dadc1cf65bee663be3a4d35 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:51:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 08:59:35 +0000 Add 'contrib/unifdef/' from commit '0da44885831dc0a43c4ca6ff04a2430993cc0a80' git-subtree-dir: contrib/unifdef git-subtree-mainline: 3b7ffacdee49f90716cba2bcf8af3fc1971ae031 git-subtree-split: 0da44885831dc0a43c4ca6ff04a2430993cc0a80 (cherry picked from commit fb3ef04d2028110f06d68b09009f1f2ca0f4128e) unifdef: Reapply our 61287be18189. (cherry picked from commit 343b776fd0280f4dc95a1a61fd9ac40c78ce684e) unifdef: Reapply our 7102ec5226e5. (cherry picked from commit 049b7608f41bf4e93ac6de718c45bef261f6977d) --- contrib/unifdef/.gitignore | 7 + contrib/unifdef/.travis.yml | 59 + contrib/unifdef/COPYING | 85 ++ contrib/unifdef/FreeBSD/err.c | 138 ++ contrib/unifdef/FreeBSD/getopt.c | 118 ++ contrib/unifdef/INSTALL | 36 + contrib/unifdef/Makefile | 58 + contrib/unifdef/README | 53 + contrib/unifdef/ifdef-how.pl | 42 + contrib/unifdef/scripts/authors.svn | 15 + contrib/unifdef/scripts/copycheck.sh | 21 + contrib/unifdef/scripts/fixtests.sh | 9 + contrib/unifdef/scripts/git.config | 10 + contrib/unifdef/scripts/gitlog2changelog.sh | 9 + contrib/unifdef/scripts/release.sh | 18 + contrib/unifdef/scripts/reversion.sh | 41 + contrib/unifdef/scripts/runtests.sh | 38 + contrib/unifdef/scripts/svnup.sh | 12 + contrib/unifdef/scripts/upload.sh | 19 + contrib/unifdef/tests/000-init.experr | 0 contrib/unifdef/tests/000-init.expout | 0 contrib/unifdef/tests/000-init.exprc | 1 + contrib/unifdef/tests/000-init.sh | 1 + contrib/unifdef/tests/NetBSD-42628.c | 25 + contrib/unifdef/tests/NetBSD-42628.experr | 0 contrib/unifdef/tests/NetBSD-42628.expout | 6 + contrib/unifdef/tests/NetBSD-42628.exprc | 1 + contrib/unifdef/tests/NetBSD-42628.sh | 1 + contrib/unifdef/tests/NetBSD-47068.c | 2 + contrib/unifdef/tests/NetBSD-47068.experr | 0 contrib/unifdef/tests/NetBSD-47068.expout | 2 + contrib/unifdef/tests/NetBSD-47068.exprc | 1 + contrib/unifdef/tests/NetBSD-47068.sh | 1 + contrib/unifdef/tests/args1.c | 3 + contrib/unifdef/tests/args1.experr | 0 contrib/unifdef/tests/args1.expout | 1 + contrib/unifdef/tests/args1.exprc | 1 + contrib/unifdef/tests/args1.sh | 1 + contrib/unifdef/tests/args2.c | 3 + contrib/unifdef/tests/args2.experr | 0 contrib/unifdef/tests/args2.expout | 3 + contrib/unifdef/tests/args2.exprc | 1 + contrib/unifdef/tests/args2.sh | 1 + contrib/unifdef/tests/blank0d.c | 25 + contrib/unifdef/tests/blank0d.experr | 0 contrib/unifdef/tests/blank0d.expout | 23 + contrib/unifdef/tests/blank0d.exprc | 1 + contrib/unifdef/tests/blank0d.sh | 1 + contrib/unifdef/tests/blank0u.c | 25 + contrib/unifdef/tests/blank0u.experr | 0 contrib/unifdef/tests/blank0u.expout | 22 + contrib/unifdef/tests/blank0u.exprc | 1 + contrib/unifdef/tests/blank0u.sh | 1 + contrib/unifdef/tests/blank1d.c | 25 + contrib/unifdef/tests/blank1d.experr | 0 contrib/unifdef/tests/blank1d.expout | 23 + contrib/unifdef/tests/blank1d.exprc | 1 + contrib/unifdef/tests/blank1d.sh | 1 + contrib/unifdef/tests/blank1u.c | 25 + contrib/unifdef/tests/blank1u.experr | 0 contrib/unifdef/tests/blank1u.expout | 21 + contrib/unifdef/tests/blank1u.exprc | 1 + contrib/unifdef/tests/blank1u.sh | 1 + contrib/unifdef/tests/blank2d.c | 25 + contrib/unifdef/tests/blank2d.experr | 0 contrib/unifdef/tests/blank2d.expout | 23 + contrib/unifdef/tests/blank2d.exprc | 1 + contrib/unifdef/tests/blank2d.sh | 1 + contrib/unifdef/tests/blank2u.c | 25 + contrib/unifdef/tests/blank2u.experr | 0 contrib/unifdef/tests/blank2u.expout | 20 + contrib/unifdef/tests/blank2u.exprc | 1 + contrib/unifdef/tests/blank2u.sh | 1 + contrib/unifdef/tests/blank3d.c | 25 + contrib/unifdef/tests/blank3d.experr | 0 contrib/unifdef/tests/blank3d.expout | 23 + contrib/unifdef/tests/blank3d.exprc | 1 + contrib/unifdef/tests/blank3d.sh | 1 + contrib/unifdef/tests/blank3u.c | 25 + contrib/unifdef/tests/blank3u.experr | 0 contrib/unifdef/tests/blank3u.expout | 19 + contrib/unifdef/tests/blank3u.exprc | 1 + contrib/unifdef/tests/blank3u.sh | 1 + contrib/unifdef/tests/blank4d.c | 25 + contrib/unifdef/tests/blank4d.experr | 0 contrib/unifdef/tests/blank4d.expout | 23 + contrib/unifdef/tests/blank4d.exprc | 1 + contrib/unifdef/tests/blank4d.sh | 1 + contrib/unifdef/tests/blank4u.c | 25 + contrib/unifdef/tests/blank4u.experr | 0 contrib/unifdef/tests/blank4u.expout | 18 + contrib/unifdef/tests/blank4u.exprc | 1 + contrib/unifdef/tests/blank4u.sh | 1 + contrib/unifdef/tests/broken2.h | 1 + contrib/unifdef/tests/broken3.h | 1 + contrib/unifdef/tests/broken4.h | 2 + contrib/unifdef/tests/crlf-a.experr | 0 contrib/unifdef/tests/crlf-a.expout | 10 + contrib/unifdef/tests/crlf-a.exprc | 1 + contrib/unifdef/tests/crlf-a.sh | 1 + contrib/unifdef/tests/crlf-b.experr | 0 contrib/unifdef/tests/crlf-b.expout | 14 + contrib/unifdef/tests/crlf-b.exprc | 1 + contrib/unifdef/tests/crlf-b.sh | 1 + contrib/unifdef/tests/crlf-c.experr | 0 contrib/unifdef/tests/crlf-c.expout | 16 + contrib/unifdef/tests/crlf-c.exprc | 1 + contrib/unifdef/tests/crlf-c.sh | 1 + contrib/unifdef/tests/crlf-d.experr | 0 contrib/unifdef/tests/crlf-d.expout | 18 + contrib/unifdef/tests/crlf-d.exprc | 1 + contrib/unifdef/tests/crlf-d.sh | 1 + contrib/unifdef/tests/crlf.c | 20 + contrib/unifdef/tests/dangle.c | 6 + contrib/unifdef/tests/dangle.experr | 0 contrib/unifdef/tests/dangle.expout | 6 + contrib/unifdef/tests/dangle.exprc | 1 + contrib/unifdef/tests/dangle.sh | 1 + contrib/unifdef/tests/debian-603860.c | 8 + contrib/unifdef/tests/debian-603860.experr | 0 contrib/unifdef/tests/debian-603860.expout | 2 + contrib/unifdef/tests/debian-603860.exprc | 1 + contrib/unifdef/tests/debian-603860.sh | 1 + contrib/unifdef/tests/defundef-broken2.experr | 2 + contrib/unifdef/tests/defundef-broken2.expout | 0 contrib/unifdef/tests/defundef-broken2.exprc | 1 + contrib/unifdef/tests/defundef-broken2.sh | 1 + contrib/unifdef/tests/defundef-broken3.experr | 2 + contrib/unifdef/tests/defundef-broken3.expout | 0 contrib/unifdef/tests/defundef-broken3.exprc | 1 + contrib/unifdef/tests/defundef-broken3.sh | 1 + contrib/unifdef/tests/defundef-broken4.experr | 2 + contrib/unifdef/tests/defundef-broken4.expout | 0 contrib/unifdef/tests/defundef-broken4.exprc | 1 + contrib/unifdef/tests/defundef-broken4.sh | 1 + contrib/unifdef/tests/defundef-funlike.experr | 0 contrib/unifdef/tests/defundef-funlike.expout | 13 + contrib/unifdef/tests/defundef-funlike.exprc | 1 + contrib/unifdef/tests/defundef-funlike.sh | 1 + contrib/unifdef/tests/defundef-undefdef.experr | 0 contrib/unifdef/tests/defundef-undefdef.expout | 1 + contrib/unifdef/tests/defundef-undefdef.exprc | 1 + contrib/unifdef/tests/defundef-undefdef.sh | 1 + contrib/unifdef/tests/div.c | 3 + contrib/unifdef/tests/div.experr | 0 contrib/unifdef/tests/div.expout | 10 + contrib/unifdef/tests/div.exprc | 1 + contrib/unifdef/tests/div.sh | 10 + contrib/unifdef/tests/empty.c | 0 contrib/unifdef/tests/empty.experr | 0 contrib/unifdef/tests/empty.expout | 0 contrib/unifdef/tests/empty.exprc | 1 + contrib/unifdef/tests/empty.sh | 1 + contrib/unifdef/tests/error.c | 4 + contrib/unifdef/tests/error.experr | 0 contrib/unifdef/tests/error.expout | 2 + contrib/unifdef/tests/error.exprc | 1 + contrib/unifdef/tests/error.sh | 1 + contrib/unifdef/tests/exitmode0a.experr | 0 contrib/unifdef/tests/exitmode0a.expout | 16 + contrib/unifdef/tests/exitmode0a.exprc | 1 + contrib/unifdef/tests/exitmode0a.sh | 1 + contrib/unifdef/tests/exitmode0b.experr | 0 contrib/unifdef/tests/exitmode0b.expout | 26 + contrib/unifdef/tests/exitmode0b.exprc | 1 + contrib/unifdef/tests/exitmode0b.sh | 1 + contrib/unifdef/tests/exitmode1a.experr | 0 contrib/unifdef/tests/exitmode1a.expout | 16 + contrib/unifdef/tests/exitmode1a.exprc | 1 + contrib/unifdef/tests/exitmode1a.sh | 1 + contrib/unifdef/tests/exitmode1b.experr | 0 contrib/unifdef/tests/exitmode1b.expout | 26 + contrib/unifdef/tests/exitmode1b.exprc | 1 + contrib/unifdef/tests/exitmode1b.sh | 1 + contrib/unifdef/tests/exitmode2a.experr | 0 contrib/unifdef/tests/exitmode2a.expout | 16 + contrib/unifdef/tests/exitmode2a.exprc | 1 + contrib/unifdef/tests/exitmode2a.sh | 1 + contrib/unifdef/tests/exitmode2b.experr | 0 contrib/unifdef/tests/exitmode2b.expout | 26 + contrib/unifdef/tests/exitmode2b.exprc | 1 + contrib/unifdef/tests/exitmode2b.sh | 1 + contrib/unifdef/tests/exitstat.c | 3 + contrib/unifdef/tests/exitstat.experr | 0 contrib/unifdef/tests/exitstat.expout | 3 + contrib/unifdef/tests/exitstat.exprc | 1 + contrib/unifdef/tests/exitstat.sh | 1 + contrib/unifdef/tests/funlike.h | 1 + contrib/unifdef/tests/if1-a.experr | 0 contrib/unifdef/tests/if1-a.expout | 16 + contrib/unifdef/tests/if1-a.exprc | 1 + contrib/unifdef/tests/if1-a.sh | 1 + contrib/unifdef/tests/if1-f.experr | 0 contrib/unifdef/tests/if1-f.expout | 16 + contrib/unifdef/tests/if1-f.exprc | 1 + contrib/unifdef/tests/if1-f.sh | 1 + contrib/unifdef/tests/if1-k.c | 38 + contrib/unifdef/tests/if1-k.experr | 0 contrib/unifdef/tests/if1-k.expout | 30 + contrib/unifdef/tests/if1-k.exprc | 1 + contrib/unifdef/tests/if1-k.sh | 1 + contrib/unifdef/tests/if1-kDU.c | 38 + contrib/unifdef/tests/if1-kDU.experr | 0 contrib/unifdef/tests/if1-kDU.expout | 20 + contrib/unifdef/tests/if1-kDU.exprc | 1 + contrib/unifdef/tests/if1-kDU.sh | 1 + contrib/unifdef/tests/if1.c | 26 + contrib/unifdef/tests/if1.experr | 0 contrib/unifdef/tests/if1.expout | 16 + contrib/unifdef/tests/if1.exprc | 1 + contrib/unifdef/tests/if1.h | 3 + contrib/unifdef/tests/if1.sh | 1 + contrib/unifdef/tests/if1a.experr | 0 contrib/unifdef/tests/if1a.expout | 24 + contrib/unifdef/tests/if1a.exprc | 1 + contrib/unifdef/tests/if1a.sh | 1 + contrib/unifdef/tests/if2-a.experr | 0 contrib/unifdef/tests/if2-a.expout | 13 + contrib/unifdef/tests/if2-a.exprc | 1 + contrib/unifdef/tests/if2-a.sh | 1 + contrib/unifdef/tests/if2-k.c | 29 + contrib/unifdef/tests/if2-k.experr | 0 contrib/unifdef/tests/if2-k.expout | 21 + contrib/unifdef/tests/if2-k.exprc | 1 + contrib/unifdef/tests/if2-k.sh | 1 + contrib/unifdef/tests/if2-kDU.c | 29 + contrib/unifdef/tests/if2-kDU.experr | 0 contrib/unifdef/tests/if2-kDU.expout | 17 + contrib/unifdef/tests/if2-kDU.exprc | 1 + contrib/unifdef/tests/if2-kDU.sh | 1 + contrib/unifdef/tests/if2.c | 17 + contrib/unifdef/tests/if2.experr | 0 contrib/unifdef/tests/if2.expout | 13 + contrib/unifdef/tests/if2.exprc | 1 + contrib/unifdef/tests/if2.sh | 1 + contrib/unifdef/tests/if3-a.experr | 0 contrib/unifdef/tests/if3-a.expout | 13 + contrib/unifdef/tests/if3-a.exprc | 1 + contrib/unifdef/tests/if3-a.sh | 1 + contrib/unifdef/tests/if3-k.c | 29 + contrib/unifdef/tests/if3-k.experr | 0 contrib/unifdef/tests/if3-k.expout | 21 + contrib/unifdef/tests/if3-k.exprc | 1 + contrib/unifdef/tests/if3-k.sh | 1 + contrib/unifdef/tests/if3-kDU.c | 29 + contrib/unifdef/tests/if3-kDU.experr | 0 contrib/unifdef/tests/if3-kDU.expout | 17 + contrib/unifdef/tests/if3-kDU.exprc | 1 + contrib/unifdef/tests/if3-kDU.sh | 1 + contrib/unifdef/tests/if3.c | 17 + contrib/unifdef/tests/if3.experr | 0 contrib/unifdef/tests/if3.expout | 13 + contrib/unifdef/tests/if3.exprc | 1 + contrib/unifdef/tests/if3.sh | 1 + contrib/unifdef/tests/if4-a.experr | 0 contrib/unifdef/tests/if4-a.expout | 22 + contrib/unifdef/tests/if4-a.exprc | 1 + contrib/unifdef/tests/if4-a.sh | 1 + contrib/unifdef/tests/if4-k.c | 50 + contrib/unifdef/tests/if4-k.experr | 0 contrib/unifdef/tests/if4-k.expout | 42 + contrib/unifdef/tests/if4-k.exprc | 1 + contrib/unifdef/tests/if4-k.sh | 1 + contrib/unifdef/tests/if4-kDU.c | 50 + contrib/unifdef/tests/if4-kDU.experr | 0 contrib/unifdef/tests/if4-kDU.expout | 26 + contrib/unifdef/tests/if4-kDU.exprc | 1 + contrib/unifdef/tests/if4-kDU.sh | 1 + contrib/unifdef/tests/if4.c | 38 + contrib/unifdef/tests/if4.experr | 0 contrib/unifdef/tests/if4.expout | 22 + contrib/unifdef/tests/if4.exprc | 1 + contrib/unifdef/tests/if4.sh | 1 + contrib/unifdef/tests/if5-a.experr | 0 contrib/unifdef/tests/if5-a.expout | 40 + contrib/unifdef/tests/if5-a.exprc | 1 + contrib/unifdef/tests/if5-a.sh | 1 + contrib/unifdef/tests/if5-k.c | 64 + contrib/unifdef/tests/if5-k.experr | 0 contrib/unifdef/tests/if5-k.expout | 56 + contrib/unifdef/tests/if5-k.exprc | 1 + contrib/unifdef/tests/if5-k.sh | 1 + contrib/unifdef/tests/if5-kDU.c | 64 + contrib/unifdef/tests/if5-kDU.experr | 0 contrib/unifdef/tests/if5-kDU.expout | 32 + contrib/unifdef/tests/if5-kDU.exprc | 1 + contrib/unifdef/tests/if5-kDU.sh | 1 + contrib/unifdef/tests/if5.c | 80 ++ contrib/unifdef/tests/if5.experr | 0 contrib/unifdef/tests/if5.expout | 40 + contrib/unifdef/tests/if5.exprc | 1 + contrib/unifdef/tests/if5.sh | 1 + contrib/unifdef/tests/if6.c | 11 + contrib/unifdef/tests/if6.h | 2 + contrib/unifdef/tests/if6a.experr | 0 contrib/unifdef/tests/if6a.expout | 1 + contrib/unifdef/tests/if6a.exprc | 1 + contrib/unifdef/tests/if6a.sh | 1 + contrib/unifdef/tests/if6b.experr | 0 contrib/unifdef/tests/if6b.expout | 5 + contrib/unifdef/tests/if6b.exprc | 1 + contrib/unifdef/tests/if6b.sh | 1 + contrib/unifdef/tests/if6c.experr | 0 contrib/unifdef/tests/if6c.expout | 7 + contrib/unifdef/tests/if6c.exprc | 1 + contrib/unifdef/tests/if6c.sh | 1 + contrib/unifdef/tests/if6d.experr | 0 contrib/unifdef/tests/if6d.expout | 9 + contrib/unifdef/tests/if6d.exprc | 1 + contrib/unifdef/tests/if6d.sh | 1 + contrib/unifdef/tests/if7.c | 94 ++ contrib/unifdef/tests/if7.experr | 0 contrib/unifdef/tests/if7.expout | 46 + contrib/unifdef/tests/if7.exprc | 1 + contrib/unifdef/tests/if7.sh | 1 + contrib/unifdef/tests/indirect.experr | 0 contrib/unifdef/tests/indirect.expout | 16 + contrib/unifdef/tests/indirect.exprc | 1 + contrib/unifdef/tests/indirect.sh | 1 + contrib/unifdef/tests/multi-generic-sh | 15 + contrib/unifdef/tests/multi.experr | 0 contrib/unifdef/tests/multi.expout | 36 + contrib/unifdef/tests/multi.exprc | 1 + contrib/unifdef/tests/multi.sh | 3 + contrib/unifdef/tests/multilnnum.experr | 0 contrib/unifdef/tests/multilnnum.expout | 42 + contrib/unifdef/tests/multilnnum.exprc | 1 + contrib/unifdef/tests/multilnnum.sh | 3 + contrib/unifdef/tests/multimissing.experr | 4 + contrib/unifdef/tests/multimissing.expout | 22 + contrib/unifdef/tests/multimissing.exprc | 1 + contrib/unifdef/tests/multimissing.sh | 3 + contrib/unifdef/tests/multinewline.experr | 0 contrib/unifdef/tests/multinewline.expout | 39 + contrib/unifdef/tests/multinewline.exprc | 1 + contrib/unifdef/tests/multinewline.sh | 3 + contrib/unifdef/tests/none.c | 5 + contrib/unifdef/tests/none.experr | 0 contrib/unifdef/tests/none.expout | 5 + contrib/unifdef/tests/none.exprc | 1 + contrib/unifdef/tests/none.sh | 1 + contrib/unifdef/tests/outdir.experr | 0 contrib/unifdef/tests/outdir.expout | 16 + contrib/unifdef/tests/outdir.exprc | 1 + contrib/unifdef/tests/outdir.sh | 6 + contrib/unifdef/tests/outeperm.experr | 1 + contrib/unifdef/tests/outeperm.expout | 0 contrib/unifdef/tests/outeperm.exprc | 1 + contrib/unifdef/tests/outeperm.sh | 6 + contrib/unifdef/tests/outfile.experr | 0 contrib/unifdef/tests/outfile.expout | 16 + contrib/unifdef/tests/outfile.exprc | 1 + contrib/unifdef/tests/outfile.sh | 5 + contrib/unifdef/tests/outperms.experr | 1 + contrib/unifdef/tests/outperms.expout | 16 + contrib/unifdef/tests/outperms.exprc | 1 + contrib/unifdef/tests/outperms.sh | 10 + contrib/unifdef/tests/overdir.experr | 0 contrib/unifdef/tests/overdir.expout | 16 + contrib/unifdef/tests/overdir.exprc | 1 + contrib/unifdef/tests/overdir.sh | 7 + contrib/unifdef/tests/overenoent.experr | 1 + contrib/unifdef/tests/overenoent.expout | 0 contrib/unifdef/tests/overenoent.exprc | 1 + contrib/unifdef/tests/overenoent.sh | 5 + contrib/unifdef/tests/overin.experr | 0 contrib/unifdef/tests/overin.expout | 16 + contrib/unifdef/tests/overin.exprc | 1 + contrib/unifdef/tests/overin.sh | 6 + contrib/unifdef/tests/overlnnum.experr | 0 contrib/unifdef/tests/overlnnum.expout | 20 + contrib/unifdef/tests/overlnnum.exprc | 1 + contrib/unifdef/tests/overlnnum.sh | 6 + contrib/unifdef/tests/overperms.experr | 2 + contrib/unifdef/tests/overperms.expout | 16 + contrib/unifdef/tests/overperms.exprc | 1 + contrib/unifdef/tests/overperms.sh | 12 + contrib/unifdef/tests/overunchanged.experr | 0 contrib/unifdef/tests/overunchanged.expout | 0 contrib/unifdef/tests/overunchanged.exprc | 1 + contrib/unifdef/tests/overunchanged.sh | 8 + contrib/unifdef/tests/overwrite.experr | 0 contrib/unifdef/tests/overwrite.expout | 16 + contrib/unifdef/tests/overwrite.exprc | 1 + contrib/unifdef/tests/overwrite.sh | 6 + contrib/unifdef/tests/recursive.experr | 120 ++ contrib/unifdef/tests/recursive.expout | 26 + contrib/unifdef/tests/recursive.exprc | 1 + contrib/unifdef/tests/recursive.sh | 1 + contrib/unifdef/tests/small1.c | 17 + contrib/unifdef/tests/small1.experr | 0 contrib/unifdef/tests/small1.expout | 13 + contrib/unifdef/tests/small1.exprc | 1 + contrib/unifdef/tests/small1.sh | 1 + contrib/unifdef/tests/small2.c | 17 + contrib/unifdef/tests/small2.experr | 0 contrib/unifdef/tests/small2.expout | 13 + contrib/unifdef/tests/small2.exprc | 1 + contrib/unifdef/tests/small2.sh | 1 + contrib/unifdef/tests/spaces1.c | 17 + contrib/unifdef/tests/spaces1.experr | 0 contrib/unifdef/tests/spaces1.expout | 13 + contrib/unifdef/tests/spaces1.exprc | 1 + contrib/unifdef/tests/spaces1.sh | 1 + contrib/unifdef/tests/spaces2.c | 17 + contrib/unifdef/tests/spaces2.experr | 0 contrib/unifdef/tests/spaces2.expout | 13 + contrib/unifdef/tests/spaces2.exprc | 1 + contrib/unifdef/tests/spaces2.sh | 1 + contrib/unifdef/tests/spaces3.c | 17 + contrib/unifdef/tests/spaces3.experr | 0 contrib/unifdef/tests/spaces3.expout | 13 + contrib/unifdef/tests/spaces3.exprc | 1 + contrib/unifdef/tests/spaces3.sh | 1 + contrib/unifdef/tests/spaces4.c | 17 + contrib/unifdef/tests/spaces4.experr | 0 contrib/unifdef/tests/spaces4.expout | 13 + contrib/unifdef/tests/spaces4.exprc | 1 + contrib/unifdef/tests/spaces4.sh | 1 + contrib/unifdef/tests/whitespace-1.experr | 2 + contrib/unifdef/tests/whitespace-1.expout | 1 + contrib/unifdef/tests/whitespace-1.exprc | 1 + contrib/unifdef/tests/whitespace-1.sh | 1 + contrib/unifdef/tests/whitespace-2.experr | 0 contrib/unifdef/tests/whitespace-2.expout | 5 + contrib/unifdef/tests/whitespace-2.exprc | 1 + contrib/unifdef/tests/whitespace-2.sh | 1 + contrib/unifdef/tests/whitespace.c | 7 + contrib/unifdef/tests/xterm.experr | 3 + contrib/unifdef/tests/xterm.expout | 83 ++ contrib/unifdef/tests/xterm.exprc | 1 + contrib/unifdef/tests/xterm.sh | 35 + contrib/unifdef/unifdef.1 | 530 ++++++++ contrib/unifdef/unifdef.c | 1702 ++++++++++++++++++++++++ contrib/unifdef/unifdef.h | 53 + contrib/unifdef/unifdefall.sh | 58 + contrib/unifdef/version.h | 2 + contrib/unifdef/win32/Makefile.mingw | 14 + contrib/unifdef/win32/unifdef.h | 84 ++ contrib/unifdef/win32/unifdef.sln | 20 + contrib/unifdef/win32/unifdef.vcxproj | 96 ++ contrib/unifdef/win32/win32.c | 91 ++ 442 files changed, 6575 insertions(+) diff --git a/contrib/unifdef/.gitignore b/contrib/unifdef/.gitignore new file mode 100644 index 000000000000..55ca2f341b7c --- /dev/null +++ b/contrib/unifdef/.gitignore @@ -0,0 +1,7 @@ +Changelog +unifdef +unifdef.exe +unifdef.txt +unifdef-* +version.h +version.sh diff --git a/contrib/unifdef/.travis.yml b/contrib/unifdef/.travis.yml new file mode 100644 index 000000000000..39aa4292de14 --- /dev/null +++ b/contrib/unifdef/.travis.yml @@ -0,0 +1,59 @@ +language: c + +sudo: false + +os: + - linux + - osx + +compiler: + - gcc + - clang + +matrix: + include: + ## Ubuntu 14.04 Trusty (beta), sudo required! + - os: linux + dist: trusty + sudo: required + compiler: gcc + env: TRUSTY="yes" + - os: linux + dist: trusty + sudo: required + compiler: clang + env: TRUSTY="yes" + ## MinGW / wine + - os: linux + sudo: required + compiler: i586-mingw32msvc-gcc + env: BUILD_MINGW="yes" + allow_failures: + - compiler: i586-mingw32msvc-gcc + +install: + - env | grep -v "encrypted" | LC_ALL=C sort + - if test "${BUILD_MINGW}" = "yes"; then + sudo apt-get -qq update && + sudo apt-get -qq install wine; + fi + +script: + - if test "${BUILD_MINGW}" != "yes"; then + make && + make test && + make release; + else + export CC=i586-mingw32msvc-gcc; + echo -e '#!/bin/bash\nexec wine $0.exe "$@"' > unifdef; + chmod ugo+x unifdef; + make version.h && + make -f win32/Makefile.mingw test; + fi + +branches: + only: + - master + - next + - /^travis.*/ + - /^tmp.*/ diff --git a/contrib/unifdef/COPYING b/contrib/unifdef/COPYING new file mode 100644 index 000000000000..ae0ab7eeb717 --- /dev/null +++ b/contrib/unifdef/COPYING @@ -0,0 +1,85 @@ +unifdef copyright licence +------------------------- + +All files in this package are distributed under the two-clause BSD +copyright licence, except for the manual page unifdef.1 and the +portability support code in the FreeBSD subdirectory, which all have +a three-clause BSD copyright licence. + +Unifdef was derived from software contributed to Berkeley by Dave +Yost. It was rewritten to support ANSI C by Tony Finch. The original +version of unifdef.c carried the four-clause BSD copyright licence. +None of its code remains in this version (though some of the names +remain) so it now carries the more liberal two-clause licence. + +Unless otherwise stated, the files in this package are: + + Copyright (c) 2002 - 2020 Tony Finch + +unifdefall.sh is: + + Copyright (c) 2002 - 2013 Tony Finch + Copyright (c) 2009 - 2010 Jonathan Nieder + +Some files in the tests directory are: + + Copyright 2004, 2008 Bob Proulx + +The two-clause BSD copyright licence applying to all the above files is: + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +The three-clause BSD copyright licence for the manual page unifdef.1 +and the portability support code from FreeBSD is below. The fourth +advertising clause that used to appear between clauses 2 and 3 was +rescinded by the University of California Berkeley in 1999. +ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change + + Copyright (c) 1985 - 1994 + The Regents of the University of California. All rights reserved. + Copyright (c) 2002 - 2012 Tony Finch . All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +- end - diff --git a/contrib/unifdef/FreeBSD/err.c b/contrib/unifdef/FreeBSD/err.c new file mode 100644 index 000000000000..9589fced5b26 --- /dev/null +++ b/contrib/unifdef/FreeBSD/err.c @@ -0,0 +1,138 @@ +/*- + * Copyright (c) 1993 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "unifdef.h" + +void +err(int eval, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verrc(eval, errno, fmt, ap); + va_end(ap); +} + +void +verr(int eval, const char *fmt, va_list ap) +{ + verrc(eval, errno, fmt, ap); +} + +void +errc(int eval, int code, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verrc(eval, code, fmt, ap); + va_end(ap); +} + +void +verrc(int eval, int code, const char *fmt, va_list ap) +{ + fprintf(stderr, "%s: ", _getprogname()); + if (fmt != NULL) { + vfprintf(stderr, fmt, ap); + fprintf(stderr, ": "); + } + fprintf(stderr, "%s\n", strerror(code)); + exit(eval); +} + +void +errx(int eval, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verrx(eval, fmt, ap); + va_end(ap); +} + +void +verrx(int eval, const char *fmt, va_list ap) +{ + fprintf(stderr, "%s: ", _getprogname()); + if (fmt != NULL) + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); + exit(eval); +} + +void +warn(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vwarnc(errno, fmt, ap); + va_end(ap); +} + +void +vwarn(const char *fmt, va_list ap) +{ + vwarnc(errno, fmt, ap); +} + +void +warnc(int code, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vwarnc(code, fmt, ap); + va_end(ap); +} + +void +vwarnc(int code, const char *fmt, va_list ap) +{ + fprintf(stderr, "%s: ", _getprogname()); + if (fmt != NULL) { + vfprintf(stderr, fmt, ap); + fprintf(stderr, ": "); + } + fprintf(stderr, "%s\n", strerror(code)); +} + +void +warnx(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vwarnx(fmt, ap); + va_end(ap); +} + +void +vwarnx(const char *fmt, va_list ap) +{ + fprintf(stderr, "%s: ", _getprogname()); + if (fmt != NULL) + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n"); +} diff --git a/contrib/unifdef/FreeBSD/getopt.c b/contrib/unifdef/FreeBSD/getopt.c new file mode 100644 index 000000000000..eb9b0c507875 --- /dev/null +++ b/contrib/unifdef/FreeBSD/getopt.c @@ -0,0 +1,118 @@ +/* + * Copyright (c) 1987, 1993, 1994 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "unifdef.h" + +int opterr = 1, /* if error message should be printed */ + optind = 1, /* index into parent argv vector */ + optopt, /* character checked for validity */ + optreset; /* reset getopt */ +char *optarg; /* argument associated with option */ + +#define BADCH (int)'?' +#define BADARG (int)':' + +static char EMSG[] = ""; + +/* + * getopt -- + * Parse argc/argv argument vector. + */ +int +getopt(int nargc, char *nargv[], const char *ostr) +{ + static char *place = EMSG; /* option letter processing */ + const char *oli; /* option letter list index */ + + if (optreset || *place == 0) { /* update scanning pointer */ + optreset = 0; + place = nargv[optind]; + if (optind >= nargc || *place++ != '-') { + /* Argument is absent or is not an option */ + place = EMSG; + return (-1); + } + optopt = *place++; + if (optopt == '-' && *place == 0) { + /* "--" => end of options */ + ++optind; + place = EMSG; + return (-1); + } + if (optopt == 0) { + /* Solitary '-', treat as a '-' option + if the program (eg su) is looking for it. */ + place = EMSG; + if (strchr(ostr, '-') == NULL) + return (-1); + optopt = '-'; + } + } else + optopt = *place++; + + /* See if option letter is one the caller wanted... */ + if (optopt == ':' || (oli = strchr(ostr, optopt)) == NULL) { + if (*place == 0) + ++optind; + if (opterr && *ostr != ':') + (void)fprintf(stderr, + "%s: illegal option -- %c\n", _getprogname(), + optopt); + return (BADCH); + } + + /* Does this option need an argument? */ + if (oli[1] != ':') { + /* don't need argument */ + optarg = NULL; + if (*place == 0) + ++optind; + } else { + /* Option-argument is either the rest of this argument or the + entire next argument. */ + if (*place) + optarg = place; + else if (nargc > ++optind) + optarg = nargv[optind]; + else { + /* option-argument absent */ + place = EMSG; + if (*ostr == ':') + return (BADARG); + if (opterr) + (void)fprintf(stderr, + "%s: option requires an argument -- %c\n", + _getprogname(), optopt); + return (BADCH); + } + place = EMSG; + ++optind; + } + return (optopt); /* return option letter */ +} diff --git a/contrib/unifdef/INSTALL b/contrib/unifdef/INSTALL new file mode 100644 index 000000000000..03d7488588ab --- /dev/null +++ b/contrib/unifdef/INSTALL @@ -0,0 +1,36 @@ +unifdef installation instructions +--------------------------------- + +Dependencies: + * unifdef is mostly ANSI C, with a few unixisms + * unifdefall is a Unix shell script + * the manual uses the nroff mdoc macros + * the support and test scripts are Unix shell scripts + +To build on Unix, type `make`. You can adjust the compilation options +using the POSIX standard CFLAGS and LDFLAGS make variables. + +To install in your home directory, type `make install` +or to install in /usr type `make prefix=/usr install`. +See the start of the Makefile for the install location +variables. + +The win32 subdirectory contains build files for MinGW and Visual +Studio 2010 which make use of the FreeBSD code plus some other +portability wrappers. + +To build with MinGW, type `mingw32-make -f win32/Makefile.mingw`. + +Unlike the Unix Makefile, the Windows builds do not automatically +create or update version.h. The release tar and zip files include a +pre-generated version.h but the git repository does not. To build from +a git clone you need a Unix shell environment, which you can get as +part of GitHub for Windows - http://windows.github.com/ +To update version.h, right-click on the fanf2/unifdef repository and +select "open a shell here", then type `sh scripts\reversion.sh`. + +We assume Unix provides the BSD err.h functions and C99 stdbool.h. The +FreeBSD subdirectory has copies of err.c and getopt.c for systems such +as Windows that don't have them built in. + +- end - diff --git a/contrib/unifdef/Makefile b/contrib/unifdef/Makefile new file mode 100644 index 000000000000..36c70283c1b7 --- /dev/null +++ b/contrib/unifdef/Makefile @@ -0,0 +1,58 @@ +# Makefile for unifdef + +prefix = ${HOME} +bindir = ${prefix}/bin +mandir = ${prefix}/share/man +man1dir= ${mandir}/man1 + +bindest= ${DESTDIR}${bindir} +man1dest= ${DESTDIR}${man1dir} + +all: unifdef + +unifdef: unifdef.c unifdef.h version.h + ${CC} ${CFLAGS} ${LDFLAGS} -o unifdef unifdef.c + +version.h: version.sh +version.sh:: + scripts/reversion.sh + +test: unifdef + scripts/runtests.sh tests + +install: unifdef unifdefall.sh unifdef.1 + : commands + install -m 755 -d ${bindest} + install -m 755 unifdef ${bindest}/ + install -m 755 unifdefall.sh ${bindest}/unifdefall + : manual + install -m 755 -d ${man1dest} + install -m 644 unifdef.1 ${man1dest}/ + ln -s unifdef.1 ${man1dest}/unifdefall.1 + *** 8448 LINES SKIPPED *** From nobody Thu Sep 7 14:51:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMcq2BvSz4snkD; Thu, 7 Sep 2023 14:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMcp0lrmz4l5R; Thu, 7 Sep 2023 14:51:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x1egAy6q5VZ6x3u6fGUmL8FGpsBtu94W7GaCUmq24qc=; b=K8PikLkAiwFtXXRYeuBbOwOhZc4qgxQprR/QzWOQV+0WLvG0JJ8258z6IT+79HPm9jHYIU gsJRFuMfM15BqMiSo+PJR2VKASUmJY5A9HrhE7o2rKOW7G6q7VVXV+VrJETJieK4/tnWtf rRZS9lMzTNKVBM2p+nqaZ0PXVK6a6Hl4TamAgnhMqYSwHpVnDAgNXlPbP7LhIOkZ/pGgxZ KRw48YQGsfzzZTBMiR2J/SEP9RI2Zp5LBQbaFdl8+Q5mlvhLFSIQMT9LCIAOCubtk9Lm3N cON2WdM5jEyeDimpE+U3+I/k1vNz14hqnftT4w5E3zhzNO8+SU+Rs6goQw5rew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098266; a=rsa-sha256; cv=none; b=CuACZ3jC2UV7i2agazFvefptpXC/UWX9CctlkW5gsMGXxIPMv+QxSX/3FRLzp0k69dhg7f Vp/t0l0vceFaTH5Ja3XgLX/byUexrz/4dzdfOCLrJGB13clV+Jn3mPlEZRWwi73JRm+ypc 2Dv1G6sm6FOP9B73jkaVhuXwKbsLcJ6wbw1RPq2yl0aGAjQWZMafVLzRLpJcksTwKtQSZ3 k9cMptGYOHd+Lt01WVh8iO6ys9rhEZ45629GKmcwj1Vd1ERDbeG0qVOkhqnYpRgzhjuhiw yeDvjKMoUdGueGxwHLkx5MyRcS+sTkn43AjeMa2ZMsYAdhUQdW9i4Gt/BD76MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x1egAy6q5VZ6x3u6fGUmL8FGpsBtu94W7GaCUmq24qc=; b=xZtZ8tL869HM91fSwHZyU0SzMidb4eWaFKBPbwIcThpHND9V+qgAf02CopRJKNaCzSOKbu cjem+hLwenxuaUld5WCNZi37V+kDTdYA1Gh5L6J8OvhfQwALqcVxNMgFyNPYLL7Q8q3Jzw vqIjl2EAHA0mmv0BBXgD5Y+g1fvTmnDpAV5rxNlIzzg2+LMgHkO7ph+UspcROHOs8moMWJ ZHMQB4vasLfSLuk8w6W/xxHC9FFytpS6phFFKho5mCP9yJiWSHDpJQZx44zf6ldrYVZxoP D5Yh1eHjVaWYsPx3N0uTTN7OIW9kASli0ko2KR0x2Pk4R4v2MDvbwyPMW+oUWg== 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 4RhMcn6t2qz13tB; Thu, 7 Sep 2023 14:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ep5LR013104; Thu, 7 Sep 2023 14:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ep5GL013101; Thu, 7 Sep 2023 14:51:05 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:51:05 GMT Message-Id: <202309071451.387Ep5GL013101@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: d194776d7df1 - stable/13 - unifdef: Vendorize. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d194776d7df15b4932881f8327cd8d8b45c84d8f Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d194776d7df15b4932881f8327cd8d8b45c84d8f commit d194776d7df15b4932881f8327cd8d8b45c84d8f Author: Dag-Erling Smørgrav AuthorDate: 2023-08-21 17:49:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 08:59:37 +0000 unifdef: Vendorize. (cherry picked from commit 7addfafe73e077891f003b7cc7a62cfb434f92ec) unifdef: Handle redefined symbols correctly. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41758 (cherry picked from commit aacbe7384221d2eafa326864bbbe2f22a10063ce) --- contrib/unifdef/unifdef.c | 6 +- usr.bin/unifdef/Makefile | 6 +- usr.bin/unifdef/tests/unifdef_test.sh | 21 + usr.bin/unifdef/unifdef.1 | 515 ---------- usr.bin/unifdef/unifdef.c | 1719 --------------------------------- usr.bin/unifdef/unifdefall.sh | 61 -- 6 files changed, 29 insertions(+), 2299 deletions(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index 82f6acd66038..3dd4ace7b81e 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -1550,8 +1550,12 @@ addsym2(bool ignorethis, const char *symname, const char *val) sym->value = val; r = RB_INSERT(MACROMAP, ¯o_tree, sym); assert(r == NULL); + debugsym("addsym", sym); + } else { + sym->ignore = ignorethis; + sym->value = val; + debugsym("updsym", sym); } - debugsym("addsym", sym); } static void diff --git a/usr.bin/unifdef/Makefile b/usr.bin/unifdef/Makefile index 9c2e081b3ba9..82b0c5839f8e 100644 --- a/usr.bin/unifdef/Makefile +++ b/usr.bin/unifdef/Makefile @@ -1,11 +1,11 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 - -.include +.PATH: ${SRCTOP}/contrib/unifdef PROG= unifdef SCRIPTS=unifdefall.sh MLINKS= unifdef.1 unifdefall.1 +.include + HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index 98adef3adfdc..dfb08c187724 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -17,6 +17,27 @@ EOF atf_check -o file:f unifdef file <. All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" Dave Yost. It was rewritten to support ANSI C by Tony Finch. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.Dd December 3, 2015 -.Dt UNIFDEF 1 PRM -.Os " " -.Sh NAME -.Nm unifdef , unifdefall -.Nd remove preprocessor conditionals from code -.Sh SYNOPSIS -.Nm -.Op Fl bBcdehKkmnsStV -.Op Fl I Ns Ar path -.Op Fl [i]D Ns Ar sym Ns Op = Ns Ar val -.Op Fl [i]U Ns Ar sym -.Ar ... -.Op Fl f Ar defile -.Op Fl x Bro Ar 012 Brc -.Op Fl M Ar backext -.Op Fl o Ar outfile -.Op Ar infile ... -.Nm unifdefall -.Op Fl I Ns Ar path -.Ar ... -.Ar file -.Sh DESCRIPTION -The -.Nm -utility selectively processes conditional -.Xr cpp 1 -directives. -It removes from a file -both the directives -and any additional text that they specify should be removed, -while otherwise leaving the file alone. -.Pp -The -.Nm -utility acts on -.Ic #if , #ifdef , #ifndef , -.Ic #elif , #else , -and -.Ic #endif -lines, -using macros specified in -.Fl D -and -.Fl U -command line options or in -.Fl f -definitions files. -A directive is processed -if the macro specifications are sufficient to provide -a definite value for its control expression. -If the result is false, -the directive and the following lines under its control are removed. -If the result is true, -only the directive is removed. -An -.Ic #ifdef -or -.Ic #ifndef -directive is passed through unchanged -if its controlling macro is not specified. -Any -.Ic #if -or -.Ic #elif -control expression that has an unknown value or that -.Nm -cannot parse is passed through unchanged. -By default, -.Nm -ignores -.Ic #if -and -.Ic #elif -lines with constant expressions; -it can be told to process them by specifying the -.Fl k -flag on the command line. -.Pp -It understands a commonly-used subset -of the expression syntax for -.Ic #if -and -.Ic #elif -lines: -integer constants, -integer values of macros defined on the command line, -the -.Fn defined -operator, -the operators -.Ic \&! , ~ , - -(unary), -.Ic * , / , % , + , - , -.Ic < , <= , > , >= , == , != , & , ^ , \&| , -.Ic && , || , -and parenthesized expressions. -Division by zero is treated as an unknown value. -A kind of -.Dq "short circuit" -evaluation is used for the -.Ic && -operator: -if either operand is definitely false then the result is false, -even if the value of the other operand is unknown. -Similarly, -if either operand of -.Ic || -is definitely true then the result is true. -.Pp -When evaluating an expression, -.Nm -does not expand macros first. -The value of a macro must be a simple number, -not an expression. -A limited form of indirection is allowed, -where one macro's value is the name of another. -.Pp -In most cases, -.Nm -does not distinguish between object-like macros -(without arguments) and function-like macros (with arguments). -A function-like macro invocation can appear in -.Ic #if -and -.Ic #elif -control expressions. -If the macro is not explicitly defined, -or is defined with the -.Fl D -flag on the command-line, -or with -.Ic #define -in a -.Fl f -definitions file, -its arguments are ignored. -If a macro is explicitly undefined on the command line with the -.Fl U -flag, -or with -.Ic #undef -in a -.Fl f -definitions file, -it may not have any arguments since this leads to a syntax error. -.Pp -The -.Nm -utility understands just enough about C -to know when one of the directives is inactive -because it is inside -a comment, -or affected by a backslash-continued line. -It spots unusually-formatted preprocessor directives -and knows when the layout is too odd for it to handle. -.Pp -A script called -.Nm unifdefall -can be used to remove all conditional -.Xr cpp 1 -directives from a file. -It uses -.Nm Fl s -and -.Nm cpp Fl dM -to get lists of all the controlling macros -and their definitions (or lack thereof), -then invokes -.Nm -with appropriate arguments to process the file. -.Sh OPTIONS -.Bl -tag -width indent -compact -.It Fl D Ns Ar sym Ns = Ns Ar val -Specify that a macro is defined to a given value. -.Pp -.It Fl D Ns Ar sym -Specify that a macro is defined to the value 1. -.Pp -.It Fl U Ns Ar sym -Specify that a macro is undefined. -.Pp -If the same macro appears in more than one argument, -the last occurrence dominates. -.Pp -.It Fl iD Ns Ar sym Ns Op = Ns Ar val -.It Fl iU Ns Ar sym -C strings, comments, -and line continuations -are ignored within -.Ic #ifdef -and -.Ic #ifndef -blocks -controlled by macros -specified with these options. -.Pp -.It Fl f Ar defile -The file -.Ar defile -contains -.Ic #define -and -.Ic #undef -preprocessor directives, -which have the same effect as the corresponding -.Fl D -and -.Fl U -command-line arguments. -You can have multiple -.Fl f -arguments and mix them with -.Fl D -and -.Fl U -arguments; -later options override earlier ones. -.Pp -Each directive must be on a single line. -Object-like macro definitions (without arguments) -are set to the given value. -Function-like macro definitions (with arguments) -are treated as if they are set to 1. -.Pp -.Em Warning: -string literals and character constants are not parsed correctly in -.Fl f -files. -.Pp -.It Fl b -Replace removed lines with blank lines -instead of deleting them. -Mutually exclusive with the -.Fl B -option. -.Pp -.It Fl B -Compress blank lines around a deleted section. -Mutually exclusive with the -.Fl b -option. -.Pp -.It Fl c -Complement, -i.e., lines that would have been removed or blanked -are retained and vice versa. -.Pp -.It Fl d -Turn on printing of debugging messages. -.Pp -.It Fl e -By default, -.Nm -will report an error if it needs to remove -a preprocessor directive that spans more than one line, -for example, if it has a multi-line -comment hanging off its right hand end. -The -.Fl e -flag makes it ignore the line instead. -.Pp -.It Fl h -Print help. -.Pp -.It Fl I Ns Ar path -Specifies to -.Nm unifdefall -an additional place to look for -.Ic #include -files. -This option is ignored by -.Nm -for compatibility with -.Xr cpp 1 -and to simplify the implementation of -.Nm unifdefall . -.Pp -.It Fl K -Always treat the result of -.Ic && -and -.Ic || -operators as unknown if either operand is unknown, -instead of short-circuiting when unknown operands can't affect the result. -This option is for compatibility with older versions of -.Nm . -.Pp -.It Fl k -Process -.Ic #if -and -.Ic #elif -lines with constant expressions. -By default, sections controlled by such lines are passed through unchanged -because they typically start -.Dq Li "#if 0" -and are used as a kind of comment to sketch out future or past development. -It would be rude to strip them out, just as it would be for normal comments. -.Pp -.It Fl m -Modify one or more input files in place. -If an input file is not modified, -the original is preserved instead of being overwritten with an identical copy. -.Pp -.It Fl M Ar backext -Modify input files in place, and keep backups of the original files by -appending the -.Ar backext -to the input filenames. -A zero length -.Ar backext -behaves the same as the -.Fl m -option. -.Pp -.It Fl n -Add -.Li #line -directives to the output following any deleted lines, -so that errors produced when compiling the output file correspond to -line numbers in the input file. -.Pp -.It Fl o Ar outfile -Write output to the file -.Ar outfile -instead of the standard output when processing a single file. -.Pp -.It Fl s -Instead of processing an input file as usual, -this option causes -.Nm -to produce a list of macros that are used in -preprocessor directive controlling expressions. -.Pp -.It Fl S -Like the -.Fl s -option, but the nesting depth of each macro is also printed. -This is useful for working out the number of possible combinations -of interdependent defined/undefined macros. -.Pp -.It Fl t -Disables parsing for C strings, comments, -and line continuations, -which is useful -for plain text. -This is a blanket version of the -.Fl iD -and -.Fl iU -flags. -.Pp -.It Fl V -Print version details. -.Pp -.It Fl x Bro Ar 012 Brc -Set exit status mode to zero, one, or two. -See the -.Sx EXIT STATUS -section below for details. -.El -.Pp -The -.Nm -utility takes its input from -.Em stdin -if there are no -.Ar file -arguments. -You must use the -.Fl m -or -.Fl M -options if there are multiple input files. -You can specify inut from stdin or output to stdout with -.Ql - . -.Pp -The -.Nm -utility works nicely with the -.Fl D Ns Ar sym -option of -.Xr diff 1 . -.Sh EXIT STATUS -In normal usage the -.Nm -utility's exit status depends on the mode set using the -.Fl x -option. -.Pp -If the exit mode is zero (the default) then -.Nm -exits with status 0 if the output is an exact copy of the input, -or with status 1 if the output differs. -.Pp -If the exit mode is one, -.Nm -exits with status 1 if the output is unmodified -or 0 if it differs. -.Pp -If the exit mode is two, -.Nm -exits with status zero in both cases. -.Pp -In all exit modes, -.Nm -exits with status 2 if there is an error. -.Pp -The exit status is 0 if the -.Fl h -or -.Fl V -command line options are given. -.Sh DIAGNOSTICS -.Bl -item -.It -.Tn EOF -in comment -.It -Inappropriate -.Ic #elif , -.Ic #else -or -.Ic #endif -.It -Missing macro name in #define or #undef -.It -Obfuscated preprocessor control line -.It -Premature -.Tn EOF -(with the line number of the most recent unterminated -.Ic #if ) -.It -Too many levels of nesting -.It -Unrecognized preprocessor directive -.It -Unterminated char or string literal -.El -.Sh SEE ALSO -.Xr cpp 1 , -.Xr diff 1 -.Pp -The unifdef home page is -.Pa https://dotat.at/prog/unifdef -.Sh HISTORY -The -.Nm -command appeared in -.Bx 2.9 . -.Tn ANSI\~C -support was added in -.Fx 4.7 . -.Sh AUTHORS -.An -nosplit -The original implementation was written by -.An Dave Yost Aq Mt Dave@Yost.com . -.An Tony Finch Aq Mt dot@dotat.at -rewrote it to support -.Tn ANSI\~C . -.Sh BUGS -Expression evaluation is very limited. -.Pp -Character constants are not evaluated. -String literals and character constants in -.Fl f -definition files are ignored rather than parsed as -part of a macro's replacement tokens. -.Pp -Handling one line at a time means -preprocessor directives split across more than one physical line -(because of comments or backslash-newline) -cannot be handled in every situation. -.Pp -Trigraphs are not recognized. -.Pp -There is no support for macros with different definitions at -different points in the source file. -.Pp -The text-mode and ignore functionality does not correspond to modern -.Xr cpp 1 -behaviour. diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c deleted file mode 100644 index 598c66e3ab06..000000000000 --- a/usr.bin/unifdef/unifdef.c +++ /dev/null @@ -1,1719 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2002 - 2015 Tony Finch - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * unifdef - remove ifdef'ed lines - * - * This code was derived from software contributed to Berkeley by Dave Yost. - * It was rewritten to support ANSI C by Tony Finch. The original version - * of unifdef carried the 4-clause BSD copyright licence. None of its code - * remains in this version (though some of the names remain) so it now - * carries a more liberal licence. - * - * Wishlist: - * provide an option which will append the name of the - * appropriate symbol after #else's and #endif's - * provide an option which will check symbols after - * #else's and #endif's to see that they match their - * corresponding #ifdef or #ifndef - * - * These require better buffer handling, which would also make - * it possible to handle all "dodgy" directives correctly. - */ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static const char copyright[] = - "@(#) $Version: unifdef-2.11 $\n" - "@(#) $FreeBSD$\n" - "@(#) $Author: Tony Finch (dot@dotat.at) $\n" - "@(#) $URL: https://dotat.at/prog/unifdef $\n" -; - -/* types of input lines: */ -typedef enum { - LT_TRUEI, /* a true #if with ignore flag */ - LT_FALSEI, /* a false #if with ignore flag */ - LT_IF, /* an unknown #if */ - LT_TRUE, /* a true #if */ - LT_FALSE, /* a false #if */ - LT_ELIF, /* an unknown #elif */ - LT_ELTRUE, /* a true #elif */ - LT_ELFALSE, /* a false #elif */ - LT_ELSE, /* #else */ - LT_ENDIF, /* #endif */ - LT_DODGY, /* flag: directive is not on one line */ - LT_DODGY_LAST = LT_DODGY + LT_ENDIF, - LT_PLAIN, /* ordinary line */ - LT_EOF, /* end of file */ - LT_ERROR, /* unevaluable #if */ - LT_COUNT -} Linetype; - -static char const * const linetype_name[] = { - "TRUEI", "FALSEI", "IF", "TRUE", "FALSE", - "ELIF", "ELTRUE", "ELFALSE", "ELSE", "ENDIF", - "DODGY TRUEI", "DODGY FALSEI", - "DODGY IF", "DODGY TRUE", "DODGY FALSE", - "DODGY ELIF", "DODGY ELTRUE", "DODGY ELFALSE", - "DODGY ELSE", "DODGY ENDIF", - "PLAIN", "EOF", "ERROR" -}; - -#define linetype_if2elif(lt) ((Linetype)(lt - LT_IF + LT_ELIF)) -#define linetype_2dodgy(lt) ((Linetype)(lt + LT_DODGY)) - -/* state of #if processing */ -typedef enum { - IS_OUTSIDE, - IS_FALSE_PREFIX, /* false #if followed by false #elifs */ - IS_TRUE_PREFIX, /* first non-false #(el)if is true */ - IS_PASS_MIDDLE, /* first non-false #(el)if is unknown */ - IS_FALSE_MIDDLE, /* a false #elif after a pass state */ - IS_TRUE_MIDDLE, /* a true #elif after a pass state */ - IS_PASS_ELSE, /* an else after a pass state */ - IS_FALSE_ELSE, /* an else after a true state */ - IS_TRUE_ELSE, /* an else after only false states */ - IS_FALSE_TRAILER, /* #elifs after a true are false */ - IS_COUNT -} Ifstate; - -static char const * const ifstate_name[] = { - "OUTSIDE", "FALSE_PREFIX", "TRUE_PREFIX", - "PASS_MIDDLE", "FALSE_MIDDLE", "TRUE_MIDDLE", - "PASS_ELSE", "FALSE_ELSE", "TRUE_ELSE", - "FALSE_TRAILER" -}; - -/* state of comment parser */ -typedef enum { - NO_COMMENT = false, /* outside a comment */ - C_COMMENT, /* in a comment like this one */ - CXX_COMMENT, /* between // and end of line */ - STARTING_COMMENT, /* just after slash-backslash-newline */ - FINISHING_COMMENT, /* star-backslash-newline in a C comment */ - CHAR_LITERAL, /* inside '' */ - STRING_LITERAL /* inside "" */ -} Comment_state; - -static char const * const comment_name[] = { - "NO", "C", "CXX", "STARTING", "FINISHING", "CHAR", "STRING" -}; - -/* state of preprocessor line parser */ -typedef enum { - LS_START, /* only space and comments on this line */ - LS_HASH, /* only space, comments, and a hash */ - LS_DIRTY /* this line can't be a preprocessor line */ -} Line_state; - -static char const * const linestate_name[] = { - "START", "HASH", "DIRTY" -}; - -/* - * Minimum translation limits from ISO/IEC 9899:1999 5.2.4.1 - */ -#define MAXDEPTH 64 /* maximum #if nesting */ -#define MAXLINE 4096 /* maximum length of line */ - -/* - * Sometimes when editing a keyword the replacement text is longer, so - * we leave some space at the end of the tline buffer to accommodate this. - */ -#define EDITSLOP 10 - -/* - * C17/18 allow 63 characters per macro name, but up to 127 arbitrarily large - * parameters. - */ -struct macro { - RB_ENTRY(macro) entry; - const char *name; - const char *value; - bool ignore; /* -iDsym or -iUsym */ -}; - -static int -macro_cmp(struct macro *a, struct macro *b) -{ - return (strcmp(a->name, b->name)); -} - -static RB_HEAD(MACROMAP, macro) macro_tree = RB_INITIALIZER(¯o_tree); -RB_GENERATE_STATIC(MACROMAP, macro, entry, macro_cmp); - -/* - * Globals. - */ - -static bool compblank; /* -B: compress blank lines */ -static bool lnblank; /* -b: blank deleted lines */ -static bool complement; /* -c: do the complement */ -static bool debugging; /* -d: debugging reports */ -static bool inplace; /* -m: modify in place */ -static bool iocccok; /* -e: fewer IOCCC errors */ -static bool strictlogic; /* -K: keep ambiguous #ifs */ -static bool killconsts; /* -k: eval constant #ifs */ -static bool lnnum; /* -n: add #line directives */ -static bool symlist; /* -s: output symbol list */ -static bool symdepth; /* -S: output symbol depth */ -static bool text; /* -t: this is a text file */ - -static FILE *input; /* input file pointer */ -static const char *filename; /* input file name */ -static int linenum; /* current line number */ -static const char *linefile; /* file name for #line */ -static FILE *output; /* output file pointer */ -static const char *ofilename; /* output file name */ -static const char *backext; /* backup extension */ -static char *tempname; /* avoid splatting input */ - -static char tline[MAXLINE+EDITSLOP];/* input buffer plus space */ -static char *keyword; /* used for editing #elif's */ - -/* - * When processing a file, the output's newline style will match the - * input's, and unifdef correctly handles CRLF or LF endings whatever - * the platform's native style. The stdio streams are opened in binary - * mode to accommodate platforms whose native newline style is CRLF. - * When the output isn't a processed input file (when it is error / - * debug / diagnostic messages) then unifdef uses native line endings. - */ - -static const char *newline; /* input file format */ -static const char newline_unix[] = "\n"; -static const char newline_crlf[] = "\r\n"; - -static Comment_state incomment; /* comment parser state */ -static Line_state linestate; /* #if line parser state */ -static Ifstate ifstate[MAXDEPTH]; /* #if processor state */ -static bool ignoring[MAXDEPTH]; /* ignore comments state */ -static int stifline[MAXDEPTH]; /* start of current #if */ -static int depth; /* current #if nesting */ -static int delcount; /* count of deleted lines */ -static unsigned blankcount; /* count of blank lines */ -static unsigned blankmax; /* maximum recent blankcount */ -static bool constexpr; /* constant #if expression */ -static bool zerosyms; /* to format symdepth output */ -static bool firstsym; /* ditto */ - -static int exitmode; /* exit status mode */ -static int exitstat; /* program exit status */ -static bool altered; /* was this file modified? */ - -static void addsym1(bool, bool, char *); -static void addsym2(bool, const char *, const char *); -static char *astrcat(const char *, const char *); -static void cleantemp(void); -static void closeio(void); -static void debug(const char *, ...); -static void debugsym(const char *, const struct macro *); -static bool defundef(void); -static void defundefile(const char *); -static void done(void); -static void error(const char *); -static struct macro *findsym(const char **); -static void flushline(bool); -static void hashline(void); -static void help(void); -static Linetype ifeval(const char **); -static void ignoreoff(void); -static void ignoreon(void); -static void indirectsym(void); -static void keywordedit(const char *); -static const char *matchsym(const char *, const char *); -static void nest(void); -static Linetype parseline(void); -static void process(void); -static void processinout(const char *, const char *); -static const char *skipargs(const char *); -static const char *skipcomment(const char *); -static const char *skiphash(void); -static const char *skipline(const char *); -static const char *skipsym(const char *); -static void state(Ifstate); -static void unnest(void); -static void usage(void); -static void version(void); -static const char *xstrdup(const char *, const char *); - -#define endsym(c) (!isalnum((unsigned char)c) && c != '_') - -static FILE * -mktempmode(char *tmp, int mode) -{ - int rc, fd; - - mode &= (S_IRWXU|S_IRWXG|S_IRWXO); - fd = mkstemp(tmp); - if (fd < 0) - err(2, "can't create %s", tmp); - rc = fchmod(fd, mode); - if (rc < 0) - err(2, "can't fchmod %s mode=0o%o", tmp, mode); - return (fdopen(fd, "wb")); -} - -/* - * The main program. - */ -int -main(int argc, char *argv[]) -{ - int opt; - - while ((opt = getopt(argc, argv, "i:D:U:f:I:M:o:x:bBcdehKklmnsStV")) != -1) - switch (opt) { - case 'i': /* treat stuff controlled by these symbols as text */ - /* - * For strict backwards-compatibility the U or D - * should be immediately after the -i but it doesn't - * matter much if we relax that requirement. - */ - opt = *optarg++; - if (opt == 'D') - addsym1(true, true, optarg); - else if (opt == 'U') - addsym1(true, false, optarg); - else - usage(); - break; - case 'D': /* define a symbol */ - addsym1(false, true, optarg); - break; - case 'U': /* undef a symbol */ - addsym1(false, false, optarg); - break; - case 'I': /* no-op for compatibility with cpp */ - break; - case 'b': /* blank deleted lines instead of omitting them */ - case 'l': /* backwards compatibility */ - lnblank = true; - break; - case 'B': /* compress blank lines around removed section */ - compblank = true; - break; - case 'c': /* treat -D as -U and vice versa */ - complement = true; - break; - case 'd': - debugging = true; - break; - case 'e': /* fewer errors from dodgy lines */ - iocccok = true; - break; - case 'f': /* definitions file */ - defundefile(optarg); - break; - case 'h': - help(); - break; - case 'K': /* keep ambiguous #ifs */ - strictlogic = true; - break; - case 'k': /* process constant #ifs */ - killconsts = true; - break; - case 'm': /* modify in place */ - inplace = true; - break; - case 'M': /* modify in place and keep backup */ - inplace = true; - if (strlen(optarg) > 0) - backext = optarg; *** 1426 LINES SKIPPED *** From nobody Thu Sep 7 14:51:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMcq3MNBz4snh4; Thu, 7 Sep 2023 14:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMcq2Ll5z4l89; Thu, 7 Sep 2023 14:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHRcbgxm1V+n3KIM1FP7pzhwzwOTHUMUtKk1xG+ONq4=; b=pHW9SGH9wxW7Sd5r/sc3FqvAmnfbRT+HI4mDbRUcM7u7YQs3Jp9lAy2XanuQ80m84bx8Z/ BR34532EFr/Kkd1Abl6XDmBfUz7uErWNLsx1y1Mn9Bn1P2d+BPBftiNZ5Dwtg6x2Lqp5k1 SF+avT5TeASvVWmuRPnf182GRWLR6c+uSHasJthYvSFswNTMf1xDTQ3BGnoi9+gSnr8WfP xyb2N6BMRBZwt7u8bFoIQ0H3aWfIgKatyXA81sJCOZWP74A1FxYNQf7vt14koFEp4I+OCh LCt4l/iKILkdiYrTTyHZfcDajmNEFnfO/I8VhQfm5kGd92h/My4EMmgkEemG2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098267; a=rsa-sha256; cv=none; b=q99xfo8VRQMwS1z92iRG/e4V6eYPTdXl9MSf5rrMKjDIlDsNygoMaD91QhVfiCgI8wXFUW gjpYMsb3eDanfV3x6CHIiHYTguWE7yd72vgSZLFTdGVAclmBciO74dZKK0f+GXwihy9jY3 bpOMGE2qYCN6rOMJyLAmCQ3804Ivjp14QBQR37oPVH+4iAavylZFi6ckYJ3vmW9DIB5Uku wpdIrvwny9Ix8UOQH82fr+J8ugid4bYH8OpSo/dvDsGYtx1H+/wNKgYEKK5tg13KNUCE/Q XSkJ/gllivhKlrNKEy4CEMvWOz2Asy6gUeYNN+/tgFQnOE5kLIsNcpYZrcytRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DHRcbgxm1V+n3KIM1FP7pzhwzwOTHUMUtKk1xG+ONq4=; b=phXqUWn8EM0RFLE9I40+YWFY4ow/4emJgi+CMyUUU4loTL643X/fATR07zjbsIBg5xCftV stoncEanIxnEchEvBoMXmYMcBwPfA61xwWhqCTQhZ0rAfYPKT+pZsyUQM1+xJba4/jziqt ZaLwz/bZZ7C34WgB02HfKB2B13PJW+6h3oo3w3s2XrJaWyClzvy/epKfjntIotFvH+PGfe c4tMeMPQR+v42VrqiDr39/0HAPQ8J111BZlvByuSel+FIaJ6V+AwWMyPPO8qnraeggxoCl /4Jg3P0iKCUhbKB2fJYguAgY1F1L0/ZfYzQRtc4kGxXz6IHrNapU2KCTXm5dlw== 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 4RhMcq0MCsz13tC; Thu, 7 Sep 2023 14:51:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ep6hW013163; Thu, 7 Sep 2023 14:51:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ep6bx013160; Thu, 7 Sep 2023 14:51:06 GMT (envelope-from git) Date: Thu, 7 Sep 2023 14:51:06 GMT Message-Id: <202309071451.387Ep6bx013160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3b95950fa3f4 - stable/13 - libc: Fix parsing of hexadecimal numbers in strtol() family. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b95950fa3f4e304908cec6818d552db69e2bb64 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3b95950fa3f4e304908cec6818d552db69e2bb64 commit 3b95950fa3f4e304908cec6818d552db69e2bb64 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-24 21:31:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 09:00:30 +0000 libc: Fix parsing of hexadecimal numbers in strtol() family. This had previously been partly fixed in 2571c7f7200f. MFC after: 1 week Reviewed by: imp, allanjude, emaste Differential Revision: https://reviews.freebsd.org/D41510 (cherry picked from commit b8b6bef43f876a0a0b8c0b4ae65135bcab4c7aa6) --- lib/libc/iconv/_strtol.h | 5 ++++- lib/libc/iconv/_strtoul.h | 5 ++++- lib/libc/locale/wcstoimax.c | 5 ++++- lib/libc/locale/wcstol.c | 7 +++++-- lib/libc/locale/wcstoll.c | 5 ++++- lib/libc/locale/wcstoul.c | 5 ++++- lib/libc/locale/wcstoull.c | 5 ++++- lib/libc/locale/wcstoumax.c | 5 ++++- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/lib/libc/iconv/_strtol.h b/lib/libc/iconv/_strtol.h index 786ae2efbaa9..d183edbe8c3a 100644 --- a/lib/libc/iconv/_strtol.h +++ b/lib/libc/iconv/_strtol.h @@ -83,7 +83,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/iconv/_strtoul.h b/lib/libc/iconv/_strtoul.h index 2d5c7776b0e3..eade72e9c2e6 100644 --- a/lib/libc/iconv/_strtoul.h +++ b/lib/libc/iconv/_strtoul.h @@ -79,7 +79,10 @@ _FUNCNAME(const char *nptr, char **endptr, int base) c = *s++; } if ((base == 0 || base == 16) && - c == '0' && (*s == 'x' || *s == 'X')) { + c == '0' && (*s == 'x' || *s == 'X') && + ((s[1] >= '0' && s[1] <= '9') || + (s[1] >= 'A' && s[1] <= 'F') || + (s[1] >= 'a' && s[1] <= 'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c index 729800704bef..e7b1c71e5d71 100644 --- a/lib/libc/locale/wcstoimax.c +++ b/lib/libc/locale/wcstoimax.c @@ -78,7 +78,10 @@ wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c index a61db0ec8b60..facf2bd9ee35 100644 --- a/lib/libc/locale/wcstol.c +++ b/lib/libc/locale/wcstol.c @@ -63,7 +63,7 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int do { c = *s++; } while (iswspace_l(c, locale)); - if (c == '-') { + if (c == L'-') { neg = 1; c = *s++; } else { @@ -72,7 +72,10 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c index f6de4ca38332..c8cf66c1bb01 100644 --- a/lib/libc/locale/wcstoll.c +++ b/lib/libc/locale/wcstoll.c @@ -78,7 +78,10 @@ wcstoll_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c index cc9f50fbfbc9..0f6fe4152dea 100644 --- a/lib/libc/locale/wcstoul.c +++ b/lib/libc/locale/wcstoul.c @@ -72,7 +72,10 @@ wcstoul_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c index a967e1691292..df68c5681433 100644 --- a/lib/libc/locale/wcstoull.c +++ b/lib/libc/locale/wcstoull.c @@ -78,7 +78,10 @@ wcstoull_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c index a14dca8ba80b..d6e92f4d3305 100644 --- a/lib/libc/locale/wcstoumax.c +++ b/lib/libc/locale/wcstoumax.c @@ -78,7 +78,10 @@ wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, c = *s++; } if ((base == 0 || base == 16) && - c == L'0' && (*s == L'x' || *s == L'X')) { + c == L'0' && (*s == L'x' || *s == L'X') && + ((s[1] >= L'0' && s[1] <= L'9') || + (s[1] >= L'A' && s[1] <= L'F') || + (s[1] >= L'a' && s[1] <= L'f'))) { c = s[1]; s += 2; base = 16; From nobody Thu Sep 7 15:00:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhMqP6V5dz4sslr; Thu, 7 Sep 2023 15:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhMqP5HXvz4pWP; Thu, 7 Sep 2023 15:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyQXclZpUB65KLuuMom7P3r9kVlZa2YXiH5fBmJrQbA=; b=rWXpUGzn08dU5CysazboJrqPt3xOnEAt5XTOaorMs5sMpvv1jmijUS/1mL1jF8SErekw7e 7r9+dAvVGUrRxpnfFctXuhFCBm7aLF7d/UVjsxcvoOWkjeP/sZZGP8YMMUhD6k+l+W09Cu B5wwhilaOrSr0lXoYxQQ0JdP4ny6POpXAZy62dmJjM4DABHiDVq38snW4uCEP+BwRvIEAt CHpdwPqW6kOSPGy1JqWHtFvrsG84zpwme6/SNbOaJhzdXCfWR1RxEsP+GZmUY97FDT9gMa d8cD3qMa+hWSmuSjiZMG6Y8j5pj0y8uczOcFiQ8jvmic7YpXXW7zZVPy3YjqxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694098817; a=rsa-sha256; cv=none; b=xgYfWq7VosJMNDpYw50j7i4nJICTQb2IKa8pUdQmRZi5ToNkqTecWZliuzQLrV+bwwTbym ejfz0enhCEN8tv+KPUwmaP1/8/YNJt+NKh/tgEUzKTvjH5dqNDmkX+ZP4sWe9+oIgxXX6y zV6kUiSnDuuHeW3qHnMhdyUAoy35aOce8G5PZrFmqGj+RWSvI2zXjyiyHzmD4mDmtcEkLz WPYXO5zdN+h8jBOb368F7Akz/BTj9ZEFtZfW3n/1Lg9mxlsZWSYkzZuFxI4qOeqHMB+Iro Zdvvbz9T9Pnt8MPYeWmsMbowkpsKTB8B2DwQ8KX75FT4zBQbUVvYsr7xgUfgSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694098817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KyQXclZpUB65KLuuMom7P3r9kVlZa2YXiH5fBmJrQbA=; b=DPEjc3N+02wbs5tW121tb58riKgbiutR0OtvE9lFkvMIc1aElyEZwCfHZTgDPevBK2uQQm Tjxoumo3+3EU/ODFXV3MfgBK3KDL3eGrKn7coAWJ1N8HEQMxb/AOiF1MzKRJyd3ynlaO90 Djz3SEo21wd71qrZyuQyk/ZosYunp7hhkWRzPXmMZZwrM3SsU81AVRQry6sXm3xkspOKRC ky4mweExKuqXNB5a+6T+SXonrKbHQ9zimdvn8dLYHpWJ/4tnG/IBEXXkclxIMskBXkwpDs 1XOok5fNM+e8BDIMCB7BA0zOrdiPcsnsiGJfpUfktmxKWPaZ+743a9TOezbWzA== 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 4RhMqP4CKLz13xZ; Thu, 7 Sep 2023 15:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387F0HfP025836; Thu, 7 Sep 2023 15:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387F0H8l025833; Thu, 7 Sep 2023 15:00:17 GMT (envelope-from git) Date: Thu, 7 Sep 2023 15:00:17 GMT Message-Id: <202309071500.387F0H8l025833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wolfram Schneider Subject: git: cd89fe3923e9 - main - switch groff parameter -man to -mandoc for new groff release 1.23.0 PR: 273565 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wosch X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd89fe3923e92ab090cbdff7eb215c2d85b51718 Auto-Submitted: auto-generated The branch main has been updated by wosch: URL: https://cgit.FreeBSD.org/src/commit/?id=cd89fe3923e92ab090cbdff7eb215c2d85b51718 commit cd89fe3923e92ab090cbdff7eb215c2d85b51718 Author: Wolfram Schneider AuthorDate: 2023-09-07 14:59:12 +0000 Commit: Wolfram Schneider CommitDate: 2023-09-07 14:59:12 +0000 switch groff parameter -man to -mandoc for new groff release 1.23.0 PR: 273565 --- usr.bin/man/man.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5 index 5bffbf96bec2..90595bb6d498 100644 --- a/usr.bin/man/man.conf.5 +++ b/usr.bin/man/man.conf.5 @@ -113,8 +113,8 @@ MANLOCALE ja_JP.eucJP EQN_JA /usr/local/bin/geqn PIC_JA /usr/local/bin/gpic TBL_JA /usr/local/bin/gtbl -NROFF_JA /usr/local/bin/groff -man -dlang=ja_JP.eucJP -TROFF_JA /usr/local/bin/groff -man -dlang=ja_JP.euc.jp +NROFF_JA /usr/local/bin/groff -mandoc -dlang=ja_JP.eucJP +TROFF_JA /usr/local/bin/groff -mandoc -dlang=ja_JP.euc.jp .Ed .Pp If the system administrator decides to override the From nobody Thu Sep 7 15:09:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhN1x45dcz4rklq for ; Thu, 7 Sep 2023 15:09:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhN1x0f0wz4s3p for ; Thu, 7 Sep 2023 15:09:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-52bcd4db4e6so1457776a12.0 for ; Thu, 07 Sep 2023 08:09:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1694099363; x=1694704163; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=/iVVSdk/TZQbwEVJO/ep2Q+pm2qz3FqJaJE0FKNR9DQ=; b=x8VbS5mM8jBRIzbvTiDCrsudvmBCaoAOnwlVIylqpK9IVxf3qWqBnPl+Qb9RUbaE3R eZYUK5QhhISpLvk6W0CS4Fo15wWTfHmpqhQD8+38d/StwqPz78MOxi1FXcjvipkhuz3o 7+sTwVHSzudf+LSbJidltLLsTbNkpuw0ssDLl/4N46Yk4mr+fEvyXCfyjkHFdq8DKM+G Jjmqkfrk1VqPC7C/l7qspGl3z4PNVIwWnbonyDBeLnQwIvHgZ8PmDB2elHKC6N7U8Mlq TizlrwRH6dEmbHGNdr+K0ppd8PSMydQh6pBn42b6MI5Qw9k9zBoTPFh59hKW5aC1D+fl pOMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694099363; x=1694704163; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=/iVVSdk/TZQbwEVJO/ep2Q+pm2qz3FqJaJE0FKNR9DQ=; b=HK60DzO7ie8rZhX1ZGUIGFI/6CaLMDM+4Mwu+KQrDOoVdA+Okvcsn79Dlobbo+mOIj cXP+NS5FYRUwMTilEavrs2T6nxS5loNJiF/Q9GcfmQ6uIIRc/FYsVFY6mRD1DwGNcVBK pRCVBY8fjCLbgghsAzKsIipV49I3We02tAgs2/RPFRytX5t3lEQWEJdD5NCWG+otmYFM 42+1YZuSwDdOyS23syvgMRpgSKAUzcWUWmol5jDk9aYFwypPQJg4uUGuJhxRBTkJzDdv Np568Rkk7qpfQnUVIsCSELsawCw2Hchz9uVVTCphiw628YfZvGJh+jTZd389nyG/TUXY +MZA== X-Gm-Message-State: AOJu0YxZlQYvUh1953wGS/eqa5yCLT/nGgWGAhscJskrNgjA6Hr+9xjT YqQ30SxJa2sBppErGvQPabwnJM78DgfAyNc5X7Ji2Q== X-Google-Smtp-Source: AGHT+IGMzyNJnTAa+fHWHEYkjf0ub0aqotQMgTrbGFJ4sNTYfFl+baGK0c5QykxuIYQ6l4R0vQFJgvZdmSKgmg3+qvc= X-Received: by 2002:aa7:c859:0:b0:52c:e607:3866 with SMTP id g25-20020aa7c859000000b0052ce6073866mr4456725edt.32.1694099363470; Thu, 07 Sep 2023 08:09:23 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202309052116.385LGoau059784@gitrepo.freebsd.org> <92064p8n-134r-9rqo-8038-rpnq4r25p567@SerrOFQ.bet> <5325f22d-9e7f-04bd-ab35-128438eb9a2a@FreeBSD.org> <4sr8n9or-q731-1945-893s-no953r283756@SerrOFQ.bet> <5o323300-6053-0s28-692r-6oro7qq5n9p8@serrofq.bet> In-Reply-To: <5o323300-6053-0s28-692r-6oro7qq5n9p8@serrofq.bet> From: Warner Losh Date: Thu, 7 Sep 2023 09:09:12 -0600 Message-ID: Subject: Re: git: cf94672363d6 - main - rtw88/rtw89: remove local firmware. To: "Bjoern A. Zeeb" Cc: John Baldwin , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000c6372f0604c63e78" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4RhN1x0f0wz4s3p --000000000000c6372f0604c63e78 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Sep 7, 2023, 7:45 AM Bjoern A. Zeeb wrote: > On Thu, 7 Sep 2023, Warner Losh wrote: > > > On Thu, Sep 7, 2023 at 6:36=E2=80=AFAM Bjoern A. Zeeb = wrote: > > > >> On Wed, 6 Sep 2023, John Baldwin wrote: > >> > >>> On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote: > >>>> On Wed, 6 Sep 2023, John Baldwin wrote: > >>>> > >>>>> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote: > >>>>>> The branch main has been updated by bz: > >>>>>> > >>>>>> URL: > >>>>>> > >> > https://cgit.FreeBSD.org/src/commit/?id=3Dcf94672363d6638b7268c05b4628b62= bbfc8dbe5 > >>>>>> > >>>>>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 > >>>>>> Author: Bjoern A. Zeeb > >>>>>> AuthorDate: 2023-06-08 21:35:09 +0000 > >>>>>> Commit: Bjoern A. Zeeb > >>>>>> CommitDate: 2023-09-05 21:13:18 +0000 > >>>>>> > >>>>>> rtw88/rtw89: remove local firmware. > >>>>>> Remove firmware from src/ in favor of the ports/package= s > >> and > >>>>>> fwget(8). > >>>>>> This will allow us to shrink the size of src (and installed > >>>>>> modules). > >>>>>> Update the rtw88 man page to reflect the change. > >>>>> > >>>>> How does this interfact with doing an install to a machine over one > of > >>>>> these > >>>>> interfaces? > >>>> > >>>> That's nothing we support. At least we do not support netboot over > wifi > >>>> currently, so you'll always need another install media. > >>>> > >>>> How's the "bootstrapping" going to work if wireless is the only > network > >>>> option? > >>> > >>> To be clear, I was discussing the case you use a USB memstick, but > fetch > >>> the base system and packages over the network. > >> > >> Understood. Not sure we actually support the former; I guess I am no= t > >> using the installer too much. > >> > >> > >>> Or at least you need to > >>> install pkg over the network, but you need pkg to install the firmwar= e > >>> so you can bring up the network which you did address, though it seem= s > >>> something we plan to fix in the future so won't be in 14.0? > >> > >> Yes. We plan to sort this out but I'd say it's unlikely for 14.0. > >> > >> And to be clear, it was me who raised exactly these "botstrapping" > >> installer concerns in the first place. > >> > >> At the moment we will first need stable drivers to be able to do any > >> networking in first place. Once that is sorted, installing mobile > >> devices with just them and no other means of networking will be > >> addressed. > >> > > > > Yea, the rtw88 driver is stable enough for me to do a network install > > over it. So now people with -current can't do that any more and have > > to do hokey things to get the firmware or other packages to the laptop > > before they can do anything. This is not really going to make people > > happy and will generate a fair number of complaints. > > > > I'd assume some other "fallout" will improve some installer bits along > >> when this happens and that we'll want enough and brought testing for i= t. > >> > > > > It sounds rather premature to remove it from -current if there's no > support > > in the installer, and nothing in place that adds the packages to the > > installation > > media with no firm plans or timelines to address that. > > You do understand that I also disconnected rtw88 from main? > > Please read the announcement and/or fill the gap. It is no less premature. It's the first step without a clear timeline. You've removed functionality that was present and my point is still valid. It's even worse because now I have to add this driver back when I upgrade my laptop or I have to find the USB dongle I was using. This just doesn't make any sense to me. Warner /bz > > -- > Bjoern A. Zeeb r15:7 --000000000000c6372f0604c63e78 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Sep 7, 2023, 7:45 AM Bjoern A. Zeeb <bz@freebsd.org> wrote:
On Thu, 7 Sep 2023, Warner Losh wrote:

> On Thu, Sep 7, 2023 at 6:36=E2=80=AFAM Bjoern A. Zeeb <bz@freebsd.org> wrote:
>
>> On Wed, 6 Sep 2023, John Baldwin wrote:
>>
>>> On 9/6/23 12:06 PM, Bjoern A. Zeeb wrote:
>>>> On Wed, 6 Sep 2023, John Baldwin wrote:
>>>>
>>>>> On 9/5/23 2:16 PM, Bjoern A. Zeeb wrote:
>>>>>> The branch main has been updated by bz:
>>>>>>
>>>>>> URL:
>>>>>>
>> https://cgit.FreeBSD.org/src/commit/?id=3Dcf94672363d6638b7268c05b4628b62= bbfc8dbe5
>>>>>>
>>>>>> commit cf94672363d6638b7268c05b4628b62bbfc8dbe5 >>>>>> Author:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@F= reeBSD.org>
>>>>>> AuthorDate: 2023-06-08 21:35:09 +0000
>>>>>> Commit:=C2=A0 =C2=A0 =C2=A0Bjoern A. Zeeb <bz@F= reeBSD.org>
>>>>>> CommitDate: 2023-09-05 21:13:18 +0000
>>>>>>
>>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0rtw88/rtw89: remove loca= l firmware.
>>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Remove fi= rmware from src/ in favor of the ports/packages
>> and
>>>>>> fwget(8).
>>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0This will allow us to sh= rink the size of src (and installed
>>>>>> modules).
>>>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Update the rtw88 man pag= e to reflect the change.
>>>>>
>>>>> How does this interfact with doing an install to a mac= hine over one of
>>>>> these
>>>>> interfaces?
>>>>
>>>> That's nothing we support.=C2=A0 At least we do not su= pport netboot over wifi
>>>> currently, so you'll always need another install media= .
>>>>
>>>> How's the "bootstrapping" going to work if w= ireless is the only network
>>>> option?
>>>
>>> To be clear, I was discussing the case you use a USB memstick,= but fetch
>>> the base system and packages over the network.
>>
>> Understood.=C2=A0 Not sure we actually support the former;=C2=A0 I= guess I am not
>> using the installer too much.
>>
>>
>>> Or at least you need to
>>> install pkg over the network, but you need pkg to install the = firmware
>>> so you can bring up the network which you did address, though = it seems
>>> something we plan to fix in the future so won't be in 14.0= ?
>>
>> Yes.=C2=A0 We plan to sort this out but I'd say it's unlik= ely for 14.0.
>>
>> And to be clear, it was me who raised exactly these "botstrap= ping"
>> installer concerns in the first place.
>>
>> At the moment we will first need stable drivers to be able to do a= ny
>> networking in first place.=C2=A0 =C2=A0Once that is sorted, instal= ling mobile
>> devices with just them and no other means of networking will be >> addressed.
>>
>
> Yea, the rtw88 driver is stable enough for me to do a network install<= br> > over it. So now people with -current can't do that any more and ha= ve
> to do hokey things to get the firmware or other packages to the laptop=
> before they can do anything. This is not really going to make people > happy and will generate a fair number of complaints.
>
> I'd assume some other "fallout" will improve some instal= ler bits along
>> when this happens and that we'll want enough and brought testi= ng for it.
>>
>
> It sounds rather premature to remove it from -current if there's n= o support
> in the installer, and nothing in place that adds the packages to the > installation
> media with no firm plans or timelines to address that.

You do understand that I also disconnected rtw88 from main?

Please read the announcement and/or fill the gap.
<= div dir=3D"auto">
It is no less premature. It= 9;s the first step without a clear timeline. You've removed functionali= ty that was present and my point is still valid.
It's even worse because now I have to add this= driver back when I upgrade my laptop or I have to find the USB dongle I wa= s using.

This just doesn= 't make any sense to me.

Warner


/bz

--
Bjoern A. Zeeb=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0r15:7
--000000000000c6372f0604c63e78-- From nobody Thu Sep 7 15:16:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhN9c164Pz4rpZN; Thu, 7 Sep 2023 15:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhN9c0cqQz4tf9; Thu, 7 Sep 2023 15:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694099764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cs5LDqfFfN5IFjcgfXzSPoBLTQzaso48I/1N/kz2NCE=; b=dNT/Lb03c2osTVgF4+OlMoQYn73vQiEYzVPMV8IIEm3cZeVzMhiFxBpwDqnXsX7nEGs7bw iTsYzg/4OehX/cCUrwYJPfoMVkmkiz/mUWAKkviWtPsacqnKFpZQJd/mrlYSdyKK17/+AB /5DOrrzL203gqPXSWYVHfCVSq0ym+HpiwWfoa8Mr64xil0v2rX9GjO8VuwVo+goNdq7KJu 6mhKhS20PsaJr0QDm9TXuV4YFsOUF6H0NpB3mXQ4SR9ZMWZr6m5yxAG9UFM2vQNi29R2NW ruJepaQBqhRTlW8AoZC6YhwKpZCngZyp4f0MgnhQlNUFt+fCNj49a/OovKcRxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694099764; a=rsa-sha256; cv=none; b=hItIZ/Hlnp/x9GtziXKMDGkn9cH6dfrNXZ8sHekVBrxUcPgwkyVWSBiWg0MtjYHqpmmJB9 rESzMSvPQkRicB0Yqy+fbDv2jtXtlby0fljP3lig/iZ7lxgwlbIjnS1aC7x+MNjZVxd6NL H2ay/YFa4rjqqxlIhwbIx/i8Cmj2rQz5LregsvafvHO4KSqBAP+fijY8EAe/0wIgg2wDqn wTUPE7obhhqBbikclP1Lv8RZxPmPTqUBlSyimAAR6HpJb4UjhYjsKuRWxsKn4yLxDbUGtu qR1auAT2d7SPQl3xJE59aJ3nUkqdeJOAQpG1BT70Ah2ZGkKXhDt5HmokB6nr5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694099764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cs5LDqfFfN5IFjcgfXzSPoBLTQzaso48I/1N/kz2NCE=; b=VcOcpdJf6cFmSTrbPWp4/XHRaTMrtMG28l8Ah0WiGTQFA4PtCv5JLM94dXA6jaJvqmaDrG Iyg7vPQQYKUKh2J7diXTyrRYPoKN0CECrF6MCBHcomTJLpUpZmwjOp710MIf2mmf2kW8oe iHz0oKk9SWh8R4sCEzwWzsGOkvVPkVs59PyPDYr8wqXmoATiAcosg9ZIqTt5BpJDcYcB2i jLU4GAnvwPzrF9cpIzxkW/UiDu+RL9y8QVCjqU/04Yf3WP0L15Sidxs6Y0vJJkQ2QKEknr NE9dXyiJQmVu2LflF4FmvKH8mq5Q4D4QV7iDGAinbhmPTQ1aTEEtspY8BDR2Cg== 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 4RhN9b6phwz1407; Thu, 7 Sep 2023 15:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387FG3eC050460; Thu, 7 Sep 2023 15:16:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387FG3K7050457; Thu, 7 Sep 2023 15:16:03 GMT (envelope-from git) Date: Thu, 7 Sep 2023 15:16:03 GMT Message-Id: <202309071516.387FG3K7050457@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 2afef29b2c0b - main - syscons: refer to it as the legacy console List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2afef29b2c0b59182c6c1e133733943eafab714d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2afef29b2c0b59182c6c1e133733943eafab714d commit 2afef29b2c0b59182c6c1e133733943eafab714d Author: Ed Maste AuthorDate: 2023-09-07 15:10:33 +0000 Commit: Ed Maste CommitDate: 2023-09-07 15:16:00 +0000 syscons: refer to it as the legacy console vt(4) is the default console, and although there is no firm deprecation plan for syscons(4) yet it it is not actively maintained and is not compatible with contemporary systems (i.e., those booting via UEFI). Reviewed by: manu MFC after: 3 days Sponsored by: The FreeBSD Foundation --- share/man/man4/syscons.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4 index f9540ffe9bdc..19ecd5e3746e 100644 --- a/share/man/man4/syscons.4 +++ b/share/man/man4/syscons.4 @@ -30,7 +30,7 @@ .Sh NAME .Nm syscons , .Nm sc -.Nd the console driver +.Nd the legacy console driver .Sh SYNOPSIS .Cd "options MAXCONS=N" .Cd "options SC_ALT_MOUSE_IMAGE" From nobody Thu Sep 7 15:24:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhNM40Kvjz4rvbk; Thu, 7 Sep 2023 15:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhNM372HLz3CmK; Thu, 7 Sep 2023 15:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694100256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zmz9lm0aQsf+IGCGz4e7x/ZnMck3zYF+IIHG7jU2Idk=; b=VtmFZpx9XAsqRrnf2Ss5eGtk9ZzGW/u1nQvvMjjqcJAHNKBEJrSrh+60KKqik44agvdl4T 13TxcIhukh37nxEekSmVig2FAlLdU2YnJDk3D1Kbli4AVZnxV5OcEPm1sDgfIKNhtgLMUE AJBabrofY9IHkk1bRt4qRUeqL1u8/+fb4jLP1LgT698aTHfuEN1n5eg+LZzO4ldIpFO5Jp vbdFybO8EF/aI+NYQNK5Ny8k5XYED7gYjZ4XrJzirStJ3SDoTn2HzHTBDbOYR8qZAGt8TX jNJpKPF2CPLBUhnF0U5TwRgWX+bpzrpg/4FSUfsADNyqhZ2785ORY+Ix7Qy1WA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694100256; a=rsa-sha256; cv=none; b=mxXugcWutszG8SOuTZ13fCQiSgs77q8w/2IFRZmeFD9JjqEdZATbkJkKnzLbgujIsYOQ6q P0QNft66V5C9N0RFDuDpBak8tpmvffRXlStl3dHNXXrHsawcMeElKJAtrHLal3f82gg5h9 j0JGmgV28rFm5qVdVvr2ZUij2rzyAMYY/iKlbqd1m1ICHNB1JKpim1JF1yVtUupWtTvz7N 3Yt3R219OTVz4paAbRvBACzs2aLTnbjPMXBGoB6A2GRtHtOw4YQy32qDwqRtRLoFjqhWED zddptpUZdW3APPb6qLo13tCGIdKP9iur5ECkNRORRie5QpQz0QMSDcqJ64WEKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694100256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zmz9lm0aQsf+IGCGz4e7x/ZnMck3zYF+IIHG7jU2Idk=; b=n7mn2d/muv9djIRX6wtbMqPExuxN+ejf8+H3MMkM1ZlQnl7TMI8GJgi0I7Jcd/0kmyMlUM KlhrHnYxtv7rK4Mh+Fk6lrJoES73Z5UY9WE3WQYF0VjU1fRkhw6SId9Z7F8J8NkdMNVUvb BMGKKyABKqM5AvRdase6ggWX/tzOtRr3WO44k8QqEME1wVpA5igPYdV1tTGzZgOrxzjISH 72q/2fWUnkXeytK5sNcHtTAmOSZHLdyZMRP+mgytwq0XQV+7mWDq9QFcz5gRm2eepQ5S4Y ZrpwVL3dtWDZVPyC4LBf+cXGIdUHP8Fv7vmdY+zoYjrl9MH6D/daZ8F2kbTKMw== 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 4RhNM35sfZz140l; Thu, 7 Sep 2023 15:24:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387FOFw6066261; Thu, 7 Sep 2023 15:24:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387FOFTN066258; Thu, 7 Sep 2023 15:24:15 GMT (envelope-from git) Date: Thu, 7 Sep 2023 15:24:15 GMT Message-Id: <202309071524.387FOFTN066258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: f10f65999fe5 - main - libarchive: merge security fix from vendor branch List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f10f65999fe56e92f00b5bc5d27ac342cfea5364 Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=f10f65999fe56e92f00b5bc5d27ac342cfea5364 commit f10f65999fe56e92f00b5bc5d27ac342cfea5364 Merge: 2afef29b2c0b a5913a473bb0 Author: Martin Matuska AuthorDate: 2023-09-07 15:18:12 +0000 Commit: Martin Matuska CommitDate: 2023-09-07 15:22:34 +0000 libarchive: merge security fix from vendor branch This commit fixes a couple of security vulnerabilities in the PAX writer: 1. Heap overflow in url_encode() in archive_write_set_format_pax.c 2. NULL dereference in archive_write_pax_header_xattrs() 3. Another NULL dereference in archive_write_pax_header_xattrs() 4. NULL dereference in archive_write_pax_header_xattr() Security: No known reference yet Obtained from: https://github.com/libarchive/libarchive/commit/1b4e0d0f9 MFC after: 3 days .../libarchive/archive_write_set_format_pax.c | 35 +++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) From nobody Thu Sep 7 15:59:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhP853FzVz4sJcT; Thu, 7 Sep 2023 15:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhP852qpMz3Mxj; Thu, 7 Sep 2023 15:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694102389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lAXz7ipAVosQBIYIYk609QpgKrDNP7VRpML4HyXlIas=; b=akj2OU526mm5r+/LvDkfDuJVfIEO1k1Q3Gl1+27e68PNhX1s2emHE5VFqkJyVOXrkCVKM9 QDPbV0NkuXx3/rJ9wWE6snzHXhtjZupmeCmhxLn/6bcUY623Nu1YOcpkdmwvqeSR4l9TSW MNju0JEPyoLJGMeHXcNfIffryX0OG6QLkSHst3mWAvbwm7LT0RTrRrQNO8FkvbCkUp15RK yCCaWEd5pnpl0Q6H9DSmp01Cqkg5QRMHzGfaL8MS9OXXms2bOMv7qND/4pPokpWVhmZPc1 6MiSVCmR4VD01VQz7I+WTEOq6iwpqnSg3PbY51zYo2MCtPMNIIsOoPQiZb5fbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694102389; a=rsa-sha256; cv=none; b=EyTb2PDtFaAYLhYT2b78Lbwtjnl5UxpeSt5R2xcUTW3+RBsgt2XSlqD568pujrZKSiR9/W w3pdFQoEEQOZRoobvNIPCQ7ZQceYKoXF8hih1cwvjzCViuI45spy8Vdt33Y+KO2TaioICw c7iD12ufMgAVFPe87Jc48db00JRDOA+OvoXktL/dfWTWsUP2sBjUgv9SGXn/zAiT4GfFPr 8ndIxEYX4WF7FT9uvNAnYvo92O89vF1vttJplREA+I7X2rguyfd3HnFEbseb1ZYja0OQxE mm6zP3/RLPXZOGuXLlsGg6J/5O2Q9sJQjMJBpLEYQE/4YIGsSog3Ha+zxJQFcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694102389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lAXz7ipAVosQBIYIYk609QpgKrDNP7VRpML4HyXlIas=; b=drPV3Rt4Mu+fYAcZe5gsu0KMUvGPi1/xmAZvLr3XKUCUe2qeC+yM8atpJS7pFdMQECp57e xkJgoGAECwVo/A6ahYnJssyoHBtb4MhX9AiffreJdVYu52lfRWdJSFByAJmruFMvwER12x sIcbHpQ14OQDdExiN1+U2wfB1DTVIJi6wjxAImmx4PtUQsyvsP1v5ZMXhTV/lQWpaiNgCw NCkFIYVC51cC9iGe5FnnQ5MR5jC7xBxWQmsLCjg+hfC7qcTMmwPYk9UbFB4bx8u8Bf+RKx MlQMO/eUqB57zrbljWbcW5gozWAaez2Q1Ez9yt4UPRQ6PBoJc1N/PYrIo/DA+Q== 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 4RhP851rsFz15C2; Thu, 7 Sep 2023 15:59:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387FxngO016203; Thu, 7 Sep 2023 15:59:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Fxnsb016200; Thu, 7 Sep 2023 15:59:49 GMT (envelope-from git) Date: Thu, 7 Sep 2023 15:59:49 GMT Message-Id: <202309071559.387Fxnsb016200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b461276d7548 - main - Update WITH_/WITHOUT_SSP descriptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b461276d75488fe50c1503db85d43cbb8c3c3067 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b461276d75488fe50c1503db85d43cbb8c3c3067 commit b461276d75488fe50c1503db85d43cbb8c3c3067 Author: Ed Maste AuthorDate: 2023-08-30 20:49:44 +0000 Commit: Ed Maste CommitDate: 2023-09-07 15:59:46 +0000 Update WITH_/WITHOUT_SSP descriptions ProPolice refers to a specific implementation by Hiroaki Etoh and Kunikazu Yoda. The implementation in contemporary Clang and GCC is somewhat different and newer, so use a generic term in the src.conf descriptions. Sponsored by: The FreeBSD Foundation --- tools/build/options/WITHOUT_SSP | 2 +- tools/build/options/WITH_SSP | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/options/WITHOUT_SSP b/tools/build/options/WITHOUT_SSP index 9dc19c117995..88162cecf14a 100644 --- a/tools/build/options/WITHOUT_SSP +++ b/tools/build/options/WITHOUT_SSP @@ -1 +1 @@ -Do not build world with propolice stack smashing protection. +Do not build world with stack smashing protection. diff --git a/tools/build/options/WITH_SSP b/tools/build/options/WITH_SSP index 22aba26fd6cc..0088dd133782 100644 --- a/tools/build/options/WITH_SSP +++ b/tools/build/options/WITH_SSP @@ -1 +1 @@ -Build world with propolice stack smashing protection. +Build world with stack smashing protection. From nobody Thu Sep 7 15:59:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhP864fR2z4sJTX; Thu, 7 Sep 2023 15:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhP863gsJz3N9p; Thu, 7 Sep 2023 15:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694102390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mdQgLKeVw33kEz+Mo7A2g/SffCnAlFhCa/xd+eOvZ8E=; b=yIOCghDMGHEgMhtwPcugqZ03g59Ru6WSNzqQeGoN25dfeZarMmsy/n2ynOc9rVuvYBA48I lhZHnN2tQtcivkFv7wmcvCUT6+plhf+FBJApUlQ0rj2ynkxT3HH2BBKhHlh5GUulrC6dxi yKQnrgJopRdzLzjY7LTDcz5TQaTqw9ypMt2pAtBt7zJfAK7jKGpbkgr6pHVSschO5Vmaom mKumFFSFYXwnOheTPI0uyu/cfXa0/r6IDqSBvo8POG6DaAEGbkUip4ZBw4JFS7a+0N2eI1 RH39U0ENdx7Z2Xp1XJreVDCVmok/vDTUFqHbXRBUbcG9jOyxFxQzlXiqFYBGDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694102390; a=rsa-sha256; cv=none; b=VfU6tXZZYHgMNUOdYo1r+cNZQ7f566Fu0ss6Rkym0BOPZCq1hvgzA/baaFPF0uf1BJiXHa 3wg4/MLzV4r0E4OvXp16FBIG0qRLEQFmiV2lSURpidXfww8fZTaXqQ3fRJ4hQ8fghlyudq oqtyATn8wm1eH4tT4jApU6+cXLzHgprtbQMoJXN0UaxLKusINMgc+9MCiDaMpezgrtU/Q8 IQCXghJ0qUQk6NPWbbBSckl6Y5E3C55gV/6nflFnwvtTHKVb7KM84gAKuQkNygjXsKXmfp B81zepcEj4t/lcuyQB+RldhU0xZZzTLZGaeRG3jiwF2K+0YRB/4SdB2c79oc0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694102390; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mdQgLKeVw33kEz+Mo7A2g/SffCnAlFhCa/xd+eOvZ8E=; b=m4OoG6DdbFB3NjHLmpte5NR79rrY4eoWGBta6QxvVrAarOmrQxTssYVcTRRNXXUQ3WAQas Iee53LSiuwHAeiKmRIuO3pb9sX2FIsmsIJItSxgKk5k2p0c1Mg68PPVUMxzdccq9noJD1s Ov/4cAtCQEDFjOE6FGB0+9nb9oUGgWUkoVIeg0NfTDwdace7nkqoE9G2L+S1gxhlKs5MIR GpNI/gH5aktqijte9XdTzWbC0FvYfDJHJV6F6Sl65PRMNFhiBBpsdtjfsYuKLIurQulKrz hof9ZTde7QkW7x1/fHMc/cHGG0WkqdqUcFkCutpC6vPwvAXd8ctsA1GbqLe5jA== 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 4RhP862fmcz15Qv; Thu, 7 Sep 2023 15:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387FxoSS016252; Thu, 7 Sep 2023 15:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Fxoka016249; Thu, 7 Sep 2023 15:59:50 GMT (envelope-from git) Date: Thu, 7 Sep 2023 15:59:50 GMT Message-Id: <202309071559.387Fxoka016249@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5449d0144d61 - main - src.conf.5: regen after SSP option description update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5449d0144d612d7b7b3b85ab292d514db4e300c3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5449d0144d612d7b7b3b85ab292d514db4e300c3 commit 5449d0144d612d7b7b3b85ab292d514db4e300c3 Author: Ed Maste AuthorDate: 2023-09-07 15:57:46 +0000 Commit: Ed Maste CommitDate: 2023-09-07 15:59:46 +0000 src.conf.5: regen after SSP option description update --- share/man/man5/src.conf.5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index ff7623b1e8d1..a5e7c501825a 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd September 1, 2023 +.Dd September 7, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1560,7 +1560,7 @@ When set, it enforces these options: .Va WITHOUT_KERNEL_SYMBOLS .El .It Va WITHOUT_SSP -Do not build world with propolice stack smashing protection. +Do not build world with stack smashing protection. .It Va WITH_STAGING Enable staging of files to a stage tree. This can be best thought of as auto-install to From nobody Thu Sep 7 17:05:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhQbs5YpYz4s1yP; Thu, 7 Sep 2023 17:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhQbs565qz4DZs; Thu, 7 Sep 2023 17:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LnhUezuoqVOV4Szuw5PbOlTljZYVrlnHLk00O+9yoO4=; b=iDZAArEVDYyBAFBA51lKfmszYkn0GQzKzTvkriWXh9XOxQD/+lNr7p+WPfF7vFgK/TDBTJ ggx9zxkPphCrsun1l17KpB6jGGXi7OKBua8JqbyL3Gkfp1eJBhsXcBJbO09EmSlf85XkjO ditGs1OcaUYel0aofcDsgC57MtyVGGE/q+WcA3A5etdoO+eaCTl16sZppwI6EfDqV5UrOr I3hiIAjnkjsO97g7AKoeu57c2R2wKdgVg6CMw52pyUHaS6lkEU5ydsSX3m/lmJk0cdT6fq 8nvg7K+gi3Lo908HaRr33Z80x+zQewKELPHcFOs9ICgMBjyqlIwFZa4uPTZKFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694106329; a=rsa-sha256; cv=none; b=TOBAAxTYh59zIHP/2/mXJhTZACjy7ey9k5+bBRAwMXK7iBfJ87xdUuhNxib/nN8IiD3mXp iQfnXX6yRn7KWzmanqRdAsQLklpQEYbCopWDEEiqr7LYA35j9Nik9uPRta0khMO/LvCPQU IuWs9gN5NyqPd3tKpu1c8qJybKD3xNn6wsARlvsxtJM9uLDDCrZM6lzAl1ZHz1VyzzdF30 S9gCavlpMOY4jXliB/setTgcByaYj8UQ3wrVwPPj142l68P/TgUk3tf6IXl8p2UcYxPCSU ghuRq2CPkAddQh1uRKGZVBWp81OZdcr5tJpBemeeaTknirS77j8ePIsRCx2deg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LnhUezuoqVOV4Szuw5PbOlTljZYVrlnHLk00O+9yoO4=; b=C0sPI/qJvM3JXiLKGM0pdiPsW+6RfPPkAKlQ0VeKwtVMmEdZDWfiUeTrLXpfsaVjMlykZi tyd6+OOg6EKSLcAPnYdxihpIQTVPCsC+BzBMdqaKuvRgnxur2vjIe7mYoQ3mx2RGqz+IZd oOsAUvK4zJmnAgaj23v7FW37dAr1/a0MAfcrQpr2DOJ+1Qz+pYl4B27hnypXcyUDOqFsN1 NCF1Um27HeBWv4sF9w9G9AaOKYXAwmj8mL0iO/tlz1Hu//J5S4FNuARp+czuLQ0+mceeUQ F3/zS4r5caE0GlcC2IAcH6f/ABCFA+DZUC1W/hk6gb5OeGNFQKQiw22kymO4JQ== 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 4RhQbs49Zwz16f7; Thu, 7 Sep 2023 17:05:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387H5TQq032372; Thu, 7 Sep 2023 17:05:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387H5TCR032369; Thu, 7 Sep 2023 17:05:29 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:05:29 GMT Message-Id: <202309071705.387H5TCR032369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 10aa9ddb4d45 - main - pf: support SCTP multihoming List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10aa9ddb4d45ab0c8f56b0e91c7e8de213030c0f Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=10aa9ddb4d45ab0c8f56b0e91c7e8de213030c0f commit 10aa9ddb4d45ab0c8f56b0e91c7e8de213030c0f Author: Kristof Provost AuthorDate: 2023-08-02 17:05:00 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 17:05:00 +0000 pf: support SCTP multihoming SCTP may announce additional IP addresses it'll use in the INIT/INIT_ACK chunks, or in ASCONF chunks at any time during the connection. Parse these parameters, evaluate the ruleset for the new connection and if allowed create the corresponding states. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D41637 --- sys/net/pfvar.h | 22 +++++- sys/netpfil/pf/pf.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++- sys/netpfil/pf/pf_norm.c | 34 +++++++-- 3 files changed, 231 insertions(+), 11 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index 60c7136e267c..a131ba925013 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1531,6 +1531,9 @@ struct pfi_kkif { #define PFI_IFLAG_SKIP 0x0100 /* skip filtering on interface */ #ifdef _KERNEL +struct pf_sctp_multihome_job; +TAILQ_HEAD(pf_sctp_multihome_jobs, pf_sctp_multihome_job); + struct pf_pdesc { struct { int done; @@ -1578,10 +1581,22 @@ struct pf_pdesc { #define PFDESC_SCTP_SHUTDOWN 0x0010 #define PFDESC_SCTP_SHUTDOWN_COMPLETE 0x0020 #define PFDESC_SCTP_DATA 0x0040 -#define PFDESC_SCTP_OTHER 0x0080 +#define PFDESC_SCTP_ASCONF 0x0080 +#define PFDESC_SCTP_OTHER 0x0100 u_int16_t sctp_flags; u_int32_t sctp_initiate_tag; + + struct pf_sctp_multihome_jobs sctp_multihome_jobs; +}; + +struct pf_sctp_multihome_job { + TAILQ_ENTRY(pf_sctp_multihome_job) next; + struct pf_pdesc pd; + struct pf_addr src; + struct pf_addr dst; + struct mbuf *m; }; + #endif /* flags for RDR options */ @@ -2249,6 +2264,11 @@ void pf_addr_inc(struct pf_addr *, sa_family_t); int pf_refragment6(struct ifnet *, struct mbuf **, struct m_tag *, bool); #endif /* INET6 */ +int pf_multihome_scan_init(struct mbuf *, int, int, struct pf_pdesc *, + struct pfi_kkif *); +int pf_multihome_scan_asconf(struct mbuf *, int, int, struct pf_pdesc *, + struct pfi_kkif *); + u_int32_t pf_new_isn(struct pf_kstate *); void *pf_pull_hdr(struct mbuf *, int, void *, int, u_short *, u_short *, sa_family_t); diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a5d7c1ba0155..a324a31d6d84 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -126,6 +126,8 @@ SDT_PROBE_DEFINE4(pf, ip, test6, done, "int", "int", "struct pf_krule *", SDT_PROBE_DEFINE5(pf, ip, state, lookup, "struct pfi_kkif *", "struct pf_state_key_cmp *", "int", "struct pf_pdesc *", "struct pf_kstate *"); +SDT_PROBE_DEFINE4(pf, sctp, multihome, test, "struct pfi_kkif *", + "struct pf_krule *", "struct mbuf *", "int"); SDT_PROBE_DEFINE3(pf, eth, test_rule, entry, "int", "struct ifnet *", "struct mbuf *"); @@ -307,6 +309,8 @@ static int pf_test_state_udp(struct pf_kstate **, static int pf_test_state_icmp(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *, u_short *); +static void pf_sctp_multihome_delayed(struct pf_pdesc *, int, + struct pfi_kkif *, struct pf_kstate *); static int pf_test_state_sctp(struct pf_kstate **, struct pfi_kkif *, struct mbuf *, int, void *, struct pf_pdesc *, u_short *); @@ -5912,6 +5916,174 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, return (PF_PASS); } +static void +pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, + struct pf_kstate *s) +{ + struct pf_sctp_multihome_job *j, *tmp; + int action;; + struct pf_kstate *sm = NULL; + struct pf_krule *ra = NULL; + struct pf_krule *r = &V_pf_default_rule; + struct pf_kruleset *rs = NULL; + + PF_RULES_RLOCK_TRACKER; + + TAILQ_FOREACH_SAFE(j, &pd->sctp_multihome_jobs, next, tmp) { + PF_RULES_RLOCK(); + action = pf_test_rule(&r, &sm, kif, + j->m, off, &j->pd, &ra, &rs, NULL); + PF_RULES_RUNLOCK(); + SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, action); + if (sm) + PF_STATE_UNLOCK(sm); + + free(j, M_PFTEMP); + } +} + +static int +pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, + struct pfi_kkif *kif) +{ + int off = 0; + struct pf_sctp_multihome_job *job; + + while (off < len) { + struct sctp_paramhdr h; + + if (!pf_pull_hdr(m, start + off, &h, sizeof(h), NULL, NULL, + pd->af)) + return (PF_DROP); + + /* Parameters are at least 4 bytes. */ + if (ntohs(h.param_length) < 4) + return (PF_DROP); + + switch (ntohs(h.param_type)) { + case SCTP_IPV4_ADDRESS: { + struct in_addr t; + + if (ntohs(h.param_length) != + (sizeof(struct sctp_paramhdr) + sizeof(t))) + return (PF_DROP); + + if (!pf_pull_hdr(m, start + off + sizeof(h), &t, sizeof(t), + NULL, NULL, pd->af)) + return (PF_DROP); + + /* + * Avoid duplicating states. We'll already have + * created a state based on the source address of + * the packet, but SCTP endpoints may also list this + * address again in the INIT(_ACK) parameters. + */ + if (t.s_addr == pd->src->v4.s_addr) + break; + + if (in_nullhost(t)) + t.s_addr = pd->src->v4.s_addr; + + /* + * We hold the state lock (idhash) here, which means + * that we can't acquire the keyhash, or we'll get a + * LOR (and potentially double-lock things too). We also + * can't release the state lock here, so instead we'll + * enqueue this for async handling. + * There's a relatively small race here, in that a + * packet using the new addresses could arrive already, + * but that's just though luck for it. + */ + job = malloc(sizeof(*job), M_PFTEMP, M_NOWAIT | M_ZERO); + if (! job) + return (PF_DROP); + + memcpy(&job->pd, pd, sizeof(*pd)); + + // New source address! + memcpy(&job->src, &t, sizeof(t)); + job->pd.src = &job->src; + memcpy(&job->dst, pd->dst, sizeof(job->dst)); + job->pd.dst = &job->dst; + job->m = m; + + TAILQ_INSERT_TAIL(&pd->sctp_multihome_jobs, job, next); + break; + } +#ifdef INET6 + case SCTP_IPV6_ADDRESS: { + struct in6_addr t; + + if (ntohs(h.param_length) != + (sizeof(struct sctp_paramhdr) + sizeof(t))) + return (PF_DROP); + + if (!pf_pull_hdr(m, start + off + sizeof(h), &t, sizeof(t), + NULL, NULL, pd->af)) + return (PF_DROP); + if (memcmp(&t, &pd->src->v6, sizeof(t)) == 0) + break; + if (memcmp(&t, &in6addr_any, sizeof(t)) == 0) + memcpy(&t, &pd->src->v6, sizeof(t)); + + job = malloc(sizeof(*job), M_PFTEMP, M_NOWAIT | M_ZERO); + if (! job) + return (PF_DROP); + + memcpy(&job->pd, pd, sizeof(*pd)); + memcpy(&job->src, &t, sizeof(t)); + job->pd.src = &job->src; + memcpy(&job->dst, pd->dst, sizeof(job->dst)); + job->pd.dst = &job->dst; + job->m = m; + + TAILQ_INSERT_TAIL(&pd->sctp_multihome_jobs, job, next); + break; + } +#endif + case SCTP_ADD_IP_ADDRESS: { + int ret; + struct sctp_asconf_paramhdr ah; + + if (!pf_pull_hdr(m, start + off, &ah, sizeof(ah), + NULL, NULL, pd->af)) + return (PF_DROP); + + ret = pf_multihome_scan(m, start + off + sizeof(ah), + ntohs(ah.ph.param_length) - sizeof(ah), pd, kif); + if (ret != PF_PASS) + return (ret); + break; + } + default: + break; + } + + off += roundup(ntohs(h.param_length), 4); + } + + return (PF_PASS); +} +int +pf_multihome_scan_init(struct mbuf *m, int start, int len, struct pf_pdesc *pd, + struct pfi_kkif *kif) +{ + start += sizeof(struct sctp_init_chunk); + len -= sizeof(struct sctp_init_chunk); + + return (pf_multihome_scan(m, start, len, pd, kif)); +} + +int +pf_multihome_scan_asconf(struct mbuf *m, int start, int len, + struct pf_pdesc *pd, struct pfi_kkif *kif) +{ + start += sizeof(struct sctp_asconf_chunk); + len -= sizeof(struct sctp_asconf_chunk); + + return (pf_multihome_scan(m, start, len, pd, kif)); +} + static int pf_test_state_icmp(struct pf_kstate **state, struct pfi_kkif *kif, struct mbuf *m, int off, void *h, struct pf_pdesc *pd, u_short *reason) @@ -7412,6 +7584,7 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, } memset(&pd, 0, sizeof(pd)); + TAILQ_INIT(&pd.sctp_multihome_jobs); if (default_actions != NULL) memcpy(&pd.act, default_actions, sizeof(pd.act)); pd.pf_mtag = pf_find_mtag(m); @@ -7613,6 +7786,8 @@ pf_test(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, pd.act.log |= PF_LOG_FORCE; goto done; } + pd.p_len = pd.tot_len - off; + pd.sport = &pd.hdr.sctp.src_port; pd.dport = &pd.hdr.sctp.dest_port; if (pd.hdr.sctp.src_port == 0 || pd.hdr.sctp.dest_port == 0) { @@ -7896,7 +8071,7 @@ done: /* pf_route() returns unlocked. */ if (rt) { pf_route(m0, r, kif->pfik_ifp, s, &pd, inp); - return (action); + goto out; } if (pf_dummynet(&pd, s, r, m0) != 0) { action = PF_DROP; @@ -7910,6 +8085,9 @@ done: if (s) PF_STATE_UNLOCK(s); +out: + pf_sctp_multihome_delayed(&pd, off, kif, s); + return (action); } #endif /* INET */ @@ -7959,6 +8137,7 @@ pf_test6(int dir, int pflags, struct ifnet *ifp, struct mbuf **m0, struct inpcb } memset(&pd, 0, sizeof(pd)); + TAILQ_INIT(&pd.sctp_multihome_jobs); if (default_actions != NULL) memcpy(&pd.act, default_actions, sizeof(pd.act)); pd.pf_mtag = pf_find_mtag(m); @@ -8441,7 +8620,7 @@ done: /* pf_route6() returns unlocked. */ if (rt) { pf_route6(m0, r, kif->pfik_ifp, s, &pd, inp); - return (action); + goto out; } if (pf_dummynet(&pd, s, r, m0) != 0) { action = PF_DROP; @@ -8458,8 +8637,11 @@ done: (mtag = m_tag_find(m, PACKET_TAG_PF_REASSEMBLED, NULL)) != NULL) action = pf_refragment6(ifp, m0, mtag, pflags & PFIL_FWD); +out: SDT_PROBE4(pf, ip, test6, done, action, reason, r, s); + pf_sctp_multihome_delayed(&pd, off, kif, s); + return (action); } #endif /* INET6 */ diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 8f532ad08c46..83b94db87a19 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -2021,11 +2021,13 @@ pf_normalize_mss(struct mbuf *m, int off, struct pf_pdesc *pd) } static int -pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd) +pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd, + struct pfi_kkif *kif) { struct sctp_chunkhdr ch = { }; int chunk_off = sizeof(struct sctphdr); int chunk_start; + int ret; while (off + chunk_off < pd->tot_len) { if (!pf_pull_hdr(m, off + chunk_off, &ch, sizeof(ch), NULL, @@ -2040,7 +2042,8 @@ pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd) chunk_off += roundup(ntohs(ch.chunk_length), 4); switch (ch.chunk_type) { - case SCTP_INITIATION: { + case SCTP_INITIATION: + case SCTP_INITIATION_ACK: { struct sctp_init_chunk init; if (!pf_pull_hdr(m, off + chunk_start, &init, @@ -2064,17 +2067,24 @@ pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd) * RFC 9260, Section 3.1, INIT chunks MUST have zero * verification tag. */ - if (pd->hdr.sctp.v_tag != 0) + if (ch.chunk_type == SCTP_INITIATION && + pd->hdr.sctp.v_tag != 0) return (PF_DROP); pd->sctp_initiate_tag = init.init.initiate_tag; - pd->sctp_flags |= PFDESC_SCTP_INIT; + if (ch.chunk_type == SCTP_INITIATION) + pd->sctp_flags |= PFDESC_SCTP_INIT; + else + pd->sctp_flags |= PFDESC_SCTP_INIT_ACK; + + ret = pf_multihome_scan_init(m, off + chunk_start, + ntohs(init.ch.chunk_length), pd, kif); + if (ret != PF_PASS) + return (ret); + break; } - case SCTP_INITIATION_ACK: - pd->sctp_flags |= PFDESC_SCTP_INIT_ACK; - break; case SCTP_ABORT_ASSOCIATION: pd->sctp_flags |= PFDESC_SCTP_ABORT; break; @@ -2092,6 +2102,14 @@ pf_scan_sctp(struct mbuf *m, int ipoff, int off, struct pf_pdesc *pd) case SCTP_DATA: pd->sctp_flags |= PFDESC_SCTP_DATA; break; + case SCTP_ASCONF: + pd->sctp_flags |= PFDESC_SCTP_ASCONF; + + ret = pf_multihome_scan_asconf(m, off + chunk_start, + ntohs(ch.chunk_length), pd, kif); + if (ret != PF_PASS) + return (ret); + break; default: pd->sctp_flags |= PFDESC_SCTP_OTHER; break; @@ -2133,7 +2151,7 @@ pf_normalize_sctp(int dir, struct pfi_kkif *kif, struct mbuf *m, int ipoff, /* Unconditionally scan the SCTP packet, because we need to look for * things like shutdown and asconf chunks. */ - if (pf_scan_sctp(m, ipoff, off, pd) != PF_PASS) + if (pf_scan_sctp(m, ipoff, off, pd, kif) != PF_PASS) goto sctp_drop; r = TAILQ_FIRST(pf_main_ruleset.rules[PF_RULESET_SCRUB].active.ptr); From nobody Thu Sep 7 17:05:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhQbt6r8zz4s1qN; Thu, 7 Sep 2023 17:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhQbt5sJBz4DSL; Thu, 7 Sep 2023 17:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lcwIJcLrowZjWM4/CR5o/35lhgVY+KqCFmvBfk2VnC4=; b=ocZ6y9wioWhzt/BXSYMmEihWvq8ROah1aKxNGf+jSwVK7ucb8cF4OAbjacyzD5oGlzesEz 5bYPeyNEc3wsKJKQXLQE6S7/GpGl2PiY0VWLbklyurDt6+jvnrX2Rmx3y+qRGAvRCtBSxf N3uCrfHg/xMc/p9I4ZVVmtuhMmC1J0SChUjzf/KhdFtr9XL4AfIpUNn6WR2RUpGlKck63W gZbwAYmsOiUdPVY96ix4AntFAPlRljpYau5rC3JZ23xCY0Pl5f09J0nlCJJlOGdPRIj2mK sbTd8XtZ/bdcFE88Ldn3Ed7N7cs5X/44mMJW1hgdJR2O8nfcX5WxlgiOZXEuRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694106330; a=rsa-sha256; cv=none; b=b9kTROebaXP7ssEltHPRpmJoB+c/g9ZNHGjK9Z2tCfwxWuiWK3aJ3vSFsJWrh62Lp7kKal kDDWdk30evbs8vCqpwF8tQJWvUSxykqyyf1Ovctrl4VngaddIMcySkROpKpxXHWTyPwiWR 7APEkWGAlr9+txBoj50esRW83/BjRATzEy7R2U8nfSWORYLPrkMwDB/u2MsUVPfE2SHywE 3uiZ92LIO2P67JzteGOEE+c448g3cYjacD7hUamSLHA0dClSDwsIB04YDzDcZewq89r2gA Uc5Nu/VVxfttBIwnao2BwYyJcTMex33A+4D/sP/Hc8WRuMt8gzwzTm/R3YicVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106330; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lcwIJcLrowZjWM4/CR5o/35lhgVY+KqCFmvBfk2VnC4=; b=ZDu9Ii+jGtL/G5398DUtV8FGykJg0aeMe0UKy3uAwO2/AO2ZvjqAK+iV8d0INJhrAR2bVA M2ga/MtCqG/s8WtnOO+dGPK7OByXWpuQaCEJzFha+05KeWEtNaFfvyYqilzsBdf8dRwRe9 epFELhOhQHGJ0KvW/n/SRG22FZ1rUMeseHMA22Tg7UhV9vToGhPxdSoMeHzqBnNDjHv5KJ drpgF2EwZ+38sMarwqs3sgnYo4kL7yMNlc4+CN+8yNnMlSkm3+c1H/oEZMgKcZ1I/fNJFA c3j9vFv6NpqUj4wShBiITV//ZX2AfaWIeoanww/aqMAoH2DTa+b2Vkk223GQOw== 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 4RhQbt4rxYz16Rt; Thu, 7 Sep 2023 17:05:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387H5UPK032422; Thu, 7 Sep 2023 17:05:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387H5UTo032419; Thu, 7 Sep 2023 17:05:30 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:05:30 GMT Message-Id: <202309071705.387H5UTo032419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1a28d5fea7ed - main - pf tests: basic SCTP multihoming test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a28d5fea7edf200c37d14f7ed5865910664ec3d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a28d5fea7edf200c37d14f7ed5865910664ec3d commit 1a28d5fea7edf200c37d14f7ed5865910664ec3d Author: Kristof Provost AuthorDate: 2023-08-02 08:44:52 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 17:05:01 +0000 pf tests: basic SCTP multihoming test The SCTP server will announce multiple addresses. Block one of them with pf, connect to the other have the client use the blocked address. pf is expected to have created state for all of the addresses announced by the server. In a separate test case add the secondary (client) IP after the connection has been established. The intent is to verify the functionality of the ASCONF chunk parsing. MFC after: 3 weeks Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D41638 --- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/sctp.py | 442 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 443 insertions(+) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 70c0c300d7ad..44fe95680dfb 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -40,6 +40,7 @@ ATF_TESTS_SH+= altq \ tos ATF_TESTS_PYTEST+= frag6.py +ATF_TESTS_PYTEST+= sctp.py # Tests reuse jail names and so cannot run in parallel. TEST_METADATA+= is_exclusive=true diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py new file mode 100644 index 000000000000..b24d0c414ac8 --- /dev/null +++ b/tests/sys/netpfil/pf/sctp.py @@ -0,0 +1,442 @@ +import pytest +import ctypes +import socket +import ipaddress +import re +from atf_python.sys.net.tools import ToolsHelper +from atf_python.sys.net.vnet import VnetTestTemplate + +import time + +SCTP_UNORDERED = 0x0400 + +SCTP_NODELAY = 0x00000004 +SCTP_SET_PEER_PRIMARY_ADDR = 0x00000006 +SCTP_PRIMARY_ADDR = 0x00000007 + +SCTP_BINDX_ADD_ADDR = 0x00008001 +SCTP_BINDX_REM_ADDR = 0x00008002 + +class sockaddr_in(ctypes.Structure): + _fields_ = [ + ('sin_len', ctypes.c_uint8), + ('sin_family', ctypes.c_uint8), + ('sin_port', ctypes.c_uint16), + ('sin_addr', ctypes.c_uint32), + ('sin_zero', ctypes.c_int8 * 8) + ] + +class sockaddr_in6(ctypes.Structure): + _fields_ = [ + ('sin6_len', ctypes.c_uint8), + ('sin6_family', ctypes.c_uint8), + ('sin6_port', ctypes.c_uint16), + ('sin6_flowinfo', ctypes.c_uint32), + ('sin6_addr', ctypes.c_uint8 * 16), + ('sin6_scope_id', ctypes.c_uint32) + ] + +class sockaddr_storage(ctypes.Union): + _fields_ = [ + ("v4", sockaddr_in), + ("v6", sockaddr_in6) + ] + +class sctp_sndrcvinfo(ctypes.Structure): + _fields_ = [ + ('sinfo_stream', ctypes.c_uint16), + ('sinfo_ssn', ctypes.c_uint16), + ('sinfo_flags', ctypes.c_uint16), + ('sinfo_ppid', ctypes.c_uint32), + ('sinfo_context', ctypes.c_uint32), + ('sinfo_timetolive', ctypes.c_uint32), + ('sinfo_tsn', ctypes.c_uint32), + ('sinfo_cumtsn', ctypes.c_uint32), + ('sinfo_assoc_id', ctypes.c_uint32), + ] + +class sctp_setprim(ctypes.Structure): + _fields_ = [ + ('ssp_addr', sockaddr_storage), + ('ssp_pad', ctypes.c_int8 * (128 - 16)), + ('ssp_assoc_id', ctypes.c_uint32), + ('ssp_padding', ctypes.c_uint32) + ] + +def to_sockaddr(ip, port): + ip = ipaddress.ip_address(ip) + + if ip.version == 4: + addr = sockaddr_in() + addr.sin_len = ctypes.sizeof(addr) + addr.sin_family = socket.AF_INET + addr.sin_port = socket.htons(port) + addr.sin_addr = socket.htonl(int.from_bytes(ip.packed, byteorder='big')) + else: + assert ip.version == 6 + + addr = sockaddr_in6() + addr.sin6_len = ctypes.sizeof(addr) + addr.sin6_family = socket.AF_INET6 + addr.sin6_port = socket.htons(port) + for i in range(0, 16): + addr.sin6_addr[i] = ip.packed[i] + + return addr + +class SCTPServer: + def __init__(self, family, port=1234): + self._libc = ctypes.CDLL("libc.so.7", use_errno=True) + + self._listen_fd = self._libc.socket(family, socket.SOCK_STREAM, socket.IPPROTO_SCTP) + if self._listen_fd == -1: + raise Exception("Failed to create socket") + + if family == socket.AF_INET: + srvaddr = sockaddr_in() + srvaddr.sin_len = ctypes.sizeof(srvaddr) + srvaddr.sin_family = socket.AF_INET + srvaddr.sin_port = socket.htons(port) + srvaddr.sin_addr = socket.INADDR_ANY + else: + srvaddr = sockaddr_in6() + srvaddr.sin6_len = ctypes.sizeof(srvaddr) + srvaddr.sin6_family = family + srvaddr.sin6_port = socket.htons(port) + # Leave sin_addr empty, because ANY is zero + + ret = self._libc.bind(self._listen_fd, ctypes.pointer(srvaddr), + ctypes.sizeof(srvaddr)) + if ret == -1: + raise Exception("Failed to bind: %d" % ctypes.get_errno()) + + ret = self._libc.listen(self._listen_fd, 2) + if ret == -1: + raise Exception("Failed to listen") + + def _to_string(self, buf): + return ''.join([chr(int.from_bytes(i, byteorder='big')) for i in buf]).rstrip('\x00') + + def accept(self, vnet): + fd = self._libc.accept(self._listen_fd, 0, 0) + if fd < 0: + raise Exception("Failed to accept") + + print("SCTPServer: connection opened") + while True: + rcvinfo = sctp_sndrcvinfo() + flags = ctypes.c_int() + buf = ctypes.create_string_buffer(128) + + # Receive a single message, and inform the other vnet about it. + ret = self._libc.sctp_recvmsg(fd, ctypes.cast(buf, ctypes.c_void_p), 128, + 0, 0, ctypes.pointer(rcvinfo), ctypes.pointer(flags)) + if ret < 0: + print("SCTPServer: connection closed") + return + if ret == 0: + continue + + rcvd = {} + rcvd['ppid'] = socket.ntohl(rcvinfo.sinfo_ppid) + rcvd['data'] = self._to_string(buf) + rcvd['len'] = ret + print(rcvd) + vnet.pipe.send(rcvd) + +class SCTPClient: + def __init__(self, ip, port=1234, fromaddr=None): + self._libc = ctypes.CDLL("libc.so.7", use_errno=True) + + if ipaddress.ip_address(ip).version == 4: + family = socket.AF_INET + else: + family = socket.AF_INET6 + + self._fd = self._libc.socket(family, socket.SOCK_STREAM, + socket.IPPROTO_SCTP) + if self._fd == -1: + raise Exception("Failed to open socket") + + if fromaddr is not None: + addr = to_sockaddr(fromaddr, 0) + + ret = self._libc.bind(self._fd, ctypes.pointer(addr), ctypes.sizeof(addr)) + if ret != 0: + print("bind() => %d", ctypes.get_errno()) + raise + + addr = to_sockaddr(ip, port) + ret = self._libc.connect(self._fd, ctypes.pointer(addr), ctypes.sizeof(addr)) + if ret == -1: + raise Exception("Failed to connect") + + # Enable NODELAY, because otherwise the sending host may wait for SACK + # on a data chunk we've removed + enable = ctypes.c_int(1) + ret = self._libc.setsockopt(self._fd, socket.IPPROTO_SCTP, + SCTP_NODELAY, ctypes.pointer(enable), 4) + + def newpeer(self, addr): + print("newpeer(%s)" % (addr)) + + setp = sctp_setprim() + a = to_sockaddr(addr, 0) + if type(a) is sockaddr_in: + setp.ssp_addr.v4 = a + else: + assert type(a) is sockaddr_in6 + setp.ssp_addr.v6 = a + + ret = self._libc.setsockopt(self._fd, socket.IPPROTO_SCTP, + SCTP_PRIMARY_ADDR, ctypes.pointer(setp), ctypes.sizeof(setp)) + if ret != 0: + print("errno %d" % ctypes.get_errno()) + raise Exception(ctypes.get_errno()) + + def newprimary(self, addr): + print("newprimary(%s)" % (addr)) + + # Strictly speaking needs to be struct sctp_setpeerprim, but that's + # identical to sctp_setprim + setp = sctp_setprim() + a = to_sockaddr(addr, 0) + if type(a) is sockaddr_in: + setp.ssp_addr.v4 = a + else: + assert type(a) is sockaddr_in6 + setp.ssp_addr.v6 = a + + ret = self._libc.setsockopt(self._fd, socket.IPPROTO_SCTP, + SCTP_SET_PEER_PRIMARY_ADDR, ctypes.pointer(setp), ctypes.sizeof(setp)) + if ret != 0: + print("errno %d" % ctypes.get_errno()) + raise + + def bindx(self, addr, add): + print("bindx(%s, %s)" % (addr, add)) + + addr = to_sockaddr(addr, 0) + + if add: + flag = SCTP_BINDX_ADD_ADDR + else: + flag = SCTP_BINDX_REM_ADDR + ret = self._libc.sctp_bindx(self._fd, ctypes.pointer(addr), 1, flag) + if ret != 0: + print("sctp_bindx() errno %d" % ctypes.get_errno()) + raise + + def send(self, buf, ppid, ordered=False): + flags = 0 + + if not ordered: + flags = SCTP_UNORDERED + + ppid = socket.htonl(ppid) + ret = self._libc.sctp_sendmsg(self._fd, ctypes.c_char_p(buf), len(buf), + ctypes.c_void_p(0), 0, ppid, flags, 0, 0, 0) + if ret < 0: + raise Exception("Failed to send message") + + def close(self): + self._libc.close(self._fd) + self._fd = -1 + +class TestSCTP(VnetTestTemplate): + REQUIRED_MODULES = ["sctp", "pf"] + TOPOLOGY = { + "vnet1": {"ifaces": ["if1"]}, + "vnet2": {"ifaces": ["if1"]}, + "if1": {"prefixes4": [("192.0.2.1/24", "192.0.2.2/24")]}, + } + + def vnet2_handler(self, vnet): + # Give ourself a second IP address, for multihome testing + ifname = vnet.iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet alias 192.0.2.3/24" % ifname) + + # Start an SCTP server process, pipe the ppid + data back to the other vnet? + srv = SCTPServer(socket.AF_INET, port=1234) + while True: + srv.accept(vnet) + + @pytest.mark.require_user("root") + def test_multihome(self): + srv_vnet = self.vnet_map["vnet2"] + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet proto sctp to 192.0.2.0/24"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("192.0.2.3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + try: + client.newpeer("192.0.2.2") + client.send(b"world", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "world" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss") + ToolsHelper.print_output("/sbin/pfctl -sr -vv") + + # Check that we have a state for 192.0.2.3 and 192.0.2.2 to 192.0.2.1 + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.2:1234", states) + + @pytest.mark.require_user("root") + def test_multihome_asconf(self): + srv_vnet = self.vnet_map["vnet2"] + + # Assign a second IP to ourselves + ToolsHelper.print_output("/sbin/ifconfig %s inet alias 192.0.2.10/24" + % self.vnet.iface_alias_map["if1"].name) + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet proto sctp from 192.0.2.0/24"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("192.0.2.3", 1234, "192.0.2.1") + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Now add our second address to the connection + client.bindx("192.0.2.10", True) + + # We can still communicate + client.send(b"world", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "world" + + # Now change to a different peer address + try: + client.newprimary("192.0.2.10") + client.send(b"!", 0) + rcvd = self.wait_object(srv_vnet.pipe, 5) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "!" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss -vv") + + # Ensure we have the states we'd expect + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) + assert re.search(r"all sctp 192.0.2.10:.*192.0.2.3:1234", states) + +class TestSCTPv6(VnetTestTemplate): + REQUIRED_MODULES = ["sctp", "pf"] + TOPOLOGY = { + "vnet1": {"ifaces": ["if1"]}, + "vnet2": {"ifaces": ["if1"]}, + "if1": {"prefixes6": [("2001:db8::1/64", "2001:db8::2/64")]}, + } + + def vnet2_handler(self, vnet): + # Give ourself a second IP address, for multihome testing + ifname = vnet.iface_alias_map["if1"].name + ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::3/64" % ifname) + + # Start an SCTP server process, pipe the ppid + data back to the other vnet? + srv = SCTPServer(socket.AF_INET6, port=1234) + while True: + srv.accept(vnet) + + @pytest.mark.require_user("root") + def test_multihome(self): + srv_vnet = self.vnet_map["vnet2"] + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet6 proto sctp to 2001:db8::0/64"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("2001:db8::3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Now change to a different peer address + try: + client.newpeer("2001:db8::2") + client.send(b"world", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "world" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss -vv") + + # Check that we have the expected states + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::2\[1234\]", states) + + @pytest.mark.require_user("root") + def test_multihome_asconf(self): + srv_vnet = self.vnet_map["vnet2"] + + # Assign a second IP to ourselves + ToolsHelper.print_output("/sbin/ifconfig %s inet6 alias 2001:db8::10/64" + % self.vnet.iface_alias_map["if1"].name) + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass inet6 proto sctp from 2001:db8::/64"]) + + # Sanity check, we can communicate with the primary address. + client = SCTPClient("2001:db8::3", 1234, "2001:db8::1") + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # Now add our second address to the connection + client.bindx("2001:db8::10", True) + + # We can still communicate + client.send(b"world", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "world" + + # Now change to a different peer address + try: + client.newprimary("2001:db8::10") + client.send(b"!", 0) + rcvd = self.wait_object(srv_vnet.pipe, 5) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "!" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss -vv") + + # Check that we have the expected states + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) + assert re.search(r"all sctp 2001:db8::10\[.*2001:db8::3\[1234\]", states) From nobody Thu Sep 7 17:05:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhQbw0tsnz4s1t6; Thu, 7 Sep 2023 17:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhQbw04gWz4DYB; Thu, 7 Sep 2023 17:05:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ANMoB7jfsST+D45fCvxsCMO99oqht9MTiYmGWFP8Oo=; b=XZIOuaQ3//F26774beUazDXN1WgqyLCorQyj4wF6x9Y33j1zFuM7+LgflLKpI1ByFCLAVs Vq1Hz19MIEP8iKmNbnXVbbJLRT4/LJoiQFwBA9IYj0vVFYlyhWx0KLVLbWEbqVOkNcys+S 0zNbru2gRxfnu1OkLOlQkobO543JGWKSBbV441BQ1mIMXUVLr4Ce5I+5iXJdyebu6QD8+s Tb4bbYZLemfJOpdiQ5KbrFEBCdaLEMcjB0b6UCSwr9qXBkfXf9+gXOwzIumc0i9+/9Fpsd BlvtwzTkJ5Az8sH3Cdbd7zwK6c2vQv+MfI7bJJITu1eF/5iQBXjfcPzZZk11hA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694106332; a=rsa-sha256; cv=none; b=HMh9h4+m3Ox+6IQQ+n50JbS8k6ZTIN4ZMgtj+qFsE/aveLaxdt8TEhXQD3I0UskByhr5LZ GHgpH2nRNWPe2eX6+ki984a2RXSdebK5qS9DKtYKH3dNtbXnGcmSDbqKCREQvyn3DO8dZq rciJIQ7yPfqyM8jgJr418tJkCVrMIfb1q4trXPglFKXBn6lpAghZjkucuNH1JPh4u+GrW/ OoamC1i43+Z7euvDqQTnAMeiUiQGjECjQZ8zItp9+Te1woJ1V3nFt7u2b86yUQaqNNJKnR HiMlUT3nSDtH25OV/f6JlLwaDaOAr1fjX+MjrttABtSOhoY4W7rVidOpAyc0LA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2ANMoB7jfsST+D45fCvxsCMO99oqht9MTiYmGWFP8Oo=; b=NA6X8EmZDe/fgfdfgu+9glxnMvqGBn9SbNyMDbkPf529jTCIul0tPCloCi0uxKXRD9ifaA K4aKg0+haoSnPE/5S9BSBgoPMyLE3jN2GqB1Ms0yE42TGUHVTGFKl2BOfccIlZ4Noy503n oWkZCui8xsj+dcGY7k8APM+7pfND1RmCBIh4otT8tOIj6QoQDJ7h8fhIzamDZ/FWJTZxHz jdzj83gQPgfllwWxGo4JoiYGKtDDRtAEhoEadJfgAD3Be4Aa3wrRTGBPXk4S6WIIRbDgl6 gr9LV8DI3qcL1QPhiePBjWPu8+QIEgRx/v+iHqP7P0lE+kbcRMgwDsNq0AdIFQ== 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 4RhQbv69MGz16Rv; Thu, 7 Sep 2023 17:05:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387H5VXA032474; Thu, 7 Sep 2023 17:05:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387H5V1L032471; Thu, 7 Sep 2023 17:05:31 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:05:31 GMT Message-Id: <202309071705.387H5V1L032471@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 51a78dd2764b - main - pf: improve SCTP state validation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51a78dd2764beabfd19a58b8a8b04387a547f02e Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=51a78dd2764beabfd19a58b8a8b04387a547f02e commit 51a78dd2764beabfd19a58b8a8b04387a547f02e Author: Kristof Provost AuthorDate: 2023-09-01 11:33:56 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 17:05:01 +0000 pf: improve SCTP state validation Only create new states for INIT chunks, or when we're creating a secondary state for a multihomed association. Store and verify verification tag. MFC after: 3 weeks Sponsored by: Orange Business Services --- sys/net/pfvar.h | 8 +++++++- sys/netpfil/pf/pf.c | 32 ++++++++++++++++++++++---------- sys/netpfil/pf/pf_norm.c | 17 +++++++++++++++++ 3 files changed, 46 insertions(+), 11 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index a131ba925013..d63a7bb1afb2 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -900,7 +900,10 @@ struct pf_state_scrub { #define PFSS_DATA_NOTS 0x0080 /* no timestamp on data packets */ u_int8_t pfss_ttl; /* stashed TTL */ u_int8_t pad; - u_int32_t pfss_ts_mod; /* timestamp modulation */ + union { + u_int32_t pfss_ts_mod; /* timestamp modulation */ + u_int32_t pfss_v_tag; /* SCTP verification tag */ + }; }; struct pf_state_host { @@ -1583,6 +1586,7 @@ struct pf_pdesc { #define PFDESC_SCTP_DATA 0x0040 #define PFDESC_SCTP_ASCONF 0x0080 #define PFDESC_SCTP_OTHER 0x0100 +#define PFDESC_SCTP_ADD_IP 0x0200 u_int16_t sctp_flags; u_int32_t sctp_initiate_tag; @@ -2297,6 +2301,8 @@ int pf_normalize_tcp_init(struct mbuf *, int, struct pf_pdesc *, int pf_normalize_tcp_stateful(struct mbuf *, int, struct pf_pdesc *, u_short *, struct tcphdr *, struct pf_kstate *, struct pf_state_peer *, struct pf_state_peer *, int *); +int pf_normalize_sctp_init(struct mbuf *, int, struct pf_pdesc *, + struct pf_state_peer *, struct pf_state_peer *); int pf_normalize_sctp(int, struct pfi_kkif *, struct mbuf *, int, int, void *, struct pf_pdesc *); u_int32_t diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index a324a31d6d84..c24d4dfce742 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -4909,11 +4909,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, if (s->state_flags & PFSTATE_SCRUB_TCP && pf_normalize_tcp_init(m, off, pd, th, &s->src, &s->dst)) { REASON_SET(&reason, PFRES_MEMORY); - pf_src_tree_remove_state(s); - s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); - pf_free_state(s); - return (PF_DROP); + goto drop; } if (s->state_flags & PFSTATE_SCRUB_TCP && s->src.scrub && pf_normalize_tcp_stateful(m, off, pd, &reason, th, s, @@ -4922,12 +4918,13 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a, DPFPRINTF(PF_DEBUG_URGENT, ("pf_normalize_tcp_stateful failed on first " "pkt\n")); - pf_src_tree_remove_state(s); - s->timeout = PFTM_UNLINKED; - STATE_DEC_COUNTERS(s); - pf_free_state(s); - return (PF_DROP); + goto drop; } + } else if (pd->proto == IPPROTO_SCTP) { + if (pf_normalize_sctp_init(m, off, pd, &s->src, &s->dst)) + goto drop; + if (! (pd->sctp_flags & (PFDESC_SCTP_INIT | PFDESC_SCTP_ADD_IP))) + goto drop; } s->direction = pd->dir; @@ -5024,6 +5021,13 @@ csfailed: } return (PF_DROP); + +drop: + pf_src_tree_remove_state(s); + s->timeout = PFTM_UNLINKED; + STATE_DEC_COUNTERS(s); + pf_free_state(s); + return (PF_DROP); } static int @@ -5891,6 +5895,13 @@ pf_test_state_sctp(struct pf_kstate **state, struct pfi_kkif *kif, } } + if (src->scrub != NULL) { + if (src->scrub->pfss_v_tag == 0) { + src->scrub->pfss_v_tag = pd->hdr.sctp.v_tag; + } else if (src->scrub->pfss_v_tag != pd->hdr.sctp.v_tag) + return (PF_DROP); + } + (*state)->expire = time_uptime; /* translate source/destination address, if necessary */ @@ -5931,6 +5942,7 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, TAILQ_FOREACH_SAFE(j, &pd->sctp_multihome_jobs, next, tmp) { PF_RULES_RLOCK(); + j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; action = pf_test_rule(&r, &sm, kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c index 83b94db87a19..d63cf0ebe54e 100644 --- a/sys/netpfil/pf/pf_norm.c +++ b/sys/netpfil/pf/pf_norm.c @@ -1565,11 +1565,28 @@ pf_normalize_tcp_init(struct mbuf *m, int off, struct pf_pdesc *pd, void pf_normalize_tcp_cleanup(struct pf_kstate *state) { + /* XXX Note: this also cleans up SCTP. */ uma_zfree(V_pf_state_scrub_z, state->src.scrub); uma_zfree(V_pf_state_scrub_z, state->dst.scrub); /* Someday... flush the TCP segment reassembly descriptors. */ } +int +pf_normalize_sctp_init(struct mbuf *m, int off, struct pf_pdesc *pd, + struct pf_state_peer *src, struct pf_state_peer *dst) +{ + src->scrub = uma_zalloc(V_pf_state_scrub_z, M_ZERO | M_NOWAIT); + if (src->scrub == NULL) + return (1); + + dst->scrub = uma_zalloc(V_pf_state_scrub_z, M_ZERO | M_NOWAIT); + if (dst->scrub == NULL) { + uma_zfree(V_pf_state_scrub_z, src); + return (1); + } + + return (0); +} int pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd, From nobody Thu Sep 7 17:05:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhQbx3h2Vz4s1lq; Thu, 7 Sep 2023 17:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhQbx1n3gz4Ds7; Thu, 7 Sep 2023 17:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zLqSWxUBxoFo0jW4a9a7qoQQLK1AvpaTlz5LoO3K10g=; b=cJ4hkjNekyEjpKP7iSjQ5Z3LC76MhTCQ+WqhPD8mGAKAlsP5kz1ZPO8ZU3YuPFxOgeK9Sd VIT3h6edPGTYGM7chh8Q4BiJdmp16jdGQWeEZjVWR5CaASbOXG2+SDmHtTUzcjLhNoUriR 0MCOjWEfOGjxbEROeRT0uwr1E0HiNkFuJ++BlBrEaqVYXY/QRjhi45fM9+PADG86lK+A9P l5NB0gj0DjIdnZfR7nbgz0chP3kzA7FQm0lSXLqabFclAMLEeflwb8W5y6eYxBmkWi5gln C0HcKVg3CmMDLdBy3p4gPoFaFEgfMW/+dGUYH73vrE6VEfmuylt2JWqUW9VuJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694106333; a=rsa-sha256; cv=none; b=nfAxhny8AmIa8SSZSkH9viOLJmJwG4Xq+s2Zor/5fBKnY5QEW1mGatO0iHOySyjbwSoz1S kiPIDE2j2sFGNfZVD+QObKrfXbbiZ+o5W3vayDF41aWpncJVTFeDENrDjHfISLp60eTjK/ gyYUhWXF8zBLEXIez1nvx6Ip6Mg6eew21bb5CWqyZOXsu2C56uLxW2GdMM4B1gmJ7jYVpf pfcjCwX2Q5tJVk94A0MFBRMsS/4Jb9FJtqGjIdaAUY67GgPD6pIMFN/Rplhr6gn0k+sbx5 Z3cuQm1ntKsEnzKIyd5p7v2z8g68iIOsXwkTW4ExJ592NqAkbmtw1aReRAiwKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106333; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zLqSWxUBxoFo0jW4a9a7qoQQLK1AvpaTlz5LoO3K10g=; b=QD+LJ4cPAOGfcePUFnHSUaIRgHxYJwjAfafEz6HrZnDQtm5VdVNVbGi43ad5u9NcgZ7M3U 3V3a0ENmzIrobx+0HZmSVEeEXm8omSgsewypH6BUeJJvL9e+y2MA0cmS0U0V/C184e5Z6l W/m7ho4IEQrFvQG6e9Q0lk67q3IUC7ljfnz5PIEXT+R2IfcA3ahtuxFAUeDxMLx0j4cwey +wSYS+z9FtgK54ld5kGODHVTSPfJKumKmCZFZiGH6O+HEFKBqRDvoc1+dZciyikZgjjwUS aSaw3wbMHG1HMwe0NyW0Lvs4738jgx8/H7q31TTC65/CsnJ7GtcOEneRP5iUag== 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 4RhQbx04fYz16JX; Thu, 7 Sep 2023 17:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387H5Wvn032523; Thu, 7 Sep 2023 17:05:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387H5WmZ032520; Thu, 7 Sep 2023 17:05:32 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:05:32 GMT Message-Id: <202309071705.387H5WmZ032520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f1cc29af8447 - main - pf: inherit v_tag values to multihomed connections List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1cc29af84475b800df5eb94ff7d5b9484ddbdac Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1cc29af84475b800df5eb94ff7d5b9484ddbdac commit f1cc29af84475b800df5eb94ff7d5b9484ddbdac Author: Kristof Provost AuthorDate: 2023-09-04 16:00:08 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 17:05:01 +0000 pf: inherit v_tag values to multihomed connections When we create a new state for an existing SCTP association inherit the v_tag values from the original connection. MFC after: 3 weeks Sponsored by: Orange Business Services --- sys/netpfil/pf/pf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c24d4dfce742..5667cb422bbb 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5947,8 +5947,12 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, j->m, off, &j->pd, &ra, &rs, NULL); PF_RULES_RUNLOCK(); SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, action); - if (sm) + if (sm) { + /* Inherit v_tag values. */ + sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags; + sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_flags; PF_STATE_UNLOCK(sm); + } free(j, M_PFTEMP); } From nobody Thu Sep 7 17:05:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhQby3PVdz4s24b; Thu, 7 Sep 2023 17:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhQby21tbz4DlB; Thu, 7 Sep 2023 17:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUhfJfvA2VS2EtKEsXVGRdnMmnNnItaCppdFQttGcBQ=; b=Zj1Dc8EVQou1ajbc1k+SjOmuZRwtjORynZLIp31XKOR5hkgswOJXbysQ5+X6RjvkgiVlRb NMW+QfqWbrPtFor6RttvFSLdrMY3l38s7L6eu53Ao/s9HThj2prcrTVEdg2uOJkOW0Y4fy +PUyXHwAvx4jwyz0/AQ22km92gihghbJv1U3DeV37ayQbVBpnwEh0NexmF2udajtocFpeR nfAWq8ptYZl/4t7WWH9Q3nNMmD1lStnu2zffq5vXSSPhWVopwvkC0+t8UV9LRzwIPT2ZEY JDhLJ1cHswFoXZ+pnslkfcISV1UMXzeySSvvoyxn7PsSy1ZHzGNdGQoVq7bUJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694106334; a=rsa-sha256; cv=none; b=adE3kd17tdMdfcPmYmCtatV04ncjl2YP4xh5rGzmBeDYrcziFojAUE6QSI79eeUe34z4ss /meZp+B3TDqx0MMPdbr6Ez3zJmGhM4gMru+rD4QZwKlPGTmTGNXgb5gLo6MKyUIArNbB0L vltAAkxs0uqd4ZlKXvpKTVQ13MwnVNkKjE61/6xFgTsbeFI8TmIZdz63Djn7DH2h3C/h9V FODEbsb2R/tXW5/GcXzzP2H0JtcE/uOrKfMOVddiV6uDBTJRmcWLR7JOsWR3rbzoMF7Bx8 Qxa+p1XrTpLK2UCNB/9lGkkcS51egsqXrEagBOcvUaOaaRrUavAbMx+j6IxOGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUhfJfvA2VS2EtKEsXVGRdnMmnNnItaCppdFQttGcBQ=; b=MIbLn+hTTTBtkZX07o15yekA86GjSuxLwqBeJa6CXQ6MrDB7BTsD7Dy9gBoefyQ3pL0HDb 7L9ij1+JJdzghJGfl3/Y1UL0xQ3e2vnyThZHqjgi+3c9Ic3uMRWnkMidul86FI8xAtq7GA irJ9kVID7hEoId4qMekgGbmClbl7mIZf3yC2D7dVt/sDy/XOLZnZwwyo7RaylleANZCBEl uOaQujP/to+8dCKFdBDsw7CWhCBHSNPq06CmpcGBiojeG6PfLwEa149mh9GwGXVVWPtX1u 8L5Y0GuS6HsnBsvSrAYAX8CrP68eCC7FkIWOfP/nWLyhe68790cFwbZ8wOVrFA== 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 4RhQby0kQMz16f8; Thu, 7 Sep 2023 17:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387H5YWT032585; Thu, 7 Sep 2023 17:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387H5XIh032582; Thu, 7 Sep 2023 17:05:33 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:05:33 GMT Message-Id: <202309071705.387H5XIh032582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 4d3af82f7896 - main - pf: mark removed connections within a multihome association as shutting down List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d3af82f78961180149e8a579b481dc382f76eef Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4d3af82f78961180149e8a579b481dc382f76eef commit 4d3af82f78961180149e8a579b481dc382f76eef Author: Kristof Provost AuthorDate: 2023-09-05 16:30:42 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 17:05:01 +0000 pf: mark removed connections within a multihome association as shutting down Parse IP removal in ASCONF chunks, find the affected state(s) and mark them as shutting down. This will cause them to time out according to PFTM_TCP_CLOSING timeouts, rather than waiting for the established session timeout. MFC after: 3 weeks Sponsored by: Orange Business Services --- sys/net/pfvar.h | 1 + sys/netpfil/pf/pf.c | 87 ++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 73 insertions(+), 15 deletions(-) diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h index d63a7bb1afb2..a5eeb60a0d7c 100644 --- a/sys/net/pfvar.h +++ b/sys/net/pfvar.h @@ -1599,6 +1599,7 @@ struct pf_sctp_multihome_job { struct pf_addr src; struct pf_addr dst; struct mbuf *m; + int op; }; #endif diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 5667cb422bbb..9a571b1ee3d9 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5941,17 +5941,57 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, PF_RULES_RLOCK_TRACKER; TAILQ_FOREACH_SAFE(j, &pd->sctp_multihome_jobs, next, tmp) { - PF_RULES_RLOCK(); - j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; - action = pf_test_rule(&r, &sm, kif, - j->m, off, &j->pd, &ra, &rs, NULL); - PF_RULES_RUNLOCK(); - SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, action); - if (sm) { - /* Inherit v_tag values. */ - sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags; - sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_flags; - PF_STATE_UNLOCK(sm); + switch (j->op) { + case SCTP_ADD_IP_ADDRESS: { + j->pd.sctp_flags |= PFDESC_SCTP_ADD_IP; + PF_RULES_RLOCK(); + action = pf_test_rule(&r, &sm, kif, + j->m, off, &j->pd, &ra, &rs, NULL); + PF_RULES_RUNLOCK(); + SDT_PROBE4(pf, sctp, multihome, test, kif, r, j->m, action); + if (sm) { + /* Inherit v_tag values. */ + sm->src.scrub->pfss_v_tag = s->src.scrub->pfss_flags; + sm->dst.scrub->pfss_v_tag = s->dst.scrub->pfss_flags; + PF_STATE_UNLOCK(sm); + } + break; + } + case SCTP_DEL_IP_ADDRESS: { + struct pf_state_key_cmp key; + uint8_t psrc; + + bzero(&key, sizeof(key)); + key.af = j->pd.af; + key.proto = IPPROTO_SCTP; + if (j->pd.dir == PF_IN) { /* wire side, straight */ + PF_ACPY(&key.addr[0], j->pd.src, key.af); + PF_ACPY(&key.addr[1], j->pd.dst, key.af); + key.port[0] = j->pd.hdr.sctp.src_port; + key.port[1] = j->pd.hdr.sctp.dest_port; + } else { /* stack side, reverse */ + PF_ACPY(&key.addr[1], j->pd.src, key.af); + PF_ACPY(&key.addr[0], j->pd.dst, key.af); + key.port[1] = j->pd.hdr.sctp.src_port; + key.port[0] = j->pd.hdr.sctp.dest_port; + } + + sm = pf_find_state(kif, &key, j->pd.dir); + if (sm != NULL) { + PF_STATE_LOCK_ASSERT(sm); + if (j->pd.dir == sm->direction) { + psrc = PF_PEER_SRC; + } else { + psrc = PF_PEER_DST; + } + pf_set_protostate(sm, psrc, SCTP_SHUTDOWN_PENDING); + sm->timeout = PFTM_TCP_CLOSING; + PF_STATE_UNLOCK(sm); + } + break; + default: + panic("Unknown op %#x", j->op); + } } free(j, M_PFTEMP); @@ -5960,7 +6000,7 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, static int pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, - struct pfi_kkif *kif) + struct pfi_kkif *kif, int op) { int off = 0; struct pf_sctp_multihome_job *job; @@ -6022,6 +6062,7 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, memcpy(&job->dst, pd->dst, sizeof(job->dst)); job->pd.dst = &job->dst; job->m = m; + job->op = op; TAILQ_INSERT_TAIL(&pd->sctp_multihome_jobs, job, next); break; @@ -6052,6 +6093,7 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, memcpy(&job->dst, pd->dst, sizeof(job->dst)); job->pd.dst = &job->dst; job->m = m; + job->op = op; TAILQ_INSERT_TAIL(&pd->sctp_multihome_jobs, job, next); break; @@ -6066,7 +6108,22 @@ pf_multihome_scan(struct mbuf *m, int start, int len, struct pf_pdesc *pd, return (PF_DROP); ret = pf_multihome_scan(m, start + off + sizeof(ah), - ntohs(ah.ph.param_length) - sizeof(ah), pd, kif); + ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, + SCTP_ADD_IP_ADDRESS); + if (ret != PF_PASS) + return (ret); + break; + } + case SCTP_DEL_IP_ADDRESS: { + int ret; + struct sctp_asconf_paramhdr ah; + + if (!pf_pull_hdr(m, start + off, &ah, sizeof(ah), + NULL, NULL, pd->af)) + return (PF_DROP); + ret = pf_multihome_scan(m, start + off + sizeof(ah), + ntohs(ah.ph.param_length) - sizeof(ah), pd, kif, + SCTP_DEL_IP_ADDRESS); if (ret != PF_PASS) return (ret); break; @@ -6087,7 +6144,7 @@ pf_multihome_scan_init(struct mbuf *m, int start, int len, struct pf_pdesc *pd, start += sizeof(struct sctp_init_chunk); len -= sizeof(struct sctp_init_chunk); - return (pf_multihome_scan(m, start, len, pd, kif)); + return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS)); } int @@ -6097,7 +6154,7 @@ pf_multihome_scan_asconf(struct mbuf *m, int start, int len, start += sizeof(struct sctp_asconf_chunk); len -= sizeof(struct sctp_asconf_chunk); - return (pf_multihome_scan(m, start, len, pd, kif)); + return (pf_multihome_scan(m, start, len, pd, kif, SCTP_ADD_IP_ADDRESS)); } static int From nobody Thu Sep 7 17:05:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhQbz3fp6z4s1yq; Thu, 7 Sep 2023 17:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhQbz2Prpz4Dyk; Thu, 7 Sep 2023 17:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCFcz1FycBdIVgqBwSvYfxKLvyKveWiqvHEhoCAeoOA=; b=HMKKeS63x7ZM801pxLQQfNajyiCUOPOKrTDDw+sRo45dAjPxAcXA4gkfS2LLJIrv7nq8Ht tJPB6BxPcZpeoC5OXrSmM03qxqFhGscj0BRVHmlbJ6EhFkTfc1aDMfYHFFpb7B0iA7XTVs v1LctfgaVdQoJLCHn5EG6S6aPOYVTWtUAVdugHOM+aFdkcNqYxxdkWUVbvxLBf1naAnxgC QL8z1vze0MzMce6LCwpsao667KERm01qUYdo9Y+R6GwMLP/8NFr+tPUB+aV4gyPu/kmbiX h//l9qFWDQRnGMjNkvGw7dsr2itDHnO2m9tgqk0QNHIkVwVDRgVh8I0zWteBpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694106335; a=rsa-sha256; cv=none; b=uku3kdxcp2O/cr7knwnvCQVoffSfCavCaDf14THUILROHHwSZ/WIp9Gu5fxyFnCSTWWbNU B6R3b9OYfxrWUpnMqNFkzzv/hjwRvzJUtIxVOwvHs8D9wxgyas7Pdk+RlTANixEEkfRXL9 oMSVU6vqUtq9OrGvzlbKXE+1hZ5xuxoPvGLXbYV69TfqN0BkbIGrqObsWy3+fwH0P8DAmq 3xNCrAtCGRxGkRRVmaKZp6syYRHvLiPJ3m2uaOUcxCNgM8YUoz/W/VyewnS98m7ThrwMYa gdYVePAyOyGRcnvCQb9MrU+zFrpqvYp1iftJgXCbUs52sZbe6CWT6Of/p5Y2bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694106335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rCFcz1FycBdIVgqBwSvYfxKLvyKveWiqvHEhoCAeoOA=; b=buDV8Zj4CfQpXz7Q7C6QqKiuZfRXjpOdYfedf46ZXrFHBIzSGWBLw/+t4X29ONQti7D2ML Sc0s9/oAFiU1h73nhfc0AE++52Q8MvLAUH0mtKdOJy6hivL1ngWwvhBF4pQ4yWKavpoVwB 5WwlabCf8zKqKo05qPqY+3WE46DM79Wi6tM+50pFvXrVknaOOGVHnUhVbcXyCVLOD5O4C4 o1T6R/hfQkh4iL17FTR2XQbmdiSxMzeZIFpND/wREqTiK4nFxuYeFwPqI/VjlQbwYJQu8j dMFhj0zdYcScdpJHbmvAXzg58LWoLRJ2D4scuFNKt5cy5oAiwAHDcpuNW5Wepg== 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 4RhQbz1WNyz169K; Thu, 7 Sep 2023 17:05:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387H5ZjU032647; Thu, 7 Sep 2023 17:05:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387H5Zvr032644; Thu, 7 Sep 2023 17:05:35 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:05:35 GMT Message-Id: <202309071705.387H5Zvr032644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 97340b68d18b - main - pf tests: extend SCTP tests to test state removal through ASCONF List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97340b68d18bbbdebf0f73ed900c5a33894061dd Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=97340b68d18bbbdebf0f73ed900c5a33894061dd commit 97340b68d18bbbdebf0f73ed900c5a33894061dd Author: Kristof Provost AuthorDate: 2023-09-05 17:00:49 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 17:05:01 +0000 pf tests: extend SCTP tests to test state removal through ASCONF pf can now mark shut down multihomed connections shutting down. Verify that pf does the right thing. MFC after: 3 weeks Sponsored by: Orange Business Services --- tests/sys/netpfil/pf/sctp.py | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index b24d0c414ac8..5e6dca5dd64b 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -342,6 +342,24 @@ class TestSCTP(VnetTestTemplate): assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.10:.*192.0.2.3:1234", states) + # Now remove 192.0.2.1 as an address + client.bindx("192.0.2.1", False) + + # We can still communicate + try: + client.send(b"More data", 0) + rcvd = self.wait_object(srv_vnet.pipe, 5) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] =="More data" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss -vv") + + # Verify that state is closing + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 192.0.2.1:.*192.0.2.3:1234.*SHUTDOWN", states) + class TestSCTPv6(VnetTestTemplate): REQUIRED_MODULES = ["sctp", "pf"] TOPOLOGY = { @@ -440,3 +458,21 @@ class TestSCTPv6(VnetTestTemplate): states = ToolsHelper.get_output("/sbin/pfctl -ss") assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\]", states) assert re.search(r"all sctp 2001:db8::10\[.*2001:db8::3\[1234\]", states) + + # Now remove 2001:db8::1 as an address + client.bindx("2001:db8::1", False) + + # Wecan still communicate + try: + client.send(b"More data", 0) + rcvd = self.wait_object(srv_vnet.pipe, 5) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "More data" + finally: + # Debug output + ToolsHelper.print_output("/sbin/pfctl -ss -vv") + + # Verify that the state is closing + states = ToolsHelper.get_output("/sbin/pfctl -ss") + assert re.search(r"all sctp 2001:db8::1\[.*2001:db8::3\[1234\].*SHUTDOWN", states) From nobody Thu Sep 7 17:30:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhR941nf0z4sJXJ; Thu, 7 Sep 2023 17:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhR940tFJz4NmM; Thu, 7 Sep 2023 17:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694107848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPzouVkHFc8CqJrPu2fWByXxQeD4tu+OCZdJ+P0Pkus=; b=BNmhw/jgeBG8yds8Sx+8d1ttUddyS1e0pC6fWkO4ZP1oxuVN7KpTxOeThUEcZCQJPnVDDW 6rjAQmIKQDV39O6zeWD/D5Aj4huqSODB6F9+xtFUq14MDA1wHw3oEbEAWDebQSUCQHMO9I X7j4hMmvgL/uZRfYIxhF0CzPcpUiac/Kw4FUT0XYENVuY6O2COZGH1RMZraSXY+NWxJoQm Up/MjtRQilqOSNq3z+EA9QumxYWsVVQjFNnCukNA+8Dfp+gOgLAWJHx69LDgkkTGli+Eoc V9tHdzZEIut0g5ajthTa1ZnmgnYKPawLWLBkKDscztkW3oAdpHPafAtq6HY9lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694107848; a=rsa-sha256; cv=none; b=wNzlgW8/ww/igPtsTzgNr2vLhwum/fO4uinvK2pLNJpQVynnlAoZJBxeyc7U/Qii13jxJy F+TGY1B3In7crttl9NNj0ubfbtpi7nsTLbDMXhDarTa6dvzXCmBRqPgRChN7wPxAmX0r0Y fnME/5ZhUhiMov/elWV04tcEiNw2eXSeMKsW2IYeaDW4ZSTtK8B33BpAZW6YM2aB9eslJM pqP5LlAYeWqL/e2vGqhN6Gy6Ams1fa5W5gEbF+fQaqbGICGkz2iPsh+FsbgmZTWSyXVHnY 9epT/YD4UNRXPBZtM5T4GR4cP7RBNqvcxOTQwLGf4LgVmPo2VmhniiVZoVyy1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694107848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yPzouVkHFc8CqJrPu2fWByXxQeD4tu+OCZdJ+P0Pkus=; b=ah3g3nXEkfXIVRt4usY/mc3oXmqWyNBFREU/NLkV4KH8omAddZdzquXCbVvQ+LcbFI0lPR M71kdXy0PKU2l7mGdc8QblJ2V44GAw4qNXP0sLghxOWWcJsYjbKW+Bj28I8thSBn6eod4I X8YaidR38vU1H8c4o3s/XcaixPDNwdJdIZeX1bb+eLYYJ+cN7k1z/P/C7NceFCQgb2eKwe N1kyJWjriSXMKGUoMd2KvjQUvj7jGGJtrjjYx5Nr2i4VcmhUutI5Paf4xpMqrKSEeqQ217 DsAxQxmSW7YTXY9C/SHIdO2zav5DWRB6GWIKD4EDjfmFufRfEmCN/Lr0tTrT/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 4RhR936tspz17Q0; Thu, 7 Sep 2023 17:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387HUlEs076728; Thu, 7 Sep 2023 17:30:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387HUlqb076710; Thu, 7 Sep 2023 17:30:47 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:30:47 GMT Message-Id: <202309071730.387HUlqb076710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1fb1008822c6 - stable/13 - forkpty: Avoid fd leak if fork() fails. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1fb1008822c64611535d3cb8f872b66a4e70acf1 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1fb1008822c64611535d3cb8f872b66a4e70acf1 commit 1fb1008822c64611535d3cb8f872b66a4e70acf1 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-17 13:48:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 17:26:58 +0000 forkpty: Avoid fd leak if fork() fails. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D41491 (cherry picked from commit a4aaee2120ce0a121f86e39e214c2fabe82f2762) --- lib/libutil/pty.c | 1 + lib/libutil/tests/Makefile | 1 + lib/libutil/tests/forkpty_test.c | 58 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c index f52407608e9a..e5b42a666c7f 100644 --- a/lib/libutil/pty.c +++ b/lib/libutil/pty.c @@ -95,6 +95,7 @@ forkpty(int *amaster, char *name, struct termios *termp, struct winsize *winp) return (-1); switch (pid = fork()) { case -1: + (void)close(master); (void)close(slave); return (-1); case 0: diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile index dcbcb0ab4461..e096021fbb76 100644 --- a/lib/libutil/tests/Makefile +++ b/lib/libutil/tests/Makefile @@ -5,6 +5,7 @@ TAP_TESTS_C+= humanize_number_test TAP_TESTS_C+= pidfile_test TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test +ATF_TESTS_C+= forkpty_test WARNS?= 2 LIBADD+= util diff --git a/lib/libutil/tests/forkpty_test.c b/lib/libutil/tests/forkpty_test.c new file mode 100644 index 000000000000..3e54cf310150 --- /dev/null +++ b/lib/libutil/tests/forkpty_test.c @@ -0,0 +1,58 @@ +/*- + * Copyright (c) 2023 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include +#include +#include + +#include + +ATF_TC(forkfail); +ATF_TC_HEAD(forkfail, tc) +{ + atf_tc_set_md_var(tc, "descr", "Check for fd leak when fork() fails"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} + +ATF_TC_BODY(forkfail, tc) +{ + struct rlimit orl, nrl; + pid_t pid; + int prevfd, fd, pty; + + /* set process limit to 1 so fork() will fail */ + ATF_REQUIRE_EQ(0, getrlimit(RLIMIT_NPROC, &orl)); + nrl = orl; + nrl.rlim_cur = 1; + ATF_REQUIRE_EQ(0, setrlimit(RLIMIT_NPROC, &nrl)); + /* check first free fd */ + ATF_REQUIRE((fd = dup(0)) > 0); + ATF_REQUIRE_EQ(0, close(fd)); + /* attempt forkpty() */ + pid = forkpty(&pty, NULL, NULL, NULL); + if (pid == 0) { + /* child - fork() unexpectedly succeeded */ + _exit(0); + } + ATF_CHECK_ERRNO(EAGAIN, pid < 0); + if (pid > 0) { + /* parent - fork() unexpectedly succeeded */ + (void)waitpid(pid, NULL, 0); + } + /* check that first free fd hasn't changed */ + prevfd = fd; + ATF_REQUIRE((fd = dup(0)) > 0); + ATF_CHECK_EQ(prevfd, fd); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, forkfail); + return (atf_no_error()); +} From nobody Thu Sep 7 17:30:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhR951ZNjz4sJ6y; Thu, 7 Sep 2023 17:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhR951Drrz4PGs; Thu, 7 Sep 2023 17:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694107849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nx2onlVXiNkwzRw1iEJ078U18PnInbsUDc8ySxs9NjQ=; b=nnzamIPJPyLsSTmxNJA0KbBILhrmijdvy+3Yfxvb4XWumntdT/HJTtFdTFhgTVIX9KUoJC UnlkCM+QExUA9MCyoS+ysmIMFFmPtLY+nes1XopCsVzqehgkOdm4kgDnlV1m16oaUMS6cQ WFpzGe+dkuH0TkOZAHPYvejQvZFWlVJVgstZMi86vzyCRPHvtnlileUu1RSV6uw/u66sVU xjnPEjhs3fLP3779vUaJfmC1AHYVNeX8C5wZXkUvmf9MbGwFf2ob0VxykcQu4LusEH/3e7 jtEos4ZW7qkvpY5wFBR/vXp8BEwDUbkm/pA3Y2rVV1BWdcNvASnn2eQQH+hrxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694107849; a=rsa-sha256; cv=none; b=AUbT79WTH8uvyWY5kFrFIab2oqYZgGzng7DefQ033Ghg+mZisOfCYQMwRGGYC8f4PrcrYW Hc4MIlm7/Is32LBMtZQ6AJaRCs3pVVFFgU7Vf/MTavRr3SoeGUdTA43+zsijHnvnXmEBha C3YVXZ4VrSM8KmGNnzh1DFC4vpUtG6m1rWmpH6Zk4Tzz3cMaY9xJek9+cAgfneLSfpRFSa ruvsHc8Aj64YBm7rzEWNif9Sp8viQj3CMzJAMeUZGr2FjuIYedi7g3kH4u9sWMyKFm9hVE YjTMmMre3Eab/ekvRK1GvMgzg50o7oCZYZutTfY2PguoVfW3P53ywYEBhzKToA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694107849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nx2onlVXiNkwzRw1iEJ078U18PnInbsUDc8ySxs9NjQ=; b=lj7i7+Zi4XMdxzswpEbYcOR3GDH9xv1EYNeHX6NzAZH4WUjZwkq9wiULkdWOzKwFU9iap6 dKmHjEZoTAOUXhq2QzemeJirBTq22GcCAI/JYFcLMuBk7JqSlztrccCoMIJN6MGC0jWdcO zKQ0tEFumZ4CuDs5Cz6ACYNx7SNukQxQGO14XUQ7HzSQo+F8Hm3FDbbmstMWcx9BcbYbgi b+Ix6I38quJDeyc90QzsIW5Lf5mOe/N9V1Lz4Kvk0DA/kThhCBDOGmOmzJRZEtc6r8nQ0B 0MFgMerFIYA2ucRj9kLnHMVQ/sG1bFhzeU+4LOrYqDOiWs4Z2vZ7CEjnzfMmbA== 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 4RhR950GBwz17BR; Thu, 7 Sep 2023 17:30:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387HUn76077455; Thu, 7 Sep 2023 17:30:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387HUn7T077452; Thu, 7 Sep 2023 17:30:49 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:30:49 GMT Message-Id: <202309071730.387HUn7T077452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 27968aa02206 - stable/13 - pam_krb5: Clarify a loop condition. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 27968aa02206baf85314305116fd63d55a3bebf4 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=27968aa02206baf85314305116fd63d55a3bebf4 commit 27968aa02206baf85314305116fd63d55a3bebf4 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-04 16:08:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 17:27:55 +0000 pam_krb5: Clarify a loop condition. The closing parenthesis was in the wrong location, so instead of assigning the return value to krbret and then comparing it to zero, we were assigning the result of the comparison to krbret and then comparing that to zero. This has no practical significance since the value is not used after the loop terminates. PR: 229719 Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41299 (cherry picked from commit acc7cf8641dcedad295ff0e569c3f3a28939ada0) pam_krb5: Rename a variable. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41300 (cherry picked from commit 9c2823bae92c09e5356623118da2777bc3ed521d) --- lib/libpam/modules/pam_krb5/pam_krb5.c | 181 ++++++++++++++++----------------- 1 file changed, 90 insertions(+), 91 deletions(-) diff --git a/lib/libpam/modules/pam_krb5/pam_krb5.c b/lib/libpam/modules/pam_krb5/pam_krb5.c index 66eb8b7f29c4..34f457d07a40 100644 --- a/lib/libpam/modules/pam_krb5/pam_krb5.c +++ b/lib/libpam/modules/pam_krb5/pam_krb5.c @@ -112,7 +112,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; int debug; const char *auth_service; krb5_principal auth_princ; @@ -152,7 +152,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, goto cleanup6; } - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -162,7 +162,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Context initialised"); debug = openpam_get_option(pamh, PAM_OPT_DEBUG) ? 1 : 0; - krbret = verify_krb_v5_tgt_begin(pam_context, srvdup, debug, + krbret = verify_krb_v5_tgt_begin(krbctx, srvdup, debug, &auth_service, &auth_princ, auth_phost); if (krbret != 0) { /* failed to find key */ /* Keytab or service key does not exist */ @@ -178,7 +178,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, } } - krbret = krb5_cc_register(pam_context, &krb5_mcc_ops, FALSE); + krbret = krb5_cc_register(krbctx, &krb5_mcc_ops, FALSE); if (krbret != 0 && krbret != KRB5_CC_TYPE_EXISTS) { PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -195,10 +195,10 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Created principal: %s", principal); - krbret = krb5_parse_name(pam_context, principal, &princ); + krbret = krb5_parse_name(krbctx, principal, &princ); free(principal); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, "Error krb5_parse_name()"); + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_parse_name()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; goto cleanup3; @@ -208,9 +208,9 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, /* Now convert the principal name into something human readable */ princ_name = NULL; - krbret = krb5_unparse_name(pam_context, princ, &princ_name); + krbret = krb5_unparse_name(krbctx, princ, &princ_name); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_unparse_name()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -233,11 +233,11 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, /* Verify the local user exists (AFTER getting the password) */ if (strchr(user, '@')) { /* get a local account name for this principal */ - krbret = krb5_aname_to_localname(pam_context, princ, + krbret = krb5_aname_to_localname(krbctx, princ, sizeof(luser), luser); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_aname_to_localname()"); retval = PAM_USER_UNKNOWN; goto cleanup2; @@ -262,15 +262,15 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, } /* Initialize credentials request options. */ - krbret = krb5_get_init_creds_opt_alloc(pam_context, &opts); + krbret = krb5_get_init_creds_opt_alloc(krbctx, &opts); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_opt_alloc()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; goto cleanup2; } - krb5_get_init_creds_opt_set_default_flags(pam_context, + krb5_get_init_creds_opt_set_default_flags(krbctx, service, NULL, opts); if (openpam_get_option(pamh, PAM_OPT_FORWARDABLE)) @@ -280,12 +280,12 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, /* Get a TGT */ memset(&creds, 0, sizeof(krb5_creds)); - krbret = krb5_get_init_creds_password(pam_context, &creds, princ, + krbret = krb5_get_init_creds_password(krbctx, &creds, princ, pass, NULL, pamh, 0, NULL, opts); - krb5_get_init_creds_opt_free(pam_context, opts); + krb5_get_init_creds_opt_free(krbctx, opts); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_password()"); retval = PAM_AUTH_ERR; goto cleanup2; @@ -294,28 +294,28 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got TGT"); /* Generate a temporary cache */ - krbret = krb5_cc_new_unique(pam_context, krb5_cc_type_memory, NULL, &ccache); + krbret = krb5_cc_new_unique(krbctx, krb5_cc_type_memory, NULL, &ccache); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_new_unique()"); retval = PAM_SERVICE_ERR; goto cleanup; } - krbret = krb5_cc_initialize(pam_context, ccache, princ); + krbret = krb5_cc_initialize(krbctx, ccache, princ); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_initialize()"); retval = PAM_SERVICE_ERR; goto cleanup; } - krbret = krb5_cc_store_cred(pam_context, ccache, &creds); + krbret = krb5_cc_store_cred(krbctx, ccache, &creds); if (krbret != 0) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_store_cred()"); - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); retval = PAM_SERVICE_ERR; goto cleanup; } @@ -323,14 +323,14 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Credentials stashed"); /* Verify them */ - krbret = verify_krb_v5_tgt(pam_context, ccache, srvdup, + krbret = verify_krb_v5_tgt(krbctx, ccache, srvdup, debug, auth_service, auth_princ, auth_phost); free(srvdup); srvdup = NULL; if (krbret == -1) { PAM_VERBOSE_ERROR("Kerberos 5 error"); - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); retval = PAM_AUTH_ERR; goto cleanup; } @@ -339,7 +339,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, retval = pam_get_data(pamh, "ccache", &ccache_data); if (retval == PAM_SUCCESS) { - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_AUTH_ERR; goto cleanup; @@ -347,8 +347,8 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Credentials stash not pre-existing"); - asprintf(&ccache_name, "%s:%s", krb5_cc_get_type(pam_context, - ccache), krb5_cc_get_name(pam_context, ccache)); + asprintf(&ccache_name, "%s:%s", krb5_cc_get_type(krbctx, + ccache), krb5_cc_get_name(krbctx, ccache)); if (ccache_name == NULL) { PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_BUF_ERR; @@ -356,7 +356,7 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, } retval = pam_set_data(pamh, "ccache", ccache_name, cleanup_cache); if (retval != 0) { - krb5_cc_destroy(pam_context, ccache); + krb5_cc_destroy(krbctx, ccache); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; goto cleanup; @@ -365,21 +365,21 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, PAM_LOG("Credentials stash saved"); cleanup: - krb5_free_cred_contents(pam_context, &creds); + krb5_free_cred_contents(krbctx, &creds); PAM_LOG("Done cleanup"); cleanup2: - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); if (princ_name) free(princ_name); PAM_LOG("Done cleanup2"); cleanup3: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup3"); cleanup4: - verify_krb_v5_tgt_cleanup(pam_context, debug, + verify_krb_v5_tgt_cleanup(krbctx, debug, auth_service, auth_princ, auth_phost); PAM_LOG("Done cleanup4"); @@ -405,7 +405,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, #else krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; krb5_principal princ; krb5_creds creds; krb5_ccache ccache_temp, ccache_perm; @@ -446,7 +446,7 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Got user: %s", (const char *)user); - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_LOG("Error krb5_init_context() failed"); return (PAM_SERVICE_ERR); @@ -465,9 +465,9 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, retval = PAM_CRED_UNAVAIL; goto cleanup3; } - krbret = krb5_cc_resolve(pam_context, cache_data, &ccache_temp); + krbret = krb5_cc_resolve(krbctx, cache_data, &ccache_temp); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_resolve(\"%s\")", (const char *)cache_data); retval = PAM_SERVICE_ERR; goto cleanup3; @@ -538,22 +538,22 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Got cache_name: %s", cache_name); /* Initialize the new ccache */ - krbret = krb5_cc_get_principal(pam_context, ccache_temp, &princ); + krbret = krb5_cc_get_principal(krbctx, ccache_temp, &princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_get_principal()"); retval = PAM_SERVICE_ERR; goto cleanup3; } - krbret = krb5_cc_resolve(pam_context, cache_name, &ccache_perm); + krbret = krb5_cc_resolve(krbctx, cache_name, &ccache_perm); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, "Error krb5_cc_resolve()"); + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_resolve()"); retval = PAM_SERVICE_ERR; goto cleanup2; } - krbret = krb5_cc_initialize(pam_context, ccache_perm, princ); + krbret = krb5_cc_initialize(krbctx, ccache_perm, princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_initialize()"); retval = PAM_SERVICE_ERR; goto cleanup2; @@ -562,11 +562,11 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Cache initialised"); /* Prepare for iteration over creds */ - krbret = krb5_cc_start_seq_get(pam_context, ccache_temp, &cursor); + krbret = krb5_cc_start_seq_get(krbctx, ccache_temp, &cursor); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_start_seq_get()"); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } @@ -574,28 +574,27 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Prepared for iteration"); /* Copy the creds (should be two of them) */ - while ((krbret = krb5_cc_next_cred(pam_context, ccache_temp, - &cursor, &creds) == 0)) { - krbret = krb5_cc_store_cred(pam_context, ccache_perm, &creds); + while (krb5_cc_next_cred(krbctx, ccache_temp, &cursor, &creds) == 0) { + krbret = krb5_cc_store_cred(krbctx, ccache_perm, &creds); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_store_cred()"); - krb5_cc_destroy(pam_context, ccache_perm); - krb5_free_cred_contents(pam_context, &creds); + krb5_cc_destroy(krbctx, ccache_perm); + krb5_free_cred_contents(krbctx, &creds); retval = PAM_SERVICE_ERR; goto cleanup2; } - krb5_free_cred_contents(pam_context, &creds); + krb5_free_cred_contents(krbctx, &creds); PAM_LOG("Iteration"); } - krb5_cc_end_seq_get(pam_context, ccache_temp, &cursor); + krb5_cc_end_seq_get(krbctx, ccache_temp, &cursor); PAM_LOG("Done iterating"); if (strstr(cache_name, "FILE:") == cache_name) { if (chown(&cache_name[5], pwd->pw_uid, pwd->pw_gid) == -1) { PAM_LOG("Error chown(): %s", strerror(errno)); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } @@ -603,21 +602,21 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, if (chmod(&cache_name[5], (S_IRUSR | S_IWUSR)) == -1) { PAM_LOG("Error chmod(): %s", strerror(errno)); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } PAM_LOG("Done chmod()"); } - krb5_cc_close(pam_context, ccache_perm); + krb5_cc_close(krbctx, ccache_perm); PAM_LOG("Cache closed"); retval = pam_setenv(pamh, "KRB5CCNAME", cache_name, 1); if (retval != PAM_SUCCESS) { PAM_LOG("Error pam_setenv(): %s", pam_strerror(pamh, retval)); - krb5_cc_destroy(pam_context, ccache_perm); + krb5_cc_destroy(krbctx, ccache_perm); retval = PAM_SERVICE_ERR; goto cleanup2; } @@ -625,10 +624,10 @@ pam_sm_setcred(pam_handle_t *pamh, int flags, PAM_LOG("Environment done: KRB5CCNAME=%s", cache_name); cleanup2: - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); PAM_LOG("Done cleanup2"); cleanup3: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup3"); seteuid(euid); @@ -651,7 +650,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; krb5_ccache ccache; krb5_principal princ; int retval; @@ -670,7 +669,7 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got credentials"); - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_LOG("Error krb5_init_context() failed"); return (PAM_PERM_DENIED); @@ -678,20 +677,20 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Context initialised"); - krbret = krb5_cc_resolve(pam_context, (const char *)ccache_name, &ccache); + krbret = krb5_cc_resolve(krbctx, (const char *)ccache_name, &ccache); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_resolve(\"%s\")", (const char *)ccache_name); - krb5_free_context(pam_context); + krb5_free_context(krbctx); return (PAM_PERM_DENIED); } PAM_LOG("Got ccache %s", (const char *)ccache_name); - krbret = krb5_cc_get_principal(pam_context, ccache, &princ); + krbret = krb5_cc_get_principal(krbctx, ccache, &princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_cc_get_principal()"); retval = PAM_PERM_DENIED; goto cleanup; @@ -699,16 +698,16 @@ pam_sm_acct_mgmt(pam_handle_t *pamh, int flags __unused, PAM_LOG("Got principal"); - if (krb5_kuserok(pam_context, princ, (const char *)user)) + if (krb5_kuserok(krbctx, princ, (const char *)user)) retval = PAM_SUCCESS; else retval = PAM_PERM_DENIED; - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); PAM_LOG("Done kuserok()"); cleanup: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup"); return (retval); @@ -723,7 +722,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc __unused, const char *argv[] __unused) { krb5_error_code krbret; - krb5_context pam_context; + krb5_context krbctx; krb5_creds creds; krb5_principal princ; krb5_get_init_creds_opt *opts; @@ -742,7 +741,7 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Got user: %s", (const char *)user); - krbret = krb5_init_context(&pam_context); + krbret = krb5_init_context(&krbctx); if (krbret != 0) { PAM_LOG("Error krb5_init_context() failed"); return (PAM_SERVICE_ERR); @@ -751,9 +750,9 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Context initialised"); /* Get principal name */ - krbret = krb5_parse_name(pam_context, (const char *)user, &princ); + krbret = krb5_parse_name(krbctx, (const char *)user, &princ); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_parse_name()"); retval = PAM_USER_UNKNOWN; goto cleanup3; @@ -761,9 +760,9 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, /* Now convert the principal name into something human readable */ princ_name = NULL; - krbret = krb5_unparse_name(pam_context, princ, &princ_name); + krbret = krb5_unparse_name(krbctx, princ, &princ_name); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_unparse_name()"); retval = PAM_SERVICE_ERR; goto cleanup2; @@ -779,9 +778,9 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Got password"); /* Initialize credentials request options. */ - krbret = krb5_get_init_creds_opt_alloc(pam_context, &opts); + krbret = krb5_get_init_creds_opt_alloc(krbctx, &opts); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_opt_alloc()"); PAM_VERBOSE_ERROR("Kerberos 5 error"); retval = PAM_SERVICE_ERR; @@ -791,11 +790,11 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, PAM_LOG("Credentials options initialised"); memset(&creds, 0, sizeof(krb5_creds)); - krbret = krb5_get_init_creds_password(pam_context, &creds, princ, + krbret = krb5_get_init_creds_password(krbctx, &creds, princ, pass, NULL, pamh, 0, "kadmin/changepw", opts); - krb5_get_init_creds_opt_free(pam_context, opts); + krb5_get_init_creds_opt_free(krbctx, opts); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_get_init_creds_password()"); retval = PAM_AUTH_ERR; goto cleanup2; @@ -821,11 +820,11 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, retval = PAM_BUF_ERR; goto cleanup; } - krbret = krb5_set_password(pam_context, &creds, passdup, NULL, + krbret = krb5_set_password(krbctx, &creds, passdup, NULL, &result_code, &result_code_string, &result_string); free(passdup); if (krbret != 0) { - PAM_LOG_KRB5_ERR(pam_context, krbret, + PAM_LOG_KRB5_ERR(krbctx, krbret, "Error krb5_change_password()"); retval = PAM_AUTHTOK_ERR; goto cleanup; @@ -844,16 +843,16 @@ pam_sm_chauthtok(pam_handle_t *pamh, int flags, free(result_code_string.data); cleanup: - krb5_free_cred_contents(pam_context, &creds); + krb5_free_cred_contents(krbctx, &creds); PAM_LOG("Done cleanup"); cleanup2: - krb5_free_principal(pam_context, princ); + krb5_free_principal(krbctx, princ); if (princ_name) free(princ_name); PAM_LOG("Done cleanup2"); cleanup3: - krb5_free_context(pam_context); + krb5_free_context(krbctx); PAM_LOG("Done cleanup3"); @@ -1017,17 +1016,17 @@ verify_krb_v5_tgt_cleanup(krb5_context context, int debug, static void cleanup_cache(pam_handle_t *pamh __unused, void *data, int pam_end_status __unused) { - krb5_context pam_context; + krb5_context krbctx; krb5_ccache ccache; krb5_error_code krbret; - if (krb5_init_context(&pam_context)) + if (krb5_init_context(&krbctx)) return; - krbret = krb5_cc_resolve(pam_context, data, &ccache); + krbret = krb5_cc_resolve(krbctx, data, &ccache); if (krbret == 0) - krb5_cc_destroy(pam_context, ccache); - krb5_free_context(pam_context); + krb5_cc_destroy(krbctx, ccache); + krb5_free_context(krbctx); free(data); } From nobody Thu Sep 7 17:36:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhRHC2L8Qz4sMQx; Thu, 7 Sep 2023 17:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhRHC1dFzz4R6g; Thu, 7 Sep 2023 17:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694108167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f6rk5CNgS7/9r5fcxGk4acRjRb7QVbNY/trcAVhyONU=; b=VWSG9uBORGY07Umi10GJVqEhEiVXaigptl7Pd+g/WvigFLOYvmpZ4fWH87C2d8qNPE+ik2 9jpphFdV19dRJxJcWGwsRQTAtsP+HevHiMX6Omo0gmgXK4G5wN34iF/v1a3xj4LWRyOc07 AhfmaXq+zo62dhlFWfwreC21HuWaD6FCXg1dgxz/JQIL5UIMoi6GITXB4Xt07f0DgTfcum dkX03MgmfrD7KZKZAQ+JvkLatWA6cxJYCEwKQX1HThSLudSnLprAiFxx7zKNJjudUZeYcU 2zUA/lga3UQF2nnfEnXcaCtp5YljTLeBoWyJmn0EJJubVq2L8YeUd+L3QdRNQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694108167; a=rsa-sha256; cv=none; b=DkUbw2q9TyAo4MCfPG1X4zd1N2Uj4VXrQCpL3I01XtXbUyfd0YkWkHOMYU/SrbhIkwqV71 O63w+2wu4Q2+S+D+25xYRGV4lGygIJoAp8RciB5AnCtLok1y6pOyv2QY4pD/mf9Dq9Fy54 cXChu5DtMnPclwO396ywGGOTSfJxTL3dxjx0neGWhwZwaBRvttfyK2zMYcc/5zDcmOOk5u DDP0IOe0htyuttlH7qjhe/G4+UrOBtEHiS2eFftVSEJpsaqYQgcHyNY4z6NvPlMUIaIS/L nVcI5vov7sju6pwEOURbFNNsmpWF8AgM9Q4rHHntzidgRWX4ZojDBHS+xf8WmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694108167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f6rk5CNgS7/9r5fcxGk4acRjRb7QVbNY/trcAVhyONU=; b=Exphp2Clf58OvGNc4LSdr2xtRPf1XdsYdvTE7VIWfUBPb/4cCJt73NVFUcArgDIYVDTCGj CZVWPFL2WAkXy2dEc4vO0NMEdILzDybFJnYtWPYXlrjZkeHTxiwtROgUAVN4sYbES00wi+ ccOmUxxs++2IRs8fvRJj9CfQIKJm9k7kcMhRdmWvP6IHXNEL3SuICHffAEjcuzAmyqLrFq i2Bwxie7oj/ThOx4/DNtwE95ksllT2SZi4aVA/VMKbZqnWd1KUUr65g6HAUeMZJV7JqLcl zyjZWx6IbTdg6O7vQEi+2A5N6KIZ1rlqNXBAoxwDoMvLbQguFVtmFJL6bynsKA== 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 4RhRHC0P3Bz17pC; Thu, 7 Sep 2023 17:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387Ha6YF082118; Thu, 7 Sep 2023 17:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387Ha6nw082115; Thu, 7 Sep 2023 17:36:06 GMT (envelope-from git) Date: Thu, 7 Sep 2023 17:36:06 GMT Message-Id: <202309071736.387Ha6nw082115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c9315099f69e - main - ssh-keygen: Generate Ed25519 keys when invoked without arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9315099f69ead6796ef48c2ac5435f8f93c0de7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c9315099f69ead6796ef48c2ac5435f8f93c0de7 commit c9315099f69ead6796ef48c2ac5435f8f93c0de7 Author: Ed Maste AuthorDate: 2023-09-07 16:32:39 +0000 Commit: Ed Maste CommitDate: 2023-09-07 17:34:21 +0000 ssh-keygen: Generate Ed25519 keys when invoked without arguments Ed25519 keys are convenient because they're much smaller, and the next OpenSSH release (9.5) will switch to them by default. Apply the change to FreeBSD main now, to help identify issues as early as possible. Reviewed by: kevans, karels, des Relnotes: Yes Obtained from: OpenBSD 9de458a24986 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41773 --- crypto/openssh/ssh-keygen.1 | 6 +++--- crypto/openssh/ssh-keygen.c | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/crypto/openssh/ssh-keygen.1 b/crypto/openssh/ssh-keygen.1 index c760f91be14f..c392141ea127 100644 --- a/crypto/openssh/ssh-keygen.1 +++ b/crypto/openssh/ssh-keygen.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.229 2023/07/23 20:04:45 naddy Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.230 2023/09/04 10:29:58 job Exp $ .\" .\" Author: Tatu Ylonen .\" Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -35,7 +35,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 23 2023 $ +.Dd $Mdocdate: September 4 2023 $ .Dt SSH-KEYGEN 1 .Os .Sh NAME @@ -185,7 +185,7 @@ The type of key to be generated is specified with the option. If invoked without any arguments, .Nm -will generate an RSA key. +will generate an Ed25519 key. .Pp .Nm is also used to generate groups for use in Diffie-Hellman group diff --git a/crypto/openssh/ssh-keygen.c b/crypto/openssh/ssh-keygen.c index 9ccea624cd90..5b945a849202 100644 --- a/crypto/openssh/ssh-keygen.c +++ b/crypto/openssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.470 2023/07/17 04:01:10 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.471 2023/09/04 10:29:58 job Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1994 Tatu Ylonen , Espoo, Finland @@ -67,11 +67,7 @@ #include "sk-api.h" /* XXX for SSH_SK_USER_PRESENCE_REQD; remove */ #include "cipher.h" -#ifdef WITH_OPENSSL -# define DEFAULT_KEY_TYPE_NAME "rsa" -#else -# define DEFAULT_KEY_TYPE_NAME "ed25519" -#endif +#define DEFAULT_KEY_TYPE_NAME "ed25519" /* * Default number of bits in the RSA, DSA and ECDSA keys. These value can be @@ -263,7 +259,7 @@ ask_filename(struct passwd *pw, const char *prompt) char *name = NULL; if (key_type_name == NULL) - name = _PATH_SSH_CLIENT_ID_RSA; + name = _PATH_SSH_CLIENT_ID_ED25519; else { switch (sshkey_type_from_name(key_type_name)) { case KEY_DSA_CERT: From nobody Thu Sep 7 18:19:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhSF835MWz4sn8g; Thu, 7 Sep 2023 18:19:24 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Received: from spindle.one-eyed-alien.net (spindle.one-eyed-alien.net [199.48.129.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhSF82gxmz3Fs7; Thu, 7 Sep 2023 18:19:24 +0000 (UTC) (envelope-from brooks@spindle.one-eyed-alien.net) Authentication-Results: mx1.freebsd.org; none Received: by spindle.one-eyed-alien.net (Postfix, from userid 3001) id EFC0A3C019A; Thu, 7 Sep 2023 18:19:23 +0000 (UTC) Date: Thu, 7 Sep 2023 18:19:23 +0000 From: Brooks Davis To: Colin Percival Cc: Zhenlei Huang , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 1926d5cef6ea - main - init_main: Record completed SYSINITs Message-ID: References: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> <5BC96D9F-E4C4-4D34-B7B3-41576AD296DA@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:36236, ipnet:199.48.128.0/22, country:US] X-Rspamd-Queue-Id: 4RhSF82gxmz3Fs7 On Wed, Sep 06, 2023 at 06:46:59PM -0700, Colin Percival wrote: > On 9/6/23 18:12, Zhenlei Huang wrote: > > > On Sep 7, 2023, at 2:37 AM, Colin Percival wrote: > > > init_main: Record completed SYSINITs > > > > > > When removing them from sysinit_list, append them to sysinit_done_list; > > > print this list from 'show sysinit' along with the list of future > > > sysinits. > > > > So the `sysinit_done_list` is for DDB only. > > Well... sort of. You can open up kgdb and run 'p sysinit_done_list'. > > > > static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; > > > +static struct sysinitlist sysinit_done_list = > > > + STAILQ_HEAD_INITIALIZER(sysinit_done_list); > > > > Then it should be wrapped around with #ifdef DDB and #endif > I considered that, but since we're literally talking about 2 pointers of > memory I figured it wasn't worth making it conditional. IMO loss of the run order in a dump was a (minor) regression so this should be unconditionally available. -- Brooks From nobody Thu Sep 7 19:24:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhThq15ftz4sFwZ; Thu, 7 Sep 2023 19:24: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhThq0XDdz3dPg; Thu, 7 Sep 2023 19:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pO2AtfSNABUBCZD7u2D43L4gv4U6OxdInLgDKKidQiI=; b=rcJv63JGKjZhRadpNwkixHbGGIkbvc7jUUKAHKKZaaUZ7GOvsBMx1k7paSVtUmoNZagScW 54xmltP7nW8nqB5tXBrQ0lfd+8vKQer704c76fbFAHAVxvCDhYrvRoKPuD3+FJlb3ZMcvB yGnPLvR25Ymocz7xAQBfdoImCwhYqvjHWZHJ1ycHDbLmIRUZCT1sMT/Ag/SLgqZ70kR2kz t5PDoktOfv/zss3kEpjWifvP+K9ZvRWobcmg7Va3WV0Z364FKXharg/dVBbFLRJercdtjh yK7gD2WSSocJ6Yw7BvG8OesWA7cTvphP4Q7gsrFEpppS4rZLcWPeAugx8heZyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114699; a=rsa-sha256; cv=none; b=OM7G8PrbEekx0c00FGM7XcaQKZKdlYR278jOnpDvpsUbrCbahsQDHKrqFjuuQCCYDpDj1b p2Nv8hYNvjWAAmg2pXvwZmwTTmQXEMd+vvM1C2s6GElyJZdV+DIEASJBKoZ2BZxJyoq31K ZOpdyEwptFosI3jdht+uRA6F1tFQOHe2GDoD28jhsGTINiK7PLzEJ0CceCNdRy+GdabUm7 6LU9xyxkgAP/5q3COa1GiSj84ObUahpgo6Kun0aZgGSDvwhX0GSi2qck2rkVxba9lTsxLZ 7a2o+4yno1IxKS/65RzcIO8I2FYDm8/XUTmOHooqYCiQpwkn1AppqpSfJ8xsDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pO2AtfSNABUBCZD7u2D43L4gv4U6OxdInLgDKKidQiI=; b=V+/M7aFujTDS7GVVAr3Vo92HdV+cAmTy9w1jlxo/0T2/MLaYLDI8mN8Xvp6tNhqxDqtlO/ 6gkrT6av8g2ekqx7jyz2pCYM7quIfy9aSjnqIaRuMFB1xsflMh0JHPE5UfO9gZDkoAOudU jNCJamsR/BjHaSqWiQjefKNjV7OUsX0nvHA8jw69cD2X4ujmuj4L8RY5l6TmEQQuyaCxSP s/hI7adz54zxwVmojLCbO/SJ1wdU/hmHHjN4PPqoOGuoc9FXIcf/HoHVGWWQ69qUmb2IUZ nI6P0Bih6MQ8w3kNCZ9x0T+K2+3PstR0jTEcQad8nkzney8L2TK+6rRaXxsQ8Q== 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 4RhThp6Vc1z1B5q; Thu, 7 Sep 2023 19:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387JOwkR064579; Thu, 7 Sep 2023 19:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JOwDn064576; Thu, 7 Sep 2023 19:24:58 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:24:58 GMT Message-Id: <202309071924.387JOwDn064576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: c34ca43649db - stable/13 - pf (t)ftp-proxy: use libpfctl instead of DIOCGETSTATUS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c34ca43649db9f6d73a55a4e6c7fad832f7b4383 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c34ca43649db9f6d73a55a4e6c7fad832f7b4383 commit c34ca43649db9f6d73a55a4e6c7fad832f7b4383 Author: Kristof Provost AuthorDate: 2023-08-29 15:00:44 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:23:06 +0000 pf (t)ftp-proxy: use libpfctl instead of DIOCGETSTATUS Prefer libpfctl functions over direct access to the ioctl whenever possible. This will allow subsequent removal of DIOCGETSTATUS (in 15) as there already is an nvlist-based alternative. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41647 (cherry picked from commit ddd08375c85576b49fb9a34968ba2c2f4f8d56cf) --- contrib/pf/ftp-proxy/filter.c | 9 ++++++--- contrib/pf/tftp-proxy/filter.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/pf/ftp-proxy/filter.c b/contrib/pf/ftp-proxy/filter.c index e4787985e99f..4277e079f3be 100644 --- a/contrib/pf/ftp-proxy/filter.c +++ b/contrib/pf/ftp-proxy/filter.c @@ -169,7 +169,7 @@ do_rollback(void) void init_filter(const char *opt_qname, const char *opt_tagname, int opt_verbose) { - struct pf_status status; + struct pfctl_status *status; qname = opt_qname; tagname = opt_tagname; @@ -182,10 +182,13 @@ init_filter(const char *opt_qname, const char *opt_tagname, int opt_verbose) dev = open("/dev/pf", O_RDWR); if (dev == -1) err(1, "open /dev/pf"); - if (ioctl(dev, DIOCGETSTATUS, &status) == -1) + status = pfctl_get_status(dev); + if (status == NULL) err(1, "DIOCGETSTATUS"); - if (!status.running) + if (!status->running) errx(1, "pf is disabled"); + + pfctl_free_status(status); } int diff --git a/contrib/pf/tftp-proxy/filter.c b/contrib/pf/tftp-proxy/filter.c index 1689d3465fd3..966628464d28 100644 --- a/contrib/pf/tftp-proxy/filter.c +++ b/contrib/pf/tftp-proxy/filter.c @@ -173,7 +173,7 @@ do_rollback(void) void init_filter(char *opt_qname, int opt_verbose) { - struct pf_status status; + struct pfctl_status *status; qname = opt_qname; @@ -187,14 +187,17 @@ init_filter(char *opt_qname, int opt_verbose) syslog(LOG_ERR, "can't open /dev/pf"); exit(1); } - if (ioctl(dev, DIOCGETSTATUS, &status) == -1) { + status = pfctl_get_status(dev); + if (status == NULL) { syslog(LOG_ERR, "DIOCGETSTATUS"); exit(1); } - if (!status.running) { + if (!status->running) { syslog(LOG_ERR, "pf is disabled"); exit(1); } + + pfctl_free_status(status); } int From nobody Thu Sep 7 19:24:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhThr2ySNz4sFyv; Thu, 7 Sep 2023 19:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhThr1H7Xz3d8K; Thu, 7 Sep 2023 19:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6m6mCf+jJkLWFnw7OtakN9zzeXFt5j9eA8Z6e2bjEM=; b=scb/V49bXbubn2I5ZAQ8RSyp2nhDjB/sGtokayzVYwpJRzFADGQuIJqUS209yks2Do4rqn jV2hG0xOW1xxh90fIeV95mPaoHYTk4ZTIP0Bp2kSEpYsgtv+rM/s+Uns57DLwLWGXirH/C wZIutW9XP8nXnTDtENVTxohhi8IrcGse9+DKeMFY1OHbTxOF9ShLPL1GC5axONUCNwXTex lJbbmwwgV9YJRTe8mM+vNp48klltPfplXWdSUYy60SiR9ANbCYIf29Jc2bVhcN7Ds6x6nE Ir5n1e6tn0v2EKNarCt7YYeCLtRZcnIVoB+XQAL8LqSwhdxelxCLy05W6Ze/6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114700; a=rsa-sha256; cv=none; b=amkRsM/+WIlacTQTUztf35AI59zA0R/djvLpzv0JyfKnFNvuO8HjmyH5DHa/t0YrygIFJC WZw0kV1nqwCaW8zQWNaBAezBufkrFiGTrZJHUkbgEeRPl49/U4yFGRKtSBLgsBUrbM5Fh3 qeLKqvxrPfBMhcFktztZeKzlba6i15iRfsQE9bn8EruHLYExRvMtPaY+rIAis+GgNqNOkk OXCYAtpAyYdh3kMPqHet1Wi5GZ3nM1rZxl1o1PAJ4p0CyjQl/eOdQG7kdymiODeQ97foWU 71YLidswsanRM8B5ado92AQasvtZri+arJmADYHC3TQqq7EWWXkDJ33W8PTRwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114700; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M6m6mCf+jJkLWFnw7OtakN9zzeXFt5j9eA8Z6e2bjEM=; b=MuN6JxeyuJsEhP6T9+ttvXe4xxV+SqBIAXL6xGq0YwbA/EgNSnFTLaCOiMM6O2f922iIKi MZ0AqBLLM/eqUfXjyxMNxmTCygeR8YvfTRg5E8pBwFyMTSxWYrvgzohHL8oXOqvzw7T1JS vFWDJRfg8fwUc6m8BvLBBiMnmvf8WpgUj8HefdwsNOPvRGxJYEUANitGYgOW4OlP2b61pE RUv7nIKz59QiEb2kUGwCBsjuZYD+IrBWFeuyn1e+ajTAwSIAM63fpaBVBngpp+Hi9Tx/St odLwrt+mn0GPy0kU/ZCW45cHGLL0mwpnKGQTuC9XCMY0XunxdhZK5Wf7GDRy/Q== 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 4RhThr0HW5z1BHj; Thu, 7 Sep 2023 19:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387JOxJF064616; Thu, 7 Sep 2023 19:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JOxv3064613; Thu, 7 Sep 2023 19:24:59 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:24:59 GMT Message-Id: <202309071924.387JOxv3064613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: c364b43a717a - stable/13 - libpfctl: allow pfctl_free_status(NULL) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c364b43a717a91f53aabde06bf6077bf87069d54 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=c364b43a717a91f53aabde06bf6077bf87069d54 commit c364b43a717a91f53aabde06bf6077bf87069d54 Author: Kristof Provost AuthorDate: 2023-08-29 15:02:34 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:23:07 +0000 libpfctl: allow pfctl_free_status(NULL) Mimic free() and friends, and allow free()ing of NULL. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41648 (cherry picked from commit 0b01878fd00b128ce3dead119b37781048744d39) --- lib/libpfctl/libpfctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 6ade20fcd990..3bfa0698e4b1 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -256,6 +256,9 @@ pfctl_free_status(struct pfctl_status *status) { struct pfctl_status_counter *c, *tmp; + if (status == NULL) + return; + TAILQ_FOREACH_SAFE(c, &status->counters, entry, tmp) { free(c->name); free(c); From nobody Thu Sep 7 19:25:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhThs3TjKz4sFvL; Thu, 7 Sep 2023 19:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhThs2VV4z3d8V; Thu, 7 Sep 2023 19:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZcCaXkAZSP4/SUJapUgnBczlevXzmi40tOOekKXv/dE=; b=OTQQoEh6SMke6ns4zKP9FBycaiKh/oFxHCJI3tz2GFQ5+I/yKIjYhe0Q4x6v6QGUI/PsQd f4xmuvUvbp/MNznoPAjxrmoBYCU8GNusgrRKgcKTul1SpmLu54PEVjmLYaT2oVZIt+Ri7c QFC7EJSS+3n4/4vq4QHn+D+Qg3QacC66qbNSVuAkrMbZZDIr0Fa1aPEEMkapMOR1BQneRI Vluhr05Qz9ihnm1SIxZ5tBtzZT/LzXmh2PLtkWiVZhGTMXRcPkPU+LSbK246u8gZ9iVqA0 Ys9U+Ubu+xhYOyZvoj04ieITNUNPuDqm8SvBbYVgI7w5M0/PXTfzu2Jg3bfdmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114701; a=rsa-sha256; cv=none; b=UjtgyG00WdnSTiOWjiVdnbUGdCkhvMsmNIQ0G2sJa2ax6jgjG2nlLq0+eJ+w7nnh/5/ml/ CIuC7RpfijSQWWYz0ckn91YtT4hvg4dv4IGGIC+cR4RNi6vimMOOSO3nXG5jC6FO0+bmdD ulWdL+kMelM7RwKqkVpDcYtCXtqGLv9Z67W4QbCb2797L3fHiWhyryleMQzgDdhubDT6/X 5aRd6oNeJZV0MXk4ptN21dc5KvBX56v11+csYFi79SnAqjZKd3EnoqhGxGG3SrFLpgnnk7 9lplMfqwucclQvX6/hyZLzl1dFlBWm0D2K+x6zatVfKLRSnth58uwE8L61F3aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZcCaXkAZSP4/SUJapUgnBczlevXzmi40tOOekKXv/dE=; b=ZG2kGSZQPwIeZ3hXQDmQPzh4lCl7a8Sujfc46O26drdoYoVMZtlxJymdldLbMA6jXOxNpw Sy4PpORRFt0qMnBSFWv7OrzNM7LoAmdhjx3Nc+f1pWjYoR9fdiPOb/X/TVPCB+ZqRTFGgK Q380UA0byLZeN1Vz+RnI3fxpUf54AKjJ/xqJBxyU/ixhSgbVunLRnI88I6VUXI+2ZMxtoF 3/jGjbCSKFmnRSwdYOAuBrZwfaOt2Zv8nW/3UrzbvNe7Fly07Llf4bd9napdnMvBcKxo0d U1JzWOMgBbcY2NojIhlQHv7o4QixFo7j87xLs/RgJnI3yIpN10taCcXrLw+WHw== 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 4RhThs1RWHz1BYV; Thu, 7 Sep 2023 19:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387JP11s064678; Thu, 7 Sep 2023 19:25:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JP1Fo064675; Thu, 7 Sep 2023 19:25:01 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:25:01 GMT Message-Id: <202309071925.387JP1Fo064675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 3155f562c5b1 - stable/13 - libpfctl: implement status counter accessor functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3155f562c5b1940a6921d513be724cad4545bdf6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3155f562c5b1940a6921d513be724cad4545bdf6 commit 3155f562c5b1940a6921d513be724cad4545bdf6 Author: Kristof Provost AuthorDate: 2023-08-29 15:04:17 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:23:07 +0000 libpfctl: implement status counter accessor functions The new nvlist-based status call allows us to easily add new counters. However, the libpfctl interface defines a TAILQ, so it's not quite trivial to find the counter consumers are interested in. Provide convenience functions to access the counters. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41649 (cherry picked from commit e3d3d61a7d94a4155ef70048a8b578985fca8383) --- lib/libpfctl/libpfctl.c | 31 +++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 3bfa0698e4b1..54e8fedbe4df 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -251,6 +251,37 @@ pfctl_get_status(int dev) return (status); } +static uint64_t +_pfctl_status_counter(struct pfctl_status_counters *counters, uint64_t id) +{ + struct pfctl_status_counter *c; + + TAILQ_FOREACH(c, counters, entry) { + if (c->id == id) + return (c->counter); + } + + return (0); +} + +uint64_t +pfctl_status_counter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->counters, id)); +} + +uint64_t +pfctl_status_fcounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->fcounters, id)); +} + +uint64_t +pfctl_status_scounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->scounters, id)); +} + void pfctl_free_status(struct pfctl_status *status) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index bcf8644d112c..e500bbf0bddf 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -290,6 +290,9 @@ struct pfctl_syncookies { }; struct pfctl_status* pfctl_get_status(int dev); +uint64_t pfctl_status_counter(struct pfctl_status *status, int id); +uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id); +uint64_t pfctl_status_scounter(struct pfctl_status *status, int id); void pfctl_free_status(struct pfctl_status *status); int pfctl_get_rules_info(int dev, struct pfctl_rules_info *rules, From nobody Thu Sep 7 19:25:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhThv1B9Xz4sG05; Thu, 7 Sep 2023 19:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhTht3SD5z3dbK; Thu, 7 Sep 2023 19:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=52zgHz7wW4+rwAIWq63UKE4v3g3xVo84KY65nCVkLF0=; b=YV75WreN4KM6Sp9GAUksMSccN1nSy3z0iHUgEmn7QhZQ6Vp/tKOqT691uTr0o2Ye2/oLMX Y59EolNNJf9U/uTcleew6T4AevfDxT7x0em2vD7/7tAHl1hyepaF9mbPWQ3Amc8YsC+rLY NMKNgczJEpcGPVOlrZsP2ZwLwboqe/Xu40PtC/6cUncAQQ/lpcMio4sFUQ927btsWBAyHV 5510zcoFdWrUgHPo33+zN7Y1TOtyCWD3cQkXJ/iUDIoFIhRqH0HWAD/esurI9TXor2KgyB E8XnPB3Ouy6pom3UvSIcnXV3vCmHK8Nj4+G49g6bJ92GtEs7mBGngTJIFfgWzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114702; a=rsa-sha256; cv=none; b=LE3gIOqYvZrd+bSECGxdHECHYS+dXhn/aTXAUCVmFBUsXt3QXlBz+0DoptjR6pk9M9m4eU 6DeQLLUpjF/8n744CatmSEjTQVa4QgTJPwQ2w87KpqtrfWiZ7CMKFdTbiVTBqeWwdIms55 p6wCgStRktlsfvSVQeGyk6uivLmOw6qHsXukU5usL/eouGj9mZC7l44x70vBURfp7Q/k+7 sl/1hGlpJGJUZStw/+0hdBf75wcNukyef7xIsU17Db+F7YgolRbaDTqIIInPoaL7PhE4BB G8nRz1K5o/SibwQSnz71Wv0oeUgoSIkJGBcq8vafJnlL7DrSDJEvt2XCfGdccw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114702; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=52zgHz7wW4+rwAIWq63UKE4v3g3xVo84KY65nCVkLF0=; b=wTZ47ftiNua/sJ/WrAys16+YrJ/uGe2Djh/LKIwD0ZHAvHLXRgVXKmI5Q7LqR9VgZNzDNW zYECKaGanyFARVSrcsJjsI7oB9faHPzRRDzHPFI5NSCojy046VZMjnBSjlr+H5n3JkMD2x pDjrW8xxG+Ad+/Hhm2FcTfXcsQjRs/lt6A5W00nzpCy1oy16bIavwB2qvhM5uB5hy9yoTU rwaGDVXkst7IfHgE3Bb+YbbrSoIBgXidr6K6M808Q2J18g1f2jlB5+jJCkeXJ+2mR4y3Wc PCdTJR3SXc17j6WiodtOaZrMtPXOj4B5ayhRZqutRySbkXt61CWq+XgYVAXMHA== 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 4RhTht297pz1BKK; Thu, 7 Sep 2023 19:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387JP2eW064733; Thu, 7 Sep 2023 19:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JP2uR064730; Thu, 7 Sep 2023 19:25:02 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:25:02 GMT Message-Id: <202309071925.387JP2uR064730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 84983bf36458 - stable/13 - snmp_pf: use libpfctl's pfctl_get_status() rather than DIOCGETSTATUS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 84983bf36458ea94a6e07492db4aab4a77e4bbed Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=84983bf36458ea94a6e07492db4aab4a77e4bbed commit 84983bf36458ea94a6e07492db4aab4a77e4bbed Author: Kristof Provost AuthorDate: 2023-08-29 15:16:19 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:23:07 +0000 snmp_pf: use libpfctl's pfctl_get_status() rather than DIOCGETSTATUS Prefer libpfctl functions over direct access to the ioctl whenever possible. This will allow subsequent removal of DIOCGETSTATUS (in 15) as there already is an nvlist-based alternative. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41650 (cherry picked from commit 6fbb9fbf7d659574512d706912e8fd0576b13573) --- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 74 ++++++++++++++++--------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index 134c05171749..a5786007d3f4 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -54,7 +54,7 @@ static int dev = -1; static int started; static uint64_t pf_tick; -static struct pf_status pfs; +static struct pfctl_status *pfs; enum { IN, OUT }; enum { IPV4, IPV6 }; @@ -166,18 +166,18 @@ pf_status(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfStatusRunning: - val->v.uint32 = pfs.running; + val->v.uint32 = pfs->running; break; case LEAF_pfStatusRuntime: - runtime = (pfs.since > 0) ? - time(NULL) - pfs.since : 0; + runtime = (pfs->since > 0) ? + time(NULL) - pfs->since : 0; val->v.uint32 = runtime * 100; break; case LEAF_pfStatusDebug: - val->v.uint32 = pfs.debug; + val->v.uint32 = pfs->debug; break; case LEAF_pfStatusHostId: - sprintf(str, "0x%08x", ntohl(pfs.hostid)); + sprintf(str, "0x%08x", ntohl(pfs->hostid)); return (string_get(val, str, strlen(str))); default: @@ -205,22 +205,22 @@ pf_counter(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfCounterMatch: - val->v.counter64 = pfs.counters[PFRES_MATCH]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_MATCH); break; case LEAF_pfCounterBadOffset: - val->v.counter64 = pfs.counters[PFRES_BADOFF]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_BADOFF); break; case LEAF_pfCounterFragment: - val->v.counter64 = pfs.counters[PFRES_FRAG]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_FRAG); break; case LEAF_pfCounterShort: - val->v.counter64 = pfs.counters[PFRES_SHORT]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_SHORT); break; case LEAF_pfCounterNormalize: - val->v.counter64 = pfs.counters[PFRES_NORM]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_NORM); break; case LEAF_pfCounterMemDrop: - val->v.counter64 = pfs.counters[PFRES_MEMORY]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_MEMORY); break; default: @@ -248,19 +248,19 @@ pf_statetable(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfStateTableCount: - val->v.uint32 = pfs.states; + val->v.uint32 = pfs->states; break; case LEAF_pfStateTableSearches: val->v.counter64 = - pfs.fcounters[FCNT_STATE_SEARCH]; + pfctl_status_fcounter(pfs, FCNT_STATE_SEARCH); break; case LEAF_pfStateTableInserts: val->v.counter64 = - pfs.fcounters[FCNT_STATE_INSERT]; + pfctl_status_fcounter(pfs, FCNT_STATE_INSERT); break; case LEAF_pfStateTableRemovals: val->v.counter64 = - pfs.fcounters[FCNT_STATE_REMOVALS]; + pfctl_status_fcounter(pfs, FCNT_STATE_REMOVALS); break; default: @@ -288,19 +288,19 @@ pf_srcnodes(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfSrcNodesCount: - val->v.uint32 = pfs.src_nodes; + val->v.uint32 = pfs->src_nodes; break; case LEAF_pfSrcNodesSearches: val->v.counter64 = - pfs.scounters[SCNT_SRC_NODE_SEARCH]; + pfctl_status_scounter(pfs, SCNT_SRC_NODE_SEARCH); break; case LEAF_pfSrcNodesInserts: val->v.counter64 = - pfs.scounters[SCNT_SRC_NODE_INSERT]; + pfctl_status_scounter(pfs, SCNT_SRC_NODE_INSERT); break; case LEAF_pfSrcNodesRemovals: val->v.counter64 = - pfs.scounters[SCNT_SRC_NODE_REMOVALS]; + pfctl_status_scounter(pfs, SCNT_SRC_NODE_REMOVALS); break; default: @@ -461,51 +461,51 @@ pf_logif(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfLogInterfaceName: - strlcpy(str, pfs.ifname, sizeof str); + strlcpy(str, pfs->ifname, sizeof str); return (string_get(val, str, strlen(str))); case LEAF_pfLogInterfaceIp4BytesIn: - val->v.counter64 = pfs.bcounters[IPV4][IN]; + val->v.counter64 = pfs->bcounters[IPV4][IN]; break; case LEAF_pfLogInterfaceIp4BytesOut: - val->v.counter64 = pfs.bcounters[IPV4][OUT]; + val->v.counter64 = pfs->bcounters[IPV4][OUT]; break; case LEAF_pfLogInterfaceIp4PktsInPass: val->v.counter64 = - pfs.pcounters[IPV4][IN][PF_PASS]; + pfs->pcounters[IPV4][IN][PF_PASS]; break; case LEAF_pfLogInterfaceIp4PktsInDrop: val->v.counter64 = - pfs.pcounters[IPV4][IN][PF_DROP]; + pfs->pcounters[IPV4][IN][PF_DROP]; break; case LEAF_pfLogInterfaceIp4PktsOutPass: val->v.counter64 = - pfs.pcounters[IPV4][OUT][PF_PASS]; + pfs->pcounters[IPV4][OUT][PF_PASS]; break; case LEAF_pfLogInterfaceIp4PktsOutDrop: val->v.counter64 = - pfs.pcounters[IPV4][OUT][PF_DROP]; + pfs->pcounters[IPV4][OUT][PF_DROP]; break; case LEAF_pfLogInterfaceIp6BytesIn: - val->v.counter64 = pfs.bcounters[IPV6][IN]; + val->v.counter64 = pfs->bcounters[IPV6][IN]; break; case LEAF_pfLogInterfaceIp6BytesOut: - val->v.counter64 = pfs.bcounters[IPV6][OUT]; + val->v.counter64 = pfs->bcounters[IPV6][OUT]; break; case LEAF_pfLogInterfaceIp6PktsInPass: val->v.counter64 = - pfs.pcounters[IPV6][IN][PF_PASS]; + pfs->pcounters[IPV6][IN][PF_PASS]; break; case LEAF_pfLogInterfaceIp6PktsInDrop: val->v.counter64 = - pfs.pcounters[IPV6][IN][PF_DROP]; + pfs->pcounters[IPV6][IN][PF_DROP]; break; case LEAF_pfLogInterfaceIp6PktsOutPass: val->v.counter64 = - pfs.pcounters[IPV6][OUT][PF_PASS]; + pfs->pcounters[IPV6][OUT][PF_PASS]; break; case LEAF_pfLogInterfaceIp6PktsOutDrop: val->v.counter64 = - pfs.pcounters[IPV6][OUT][PF_DROP]; + pfs->pcounters[IPV6][OUT][PF_DROP]; break; default: @@ -1286,9 +1286,10 @@ pfs_refresh(void) if (started && this_tick <= pf_tick) return (0); - bzero(&pfs, sizeof(struct pf_status)); + pfctl_free_status(pfs); + pfs = pfctl_get_status(dev); - if (ioctl(dev, DIOCGETSTATUS, &pfs)) { + if (pfs == NULL) { syslog(LOG_ERR, "pfs_refresh(): ioctl(): %s", strerror(errno)); return (-1); @@ -1755,6 +1756,9 @@ pf_fini(void) l1 = l2; } + pfctl_free_status(pfs); + pfs = NULL; + close(dev); return (0); } From nobody Thu Sep 7 19:25:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhThw2xt4z4sG2h; Thu, 7 Sep 2023 19:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhThv4bm8z3dTH; Thu, 7 Sep 2023 19:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rh8ZnuaCdLpk3JTaHpRE1/Y+2IrgS6RGqEvIe/bzoJo=; b=fzV+5LUxpDVRv/IDMsh7/GZ39vKDA7pJCwdQuqpYwlNsAriI1Z6Rhn7Szb+UdZxkEoOU8e eS51WZq/S7bgKcKjic9Rmf8s8/u1LcIaz+H4s/cQmI7I4SX1zKt6kwhbxTicu8DIb7XYKQ MYuONeaozOBYnmXIlGRd7ujn2r+dVCpOWgmvuxKyb3WwXE8C1IU0MWtkqLhsQZYtGQqlw1 31pn823bYbCUL4OIKQTTq9S6Cn5C72X+Ya2yaf2UatoL/XanIY0RN93rsy2qWrfqYAgBSu mIWaE1g72VSfpOu5FZci6AsJskiZ8GuWr1v4TyueqKgIhKC2Fz4PYwSpec5Lmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114703; a=rsa-sha256; cv=none; b=C2yJV7LMX1C3ky7AM/XAF887kubqj6Ozpgg7HL4nUgB+TrIXBVyTh2g2CeUa0Hu/A+9n83 dqy91nx6CQf1NO57PYGHL6SsA5+yDPYCza6QSik5r29hJaiqD+qOeQpgm6GDzWaNi+IcpW nLaceBrKu+RFDHMwwD8NlcZaDJ/jJ0jbzDeyEGto2FDM8WHyxV0RWXyCmVXFHThFrBfmmg YNP2Bw5o0vinAiRXpB1Y5aZ2Anwozagle1QOpBKcnyM0WaqEJKez2A/5+pHbB9gQ/AMaAF pDmyqpkKYmlD5xB0g0LERsg0tgj4Qv8ai1cIOA12dZzu0ph5jLgZJvyclyESKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rh8ZnuaCdLpk3JTaHpRE1/Y+2IrgS6RGqEvIe/bzoJo=; b=Ne95aIM3Xtz7j2VQDnl74xklGwKeJElzOExjCxITUbfLqWnjFuWQAKcL4g+0BWKoMfoHiU C/AOf42e5Y45ofuYaMzCsZJRRugoTaCle6Xfb1IY/OBjOUYj7Dv5hKMLMo1O+Q4PyTmDL1 DQHUfNhf7ohVdpZzJnmyMKxgoZ/++Yl4QylYCvoc7aHRabcQg8c4b6U3S39hBeSFvBQe2g S4ebGa9oozoBy6fT2yvICxl7GQ5KSgPvcmDDYT00ststtwvCyjV9RUj9WX6ZbP5V1y3clT id2ZTlSb+gNPnX0a16lzTG3Oz+9fze7Z79IsA+4+wBSHssMexrKg4QqO38rDJw== 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 4RhThv37Ngz1BN2; Thu, 7 Sep 2023 19:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387JP3iu064782; Thu, 7 Sep 2023 19:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JP39d064779; Thu, 7 Sep 2023 19:25:03 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:25:03 GMT Message-Id: <202309071925.387JP39d064779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 55be69175311 - stable/13 - mcast: fix memory leak in imf_purge() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 55be6917531157259d273cc5e698e797865dd0b4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=55be6917531157259d273cc5e698e797865dd0b4 commit 55be6917531157259d273cc5e698e797865dd0b4 Author: Kristof Provost AuthorDate: 2023-08-29 09:33:17 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:23:07 +0000 mcast: fix memory leak in imf_purge() The IGMP code buffers packets in the imf_inm->inm_scq mbufq, but does not clear this queue when struct in_mfilter is freed by imf_purge(). This can cause memory leaks if IGMPv3 is used. Purge the mbufq on imf_purge(). MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41629 (cherry picked from commit fa03d37432caf17d56a931a9e6f5d9b06f102c5b) --- sys/netinet/in_mcast.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index da5a23541c17..a78363da43e0 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -920,6 +920,8 @@ imf_purge(struct in_mfilter *imf) imf->imf_st[0] = imf->imf_st[1] = MCAST_UNDEFINED; KASSERT(RB_EMPTY(&imf->imf_sources), ("%s: imf_sources not empty", __func__)); + if (imf->imf_inm != NULL) + mbufq_drain(&imf->imf_inm->inm_scq); } /* From nobody Thu Sep 7 19:27:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhTlB65KCz4sGvV; Thu, 7 Sep 2023 19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhTlB5dsKz3fxR; Thu, 7 Sep 2023 19: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=1694114822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpdU8THBACiVJ0klJ6sWwnldrTStUT0D8doVaZDsajk=; b=vxmzRS3VTuRV4aNLIWSZYvCcc6VFXrfWVmwZ20gBxB71RnDhAL4dGe9kPeCza0vsftseU1 yCjG/9EBmbk6Xa6ZzrmVjSEU6WrxAIJ93U0olEBzNySzo+BXkXcem5AREv/V2LaQ+FNfcr 7mN6lvoUf8sQd7JKr/Q0QbmXY8mMd0xxf9hWzEagr17Z88a6EsIA+RuwewIUiLtL74nwM0 m3hXaa4r4ZjXWwNTcEX1lE+pYwwmnBfOuOZHuy2Atye1/7hlin7+m9kJP2FJLecKM1WOMU MuSlJuLQqtJgwWlBqMYzRQJ/2PYOmQRlzqTm3mzcBUm2G+YpiK9ucVokMlebbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114822; a=rsa-sha256; cv=none; b=O9dIVsPsgfWzYjD+S/bmU7904TxV5b1piX6lk8FwLIhhRhWYfZy/Kq64YnWidA7hxDlRnv Xh8wQaIGNRIHOiMqb/ZfitqUi6mKxp5hfrART6owC+qfaQ2epNU8elJqVYGk1YGxNjKoJ2 dTE1AlUopqaat9adt/ojqtikTiMErzkuaFA1/AQjtjv5KmbCKZyvIPYPjJ9ijf2rljTVIb lv6liRypditlAe25uyrcoEebR01i/C7/3Z9pZqERPTvmbXrU59DCd1yyUPvijdEq3Zee8J FljPtNYWPGbnxmHbbBo/49J72OY9HvTiB1uIe2qpfOrGlEHGlP2+fFrFGPnlOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DpdU8THBACiVJ0klJ6sWwnldrTStUT0D8doVaZDsajk=; b=hcQ1rsdW58U65y1Z334sMZRnWEz8kfhVNyGzZLiGn+6NJJjBeFywZy+GFO6i6busr5bgKs PizR2IISQSEycbizJs6WKNbe8I2NNGZm5WyozXjdGyTzndvcpY/optb/VYdvv8u1pWBKBy RlQiDuwbW/3pN/5bN2LUw8n8oI93O8IoUeKIW2CRDFnTfm9Uq78h3axxpupVwgCCd4jj64 LJXDdnNMFpzSRW6OpOsMAGPwHxLnUnWwLXWHGh+ky1hFeHfTO3kqoS5oFYW20Py2yHlX4S A31nvr5FJ1MuM6KtI1EtXX/waRcJmB/98vTXhCFy0mphRCV5PwIraIR7/DA7nw== 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 4RhTlB4l4Xz1BN4; Thu, 7 Sep 2023 19:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387JR2Gm065276; Thu, 7 Sep 2023 19:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JR2W6065273; Thu, 7 Sep 2023 19:27:02 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:27:02 GMT Message-Id: <202309071927.387JR2W6065273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 70323196c2b1 - stable/14 - vmxnet3: do restart on VLAN changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70323196c2b1969a69b5888519d0375882fc8ca9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=70323196c2b1969a69b5888519d0375882fc8ca9 commit 70323196c2b1969a69b5888519d0375882fc8ca9 Author: Kristof Provost AuthorDate: 2023-08-31 07:32:54 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:26:05 +0000 vmxnet3: do restart on VLAN changes At least one user reports issues with vmx interfaces after 725e4008ef, where we default to not resetting the interface on VLAN changes. This was on an ESXi 7.0.3 setup. Reported by: Marcos Mendoza MFC after: 1 week Approved by: re (gjb) Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 8c1274138a20ee2342c4f217adb605e3abc14042) --- sys/dev/vmware/vmxnet3/if_vmx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index 2c3530a217f3..fdcad0dd4bba 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -2513,6 +2513,7 @@ vmxnet3_if_needs_restart(if_ctx_t ctx __unused, enum iflib_restart_event event) { switch (event) { case IFLIB_RESTART_VLAN_CONFIG: + return (true); default: return (false); } From nobody Thu Sep 7 19:27:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhTlD0Jf5z4sGdx; Thu, 7 Sep 2023 19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhTlC6pcxz3g2k; Thu, 7 Sep 2023 19: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=1694114824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0cmaCma/cxQMWQsZPWfpPa8AMFlFUzYZu0Okc4hQRI=; b=vK9LBegglYF6h3gz9i78fIg/OEpFKKS8ndWflfbynCIDtW3w8IOUVMJdiPknGU90W+RnC4 di2wsx5cNLqmzjHG0NaaL5lxRSy2EG4O079ktqyEcWRir5XTvKUtlAtu4u87NoXc1gYzCF +ZfoNoIF3uOEuOBDZuO1r/pn/PpNKXX8AaBwtynTQmezAEDvFX8IqMCz6agJxEAIuu/5d0 Yu0Lxo6IDq8FPIn7ebt5lyIrHW50PK2muFMqQ+DdvGKssrxwwQWD9PJcwgJPTawYnzjLbN ycKOj6E9MLba4dHUC9Ar7dksI6d9OD6OxSJYJJHGwMntnwqpRiljwv0OFRtaUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694114824; a=rsa-sha256; cv=none; b=iGjFz7Vj3ZhTXkJM4eI4uZj0s/7UryPMPXACGU2h9Cies9G6HS/IK0zdgs5x9XOMt+6ErS sKYNxuUe5864cfAJiCVykPYYBmG+rx9DuaJ1GUzSYdLuTcQB6+behAtyYBGTSRe635J2rY Dztex84Ho688ZYJKN2sJsyV0benUmlM7ZR8O5V9ISDlBOQPdwYopourxUxk5BCiYUsLDrp ZP9vn2Fv45OgLxPPD1de9zPPsaduuNCPeahAxgVfcp+VD+htGAuZO4ieB4ny5N1Kdo6Rwc 3f8Hy5P/OECsnLfh3IWX+1kOjMiscC1UvaFTQnJEGTWRkkSi5F3apaKaLRamvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694114824; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P0cmaCma/cxQMWQsZPWfpPa8AMFlFUzYZu0Okc4hQRI=; b=q4HVoJkpyzPBf9MiEGnlg8tbFLvRCbcxXl5G1ThBNB3ztQ8E7dpO+ELIPjHjBts3JLzwaG jhEFaHyLe34Elq81jruRowzPnmg8agzQ/8Uy4LHjx3BZZjPfnFtmOQ/Il9q+D5ui/x5r/u tjO4uQAPy30DwUMesVd5BJpG3ouYEgfBZrk7BW2F9c4XrtbbM9X9NfeqAoBlN2A9XKnT0b Lv3fHPlInU92GzzZhipTc63GSmRQcRZAMSANVtTtZUYtCbSlGx65pAMJk768v7VOQr5MFU MVNLNmz+TMjr7O5sFn5pEVwEXdXF/JrszSDjcTkstVNNRfLrsP5i5ILbLTYFRQ== 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 4RhTlC5kZjz1BYX; Thu, 7 Sep 2023 19:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387JR3BY065323; Thu, 7 Sep 2023 19:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387JR3kU065320; Thu, 7 Sep 2023 19:27:03 GMT (envelope-from git) Date: Thu, 7 Sep 2023 19:27:03 GMT Message-Id: <202309071927.387JR3kU065320@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 70fbe797c0f6 - stable/14 - mcast: fix memory leak in imf_purge() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70fbe797c0f6806d51708a9ef96ee02cb0c6d10d Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=70fbe797c0f6806d51708a9ef96ee02cb0c6d10d commit 70fbe797c0f6806d51708a9ef96ee02cb0c6d10d Author: Kristof Provost AuthorDate: 2023-08-29 09:33:17 +0000 Commit: Kristof Provost CommitDate: 2023-09-07 19:26:07 +0000 mcast: fix memory leak in imf_purge() The IGMP code buffers packets in the imf_inm->inm_scq mbufq, but does not clear this queue when struct in_mfilter is freed by imf_purge(). This can cause memory leaks if IGMPv3 is used. Purge the mbufq on imf_purge(). MFC after: 1 week Approved by: re (gjb) Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41629 (cherry picked from commit fa03d37432caf17d56a931a9e6f5d9b06f102c5b) --- sys/netinet/in_mcast.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c index 827b8f96b07e..362e3f25115c 100644 --- a/sys/netinet/in_mcast.c +++ b/sys/netinet/in_mcast.c @@ -915,6 +915,8 @@ imf_purge(struct in_mfilter *imf) imf->imf_st[0] = imf->imf_st[1] = MCAST_UNDEFINED; KASSERT(RB_EMPTY(&imf->imf_sources), ("%s: imf_sources not empty", __func__)); + if (imf->imf_inm != NULL) + mbufq_drain(&imf->imf_inm->inm_scq); } /* From nobody Thu Sep 7 20:28:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6P1Wyjz4ssyN; Thu, 7 Sep 2023 20:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6P1MHBz4Zb7; Thu, 7 Sep 2023 20:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWOUjToFUFSYgqCochP1Jfwvo0h/jN7UjjRozwDmFKI=; b=cateUUmKvW/JEeY4Pdi11MZXhNvU6/aB5DdPAnSnBXa3Xntzp6qQvgigUuhFWlJd+ACDE/ mgClj68GLLmcYDRNmzBnHqgvB8rZ6yE3D8kDjVPX1eqxUt8TAfEn8x2LmBPwevMcSEx/wD 7IZynnhsJwqzqVtDP5TI5hvEqUt4uZO1CgxWy3g2kLZE9vp0UgQ/PD6H/BC9/PxDniwoOj 3clbMHfQNhs9zOZpPxHYVBW/jJ1XzL+LTq0uXd1JZghzDEGz3FQumm5FATkKte8noU4GBV eMSrnu8YZF/wNAfH3Jt/qsCOWE6tldWrjVH7JBad89dYo7Pmm12h5XsmZ3EQ4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118525; a=rsa-sha256; cv=none; b=jRvvvPFMz13IdzScxjIDdDlHsXQwqoJAY6R9GGI9gxY5dPxwqgSTwDZ+Lsocq126Wuz3Lw hk4eSLTJClxmaPnFQBpW7ZwVQavWhPQoUR5mw95EHsEXhZKkHRwod0AZnj6L/l56HLxZHa aYkkiI/jF3T+unqZe/ZLIwPGtwyrBRyFSFtsHtSrMYycTebUr4SqvTJzJsynlyUWM7rJLG Atg3Ri8KqgppgkETMkxESXZxoywlnmQUJ6AKCAzULDzIzdzsOOWxptYhtfAoQZ4JepliZ3 9THzqCSMF3T90pwJnmmr4pnAo7DhqCwy4yC6eBYgV3D9IAo9uMZ5n/gQ0zv/lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xWOUjToFUFSYgqCochP1Jfwvo0h/jN7UjjRozwDmFKI=; b=D5C7RUYfNhKStLL0EmW6b9HoJflKfeDkPy+w2fm/JQ2oIpHoeo+0plpL744Q/1UCBDLo6t UZJT9TvDWIbflNsNuSJ42GjJHx2ps1+UCIuyGjTxYCjOryVg2gx8OlsZSLZ8c/SPAiHWVb 7lFrWltIbTuEzC8oCNCdPwRFHRHDJKjBl7DqC4CwB4jmHWtWmIhG4Ti+UgDOBQCTC55eSU pC4Z0CnHAbUSuxSagvgmS0RP9jiE+shNwRR7hDMTqNWR21ve92Ry/Ny0JzbnnIQTLm6fPs /vt30pB4vg2FAzMdipGyrX7xz30Zkt1CLmqwjJijG7j5+9GAUJcM/+4WOKgVhQ== 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 4RhW6P0Mjxz1Cs7; Thu, 7 Sep 2023 20:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSjnx064525; Thu, 7 Sep 2023 20:28:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSjrr064522; Thu, 7 Sep 2023 20:28:45 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:45 GMT Message-Id: <202309072028.387KSjrr064522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: bae932999e0f - stable/14 - libc: Implement N2630. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bae932999e0fa9e9a08d84ca992332c57e5b42be Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=bae932999e0fa9e9a08d84ca992332c57e5b42be commit bae932999e0fa9e9a08d84ca992332c57e5b42be Author: Dag-Erling Smørgrav AuthorDate: 2023-08-28 15:32:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:30 +0000 libc: Implement N2630. This adds formatted input/output of binary integer numbers to the printf(), scanf(), and strtol() families, including their wide-character counterparts. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41511 (cherry picked from commit d9dc1603d6e48cca84cad3ebe859129131b8387c) libc: Add unit tests for N2630 and possible collateral damage. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41512 (cherry picked from commit b9385720f34b536ef2568a642e8b1fad0450056f) libc: Document support for binary integers. Reviewed by: debdrup, emaste Differential Revision: https://reviews.freebsd.org/D41522 (cherry picked from commit 76edfabbecdec686a570b8e009d5ea4112f943e0) libc: Fix fixed-width case in the new integer parser. Fixes: d9dc1603d6e4 Differential Revision: https://reviews.freebsd.org/D41622 (cherry picked from commit aca3bd1602577591e5cd237c4bb0bb71b3be0c75) libc: Add a wide version of snprintf_test. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41726 (cherry picked from commit 4ec9ee9912765ac4ca57353999caa92a23283d8e) libc: Suppress format checks on printf() / scanf() tests. Reviewed by: jrtc27, markj, emaste Differential Revision: https://reviews.freebsd.org/D41727 (cherry picked from commit 294bd2827e61a78041f6613f4b82235fcc454157) Approved by: re (gjb) --- contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c | 6 + lib/libc/iconv/_strtol.h | 7 + lib/libc/iconv/_strtoul.h | 7 + lib/libc/locale/wcstoimax.c | 7 + lib/libc/locale/wcstol.c | 7 + lib/libc/locale/wcstoll.c | 7 + lib/libc/locale/wcstoul.c | 7 + lib/libc/locale/wcstoull.c | 7 + lib/libc/locale/wcstoumax.c | 7 + lib/libc/stdio/printf.3 | 34 ++- lib/libc/stdio/printfcommon.h | 14 ++ lib/libc/stdio/scanf.3 | 29 ++- lib/libc/stdio/vfprintf.c | 13 ++ lib/libc/stdio/vfscanf.c | 267 +++++++++++++----------- lib/libc/stdio/vfwprintf.c | 13 ++ lib/libc/stdio/vfwscanf.c | 263 +++++++++++++---------- lib/libc/stdlib/strtoimax.c | 7 + lib/libc/stdlib/strtol.3 | 4 +- lib/libc/stdlib/strtol.c | 7 + lib/libc/stdlib/strtoll.c | 12 +- lib/libc/stdlib/strtoul.3 | 4 +- lib/libc/stdlib/strtoul.c | 7 + lib/libc/stdlib/strtoull.c | 7 + lib/libc/stdlib/strtoumax.c | 7 + lib/libc/tests/stdio/Makefile | 12 +- lib/libc/tests/stdio/snprintf_test.c | 139 ++++++++++++ lib/libc/tests/stdio/sscanf_test.c | 266 +++++++++++++++++++++++ lib/libc/tests/stdio/swprintf_test.c | 140 +++++++++++++ lib/libc/tests/stdio/swscanf_test.c | 267 ++++++++++++++++++++++++ 29 files changed, 1315 insertions(+), 259 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c b/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c index 54e190760656..d1027fcc7bb1 100644 --- a/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c +++ b/contrib/netbsd-tests/lib/libc/stdlib/t_strtol.c @@ -94,6 +94,12 @@ ATF_TC_BODY(strtol_base, tc) { "01234567", 342391, 0, NULL }, { "0123456789", 123456789, 10, NULL }, { "0x75bcd15", 123456789, 0, NULL }, +#ifdef __FreeBSD__ + { "0x", 0, 0, "x" }, + { "0b111010110111100110100010101", 123456789, 0, NULL }, + { "0b0123", 1, 0, "23" }, + { "0b", 0, 0, "b" }, +#endif }; long long int lli; diff --git a/lib/libc/iconv/_strtol.h b/lib/libc/iconv/_strtol.h index d183edbe8c3a..94a13c56db98 100644 --- a/lib/libc/iconv/_strtol.h +++ b/lib/libc/iconv/_strtol.h @@ -91,6 +91,13 @@ _FUNCNAME(const char *nptr, char **endptr, int base) s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == '0' && (*s == 'b' || *s == 'B') && + (s[1] >= '0' && s[1] <= '1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = (c == '0' ? 8 : 10); diff --git a/lib/libc/iconv/_strtoul.h b/lib/libc/iconv/_strtoul.h index eade72e9c2e6..4944e1fb06e0 100644 --- a/lib/libc/iconv/_strtoul.h +++ b/lib/libc/iconv/_strtoul.h @@ -87,6 +87,13 @@ _FUNCNAME(const char *nptr, char **endptr, int base) s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == '0' && (*s == 'b' || *s == 'B') && + (s[1] >= '0' && s[1] <= '1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = (c == '0' ? 8 : 10); diff --git a/lib/libc/locale/wcstoimax.c b/lib/libc/locale/wcstoimax.c index 259faa2b011c..5ed949cd0531 100644 --- a/lib/libc/locale/wcstoimax.c +++ b/lib/libc/locale/wcstoimax.c @@ -86,6 +86,13 @@ wcstoimax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == L'0' && (*s == L'b' || *s == L'B') && + (s[1] >= L'0' && s[1] <= L'1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = c == L'0' ? 8 : 10; acc = any = 0; diff --git a/lib/libc/locale/wcstol.c b/lib/libc/locale/wcstol.c index b0b787384f39..1678b615ca1c 100644 --- a/lib/libc/locale/wcstol.c +++ b/lib/libc/locale/wcstol.c @@ -80,6 +80,13 @@ wcstol_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, int s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == L'0' && (*s == L'b' || *s == L'B') && + (s[1] >= L'0' && s[1] <= L'1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = c == L'0' ? 8 : 10; acc = any = 0; diff --git a/lib/libc/locale/wcstoll.c b/lib/libc/locale/wcstoll.c index ac07d6c6adbf..ef1e6ef58861 100644 --- a/lib/libc/locale/wcstoll.c +++ b/lib/libc/locale/wcstoll.c @@ -86,6 +86,13 @@ wcstoll_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == L'0' && (*s == L'b' || *s == L'B') && + (s[1] >= L'0' && s[1] <= L'1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = c == L'0' ? 8 : 10; acc = any = 0; diff --git a/lib/libc/locale/wcstoul.c b/lib/libc/locale/wcstoul.c index 9f58db799c0e..2c9c8820b1f6 100644 --- a/lib/libc/locale/wcstoul.c +++ b/lib/libc/locale/wcstoul.c @@ -80,6 +80,13 @@ wcstoul_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == L'0' && (*s == L'b' || *s == L'B') && + (s[1] >= L'0' && s[1] <= L'1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = c == L'0' ? 8 : 10; acc = any = 0; diff --git a/lib/libc/locale/wcstoull.c b/lib/libc/locale/wcstoull.c index cbc7253f884d..692eb90eef6b 100644 --- a/lib/libc/locale/wcstoull.c +++ b/lib/libc/locale/wcstoull.c @@ -86,6 +86,13 @@ wcstoull_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == L'0' && (*s == L'b' || *s == L'B') && + (s[1] >= L'0' && s[1] <= L'1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = c == L'0' ? 8 : 10; acc = any = 0; diff --git a/lib/libc/locale/wcstoumax.c b/lib/libc/locale/wcstoumax.c index 4380cccf2424..c4f2ec3aaf41 100644 --- a/lib/libc/locale/wcstoumax.c +++ b/lib/libc/locale/wcstoumax.c @@ -86,6 +86,13 @@ wcstoumax_l(const wchar_t * __restrict nptr, wchar_t ** __restrict endptr, s += 2; base = 16; } + if ((base == 0 || base == 2) && + c == L'0' && (*s == L'b' || *s == L'B') && + (s[1] >= L'0' && s[1] <= L'1')) { + c = s[1]; + s += 2; + base = 2; + } if (base == 0) base = c == L'0' ? 8 : 10; acc = any = 0; diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index 3e5c6ca23511..110851e2a421 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -31,7 +31,7 @@ .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 .\" -.Dd May 22, 2018 +.Dd August 21, 2023 .Dt PRINTF 3 .Os .Sh NAME @@ -212,6 +212,17 @@ and .Cm u conversions, this option has no effect. For +.Cm b +and +.Cm B +conversions, a non-zero result has the string +.Ql 0b +(or +.Ql 0B +for +.Cm B +conversions) prepended to it. +For .Cm o conversions, the precision of the number is increased to force the first character of the output string to a zero. @@ -245,7 +256,7 @@ For all conversions except .Cm n , the converted value is padded on the left with zeros rather than blanks. If a precision is given with a numeric conversion -.Cm ( d , i , o , u , i , x , +.Cm ( b , B , d , i , o , u , i , x , and .Cm X ) , the @@ -301,7 +312,7 @@ followed by an optional digit string. If the digit string is omitted, the precision is taken as zero. This gives the minimum number of digits to appear for -.Cm d , i , o , u , x , +.Cm b , B , d , i , o , u , x , and .Cm X conversions, the number of digits to appear after the decimal-point for @@ -319,12 +330,12 @@ conversions. .It An optional length modifier, that specifies the size of the argument. The following length modifiers are valid for the -.Cm d , i , n , o , u , x , +.Cm b , B , d , i , n , o , u , x , or .Cm X conversion: .Bl -column ".Cm q Em (deprecated)" ".Vt signed char" ".Vt unsigned long long" ".Vt long long *" -.It Sy Modifier Ta Cm d , i Ta Cm o , u , x , X Ta Cm n +.It Sy Modifier Ta Cm d , i Ta Cm b , B , o , u , x , X Ta Cm n .It Cm hh Ta Vt "signed char" Ta Vt "unsigned char" Ta Vt "signed char *" .It Cm h Ta Vt short Ta Vt "unsigned short" Ta Vt "short *" .It Cm l No (ell) Ta Vt long Ta Vt "unsigned long" Ta Vt "long *" @@ -339,7 +350,7 @@ Note: the .Cm t modifier, when applied to a -.Cm o , u , x , +.Cm b , B , o , u , x , or .Cm X conversion, indicates that the argument is of an unsigned type @@ -403,11 +414,16 @@ If a single format directive mixes positional and non-positional arguments, the results are undefined. .Pp The conversion specifiers and their meanings are: -.Bl -tag -width ".Cm diouxX" -.It Cm diouxX +.Bl -tag -width ".Cm bBdiouxX" +.It Cm bBdiouxX The .Vt int -(or appropriate variant) argument is converted to signed decimal +(or appropriate variant) argument is converted to +unsigned binary +.Cm ( b +and +.Cm B ) , +signed decimal .Cm ( d and .Cm i ) , diff --git a/lib/libc/stdio/printfcommon.h b/lib/libc/stdio/printfcommon.h index ac5aed0a5fcd..411b778dc234 100644 --- a/lib/libc/stdio/printfcommon.h +++ b/lib/libc/stdio/printfcommon.h @@ -194,6 +194,13 @@ __ultoa(u_long val, CHAR *endp, int base, int octzero, const char *xdigs) } while (sval != 0); break; + case 2: + do { + *--cp = to_char(val & 1); + val >>= 1; + } while (val); + break; + case 8: do { *--cp = to_char(val & 7); @@ -244,6 +251,13 @@ __ujtoa(uintmax_t val, CHAR *endp, int base, int octzero, const char *xdigs) } while (sval != 0); break; + case 2: + do { + *--cp = to_char(val & 1); + val >>= 1; + } while (val); + break; + case 8: do { *--cp = to_char(val & 7); diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3 index b1c50e10a795..6cefdb133983 100644 --- a/lib/libc/stdio/scanf.3 +++ b/lib/libc/stdio/scanf.3 @@ -31,7 +31,7 @@ .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 .\" -.Dd April 2, 2022 +.Dd August 21, 2023 .Dt SCANF 3 .Os .Sh NAME @@ -141,7 +141,7 @@ The conversion that follows occurs as usual, but no pointer is used; the result of the conversion is simply discarded. .It Cm hh Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -150,7 +150,7 @@ and the next pointer is a pointer to a .Vt int ) . .It Cm h Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -159,7 +159,7 @@ and the next pointer is a pointer to a .Vt int ) . .It Cm l No (ell) Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -185,7 +185,7 @@ and the next pointer is a pointer to an array of .Vt char ) . .It Cm ll No (ell ell) Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -201,7 +201,7 @@ and the next pointer is a pointer to .Vt "long double" . .It Cm j Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -210,7 +210,7 @@ and the next pointer is a pointer to a .Vt int ) . .It Cm t Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -219,7 +219,7 @@ and the next pointer is a pointer to a .Vt int ) . .It Cm z Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -229,7 +229,7 @@ and the next pointer is a pointer to a .It Cm q (deprecated.) Indicates that the conversion will be one of -.Cm dioux +.Cm bdioux or .Cm n and the next pointer is a pointer to a @@ -273,6 +273,10 @@ matches a single input .Ql % character. No conversion is done, and assignment does not occur. +.It Cm b , B +Matches an optionally signed binary integer; +the next pointer must be a pointer to +.Vt "unsigned int" . .It Cm d Matches an optionally signed decimal integer; the next pointer must be a pointer to @@ -281,7 +285,12 @@ the next pointer must be a pointer to Matches an optionally signed integer; the next pointer must be a pointer to .Vt int . -The integer is read in base 16 if it begins +The integer is read +in base 2 if it begins with +.Ql 0b +or +.Ql 0B , +in base 16 if it begins with .Ql 0x or diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index ad655c5d78d4..5e5a9b5e31c1 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -613,6 +613,19 @@ reswitch: switch (ch) { case 'z': flags |= SIZET; goto rflag; + case 'B': + case 'b': + if (flags & INTMAX_SIZE) + ujval = UJARG(); + else + ulval = UARG(); + base = 2; + /* leading 0b/B only if non-zero */ + if (flags & ALT && + (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0)) + ox[1] = ch; + goto nosign; + break; case 'C': flags |= LONGINT; /*FALLTHROUGH*/ diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index cc2e1e428321..9727c9e70c34 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -6,6 +6,8 @@ * * Copyright (c) 2011 The FreeBSD Foundation * + * Copyright (c) 2023 Dag-Erling Smørgrav + * * Portions of this software were developed by David Chisnall * under sponsorship from the FreeBSD Foundation. * @@ -80,16 +82,6 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #define SHORTSHORT 0x4000 /* hh: char */ #define UNSIGNED 0x8000 /* %[oupxX] conversions */ -/* - * The following are used in integral conversions only: - * SIGNOK, NDIGITS, PFXOK, and NZDIGITS - */ -#define SIGNOK 0x40 /* +/- is (still) legal */ -#define NDIGITS 0x80 /* no digits detected */ -#define PFXOK 0x100 /* 0x prefix is (still) legal */ -#define NZDIGITS 0x200 /* no zero digits detected */ -#define HAVESIGN 0x10000 /* sign detected */ - /* * Conversion types. */ @@ -307,129 +299,160 @@ convert_wstring(FILE *fp, wchar_t *wcp, int width, locale_t locale) return (n); } +enum parseint_state { + begin, + havesign, + havezero, + haveprefix, + any, +}; + +static __inline int +parseint_fsm(int c, enum parseint_state *state, int *base) +{ + switch (c) { + case '+': + case '-': + if (*state == begin) { + *state = havesign; + return 1; + } + break; + case '0': + if (*state == begin || *state == havesign) { + *state = havezero; + } else { + *state = any; + } + return 1; + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + if (*state == havezero && *base == 0) { + *base = 8; + } + /* FALL THROUGH */ + case '8': + case '9': + if (*state == begin || + *state == havesign) { + if (*base == 0) { + *base = 10; + } + } + if (*state == begin || + *state == havesign || + *state == havezero || + *state == haveprefix || + *state == any) { + if (*base > c - '0') { + *state = any; + return 1; + } + } + break; + case 'b': + if (*state == havezero) { + if (*base == 0 || *base == 2) { + *state = haveprefix; + *base = 2; + return 1; + } + } + /* FALL THROUGH */ + case 'a': + case 'c': + case 'd': + case 'e': + case 'f': + if (*state == begin || + *state == havesign || + *state == havezero || + *state == haveprefix || + *state == any) { + if (*base > c - 'a' + 10) { + *state = any; + return 1; + } + } + break; + case 'B': + if (*state == havezero) { + if (*base == 0 || *base == 2) { + *state = haveprefix; + *base = 2; + return 1; + } + } + /* FALL THROUGH */ + case 'A': + case 'C': + case 'D': + case 'E': + case 'F': + if (*state == begin || + *state == havesign || + *state == havezero || + *state == haveprefix || + *state == any) { + if (*base > c - 'A' + 10) { + *state = any; + return 1; + } + } + break; + case 'x': + case 'X': + if (*state == havezero) { + if (*base == 0 || *base == 16) { + *state = haveprefix; + *base = 16; + return 1; + } + } + break; + } + return 0; +} + /* - * Read an integer, storing it in buf. The only relevant bit in the - * flags argument is PFXOK. + * Read an integer, storing it in buf. * * Return 0 on a match failure, and the number of characters read * otherwise. */ static __inline int -parseint(FILE *fp, char * __restrict buf, int width, int base, int flags) +parseint(FILE *fp, char * __restrict buf, int width, int base) { - /* `basefix' is used to avoid `if' tests */ - static const short basefix[17] = - { 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }; + enum parseint_state state = begin; char *p; int c; - flags |= SIGNOK | NDIGITS | NZDIGITS; for (p = buf; width; width--) { - c = *fp->_p; - /* - * Switch on the character; `goto ok' if we accept it - * as a part of number. - */ - switch (c) { - - /* - * The digit 0 is always legal, but is special. For - * %i conversions, if no digits (zero or nonzero) have - * been scanned (only signs), we will have base==0. - * In that case, we should set it to 8 and enable 0x - * prefixing. Also, if we have not scanned zero - * digits before this, do not turn off prefixing - * (someone else will turn it off if we have scanned - * any nonzero digits). - */ - case '0': - if (base == 0) { - base = 8; - flags |= PFXOK; - } - if (flags & NZDIGITS) - flags &= ~(SIGNOK|NZDIGITS|NDIGITS); - else - flags &= ~(SIGNOK|PFXOK|NDIGITS); - goto ok; - - /* 1 through 7 always legal */ - case '1': case '2': case '3': - case '4': case '5': case '6': case '7': - base = basefix[base]; - flags &= ~(SIGNOK | PFXOK | NDIGITS); - goto ok; - - /* digits 8 and 9 ok iff decimal or hex */ - case '8': case '9': - base = basefix[base]; - if (base <= 8) - break; /* not legal here */ - flags &= ~(SIGNOK | PFXOK | NDIGITS); - goto ok; - - /* letters ok iff hex */ - case 'A': case 'B': case 'C': - case 'D': case 'E': case 'F': - case 'a': case 'b': case 'c': - case 'd': case 'e': case 'f': - /* no need to fix base here */ - if (base <= 10) - break; /* not legal here */ - flags &= ~(SIGNOK | PFXOK | NDIGITS); - goto ok; - - /* sign ok only as first character */ - case '+': case '-': - if (flags & SIGNOK) { - flags &= ~SIGNOK; - flags |= HAVESIGN; - goto ok; - } + c = __sgetc(fp); + if (c == EOF) break; - - /* - * x ok iff flag still set & 2nd char (or 3rd char if - * we have a sign). - */ - case 'x': case 'X': - if (flags & PFXOK && p == - buf + 1 + !!(flags & HAVESIGN)) { - base = 16; /* if %i */ - flags &= ~PFXOK; - goto ok; - } + if (!parseint_fsm(c, &state, &base)) break; - } - - /* - * If we got here, c is not a legal character for a - * number. Stop accumulating digits. - */ - break; - ok: - /* - * c is legal: store it and look at the next. - */ *p++ = c; - if (--fp->_r > 0) - fp->_p++; - else if (__srefill(fp)) - break; /* EOF */ } /* - * If we had only a sign, it is no good; push back the sign. - * If the number ends in `x', it was [sign] '0' 'x', so push - * back the x and treat it as [sign] '0'. + * If we only had a sign, push it back. If we only had a 0b or 0x + * prefix (possibly preceded by a sign), we view it as "0" and + * push back the letter. In all other cases, if we stopped + * because we read a non-number character, push it back. */ - if (flags & NDIGITS) { - if (p > buf) - (void) __ungetc(*(u_char *)--p, fp); - return (0); - } - c = ((u_char *)p)[-1]; - if (c == 'x' || c == 'X') { - --p; + if (state == havesign) { + p--; + (void) __ungetc(*(u_char *)p, fp); + } else if (state == haveprefix) { + p--; + (void) __ungetc(c, fp); + } else if (width && c != EOF) { (void) __ungetc(c, fp); } return (p - buf); @@ -554,6 +577,13 @@ literal: /* * Conversions. */ + case 'B': + case 'b': + c = CT_INT; + flags |= UNSIGNED; + base = 2; + break; + case 'd': c = CT_INT; base = 10; @@ -578,7 +608,6 @@ literal: case 'X': case 'x': - flags |= PFXOK; /* enable 0x prefixing */ c = CT_INT; flags |= UNSIGNED; base = 16; @@ -613,7 +642,7 @@ literal: break; case 'p': /* pointer format is like hex */ - flags |= POINTER | PFXOK; + flags |= POINTER; c = CT_INT; /* assumes sizeof(uintmax_t) */ flags |= UNSIGNED; /* >= sizeof(uintptr_t) */ base = 16; @@ -738,7 +767,7 @@ literal: width = sizeof(buf) - 2; width++; #endif - nr = parseint(fp, buf, width, base, flags); + nr = parseint(fp, buf, width, base); if (nr == 0) goto match_failure; if ((flags & SUPPRESS) == 0) { diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index fc681e8d0575..259a86467ea7 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -684,6 +684,19 @@ reswitch: switch (ch) { case 'z': flags |= SIZET; goto rflag; + case 'B': + case 'b': + if (flags & INTMAX_SIZE) + ujval = UJARG(); + else + ulval = UARG(); + base = 2; + /* leading 0b/B only if non-zero */ + if (flags & ALT && + (flags & INTMAX_SIZE ? ujval != 0 : ulval != 0)) + ox[1] = ch; + goto nosign; + break; case 'C': flags |= LONGINT; /*FALLTHROUGH*/ diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c index 1a28ff665247..b03c9dba0699 100644 --- a/lib/libc/stdio/vfwscanf.c +++ b/lib/libc/stdio/vfwscanf.c @@ -9,6 +9,8 @@ * * Copyright (c) 2011 The FreeBSD Foundation * + * Copyright (c) 2023 Dag-Erling Smørgrav + * * Portions of this software were developed by David Chisnall * under sponsorship from the FreeBSD Foundation. * @@ -78,16 +80,6 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #define SHORTSHORT 0x4000 /* hh: char */ #define UNSIGNED 0x8000 /* %[oupxX] conversions */ -/* - * The following are used in integral conversions only: - * SIGNOK, NDIGITS, PFXOK, and NZDIGITS - */ -#define SIGNOK 0x40 /* +/- is (still) legal */ -#define NDIGITS 0x80 /* no digits detected */ -#define PFXOK 0x100 /* 0x prefix is (still) legal */ -#define NZDIGITS 0x200 /* no zero digits detected */ -#define HAVESIGN 0x10000 /* sign detected */ - /* * Conversion types. */ @@ -289,128 +281,161 @@ convert_wstring(FILE *fp, wchar_t *wcp, int width, locale_t locale) return (nread); } +enum parseint_state { + begin, + havesign, + havezero, + haveprefix, + any, +}; + +static __inline int +parseint_fsm(wchar_t c, enum parseint_state *state, int *base) +{ + switch (c) { + case '+': + case '-': + if (*state == begin) { + *state = havesign; + return 1; + } + break; + case '0': + if (*state == begin || *state == havesign) { + *state = havezero; + } else { + *state = any; + } + return 1; + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + if (*state == havezero && *base == 0) { + *base = 8; + } + /* FALL THROUGH */ + case '8': + case '9': + if (*state == begin || + *state == havesign) { + if (*base == 0) { + *base = 10; + } + } + if (*state == begin || + *state == havesign || + *state == havezero || + *state == haveprefix || + *state == any) { + if (*base > c - '0') { + *state = any; + return 1; + } + } + break; + case 'b': + if (*state == havezero) { + if (*base == 0 || *base == 2) { + *state = haveprefix; + *base = 2; + return 1; + } + } + /* FALL THROUGH */ + case 'a': + case 'c': + case 'd': + case 'e': + case 'f': + if (*state == begin || + *state == havesign || + *state == havezero || + *state == haveprefix || + *state == any) { + if (*base > c - 'a' + 10) { + *state = any; + return 1; + } + } + break; + case 'B': + if (*state == havezero) { + if (*base == 0 || *base == 2) { + *state = haveprefix; *** 1248 LINES SKIPPED *** From nobody Thu Sep 7 20:28:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6Q45D1z4ssqZ; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6Q33Ywz4ZY5; Thu, 7 Sep 2023 20:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkP3U7R/cas1beWEw12/kOCJdhKfrmX2akI5H4xGXNM=; b=uFwr8JPFxSE7ZFBMW0QTjE1UwyqTW2swXWwpolCP5855ZwUp9JlsY+fEYFJB7ybZ92mqEk wGyqAcJXaOJ0ClBdXGLf+G4iqrM5oYzrQJGjydRUGTh0GGqhBCxppm6mQ9PtdERloQm4m2 G0+IxRj7kYSjMSy7S6M2Eqlx1rlKBoP3SpGAsqrRs41QXqberikjiP8C85VDzv46BHifiu SpxmSSC2ATejVpT/IGo4mXZM3X0jgeqmdV8B7AmWbYyzTYXaSqX0Go+wi11PwK4hkWBA4P 74RnFxS20NwMYQFq0n9PO42ygp7HTXOgiVnud45et2WwhEuxWz3RR3Db6m9o7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118526; a=rsa-sha256; cv=none; b=bpJ89dmPMDpskEv1EKKn8QChM2m6uQu/n+XWENRdzUMb+z0LODOM8zyxKJIrj6VCeK+Mvw Ab1HlnyaJgerwXEC6i4lW+yAapCE2pvSwgq7Upw6Lz/XXthWNPlERvBctumx2lNRLLeSFd fdVTq0ULa3hAAh67xq1WAyTNV6XVljhF/Yj3ulsurAvr463VFxf8E+tEabQgK0+uNujmbN lbAJOtIFNnVU8Q4TPiyZKPyT8ERAzWg7prhKeY/8T/tlzjG1RUo4grFLWQCteIf7hSy5xj m+uLOMW+Kg2cz9O2TXjHNBQ5zDrGgcY30itIv735U+AZw3YkVJWsWd4swWa7bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LkP3U7R/cas1beWEw12/kOCJdhKfrmX2akI5H4xGXNM=; b=vJNfD7rBkK+9dbVR7VPd3Wek9Gf7fbTWovU8OwTdWVloYYs8ijBfGstXl3fkk9RoWtdlUG glxB5jaTnMXI2FcTZ6XjPaOdetUazlRcQwygO43F7h35dDyVPsXUFwhW5ZhYCi8pMq6Kvw 0Xf/Uh9JoaE2u3oK8OW0Eia2wwZT6PEF6cPhlmIU2yLpQmND2HSGmmPdi3r+GjTFNY2wFH 538lZczmRcErTHBh3OC2OznJ0Usir9MZE5+7k8BPA1l6T+e1CptnpphvT/6lpGFozSinJM sC25aPcWYkJHNuqq+pqG4QE1Tn/5eBcoQOD9MKB5NoBdolxYxyK1dziBivyZ2A== 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 4RhW6Q1ZBmz1C2c; Thu, 7 Sep 2023 20:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSkJM064589; Thu, 7 Sep 2023 20:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSkQq064586; Thu, 7 Sep 2023 20:28:46 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:46 GMT Message-Id: <202309072028.387KSkQq064586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f41c23ee5b34 - stable/14 - wmistat: don't restrict reading to the pid that opened the fd. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f41c23ee5b347c422f79630345af8a22bc9a5190 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f41c23ee5b347c422f79630345af8a22bc9a5190 commit f41c23ee5b347c422f79630345af8a22bc9a5190 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-29 17:23:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:30 +0000 wmistat: don't restrict reading to the pid that opened the fd. PR: 273405 MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41621 (cherry picked from commit 28977cb9bc15a7f1fb7d28e14cd03f8dafd4e155) Approved by: re (gjb) --- sys/dev/acpi_support/acpi_wmi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c index 1df7cc60a940..6601db4317cb 100644 --- a/sys/dev/acpi_support/acpi_wmi.c +++ b/sys/dev/acpi_support/acpi_wmi.c @@ -976,8 +976,7 @@ acpi_wmi_wmistat_read(struct cdev *dev, struct uio *buf, int flag) sc = dev->si_drv1; ACPI_SERIAL_BEGIN(acpi_wmi); - if (sc->wmistat_open_pid != buf->uio_td->td_proc->p_pid || - sc->wmistat_bufptr == -1) { + if (sc->wmistat_bufptr == -1) { ret = EBADF; } else { From nobody Thu Sep 7 20:28:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6R4T7cz4sslL; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6R3QtPz4Zpt; Thu, 7 Sep 2023 20:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TcdYLOl9nv2ErV6uHtDE/gWh7ad0RyvtO8Z/QAIHMBU=; b=iLNdppr4W5Uldjr7Rz2WZVv70ukS4G2+KLr5NcqR+nG1MkYDq3kVjcZmCyJHe9lcnBV6mj LwoIchgCTuz7UN5bOpr7Vy5XlLMGWK5eX6fkrMopbLtqRXmLy5C9FEDKj6efw0fXy6Crmf s1dxf9Ul6nzwxYdXLpVs1IluMWKHjwnDczWlqf7eJzWAUZzCVNZ9iAtJhltNNS39tYtKJW 1uvuEOzXf3bwGm2JbbHeQHlvOm9um9/rzkp/ycdvVGoVwq4wdQyrZiGEd1rBbf1YB79uXX uxlwIcZzcDx9Mz2113CQ+jAhUTBXhgQ9q5xJCPhuPlDw3BKezj0WLKSTdofhWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118527; a=rsa-sha256; cv=none; b=bZmlwk24q7jn8HtGmXsVGg/h5IYXvW3OtoNFYUkA16e4se1p6hIoqE+WBJpROGKCFGc7+2 dnzjaINO/5tWi8z4G6pNr36Pwk74ImK35KC8byD/TewSM5PI40S31OfXqYNq9M0DuqCdGE ETKjDbuc3xBeDZlLWNVolpf+bFSDeFwHPXLHTxxwvYqWqjfwahBz7Gtv6J+X0X1VcVV0mz uNpx0XbC8lPjQ5iLdUg6XFCqvjxoYGmdRiePhqnD6mWJixxzJFjymk2Vs/zOOOeTMQmKLA ifZSCsFPcDHziVEiJkNiNzzL6MqlvVUsDiqkfBE0YkCX1DB2SdIuLWzOTw4+Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TcdYLOl9nv2ErV6uHtDE/gWh7ad0RyvtO8Z/QAIHMBU=; b=wdZamb+j3Exq6AbeNpjM8s7QJfZhWjX46hgHVDIMyovYVj2WrSOcYI1aRR79zTw8EazFxQ 4auhWvYtJ5Pd64DYEFxToNErEeV/mRl4mxlx+hsATgx0EpCZoB3+CRbNimpejiC0/2I0U7 kmLGZHXJgNjd+pjSCNCMsttr4ufI2V23YH0fOwK+rmT+QWEETSAoB+ys/N/3qY3hx8GLMu HPd2/+83C1yVgP8FmGdblKfZC3HYwSo2w6TXb/evQVGG//pyyRSHLTQhijN1In2l/FTe5a PnqjHVvciStKLYIleBZJsAHizRIdBppO/l7b/9w6Vzed272JAkcAJcbAeIt/Bg== 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 4RhW6R2Fpjz57; Thu, 7 Sep 2023 20:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSljE064635; Thu, 7 Sep 2023 20:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSlIF064632; Thu, 7 Sep 2023 20:28:47 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:47 GMT Message-Id: <202309072028.387KSlIF064632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cbc42905e524 - stable/14 - iostat: getopt() / usage() cleanup. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cbc42905e5245030920920f4d3fb31d1a5914a6f Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cbc42905e5245030920920f4d3fb31d1a5914a6f commit cbc42905e5245030920920f4d3fb31d1a5914a6f Author: Dag-Erling Smørgrav AuthorDate: 2023-08-29 17:23:23 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:30 +0000 iostat: getopt() / usage() cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D41636 (cherry picked from commit 09c45b089d2f90ec04153a1b4621dd6bec142959) Approved by: re (gjb) --- usr.sbin/iostat/iostat.8 | 40 +++++++++++++++++++--------------------- usr.sbin/iostat/iostat.c | 24 ++++++++++++------------ 2 files changed, 31 insertions(+), 33 deletions(-) diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8 index 17b73f0932c7..863f8ab8466c 100644 --- a/usr.sbin/iostat/iostat.8 +++ b/usr.sbin/iostat/iostat.8 @@ -54,7 +54,7 @@ .\" .\" @(#)iostat.8 8.1 (Berkeley) 6/6/93 .\" -.Dd May 22, 2015 +.Dd August 29, 2023 .Dt IOSTAT 8 .Os .Sh NAME @@ -64,7 +64,7 @@ statistics .Sh SYNOPSIS .Nm -.Op Fl CdhIKoTxz?\& +.Op Fl CdhIKoTxz .Op Fl c Ar count .Op Fl M Ar core .Op Fl n Ar devs @@ -90,6 +90,13 @@ averaged over that time. .Pp The options are as follows: .Bl -tag -width flag +.It Fl C +Display CPU statistics. +This is on by default, unless +.Fl d +or +.Fl x +is specified. .It Fl c Repeat the display .Ar count @@ -102,13 +109,6 @@ is specified. With .Fl w the default repeat count is infinity, otherwise it is 1. -.It Fl C -Display CPU statistics. -This is on by default, unless -.Fl d -or -.Fl x -is specified. .It Fl d Display only device statistics. If this flag is turned on, only device statistics will be displayed, unless @@ -136,6 +136,9 @@ then the device native block size. Extract values associated with the name list from the specified core instead of the default .Dq Pa /dev/kmem . +.It Fl N +Extract the name list from the specified system instead of the default +.Dq Pa /boot/kernel/kernel . .It Fl n Display up to .Ar devs @@ -145,9 +148,6 @@ The utility will display fewer devices if there are not .Ar devs devices present. -.It Fl N -Extract the name list from the specified system instead of the default -.Dq Pa /boot/kernel/kernel . .It Fl o Display old-style .Nm @@ -158,6 +158,13 @@ If .Fl I is specified, total blocks/sectors, total transfers, and milliseconds per seek are displayed. +.It Fl T +Display TTY statistics. +This is on by default, unless +.Fl d +or +.Fl x +is specified. .It Fl t Specify which types of devices to display. There are three different categories of devices: @@ -228,13 +235,6 @@ argument will be included in the .Nm output, up to the number of devices that can be displayed in 80 columns, or the maximum number of devices specified by the user. -.It Fl T -Display TTY statistics. -This is on by default, unless -.Fl d -or -.Fl x -is specified. .It Fl w Pause .Ar wait @@ -267,8 +267,6 @@ is also specified to enable the display of CPU or TTY statistics. If .Fl x is specified, omit lines for devices with no activity. -.It Fl ?\& -Display a usage statement and exit. .El .Pp The diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c index 17013b433917..d4f7a2519a1b 100644 --- a/usr.sbin/iostat/iostat.c +++ b/usr.sbin/iostat/iostat.c @@ -168,7 +168,7 @@ usage(void) * This isn't mentioned in the man page, or the usage statement, * but it is supported. */ - fprintf(stderr, "usage: iostat [-CdhIKoTxz?] [-c count] [-M core]" + fprintf(stderr, "usage: iostat [-CdhIKoTxz] [-c count] [-M core]" " [-n devs] [-N system]\n" "\t [-t type,if,pass] [-w wait] [drives]\n"); exit(1); @@ -198,17 +198,17 @@ main(int argc, char **argv) matches = NULL; maxshowdevs = 3; - while ((c = getopt(argc, argv, "c:CdhIKM:n:N:ot:Tw:xz?")) != -1) { - switch(c) { + while ((c = getopt(argc, argv, "Cc:dhIKM:N:n:oTt:w:xz")) != -1) { + switch (c) { + case 'C': + Cflag++; + break; case 'c': cflag++; count = atoi(optarg); if (count < 1) errx(1, "count %d is < 1", count); break; - case 'C': - Cflag++; - break; case 'd': dflag++; break; @@ -224,6 +224,9 @@ main(int argc, char **argv) case 'M': memf = optarg; break; + case 'N': + nlistf = optarg; + break; case 'n': nflag++; maxshowdevs = atoi(optarg); @@ -231,20 +234,17 @@ main(int argc, char **argv) errx(1, "number of devices %d is < 0", maxshowdevs); break; - case 'N': - nlistf = optarg; - break; case 'o': oflag++; break; + case 'T': + Tflag++; + break; case 't': if (devstat_buildmatch(optarg, &matches, &num_matches) != 0) errx(1, "%s", devstat_errbuf); break; - case 'T': - Tflag++; - break; case 'w': wflag++; f = atof(optarg); From nobody Thu Sep 7 20:28:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6S6R5Fz4ssqq; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6S4kCzz4Zbk; Thu, 7 Sep 2023 20:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cep6kGD5HkmYKQR6lG2qppttM/x6s1DqkNgq9omfu88=; b=ToWnohX1DFr2GXJj+PrCvblMlZvmaMX/tzFWjh4s5clE2tbWNa4AIS4i1aWAo5tQzFlmqw Pitrqha/dRgU4fECxHeIKYMZF2Iv9uMnz3vtJIU0hHfQJu+rJdqhSQ23ASfL/M9P2KOOcg QicZ8+skxiGZZYbDCzjv0rtA21QeRA60SNodGQFohVvk8giQ/JDMylH1Dz5/LT30PioTzq kX0PRpOoJYRz4kAsn+4cnf8vLzpD8rGGfjoF5/zhsrsRVkyf4Wh0ro2BVWMa+2Znb9D7vv DEDvXt9pyhE+RSIpmLbcVUqj9GbAcZ8vhGw0k2XdMkUxr4Bmt3RUS58NoSqtOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118528; a=rsa-sha256; cv=none; b=rvDpu3W9gDQcB6VWCEA6P0Rw55r187o/Tz0plnKwLpczRIb/4KtxmROBPGnNWWH5Q9dHUS O5qdpshXJpvSVYPsggHiiwMXifrCO344WzwKsJRkttgq9hCaZjIY+7DCR6FuX5FhL0lkwV cwQMPW85yq+qn1dqt8QMYRTLcV1fQYVaBsIKcnklQF0rgBTzsfWfJ9MCGcMJWG/knS1Sf7 PBR7TkwgEYbpTHkbhuRvhfIhNdmOo/YaWGGhBAKDvjSLPI6M5IHgr+3YhQujezxCuF//5a nDRZwuCndeDTUAITC7O+LoEUYI/Ja5oHv8tLSo4isuYHEiU3tCjzH0L/GN4C9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cep6kGD5HkmYKQR6lG2qppttM/x6s1DqkNgq9omfu88=; b=g7RKs0tKhX3L0WdozrG6ZTkPWR8PuSAVGfr8duFi+PPM0kILbHkMEL7ck9OQCzJOSFURLC yjYR5wg5JV6/X8C7DKtGqOAH8H9tKFhglhYJuIqAU59LYJFF3cZU7y3q/1tHEKINSFU+Vg h3GwhgbONMzIjopxDSOnK5erKt/opx/0lBRVfVyP4eQ7LE+j36d95Fv7wuRcUw5Sh6HFH/ y0Uq/kBOBIe/y/UwGdljNarbeEfn85Qcd68wZFBOR13llH2pJPrrzL3ILSN2cYFs+Ckz7y DILxG/1f9uwtrbb/QweSSdItMvDh3fqPK11TOcREMlNPpFiqsaAIHu8Fcy9GoQ== 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 4RhW6S3B4Rz1CcX; Thu, 7 Sep 2023 20:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSmvp064683; Thu, 7 Sep 2023 20:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSmrr064680; Thu, 7 Sep 2023 20:28:48 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:48 GMT Message-Id: <202309072028.387KSmrr064680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a781134d4967 - stable/14 - nss_tacplus: Provide dummy setpwent(), getpwent_r(), endpwent(). List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a781134d4967f25f7685f59c7361131f1c39831a Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a781134d4967f25f7685f59c7361131f1c39831a commit a781134d4967f25f7685f59c7361131f1c39831a Author: Dag-Erling Smørgrav AuthorDate: 2023-08-31 07:49:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:30 +0000 nss_tacplus: Provide dummy setpwent(), getpwent_r(), endpwent(). These aren't really needed, since TACACS+ does not support enumeration, but providing placeholders keeps nsdispatch() from complaining that they're missing. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41658 (cherry picked from commit 56b74a2d856c4d65a4b5c72d1352067b6b469d3b) Approved by: re (gjb) --- lib/nss_tacplus/nss_tacplus.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/nss_tacplus/nss_tacplus.c b/lib/nss_tacplus/nss_tacplus.c index e18ffe2315ce..238d7bf301ad 100644 --- a/lib/nss_tacplus/nss_tacplus.c +++ b/lib/nss_tacplus/nss_tacplus.c @@ -271,12 +271,43 @@ nss_tacplus_getpwnam_r(void *retval, void *mdata __unused, va_list ap) return (ret); } +static int +nss_tacplus_setpwent(void *retval __unused, void *mdata __unused, + va_list ap __unused) +{ + return (NS_SUCCESS); +} + +static int +nss_tacplus_getpwent_r(void *retval, void *mdata __unused, va_list ap) +{ + struct passwd *pwd __unused = va_arg(ap, struct passwd *); + char *buffer __unused = va_arg(ap, char *); + size_t bufsize __unused = va_arg(ap, size_t); + int *result = va_arg(ap, int *); + + *(void **)retval = NULL; + *result = 0; + return (NS_SUCCESS); + +} + +static int +nss_tacplus_endpwent(void *retval __unused, void *mdata __unused, + va_list ap __unused) +{ + return (NS_SUCCESS); +} + ns_mtab * nss_module_register(const char *name __unused, unsigned int *plen, nss_module_unregister_fn *unreg) { static ns_mtab mtab[] = { { "passwd", "getpwnam_r", &nss_tacplus_getpwnam_r, NULL }, + { "passwd", "setpwent", &nss_tacplus_setpwent, NULL }, + { "passwd", "getpwent_r", &nss_tacplus_getpwent_r, NULL }, + { "passwd", "endpwent", &nss_tacplus_endpwent, NULL }, }; *plen = nitems(mtab); From nobody Thu Sep 7 20:28:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6V0CKdz4ssnw; Thu, 7 Sep 2023 20:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6T5T9Hz4ZnM; Thu, 7 Sep 2023 20:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GG7UngI+PRdM0W8ghPrYLeCg7hT670StDOYO4PUFnWY=; b=RCLCqqdyN6vvkTWq37PEctkdpZHlWH4M8KEx3VaTYllF+feJayKOiQji1XHZ+r73rr6cse Yt0t06AmNB7GiIpmzQcXDmwqhEnkUEB4wpkUZzKREploDRAnwknkKa7f5eqRCUOPgLaHcp HeKFD+2WLui7boXSthrAa/qD8yOd8eJbfERRBIYSX9Ao/iMJh3kKIt9hbiu/xbpVi+wUsI uIrhNUSiyyWSlzTjUJ65AE7NgqT28MpvrpptLhgEPxlK62m4kcIaZKmZgtjN7/h2JeRrWU qvp0qQD7jN5el4GdbyfNSgd1SSbrVMjbQP0me0vCS42NG4p/SPMtRhGG7Ozrkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118529; a=rsa-sha256; cv=none; b=qnRxiFFouMA9UEgvN9ValdsKZp67PcxiSmQ7l7hDBvFef3OCJFJkla5ML1xfyOh7mdr4qn Dh7dZXz8c5Clqpz179zfVWs7r/ANZRYPZuoyJmBI21Ttc/wrWw6erxpXStBYdA5CO9xPjA QtknY63HpsIQJaUqKb/XZX4RrtdOyJzdELejg/YzUYb42raNJpbTLoP56nfiAwv2cGuCFv Styj63kp3DkJRbG3oS5aOK9FpkG3MDm21V9DCKDRkdbIG1MMwbmwQPE9Ni7z+EBz3gMC24 bVCL097ngNRvQl5nP+45hHMCiYfKKkiGJYd6K1HihzeDgDpmWfqgLp2mUUeabg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GG7UngI+PRdM0W8ghPrYLeCg7hT670StDOYO4PUFnWY=; b=mpdECsFTMjUny1YiAETiyv2y9cBINDVUFKbTWATO/wkOh2Wmjh4JZJgRquwM2L4lkHvVJj LPccWehD7YLrxlZYeAA9iZNWrOy7IrB47qS0rDVcQNBNnT8NRpOXwuU0aJahYhi7CbWoa9 GvokZUItLqYrmozRNlTNUWzxxtuxeEZPGTu7AKDWs5lHkwfmuX2x7pAhPoWJdfS6tHg1Rv 4LmTuDQ+/NyAV8lpZWGmcvgrgtjOtis4V0nNgwQQFHj4pML60TvDldkZedMbppSGHoPNa1 Eb8WV0JXf5Vod+97m8h963u70lxR7XKThQChs5JRo49qvjo9NENeN7OyMHlmxg== 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 4RhW6T48Qsz1CN3; Thu, 7 Sep 2023 20:28:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSnIl064734; Thu, 7 Sep 2023 20:28:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSn5Z064731; Thu, 7 Sep 2023 20:28:49 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:49 GMT Message-Id: <202309072028.387KSn5Z064731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: b27e66f26643 - stable/14 - libipf: fix parser error message. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b27e66f2664359de22ff752faf7a81b6530fd009 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b27e66f2664359de22ff752faf7a81b6530fd009 commit b27e66f2664359de22ff752faf7a81b6530fd009 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-31 20:15:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 libipf: fix parser error message. MFC after: 1 week Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41652 (cherry picked from commit 4cd9d804ae8b955d47dfa0bba06e7c254d760cb1) Approved by: re (gjb) --- sbin/ipf/libipf/parseipfexpr.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sbin/ipf/libipf/parseipfexpr.c b/sbin/ipf/libipf/parseipfexpr.c index 215e43b2978d..880258e5dd66 100644 --- a/sbin/ipf/libipf/parseipfexpr.c +++ b/sbin/ipf/libipf/parseipfexpr.c @@ -93,11 +93,7 @@ parseipfexpr(char *line, char **errorptr) break; } if (e->ipoe_word == NULL) { - error = malloc(32); - if (error != NULL) { - snprintf(error, sizeof(error), "keyword (%.10s) not found", - ops); - } + asprintf(&error, "keyword (%.10s) not found", ops); goto parseerror; } From nobody Thu Sep 7 20:28:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6W0FBrz4st47; Thu, 7 Sep 2023 20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6V6Wt1z4ZZ9; Thu, 7 Sep 2023 20:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gc8wDTEkJfHfdUw59yePKjka40IcC11MvAzB6+qb5Co=; b=ZzJ8qiILlfySnkibO/tOnGn2I5FUKnlo8jFSG7/bFI4yK+CtORNWACpCwlr0KLOUEU4jNP N6vz09S4UZrccsY92z3VaI7C+OJuQ9Mm2UVJYlaINbn8rk0ZV4jjnWQ0xBjETOd9YPXGvT YkfhA8mKNiU6NuVS6i3G0/dbkhe5h9Bc0yk0s02hMOQIjEaO7/33s0lbYhoW80DFbJsMD8 cnmQ3Li6Mjbn4QRh9TPnJFS53LKin2E3/vBABiUotH9IJVAA12VQbhGvbkytqdX2H2dQX/ QADpJPn4d8sgUh1IV+rHoq6CFqdxbtundRaONea2SXH4/T9GF0xRC5zrUcR5jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118530; a=rsa-sha256; cv=none; b=L8C5nBaVHKkhn3B5GR2OjHo/UbiS258ybdTXBuGDKXO3FLj8CF425johBctK5x1FMRfiz5 QkCZhElEH/rgVUCcPp4vFJ+Wtp7HnZhBj1WUGH+t2hSD5LFfWeHQa5fS9H84P2g1c0fwWt 7/NMqkmxbs8H0SQKhR1IF4kR70kIlj1QxQGQAbg6uhD9vVIkcFtaImJd88ixVxIjATzx2D LCJuFGDskMWdVZWKbWPBUgYgjylOUUqib10iWwNjicdR8LCXC44iqS5U8UjzoYhHuiRlkr 1kwG5xtnlk1a9faEG7Vy2DvLrsP/c4FdPzt7MNnga/Red9MlSFvF9HEwaEvybA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gc8wDTEkJfHfdUw59yePKjka40IcC11MvAzB6+qb5Co=; b=hs6iwe6VFUXuMqRk7wYLIJca9yWcy8cZvXOwyZDUzA5MLVVmKr3ex6LyTh6Nn47Ce8rkwl NoBgDtfsh9CSj5DiHgJ6BA7AVdaN0EmYsnOogJiOrFmZQUZamtM4txJq/pDsV+mLFC34Cl yhIq005iqZSzssi7ZqRuQ+BFRbByu5Gnv2NwzKnVY8t6VP1zn7SPvnG23UjbU8IXLEgzVl TIB9/QQjVxFoQhMvXWVh0ipB/mvcjVZoJOScvS0z7tJ+GRLPlcfYf6NMSM+WNVgntReSbi nrAG1lzcuik2gIbV8cQsNPKQ75IQItYGtr309i5DyMBzp5w1daqOqjYcegnM/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 4RhW6V59hhz58; Thu, 7 Sep 2023 20:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSo8j064789; Thu, 7 Sep 2023 20:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSojk064786; Thu, 7 Sep 2023 20:28:50 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:50 GMT Message-Id: <202309072028.387KSojk064786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6a629dd2a799 - stable/14 - libc: Fix fmemopen(3) prototype in fopen(3) man page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6a629dd2a7998d4956547191d314abdb5633db82 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6a629dd2a7998d4956547191d314abdb5633db82 commit 6a629dd2a7998d4956547191d314abdb5633db82 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-01 20:56:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 libc: Fix fmemopen(3) prototype in fopen(3) man page. While here, also update a mention of ANSI C. Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D41686 (cherry picked from commit 5a57401e7106132b61b16e34365cebf52b773007) libc: Further nit in fopen(3) man page. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41687 (cherry picked from commit c9f5889d05b5854be033849a4ff9985699071548) Approved by: re (gjb) --- lib/libc/stdio/fopen.3 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3 index 74da88efff0f..6f03443caf42 100644 --- a/lib/libc/stdio/fopen.3 +++ b/lib/libc/stdio/fopen.3 @@ -31,7 +31,7 @@ .\" .\" @(#)fopen.3 8.1 (Berkeley) 6/4/93 .\" -.Dd May 1, 2020 +.Dd September 1, 2023 .Dt FOPEN 3 .Os .Sh NAME @@ -51,7 +51,7 @@ .Ft FILE * .Fn freopen "const char *path" "const char *mode" "FILE *stream" .Ft FILE * -.Fn fmemopen "void *restrict *buf" "size_t size" "const char * restrict mode" +.Fn fmemopen "void * restrict buf" "size_t size" "const char * restrict mode" .Sh DESCRIPTION The .Fn fopen @@ -144,8 +144,10 @@ Reads and writes may be intermixed on read/write streams in any order, and do not require an intermediate seek as in previous versions of .Em stdio . This is not portable to other systems, however; -.Tn ANSI C -requires that +.St -isoC +and +.St -p1003.1 +both require that a file positioning function intervene between output and input, unless an input operation encounters end-of-file. .Pp @@ -246,9 +248,10 @@ byte. .Sh RETURN VALUES Upon successful completion .Fn fopen , -.Fn fdopen -and +.Fn fdopen , .Fn freopen +and +.Fn fmemopen return a .Tn FILE pointer. From nobody Thu Sep 7 20:28:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6X14kGz4sslf; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6W70mtz4ZyW; Thu, 7 Sep 2023 20: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=1694118532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9vSlC8jPnYzT45+4XTVmuyXcG9yB8Uwzj/xmmMKfxc=; b=UBzqI0HW/LWbzd3bTneOQxCW457BbQV+cRLQYEhQNdFoQZts23CDZetNoFYzXn/Zdmh2/v BaNlMLqRRp+X/Kos73hTVaZP/GFm9eZ1VYVp/EVPljyPWjwbE5qnpF0Aq/vGverOfszL2t S+rUI/G9GG7iCN6nHlTP4dMi4PueW/ZOtCtcXBiUBoP50fChEFDe3TLqHLksOougqXuaED 2Z1SQBzGSNqEi6x9VXDAcefho6mc8FJsFNMfWw17hJ03WQK7Plkzjsdq6yuzDxkO1ftpb0 TA8gRLK3vcUAGYFxkU/+JCFkJwTm0hNKL8qAjv6XkcjPGf+oHM6dX0LpKIKdvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118532; a=rsa-sha256; cv=none; b=B/MJxk/6rUiK1Xk1fed1FdlFcFTFOXbIpr6OY2tEqapQzkNZUscgV1lqS6zpbC+Ea1Gq32 LaKwhpBqk8u44M4SS4YriH2Ip8U1MAkTVGvCMQ2dLhwCifh5UntHgl/sPtYy1O2K6r2KLn OJLEfSkS5ZXHgg0EsW24+VPbcJBDlPIpHkibsODi1QfvVfgi/Xc+0hfuxSBzPA6OF7VTXI EJ4ftB6H0r5XK2FaFMI/U9haMVrbSLFhqu34K4OC6qyxx9zX6GZux2PGEoaLtj/peK1LRD E7Id7Tw9iF8b51DOmXmr3R0LerLvJ0BMtNxBwYwuVRUf1aSDC/+Z3Ac+XTTA0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9vSlC8jPnYzT45+4XTVmuyXcG9yB8Uwzj/xmmMKfxc=; b=SRMQWbnKS3f9/u7OdSJ2TotX6qLnbQ4FqW2P33mAVkttA1v9ofT3vetjuRpyE/mSJgdRYS 17SFT4xkWgIBvfZXAs3HRYRgZP4rJ/a91tmyaTHyFcOmDfCb6evWCBYYi1T26n4Yz29uXf UyOoOMjGLjFIpJ5AiNlZ7uf3vh2ojEc+NFz5ACQ6bAYNl2j98tza3LZXoc+FY8I6LaTSt5 j38dAKQVm6OVcLafTW4GIxdwvR2QmjKtG3FwWBrw5olXri4EJm+ic1YpsJuiCL680WdXSy geVaJPFexmfoMOWatDKMtMYVQAlWNnk/3iLPw+x/prhmnvkG65tzLq1KFOcrIQ== 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 4RhW6W5xKHz1CcY; Thu, 7 Sep 2023 20:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSpPZ064834; Thu, 7 Sep 2023 20:28:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSpo2064831; Thu, 7 Sep 2023 20:28:51 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:51 GMT Message-Id: <202309072028.387KSpo2064831@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a0fea1dc59d5 - stable/14 - if_vlan: Always default to 802.1q. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a0fea1dc59d5eae266bef72e8f6ba9ca9d9f9691 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a0fea1dc59d5eae266bef72e8f6ba9ca9d9f9691 commit a0fea1dc59d5eae266bef72e8f6ba9ca9d9f9691 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-04 23:26:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 if_vlan: Always default to 802.1q. There is no reason for this fallback to be conditional on COMPAT_FREEBSD12. PR: 273539 MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: melifaro, allanjude Differential Revision: https://reviews.freebsd.org/D41717 (cherry picked from commit b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94) Approved by: re (gjb) --- sys/net/if_vlan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 41a099c1407a..e7a290564722 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1106,11 +1106,8 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, return error; vid = vlr.vlr_tag; proto = vlr.vlr_proto; - -#ifdef COMPAT_FREEBSD12 if (proto == 0) proto = ETHERTYPE_VLAN; -#endif p = ifunit_ref(vlr.vlr_parent); if (p == NULL) return (ENXIO); @@ -2262,10 +2259,8 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ENOENT; break; } -#ifdef COMPAT_FREEBSD12 if (vlr.vlr_proto == 0) vlr.vlr_proto = ETHERTYPE_VLAN; -#endif oldmtu = ifp->if_mtu; error = vlan_config(ifv, p, vlr.vlr_tag, vlr.vlr_proto); if_rele(p); From nobody Thu Sep 7 20:28:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6Y1fR7z4ssln; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6Y0mvYz4Zys; Thu, 7 Sep 2023 20:28:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZgd9gg+2giK9DZp6uizvSxPW+Xuo0/xt7HDg5+PSxU=; b=fbd0lPXiSBYDLNzndxEMHDAqeow0s8n5I6nittrQIlbL/3nBYi8H4ooYnk8VBiU5XVA9RN Les0qiXDspFHQ1wPv8XTl9iaYrUy+7SDNffTBhPyGcCBuVv/0tjIMMPqfyAMucuNgTgcYx h6DgzgoEIdIsnm/BpVsoMirHx9/SXk+ZhQtrJoWvxeWSZGMo/l+owjqyafs894xHVBoUoX U+OQxc4jmho8T6N4CsZDdOAT5093pCGA/ws1ULgo2+bUFHudPV69fvBi/pEO/fhSNG5upu b3zwDVrIV/fynKsOMbAHzIp6rFeB/Ph9zVryP6wgKEPv6dQnJ3i71WtHjdaibw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118533; a=rsa-sha256; cv=none; b=EdS5HHl5eRn0itxwyGip5k5H2X7oGF9cqBFSTmjL+ii6t9IofufvIMzG0EYE96zHNKz3dn f78OshIzekyPzuCN/rvwuwBnbBzUx6YsuA2ARWV0/b1oeGG71jv8kOdCJWSoFA6un4Lf3A EnOWcYo8R1okK5nQr22ML8s5+k67Q7W1iEV7ljtEAdSaRXJIpqQ2K02FwRBwKkc+Ve0GFj L21Nq9KHQ9x8zC/OgZC9PNXqF6ow6zGERabhV2gkAGhDpEiqUHcWCwQO/ZHAbahVa9xHhg VeUBhGWoDu3tYOk52BoCLPa5fj7ssab81KDI2ijg4/CrnZuNC4EuMiHgH2frTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZgd9gg+2giK9DZp6uizvSxPW+Xuo0/xt7HDg5+PSxU=; b=y3XrTkFLPPBZHELRTPPrFwgaTQeOVJNHI/TVyIKPWWd5DE5z4VTTd610ewnkDk9RAvNCSK mkucn7vaA/nplTYTr5QbaLP3A0VKueWCgpnsmrjX4a3lb8SV5hFLGT4A0GBPfOuc80K5+i 2/YhVxwTBx7N56kvaFo4MUfBLq5791CEmy2kv7DWVtG8/tD7VB+MNCso/eg8gN5FBL8k1U Kq39OLcr8YV2+QVLVRThPoJ2vuOwTgffaHDSTSs4/zJ+jzNRPu+pohQxutcB4Qoz7j74jy f0pX8yjdkIhtNqfHiRI4ekclYwtolpSrw1p+/SSpKFqoE2TmMwOkA4OFtjjKvQ== 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 4RhW6X6fmtz1C2d; Thu, 7 Sep 2023 20:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSqXE064893; Thu, 7 Sep 2023 20:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSqjD064890; Thu, 7 Sep 2023 20:28:52 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:52 GMT Message-Id: <202309072028.387KSqjD064890@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cd5a2e6b4369 - stable/14 - time.h: Fix visibility check for C11 and C23 features. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cd5a2e6b43695a20f1b61fa47626cb8102a7d081 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cd5a2e6b43695a20f1b61fa47626cb8102a7d081 commit cd5a2e6b43695a20f1b61fa47626cb8102a7d081 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 01:37:43 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 time.h: Fix visibility check for C11 and C23 features. __BSD_VISIBLE is always defined; we need to check if it's true. Fixes: d02489d11aed 9b5d724cad10 MFC after: 3 days Reviewed by: brooks, imp Differential Revision: https://reviews.freebsd.org/D41733 (cherry picked from commit 8091b82e291642f3034dc3fdc8689a4f4ba027da) Approved by: re (gjb) --- include/time.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/time.h b/include/time.h index ef55577a2f84..ff858cc1f420 100644 --- a/include/time.h +++ b/include/time.h @@ -179,13 +179,13 @@ time_t posix2time(time_t t); #include #endif -#if defined(__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2011 || \ +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2011 || \ (defined(__cplusplus) && __cplusplus >= 201703) #include /* ISO/IEC 9899:2011 7.27.2.5 The timespec_get function */ #define TIME_UTC 1 /* time elapsed since epoch */ int timespec_get(struct timespec *ts, int base); -#if defined (__BSD_VISIBLE) || __ISO_C_VISIBLE >= 2023 +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 /* ISO/IEC 9899:2024 7.29.1 Components of time */ #define TIME_MONOTONIC 2 /* monotonic time */ /* ISO/IEC 9899:2024 7.29.2.7 The timespec_getres function */ From nobody Thu Sep 7 20:28:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6Z3Hzqz4st25; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6Z1qY4z4ZxM; Thu, 7 Sep 2023 20:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J2aSwp1TSvAwEAQ5M0PttBp74KpBpoua3n2mcFJUfmE=; b=LZBU0JkHDL0089rRim5mJK/SZiRQAul2DXx5o7eTyvlj4F6K2vk4MbXZcG1WqPWV9emhtL DZGf45GbPDfm3AWqzcxlkI8nTNWIBLIDtkttJgofAkGPO5oWTPH4RpUooe6bDQ/zQGILUl +9z8NW+y55NAcrWBV+Ahrure2n8e511TIrGJ1NRsliflGnAZy36l/bpdWiGphsKRSkVyRL kYpSt8fJ8fU2IfL6x/RO+TAriBL+Xr2RCNyV7TRbTbUTRRIPO3mOK+mwc4uvs531zw6DE6 rbvqImXUL7newxJYtdGxbC4F9NvNd5KiD/9IQRNVGmOALbCw6gemC4Nulm2S+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118534; a=rsa-sha256; cv=none; b=ZY7mAbeQQIk32C6k2/x2ULAiIjoA4z/h98DRd2cuUyovu590YwxWadLLBshS/ZEw8VD7oC ZSykZ+eNc9GcF9Ty2Kxch2144CLraAScX+7m0K8Y9q/Bx42k2/D/uwiz8ngWRnYVWH4zy7 ZC7RfApsRqwpnSUcQxrC+/tF6GdoEfEoeCCPzMkkva+aXA/BSP1PQT/FHfW038d6moq2LV p7RhxuUfB0vXyxBAtBnMbVsrFTpeuBCqphN0nPK5SKMR8Q+ic4/EYJ6u7eaeUkSGfMnj8D OOH//ehh0vNJZ5yS+67LjZidAE5wIOHRqbNIBuQOIkK5Hx1n0Yjy4W581gmfbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J2aSwp1TSvAwEAQ5M0PttBp74KpBpoua3n2mcFJUfmE=; b=rlXCulb4IRsKbF5GzpZn52dfnAo906vlQmwIMU9JF4fYARbl9eU3Hdv16x17KRB2hkB7kT MRnHZlXKFL49x5WMslQWobs6twHjiMwTyBhONJ1clENzkIqcuHtcxjUTU96wYZiZaJ83dN SNjt8AkmecBEhC/yeSM+zKCNu1oSqaRzp0DxUYQnEGKe0hjrWQQH2C0Or+0RsHkq9g0jmL SfO0m/6vBxOlsRH8a++um8QzhwxoxwCjwSgTRklXNazTZAYu8OAyBkZEOmcISCUa9gepm5 BgRFJc/1rLR2BVqJfQzjaiDni9lWwA78+qpyS2FvlAbX/VzDcLvJmO0G0XXPtw== 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 4RhW6Z0gLSz1CjC; Thu, 7 Sep 2023 20:28:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSrIf064938; Thu, 7 Sep 2023 20:28:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSr1w064935; Thu, 7 Sep 2023 20:28:53 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:53 GMT Message-Id: <202309072028.387KSr1w064935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 43e873278f55 - stable/14 - split: Add missing test cases. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 43e873278f550af7f3f2720dc46cc2f416047f5e Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=43e873278f550af7f3f2720dc46cc2f416047f5e commit 43e873278f550af7f3f2720dc46cc2f416047f5e Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 03:28:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 split: Add missing test cases. This adds test cases for c4f7198f47c1 and ac17fc816e67. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41755 (cherry picked from commit cbea5eddb1b6ae2a101beacf00bf165517f4f2b1) split: Code cleanup. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41756 (cherry picked from commit 851bf856d1a7ad5427ea9c22639ab6f6c4a3f503) split: Fix linecount parsing. The “undocumented kludge” which unfortunately can't be dropped for backward compatibility reasons was prone to segfaulting and would improperly allow a new linecount when one was already set. Fix these issues and add regression tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41757 (cherry picked from commit 117c54a78ccd214c236806721f21da750e512d3e) Approved by: re (gjb) --- usr.bin/split/split.c | 45 ++++++++++++++++++++------------------- usr.bin/split/tests/split_test.sh | 45 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 67 insertions(+), 23 deletions(-) diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c index b5a457ab6ecd..af1ed69c9482 100644 --- a/usr.bin/split/split.c +++ b/usr.bin/split/split.c @@ -41,7 +41,6 @@ static const char sccsid[] = "@(#)split.c 8.2 (Berkeley) 4/16/94"; #endif #include -#include #include #include @@ -85,14 +84,14 @@ static void usage(void) __dead2; int main(int argc, char **argv) { - int ch; - int error; - char *ep, *p; + const char *p; + char *ep; + int ch, error; setlocale(LC_ALL, ""); dflag = false; - while ((ch = getopt(argc, argv, "0123456789a:b:cdl:n:p:")) != -1) + while ((ch = getopt(argc, argv, "0::1::2::3::4::5::6::7::8::9::a:b:cdl:n:p:")) != -1) switch (ch) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -100,17 +99,15 @@ main(int argc, char **argv) * Undocumented kludge: split was originally designed * to take a number after a dash. */ - if (numlines == 0) { - p = argv[optind - 1]; - if (p[0] == '-' && p[1] == ch && !p[2]) - numlines = strtol(++p, &ep, 10); - else - numlines = - strtol(argv[optind] + 1, &ep, 10); - if (numlines <= 0 || *ep) - errx(EX_USAGE, - "%s: illegal line count", optarg); - } + if (numlines != 0) + usage(); + numlines = ch - '0'; + p = optarg ? optarg : ""; + while (numlines >= 0 && *p >= '0' && *p <= '9') + numlines = numlines * 10 + *p++ - '0'; + if (numlines <= 0 || *p != '\0') + errx(EX_USAGE, "%c%s: illegal line count", ch, + optarg ? optarg : ""); break; case 'a': /* Suffix length */ if ((sufflen = strtol(optarg, &ep, 10)) <= 0 || *ep) @@ -157,17 +154,22 @@ main(int argc, char **argv) argv += optind; argc -= optind; - if (*argv != NULL) { /* Input file. */ + if (argc > 0) { /* Input file. */ if (strcmp(*argv, "-") == 0) ifd = STDIN_FILENO; else if ((ifd = open(*argv, O_RDONLY, 0)) < 0) err(EX_NOINPUT, "%s", *argv); ++argv; + --argc; + } + if (argc > 0) { /* File name prefix. */ + if (strlcpy(fname, *argv, sizeof(fname)) >= sizeof(fname)) + errx(EX_USAGE, "file name prefix is too long: %s", + *argv); + ++argv; + --argc; } - if (*argv != NULL) /* File name prefix. */ - if (strlcpy(fname, *argv++, sizeof(fname)) >= sizeof(fname)) - errx(EX_USAGE, "file name prefix is too long"); - if (*argv != NULL) + if (argc > 0) usage(); if (strlen(fname) + (unsigned long)sufflen >= sizeof(fname)) @@ -400,7 +402,6 @@ newfile(void) sufflen++; /* Reset so we start back at all 'a's in our extended suffix. */ - tfnum = 0; fnum = 0; } diff --git a/usr.bin/split/tests/split_test.sh b/usr.bin/split/tests/split_test.sh index 899fd028e74b..c9b87c01618c 100755 --- a/usr.bin/split/tests/split_test.sh +++ b/usr.bin/split/tests/split_test.sh @@ -1,7 +1,7 @@ # # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2022 Klara Systems +# Copyright (c) 2022-2023 Klara Systems # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -200,6 +200,45 @@ EOF atf_check -o file:foo-ab cat split-ab } +atf_test_case autoextend +autoextend_body() +{ + seq $((26*25+1)) >input + atf_check split -l1 input + atf_check -o inline:"$((26*25))\n" cat xyz + atf_check -o inline:"$((26*25+1))\n" cat xzaaa +} + +atf_test_case continue +continue_body() +{ + echo hello >input + atf_check split input + atf_check -o file:input cat xaa + atf_check -s exit:1 -e ignore cat xab + atf_check split -c input + atf_check -o file:input cat xab +} + +atf_test_case undocumented_kludge +undocumented_kludge_body() +{ + seq 5000 >input + atf_check split -1000 input + atf_check -o file:xae seq 4001 5000 + atf_check split -d1000 input + atf_check -o file:x04 seq 4001 5000 +} + +atf_test_case duplicate_linecount +duplicate_linecount_body() +{ + atf_check -s exit:64 -e ignore split -5 -5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -5 /dev/null + atf_check -s exit:64 -e ignore split -5 -l5 /dev/null + atf_check -s exit:64 -e ignore split -l5 -l5 /dev/null +} + atf_init_test_cases() { atf_add_test_case bytes @@ -209,4 +248,8 @@ atf_init_test_cases() atf_add_test_case numeric_suffix atf_add_test_case larger_suffix_length atf_add_test_case pattern + atf_add_test_case autoextend + atf_add_test_case continue + atf_add_test_case undocumented_kludge + atf_add_test_case duplicate_linecount } From nobody Thu Sep 7 20:28:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6b312Fz4st4T; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6b2CBYz4b0n; Thu, 7 Sep 2023 20:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwCZojnHNTnYqu0GDLasdj9j/v9wb9I0Nj/DojXxG2E=; b=MEV9RUhJKSYZ968YrxJ2pDBhoQpumUIPgFNxDpyoF8aToz/EjB0AUaN+QB+nGJGgKodGVY uYTdusppWYXtpFf9xtwhoyhThTxe9aP3dlRV+5ZByxlBPGhXCDTLf+eoUWo1GCI4ycMDYl 3O+N6id0YGm7vzruRS2lh0ms1tgIuiuJV7l9XZLR7VwO492WzB4r80M3HhE6WfyClpafuq WYng6FYhK5vzv9j4rYqMR1kGL+7WOihzgGaNSTXe1B91d/j18J1EbF94HDsHOUzi1fk9oE E3tj4yxi7if0qLE4sqSvobRQAYy/yqpSqcddZZckbGdB2mXpDXuJeFJ0J8geVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118535; a=rsa-sha256; cv=none; b=RXtMNd62ZQ6gp4i/ixoKAK1AocB1ZXZQOHZdSKjPZXk7awkSUyyVp/p0T3HYxKHa9PSf6/ SdZhF6RIQxgFj3N1PW5JQb6e2tJUKn5lxcsQobNUWodX8LHa2YN3Z2QxDMkegY4HhWV3n7 Er8N8milmXktWgMyPbzjB4FNkpuQOA2G/2VnIq3eYf8672p1LFpZeKRvMhetX+4yI3ZrTU T3GjrVmxN0ntGFQA2JVnsfEEMT1IuHjMSPPlj72ogxR37OsKnPRsi19a1GU33Warn4tKJn OLz43dlbkbJbEtz/5F8/zraqeNYMav4bhurwrJzyL+Rj2fvRWoNqq2UjygQJvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VwCZojnHNTnYqu0GDLasdj9j/v9wb9I0Nj/DojXxG2E=; b=i7GeJA/LgCM0rj4uRMPUVLSLatt+YCr/+8wVQk8otySBSMr7Xwm3HnbHN78xciJsOoNA3m 6zKBSVT1MG7lbELBpAA8z2rm6AvkWu57DLezHamVF48bnSCn7LVmcNIYw6TgWJyzwKgLRa UBj4d6cKNKRXwffkKHzc0A2uVA4nwHtPhEG1sKrcRR9XKPwTeq9dmM1N0PCg7pbpIl1L6a HZ2jTr6HtQcZDQXz8KNGmY6lRxLRFOKgBjp1wajBiHqbdXWSiJpqW3tBdMgHuGPG6nFHqU UZfxUMhjdyZPmg9yA61IxVn+y6zfNu5HVUYNi5TrvRFvZyXe6sfrXXSNiKaFmw== 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 4RhW6b19b4z1CN4; Thu, 7 Sep 2023 20:28:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KStlK064987; Thu, 7 Sep 2023 20:28:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KStDh064984; Thu, 7 Sep 2023 20:28:55 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:55 GMT Message-Id: <202309072028.387KStDh064984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0171f9ccfed8 - stable/14 - unifdef: Handle redefined symbols correctly. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0171f9ccfed8400a42a6cc44dc7bb0211a955603 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0171f9ccfed8400a42a6cc44dc7bb0211a955603 commit 0171f9ccfed8400a42a6cc44dc7bb0211a955603 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-06 17:11:04 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 unifdef: Handle redefined symbols correctly. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41758 (cherry picked from commit aacbe7384221d2eafa326864bbbe2f22a10063ce) Approved by: re (gjb) --- contrib/unifdef/unifdef.c | 6 +++++- usr.bin/unifdef/tests/unifdef_test.sh | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/contrib/unifdef/unifdef.c b/contrib/unifdef/unifdef.c index 82f6acd66038..3dd4ace7b81e 100644 --- a/contrib/unifdef/unifdef.c +++ b/contrib/unifdef/unifdef.c @@ -1550,8 +1550,12 @@ addsym2(bool ignorethis, const char *symname, const char *val) sym->value = val; r = RB_INSERT(MACROMAP, ¯o_tree, sym); assert(r == NULL); + debugsym("addsym", sym); + } else { + sym->ignore = ignorethis; + sym->value = val; + debugsym("updsym", sym); } - debugsym("addsym", sym); } static void diff --git a/usr.bin/unifdef/tests/unifdef_test.sh b/usr.bin/unifdef/tests/unifdef_test.sh index 98adef3adfdc..dfb08c187724 100644 --- a/usr.bin/unifdef/tests/unifdef_test.sh +++ b/usr.bin/unifdef/tests/unifdef_test.sh @@ -17,6 +17,27 @@ EOF atf_check -o file:f unifdef file < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 3c96ab9f1d28 - stable/14 - libc: Implement N2680. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c96ab9f1d2855e1a2a1660648ecef597678eaa3 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=3c96ab9f1d2855e1a2a1660648ecef597678eaa3 commit 3c96ab9f1d2855e1a2a1660648ecef597678eaa3 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 libc: Implement N2680. This adds specific width length modifiers in the form of wN and wfN (where N is 8, 16, 32, or 64) which allow printing intN_t and int_fastN_t without resorting to casts or PRI macros. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D41725 (cherry picked from commit bce0bef3c6abab92c7ac8cc23b7cc632a382721e) libc: Add test cases for N2680. This adds test cases for %wN and %wfN to the printf(3) and scanf(3) tests. While here, fix a few nits in the N2630 test cases. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41743 (cherry picked from commit 12b1c1e3fb446021a881d9815465137843fca50b) Approved by: re (gjb) --- lib/libc/stdio/printf.3 | 4 +- lib/libc/stdio/printflocal.h | 1 + lib/libc/stdio/scanf.3 | 30 ++++++++++++++- lib/libc/stdio/vfprintf.c | 44 ++++++++++++++++++++++ lib/libc/stdio/vfscanf.c | 40 ++++++++++++++++++++ lib/libc/stdio/vfwprintf.c | 44 ++++++++++++++++++++++ lib/libc/stdio/vfwscanf.c | 40 ++++++++++++++++++++ lib/libc/tests/stdio/snprintf_test.c | 66 ++++++++++++++++++++++++++++++++ lib/libc/tests/stdio/sscanf_test.c | 65 ++++++++++++++++++++++++++++++++ lib/libc/tests/stdio/swprintf_test.c | 66 ++++++++++++++++++++++++++++++++ lib/libc/tests/stdio/swscanf_test.c | 73 ++++++++++++++++++++++++++++++++++-- 11 files changed, 468 insertions(+), 5 deletions(-) diff --git a/lib/libc/stdio/printf.3 b/lib/libc/stdio/printf.3 index 110851e2a421..a7b0c7399e2e 100644 --- a/lib/libc/stdio/printf.3 +++ b/lib/libc/stdio/printf.3 @@ -31,7 +31,7 @@ .\" .\" @(#)printf.3 8.1 (Berkeley) 6/4/93 .\" -.Dd August 21, 2023 +.Dd September 5, 2023 .Dt PRINTF 3 .Os .Sh NAME @@ -342,6 +342,8 @@ conversion: .It Cm ll No (ell ell) Ta Vt "long long" Ta Vt "unsigned long long" Ta Vt "long long *" .It Cm j Ta Vt intmax_t Ta Vt uintmax_t Ta Vt "intmax_t *" .It Cm t Ta Vt ptrdiff_t Ta (see note) Ta Vt "ptrdiff_t *" +.It Cm w Ns Ar N Ta Vt intN_t Ta Vt uintN_t Ta Vt "intN_t *" +.It Cm wf Ns Ar N Ta Vt int_fastN_t Ta Vt uint_fastN_t Ta Vt "int_fastN_t *" .It Cm z Ta (see note) Ta Vt size_t Ta (see note) .It Cm q Em (deprecated) Ta Vt quad_t Ta Vt u_quad_t Ta Vt "quad_t *" .El diff --git a/lib/libc/stdio/printflocal.h b/lib/libc/stdio/printflocal.h index 3594f75d0050..f3d0d3e9e216 100644 --- a/lib/libc/stdio/printflocal.h +++ b/lib/libc/stdio/printflocal.h @@ -49,6 +49,7 @@ #define PTRDIFFT 0x800 /* ptrdiff_t */ #define INTMAXT 0x1000 /* intmax_t */ #define CHARINT 0x2000 /* print char using int format */ +#define FASTINT 0x4000 /* int_fastN_t */ /* * Macros for converting digits to letters and vice versa diff --git a/lib/libc/stdio/scanf.3 b/lib/libc/stdio/scanf.3 index 6cefdb133983..b8d2360c5e76 100644 --- a/lib/libc/stdio/scanf.3 +++ b/lib/libc/stdio/scanf.3 @@ -31,7 +31,7 @@ .\" .\" @(#)scanf.3 8.2 (Berkeley) 12/11/93 .\" -.Dd August 21, 2023 +.Dd September 5, 2023 .Dt SCANF 3 .Os .Sh NAME @@ -217,6 +217,34 @@ and the next pointer is a pointer to a .Vt ptrdiff_t (rather than .Vt int ) . +.It Cm w Ns Ar N +.Po +where +.Ar N +is 8, 16, 32, or 64 +.Pc +Indicates that the conversion will be one of +.Cm bdioux +or +.Cm n +and the next pointer is a pointer to a +.Vt intN_t +(rather than +.Vt int ) . +.It Cm wf Ns Ar N +.Po +where +.Ar N +is 8, 16, 32, or 64 +.Pc +Indicates that the conversion will be one of +.Cm bdioux +or +.Cm n +and the next pointer is a pointer to a +.Vt int_fastN_t +(rather than +.Vt int ) . .It Cm z Indicates that the conversion will be one of .Cm bdioux diff --git a/lib/libc/stdio/vfprintf.c b/lib/libc/stdio/vfprintf.c index 5e5a9b5e31c1..8ce77626fb6f 100644 --- a/lib/libc/stdio/vfprintf.c +++ b/lib/libc/stdio/vfprintf.c @@ -610,6 +610,49 @@ reswitch: switch (ch) { case 't': flags |= PTRDIFFT; goto rflag; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(CHARINT|SHORTINT|LONGINT|LLONGINT|INTMAXT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= CHARINT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORTINT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LLONGINT; + fmt += 2; + } else { + if (flags & FASTINT) { + flags &= ~FASTINT; + fmt--; + } + goto invalid; + } + goto rflag; case 'z': flags |= SIZET; goto rflag; @@ -932,6 +975,7 @@ number: if ((dprec = prec) >= 0) default: /* "%?" prints ?, unless ? is NUL */ if (ch == '\0') goto done; +invalid: /* pretend it was %c with argument ch */ cp = buf; *cp = ch; diff --git a/lib/libc/stdio/vfscanf.c b/lib/libc/stdio/vfscanf.c index 9727c9e70c34..fa2e865f33f9 100644 --- a/lib/libc/stdio/vfscanf.c +++ b/lib/libc/stdio/vfscanf.c @@ -75,6 +75,7 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #define SUPPRESS 0x08 /* *: suppress assignment */ #define POINTER 0x10 /* p: void * (as hex) */ #define NOSKIP 0x20 /* [ or c: do not skip blanks */ +#define FASTINT 0x200 /* wfN: int_fastN_t */ #define LONGLONG 0x400 /* ll: long long (+ deprecated q: quad) */ #define INTMAXT 0x800 /* j: intmax_t */ #define PTRDIFFT 0x1000 /* t: ptrdiff_t */ @@ -555,6 +556,45 @@ literal: case 't': flags |= PTRDIFFT; goto again; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(SHORTSHORT|SHORT|LONG|LONGLONG|SIZET|INTMAXT|PTRDIFFT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= SHORTSHORT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LONGLONG; + fmt += 2; + } else { + goto match_failure; + } + goto again; case 'z': flags |= SIZET; goto again; diff --git a/lib/libc/stdio/vfwprintf.c b/lib/libc/stdio/vfwprintf.c index 259a86467ea7..d298ed03f521 100644 --- a/lib/libc/stdio/vfwprintf.c +++ b/lib/libc/stdio/vfwprintf.c @@ -681,6 +681,49 @@ reswitch: switch (ch) { case 't': flags |= PTRDIFFT; goto rflag; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(CHARINT|SHORTINT|LONGINT|LLONGINT|INTMAXT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= CHARINT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORTINT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LLONGINT; + fmt += 2; + } else { + if (flags & FASTINT) { + flags &= ~FASTINT; + fmt--; + } + goto invalid; + } + goto rflag; case 'z': flags |= SIZET; goto rflag; @@ -993,6 +1036,7 @@ number: if ((dprec = prec) >= 0) default: /* "%?" prints ?, unless ? is NUL */ if (ch == '\0') goto done; +invalid: /* pretend it was %c with argument ch */ cp = buf; *cp = ch; diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c index b03c9dba0699..e2c730b5e7a9 100644 --- a/lib/libc/stdio/vfwscanf.c +++ b/lib/libc/stdio/vfwscanf.c @@ -73,6 +73,7 @@ static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93"; #define SUPPRESS 0x08 /* *: suppress assignment */ #define POINTER 0x10 /* p: void * (as hex) */ #define NOSKIP 0x20 /* [ or c: do not skip blanks */ +#define FASTINT 0x200 /* wfN: int_fastN_t */ #define LONGLONG 0x400 /* ll: long long (+ deprecated q: quad) */ #define INTMAXT 0x800 /* j: intmax_t */ #define PTRDIFFT 0x1000 /* t: ptrdiff_t */ @@ -539,6 +540,45 @@ literal: case 't': flags |= PTRDIFFT; goto again; + case 'w': + /* + * Fixed-width integer types. On all platforms we + * support, int8_t is equivalent to char, int16_t + * is equivalent to short, int32_t is equivalent + * to int, int64_t is equivalent to long long int. + * Furthermore, int_fast8_t, int_fast16_t and + * int_fast32_t are equivalent to int, and + * int_fast64_t is equivalent to long long int. + */ + flags &= ~(SHORTSHORT|SHORT|LONG|LONGLONG|SIZET|INTMAXT|PTRDIFFT); + if (fmt[0] == 'f') { + flags |= FASTINT; + fmt++; + } else { + flags &= ~FASTINT; + } + if (fmt[0] == '8') { + if (!(flags & FASTINT)) + flags |= SHORTSHORT; + else + /* no flag set = 32 */ ; + fmt += 1; + } else if (fmt[0] == '1' && fmt[1] == '6') { + if (!(flags & FASTINT)) + flags |= SHORT; + else + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '3' && fmt[1] == '2') { + /* no flag set = 32 */ ; + fmt += 2; + } else if (fmt[0] == '6' && fmt[1] == '4') { + flags |= LONGLONG; + fmt += 2; + } else { + goto match_failure; + } + goto again; case 'z': flags |= SIZET; goto again; diff --git a/lib/libc/tests/stdio/snprintf_test.c b/lib/libc/tests/stdio/snprintf_test.c index 10d938435b96..323356b37a7d 100644 --- a/lib/libc/tests/stdio/snprintf_test.c +++ b/lib/libc/tests/stdio/snprintf_test.c @@ -127,6 +127,70 @@ ATF_TC_BODY(snprintf_X, tc) SNPRINTF_TEST("0X007FFFFFFF", "%#012X", INT_MAX); } +ATF_TC_WITHOUT_HEAD(snprintf_wN); +ATF_TC_BODY(snprintf_wN, tc) +{ + SNPRINTF_TEST("0", "%w8d", (int8_t)0); + SNPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); + SNPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SNPRINTF_TEST("0", "%w8u", (uint8_t)0); + SNPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); + + SNPRINTF_TEST("0", "%w16d", (int16_t)0); + SNPRINTF_TEST("-32768", "%w16d", (int16_t)SHRT_MIN); + SNPRINTF_TEST("32767", "%w16d", (int16_t)SHRT_MAX); + SNPRINTF_TEST("0", "%w16u", (uint16_t)0); + SNPRINTF_TEST("65535", "%w16u", (uint16_t)USHRT_MAX); + + SNPRINTF_TEST("0", "%w32d", (int32_t)0); + SNPRINTF_TEST("-2147483648", "%w32d", (int32_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%w32d", (int32_t)INT_MAX); + SNPRINTF_TEST("0", "%w32u", (uint32_t)0); + SNPRINTF_TEST("4294967295", "%w32u", (uint32_t)UINT_MAX); + + SNPRINTF_TEST("0", "%w64d", (int64_t)0); + SNPRINTF_TEST("-9223372036854775808", "%w64d", (int64_t)LLONG_MIN); + SNPRINTF_TEST("9223372036854775807", "%w64d", (int64_t)LLONG_MAX); + SNPRINTF_TEST("0", "%w64u", (uint64_t)0); + SNPRINTF_TEST("18446744073709551615", "%w64u", (uint64_t)ULLONG_MAX); + + SNPRINTF_TEST("wd", "%wd", 0); + SNPRINTF_TEST("w1d", "%w1d", 0); + SNPRINTF_TEST("w128d", "%w128d", 0); +} + +ATF_TC_WITHOUT_HEAD(snprintf_wfN); +ATF_TC_BODY(snprintf_wfN, tc) +{ + SNPRINTF_TEST("0", "%wf8d", (int_fast8_t)0); + SNPRINTF_TEST("-2147483648", "%wf8d", (int_fast8_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%wf8d", (int_fast8_t)INT_MAX); + SNPRINTF_TEST("0", "%wf8u", (uint8_t)0); + SNPRINTF_TEST("4294967295", "%wf8u", (uint_fast8_t)UINT_MAX); + + SNPRINTF_TEST("0", "%wf16d", (int_fast16_t)0); + SNPRINTF_TEST("-2147483648", "%wf16d", (int_fast16_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%wf16d", (int_fast16_t)INT_MAX); + SNPRINTF_TEST("0", "%wf16u", (uint16_t)0); + SNPRINTF_TEST("4294967295", "%wf16u", (uint_fast16_t)UINT_MAX); + + SNPRINTF_TEST("0", "%wf32d", (int_fast32_t)0); + SNPRINTF_TEST("-2147483648", "%wf32d", (int_fast32_t)INT_MIN); + SNPRINTF_TEST("2147483647", "%wf32d", (int_fast32_t)INT_MAX); + SNPRINTF_TEST("0", "%wf32u", (uint32_t)0); + SNPRINTF_TEST("4294967295", "%wf32u", (uint_fast32_t)UINT_MAX); + + SNPRINTF_TEST("0", "%wf64d", (int_fast64_t)0); + SNPRINTF_TEST("-9223372036854775808", "%wf64d", (int_fast64_t)LLONG_MIN); + SNPRINTF_TEST("9223372036854775807", "%wf64d", (int_fast64_t)LLONG_MAX); + SNPRINTF_TEST("0", "%wf64u", (uint64_t)0); + SNPRINTF_TEST("18446744073709551615", "%wf64u", (uint_fast64_t)ULLONG_MAX); + + SNPRINTF_TEST("wfd", "%wfd", 0); + SNPRINTF_TEST("wf1d", "%wf1d", 0); + SNPRINTF_TEST("wf128d", "%wf128d", 0); +} + ATF_TP_ADD_TCS(tp) { setlocale(LC_NUMERIC, "en_US.UTF-8"); @@ -135,5 +199,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, snprintf_d); ATF_TP_ADD_TC(tp, snprintf_x); ATF_TP_ADD_TC(tp, snprintf_X); + ATF_TP_ADD_TC(tp, snprintf_wN); + ATF_TP_ADD_TC(tp, snprintf_wfN); return (atf_no_error()); } diff --git a/lib/libc/tests/stdio/sscanf_test.c b/lib/libc/tests/stdio/sscanf_test.c index 462b4a6586da..e916873d38c3 100644 --- a/lib/libc/tests/stdio/sscanf_test.c +++ b/lib/libc/tests/stdio/sscanf_test.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include @@ -237,6 +238,68 @@ ATF_TC_BODY(sscanf_i, tc) } } +ATF_TC_WITHOUT_HEAD(sscanf_wN); +ATF_TC_BODY(sscanf_wN, tc) +{ + const char x00[] = "0x00"; + const char x7f[] = "0x7fffffffffffffff"; + const char xff[] = "0xffffffffffffffff"; + +#define SSCANF_WN_TEST(N, imin, umax) \ + do { \ + int##N##_t i; \ + uint##N##_t u; \ + ATF_CHECK_EQ(1, sscanf(x00, "%w" #N "i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, sscanf(x7f, "%w" #N "i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, sscanf(x00, "%w" #N "x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, sscanf(xff, "%w" #N "x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SSCANF_WN_TEST(8, -1, UCHAR_MAX); + SSCANF_WN_TEST(16, -1, USHRT_MAX); + SSCANF_WN_TEST(32, -1, UINT_MAX); + SSCANF_WN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SSCANF_WN_TEST + + ATF_CHECK_EQ(0, sscanf(x00, "%wi", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%w1i", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%w128i", (int *)NULL)); +} + +ATF_TC_WITHOUT_HEAD(sscanf_wfN); +ATF_TC_BODY(sscanf_wfN, tc) +{ + const char x00[] = "0x00"; + const char x7f[] = "0x7fffffffffffffff"; + const char xff[] = "0xffffffffffffffff"; + +#define SSCANF_WFN_TEST(N, imin, umax) \ + do { \ + int_fast##N##_t i; \ + uint_fast##N##_t u; \ + ATF_CHECK_EQ(1, sscanf(x00, "%wf" #N "i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, sscanf(x7f, "%wf" #N "i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, sscanf(x00, "%wf" #N "x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, sscanf(xff, "%wf" #N "x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SSCANF_WFN_TEST(8, -1, UINT_MAX); + SSCANF_WFN_TEST(16, -1, UINT_MAX); + SSCANF_WFN_TEST(32, -1, UINT_MAX); + SSCANF_WFN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SSCANF_WFN_TEST + + ATF_CHECK_EQ(0, sscanf(x00, "%wfi", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%wf1i", (int *)NULL)); + ATF_CHECK_EQ(0, sscanf(x00, "%wf128i", (int *)NULL)); +} + /* * Test termination cases: non-numeric character, fixed width, EOF */ @@ -261,6 +324,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, sscanf_d); ATF_TP_ADD_TC(tp, sscanf_x); ATF_TP_ADD_TC(tp, sscanf_i); + ATF_TP_ADD_TC(tp, sscanf_wN); + ATF_TP_ADD_TC(tp, sscanf_wfN); ATF_TP_ADD_TC(tp, sscanf_termination); return (atf_no_error()); } diff --git a/lib/libc/tests/stdio/swprintf_test.c b/lib/libc/tests/stdio/swprintf_test.c index 23859b5cd2e1..f5dde349412b 100644 --- a/lib/libc/tests/stdio/swprintf_test.c +++ b/lib/libc/tests/stdio/swprintf_test.c @@ -128,6 +128,70 @@ ATF_TC_BODY(swprintf_X, tc) SWPRINTF_TEST("0X007FFFFFFF", "%#012X", INT_MAX); } +ATF_TC_WITHOUT_HEAD(swprintf_wN); +ATF_TC_BODY(swprintf_wN, tc) +{ + SWPRINTF_TEST("0", "%w8d", (int8_t)0); + SWPRINTF_TEST("-128", "%w8d", (int8_t)CHAR_MIN); + SWPRINTF_TEST("127", "%w8d", (int8_t)CHAR_MAX); + SWPRINTF_TEST("0", "%w8u", (uint8_t)0); + SWPRINTF_TEST("255", "%w8u", (uint8_t)UCHAR_MAX); + + SWPRINTF_TEST("0", "%w16d", (int16_t)0); + SWPRINTF_TEST("-32768", "%w16d", (int16_t)SHRT_MIN); + SWPRINTF_TEST("32767", "%w16d", (int16_t)SHRT_MAX); + SWPRINTF_TEST("0", "%w16u", (uint16_t)0); + SWPRINTF_TEST("65535", "%w16u", (uint16_t)USHRT_MAX); + + SWPRINTF_TEST("0", "%w32d", (int32_t)0); + SWPRINTF_TEST("-2147483648", "%w32d", (int32_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%w32d", (int32_t)INT_MAX); + SWPRINTF_TEST("0", "%w32u", (uint32_t)0); + SWPRINTF_TEST("4294967295", "%w32u", (uint32_t)UINT_MAX); + + SWPRINTF_TEST("0", "%w64d", (int64_t)0); + SWPRINTF_TEST("-9223372036854775808", "%w64d", (int64_t)LLONG_MIN); + SWPRINTF_TEST("9223372036854775807", "%w64d", (int64_t)LLONG_MAX); + SWPRINTF_TEST("0", "%w64u", (uint64_t)0); + SWPRINTF_TEST("18446744073709551615", "%w64u", (uint64_t)ULLONG_MAX); + + SWPRINTF_TEST("wd", "%wd", 0); + SWPRINTF_TEST("w1d", "%w1d", 0); + SWPRINTF_TEST("w128d", "%w128d", 0); +} + +ATF_TC_WITHOUT_HEAD(swprintf_wfN); +ATF_TC_BODY(swprintf_wfN, tc) +{ + SWPRINTF_TEST("0", "%wf8d", (int_fast8_t)0); + SWPRINTF_TEST("-2147483648", "%wf8d", (int_fast8_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%wf8d", (int_fast8_t)INT_MAX); + SWPRINTF_TEST("0", "%wf8u", (uint8_t)0); + SWPRINTF_TEST("4294967295", "%wf8u", (uint_fast8_t)UINT_MAX); + + SWPRINTF_TEST("0", "%wf16d", (int_fast16_t)0); + SWPRINTF_TEST("-2147483648", "%wf16d", (int_fast16_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%wf16d", (int_fast16_t)INT_MAX); + SWPRINTF_TEST("0", "%wf16u", (uint16_t)0); + SWPRINTF_TEST("4294967295", "%wf16u", (uint_fast16_t)UINT_MAX); + + SWPRINTF_TEST("0", "%wf32d", (int_fast32_t)0); + SWPRINTF_TEST("-2147483648", "%wf32d", (int_fast32_t)INT_MIN); + SWPRINTF_TEST("2147483647", "%wf32d", (int_fast32_t)INT_MAX); + SWPRINTF_TEST("0", "%wf32u", (uint32_t)0); + SWPRINTF_TEST("4294967295", "%wf32u", (uint_fast32_t)UINT_MAX); + + SWPRINTF_TEST("0", "%wf64d", (int_fast64_t)0); + SWPRINTF_TEST("-9223372036854775808", "%wf64d", (int_fast64_t)LLONG_MIN); + SWPRINTF_TEST("9223372036854775807", "%wf64d", (int_fast64_t)LLONG_MAX); + SWPRINTF_TEST("0", "%wf64u", (uint64_t)0); + SWPRINTF_TEST("18446744073709551615", "%wf64u", (uint_fast64_t)ULLONG_MAX); + + SWPRINTF_TEST("wfd", "%wfd", 0); + SWPRINTF_TEST("wf1d", "%wf1d", 0); + SWPRINTF_TEST("wf128d", "%wf128d", 0); +} + ATF_TP_ADD_TCS(tp) { setlocale(LC_NUMERIC, "en_US.UTF-8"); @@ -136,5 +200,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, swprintf_d); ATF_TP_ADD_TC(tp, swprintf_x); ATF_TP_ADD_TC(tp, swprintf_X); + ATF_TP_ADD_TC(tp, swprintf_wN); + ATF_TP_ADD_TC(tp, swprintf_wfN); return (atf_no_error()); } diff --git a/lib/libc/tests/stdio/swscanf_test.c b/lib/libc/tests/stdio/swscanf_test.c index 10eaf786e5fa..f7ad30b963a7 100644 --- a/lib/libc/tests/stdio/swscanf_test.c +++ b/lib/libc/tests/stdio/swscanf_test.c @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include @@ -11,6 +12,8 @@ #include +#define L(s) L ## s + static const struct swscanf_test_case { wchar_t input[8]; struct { @@ -150,7 +153,7 @@ static const struct swscanf_test_case { #define SWSCANF_TEST(string, format, expret, expval, explen) \ do { \ int ret = 0, val = 0, len = 0; \ - ret = swscanf(string, format "%n", &val, &len); \ + ret = swscanf(string, format L"%n", &val, &len); \ ATF_CHECK_EQ(expret, ret); \ if (expret && ret) { \ ATF_CHECK_EQ(expval, val); \ @@ -238,6 +241,68 @@ ATF_TC_BODY(swscanf_i, tc) } } +ATF_TC_WITHOUT_HEAD(swscanf_wN); +ATF_TC_BODY(swscanf_wN, tc) +{ + const wchar_t x00[] = L"0x00"; + const wchar_t x7f[] = L"0x7fffffffffffffff"; + const wchar_t xff[] = L"0xffffffffffffffff"; + +#define SWSCANF_WN_TEST(N, imin, umax) \ + do { \ + int##N##_t i; \ + uint##N##_t u; \ + ATF_CHECK_EQ(1, swscanf(x00, L"%w" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, swscanf(x7f, L"%w" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, swscanf(x00, L"%w" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, swscanf(xff, L"%w" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SWSCANF_WN_TEST(8, -1, UCHAR_MAX); + SWSCANF_WN_TEST(16, -1, USHRT_MAX); + SWSCANF_WN_TEST(32, -1, UINT_MAX); + SWSCANF_WN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SWSCANF_WN_TEST + + ATF_CHECK_EQ(0, swscanf(x00, L"%wi", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%w1i", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%w128i", (int *)NULL)); +} + +ATF_TC_WITHOUT_HEAD(swscanf_wfN); +ATF_TC_BODY(swscanf_wfN, tc) +{ + const wchar_t x00[] = L"0x00"; + const wchar_t x7f[] = L"0x7fffffffffffffff"; + const wchar_t xff[] = L"0xffffffffffffffff"; + +#define SWSCANF_WFN_TEST(N, imin, umax) \ + do { \ + int_fast##N##_t i; \ + uint_fast##N##_t u; \ + ATF_CHECK_EQ(1, swscanf(x00, L"%wf" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(0, i); \ + ATF_CHECK_EQ(1, swscanf(x7f, L"%wf" L(#N) L"i", &i)); \ + ATF_CHECK_EQ(imin, i); \ + ATF_CHECK_EQ(1, swscanf(x00, L"%wf" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(0, u); \ + ATF_CHECK_EQ(1, swscanf(xff, L"%wf" L(#N) L"x", &u)); \ + ATF_CHECK_EQ(umax, u); \ + } while (0) + SWSCANF_WFN_TEST(8, -1, UINT_MAX); + SWSCANF_WFN_TEST(16, -1, UINT_MAX); + SWSCANF_WFN_TEST(32, -1, UINT_MAX); + SWSCANF_WFN_TEST(64, LLONG_MAX, ULLONG_MAX); +#undef SWSCANF_WFN_TEST + + ATF_CHECK_EQ(0, swscanf(x00, L"%wfi", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%wf1i", (int *)NULL)); + ATF_CHECK_EQ(0, swscanf(x00, L"%wf128i", (int *)NULL)); +} + /* * Test termination cases: non-numeric character, fixed width, EOF */ @@ -245,9 +310,9 @@ ATF_TC_WITHOUT_HEAD(swscanf_termination); ATF_TC_BODY(swscanf_termination, tc) { int a = 0, b = 0, c = 0; - char d = 0; + wchar_t d = 0; - ATF_CHECK_EQ(4, swscanf(L"3.1415", L"%d%c%2d%d", &a, &d, &b, &c)); + ATF_CHECK_EQ(4, swscanf(L"3.1415", L"%d%lc%2d%d", &a, &d, &b, &c)); ATF_CHECK_EQ(3, a); ATF_CHECK_EQ(14, b); ATF_CHECK_EQ(15, c); @@ -262,6 +327,8 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, swscanf_d); ATF_TP_ADD_TC(tp, swscanf_x); ATF_TP_ADD_TC(tp, swscanf_i); + ATF_TP_ADD_TC(tp, swscanf_wN); + ATF_TP_ADD_TC(tp, swscanf_wfN); ATF_TP_ADD_TC(tp, swscanf_termination); return (atf_no_error()); } From nobody Thu Sep 7 20:28:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhW6d59Tlz4sswm; Thu, 7 Sep 2023 20:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhW6d4HXDz4b8H; Thu, 7 Sep 2023 20:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wgmSgf2ejHwgejShJ7vj/QlauiKWL9bAGj4tOFy1qY0=; b=OnSxQSGUTZvO8vAsXGa6F6oXai9Jkw49YkQkmk17YND9ByJRfEXO6nLJ0QlWbYMHECRZFv fyWnsBi2+ckLUTuS0UqDH8HYNqmF3OsCMvB+EaPXskYspTnSMyBtPk/VmqN9KQZC69kYj7 VjBTdpeO3EQ+IpK97Vg3tJQ0umr4MYtDGP04LFCWiKcaPGsuC19PzPITqmvQ5QDTskOjl1 Ux53esgP2EXxoxrrQlTyKzUCTGZJHBGyatBu4BC6uPZrcQhx7TfG1ri2e3cKHFUs8tmYhd PvKSYs5uYCFJGLGZ01e7OgNjt+v9QCaxgUxALRC/Tvtd4dcT6c+7dVNIhEqb4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694118537; a=rsa-sha256; cv=none; b=YEhMPio1qt0dufJuqghyuMFTBmgnEDvaOv8PQaf+dQMQ+zmvn2E7zWey3yP9WEtQI6LdDa BV9jaQ0NH+j0+R7dmNS+QKlaUF8KBtoPBhCe3XaC+yLMqFA0X0Om+LWweiUQeO258m6RyG e6q5PLjGCtKn1jq+DXyapbCOfHqHu57py4+pX2TRgWMyFS8GloNe1+Y453Zld6fd79JNKR 9RquSMAs+3/N2gT10kq3v9Bysdl7TYpQyc1Mpi7e6u6Mrf8NJbLUKBneaWhiDfb6evW/PI g/g5nZyjhpBVbEopEL5QXPEvbhpBl0R9nUsvxnD9U120P+R7PmCneXDtawWrXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694118537; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wgmSgf2ejHwgejShJ7vj/QlauiKWL9bAGj4tOFy1qY0=; b=vh/L4WvXxOC4k4wFf9xEy/CKrYFbgZm2FUWsWYRzTer9gwcrSiVaIcp1w1+ORaqZlH/X68 UrmoVO3r6ShFD4+7cZr29lVrcprjm1e0vUlfjcSDrmKHXT4RmNS0uzvlRODMwAardfKrbu TcPCSs8W8CjUT4X65NX4sS8taNC/DuJvgrUNpUg/VwXUFr86b+Fi3GvBEl9Yyk2ztex5as 5N8XaZ6UF2p44NqFklyvhktr9Z2VbW0KRiAFffkih8m/wvtuthmirQlGtkRHhj2GBAtmJZ zWKWc/sU3S+Y2rZ41TefzyhckQzbZU7E7c7dgQAkxBqGwPJ6xwB29nCr8smfmA== 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 4RhW6d34jbz1CtP; Thu, 7 Sep 2023 20:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387KSvG3065068; Thu, 7 Sep 2023 20:28:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387KSvaY065065; Thu, 7 Sep 2023 20:28:57 GMT (envelope-from git) Date: Thu, 7 Sep 2023 20:28:57 GMT Message-Id: <202309072028.387KSvaY065065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c3ae84bc2a57 - stable/14 - include: Implement N2867. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3ae84bc2a57e380c6703d7cbbfb6b541bde6391 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c3ae84bc2a57e380c6703d7cbbfb6b541bde6391 commit c3ae84bc2a57e380c6703d7cbbfb6b541bde6391 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-07 06:14:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-07 20:28:31 +0000 include: Implement N2867. This adds macros for checked addition, subtraction, and multiplication with semantics similar to the builtins gcc and clang have had for years. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D41734 (cherry picked from commit e6615b10347caf67f5bc12c9a8e30b8ddd9860ae) include: Add tests for N2867. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41735 (cherry picked from commit 4fbb9c43aa44d9145151bb5f77d302ba01fb7551) less: We have now. Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D41736 (cherry picked from commit cb8dd292c7ec53391dfa25847858dd7ef895f94e) Approved by: re (gjb) --- etc/mtree/BSD.tests.dist | 2 + include/Makefile | 2 +- include/stdckdint.h | 40 ++++++++++++++++ share/man/man3/Makefile | 4 ++ share/man/man3/stdckdint.3 | 106 +++++++++++++++++++++++++++++++++++++++++ tests/Makefile | 1 + tests/include/Makefile | 7 +++ tests/include/stdckdint_test.c | 52 ++++++++++++++++++++ usr.bin/less/defines.h | 2 +- 9 files changed, 214 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index fb755b4001ac..04dc24d772c8 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -278,6 +278,8 @@ .. .. .. + include + .. lib atf libatf-c diff --git a/include/Makefile b/include/Makefile index f3c9230f6d40..d8cdbfed3663 100644 --- a/include/Makefile +++ b/include/Makefile @@ -30,7 +30,7 @@ INCS= a.out.h ar.h assert.h bitstring.h byteswap.h \ pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h \ res_update.h resolv.h runetype.h sched.h \ search.h semaphore.h setjmp.h \ - signal.h spawn.h stab.h stdalign.h stdbool.h stddef.h \ + signal.h spawn.h stab.h stdalign.h stdbool.h stdckdint.h stddef.h \ stdnoreturn.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h termios.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ diff --git a/include/stdckdint.h b/include/stdckdint.h new file mode 100644 index 000000000000..af3074dded89 --- /dev/null +++ b/include/stdckdint.h @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#ifndef __STDC_VERSION_STDCKDINT_H__ +#define __STDC_VERSION_STDCKDINT_H__ 202311L + +#include + +#if __BSD_VISIBLE || __ISO_C_VISIBLE >= 2023 + +#if __GNUC_PREREQ__(5, 1) || __has_builtin(__builtin_add_overflow) +#define ckd_add(result, a, b) \ + (_Bool)__builtin_add_overflow((a), (b), (result)) +#else +#define ckd_add(result, a, b) \ + _Static_assert(0, "checked addition not supported") +#endif + +#if __GNUC_PREREQ__(5, 1) || __has_builtin(__builtin_sub_overflow) +#define ckd_sub(result, a, b) \ + (_Bool)__builtin_sub_overflow((a), (b), (result)) +#else +#define ckd_sub(result, a, b) \ + _Static_assert(0, "checked subtraction not supported") +#endif + +#if __GNUC_PREREQ__(5, 1) || __has_builtin(__builtin_mul_overflow) +#define ckd_mul(result, a, b) \ + (_Bool)__builtin_mul_overflow((a), (b), (result)) +#else +#define ckd_mul(result, a, b) \ + _Static_assert(0, "checked multiplication not supported") +#endif + +#endif + +#endif diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 5aec58492b8f..7fff5eedd5fb 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -29,6 +29,7 @@ MAN= arb.3 \ snl.3 \ stats.3 \ stdarg.3 \ + stdckdint.3 \ sysexits.3 \ tgmath.3 \ timeradd.3 \ @@ -310,6 +311,9 @@ MLINKS+= stdarg.3 va_arg.3 \ stdarg.3 va_end.3 \ stdarg.3 varargs.3 \ stdarg.3 va_start.3 +MLINKS+= stdckdint.3 ckd_add.3 \ + stdckdint.3 ckd_sub.3 \ + stdckdint.3 ckd_mul.3 MLINKS+= timeradd.3 timerclear.3 \ timeradd.3 timercmp.3 \ timeradd.3 timerisset.3 \ diff --git a/share/man/man3/stdckdint.3 b/share/man/man3/stdckdint.3 new file mode 100644 index 000000000000..e3593472c08b --- /dev/null +++ b/share/man/man3/stdckdint.3 @@ -0,0 +1,106 @@ +.\"- +.\" Copyright (c) 2023 Dag-Erling Smørgrav +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd September 5, 2023 +.Dt STDCKDINT 3 +.Os +.Sh NAME +.Nm stdckdint +.Nd checked integer arithmetic +.Sh SYNOPSIS +.In stdckdint.h +.Ft bool +.Fn ckd_add "type1 *result" "type2 a" "type3 b" +.Ft bool +.Fn ckd_sub "type1 *result" "type2 a" "type3 b" +.Ft bool +.Fn ckd_mul "type1 *result" "type2 a" "type3 b" +.Sh DESCRIPTION +The function-like macros +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +perform checked integer addition, subtraction, and multiplication, +respectively. +If the result of adding, subtracting, or multiplying +.Fa a +and +.Fa b +as if their respective types had infinite range fits in +.Ft type1 , +it is stored in the location pointed to by +.Fa result +and the macro evaluates to +.Dv false . +Otherwise, the macro evaluates to +.Dv true +and the contents of the location pointed to by +.Fa result +is the result of the operation wrapped to the range of +.Ft type1 . +.Sh RETURN VALUES +The +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +macros evaluate to +.Dv true +if the requested operation overflowed the result type and +.Dv false +otherwise. +.Sh EXAMPLES +.Bd -literal -offset indent +#include +#include +#include + +int main(void) +{ + int result; + + assert(!ckd_add(&result, INT_MAX, 0)); + assert(result == INT_MAX); + assert(ckd_add(&result, INT_MAX, 1)); + assert(result == INT_MIN); + + assert(!ckd_sub(&result, INT_MIN, 0)); + assert(result == INT_MIN); + assert(ckd_sub(&result, INT_MIN, 1)); + assert(result == INT_MAX); + + assert(!ckd_mul(&result, INT_MAX / 2, 2)); + assert(result == INT_MAX - 1); + assert(ckd_mul(&result, INT_MAX / 2 + 1, 2)); + assert(result == INT_MIN); + + return 0; +} +.Ed +.\" .Sh STANDARDS +.\" The +.\" .Nm ckd_add , +.\" .Nm ckd_sub , +.\" and +.\" .Nm ckd_mul +.\" macros conform to +.\" .St -isoC-23 . +.Sh HISTORY +The +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +macros were first introduced in +.Fx 14.0 . +.Sh AUTHORS +The +.Nm ckd_add , +.Nm ckd_sub , +and +.Nm ckd_mul +macros and this manual page were written by +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org . diff --git a/tests/Makefile b/tests/Makefile index bd20d063ca71..09c0fbc62a2e 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -9,6 +9,7 @@ KYUAFILE= yes SUBDIR+= etc SUBDIR+= examples +SUBDIR+= include SUBDIR+= sys SUBDIR+= atf_python diff --git a/tests/include/Makefile b/tests/include/Makefile new file mode 100644 index 000000000000..e98d08da1f2b --- /dev/null +++ b/tests/include/Makefile @@ -0,0 +1,7 @@ +.include + +TESTSDIR= ${TESTSBASE}/include + +ATF_TESTS_C+= stdckdint_test + +.include diff --git a/tests/include/stdckdint_test.c b/tests/include/stdckdint_test.c new file mode 100644 index 000000000000..89262bbd5500 --- /dev/null +++ b/tests/include/stdckdint_test.c @@ -0,0 +1,52 @@ +/*- + * Copyright (c) 2023 Dag-Erling Smørgrav + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include + +ATF_TC_WITHOUT_HEAD(ckd_add); +ATF_TC_BODY(ckd_add, tc) +{ + int result; + + ATF_CHECK(!ckd_add(&result, INT_MAX, 0)); + ATF_CHECK_EQ(INT_MAX, result); + ATF_CHECK(ckd_add(&result, INT_MAX, 1)); + ATF_CHECK_EQ(INT_MIN, result); +} + +ATF_TC_WITHOUT_HEAD(ckd_sub); +ATF_TC_BODY(ckd_sub, tc) +{ + int result; + + ATF_CHECK(!ckd_sub(&result, INT_MIN, 0)); + ATF_CHECK_EQ(INT_MIN, result); + ATF_CHECK(ckd_sub(&result, INT_MIN, 1)); + ATF_CHECK_EQ(INT_MAX, result); +} + +ATF_TC_WITHOUT_HEAD(ckd_mul); +ATF_TC_BODY(ckd_mul, tc) +{ + int result; + + ATF_CHECK(!ckd_mul(&result, INT_MAX / 2, 2)); + ATF_CHECK_EQ(INT_MAX - 1, result); + ATF_CHECK(ckd_mul(&result, INT_MAX / 2 + 1, 2)); + ATF_CHECK_EQ(INT_MIN, result); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, ckd_add); + ATF_TP_ADD_TC(tp, ckd_sub); + ATF_TP_ADD_TC(tp, ckd_mul); + return (atf_no_error()); + +} diff --git a/usr.bin/less/defines.h b/usr.bin/less/defines.h index 018d98a48162..ed9c2603970c 100644 --- a/usr.bin/less/defines.h +++ b/usr.bin/less/defines.h @@ -327,7 +327,7 @@ #define HAVE_STAT_INO 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_STDCKDINT_H */ +#define HAVE_STDCKDINT_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STDINT_H 1 From nobody Thu Sep 7 21:06:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhWyS5gmhz4s3Wl; Thu, 7 Sep 2023 21:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhWyS5FwVz3K7q; Thu, 7 Sep 2023 21:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694120816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R/+jsklkHxSur3dCG+D/jcW/GiQ/+tjKjSurQGTW/Ic=; b=EcEvqh3pxJUZPFwpaWg4KFMMgI8pXf5mS3tA8fQqPhJgcyFLgqipfXpGVFqXvf/qHYr4wR lovJD7ruiZWHzFun7O8wdcFF3w8z5Br7OPj0pY4BS02JjTSI6t8kmqI6sZQgOVVJXpxbkL m+UgB4HK9ddbdwG4X1suinBrUvaQ1TFGi4aMnt4s/DtrUbAin9coGCAfUuVYvnwMGl6/r6 nzMgodoUFZ5wGJ/EQqYWU+yjoBrLY9yZ7dMWLgbdU4Tkqh6o1/EJQ2WPYEWQ+fYrr7jSoq RDhFwFxzgZImu/PwxLHjrVm09OP31hXulia/g4p6RjVREGqgiGH2FF5roYvhbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694120816; a=rsa-sha256; cv=none; b=uUbqO6vMJ0aaQkbklEEoIsIqSE3fKgrTBy5TAM68aP0dHsuU0Fgp7FFirss85rUn69zlH2 6mv3K8QsTRv40s1KQCRuAHEMvcEPMmn308VBxcopa0eQGxrXctwn8LwMDPyeuUQbm/sne6 zUS7W8Nne0hY3VCsyQuml6+a62Pj49bKAdmnKjBP8wjldXZe0xTh7bAipWyLxm3d8To6C4 d4S1oanpoOvau5G4cTcL4XKhJglu8VhD4c15pNSDVaVgAgVgjsl5sE+TBopE1/qitb7GUu +TXZI92WxxVrnXvBvY/1G3PBWIMk1n6G4XkGHdixW+PKjvud5a3wNv8CSky3+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694120816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R/+jsklkHxSur3dCG+D/jcW/GiQ/+tjKjSurQGTW/Ic=; b=cs70nwkGGMrSsKcgtqJVHbe3y7954jBF2udUusTH42H5P8mtdaaNIUdm0rFuboiQBKJ49S aLiqkiZkRAIq0Tj8aOjs4LCVZRFfkPD8pcVcDfkMyjKSq+jxrWpVRqDYH5H5NTYuyqQgtp Aj0c8/HxlWHN+BoH3tmi68EdJGw/7VnNDQLPUPoq/H9yxmxvwZBAcitSS+6H2wMW2SQ+Xz mi15qW28/7tSuxIaULz4tj0tE6zVH++dpjNE9H3QyrFfgceKjzg07+qpnDcvWqfRB2qOFQ Hqo2+MaYf3tDbIc+Ckz84pLD+Pybp6xQDazLEOU+O0CBlL3luoGJ8IwKBLiehA== 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 4RhWyS4CRhzqb; Thu, 7 Sep 2023 21:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 387L6umn031282; Thu, 7 Sep 2023 21:06:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 387L6um6031279; Thu, 7 Sep 2023 21:06:56 GMT (envelope-from git) Date: Thu, 7 Sep 2023 21:06:56 GMT Message-Id: <202309072106.387L6um6031279@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: dde83fc4d2e6 - stable/14 - pci_iov: Refuse to create VFs which require ARI if ARI is not available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dde83fc4d2e6e8a3009bdfb7d14dcc8ef802b22f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dde83fc4d2e6e8a3009bdfb7d14dcc8ef802b22f commit dde83fc4d2e6e8a3009bdfb7d14dcc8ef802b22f Author: John Baldwin AuthorDate: 2023-09-01 21:18:30 +0000 Commit: John Baldwin CommitDate: 2023-09-07 21:06:33 +0000 pci_iov: Refuse to create VFs which require ARI if ARI is not available If a parent downstream port doesn't support ARI, the code would try to create VFs anyway but then all PCI config space access to those VFs would fail. Tested by: np Approved by: re (kib) Sponsored by: Chelsio Communications (cherry picked from commit 7063f94283af60818429a0c2d70e80ae4ad5c146) --- sys/dev/pci/pci_iov.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/dev/pci/pci_iov.c b/sys/dev/pci/pci_iov.c index db7210cb729a..ff3ac0e64271 100644 --- a/sys/dev/pci/pci_iov.c +++ b/sys/dev/pci/pci_iov.c @@ -435,7 +435,7 @@ out: * affects all PFs on the device. */ static int -pci_iov_set_ari(device_t bus) +pci_iov_set_ari(device_t bus, bool *ari_enabled) { device_t lowest; device_t *devlist; @@ -443,8 +443,10 @@ pci_iov_set_ari(device_t bus) uint16_t iov_ctl; /* If ARI is disabled on the downstream port there is nothing to do. */ - if (!PCIB_ARI_ENABLED(device_get_parent(bus))) + if (!PCIB_ARI_ENABLED(device_get_parent(bus))) { + *ari_enabled = false; return (0); + } error = device_get_children(bus, &devlist, &devcount); @@ -480,6 +482,7 @@ pci_iov_set_ari(device_t bus) device_printf(lowest, "failed to enable ARI\n"); return (ENXIO); } + *ari_enabled = true; return (0); } @@ -683,6 +686,7 @@ pci_iov_config(struct cdev *cdev, struct pci_iov_arg *arg) uint16_t iov_ctl; uint16_t num_vfs, total_vfs; int iov_inited; + bool ari_enabled; mtx_lock(&Giant); dinfo = cdev->si_drv1; @@ -713,7 +717,7 @@ pci_iov_config(struct cdev *cdev, struct pci_iov_arg *arg) if (error != 0) goto out; - error = pci_iov_set_ari(bus); + error = pci_iov_set_ari(bus, &ari_enabled); if (error != 0) goto out; @@ -736,6 +740,11 @@ pci_iov_config(struct cdev *cdev, struct pci_iov_arg *arg) goto out; } + if (!ari_enabled && PCI_RID2SLOT(last_rid) != 0) { + error = ENOSPC; + goto out; + } + iov_ctl = IOV_READ(dinfo, PCIR_SRIOV_CTL, 2); iov_ctl &= ~(PCIM_SRIOV_VF_EN | PCIM_SRIOV_VF_MSE); IOV_WRITE(dinfo, PCIR_SRIOV_CTL, iov_ctl, 2); From nobody Fri Sep 8 00:04:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rhbts2DPvz4sx46; Fri, 8 Sep 2023 00:04: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rhbts1d5Zz4fh0; Fri, 8 Sep 2023 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694131445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=USIOa4FOij6bUmOSWX/VLjZIjFeC/lPs2l/ip4az6x8=; b=MFRJiotYyAuGMbTjnDMmnJGte5IcK+Ope1lqHxhggKv60cQR0LNRYNxroAKol4nc5nNGrW 3xdgjpsdoXYMAkvz2JhgVZPdzEzoUHWrZI7bIply7zLY6dr+7WAnflx/V6NRfS7KwcfSKN /yOByDf6D1peVyweVhBv/r5Vi2di561NsAQqStZ9iP0PkEb+O8ye8Yb66fB7vFbuEb/owI Vxa+3PCJ+1P8h7gFGLbKZxB1SNXIbhdfd2EDQ2C6b+fh1KvDasvtPSyShg34qq7PwlQC2a ZsQrQPS/WhnIeLZ6cG4RAY3/70XD1jyzsOtdagj+s9XUd+JZwZFfmlwoleqfoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694131445; a=rsa-sha256; cv=none; b=vWnYKIphSXKrVONvuVuAHhTBFqv6mljy9cbDUckZUYbL4s6CGdEcfoH2srz1aqkeupvL4Q t8GHMiFJc8d16PADzBbqYR7Nl4c5ZFP5QwS/9zYKH/2goqpHU6G+YMjTG5bGmeUW81MEG6 9gN1ctgb5GUXfRSkZ4BMSICM+2yLIvTJfaTg6r5yb2ToF2S51lcNYwvKFM2o0b8c6oj920 bkp5OUlskYmyZKqJIjK1TXcD0eCLckx3QtUNuGzRAzrkHz3U6wt7fa4bfdl2yJue8h88Nj 7O+4bkyv7bx2o2QJnLvlZy0J2KfFAC2OaZ+ntJc8Zrookn0leFJYdZZ+6OBLSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694131445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=USIOa4FOij6bUmOSWX/VLjZIjFeC/lPs2l/ip4az6x8=; b=jOpsyTkSKCtSBlFom5UClZlvOGiTYXlO55AVj5MkJlK0c7xOaV88qgdfG2WZm33g0zkykZ zoum7qMNx+OQPimEDMcyRRQJXJcO6w2CFnq1ZuHQI9kEyYRuOWUf+iWbhLAaMRGNBmgK9U GzWfZBO9vw/mMl2+PqsoPW0OUOJtlM0l1yPDFz4OCsBP6HvVQKUOPSBs65dXo0HnpFLc7V kMDl/0b1Btcy33x4fl8ahYpMfIVJKqDEhYsUicLPGL/kF3gVYjWW8RuflUGjdpISmLivS/ o4QnZ63gHpYvXFXh0iOrSrSQtuSw9pwOw5m5MEbLxh6vB9gGx1aHNIw5rHy+sw== 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 4Rhbts0J1Mz59K; Fri, 8 Sep 2023 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388044ke028526; Fri, 8 Sep 2023 00:04:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388044fn028523; Fri, 8 Sep 2023 00:04:04 GMT (envelope-from git) Date: Fri, 8 Sep 2023 00:04:04 GMT Message-Id: <202309080004.388044fn028523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 115ac9a76512 - releng/14.0 - release: branch releng/14.0, set to BETA1 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 115ac9a765122f478b9fdb912a7c817ace10257b Auto-Submitted: auto-generated The branch releng/14.0 has been created by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=115ac9a765122f478b9fdb912a7c817ace10257b commit 115ac9a765122f478b9fdb912a7c817ace10257b Author: Glen Barber AuthorDate: 2023-09-08 00:03:24 +0000 Commit: Glen Barber CommitDate: 2023-09-08 00:03:24 +0000 release: branch releng/14.0, set to BETA1 Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index efd3afa16515..81c35d40f6a3 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="ALPHA4" +BRANCH="BETA1" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Sep 8 00:07:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhbyN14sfz4sxnF; Fri, 8 Sep 2023 00:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhbyM56smz4gHb; Fri, 8 Sep 2023 00:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694131627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9knWuMnlWIswJFtKTIztkjWVW+akDMdYM20Yrvc1kic=; b=SVIpedRZh0BCGqdsLhpdCYHkbxYJdZc2sGgvhd7J26i4wSiJVgkYPGMIfRN5b7XqFfOjmX pbIt5OtfqcIqGDi6tNPvW5gN+U5IDBGz1rQEGC6oO41uI5MQ0FS/w/ZBofx6yW1o6iFmbU d4N2XsJU33aTI8iBEC3lht18/+TbjxgQ6WwEA4WPKBD1rwfLjP8U5CKR/XGqSYYA9+iIdZ eX5lzn7cd+IcWYpKvKg3vp4dJKIwUm5Ts9+0to21twGIdnvRAS4Rm8aRoIw4T1xhaN8tRa 0YEho7shITxVocqqP2yyVTKiVK3sWi9zN+GDbqlSDCxmqrtRIea7tDg7D2WZow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694131627; a=rsa-sha256; cv=none; b=WhrrTQUM2mify5j6p7ITnJFERu3gyja0XgL1etFRcwkTRqZiBUyYnA3g+dI/ttJBh2Q1RN 4oI9O6cKYxp6e4WKIyCLpwUmsgvZPqB/OxZw5vMtVUVaC6fQA3eWNNnYKpw4cqBANaTefl I74G3vzzxug+73Vdi3xR7WNG4qfYI9Yzgneg1KVtnZBKG4S3l3z3xqW0FdPYhOgCKqoWuE lxv9BHEVEhIstecUHkIV8sKXmj3+GexhC8Uyjgz1ecjZ0kfVNrkDZm3d4vVxvwuizJtYWk 6KtRbEGdnUyBnFQpTJjIFJYxOcTAUOGu7G8quuvAeqjJ/1gYdIuhp0bB4AqdjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694131627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9knWuMnlWIswJFtKTIztkjWVW+akDMdYM20Yrvc1kic=; b=Z7Tqy2WIWMbBKGP5uMJd5ZOssP174KgiucAqL91iL4MLzvnkofDyN+vO2KFhh5wfd/sBvT JRzpro1faC0P06HJn+16VB9wLp7tEZmk6wtKuePg78eZW/YAHuN/cfVhbRDMVT7MsTdVKf 1h2EgKxyqINRjEqV6UVx/5mfiXHiKR5cAvait5yIqyB75dHCG+13cBwQTC92t488m+Wf3P lID9nca3RCgw1b/A99G69gCh9WkPd7JJy7SPbecI/HZIGyG6EHDIm+pZcB2e/psbRXHCpS 6Ee013QiXTuZjejE+PyfU/RWxD25/zz+2ogFoh3WLZFQkkJqgthW21UKp+t3Mw== 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 4RhbyM412Bz5Pf; Fri, 8 Sep 2023 00:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388077fd029091; Fri, 8 Sep 2023 00:07:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388077rT029089; Fri, 8 Sep 2023 00:07:07 GMT (envelope-from git) Date: Fri, 8 Sep 2023 00:07:07 GMT Message-Id: <202309080007.388077rT029089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: edbd9c3c32c0 - stable/14 - release: update __FreeBSD_version after branching releng/14.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: edbd9c3c32c047820218279613b277adfb80d0ce Auto-Submitted: auto-generated The branch stable/14 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=edbd9c3c32c047820218279613b277adfb80d0ce commit edbd9c3c32c047820218279613b277adfb80d0ce Author: Glen Barber AuthorDate: 2023-09-08 00:06:07 +0000 Commit: Glen Barber CommitDate: 2023-09-08 00:06:07 +0000 release: update __FreeBSD_version after branching releng/14.0 Rename from ALPHA to STABLE following the branch. Approved by: re (implicit) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- sys/sys/param.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index efd3afa16515..d9bccdfdf191 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="ALPHA4" +BRANCH="STABLE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi diff --git a/sys/sys/param.h b/sys/sys/param.h index 9a1ae2e2d8d4..e47588c7b879 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1400097 +#define __FreeBSD_version 1400500 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Fri Sep 8 02:45:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhgT60N6zz4sD2p; Fri, 8 Sep 2023 02:45:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhgT56wy5z4QSd; Fri, 8 Sep 2023 02:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694141130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0QvhjdPAkhUAbTKlrV3wvGaYui4D4QO1C3Iz9fyynnc=; b=Dl8tARjXV11enBb/qNkxwPLJTi5XnK+USRUshtov8jrHwAvrrWY4PWUe3RdOgXjD1Med8h 9vjv1hLeniPJU0PYdcOd6k1oDhd+SFBRCnlK3No/fe1rx7PVLgMfAQy/HxPoyiZDS5n07p fgLQA4WvQCF/Nae6namlG/YyUxLulwjUKB25sZo4z2Zt2Ym0oKWSz4RuD6w6mxtiaBZfsj qxHwMsZEQ5ErBG1T2KOspbl3kjLQGoIIjEJ5f+di/BqAZDIteLsdHK0apIJAxJDtVV6AR1 k2+BhIa77rlzpnQdsTfsPDTc/STRv9sWrCACdieNCh6i0Ud/OxOf4adPfFpRIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694141130; a=rsa-sha256; cv=none; b=ZITNXXr8izeL4guVx/y6IdG8pVMT8AFUzmiqUMFnHtWQrZTHVjYt9FH8tBykJqS3G5Vh/d EmdFahxPnpNfGy2EhGfr+MczA51ct96iFc1xC9Ql/6uS/en/Ek/hOAudPtpBjr0gQ4a09b MLFNf/Zo5FYW79pbdeewTF35JZOsLnT/7XlPftnO40Qw6/8dOesmJ1EAgcOrQz1Wm2FCOi 5AfOO/L2egdxs+Hil+UhsRgN5PJE/HE+c+9FDxCKsiKh0i+vy8gwJeccEtR1dx+m+viCHK vWkwKlgtJqRd2L58cRi77G9URQnrLuZXTZv0iUuRGI1eI+iaf9mzlaPPMUjD4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694141130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0QvhjdPAkhUAbTKlrV3wvGaYui4D4QO1C3Iz9fyynnc=; b=Nl77bFCM61JuU2/rMVt0G+vQNlt95LyhidR5J/8Byd/6ZPMWOTGFZAtxPBcJxrbVKFJRLU iRvzmosICeUT/SZUWfem+pibQ756S6MI48Gdb/DKQyULkMmG/0Nxz4sf8Lsl2mQlRvvek0 9OFHQJ96oBSGDwk4ao/jOU1PzMVhh4J+B9fjCoq43urnAlNd/l430mMNP9bRPkTcq9Yi31 9UZa8iVs+yuqE4o+xaUKUBZa/+C4l1FXJa7txVFERBtD/Qn1mhkUs6NqSM5wspUsZRbAOC LIvR64cOpqB2beNS6pmCH01lP0xN6Qot746qEYannOz4L81Br4ipB6UaYkBieA== 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 4RhgT55vsmz8wZ; Fri, 8 Sep 2023 02:45:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3882jTq3092936; Fri, 8 Sep 2023 02:45:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3882jTwC092933; Fri, 8 Sep 2023 02:45:29 GMT (envelope-from git) Date: Fri, 8 Sep 2023 02:45:29 GMT Message-Id: <202309080245.3882jTwC092933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 4e027ca1514f - releng/14.0 - release: force PKGCONFBRANCH to use 'latest' to fix BETA1 builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 4e027ca1514fc5c8d4720bec5a1ac6c71888aa38 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=4e027ca1514fc5c8d4720bec5a1ac6c71888aa38 commit 4e027ca1514fc5c8d4720bec5a1ac6c71888aa38 Author: Glen Barber AuthorDate: 2023-09-08 02:44:08 +0000 Commit: Glen Barber CommitDate: 2023-09-08 02:44:08 +0000 release: force PKGCONFBRANCH to use 'latest' to fix BETA1 builds We do not yet have a 'quarterly' build for amd64, i386, or non-x86, so use 'latest' in order to get the BETA1 builds to work. Approved by: re (implicit, build fix) Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- usr.sbin/pkg/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index 3e0e047382ca..07a6012d9721 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -16,6 +16,7 @@ PKGCONFBRANCH?= latest . endif . endif .endif +PKGCONFBRANCH= latest PKGCONF?= FreeBSD.conf.${PKGCONFBRANCH} CONFS= ${PKGCONF} CONFSNAME_${PKGCONF}= ${PKGCONF:C/\.conf.+$/.conf/} From nobody Fri Sep 8 05:57:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhlkP3Gp9z4s49V; Fri, 8 Sep 2023 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhlkP2pFgz4Mpk; Fri, 8 Sep 2023 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694152637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CfHU1DA9+DpEv+/2kdvlo4rp9iA1Nb0MpasfgcJzuxs=; b=k7fX5alDS3Sp3ZyP128g4PavFLzn+qiSFo+49c9REWUafkAEKwFc3VZ+7BLSw7NHe+c1sx kBTS+LsGfdPrYZAP2SSBae0di78JpcvUL/NU9ksndvalp/U1dyIO09puCtlnPOGuhLBmf6 /bqaVJXQrN6LdC9XKljHqIHnnC5JbHOG72kiwIguUbedc0Tnq6+0//WvqNx+PJ2UJknwCE kGIw2ybIp0DWUvEonN1PgXDPjGqGGhJiDeW6fUTmMdEpOrYB1UCHxhatnkhiUuBDsJxtu7 Z2xY23DwiDtJjBdlK9iDtTa+5b1UMDaYv0ZANXPFHpT8vs11pVuAIdUoAubcFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694152637; a=rsa-sha256; cv=none; b=F2NZkTnFF2DCrKBz7/8UX9qLCC9673koqjfLUrsLWUSI4qbA4/J12meoa0bAKHmDHzNqaB 6bqzkJ5nflbPDa0MOHpxyzvjrM4N5QARwrNOICYemx/mCXc2Ti6vz3dPmUKoVN/UyrGqB2 rke/WfoSgfeDkIgT96lD46GpZPltVAPAKEqJBMYtiERDpOoDjmPoYQkBhcmo9H4Tt7Nq+e jqZVgHYNH+BNABryGQsAQ4mExmvIx21iy+k9/qHsjBO0tLEkwYZocstV8VF8PpRNwDCX25 BfWIBDJJtot475d5Y5LwKNU8ojkYEPho9+z5WJno8nB4+39A4+XwADk7zzSKjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694152637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CfHU1DA9+DpEv+/2kdvlo4rp9iA1Nb0MpasfgcJzuxs=; b=u5+xyR3bj79iCczIa1veqZYUfzzra8ohyz/swO0NtrBc/mvY3+B7T3Z0o/az/iogzRvKg0 qfiWdksRgmg8R87olNInx3TKpzzwhFnmrFfSWcU1JTnW8Fs5LQTzpQBRN71HhhxOa/Ibc1 6jw6nJE5uzhUbTKCngrtDia+qPtAyIxGQVoeGFU1IrcAIvI2bgTK6jgpmLufAB2kTzuFO/ caqpXALZUpWyU2bepX9u8M7c3dJHfZ/m1LsCwIUTdOh+SYAYH+Ev5zfdaBBTBBMz6EZx5l mCkKFzzoorzIfZc40yG6/VGTLQsVN7KZKcWZinw1sYK3/jtSGTNtHsLw4B62Iw== 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 4RhlkP1mxkzWSD; Fri, 8 Sep 2023 05:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3885vHiW008864; Fri, 8 Sep 2023 05:57:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3885vHwf008861; Fri, 8 Sep 2023 05:57:17 GMT (envelope-from git) Date: Fri, 8 Sep 2023 05:57:17 GMT Message-Id: <202309080557.3885vHwf008861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 602d3601863d - main - arm64: start defining a std.apple configuration List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 602d3601863de3a4234ac24d3ebb5d85fe380664 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=602d3601863de3a4234ac24d3ebb5d85fe380664 commit 602d3601863de3a4234ac24d3ebb5d85fe380664 Author: Kyle Evans AuthorDate: 2023-09-08 05:53:51 +0000 Commit: Kyle Evans CommitDate: 2023-09-08 05:53:51 +0000 arm64: start defining a std.apple configuration The M1 uses FDT, and has bge to start with. Add a SOC_* option for the first SoC we'll be supporting. IOMMU is added commented out because it does have it, but IOMMU is not well-tested on aarch64. An initial version of the DART driver will be upstreamed that just puts the DARTs that support bypass mode into bypass mode -- we'll be missing some functionality, but we at least still end up with some USB ports. Reviewed by: karels, manu Input from: jrtc27 (IOMMU) Differential Revision: https://reviews.freebsd.org/D39823 --- sys/arm64/conf/GENERIC | 1 + sys/arm64/conf/std.apple | 10 ++++++++++ sys/conf/options.arm64 | 1 + 3 files changed, 12 insertions(+) diff --git a/sys/arm64/conf/GENERIC b/sys/arm64/conf/GENERIC index 2267429f16d0..51d830c5e5d6 100644 --- a/sys/arm64/conf/GENERIC +++ b/sys/arm64/conf/GENERIC @@ -28,6 +28,7 @@ include "std.al" include "std.allwinner" include "std.altera" include "std.amd" +include "std.apple" include "std.arm" include "std.azure" include "std.broadcom" diff --git a/sys/arm64/conf/std.apple b/sys/arm64/conf/std.apple new file mode 100644 index 000000000000..9eb6f279fccc --- /dev/null +++ b/sys/arm64/conf/std.apple @@ -0,0 +1,10 @@ +# +# Apple SoC support +# + +options SOC_APPLE_T8103 + +#options IOMMU +options FDT + +device bge diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64 index c53723ae2d19..ab4b01b2e38a 100644 --- a/sys/conf/options.arm64 +++ b/sys/conf/options.arm64 @@ -23,6 +23,7 @@ EFIRT opt_efirt.h SOC_ALLWINNER_A64 opt_soc.h SOC_ALLWINNER_H5 opt_soc.h SOC_ALLWINNER_H6 opt_soc.h +SOC_APPLE_T8103 opt_soc.h SOC_BRCM_BCM2837 opt_soc.h SOC_BRCM_BCM2838 opt_soc.h SOC_BRCM_NS2 opt_soc.h From nobody Fri Sep 8 06:03:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rhlst6wQSz4s862; Fri, 8 Sep 2023 06:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rhlst6VPMz4Pmn; Fri, 8 Sep 2023 06:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694153026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t5RQvFFSWTd+ypT25feo9TzPnI7WeAWlZUeU+6hozr0=; b=u5ALullav7J66MD/FBoO9bCYtRhM5iOzRBtJkXFlgUAhTlWZqDT9LERzeIF7PRUdYYJgsu bpW92uzFyFYoYL+vhVlfMSAxOu8L1YgM1U8tmz/29c5ySc14WtQ3va0TyeEf01TRWIzvfH lw9C+2YbyjTirA04o81NDrnUEkXGEcgf4QqNhN7T0b6LDQbnOKy80qXXmujqnS4pCV3I3x EVctlqgrXQOpleo80WspM7EHnqCkkYTNVWdLPHXA/+NpBQF0Rh1UNpksI+KJZSyelIB1Lk 3IQNHhxNISvxQdWVPcSWKzowsbRese0BVr6n9/siNeZxvqymhbso0O6uViJh5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694153026; a=rsa-sha256; cv=none; b=ysLekCrLAS/mMVT9MtH8yXoTbCtNkfsxdNKOTGk8yDHR+dluIIRYuWSMIO5IITYbvaSKu3 Aj/l9+Psbm7UlF3nVINJJoQqoS3edO7ru0Bq3uhOU1XmK7LDJg1HakKbwyHj72MgGRSwrp TxZ/9NcSiwijlLche8nV5qNGcL/2wcTf4jjPy7HQZo9P+h8jk0Qyv9BalpV4o6lTqXO827 /UCyydfglVSPqiToEWYSr2MV0wdikV1FN+g20FvD2m0NaHA1obViNYA6aeD5O3/ZTdD++s XI1P1xnTK0jjp2TyZbR8BWBVAYwWXEsKe6+2mh3sm65SIGk9SDMBnS2WMVNZdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694153026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t5RQvFFSWTd+ypT25feo9TzPnI7WeAWlZUeU+6hozr0=; b=d1D4cnhzzX+uWDAxx6DHECNy96iXbthUcBghSdZuHaIthOH7qU20wH+hz+SYiiCR6L4QHe qQ0l/aUfHRb8MNgoz8OSaPH9lJqs/kRgKQX0xkA+JMvNJvJvBzuEeS/YXR4c8VzanP3+aG HLhw+JZs1hpJJl3Mo2J2SMqUHxyg32Y1TaCfJcphpvo8AjYPk9TA4VoljI1IZVIF2S5O1M JLEIKiPj2ve6fikddqLyMCMNxQAaLsEcs99TtgjGC7XIGQJw8CkX5mdsqTLN2tFtGqxZom YWrtaCftTHv7a3oMtp4m7qNy5Rz53VSRxZvD9tk6P/hxHKXcCN5iRKLpE7YK5Q== 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 4Rhlst5ZBCzWHH; Fri, 8 Sep 2023 06:03:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38863k5A026500; Fri, 8 Sep 2023 06:03:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38863kYX026497; Fri, 8 Sep 2023 06:03:46 GMT (envelope-from git) Date: Fri, 8 Sep 2023 06:03:46 GMT Message-Id: <202309080603.38863kYX026497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: ea1024f468a4 - stable/13 - MFC: MFV: zlib: examples: define functions as static ones. (PR #855) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ea1024f468a4fbfa694937937f0f1f6277be8170 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=ea1024f468a4fbfa694937937f0f1f6277be8170 commit ea1024f468a4fbfa694937937f0f1f6277be8170 Author: Xin LI AuthorDate: 2023-09-05 03:14:31 +0000 Commit: Xin LI CommitDate: 2023-09-08 06:03:28 +0000 MFC: MFV: zlib: examples: define functions as static ones. (PR #855) (cherry picked from commit ef3a764bc5bed4bc071a81e04c4d3254010274c3) --- sys/contrib/zlib/test/example.c | 24 ++++++++++++------------ sys/contrib/zlib/test/minigzip.c | 30 +++++++++++++++--------------- usr.bin/minigzip/Makefile | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/contrib/zlib/test/example.c b/sys/contrib/zlib/test/example.c index 582a17a3ce94..f27ba8e2fdcb 100644 --- a/sys/contrib/zlib/test/example.c +++ b/sys/contrib/zlib/test/example.c @@ -36,12 +36,12 @@ static uLong dictId; /* Adler32 value of the dictionary */ #ifdef Z_SOLO -void *myalloc(void *q, unsigned n, unsigned m) { +static void *myalloc(void *q, unsigned n, unsigned m) { (void)q; return calloc(n, m); } -void myfree(void *q, void *p) { +static void myfree(void *q, void *p) { (void)q; free(p); } @@ -57,7 +57,7 @@ static free_func zfree = (free_func)0; /* =========================================================================== * Test compress() and uncompress() */ -void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; uLong len = (uLong)strlen(hello)+1; @@ -81,7 +81,7 @@ void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test read/write of .gz files */ -void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { +static void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { #ifdef NO_GZCOMPRESS fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n"); #else @@ -163,7 +163,7 @@ void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { /* =========================================================================== * Test deflate() with small buffers */ -void test_deflate(Byte *compr, uLong comprLen) { +static void test_deflate(Byte *compr, uLong comprLen) { z_stream c_stream; /* compression stream */ int err; uLong len = (uLong)strlen(hello)+1; @@ -198,7 +198,7 @@ void test_deflate(Byte *compr, uLong comprLen) { /* =========================================================================== * Test inflate() with small buffers */ -void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -237,7 +237,7 @@ void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test deflate() with large buffers and dynamic change of compression level */ -void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { z_stream c_stream; /* compression stream */ int err; @@ -290,7 +290,7 @@ void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test inflate() with large buffers */ -void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -329,7 +329,7 @@ void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test deflate() with full flush */ -void test_flush(Byte *compr, uLong *comprLen) { +static void test_flush(Byte *compr, uLong *comprLen) { z_stream c_stream; /* compression stream */ int err; uInt len = (uInt)strlen(hello)+1; @@ -364,7 +364,7 @@ void test_flush(Byte *compr, uLong *comprLen) { /* =========================================================================== * Test inflateSync() */ -void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { +static void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -404,7 +404,7 @@ void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { /* =========================================================================== * Test deflate() with preset dictionary */ -void test_dict_deflate(Byte *compr, uLong comprLen) { +static void test_dict_deflate(Byte *compr, uLong comprLen) { z_stream c_stream; /* compression stream */ int err; @@ -438,7 +438,7 @@ void test_dict_deflate(Byte *compr, uLong comprLen) { /* =========================================================================== * Test inflate() with a preset dictionary */ -void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ diff --git a/sys/contrib/zlib/test/minigzip.c b/sys/contrib/zlib/test/minigzip.c index 8a21ddfb57e9..c72356dbccf2 100644 --- a/sys/contrib/zlib/test/minigzip.c +++ b/sys/contrib/zlib/test/minigzip.c @@ -149,12 +149,12 @@ static void pwinerror (s) # include /* for unlink() */ #endif -void *myalloc(void *q, unsigned n, unsigned m) { +static void *myalloc(void *q, unsigned n, unsigned m) { (void)q; return calloc(n, m); } -void myfree(void *q, void *p) { +static void myfree(void *q, void *p) { (void)q; free(p); } @@ -167,7 +167,7 @@ typedef struct gzFile_s { z_stream strm; } *gzFile; -gzFile gz_open(const char *path, int fd, const char *mode) { +static gzFile gz_open(const char *path, int fd, const char *mode) { gzFile gz; int ret; @@ -201,15 +201,15 @@ gzFile gz_open(const char *path, int fd, const char *mode) { return gz; } -gzFile gzopen(const char *path, const char *mode) { +static gzFile gzopen(const char *path, const char *mode) { return gz_open(path, -1, mode); } -gzFile gzdopen(int fd, const char *mode) { +static gzFile gzdopen(int fd, const char *mode) { return gz_open(NULL, fd, mode); } -int gzwrite(gzFile gz, const void *buf, unsigned len) { +static int gzwrite(gzFile gz, const void *buf, unsigned len) { z_stream *strm; unsigned char out[BUFLEN]; @@ -227,7 +227,7 @@ int gzwrite(gzFile gz, const void *buf, unsigned len) { return len; } -int gzread(gzFile gz, void *buf, unsigned len) { +static int gzread(gzFile gz, void *buf, unsigned len) { int ret; unsigned got; unsigned char in[1]; @@ -258,7 +258,7 @@ int gzread(gzFile gz, void *buf, unsigned len) { return len - strm->avail_out; } -int gzclose(gzFile gz) { +static int gzclose(gzFile gz) { z_stream *strm; unsigned char out[BUFLEN]; @@ -283,7 +283,7 @@ int gzclose(gzFile gz) { return Z_OK; } -const char *gzerror(gzFile gz, int *err) { +static const char *gzerror(gzFile gz, int *err) { *err = gz->err; return gz->msg; } @@ -295,7 +295,7 @@ static char *prog; /* =========================================================================== * Display error message and exit */ -void error(const char *msg) { +static void error(const char *msg) { fprintf(stderr, "%s: %s\n", prog, msg); exit(1); } @@ -305,7 +305,7 @@ void error(const char *msg) { /* Try compressing the input file at once using mmap. Return Z_OK if * if success, Z_ERRNO otherwise. */ -int gz_compress_mmap(FILE *in, gzFile out) { +static int gz_compress_mmap(FILE *in, gzFile out) { int len; int err; int ifd = fileno(in); @@ -338,7 +338,7 @@ int gz_compress_mmap(FILE *in, gzFile out) { * Compress input to output then close both files. */ -void gz_compress(FILE *in, gzFile out) { +static void gz_compress(FILE *in, gzFile out) { local char buf[BUFLEN]; int len; int err; @@ -366,7 +366,7 @@ void gz_compress(FILE *in, gzFile out) { /* =========================================================================== * Uncompress input to output then close both files. */ -void gz_uncompress(gzFile in, FILE *out) { +static void gz_uncompress(gzFile in, FILE *out) { local char buf[BUFLEN]; int len; int err; @@ -390,7 +390,7 @@ void gz_uncompress(gzFile in, FILE *out) { * Compress the given file: create a corresponding .gz file and remove the * original. */ -void file_compress(char *file, char *mode) { +static void file_compress(char *file, char *mode) { local char outfile[MAX_NAME_LEN]; FILE *in; gzFile out; @@ -426,7 +426,7 @@ void file_compress(char *file, char *mode) { /* =========================================================================== * Uncompress the given file and remove the original. */ -void file_uncompress(char *file) { +static void file_uncompress(char *file) { local char buf[MAX_NAME_LEN]; char *infile, *outfile; FILE *out; diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile index e7174694865a..6b04d8a65599 100644 --- a/usr.bin/minigzip/Makefile +++ b/usr.bin/minigzip/Makefile @@ -4,7 +4,7 @@ SRCDIR= ${SRCTOP}/sys/contrib/zlib/test PROG= minigzip -WARNS?= 2 +WARNS?= 5 CFLAGS+=-DUSE_MMAP LIBADD= z From nobody Fri Sep 8 08:08:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhpdN5QNpz4sHY7; Fri, 8 Sep 2023 08:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhpdN4rqXz3GhK; Fri, 8 Sep 2023 08:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694160488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1YsH3YpAYSpLOA3VirygtdlpC6q43yuznHUNEJTgHWk=; b=XpEeJx8SnYikATpVMzXAz1u/+JWPw5PP5QRE26BYbx2+WO5yv9mcC2JZWip7l8KR5WHYdy VO2eSo3KuutY1oO0E/xnCV+iWXRmcMnmthenoh9lcDxqODp4pjl7CSAU58/h2toCGLDFoW O0E9JH9n8KYFRAZlgyhRBTWAOx/DTA29EnKbUBoGiFZdZxQ4Jogq50Mz0rzP/Nw3H03ZOu B0u+dHAiLZWWPfBCiLvkKGdQTYbjHCjTkRN1fQdo+VJ3j+4W52JLYJ70aRykVvBtNbJkWL 0k1ho8fs5/J1cTUmX6kHtgCuY/O9znMbi7o1rGU/RBQ+NV8Msc68H9zUkwq8yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694160488; a=rsa-sha256; cv=none; b=l+5UWbITjETpP4+U6b2dXr7isZlqnPRHQChl5v/AHm7W4xnokZCK50JpCbaFNOnPrav2Jh n1KHUt4UW2jqDX8/F3hVQpahsfbTRUvP2yh6unKpc0SCEKORBG/4ECXEoWnHZXM+ShSFC8 9RoOmrysJBXxsm8IOrEUn1vLaUpPzlhLeNxx6IPyFcqnDErMDnPMZOujkD3TwS8sB/TMBW tZex8uYlTQmCg8bOUOa0dVwG58v0iyNT31fLmP3PgaM/qZsvAcdbpuOBu+w8quNuwGJnrp HGTjFYF0VFNpfyHh9lGTxcIiVl4QP6TwvbiYggczgzOXu3B/IDsfWKfSPDuIpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694160488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1YsH3YpAYSpLOA3VirygtdlpC6q43yuznHUNEJTgHWk=; b=bRgbEXdTlRL+EUhcFw9TSOkHKV22kuidK+mLi/jN2lVrdv+cynY/jMa/TRUbAviUpS0/6G zAtYGDA26TlMfwWMbeg36AMxleux5wh40kxW8J/Ug/iC72Q0NTKulOuorCPJ0xCdUEHsSR R7BNGRlSWDD7WO3RVc/nR7jACiG0OfftPh+9CE2/CLyPkvlREtZX7VqA20MXCn8O4hjHrm 8ZNo/h1nOj74mQ8Yoe4GeOeEGxAnc7Qex2i5LhIhk8m+d7WQ/mjwcGCEgyxgjiMiLJ4qk4 LX7YO/w7o4dqjp9OLZJHSw/olcmch5sNh6DGpxk3jlcKKbt/wDLhDUG82Uv9Eg== 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 4RhpdN3cnTzYx9; Fri, 8 Sep 2023 08:08:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388888lO025610; Fri, 8 Sep 2023 08:08:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38888828025607; Fri, 8 Sep 2023 08:08:08 GMT (envelope-from git) Date: Fri, 8 Sep 2023 08:08:08 GMT Message-Id: <202309080808.38888828025607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 229c65a83fbe - main - kern: Globally define abs64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 229c65a83fbe0ede8c617e35d8f8c14d5ebadc19 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=229c65a83fbe0ede8c617e35d8f8c14d5ebadc19 commit 229c65a83fbe0ede8c617e35d8f8c14d5ebadc19 Author: Emmanuel Vadot AuthorDate: 2023-09-07 07:48:51 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-08 07:44:06 +0000 kern: Globally define abs64 So we can use it in non-linuxkpi sources. Reviewed by: emaste, mmel Differential Revision: https://reviews.freebsd.org/D41767 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/compat/linuxkpi/common/include/linux/kernel.h | 6 ------ sys/sys/libkern.h | 1 + 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index 1490505a02fe..2ee452cb39ed 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -623,12 +623,6 @@ mult_frac(uintmax_t x, uintmax_t multiplier, uintmax_t divisor) return ((q * multiplier) + ((r * multiplier) / divisor)); } -static inline int64_t -abs64(int64_t x) -{ - return (x < 0 ? -x : x); -} - typedef struct linux_ratelimit { struct timeval lasttime; int counter; diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index 86b4c90333e5..92698a3f9b23 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -113,6 +113,7 @@ static __inline off_t omax(off_t a, off_t b) { return (a > b ? a : b); } static __inline off_t omin(off_t a, off_t b) { return (a < b ? a : b); } static __inline int abs(int a) { return (a < 0 ? -a : a); } static __inline long labs(long a) { return (a < 0 ? -a : a); } +static __inline int64_t abs64(int64_t a) { return (a < 0 ? -a : a); } static __inline quad_t qabs(quad_t a) { return (a < 0 ? -a : a); } #ifndef RANDOM_FENESTRASX From nobody Fri Sep 8 08:08:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhpdP69Jrz4sHVh; Fri, 8 Sep 2023 08:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhpdP5LLLz3GxF; Fri, 8 Sep 2023 08:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694160489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4l0+uDj1PLafu0Q+4ZWIw5hpmq+q7xeQZCIF23soOYY=; b=x6ZD+f4hUEBKisyhUtquBCr2zeDsHjOLSN4K5IdlBAj6oavh/Q/mA+Eq/NM6jbZsEySMuG P2SnpwY1DpvBanz971zpgf8/qVV2wUNMLBQ1ML6SNyR5Un0PVT/12jCEaTcJGuGnwjRu1S Qi66dW57smrNvEMJxGM/IMikBMiyfWcimujmP4end0jnG1Zcno9aP67KtChEJrPToSI3Jg r3MDD/Tbt5lmfp7YHtOkm+PuQSCfjxiF5ciJnLmsSJ8HJA+gedVEAkdpLI3bkjqlWGr898 7SPVROowW17u/IT/O2+tXMGtxFMmlB2ssRcIfPF8yePFVtd+IXXxM1ygXPIu0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694160489; a=rsa-sha256; cv=none; b=PqoVBZoW5octWXUWmqgbt10Wlv5zH6ocUcWKN63lUfjODhVNMGBfN0a8XUMDVgP3jt4F8g 588LYX57FbabXsAA6hIryQ9VkDOB6X0n7+Qf8WgBCWJ2nkAKXF0RZBQgHzKBE6TsCTpeLU xb4NS9D8j0//m+NJ6PO1wcKwHZhwESNxzboZ4XtmvkOWP3NDZuJ//8riY2x7wzvwtd7Ejf BlPwniXZHMWc9oQwgY3LokUaC8WH+IthDauXNuNwLl9nAEjleL6crVE/EXviKrZEt+3GT6 YZJmRGRJEznLT9s34UmyhFLx9CSH8XtanmwReBolCUQkD18IK+cThIn80ml8/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=1694160489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4l0+uDj1PLafu0Q+4ZWIw5hpmq+q7xeQZCIF23soOYY=; b=I1PL+OVIAAfOmZtazwz2+fb/ZpFg4dLK7GOHL2gvfZMzf6pWFKmxrczsPe3zDGt/Ed46MR nkYdc3RkyoW2c90A4rbY86WY8lJacUCysKAxlYJuYorNDU3aQWfGLHCJIixBXSbY1X/cBJ uOm+K+0mxDKP1F739qNtg7EKpWK6fqLs4JEqYtMYfrcxyNE+sVRC1cUM4OXlTUsMr9Acdw Z1R4CfsnNc6UdH87iAgm0VdY4GYNdMYoBzHKgTvab8zNv1J5V7wK9bv/0CY2bXx+fLhFpI pxlTYSraQlBQKkYlTNbOrUPpXDGqgupBu05sENY68gVNVTJ0sKsR5Qrfvelg8g== 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 4RhpdP4M0WzZmw; Fri, 8 Sep 2023 08:08:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388889TB025659; Fri, 8 Sep 2023 08:08:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3888893Y025656; Fri, 8 Sep 2023 08:08:09 GMT (envelope-from git) Date: Fri, 8 Sep 2023 08:08:09 GMT Message-Id: <202309080808.3888893Y025656@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 17c17872ca98 - main - cpufreq_dt: Find the closest frequency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17c17872ca98df0e2b9f9c7a2c41ef73f7dee21a Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=17c17872ca98df0e2b9f9c7a2c41ef73f7dee21a commit 17c17872ca98df0e2b9f9c7a2c41ef73f7dee21a Author: Emmanuel Vadot AuthorDate: 2023-09-06 16:40:17 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-08 07:44:32 +0000 cpufreq_dt: Find the closest frequency When building the frequencies table we convert the value in the DTS to megahertz and loose precision. While it's not a problem for most of the DTS it is when the expected frequency value is strict down to the hertz. So it's either we don't truncate the value and have some ugly and long values in the sysctls or we just find the closest frequency. Do the latter. Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D41762 Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/cpufreq/cpufreq_dt.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/dev/cpufreq/cpufreq_dt.c b/sys/dev/cpufreq/cpufreq_dt.c index aaeada3a4e58..be434cabb4fd 100644 --- a/sys/dev/cpufreq/cpufreq_dt.c +++ b/sys/dev/cpufreq/cpufreq_dt.c @@ -104,17 +104,26 @@ static const struct cpufreq_dt_opp * cpufreq_dt_find_opp(device_t dev, uint64_t freq) { struct cpufreq_dt_softc *sc; - ssize_t n; + uint64_t diff, best_diff; + ssize_t n, best_n; sc = device_get_softc(dev); + diff = 0; + best_diff = ~0; DPRINTF(dev, "Looking for freq %ju\n", freq); - for (n = 0; n < sc->nopp; n++) - if (CPUFREQ_CMP(sc->opp[n].freq, freq)) - return (&sc->opp[n]); + for (n = 0; n < sc->nopp; n++) { + diff = abs64((int64_t)sc->opp[n].freq - (int64_t)freq); + DPRINTF(dev, "Testing %ju, diff is %ju\n", sc->opp[n].freq, diff); + if (diff < best_diff) { + best_diff = diff; + best_n = n; + DPRINTF(dev, "%ju is best for now\n", sc->opp[n].freq); + } + } - DPRINTF(dev, "Couldn't find one\n"); - return (NULL); + DPRINTF(dev, "Will use %ju\n", sc->opp[best_n].freq); + return (&sc->opp[best_n]); } static void From nobody Fri Sep 8 10:06:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhsGB50ndz4sZyJ; Fri, 8 Sep 2023 10:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhsGB4Yfgz4Mmy; Fri, 8 Sep 2023 10:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694167602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaYIQldtozP/wf4BXYFbXRgCaa4pXJtBbrag4WxVgDc=; b=pb58DzZBLekBrJJU8NwmyPO8l8s4XIwSakyDUo+hv4qhUck1H0LJyrMqfe2lvvPpUZj50K G00g2rIWrVzk3/8/24DdAkwXCbJY8Chhn59M8PFwk4XGGInNHMJpagQ9/VZeJ2Rso3P5wV xNzJpE5VNtzkjRAn6VzpqTfBIzbrEWf3wPZku0HdCY87gx23RJHieqVEpLRlBxuWmFFsUT Lp8L58qjZyJiFzJ6eFbr5CC9PiS4xiRtjp1rzBH7N82zBUKH38wtz1GUP378TugioLWoYj rcCLZG2QSUC4C9K8AmkVITRSnllBGw9/gp5ni9mrMvypzfBA+IV9MHG50W83bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694167602; a=rsa-sha256; cv=none; b=LKHWH1sGQdMEI3hr/7Y3VCzXrVQuVl5k5U5X+raRQjfDXdK1gBKykV0dBlwuc2uonREWCu H9FOxh+CY50NnVGQ3htzedP/cqgCiDVYWdw9hX4jrFQPmZ+XMXFPAj9TAuclCoSwPkrG7r /mVZE9T4wht4CJNxQKtzQCD3tMJ0Ae6jsacfG5hNxEVE5pJhgh4aINDmrSN3bgpmfVX+DW kXn40ySqrrQ8eFuFdyLf5XuRt9mxPHs9pfKfWsw2CU3ixX8C2HOFkeBun+CzbG0Euop1+s dgCTUyvsteG1W2UVjE5O5t8Btu7ZeRInZfUA5ZaSQ9IUQDcxR2HTRUw7ZASARA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694167602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jaYIQldtozP/wf4BXYFbXRgCaa4pXJtBbrag4WxVgDc=; b=w0NKklEZgq9612SXSd4aHdihitHvZnEjiXO2xdIgcCLKrFevTI7vnhPi7AwQPlA8gd5QZe gY1RmUpoYsqZkN4IxSy3DIJIWy7hKs4Be33sG528LAeiNlSn0Gbiog0QZ+rXFNIGUWT2nm t/Jyvna9Eiv+yMnyo5wXq0MW4HCe6d4uRf+HLPEx0UDu2QtgfHT9W+jx9dnlHpJ+0oAywu yOk3xE7HgW5rFIWR4qIGfQDMkV6E72ukyA7zXBEcJTT50zoeVuk7wp0QfQgNeQ+QhwXttb x8RMkVhlGUrI8Rdncbr3L8gtLC9lc+UY9hb11CK23/nZwDtHBlvTYFNrTBhvkg== 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 4RhsGB3X7pzdLJ; Fri, 8 Sep 2023 10:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388A6gaV025382; Fri, 8 Sep 2023 10:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388A6gMN025379; Fri, 8 Sep 2023 10:06:42 GMT (envelope-from git) Date: Fri, 8 Sep 2023 10:06:42 GMT Message-Id: <202309081006.388A6gMN025379@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9a071e4e5764 - main - Assert that ifnet_detach_sxlock is held where needed. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a071e4e576490370f26307405f12200218dec54 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9a071e4e576490370f26307405f12200218dec54 commit 9a071e4e576490370f26307405f12200218dec54 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 10:06:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 10:06:11 +0000 Assert that ifnet_detach_sxlock is held where needed. Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kp Differential Revision: https://reviews.freebsd.org/D41770 --- sys/net/if.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/net/if.c b/sys/net/if.c index 7a78ebcfea05..f7636d46331a 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -1128,6 +1128,8 @@ if_detach_internal(struct ifnet *ifp, bool vmove) shutdown = VNET_IS_SHUTTING_DOWN(ifp->if_vnet); #endif + sx_assert(&ifnet_detach_sxlock, SX_XLOCKED); + /* * At this point we know the interface still was on the ifnet list * and we removed it so we are in a stable state. From nobody Fri Sep 8 10:12:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhsNy26Snz4sdtq; Fri, 8 Sep 2023 10:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhsNy1gs5z4PZb; Fri, 8 Sep 2023 10:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694167954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=clQysOK9KDMsf7VihPhw6Z2rllETChB9XxSed5CMbf8=; b=K/dN5tm5LFv5PrZ4wn5VT922msFtWIVSeOxXCbeAsY0Ras304sdjE2Piuwc0kN3Ga1Ei5x IZqPRZAVAzlLVyM6YeFmY90c79q2ZDa1NUuHtdbEa7JTQwaE2LHiO9GcBIlN3a/4su6Qs9 Mm1RM9ME7p/XzT1kOhrFmmWleIZJ3yKlL5X6XNOjOM9efcXgY7E3l6l+r4eHEgi0RN8vi2 lDDkilFs8kTUu389q4mYZtKHSXNRP3Ekr7FMk48Tg5O5q64+oPOjAAPctKBFMXbFei2HWf e1lh6uWolIbcY2mcUVptbEh3OvAtKwQDVQyB4uRnIuh201h8btqBdPw+26xnaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694167954; a=rsa-sha256; cv=none; b=RZSjdKwhyjHLygS043qzi7ngx7OCu6ynTAxfL4HSVqSzFb66Wg5VSuxxLV9k9bN6oRqh+J WaPS5LTwTK8yiHRINSqfW8niuRYRbdCECXGk69PaUYJbcdYblUe8W9J+5xw9AaJHdiw2WL qixYxeZAYZ8z4r1sBqzG8lL9tsNLT97i/sywuVUMb+lifcL6tgtJiOnxYeWm12Qt/irZlx w32nWST59yRULyEyG+H+6sudA4AeOBriE+WvfP2tjtSK49eFQ82gLfT53lfc0roWhewo82 APSYDrKiDXkdcnjOO76k33hEjfv8+SyDfszgf8zz8bh1r1Zkz6CaxUUqd/gGSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694167954; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=clQysOK9KDMsf7VihPhw6Z2rllETChB9XxSed5CMbf8=; b=XR0DotKRWG6TMhSzCrhZieh0lZP/WwQAlKyPKo9WoW4DiQVfx0CP0f3CcK1d1pOoAOoM0J tYQoCUHOXJgwiq45ACs/TWJAzNKdfhp/SWJjtvkkrjRyfV3Y1O4S0M88yYk3nm539dK5N3 dlkP71/DlVCm8mkIIzQZREm3Nn2vMVYVZkh4whOEEHKxa9Z2KHdUxSXM+Aw1pBM03cJjRk dRIB4g9913Y8CtWbXaFoRY65ELSwPJiqlC4ekeFgiYUjIhGcb5ZBAKFrazuYQVZns79IbD 5LeOel7K+eB0xmioyiVutKWnqiiYz6vQBt9lqNYx/WkV/F8sz6UoMZDW/EMgeQ== 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 4RhsNy0klwzd5k; Fri, 8 Sep 2023 10:12:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388ACYAm040938; Fri, 8 Sep 2023 10:12:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388ACYws040935; Fri, 8 Sep 2023 10:12:34 GMT (envelope-from git) Date: Fri, 8 Sep 2023 10:12:34 GMT Message-Id: <202309081012.388ACYws040935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 9f9ba5669212 - stable/12 - wmistat: don't restrict reading to the pid that opened the fd. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9f9ba5669212d3df01d007fb54056e37814fc438 Auto-Submitted: auto-generated The branch stable/12 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f9ba5669212d3df01d007fb54056e37814fc438 commit 9f9ba5669212d3df01d007fb54056e37814fc438 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-29 17:23:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 10:12:21 +0000 wmistat: don't restrict reading to the pid that opened the fd. PR: 273405 MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41621 (cherry picked from commit 28977cb9bc15a7f1fb7d28e14cd03f8dafd4e155) --- sys/dev/acpi_support/acpi_wmi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c index 93621289c20f..23e117848543 100644 --- a/sys/dev/acpi_support/acpi_wmi.c +++ b/sys/dev/acpi_support/acpi_wmi.c @@ -951,8 +951,7 @@ acpi_wmi_wmistat_read(struct cdev *dev, struct uio *buf, int flag) sc = dev->si_drv1; ACPI_SERIAL_BEGIN(acpi_wmi); - if (sc->wmistat_open_pid != buf->uio_td->td_proc->p_pid || - sc->wmistat_bufptr == -1) { + if (sc->wmistat_bufptr == -1) { ret = EBADF; } else { From nobody Fri Sep 8 10:13:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhsQ30Hm4z4sfW6; Fri, 8 Sep 2023 10:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhsQ26lh1z4Pj6; Fri, 8 Sep 2023 10:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oz3DfJEOtLiCx8nFTFPUqPPuTgOZHfBLEtzg3noGD6Q=; b=hE5+gqjgHK+66giksCqvJTMBUPNPM1RrtYCHo2na5KLkeeWiRCxEj7a+vjHXfViGTOEOio BJ4rZyHm/dLyQhQN9t1awv4RgN1xsrgQHIH6N4PTLzjoveC/373BG208sZhqAg7vfVWRKh o+JnD9hR9SWdxeeD2cx2ho26zD+I7tvZhcUpMo6GtuQmRx5bG+GeO5vl65ZQr4pFeVenxe FRMrARBR0yueGvvmutdpa0uEVKg0iBOcuAFHz3gES6ewUwcwdAY1tMyI9vWtaE0cFILaKt AMahTz51KWR0jhCwvn3binVbvE3SFH71/K5Q8D8rpbcskP/Ry++yXrpFQzUzjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694168010; a=rsa-sha256; cv=none; b=nvDoEUxasulha5r5X4r/apx9khLB6id0mOW+MgPWvrm5bu8cLO5C3o+0ax3DxbBGqG5oD8 +2C9AX6QXTOguddRetVK5LbhogPpYmdrfd7N3eDcCOBiq8hEWaojo5Mpa+Ov67FN+F2Wzg inLDhyDqGpfOZDjGw32YrCW+G0JaZ95QPpk5eQLRRU/HBYN7q296uV2gLZdew9FFJyiNxa lklniBWzVhOv6Ekx5cfbhOKlFcSaYakWk3X3lPq3REGBv8Qj89uz4KegvzR6xv5rQ2gI6W cGH0/XDSkJkwNgJy+L/aPAFAAzWmz98+SVdK26x7sVx+UOQ7BEVf7Z1J1Ru4ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168010; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oz3DfJEOtLiCx8nFTFPUqPPuTgOZHfBLEtzg3noGD6Q=; b=WpIasMCdNBRsVc29T60PYAx8Zjd/ogFyzdcWYUrsrZ94L49akB3sJ50NbK7PkkOmLjji3i BD37Fdfiq89MbIyWc1+hhyLXYj7EJHC8LCvJzhv3TlpMI5KjO4xt5DMaYM1IjO+PUqatXL y7ceRyTWcUvROccM7rkqMwqEJGM82pGcx0Lmvn81LGnf0fNnXXYJfl2QC+kprqiQlsDGT7 ugpHnTwbAE6m/rDGZek76KzyvrKpgHdgPqZ50wu+rjfieRo8Is8m2hGS3l+IsW8Lr0RJNT YG0ZPX30IubkPFZ93E46Bqcy2smqDMsJDlBDAFYvxbCDqOIS9Pg6oPWRJXA33g== 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 4RhsQ25rhFzdyG; Fri, 8 Sep 2023 10:13:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388ADUXL041207; Fri, 8 Sep 2023 10:13:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388ADU1F041204; Fri, 8 Sep 2023 10:13:30 GMT (envelope-from git) Date: Fri, 8 Sep 2023 10:13:30 GMT Message-Id: <202309081013.388ADU1F041204@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 17ed300f0833 - stable/13 - wmistat: don't restrict reading to the pid that opened the fd. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 17ed300f0833c8e6dd6bce95748f5dbe33050a3c Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=17ed300f0833c8e6dd6bce95748f5dbe33050a3c commit 17ed300f0833c8e6dd6bce95748f5dbe33050a3c Author: Dag-Erling Smørgrav AuthorDate: 2023-08-29 17:23:16 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 10:09:22 +0000 wmistat: don't restrict reading to the pid that opened the fd. PR: 273405 MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D41621 (cherry picked from commit 28977cb9bc15a7f1fb7d28e14cd03f8dafd4e155) --- sys/dev/acpi_support/acpi_wmi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/dev/acpi_support/acpi_wmi.c b/sys/dev/acpi_support/acpi_wmi.c index 59872d632c22..2bdde3f21e5c 100644 --- a/sys/dev/acpi_support/acpi_wmi.c +++ b/sys/dev/acpi_support/acpi_wmi.c @@ -977,8 +977,7 @@ acpi_wmi_wmistat_read(struct cdev *dev, struct uio *buf, int flag) sc = dev->si_drv1; ACPI_SERIAL_BEGIN(acpi_wmi); - if (sc->wmistat_open_pid != buf->uio_td->td_proc->p_pid || - sc->wmistat_bufptr == -1) { + if (sc->wmistat_bufptr == -1) { ret = EBADF; } else { From nobody Fri Sep 8 10:13:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhsQ41Rcnz4sfZ0; Fri, 8 Sep 2023 10:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhsQ40dvVz4Q51; Fri, 8 Sep 2023 10:13:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kFZ7t0Rxh3Wg/9a7L9qTdCrge8ebdDNony98c6l7XXo=; b=vQ/gn5yG9AJvyM07T4e5PQp6vQA4usnDnGOJ+5wSCamy4STonafUqqKnPsoUUZMFsIBRRK +C6o9CusumRn19/rLV7AvkdaOAkre8fdp4rRZUO1qrdO1pkpwQ/ZLxC+DzAVO1J4QbQIWY X7TnfPhf/EhU16HT2P30tnM29CqIATvRKXsKmr5aHQVCUUxwYeIpDinjUr6/mtUZ7Sxv1r E7BdPUmguuJZG3/3erAFFF28D+2zS/PojfhpjTxWhMs84oWeWtIITfcMkDQlySyvtRvJ0k 7j7izL55P/kIhwTOxxX2lm8O3BBfXkLnLmzC5951YSOT2oL0fnWYd4Zrn+ycXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694168012; a=rsa-sha256; cv=none; b=iXtsq7zT0s8yVfY075IJP+Bs/Qmdb31KMQrjseI2Gvi8Jj8anttq1ieXZvWzWl7MKgY6B+ PfZP05A/NO+rpwPZCyICULT+dvSbrmTUSdkHA40o8Oc1hJ5+ZV89P94G1PyaHQpCQ7sKw3 zo9SznkpEq5TmxQSXzzz+R77CPZNwaBCF7H5vAGaz1sdixmnoonV7huNoEYCo25bjICCvc iMyrvLKvIFmLo5Eqkps7Lf11R577HPrfrzvV5f/JhZIA99qOH1KSPyePnpWJ/wyXiKmf9I 2anX5cdvuKqoGNUill130H9Vwq0UzUztfQkglJh+WJXs35l/uRIXomtEWfV+UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kFZ7t0Rxh3Wg/9a7L9qTdCrge8ebdDNony98c6l7XXo=; b=eJasdcSVeplLQSZTlR4aHi9f1Uq+1jLA8KgW3aJ24/+XHYzXuy0/UAo5b/vBmaj2rDsDSN /Xu7FNvMs3UtIib96X3iS0gYSanwQCrZ0SCMHSPijsvQciCtVGps5ze9ElC1U5LnKFHEuY 0fdDwr13OBapicdara0TpHWcfiWBmvsI2dhLl78Jra5P5XkbXZiNB4A0IerpBkCDKnX+wt clZVugb2mLcRtHRTCvFOswtyBctlCh9grmCqUxylfEq+hDkr4d/kHf6ancQLfvNfoi5FM0 4FVwbQEpjG5Ay6tYXengqtdTaxLYMnfvaq2ZOl07496GT69Sl+SfM+XeyM4CnA== 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 4RhsQ36qTfzd5m; Fri, 8 Sep 2023 10:13:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388ADV7k041256; Fri, 8 Sep 2023 10:13:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388ADVY2041253; Fri, 8 Sep 2023 10:13:31 GMT (envelope-from git) Date: Fri, 8 Sep 2023 10:13:31 GMT Message-Id: <202309081013.388ADVY2041253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 6d5d8c7b2c74 - stable/13 - if_vlan: Always default to 802.1q. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d5d8c7b2c745f29533a63d6bced705b9ecb1a57 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=6d5d8c7b2c745f29533a63d6bced705b9ecb1a57 commit 6d5d8c7b2c745f29533a63d6bced705b9ecb1a57 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-04 23:26:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 10:09:23 +0000 if_vlan: Always default to 802.1q. There is no reason for this fallback to be conditional on COMPAT_FREEBSD12. PR: 273539 MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Reviewed by: melifaro, allanjude Differential Revision: https://reviews.freebsd.org/D41717 (cherry picked from commit b451dcc84f1cfd1d14ede8a53d1d8359c9b85c94) --- sys/net/if_vlan.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 6c777a855039..9d0e6ae66b31 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1054,11 +1054,8 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) return error; vid = vlr.vlr_tag; proto = vlr.vlr_proto; - -#ifdef COMPAT_FREEBSD12 if (proto == 0) proto = ETHERTYPE_VLAN; -#endif p = ifunit_ref(vlr.vlr_parent); if (p == NULL) return (ENXIO); @@ -2034,10 +2031,8 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) error = ENOENT; break; } -#ifdef COMPAT_FREEBSD12 if (vlr.vlr_proto == 0) vlr.vlr_proto = ETHERTYPE_VLAN; -#endif oldmtu = ifp->if_mtu; error = vlan_config(ifv, p, vlr.vlr_tag, vlr.vlr_proto); if_rele(p); From nobody Fri Sep 8 10:16:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhsT61SYDz4sgjT; Fri, 8 Sep 2023 10:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhsT611kbz4RGX; Fri, 8 Sep 2023 10:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRU9Tf3dMeJz2tgkGmAwLUZ3HDJSsa+u2e9/1+9baW8=; b=hTjz2eIvYjxRUjxsLfFWUcsL3A5U4KOC9lpMuWNbyd2z5YOSc/Vx2Pixi/N1NF/ivIEkSp ADO/ohm8UVkr9u6Pr1xGGiudYmdGukeEP0J3Nfbu+luVHq6F9fKNUme0G+cucBF7jfXynT sI1llbwLY2edVaVmZJMwChK376qRGUksxhMnEzyopLmZCG/hN3XdeGY7NfA+zyFUoN973l vBaoiiPMYuOL0h8zSio4bitYfLtoCwFP+hRZ4Wk6VmfK9L1ymim8mBcTFzjIb1a9zYa3Iu 0xLDtG3JnG+lbwKawyRbkAGTBeXSimEHL3q8Da9snuhQCB7N3e+DWni9PhNJYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694168170; a=rsa-sha256; cv=none; b=IRkB6k1+n/T0OMKLMAZacrYYYUGvh3Mfnxvkxubctc7dKNrBLQQlc0UFrzl9psWxvdgE0V xfvS5WPzBmPqALSou9h5ArDrL28UXXe/3pfGVEoRnbWIBecohc3frpe0PfDyfMuw4E4kAO V9PbSD9y/GdZ9mGHITMcAZflV1iHkEMY1rjQr7tb5YBC4dwu39KBjHZM65aYj0BRotvIIp UziYskyM1/JmDxxzb9hdDfQMxEqTKFjoU+DfwBiswooVKfM4u8jywqJCeuBTwMuwSNcGe4 cTnKqQIq32bal+Ljsxk5Ibarx4CTxrgR8x7wnA5tx7FWsLsPT6+1C6A+rDkK2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168170; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CRU9Tf3dMeJz2tgkGmAwLUZ3HDJSsa+u2e9/1+9baW8=; b=XMvEFF+67G7Knr9A4cPRUxPyFuW7ni/bcra7GYIznyWt+6y0BUs80vT+9LE0He7M5+2UYX qlWPWhL8ZZ+19c6iJMrfcTbPSReQ/Z0yyafpWv31QMb45iNYjZR3JlJ5mdmfb1sTHU8uuI QKhNHuigEgDFot0TzOcHRrrbam3klAyWirk3ybmp3IJQQqQ+RniVF4WL9HgCctXz1F5CiO 9QgoOK/PvoxU/zaeSejRcSOX3QDfL0JdUw5nQjKSK1+iCzP/dJ8QebtWUwhrFCTM/k2Wss 4gjw580+MZnmX+fWcwe0csXvudDZ0yvduYqDv0h9LE3Vbl2sILgpszc/PLWsoQ== 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 4RhsT605m0zdns; Fri, 8 Sep 2023 10:16:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388AG9ZX041885; Fri, 8 Sep 2023 10:16:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388AG9SG041882; Fri, 8 Sep 2023 10:16:09 GMT (envelope-from git) Date: Fri, 8 Sep 2023 10:16:09 GMT Message-Id: <202309081016.388AG9SG041882@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 1f4786b88485 - stable/13 - libc: Fix fmemopen(3) prototype in fopen(3) man page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1f4786b8848504ff1c30a87258275e24811b583a Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=1f4786b8848504ff1c30a87258275e24811b583a commit 1f4786b8848504ff1c30a87258275e24811b583a Author: Dag-Erling Smørgrav AuthorDate: 2023-09-01 20:56:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 10:15:58 +0000 libc: Fix fmemopen(3) prototype in fopen(3) man page. While here, also update a mention of ANSI C. Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D41686 (cherry picked from commit 5a57401e7106132b61b16e34365cebf52b773007) libc: Further nit in fopen(3) man page. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41687 (cherry picked from commit c9f5889d05b5854be033849a4ff9985699071548) --- lib/libc/stdio/fopen.3 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3 index 74da88efff0f..6f03443caf42 100644 --- a/lib/libc/stdio/fopen.3 +++ b/lib/libc/stdio/fopen.3 @@ -31,7 +31,7 @@ .\" .\" @(#)fopen.3 8.1 (Berkeley) 6/4/93 .\" -.Dd May 1, 2020 +.Dd September 1, 2023 .Dt FOPEN 3 .Os .Sh NAME @@ -51,7 +51,7 @@ .Ft FILE * .Fn freopen "const char *path" "const char *mode" "FILE *stream" .Ft FILE * -.Fn fmemopen "void *restrict *buf" "size_t size" "const char * restrict mode" +.Fn fmemopen "void * restrict buf" "size_t size" "const char * restrict mode" .Sh DESCRIPTION The .Fn fopen @@ -144,8 +144,10 @@ Reads and writes may be intermixed on read/write streams in any order, and do not require an intermediate seek as in previous versions of .Em stdio . This is not portable to other systems, however; -.Tn ANSI C -requires that +.St -isoC +and +.St -p1003.1 +both require that a file positioning function intervene between output and input, unless an input operation encounters end-of-file. .Pp @@ -246,9 +248,10 @@ byte. .Sh RETURN VALUES Upon successful completion .Fn fopen , -.Fn fdopen -and +.Fn fdopen , .Fn freopen +and +.Fn fmemopen return a .Tn FILE pointer. From nobody Fri Sep 8 10:16:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhsTd1qbHz4sh7G; Fri, 8 Sep 2023 10:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhsTc16Dxz4Rf4; Fri, 8 Sep 2023 10:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAXWkPC4jRWzxcbL47TIeB8wPYf/M9WNC180VZ1fW0M=; b=nMNPYMruVThydE2HoKl+UWYj5BwE/MdlOl2Bt0C2wWRLkBRsnCYiUj9Jc49X/QQ4lMBdBS +DXMv/t72IindRDxyT4bqjENkn1Z1jr9rm/Pgg/lC+zMqn+d0y6dwSosdZIJ2XKactM5gk zoreP9cllDB2HUbocZVipSmoWc8XLqxPz8DhEwM/dbNQwySnkvqoRTTgAKdGU1u6hIIUGT jGWt4xsdOqNiQ9FQVMqzEg73KoyV8chyJb7LR8N9sInoajQbz5kfbxExrcJyKUm6wc6FHw r7cwylg+v6r9v2Q0DdUCzANnVnxArW+2aQ6VjIhCq0AGNgtbUtPCU7/9XeMTNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694168196; a=rsa-sha256; cv=none; b=uBMm1HMluh+bo44D8rN/ZBZnK53pGfIh6QerSPmrq6XSb2PmOQAW1hnHf7/6yFuu44qxWB rEzuNoYPr93o6JxsfCfbFI+WKDov3gEqUBw1+QYxtOC2Ag1f0qQP+JjmDip48digW5wKQw 8k11UNv+DzhrlCZ04VM4HUs+gsiAwbbETN26lU4u2JMmnDl7Ax0DWtx7hwk91UQhZ0X8DS 5IszQ6xmTnnG7fblBfcJ1JtEO9nHL0ym8Oid7ZFGy/A+pDqhyUVFNfS4QEdFaxflxHiN5z 7XRH6FvfBhPutHoQ/+Lk0f9U7MLglEUFRDxx5zXAyBfim4Tq1hjkjiA94xAwiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694168196; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XAXWkPC4jRWzxcbL47TIeB8wPYf/M9WNC180VZ1fW0M=; b=jDJ7nMhXWVwYbQcURajCu8R4Kid8lVjseB6mV35frbQiKL1umAyC/jAhTsxNwVPZrdNtJY yC99yIZoMLx11+Yb7KIy3TAva/0VbJkdB8CV2wPgJH4jIoKGYpPHD0U88+yusaWbF+bcKg uP1WA4pD5I9KcfjCD2mCd+J4IH9gVWm8aO+Jzqbm4NzdHtXVkgRhhfYN7itVeLCmYpy89y qbN16S05dxwRiribGJok6Zn91/J1LoLip7Bq/JeRsXZy/eY/aMokY3S95WPsPKAPwkIDaG PWzCY8vIRp/jZVD0EnY9nheDW58fNHLvKYGSPOPJR4vugY8xFehDMZQS7fjsJw== 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 4RhsTc08sQzdP2; Fri, 8 Sep 2023 10:16:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388AGZ1Z042092; Fri, 8 Sep 2023 10:16:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388AGZsE042089; Fri, 8 Sep 2023 10:16:35 GMT (envelope-from git) Date: Fri, 8 Sep 2023 10:16:35 GMT Message-Id: <202309081016.388AGZsE042089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: f0cfac77c6de - stable/12 - libc: Fix fmemopen(3) prototype in fopen(3) man page. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f0cfac77c6ded1de7bb0bbacea1d63882e8be004 Auto-Submitted: auto-generated The branch stable/12 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f0cfac77c6ded1de7bb0bbacea1d63882e8be004 commit f0cfac77c6ded1de7bb0bbacea1d63882e8be004 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-01 20:56:17 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 10:16:22 +0000 libc: Fix fmemopen(3) prototype in fopen(3) man page. While here, also update a mention of ANSI C. Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D41686 (cherry picked from commit 5a57401e7106132b61b16e34365cebf52b773007) libc: Further nit in fopen(3) man page. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41687 (cherry picked from commit c9f5889d05b5854be033849a4ff9985699071548) --- lib/libc/stdio/fopen.3 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/libc/stdio/fopen.3 b/lib/libc/stdio/fopen.3 index f984a7f9a27b..6e1dbe94729e 100644 --- a/lib/libc/stdio/fopen.3 +++ b/lib/libc/stdio/fopen.3 @@ -32,7 +32,7 @@ .\" @(#)fopen.3 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd May 1, 2020 +.Dd September 1, 2023 .Dt FOPEN 3 .Os .Sh NAME @@ -52,7 +52,7 @@ .Ft FILE * .Fn freopen "const char *path" "const char *mode" "FILE *stream" .Ft FILE * -.Fn fmemopen "void *restrict *buf" "size_t size" "const char * restrict mode" +.Fn fmemopen "void * restrict buf" "size_t size" "const char * restrict mode" .Sh DESCRIPTION The .Fn fopen @@ -145,8 +145,10 @@ Reads and writes may be intermixed on read/write streams in any order, and do not require an intermediate seek as in previous versions of .Em stdio . This is not portable to other systems, however; -.Tn ANSI C -requires that +.St -isoC +and +.St -p1003.1 +both require that a file positioning function intervene between output and input, unless an input operation encounters end-of-file. .Pp @@ -247,9 +249,10 @@ byte. .Sh RETURN VALUES Upon successful completion .Fn fopen , -.Fn fdopen -and +.Fn fdopen , .Fn freopen +and +.Fn fmemopen return a .Tn FILE pointer. From nobody Fri Sep 8 11:15:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhtnF1PGPz4sKqp; Fri, 8 Sep 2023 11:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhtnF0nSgz3GjZ; Fri, 8 Sep 2023 11:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694171713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V1eKKKLHpFSllCodwW5bkK6u8Td+meJI+qUx8qlkJs=; b=DiW4UYvLk9T7MP1Hai3w/OG5j+YgOJ8FqamfmikLYrzLVbb8BT8cNaptIsNE5eQLCTg9NJ 5A5zOLfJcYawC6c3W8iUFnO6P/3rZgce4IIvCXLV5u90vlqSxjmCWlOmrzzwpfVdXuMIgG R0r/BMTZqjzavuzz6QKM1Rapw+X0kGgPzWw+vUqXao1wn0fnJR/PZ7lvhg5gl1dMwiHNxh BC12/ShCy/YdtXDqisHRI+Orml7oUqAS5j271QdSiUQ7PRrI+W5KKG9wkPAUaoOiG6V1fa kRYk0t8IFNtz4RoA9IIvafk3ftfIDRXann7RS4UDFdIenV97mShZQD67gNfO+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694171713; a=rsa-sha256; cv=none; b=r72BxTkgFw1zd+Ki0ZTs6kTysWyFLYeylVL9v1176ZXeRZmKsB1Ul6NPYBOztrUbEW2Flh +G9ybzmV0GgtbsyaVuVrbRd3cZMKgZ1nYdS/5AR7coLLfuIkBVVOeoO7kvogVxA6Q+1pyz TkADhFpdmbCFv6wRHYBkvs6VjAYpmggcNLLCsSxediMvht+HPRERc5+0eEOgFRwSubdh3N H6jLBk/Y4I8rh0oHHixub+krQpMNSm/rRzv8R2ph5b5A+5LcKdnh6s9lkWC9voBCy1LhfP I9SyRmjm+8Evq9k78vlP7sWhFNxJ7DKw7YnD6zBbfr6CXjz4j2cpvuMpVZ+F6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694171713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9V1eKKKLHpFSllCodwW5bkK6u8Td+meJI+qUx8qlkJs=; b=Own1FwVH+GmXPTPb7w+FF9Bt71hqe+tM6x+3rNqX6SSwUaC7A79xshvjOfpo0KYkI9Vgv6 11IRM1b+6i3qMvmJDm8L+/6c5hMaw1UnEOGPgoGCgrSbGoMe7S7N48bWwy1wS1/kJNqCLH NkNqQaVr50xb/AArYEOuyNw1PdC4I1peoZr4KxMbt7I0XuSg4++E/AESU/SqOjmxD1koi5 w1w2SujBMDmVBDP5unzVf9CQfsEWCJdRSWWpUt3sLpFhL2/3vspnPq93/oazfAFVu5mzva a3asy6E5QEOoA2IiOT9TUlBtNmWMWrwfOD8+nYrqiXkLC9fa67jLVXV9FfprhA== 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 4RhtnD6xqJzgHh; Fri, 8 Sep 2023 11:15:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388BFCKE042406; Fri, 8 Sep 2023 11:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388BFC90042403; Fri, 8 Sep 2023 11:15:12 GMT (envelope-from git) Date: Fri, 8 Sep 2023 11:15:12 GMT Message-Id: <202309081115.388BFC90042403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: cd3770c5feb0 - main - sctp: cleanup SCTP AUTH related notification List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd3770c5feb038f3904fdb4aa04e09da122f74e3 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=cd3770c5feb038f3904fdb4aa04e09da122f74e3 commit cd3770c5feb038f3904fdb4aa04e09da122f74e3 Author: Michael Tuexen AuthorDate: 2023-09-08 11:13:43 +0000 Commit: Michael Tuexen CommitDate: 2023-09-08 11:13:43 +0000 sctp: cleanup SCTP AUTH related notification This makes consistent use of the parameters and ensures that all SCTP AUTH related notifications are using sctp_ulp_notify(). No functional change intended. MFC after: 3 days --- sys/netinet/sctp_auth.c | 32 ++++++++++++++++---------------- sys/netinet/sctp_auth.h | 2 +- sys/netinet/sctputil.c | 15 ++++++--------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index 67f0d26fa0d5..3c1962233347 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -575,7 +575,7 @@ sctp_auth_key_release(struct sctp_tcb *stcb, uint16_t key_id, int so_locked) if ((skey->refcount <= 2) && (skey->deactivated)) { /* notify ULP that key is no longer used */ sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, - key_id, 0, so_locked); + 0, &key_id, so_locked); SCTPDBG(SCTP_DEBUG_AUTH2, "%s: stcb %p key %u no longer used, %d\n", __func__, (void *)stcb, key_id, skey->refcount); @@ -1312,7 +1312,7 @@ sctp_deact_sharedkey(struct sctp_tcb *stcb, uint16_t keyid) /* are there other refcount holders on the key? */ if (skey->refcount == 1) { /* no other users, send a notification for this key */ - sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, keyid, 0, + sctp_ulp_notify(SCTP_NOTIFY_AUTH_FREE_KEY, stcb, 0, &keyid, SCTP_SO_LOCKED); } @@ -1654,15 +1654,10 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *auth, return (-1); } /* generate a notification if this is a new key id */ - if (stcb->asoc.authinfo.recv_keyid != shared_key_id) - /* - * sctp_ulp_notify(SCTP_NOTIFY_AUTH_NEW_KEY, stcb, - * shared_key_id, (void - * *)stcb->asoc.authinfo.recv_keyid); - */ - sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, - shared_key_id, stcb->asoc.authinfo.recv_keyid, - SCTP_SO_NOT_LOCKED); + if (stcb->asoc.authinfo.recv_keyid != shared_key_id) { + sctp_ulp_notify(SCTP_NOTIFY_AUTH_NEW_KEY, stcb, 0, + &shared_key_id, SCTP_SO_NOT_LOCKED); + } /* compute a new recv assoc key and cache it */ if (stcb->asoc.authinfo.recv_key != NULL) sctp_free_key(stcb->asoc.authinfo.recv_key); @@ -1705,7 +1700,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *auth, */ void sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, - uint16_t keyid, uint16_t alt_keyid, int so_locked) + uint16_t keyid, int so_locked) { struct mbuf *m_notify; struct sctp_authkey_event *auth; @@ -1714,8 +1709,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, if ((stcb == NULL) || (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET) - ) { + (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { /* If the socket is gone we are out of here */ return; } @@ -1737,7 +1731,12 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, auth->auth_flags = 0; auth->auth_length = sizeof(*auth); auth->auth_keynumber = keyid; - auth->auth_altkeynumber = alt_keyid; + /* XXXMT: The following is BSD specific. */ + if (indication == SCTP_AUTH_NEW_KEY) { + auth->auth_altkeynumber = stcb->asoc.authinfo.recv_keyid; + } else { + auth->auth_altkeynumber = 0; + } auth->auth_indication = indication; auth->auth_assoc_id = sctp_get_associd(stcb); @@ -1757,7 +1756,8 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, /* not that we need this */ control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } /*- diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h index 8bfdbaa6d4f6..279ecb6831cd 100644 --- a/sys/netinet/sctp_auth.h +++ b/sys/netinet/sctp_auth.h @@ -212,7 +212,7 @@ sctp_handle_auth(struct sctp_tcb *stcb, struct sctp_auth_chunk *ch, struct mbuf *m, uint32_t offset); extern void sctp_notify_authentication(struct sctp_tcb *stcb, - uint32_t indication, uint16_t keyid, uint16_t alt_keyid, int so_locked); + uint32_t indication, uint16_t keyid, int so_locked); extern int sctp_validate_init_auth_params(struct mbuf *m, int offset, int limit); diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 381f67f40b99..ea960a3e6376 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4197,19 +4197,16 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_shutdown_event(stcb); break; case SCTP_NOTIFY_AUTH_NEW_KEY: - sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, + *(uint16_t *)data, so_locked); break; case SCTP_NOTIFY_AUTH_FREE_KEY: - sctp_notify_authentication(stcb, SCTP_AUTH_FREE_KEY, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_FREE_KEY, + *(uint16_t *)data, so_locked); break; case SCTP_NOTIFY_NO_PEER_AUTH: - sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, error, - (uint16_t)(uintptr_t)data, - so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, + 0, so_locked); break; case SCTP_NOTIFY_SENDER_DRY: sctp_notify_sender_dry_event(stcb, so_locked); From nobody Fri Sep 8 12:22:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhwGJ32lTz4t1vs; Fri, 8 Sep 2023 12:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhwGJ2nvkz3ZXf; Fri, 8 Sep 2023 12:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694175720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxQ/oG1ayaRlvDuSSAZX5qvr3LwkHPG7uopL7xgKeXg=; b=KpHcUlV/K6kZ+dUaf1/VkelIJmPW1VB/YvN9eAFD0YHNJzKhWajDCSPwXUYJCtmULM+ZLy oc3qmGF2w9JXgmFhdhxxKs/k6ZmcMt7ziGbgy2C8aU4j+/7AVlcwrbUQQ+YFE/L1jNe2cs VXOkWKHeWS1hgKqoB1iFpWGXo52RUqvATxAcgEn/VpBPBHkcks5XMaH8C1l9Z2QCJd64Y9 MHDr2wzrkc6GR5uyMC30QI9BLC1I/yccSUwpLNcJ4T8jJpedrk63tomXR1hGEfIz1mpYrW ckfVLdTrIyNimOIl2OWYIBZBaBR4HEJ2+SkdF/InbLmDhj4d/i5vH7Qs3u/fKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694175720; a=rsa-sha256; cv=none; b=lDxjYj3S9APugXbZ6meUTfpgZBSYPUOykDiDKjNeuaPb1XpNpg8Q3e6sW621az/lYAJKKv 3y4EKiQufW1A541U09rqD9/tC4SG5b0XPXkCUsGxyFoEiTO7695MqCW1Gc//xkzvMmCx6l yvuguxoV7RyGWUTGg2Q67l7BZSiXtgmDW+toxgHRN+5Z45x/+vfpv9E0iSyEJFFvDVosuR jERqMz+HVB9GvvZ/lXgtUfEex23jhkh10oA35Gh7ONY7dr9Z9owM1PYQPjrAHqhGdL1xXH v39KWVbKeuOtM0BJWRYMYVaW6TPyIDclFmMJF1gawAddvkqB+G4ntGiPnUESGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694175720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxQ/oG1ayaRlvDuSSAZX5qvr3LwkHPG7uopL7xgKeXg=; b=mLaTBd4vLqFxg2armJDB6diz4Wv3+WXFAZ08rAlnvhgIiIcBOe60tPf+1h38gHbV/m9jAQ BcgxuRiuYk5DtnAgvX7F0WmEmtvNmwFxATFxOZpElZdmgDlNWUjQeTvvnP9DLgurfEOwR5 Z94/LTNzgLPuwCHZXvMZcdHccZPGHfSBVTjxQrjx+z7qnBRnkpin8QU3l4Ya3rNhVc8Qfu BsiREezHexhRhlpbDJ8fwH+9PfFO9KI0cOrjHNcORRbdwuhiKElRHv5JmNWjb7b5B2XjRi yDNam85LRMa4BZVv6huoLt7w4QCkdIoPx8WszrhSGIx7XXlWaaORTJGRCdMTyA== 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 4RhwGJ1tNRzhv2; Fri, 8 Sep 2023 12:22:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388CM0jX056209; Fri, 8 Sep 2023 12:22:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388CM09d056206; Fri, 8 Sep 2023 12:22:00 GMT (envelope-from git) Date: Fri, 8 Sep 2023 12:22:00 GMT Message-Id: <202309081222.388CM09d056206@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 3ac7664774ad - main - sctp: make sure all SCTP RESET notifications use sctp_ulp_notify() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ac7664774ad038b208cbb31eb52d1608efbd451 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=3ac7664774ad038b208cbb31eb52d1608efbd451 commit 3ac7664774ad038b208cbb31eb52d1608efbd451 Author: Michael Tuexen AuthorDate: 2023-09-08 12:19:56 +0000 Commit: Michael Tuexen CommitDate: 2023-09-08 12:19:56 +0000 sctp: make sure all SCTP RESET notifications use sctp_ulp_notify() While there, improve consistency of the notification related code. No functional change intended. MFC after: 3 days --- sys/netinet/sctp_constants.h | 14 +++-- sys/netinet/sctp_input.c | 26 ++++----- sys/netinet/sctputil.c | 135 ++++++++++++++++++++++--------------------- sys/netinet/sctputil.h | 6 -- 4 files changed, 86 insertions(+), 95 deletions(-) diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h index 881db9dd87cc..2054849fd5e9 100644 --- a/sys/netinet/sctp_constants.h +++ b/sys/netinet/sctp_constants.h @@ -706,12 +706,14 @@ #define SCTP_NOTIFY_STR_RESET_FAILED_IN 20 #define SCTP_NOTIFY_STR_RESET_DENIED_OUT 21 #define SCTP_NOTIFY_STR_RESET_DENIED_IN 22 -#define SCTP_NOTIFY_AUTH_NEW_KEY 23 -#define SCTP_NOTIFY_AUTH_FREE_KEY 24 -#define SCTP_NOTIFY_NO_PEER_AUTH 25 -#define SCTP_NOTIFY_SENDER_DRY 26 -#define SCTP_NOTIFY_REMOTE_ERROR 27 -#define SCTP_NOTIFY_ASSOC_TIMEDOUT 28 +#define SCTP_NOTIFY_STR_RESET_ADD 23 +#define SCTP_NOTIFY_STR_RESET_TSN 24 +#define SCTP_NOTIFY_AUTH_NEW_KEY 25 +#define SCTP_NOTIFY_AUTH_FREE_KEY 26 +#define SCTP_NOTIFY_NO_PEER_AUTH 27 +#define SCTP_NOTIFY_SENDER_DRY 28 +#define SCTP_NOTIFY_REMOTE_ERROR 29 +#define SCTP_NOTIFY_ASSOC_TIMEDOUT 30 /* This is the value for messages that are NOT completely * copied down where we will start to split the message. diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index e6dc41e08909..6937f8a2a43f 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -3510,23 +3510,19 @@ sctp_handle_stream_reset_response(struct sctp_tcb *stcb, asoc->strmout[i].state = SCTP_STREAM_OPEN; } asoc->streamoutcnt += num_stream; - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } else if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_FAILED, NULL, SCTP_SO_NOT_LOCKED); } } else if (type == SCTP_STR_RESET_ADD_IN_STREAMS) { if (asoc->stream_reset_outstanding) asoc->stream_reset_outstanding--; if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else if (action != SCTP_STREAM_RESET_RESULT_PERFORMED) { - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, - SCTP_STREAM_CHANGE_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, SCTP_STREAM_CHANGE_DENIED, NULL, SCTP_SO_NOT_LOCKED); } } else if (type == SCTP_STR_RESET_TSN_REQUEST) { /** @@ -3572,13 +3568,11 @@ sctp_handle_stream_reset_response(struct sctp_tcb *stcb, sctp_reset_out_streams(stcb, 0, (uint16_t *)NULL); sctp_reset_in_stream(stcb, 0, (uint16_t *)NULL); - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } else if (action == SCTP_STREAM_RESET_RESULT_DENIED) { - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), - SCTP_ASSOC_RESET_DENIED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, SCTP_ASSOC_RESET_DENIED, NULL, SCTP_SO_NOT_LOCKED); } else { - sctp_notify_stream_reset_tsn(stcb, stcb->asoc.sending_seq, (stcb->asoc.mapping_array_base_tsn + 1), - SCTP_ASSOC_RESET_FAILED); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, SCTP_ASSOC_RESET_FAILED, NULL, SCTP_SO_NOT_LOCKED); } } /* get rid of the request and get the request flags */ @@ -3707,7 +3701,7 @@ sctp_handle_str_reset_request_tsn(struct sctp_tcb *stcb, sctp_reset_out_streams(stcb, 0, (uint16_t *)NULL); sctp_reset_in_stream(stcb, 0, (uint16_t *)NULL); asoc->last_reset_action[0] = SCTP_STREAM_RESET_RESULT_PERFORMED; - sctp_notify_stream_reset_tsn(stcb, asoc->sending_seq, (asoc->mapping_array_base_tsn + 1), 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_TSN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } sctp_add_stream_reset_result_tsn(chk, seq, asoc->last_reset_action[0], asoc->last_sending_seq[0], asoc->last_base_tsnsent[0]); @@ -3872,7 +3866,7 @@ sctp_handle_str_reset_add_strm(struct sctp_tcb *stcb, struct sctp_tmit_chunk *ch /* update the size */ stcb->asoc.streamincnt = num_stream; stcb->asoc.last_reset_action[0] = SCTP_STREAM_RESET_RESULT_PERFORMED; - sctp_notify_stream_reset_add(stcb, stcb->asoc.streamincnt, stcb->asoc.streamoutcnt, 0); + sctp_ulp_notify(SCTP_NOTIFY_STR_RESET_ADD, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); } sctp_add_stream_reset_result(chk, seq, asoc->last_reset_action[0]); asoc->str_reset_seq_in++; diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index ea960a3e6376..17a5a098dd90 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3140,9 +3140,10 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, struct mbuf *m_notify; struct sctp_assoc_change *sac; struct sctp_queued_to_read *control; + struct sctp_inpcb *inp; unsigned int notif_len; - uint16_t abort_len; unsigned int i; + uint16_t abort_len; KASSERT(abort == NULL || from_peer, ("sctp_notify_assoc_change: ABORT chunk provided for local termination")); @@ -3151,7 +3152,8 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, if (stcb == NULL) { return; } - if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { + inp = stcb->sctp_ep; + if (sctp_stcb_is_feature_on(inp, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { notif_len = (unsigned int)sizeof(struct sctp_assoc_change); if (abort != NULL) { abort_len = ntohs(abort->ch.chunk_length); @@ -3229,10 +3231,9 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, - so_locked); + sctp_add_to_readq(inp, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -3242,8 +3243,8 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, * comes in. */ set_error: - if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && + if (((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) { SOCK_LOCK(stcb->sctp_socket); if (from_peer) { @@ -3266,8 +3267,8 @@ set_error: SOCK_UNLOCK(stcb->sctp_socket); } /* Wake ANY sleepers */ - if (((stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && + if (((inp->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) || + (inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL)) && ((state == SCTP_COMM_LOST) || (state == SCTP_CANT_STR_ASSOC))) { socantrcvmore(stcb->sctp_socket); } @@ -3356,11 +3357,9 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, - so_locked); + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3487,11 +3486,9 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, - so_locked); + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3585,13 +3582,13 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void -sctp_notify_adaptation_layer(struct sctp_tcb *stcb) +sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_adaptation_event *sai; @@ -3632,9 +3629,9 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb) control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void @@ -3702,7 +3699,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, } static void -sctp_notify_shutdown_event(struct sctp_tcb *stcb) +sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_shutdown_event *sse; @@ -3749,14 +3746,13 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb) control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void -sctp_notify_sender_dry_event(struct sctp_tcb *stcb, - int so_locked) +sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) { struct mbuf *m_notify; struct sctp_sender_dry_event *event; @@ -3798,11 +3794,12 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, /* not that we need this */ control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, so_locked); + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } -void -sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t numberout, int flag) +static void +sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3837,8 +3834,8 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t stradd->strchange_flags = flag; stradd->strchange_length = sizeof(struct sctp_stream_change_event); stradd->strchange_assoc_id = sctp_get_associd(stcb); - stradd->strchange_instrms = numberin; - stradd->strchange_outstrms = numberout; + stradd->strchange_instrms = stcb->asoc.streamincnt; + stradd->strchange_outstrms = stcb->asoc.streamoutcnt; SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_stream_change_event); SCTP_BUF_NEXT(m_notify) = NULL; if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) { @@ -3859,13 +3856,13 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, uint16_t control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } -void -sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32_t recv_tsn, int flag) +static void +sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3894,8 +3891,8 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32 strasoc->assocreset_flags = flag; strasoc->assocreset_length = sizeof(struct sctp_assoc_reset_event); strasoc->assocreset_assoc_id = sctp_get_associd(stcb); - strasoc->assocreset_local_tsn = sending_tsn; - strasoc->assocreset_remote_tsn = recv_tsn; + strasoc->assocreset_local_tsn = stcb->asoc.sending_seq; + strasoc->assocreset_remote_tsn = stcb->asoc.mapping_array_base_tsn + 1; SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_assoc_reset_event); SCTP_BUF_NEXT(m_notify) = NULL; if (sctp_sbspace(&stcb->asoc, &stcb->sctp_socket->so_rcv) < SCTP_BUF_LEN(m_notify)) { @@ -3916,14 +3913,14 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32 control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, so_locked); } static void sctp_notify_stream_reset(struct sctp_tcb *stcb, - int number_entries, uint16_t *list, int flag) + int number_entries, uint16_t *list, int flag, int so_locked) { struct mbuf *m_notify; struct sctp_queued_to_read *control; @@ -3980,13 +3977,14 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, - &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + sctp_add_to_readq(stcb->sctp_ep, stcb, control, + &stcb->sctp_socket->so_rcv, 1, + SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); } static void -sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_error_chunk *chunk) +sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, + struct sctp_error_chunk *chunk, int so_locked) { struct mbuf *m_notify; struct sctp_remote_error *sre; @@ -4041,10 +4039,9 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_erro control->spec_flags = M_NOTIFICATION; /* not that we need this */ control->tail_mbuf = m_notify; - sctp_add_to_readq(stcb->sctp_ep, stcb, - control, + sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + SCTP_READ_LOCK_NOT_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -4086,11 +4083,10 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, stcb->asoc.assoc_up_sent = 1; } if (stcb->asoc.adaptation_needed && (stcb->asoc.adaptation_sent == 0)) { - sctp_notify_adaptation_layer(stcb); + sctp_notify_adaptation_layer(stcb, so_locked); } if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, - NULL, so_locked); + sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); } break; case SCTP_NOTIFY_ASSOC_DOWN: @@ -4155,31 +4151,36 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, case SCTP_NOTIFY_ASSOC_RESTART: sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, false, false, so_locked); if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, - NULL, so_locked); + sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); } break; case SCTP_NOTIFY_STR_RESET_SEND: - sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_OUTGOING_SSN); + sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_OUTGOING_SSN, so_locked); break; case SCTP_NOTIFY_STR_RESET_RECV: - sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_INCOMING); + sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), SCTP_STREAM_RESET_INCOMING, so_locked); break; case SCTP_NOTIFY_STR_RESET_FAILED_OUT: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_FAILED)); + (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_FAILED), so_locked); break; case SCTP_NOTIFY_STR_RESET_DENIED_OUT: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_DENIED)); + (SCTP_STREAM_RESET_OUTGOING_SSN | SCTP_STREAM_RESET_DENIED), so_locked); break; case SCTP_NOTIFY_STR_RESET_FAILED_IN: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_FAILED)); + (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_FAILED), so_locked); break; case SCTP_NOTIFY_STR_RESET_DENIED_IN: sctp_notify_stream_reset(stcb, error, ((uint16_t *)data), - (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_DENIED)); + (SCTP_STREAM_RESET_INCOMING | SCTP_STREAM_RESET_DENIED), so_locked); + break; + case SCTP_NOTIFY_STR_RESET_ADD: + sctp_notify_stream_reset_add(stcb, error, so_locked); + break; + case SCTP_NOTIFY_STR_RESET_TSN: + sctp_notify_stream_reset_tsn(stcb, error, so_locked); break; case SCTP_NOTIFY_ASCONF_ADD_IP: sctp_notify_peer_addr_change(stcb, SCTP_ADDR_ADDED, data, @@ -4194,7 +4195,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, error, so_locked); break; case SCTP_NOTIFY_PEER_SHUTDOWN: - sctp_notify_shutdown_event(stcb); + sctp_notify_shutdown_event(stcb, so_locked); break; case SCTP_NOTIFY_AUTH_NEW_KEY: sctp_notify_authentication(stcb, SCTP_AUTH_NEW_KEY, @@ -4212,7 +4213,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_sender_dry_event(stcb, so_locked); break; case SCTP_NOTIFY_REMOTE_ERROR: - sctp_notify_remote_error(stcb, error, data); + sctp_notify_remote_error(stcb, error, data, so_locked); break; default: SCTPDBG(SCTP_DEBUG_UTIL1, "%s: unknown notification %xh (%u)\n", diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index c649611d5004..8de98b4608f8 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -80,12 +80,6 @@ int sctp_init_asoc(struct sctp_inpcb *, struct sctp_tcb *, uint32_t, uint32_t, u void sctp_fill_random_store(struct sctp_pcb *); -void -sctp_notify_stream_reset_add(struct sctp_tcb *stcb, uint16_t numberin, - uint16_t numberout, int flag); -void - sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, uint32_t sending_tsn, uint32_t recv_tsn, int flag); - /* * NOTE: sctp_timer_start() will increment the reference count of any relevant * structure the timer is referencing, in order to prevent a race condition From nobody Fri Sep 8 13:20:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhxYY12Hmz4sR5y; Fri, 8 Sep 2023 13:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhxYY0YKHz4MXf; Fri, 8 Sep 2023 13:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694179217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=83Y3FF+bzNwCn1vJl+UQFW3M2imJfrpNjCV0zqjqh3Q=; b=GZuvuSz1adZre4PC4YkTKgS76p+IRqCqZJu+pmnl++wravSMmKFR98uG9hiHNsSf3Hja+B trSnNe7Z5NIEmmfDHmXdTlSXCgO4TOxdsITWMO7YGPJodtve5nUgoSPnKXhg6/k9S6bffH ImVIjOweXedzlc+UmjRY+MpxcDVq0672RzywEQUp24BLWNfsOLvdPwgY0hGwVjZL+uiDmK 8OsxPtxw0cFOgZoxG5/DMOpUjH2CqGSb1uNdtCqnBWbEr9f6olMkeFG44NElqJWMwDoJgH UAhGMuOgIIiwjy+/7lNxsNJ4Lrh3F2gflV5H4X/KHKT6XKo037nN3uYDw2b09Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694179217; a=rsa-sha256; cv=none; b=xHRwYAw8tMcPKNqtWph0HlQrGNvW+BBSMdkokcne+3QRfa+e3h/jiCKKAGPrB1iAbZySsD sglszcDFDfq1IcQXJeFTFBzV4EXoCHvD5/yL/ZjQvpPf5nrPGek+sp2Wfh4MoLKKt/7bjG 9YJj63DkhQkk/sHGbiImLsd2KJHPscCbJqg3U2JTDUBWDPU+ud+PkDYpg4G0M4n/hOVMEi jbS5OnFHPMuyekQImvUmyMCAedk9Oeky+Ut71IGjJ7Hm/dDP+g+zEVlf7PnOmUTVtMUSyc j4zs/Of0EX5uWqfLgGrBeK0CdGr+k/vXppylFjh2bFSwlVluJ+jVHw4gbbIvyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694179217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=83Y3FF+bzNwCn1vJl+UQFW3M2imJfrpNjCV0zqjqh3Q=; b=LGCd9PgJmTHToFP5CsOGyz7mm+yJi2VSlIE5XQlVqjJ8PhvV1oG4zP9uJejhj/OxaA73I5 TAg9W5fqDHXWbbwl4efz1/PV9E1FEw95ruusVOQwI+gh5GyWaomVUROv4TAGN8nEPcPTyO Vvp9vDOtReEFmx8Ol14D5eQvifhA278kCRsgNbvvJzm4ZaIIXOB9KLJKpRAinzhBWg/heP HLbH4Bdr4TBjabHCYz95Wk6cSVVpjIMIlJWOxjUCfc79B6xP0BuEEkfAPyMApR1Zg8ZFdE T519oe0Ia8mCMfPqLTaYT8Sx3neiQxu8XCcjz0IKW3WGj/KufmOADldk+TEfWA== 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 4RhxYX6ksrzkCy; Fri, 8 Sep 2023 13:20:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388DKGhp048829; Fri, 8 Sep 2023 13:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388DKGNp048820; Fri, 8 Sep 2023 13:20:16 GMT (envelope-from git) Date: Fri, 8 Sep 2023 13:20:16 GMT Message-Id: <202309081320.388DKGNp048820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joel Bodenmann Subject: git: b4b89476fa95 - main - Add myself as ports committer, update mentor/mentee List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4b89476fa95d43201768be4ea58c2911863ab18 Auto-Submitted: auto-generated The branch main has been updated by jbo: URL: https://cgit.FreeBSD.org/src/commit/?id=b4b89476fa95d43201768be4ea58c2911863ab18 commit b4b89476fa95d43201768be4ea58c2911863ab18 Author: Joel Bodenmann AuthorDate: 2023-09-08 12:58:42 +0000 Commit: Joel Bodenmann CommitDate: 2023-09-08 13:20:01 +0000 Add myself as ports committer, update mentor/mentee This completes step 5 from Committer's Guide. Approved by: zirias (mentor) Differential Review: https://reviews.freebsd.org/D41782 --- share/misc/committers-ports.dot | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index df1187b06080..bc78f2c88cde 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -68,6 +68,7 @@ ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20\n2011/01/02"] itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07\n2018/11/06"] jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05\n2011/10/14"] jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02\n2020/10/05"] +jbo [label="Joel Bodenmann\njbo@FreeBSD.org\n2023/09/06"] jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06\n2021/06/07"] jmallett [label="Juli Mallett\njmallett@FreeBSD.org\n2003/01/16\n2006/08/10"] jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31\n2013/08/18"] @@ -791,6 +792,7 @@ tcberner -> adridg tcberner -> arrowd tcberner -> diizzy tcberner -> fernape +tcberner -> jbo tcberner -> joneum tcberner -> kai tcberner -> lbartoletti @@ -842,4 +844,6 @@ wxs -> zi ygy -> yasu +zirias -> jbo + } From nobody Fri Sep 8 13:39:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rhxzy6F3xz4sdQX; Fri, 8 Sep 2023 13:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rhxzy5nZ7z4RwL; Fri, 8 Sep 2023 13:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694180382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQE2MJh4tRUBAtzSijw8iZ8lOTp9e8EGePUACLJuiS4=; b=EbV/RlhuUt28t0C+XpkcKa6zlvdIVM0CkA6H020+gHRUcAu93ZuzVA2WxuZflY31IXNf5w SoW14oBPep/R4lZ61kADFKRSaPRytxpC/t/hvIK7WMVEk46tVSW7OAtwvwCXFO296Bb/86 cRxdX+kKn1KbOTOfaZldch28OweO1pSM/poLZgEbYJGZp4ax8a+tDwt60u2J6NdsmO3WXE Ty7ByxxE8RI6ptXbsi3qFVYn/RXQEtBAMXVRdC31MWyeBFm/BdAMXWU4aAj4E2xppE3s2Z YSwyOP2VIIzX6EG8M6USW5Uf2rk5tkYal9QtJfqcaAkpcPdZzK8mHgB1kIc01g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694180382; a=rsa-sha256; cv=none; b=H3eRbMuzGdotXUJ1Ux3Q9KLJyMog+/OHad2KNh5u5fjJiseImCeemQcO3lGdB/Ya8P3ZTT 6UOjj4ViAuWqaGrJhYaR/vY+QodJrtppB3XlBmy5edgQeOd9+AswFfUOtgVAaZZ0k2GMk2 Sh4EvHalT2tlBGiZx6FsJJAEKLVVi4iQf9/yTgIhPtP+bk0f5DHSJYjX/kzFlw5iUcgAlf 5TWVg6uunzxVelB+zlz6BYxOxXY6f0zf2UfixEDoQNukd446IN4i0/nGlGN3pooKot5jvB DKXnCew6OSR8ZQN2kuTKMWBM1nSh3ce8Qj71moEmGCEdCO0w+iNMe4MJ/BDKVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694180382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MQE2MJh4tRUBAtzSijw8iZ8lOTp9e8EGePUACLJuiS4=; b=aZMYX4LwQ6wPZs2/ygIvwAaPlS7Rnv2KOlsENz3OH/1vTuEJxvFNfmutEuAHZXrAEZ5kHg oK6M2bmq10hVqN50hFam9NKkm0fZ7I6X48gcVntJbEkD+TYnkEZfU/cWFL0ewfR0ZwEuRp +gacTF9j5B4lGGC2OxRKg5SafARIIi2XjB2FTCKPPIc6uyM6lMViNL4Stai/p1OTFOcV5I 08XdorbxEQKoF5zhVMNIKNxtTmqtzKcOjAySQfwcjCbJkb50WL5dsOkUctz1P+UjL/1yCK q5rx9RxgjJSFqwDhRTCkV9RAiAN2GzCyw5ekYEivyBt6NbnOY2pxRfxcIozgYw== 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 4Rhxzy4lvSzkZs; Fri, 8 Sep 2023 13:39:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388Ddg5p074302; Fri, 8 Sep 2023 13:39:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388Ddg8q074299; Fri, 8 Sep 2023 13:39:42 GMT (envelope-from git) Date: Fri, 8 Sep 2023 13:39:42 GMT Message-Id: <202309081339.388Ddg8q074299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 8ded9cd3d554 - stable/13 - scandir.3: Fix several typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8ded9cd3d5540da9b88d052a857f7fa0c18855e2 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8ded9cd3d5540da9b88d052a857f7fa0c18855e2 commit 8ded9cd3d5540da9b88d052a857f7fa0c18855e2 Author: Trond Endrestøl AuthorDate: 2023-09-01 20:48:16 +0000 Commit: Mark Johnston CommitDate: 2023-09-08 13:38:10 +0000 scandir.3: Fix several typos PR: 273480 Reviewed by: markj MFC after: 1 week (cherry picked from commit b7000cadfbf312b6a8acff6b7a3bbbbe55509565) --- lib/libc/gen/scandir.3 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3 index e6d1fb38c2b1..033042acbb05 100644 --- a/lib/libc/gen/scandir.3 +++ b/lib/libc/gen/scandir.3 @@ -48,9 +48,9 @@ .Fa "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" .Fa "int \*(lp*compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp" .Fc -.Ft +.Ft int .Fo scandirat -.Fa int dirfd +.Fa "int dirfd" .Fa "const char *dirname" .Fa "struct dirent ***namelist" .Fa "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" @@ -60,7 +60,7 @@ .Fo scandir_b .Fa "const char *dirname" .Fa "struct dirent ***namelist" -.Fa "int \*(lp*select\^(rp\*(lpconst struct dirent *\*(rp" +.Fa "int \*(lp^select\*(rp\*(lpconst struct dirent *\*(rp" .Fa "int \*(lp^compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp" .Fc .Ft int @@ -186,7 +186,6 @@ functions appeared in The .Fn scandirat and -.Fn -versionsort +.Fn versionsort functions were added in .Fx 13.2 . From nobody Fri Sep 8 13:54:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhyKR5T8Sz4sn8Q; Fri, 8 Sep 2023 13:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhyKR4xFGz4Xc2; Fri, 8 Sep 2023 13:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694181291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/q98o4kj3+/dOBin4FgIyBqN31lVadH1hZYR+4L3iI=; b=yTThkYOaZ4Ly8/kDb+vvpFpsvACrmEA/MpCeOdNNdO1s6n9wuAmclZT6zmO5Rn2LSL/xPU Hnb1YrA911cI0IuIOtWGgrEhx13B0D2BXkqflochq49H9CnVclDjl2k1snzf+iooSlkqk1 IJVgK8hcy011/hJmRASq8iLLYplZF7TouG3TAohGMihlXzmnLd09CJ6hjxb6t9bn+hLLdA shX74ayexDm+0K0n5wJcEztz13IB5lZ4N/80HHwU2TrYrwdGDkaEoB3MN7av6f7INGOSat 2BODMQNDYUT3cE9St46GUp/Nrjia8PE0XhzrYXenIW4L9voVJqOwBYG6X9tb0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694181291; a=rsa-sha256; cv=none; b=kXujuftYPUfxW6SEbjegVXTUsH2P8rt80gP+UVQjAP++tglrg6FQN8iqkwMpJ91TrQ+jv/ ThyZkrH10if7BM6o3JEcbO9UqJDX+zQ6+AkjecvDVx3tH8IDOPEsjr82zBXfQks6LKduSW zDbP8ovqE9205PhensjztA6LmNGbhY8P4jq7YGxALt0AQXFp3f2Zsxw5fDgLl0xnYMqQd+ lkNY1hNo4witArDILfj2ULHmsgty5sZ7t/W9/uerWzgPPd7sBjVdPGbicIYmzfTjUryLyb Vg5er534qd195KYhwSWuK00G5bHvDI/OmVOGt/pfyI3AGPuftGE6oYRxaySAVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694181291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/q98o4kj3+/dOBin4FgIyBqN31lVadH1hZYR+4L3iI=; b=iYPI+GtgaaI0zXujdD/SBrH+5R+bqXFK24hPwqnjG8ka2dw7a1v4rDgqC99C9Fug/avCAw 0XCMf7F77XZdMLNAvrH3rM/fmCXioChFE3p/7XiOFy/cDxqVn2MtfK5/F0B8A0G8RYomjQ tQ5RT31ef5Bg4oQCtmXk9zZ96jZDxet+n2/7HD5vXAx211jV6tMKAnwFTgG8WyjSh2D4mU S60I8LqKPt2pQUvBG7Cm9voy/D0CZdHxJI5gJ4xycGxVck4OFfwF5rfIgpCMYtFSV+B962 xxyvj7jyebRRJDGY0eP5FNb25f1WtQCZ4c+iI4uAFcUH40bTSt/2bm58D+pKPw== 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 4RhyKR40PrzkK1; Fri, 8 Sep 2023 13:54:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388DspOu005888; Fri, 8 Sep 2023 13:54:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388DspnT005886; Fri, 8 Sep 2023 13:54:51 GMT (envelope-from git) Date: Fri, 8 Sep 2023 13:54:51 GMT Message-Id: <202309081354.388DspnT005886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: aea540538991 - main - arm64: Fix the TCR_TBI0 macro to use UL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aea540538991dd9e8cf21c6ca06e09f706bf2d18 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=aea540538991dd9e8cf21c6ca06e09f706bf2d18 commit aea540538991dd9e8cf21c6ca06e09f706bf2d18 Author: Andrew Turner AuthorDate: 2023-09-08 13:27:15 +0000 Commit: Andrew Turner CommitDate: 2023-09-08 13:31:25 +0000 arm64: Fix the TCR_TBI0 macro to use UL This needs to be 1UL to ensure the type is large enough for the shift. Sponsored by: Arm Ltd --- sys/arm64/include/armreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 034504727b39..3ae2f24c2a56 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2127,7 +2127,7 @@ #define TCR_TBI1_SHIFT 38 #define TCR_TBI1 (1UL << TCR_TBI1_SHIFT) #define TCR_TBI0_SHIFT 37 -#define TCR_TBI0 (1U << TCR_TBI0_SHIFT) +#define TCR_TBI0 (1UL << TCR_TBI0_SHIFT) #define TCR_ASID_SHIFT 36 #define TCR_ASID_WIDTH 1 #define TCR_ASID_16 (1UL << TCR_ASID_SHIFT) From nobody Fri Sep 8 13:54:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhyKV0FQ7z4sn3y; Fri, 8 Sep 2023 13:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhyKS75RSz4XTg; Fri, 8 Sep 2023 13:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694181293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4n1eNABErp881lUCD05XV4RzCJSV5lcnhW5URDUvU4=; b=qXQYlFe2A6y6xeJ9gW8qcO6GZ/+JIWqB/L5MDqxbdvN18exvE4kNrseNUvcze8Fb6krTkC 6z/ThnCSlcDba94a3UfK9Qyk8u3aonEAySe5rAxUNbASomUdVnrCbI23tgaAwqisJB4PyI /tP/Y+zR9L427pNvXFzr8eWwPwPBnE0gtcJjPqW727AnSOWcw95TKJ+FIZUgxGB+nwpEOQ AufT5W2xsB4UZn8+KVDCGpwZg4GRwhZ795eC25QnokwcNgPT37Tk/+zUfiME6VuTZp+to+ LfEmujNJDxznuO80+A4qzSeUfPM7/soCzcKOSSNJsrzst138kLKXlVV8Z+NtuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694181293; a=rsa-sha256; cv=none; b=hc14WTtsQ1sdFCjZGuaUK0QbeWa0ik5KzONXH+rRwBWp6P5cN/veEODbWoECq8Fs8GNBVt lCt4zAE1b5Jhd2auEwv+AVzMJCvsF7Ydbh21hGiDCLCnjx38zsmavg9EN5mWIAB1YHQIsG n5A9bfIS7BPabR6fvhufyKTF/R128T0+5cTGLNhJK63KiBlGeOfVHdp8IRGiN1E7gHkppt 2/1JFG4IuW/AomYawdekpu6tcY/WPnrhPrrgpXcSxt2tQACviewhVR3rfUs3avPDlxXR9g okQZRG8YJo61NqaUaEzttzomiASbN9FLXtXUk9UoQIUxmNKCI2Ss974eXP84iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694181293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B4n1eNABErp881lUCD05XV4RzCJSV5lcnhW5URDUvU4=; b=SrT/fSY3Eq2Zbj4eN7AzzN5KZmHdhwFQiqNM7DZUmbFrW9jLk/RN68U8/MRjYHsyKlJOLu YpHxmScFcOOC/cOZH/Hw3odqfAhVaQQz6LP0cgzaZQ3KG+xwJoMCobcZO584FqVn6QDlfg 7Y7CEMZnFn/Ecs7LLAXIzk6D04jMFOX2+VyDE7kM4FqTR4pxQ8yC/LITRLwV/eG+lI/lxG n/UPSg3awEAlFyONENM7A80qIBfoQsPzUywGGRSvrOGOycsYDvaQo+lrnKKaMAMuplN3FU bRY0iUeIXG8ipQ/eY7nDhR0Tk75nq1sPulWdDEhX8N0qtoMRp222h5ks5U2Pdg== 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 4RhyKS4yJFzkK2; Fri, 8 Sep 2023 13:54:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388DsqNC005931; Fri, 8 Sep 2023 13:54:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388DsqrF005928; Fri, 8 Sep 2023 13:54:52 GMT (envelope-from git) Date: Fri, 8 Sep 2023 13:54:52 GMT Message-Id: <202309081354.388DsqrF005928@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: a35e47369f88 - main - arm64: Add TCR register masks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a35e47369f88e8c2e14b7371a1a5e1152680551f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a35e47369f88e8c2e14b7371a1a5e1152680551f commit a35e47369f88e8c2e14b7371a1a5e1152680551f Author: Andrew Turner AuthorDate: 2023-09-08 13:29:19 +0000 Commit: Andrew Turner CommitDate: 2023-09-08 13:31:26 +0000 arm64: Add TCR register masks These will be used by bhyve to implement page table walking. Sponsored by: Arm Ltd --- sys/arm64/include/armreg.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 3ae2f24c2a56..8251a687a5d1 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2141,6 +2141,7 @@ #define TCR_IPS_44BIT (4UL << TCR_IPS_SHIFT) #define TCR_IPS_48BIT (5UL << TCR_IPS_SHIFT) #define TCR_TG1_SHIFT 30 +#define TCR_TG1_MASK (3UL << TCR_TG1_SHIFT) #define TCR_TG1_16K (1UL << TCR_TG1_SHIFT) #define TCR_TG1_4K (2UL << TCR_TG1_SHIFT) #define TCR_TG1_64K (3UL << TCR_TG1_SHIFT) @@ -2155,8 +2156,10 @@ #define TCR_A1_SHIFT 22 #define TCR_A1 (0x1UL << TCR_A1_SHIFT) #define TCR_T1SZ_SHIFT 16 +#define TCR_T1SZ_MASK (0x3fUL << TCR_T1SZ_SHIFT) #define TCR_T1SZ(x) ((x) << TCR_T1SZ_SHIFT) #define TCR_TG0_SHIFT 14 +#define TCR_TG0_MASK (3UL << TCR_TG0_SHIFT) #define TCR_TG0_4K (0UL << TCR_TG0_SHIFT) #define TCR_TG0_64K (1UL << TCR_TG0_SHIFT) #define TCR_TG0_16K (2UL << TCR_TG0_SHIFT) @@ -2170,7 +2173,7 @@ #define TCR_EPD0 (1UL << TCR_EPD0_SHIFT) /* Bit 6 is reserved */ #define TCR_T0SZ_SHIFT 0 -#define TCR_T0SZ_MASK 0x3f +#define TCR_T0SZ_MASK (0x3fUL << TCR_T0SZ_SHIFT) #define TCR_T0SZ(x) ((x) << TCR_T0SZ_SHIFT) #define TCR_TxSZ(x) (TCR_T1SZ(x) | TCR_T0SZ(x)) From nobody Fri Sep 8 14:07:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rhybh4bh7z4svRP; Fri, 8 Sep 2023 14:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rhybh46s3z4bh6; Fri, 8 Sep 2023 14:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694182032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYMLw29Z0DShSKrU2PWwhyaU5YwFx/YANtHildQNSEE=; b=m2MF5Bkb0XVgVIg7bPvPfNj5IZvfhmFdOIkuy7fQggxxSvw4hGUBMpknM0K9zbODBavx6n 5Xq8Eyhru+OePGSTL0ShJ/MPH8cWKMqUl938CKweXILBG2yBoI5pINmRvJ1NglOO2iMRlE /A5kGRAUStwIDp/OtTc06+91Xw3xo9TB/HL9qqZDAbXT1DOJ0Z8EkPNRJm+Cr6JgYJKQ1x 1moDItPDbnbwTyUxwAufUc84IPFNhgOLOeg184gBgWAo/NVpZDhbFEAdVR3zLRCb0MoMXD p5TqogN5GaFk7VD6oR/zY9s+fkR3WVnAW0mbROKrQjGwU1E2AU2/fuMfPuA+wA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694182032; a=rsa-sha256; cv=none; b=h7fPVwxFIPJL8Pp3WXFpXHS6rU0AYgsk3HKgpo06rnWftgJrWQrK7PVi6ENii+Nwmsx3R6 pV1avMucl0/Ca5hl7qHztViVcyVD6Pa5qjr0VQvG/T9Qe6HQ2UChc2AGWFe5kus9xbs57W n1FqXCo0OfcB8My1NNFKLlAjov8VNtjJlRzM7e1Y29epzyu0Mb0XnOJTt8e8TSuBMaSt3m m9z0WiD1NRBK52ewoK9215cFVrd4RyeIkB4RXLm+lRQ16FbwZI/9cMn2ncM86gXJcqiG/r uzOzfwtU2X8FbwurTCISDBNunM5JFZuYwi1CFMFoIvCbnzOCwdM5H4mtSg46Sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694182032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LYMLw29Z0DShSKrU2PWwhyaU5YwFx/YANtHildQNSEE=; b=gVCBaQgLgnJLHUnVHEEGUZuJwdEh91S3wiLzW1shsUeQnY0vMaSLP6ZYe6ThtTNQQUA+s7 JfBI17E3FyabjedEu1FV6HjLogYIYiS3xReRyBJVQwCXke67p7lLugj0tOftCQqvM3htmh c01qMIJ4TZ98NcXx8jmtU8BxccqKBxxG4J1EDtwmxYsuxGuTKBhjBhzXQn9nRih3YYCrAl DdxvwR3EyFr9WiIm/oEijRmQBOFHFAR/RjfnLBy/a4e+PgJ6d+pyEtCuc1GVVPGl4G8ORL aXi+QxXlV+fmHJ9qz4jdrF3Vy9n+fPUuSUDmXH+KAaIzwPBXUgxMj9vyPZMi/Q== 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 4Rhybh36jfzklN; Fri, 8 Sep 2023 14:07:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388E7C5l024750; Fri, 8 Sep 2023 14:07:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388E7CVt024747; Fri, 8 Sep 2023 14:07:12 GMT (envelope-from git) Date: Fri, 8 Sep 2023 14:07:12 GMT Message-Id: <202309081407.388E7CVt024747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mike Karels Subject: git: 48514c5724cd - main - mountd: do not warn about using class mask with -mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48514c5724cdf3338dd6d220e5deee6178d7ee48 Auto-Submitted: auto-generated The branch main has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=48514c5724cdf3338dd6d220e5deee6178d7ee48 commit 48514c5724cdf3338dd6d220e5deee6178d7ee48 Author: Mike Karels AuthorDate: 2023-09-08 14:06:42 +0000 Commit: Mike Karels CommitDate: 2023-09-08 14:06:42 +0000 mountd: do not warn about using class mask with -mask The previous code would warn that the mask was being defaulted to an obsolete class mask even if -mask was present after -network. Import a fix from Peter Much with a little tweaking, deferring the warning until after all parameters are processed. PR: 263011 Obtained from: pmc at citilink.dinoex.sub.org MFC after: 3 days Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D41774 --- usr.sbin/mountd/mountd.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 436481bad14c..6602dbc09aa0 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -319,6 +319,7 @@ static struct pidfh *pfh = NULL; #define OP_QUIET 0x100 #define OP_MASKLEN 0x200 #define OP_SEC 0x400 +#define OP_CLASSMASK 0x800 /* mask not specified, is Class A/B/C default */ #ifdef DEBUG static int debug = 1; @@ -1757,6 +1758,11 @@ get_exportlist_one(int passno) nextfield(&cp, &endcp); len = endcp - cp; } + if (opt_flags & OP_CLASSMASK) + syslog(LOG_WARNING, + "WARNING: No mask specified for %s, " + "using out-of-date default", + (&grp->gr_ptr.gt_net)->nt_name); if (check_options(dirhead)) { getexp_err(ep, tgrp, NULL); goto nextline; @@ -3393,6 +3399,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) goto fail; bcopy(sa, &net->nt_mask, sa->sa_len); opt_flags |= OP_HAVEMASK; + opt_flags &= ~OP_CLASSMASK; } else { /* The specified sockaddr is a network address. */ bcopy(sa, &net->nt_net, sa->sa_len); @@ -3426,9 +3433,6 @@ get_net(char *cp, struct netmsk *net, int maskflg) (opt_flags & OP_MASK) == 0) { in_addr_t addr; - syslog(LOG_WARNING, - "WARNING: No mask specified for %s, " - "using out-of-date default", name); addr = ((struct sockaddr_in *)sa)->sin_addr.s_addr; if (IN_CLASSA(addr)) preflen = 8; @@ -3443,7 +3447,7 @@ get_net(char *cp, struct netmsk *net, int maskflg) bcopy(sa, &net->nt_mask, sa->sa_len); makemask(&net->nt_mask, (int)preflen); - opt_flags |= OP_HAVEMASK; + opt_flags |= OP_HAVEMASK | OP_CLASSMASK; } } From nobody Fri Sep 8 14:23:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhyyJ2nGXz4rrdR; Fri, 8 Sep 2023 14:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhyyJ2Yb4z3Fwj; Fri, 8 Sep 2023 14:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694183000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jbCW8BkV/zGEP7DE3AI6lrXIWIUyZG9Q9+rWQRhWi80=; b=v937Y6C5RlwfZJVsUhWWH3BYOE+hxEAhoPHk74IQECC3ZN4yEkLytrM0L0aaYWdZYiCL9t 8j5VSi92p6SNTulzXE5lbxO89kU1H2b00hxNaccM80Qrw7HmAocNmT4lsAfUup85/OaYwQ j9LT7U6IVpAAurzXoHOc9aRjHZi6z/t9ccjVCCsKvB7Eho0XdmnfbT7JJr9IYKuXbHAw96 zlurtfAHEpm9vHiH7nQpHJq4HNzj6wDY4AKpq5VAF47WpbJa9t0hk2TiRVLgXtMnvlbl2y UgwFTegovEdxm7HZjMQLbfCgaWqxgXw7bc6xpvUkY6OoQYLU0iNLw1cBKmLt8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694183000; a=rsa-sha256; cv=none; b=yNDsJIgQ4qOmrk+WSs25VhtPZMKdedUaPI3xC7g+NJl+Xb4dprHoUywKEjIGW6j+TkJFfA L6Rb/SYRdF0xCuLgdcuPF0UJG54VEVbgZhYv+wZjtMol7TCWVtq3mPV8j2s7j9A1zhzqc1 j1IhGCGxcU4hHsPuD6r+WJtbHirl88XfqkcvTcnQVf6m5uy/P8ors6tefBENkGcqR/LrtS a2RxBZWf4uq7R6i5L9QN77NGjt50kAhDNVf7JIzbQXwafmtoK+tf811RdXiMPMQv/zXgWf ZgBYyxOerTBjTg4dYpzQ8y6+VMELpDPEZJQ6lIXhm7L98Usbj97Loj2/q9ONcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694183000; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jbCW8BkV/zGEP7DE3AI6lrXIWIUyZG9Q9+rWQRhWi80=; b=DwWx49b3mMAVQ/0IBnYpXIwMlFgyNsVJaIOFtkGg+NH/Ne7aJu3jA5R4qzTSXHcBh9pImF EkpEOl0Z4kSTDV2HAfcEDS2Nb3l0mhZim5jc4hnpW+BSZA1g0dtk2EEs59QusGRmT1aWLg D12r0bFSvzTDRGXBYnsTZ8HJq6nmzeJ3cSeMCKqS7A06P3bpsrz4Icd3Ve+2c9rKJ5zkoM zdp1ZN+9m0bHFcK9md7wvBFZdCwQ04TdShYaWRvfNPV6Yp0U4YB+wnTkoXISQNOqeDILbx hwLzDechu44gzn0zz/sRlB621aHT/Jc3Jux8x2nYHRLduSkmlg7M6WUGpwfUqg== 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 4RhyyJ1dRSzlm3; Fri, 8 Sep 2023 14:23:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388ENKns056626; Fri, 8 Sep 2023 14:23:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388ENKbP056623; Fri, 8 Sep 2023 14:23:20 GMT (envelope-from git) Date: Fri, 8 Sep 2023 14:23:20 GMT Message-Id: <202309081423.388ENKbP056623@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: f9425b3a85e9 - main - sctp: cleanup locking for notifications List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f9425b3a85e9e211b61e11ce8115bf73674bdf49 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f9425b3a85e9e211b61e11ce8115bf73674bdf49 commit f9425b3a85e9e211b61e11ce8115bf73674bdf49 Author: Michael Tuexen AuthorDate: 2023-09-08 14:20:51 +0000 Commit: Michael Tuexen CommitDate: 2023-09-08 14:20:51 +0000 sctp: cleanup locking for notifications All notifications are now queued via sctp_ulp_notify(). Do the locking of the inp read lock there and validate this in all functions being used. This is one step in avoiding race conditions when closing the read end of an SCTP socket. MFC after: 3 days --- sys/netinet/sctp_auth.c | 12 ++--- sys/netinet/sctputil.c | 132 ++++++++++++++++++++++++++++++------------------ 2 files changed, 87 insertions(+), 57 deletions(-) diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index 3c1962233347..8bcb6d5243db 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -1706,13 +1706,9 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, struct sctp_authkey_event *auth; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_AUTHEVNT)) /* event not enabled */ @@ -1757,7 +1753,7 @@ sctp_notify_authentication(struct sctp_tcb *stcb, uint32_t indication, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } /*- diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 17a5a098dd90..11469236014e 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3149,10 +3149,11 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, ("sctp_notify_assoc_change: ABORT chunk provided for local termination")); KASSERT(!from_peer || !timedout, ("sctp_notify_assoc_change: timeouts can only be local")); - if (stcb == NULL) { - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); inp = stcb->sctp_ep; + SCTP_INP_READ_LOCK_ASSERT(inp); + if (sctp_stcb_is_feature_on(inp, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) { notif_len = (unsigned int)sizeof(struct sctp_assoc_change); if (abort != NULL) { @@ -3233,7 +3234,7 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb, control->tail_mbuf = m_notify; sctp_add_to_readq(inp, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -3284,11 +3285,15 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, struct sctp_paddr_change *spc; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPADDREVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPADDREVNT)) { /* event not enabled */ return; } + m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_paddr_change), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) return; @@ -3359,7 +3364,7 @@ sctp_notify_peer_addr_change(struct sctp_tcb *stcb, uint32_t state, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3373,9 +3378,12 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, struct sctp_chunkhdr *chkhdr; int notifhdr_len, chk_len, chkhdr_len, padding_len, payload_len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && + sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { /* event not enabled */ return; } @@ -3488,7 +3496,7 @@ sctp_notify_send_failed(struct sctp_tcb *stcb, uint8_t sent, uint32_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3501,12 +3509,16 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, struct sctp_queued_to_read *control; int notifhdr_len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSENDFAILEVNT) && + sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { /* event not enabled */ return; } + if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVNSENDFAILEVNT)) { notifhdr_len = sizeof(struct sctp_send_failed_event); } else { @@ -3584,7 +3596,7 @@ sctp_notify_send_failed2(struct sctp_tcb *stcb, uint32_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3594,8 +3606,11 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) struct sctp_adaptation_event *sai; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ADAPTATIONEVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ADAPTATIONEVNT)) { /* event not enabled */ return; } @@ -3631,7 +3646,7 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3644,15 +3659,16 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, struct sctp_queued_to_read *control; struct sockbuf *sb; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_PDAPIEVNT)) { + KASSERT(aborted_control != NULL, ("aborted_control is NULL")); + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_PDAPIEVNT)) { /* event not enabled */ return; } - KASSERT(aborted_control != NULL, ("aborted_control is NULL")); - SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); - m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) /* no space left */ @@ -3705,6 +3721,10 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) struct sctp_shutdown_event *sse; struct sctp_queued_to_read *control; + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + /* * For TCP model AND UDP connected sockets we will send an error up * when an SHUTDOWN completes @@ -3714,6 +3734,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) /* mark socket closed for read/write and wakeup! */ socantsendmore(stcb->sctp_socket); } + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVSHUTDOWNEVNT)) { /* event not enabled */ return; @@ -3748,7 +3769,7 @@ sctp_notify_shutdown_event(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3758,8 +3779,11 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) struct sctp_sender_dry_event *event; struct sctp_queued_to_read *control; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_DRYEVNT)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_DRYEVNT)) { /* event not enabled */ return; } @@ -3795,7 +3819,7 @@ sctp_notify_sender_dry_event(struct sctp_tcb *stcb, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3805,13 +3829,10 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) struct sctp_queued_to_read *control; struct sctp_stream_change_event *stradd; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here. */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_CHANGEEVNT)) { /* event not enabled */ return; @@ -3858,7 +3879,7 @@ sctp_notify_stream_reset_add(struct sctp_tcb *stcb, int flag, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3868,13 +3889,10 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) struct sctp_queued_to_read *control; struct sctp_assoc_reset_event *strasoc; - if ((stcb == NULL) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || - (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || - (stcb->asoc.state & SCTP_STATE_CLOSED_SOCKET)) { - /* If the socket is gone we are out of here. */ - return; - } + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_ASSOC_RESETEVNT)) { /* event not enabled */ return; @@ -3915,7 +3933,7 @@ sctp_notify_stream_reset_tsn(struct sctp_tcb *stcb, int flag, int so_locked) control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3927,8 +3945,11 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, struct sctp_stream_reset_event *strreset; int len; - if ((stcb == NULL) || - (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_RESETEVNT))) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_STREAM_RESETEVNT)) { /* event not enabled */ return; } @@ -3979,7 +4000,7 @@ sctp_notify_stream_reset(struct sctp_tcb *stcb, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); + SCTP_READ_LOCK_HELD, so_locked); } static void @@ -3992,10 +4013,14 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, unsigned int notif_len; uint16_t chunk_len; - if ((stcb == NULL) || - sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPEERERR)) { + KASSERT(stcb != NULL, ("stcb == NULL")); + SCTP_TCB_LOCK_ASSERT(stcb); + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + + if (sctp_stcb_is_feature_off(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVPEERERR)) { return; } + if (chunk != NULL) { chunk_len = ntohs(chunk->ch.chunk_length); /* @@ -4041,7 +4066,7 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, control->tail_mbuf = m_notify; sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1, - SCTP_READ_LOCK_NOT_HELD, so_locked); + SCTP_READ_LOCK_HELD, so_locked); } else { sctp_m_freem(m_notify); } @@ -4070,9 +4095,15 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, return; } } + if (notification != SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION) { + SCTP_INP_READ_LOCK(inp); + } + SCTP_INP_READ_LOCK_ASSERT(inp); + if ((inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_ALLGONE) || (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_CANT_READ)) { + SCTP_INP_READ_UNLOCK(inp); return; } @@ -4220,6 +4251,9 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, __func__, notification, notification); break; } + if (notification != SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION) { + SCTP_INP_READ_UNLOCK(inp); + } } void From nobody Fri Sep 8 14:44:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RhzQD146jz4s6Vs; Fri, 8 Sep 2023 14:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RhzQD0JDzz3Mcc; Fri, 8 Sep 2023 14:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694184244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbEQgn8MKdDybZ3xTs/S4AvrhtunmtqCHxsrUw8R5Qg=; b=iZWr6lCoh8W+LbnxcPGKlhHxfA0MkYKN0rj1XmWFcNtnE7vH9P+DjoeLmK+mw6OSPYhNls dtgV34eccQPsuoH5K4DqufIEsfJXE/iYxJQA6EqGQ8a9lsQj/DjHaKNPlrK0pKvpCQHvJF PhQUC6/A7eb7O775O31NJJ8LYqEVASV81cNN9O0RePVWDV87z7d969mK5xUsnyr7FStDLK HKqFR1Z5p2ovc7PI+9vzdfYAciejsudWM7Xuzi2dL0AbpVh34YgnkrT9u71pNQ8/YpBtzA 8WYFI6KYRyOBM24ChTnsh9I20SVQbKLFi3DBjNKcdET0CKtOKfBtvNtVYnvluA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694184244; a=rsa-sha256; cv=none; b=QyXcVmvnVqpmDzxV6pr5wxuGfdbSPhl8XLwWIo/gLpsC6Alk3O6M9VifRNNC+LDJ+GCCGT jDpGRvWlYx42jMldYrNNZ7CgprDkxMzkVPGLxbe8lKw4jpkTSUhNcrAFqJy/ds5SWYcXPF Ad+5nx8MCQL5iiGE7pBsZTQsKRVlKfeTWlmggNLpHsRsPjwJzCa+KTP3FvsD7786ay3/cE qQbuMBkXxR65EkRJevFXCthv6c5hN15nKfROtKvQty/k8tY9PlIwRdpYLvurjcsVjjF5Ub +Dkij+QahKDb10V5D0DwLDM+6gJnjDeDyj6MwfFeRG3Vp4ZpxheuOMgOt7W7OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694184244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BbEQgn8MKdDybZ3xTs/S4AvrhtunmtqCHxsrUw8R5Qg=; b=eKMii5aSiCWvgMjfVXq5YJQkLv8iRE+zklRf36pEs4bQkSy47cFe3V2GTCsq+hf0cItH+W 24svqo55jZn2gz0ZSzlPOFk0mVp/1pnr9NU5gYtV6aIO4SkDVlp4xpwmyfKjtNOMlcv05A WkDxTl+m1iIFguC/2d0dgiiY8mOdQGKopzVEr0CrJWh0hPRcVd2deHhfZUwezMfg3Gq7jd /Jai3KZa3Kd6HFdiONYXypW44CRQR8lX0X4U0SzH8EwxXwpky8mJ2+bu0fwM6m7qeXDlGZ aqiZxJmO50xfMfMdW86Fh1PNnAV/yldAIQOwku0d3H+TnQc09iOJZ9R550eSRA== 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 4RhzQC686KzmN3; Fri, 8 Sep 2023 14:44:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388Ei3R0093256; Fri, 8 Sep 2023 14:44:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388Ei3rQ093253; Fri, 8 Sep 2023 14:44:03 GMT (envelope-from git) Date: Fri, 8 Sep 2023 14:44:03 GMT Message-Id: <202309081444.388Ei3rQ093253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Felix Palmen Subject: git: 162186181013 - main - committers-ports.dot: Fix entry for jbo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16218618101322f28cba589f3b73aea9f4b05ae5 Auto-Submitted: auto-generated The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/src/commit/?id=16218618101322f28cba589f3b73aea9f4b05ae5 commit 16218618101322f28cba589f3b73aea9f4b05ae5 Author: Felix Palmen AuthorDate: 2023-09-08 14:39:47 +0000 Commit: Felix Palmen CommitDate: 2023-09-08 14:39:47 +0000 committers-ports.dot: Fix entry for jbo Joel Bodenmann's entry accidentally went to the alumni section, and I didn't notice from the context Phab provides. Fix this. Fixes: b4b89476fa95 Add myself as ports committer [...] Pointy hat to: zirias --- share/misc/committers-ports.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index bc78f2c88cde..4ce4a747cfc2 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -68,7 +68,6 @@ ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20\n2011/01/02"] itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07\n2018/11/06"] jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05\n2011/10/14"] jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02\n2020/10/05"] -jbo [label="Joel Bodenmann\njbo@FreeBSD.org\n2023/09/06"] jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06\n2021/06/07"] jmallett [label="Juli Mallett\njmallett@FreeBSD.org\n2003/01/16\n2006/08/10"] jmelo [label="Jean Milanez Melo\njmelo@FreeBSD.org\n2006/03/31\n2013/08/18"] @@ -204,6 +203,7 @@ grembo [label="Michael Gmelin\ngrembo@FreeBSD.org\n2014/01/21"] hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2004/04/10"] jase [label="Jase Thew\njase@FreeBSD.org\n2012/05/30"] jbeich [label="Jan Beich\njbeich@FreeBSD.org\n2015/01/19"] +jbo [label="Joel Bodenmann\njbo@FreeBSD.org\n2023/09/06"] jgh [label="Jason Helfman\njgh@FreeBSD.org\n2011/12/16"] jhale [label="Jason E. Hale\njhale@FreeBSD.org\n2012/09/10"] jhixson [label="John Hixson\njhixson@FreeBSD.org\n2018/07/16"] From nobody Fri Sep 8 18:21:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj4F45Z6fz4rx6b; Fri, 8 Sep 2023 18:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj4F456Qlz3SlS; Fri, 8 Sep 2023 18:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694197288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NLZsl9lZ4O7quiI6rFO2cvQCxcG/iOskG5nuYRmEFWI=; b=JRa7TwrByHGg/VJophm7hll720QSP0MKr3Sp8LmVtxVy6oG/3NpDLfjAeJ+TDSus9xAgum 2/SOhnrOlUQmSw+Ul+0mnClaoxWUVvSqiKnbJu3T5jQY1mYKAngl6+zMHcX7T1Rt3bCgv6 EHd1j35dnbesvFh8/u51tES1tPZwykjP1W2QvMFteEqbUdNnQwqkwRANqMBLD6FgDq4HLp wrwNW6V3QvhgM0JUMsbZuNNHDGfoZA1HyJ6peh/lolFNrHhaPyfKps5jsy1LKwHLDjd5VG IO7xJ7OIEsCsqjplyaHI9dfY9Qxk9wYKFdW3Fa9DeX2RVbs+BcT03Nt4uNmwbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694197288; a=rsa-sha256; cv=none; b=ey5nMf1MncEKxSBjDAVShLAC4S9ULQhndjsNGllRsZI/SbzM0AWyawquSg7mDpUtG9nx2F YUVVHk+WEiuMWDBqcnYKxJ+OSyRX1VhMIM04Gg322U4lwXF5f5CXqNBwAwwJb+9WSOvILm 74IcrNogS9rNGOucdpTAnrAfdWdRlwaRxKHcN85itJB2Ry3W1pU8cUyYD0c956UJjYncUW gMHFizvFipmcVcT/rNuYe9U7fngF7CL1Lwtp8ETMt8xf0iv6pgVeq4fyBBN0cjTV1KCuVZ zRBU7ixk6irSICl9+PiRbj9LxRoFaUIY2gPmePzv53q3lEZ0n2moi93w835SzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694197288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NLZsl9lZ4O7quiI6rFO2cvQCxcG/iOskG5nuYRmEFWI=; b=g4ZxZNd6YUo8DEh2BXsEvKyKGppz1Ci8MFiQE361ofVqhAtZ5adKx8W4IemCIB2EhQAP3y IC4BNEwK7Hbz/OfmnTaOR20V7vwzrJDeJot/SM9sFvDCGwUt2b9ifWH3jy4I60IzLynOnJ bMA9k8Q5gorCJn5loVZqXnDVcLlTeU/s/QcYTloif2XKlrUStoVfebeJ8NsfMPOXMDJljl 3GRH3xxj49kuKFWhRAKDABDvclSmIt8W0uHDW8SBL9bWxGDlMf7OcugtJkj6vvx7WiiQWi +CIK95aXeA8Wk71wSSqPdxpZoPS+i6lwa6cuYxS4SonQboEAv3jKTnmDR2reiA== 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 4Rj4F44C4rzs6G; Fri, 8 Sep 2023 18:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388ILSuN055924; Fri, 8 Sep 2023 18:21:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388ILSLM055921; Fri, 8 Sep 2023 18:21:28 GMT (envelope-from git) Date: Fri, 8 Sep 2023 18:21:28 GMT Message-Id: <202309081821.388ILSLM055921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: caf5283fc92e - main - grep: Suppress EISDIR when reading. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: caf5283fc92edb83173752b1dafbc6d586e78815 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=caf5283fc92edb83173752b1dafbc6d586e78815 commit caf5283fc92edb83173752b1dafbc6d586e78815 Author: Dag-Erling Smørgrav AuthorDate: 2023-09-08 18:17:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-09-08 18:19:46 +0000 grep: Suppress EISDIR when reading. MFC after: 1 week Sponsored by: NetApp, Inc. Sponsored by: Klara, Inc. Reviewed by: kevans --- usr.bin/grep/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index cd2764811776..3349b72842ca 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -72,6 +72,8 @@ grep_refill(struct file *f) bufrem = 0; nr = read(f->fd, buffer, MAXBUFSIZ); + if (nr < 0 && errno == EISDIR) + nr = 0; if (nr < 0) return (-1); From nobody Fri Sep 8 19:20:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj5Yj2XX0z4sqRc; Fri, 8 Sep 2023 19:20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj5Yj20yCz4GwQ; Fri, 8 Sep 2023 19:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694200857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Mb+Tq+myoHeJRR9NyuRC9J6K7jROW/0eK+ecyO9PUQ=; b=Xs8GZy32j7zAEV01U//W8y3AHzjnA82VO33ujlrZ+H2pC99+JESAF4wNTJNcgB5y2IWbyL fRjvD8XfGuCMorjRBgq7A9BnaNobV5yfA+yw1FLhDBSwWPOlsXX/+supqyc9BToFgSmTNa Co7cCW7EYu1X8kBfkXtGQkNPWK33qX0BPqTcqhimDskR9iGLkUnLGg1hiEMW6ID1Q6e0ik mX4pHo212XafyMlWRT0odgaJ0O/3lTZs45gz+cgz+MK6ymKbPe39jIKmIxLTGqxlivKF/i 9mkll5kOXCTnxbE0XoaIUPZoDzN9EEguAfKoEGFPwiLoJryfI4Zn2gw45pt9sA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694200857; a=rsa-sha256; cv=none; b=uTN2aRDrgN1EfeazSsWIiebZarl4HpfsukNXux/w7Nc5PqvI50Qkj3kWWaiHrE0aa6pAWR WxHtUMvx9Yk382IdqK5fteJLJ3x2sidrRrIVm/592QF70gP1UJOZhi6zOdtyn3hf8oeK2H 4mqH0z10JLGByOaCm5KDusMwf7clKEJuv62QYI0PCG7e+fq/0GOQv5pulB3wjmt3FRrqNa zGXsvTgc7hda+A5PTJ4Bc4Z+g/oSy8pmel+lXkpRx0GKhnAX1G6hewsNm24bj6lFcid7t9 s09UOIr2DiSSq3TRvFu/y/w+o0GQbUSOpSZaO1G4go/I9rdd9AUrbTACrNPxyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694200857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3Mb+Tq+myoHeJRR9NyuRC9J6K7jROW/0eK+ecyO9PUQ=; b=GwzXShnvZA8Ne/HMfHofLJdovhjskcvn0NKvDsy8MUztnKSuRQ3O91ZBTdyQ4MBmlL16nl huzjR09t4GqVrqrboMpQ3sKfTzRcMLubpOV2VFwDA90Cc+VwiE/Yq2CK5Lr0tB8DpiWLsK DSf2EX6L/rVcm2bZAs8oO0KzEwetPSAdkRB8GVdNvnL5An+DeQPcnXYY1fSnkOoQD/ouOE 9CXAhxqa4PWobTxoGmY7qWUbDXNG7OTMD0JlOdCpxiU9wCXzOfARrXlsHMUJ+rTWIKe7LD 2VABLaJ39FFBSo19cxABzb/5u0a+IoSkVYmBNXNqy0KBcKFh4vObr4La22xhEA== 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 4Rj5Yj11VyztcH; Fri, 8 Sep 2023 19:20:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388JKvHg051240; Fri, 8 Sep 2023 19:20:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388JKvr6051237; Fri, 8 Sep 2023 19:20:57 GMT (envelope-from git) Date: Fri, 8 Sep 2023 19:20:57 GMT Message-Id: <202309081920.388JKvr6051237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 1e81a4e7e89b - main - sctp: don't call sctp_ulp_notify() recursively List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e81a4e7e89bb1870bec84e42284ad10505e957c Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1e81a4e7e89bb1870bec84e42284ad10505e957c commit 1e81a4e7e89bb1870bec84e42284ad10505e957c Author: Michael Tuexen AuthorDate: 2023-09-08 19:19:59 +0000 Commit: Michael Tuexen CommitDate: 2023-09-08 19:19:59 +0000 sctp: don't call sctp_ulp_notify() recursively This does not work with the new locking scheme. MFC after: 3 days --- sys/netinet/sctputil.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 11469236014e..19180b3cf725 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -4117,7 +4117,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, sctp_notify_adaptation_layer(stcb, so_locked); } if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_ASSOC_DOWN: @@ -4182,7 +4182,7 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, case SCTP_NOTIFY_ASSOC_RESTART: sctp_notify_assoc_change(SCTP_RESTART, stcb, error, NULL, false, false, so_locked); if (stcb->asoc.auth_supported == 0) { - sctp_ulp_notify(SCTP_NOTIFY_NO_PEER_AUTH, stcb, 0, NULL, so_locked); + sctp_notify_authentication(stcb, SCTP_AUTH_NO_AUTH, 0, so_locked); } break; case SCTP_NOTIFY_STR_RESET_SEND: From nobody Fri Sep 8 20:37:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7GB5P5fz4shRV; Fri, 8 Sep 2023 20:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7GB4hS2z4dhs; Fri, 8 Sep 2023 20:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sZDLZ+U7GG8CW0fsmCXDChAo20qHaooDsRvMVXle6+U=; b=GwIYqhtP/i0bI7wJeLGjSOlJDQNvbr21wqAkkDL4UPM290+FuO/Q+X49AnnhZoc4W0vYi7 bVY9sK4XT6flXSjueIUuU91/JIQYAyjRZubptcmfOyPUW5MaqcEpalTSJsVuj6uvB+y8vR wegahppR8s0dUCktdc5hc/h77sPstDhSmzC5njtx5AhFDJ7LABH4oSGkWwqVSSPXZaAh/u ovq2nwkuW9bpqtRbaHht6Y6HcJLEorgp2M4SIwBciTgVMKCJEvgnGBXjcYyY4Um/1W4wKz ohmQVwZbWB+OC2cpTWZIyFUUnJrkZwSJzVIxH7gFvV+pndZh1aIcoEHnQv2rGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694205458; a=rsa-sha256; cv=none; b=cQchwwFxpxlm4mqp89QOA/6I6sq3JFTqd5ttcUKnrdjcVFoqXzNRss7cACoxRP8z2R9b4u Ziq+vh6HxYO+IrSRDz0utbEOKyxyYUvGFrxCJO6SjCAmga0ttZDi1os5JrXrd05ytOrpwI /zs2GI2kThQ8XutKSFvciykI0Rtn2pwDKkdQjdmEcJB51mmfKpvvahrwgI+wB65xrnERr5 dCbfLk1XQDQ9PyMYrotlqrEQwVVLVMAhP8L/WSdwt6ykHCSiuAN7bxL/nmEnupjLv1qDuN j/rWuwBx5YHKDjHGdLu+RW9mJ32gq9kwqsDxdkpDrypqg8pXBBbbr8V9dSp+2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sZDLZ+U7GG8CW0fsmCXDChAo20qHaooDsRvMVXle6+U=; b=HAi/G5CgrwwWxg0Bkf5JgSNYrzSlB60qx6ssC0iq852nJvnibXPmKU1mcm0g2QkOVf6jIV F7fD9ZZOS/Puy6AODl5E1dOizEfu+xpXXa1xQaQhYlpoec5BWSs8ZeEq5waZpPuYgiLIrJ MWt1cXp+iZT1E0jbjw9pu9ZqxBQ3S9sqJHTTZi5InIgNarU+g+pWaal79dE1B4zJie8EkB 6QxxhuV94qtauCT0cl+wfvZrFwiE+iaxnf23NElxKJu/N7oFHlCSp2EEBdYvRM1ghOdycV HBNcIFPEL3UDXjDHW0E/5CUsJKsyyrkHDrtTSedWMM/1S0yA+b7Ji/IW8enBZw== 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 4Rj7GB3Qm9zwZ7; Fri, 8 Sep 2023 20:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KbcXr073501; Fri, 8 Sep 2023 20:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KbcqH073498; Fri, 8 Sep 2023 20:37:38 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:37:38 GMT Message-Id: <202309082037.388KbcqH073498@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: 99f8ee196deb - stable/14 - libcasper: reference system.fileargs service List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99f8ee196deb0ca2b2a19602a317ac61e9ca25a0 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=99f8ee196deb0ca2b2a19602a317ac61e9ca25a0 commit 99f8ee196deb0ca2b2a19602a317ac61e9ca25a0 Author: Ed Maste AuthorDate: 2023-09-06 13:45:31 +0000 Commit: Ed Maste CommitDate: 2023-09-08 19:39:09 +0000 libcasper: reference system.fileargs service Reviewed by: oshogbo Fixes: cdd6ea94b0a4 ("libcasper: introduce cap_fileargs...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41761 (cherry picked from commit 56e3123fc864b6d08ee5b3752538d2f9be52027b) --- lib/libcasper/libcasper/libcasper.3 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/libcasper/libcasper.3 b/lib/libcasper/libcasper/libcasper.3 index c98a3044df25..ccd347232777 100644 --- a/lib/libcasper/libcasper/libcasper.3 +++ b/lib/libcasper/libcasper/libcasper.3 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 10, 2023 +.Dd September 6, 2023 .Dt LIBCASPER 3 .Os .Sh NAME @@ -212,6 +212,8 @@ Casper supports the following services in the base system: .Bl -tag -width "system.random" -compact -offset indent .It system.dns provides libc compatible DNS API +.It system.fileargs +provides an API for opening files specified on a command line .It system.grp provides a .Xr getgrent 3 @@ -272,6 +274,7 @@ functions always succeed. .Xr poll 2 , .Xr select 2 , .Xr cap_dns 3 , +.Xr cap_fileargs 3 , .Xr cap_grp 3 , .Xr cap_net 3 , .Xr cap_netdb 3 , From nobody Fri Sep 8 20:37:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7GC72NXz4shJy; Fri, 8 Sep 2023 20:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7GC5fJsz4dlQ; Fri, 8 Sep 2023 20:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jlfqDnyD99YTkaFp4gP2z5H93XyAvPH9Sm1nHR2EdCk=; b=KzW8ophTTYhGWOteFphBjSppUyRgESJB21wh5lLIyKV8zQZ4pp/gAWDdZaNEmOR5hS5YIV VsAwQHJWxOt11DJLJIQvu/LTsanBsQRuNetkWWV8h9zIBM+nc3eo9mNfNW+D8Qt/AiOsD6 E+8CiAHUnZcG+newW/xY5Ns5lljA7tYqQt5j/GdWKvH39/UlrrvU040STEdLmjRlcfmVTi WoPFDBxNMPSGbkYqcb8CYqgrkw6RcCRjWNy4/f58eDA8g/SIy/pc6hgieaQLxwMGsHosz9 o7omE5lw3ZwyjSdoDDHL8dunG484opQxEEW7y7HRr8rK9EIbtWeBLvMCO8zG0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694205459; a=rsa-sha256; cv=none; b=pixnUzy+oh8BUzYD4Jn0EXdRAH8zpUbbHZu/phFd/EWGk9G1hyswswXqO7qyWvMeq9ei3e 4T/Q6sRFAL6pRYxHejFnwLXYmb4rpeP5VhDYaFIbJfBDA8sVAlIpAFeM+ZTI0lpgrOIZ82 SUws/5voG3afwQuCYexsuJrm3QLGPVHW7fT3moas7LEqGZAbQ/wJNV1d1b6tr4pR2eeujL +qWa+YSh/rOhMMiO1fh98P/I2eaf1hoHN4dTrrrRr87bkn1D1gfwscDOImnZapGUGgI33P 04FW8mf5rjTAL/wlfN6N7FuWefF6FogX1thwSrnIx0XyE/42B7Hxb0adpuqF4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jlfqDnyD99YTkaFp4gP2z5H93XyAvPH9Sm1nHR2EdCk=; b=otkl7Mw+1bw6bEyDXId1Ks34iy7b63hgIAtSbU+Gf5K0uLPNsw1hbg+5bvCA8MFA2KFkzZ 1CRY37M3t7zcriZuYoyY4zcET/ALce7MJept+NdDg/9Nr90yvfMXdgdr++stHhJYP0vZ/D mUoAQXozzxBnfej1+eJv3rxmPy8eJgSNwt3eRMtn0uHpJOelALBUVJDXgzYDRmHL9VR3SB 1349jAsuQTbVu6YquSgNcDaxW/g1zw7irFODELwDMdTwC5m2t41F6pkkpmyZX2CewYgdAH IHWbMcZzeRCsNZJhxA2wOcrhMsK1FLNR1X2orsJ+Xcro/uJwXZz/Sypez7UaEg== 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 4Rj7GC4dcbzx0q; Fri, 8 Sep 2023 20:37:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388Kbd3W073552; Fri, 8 Sep 2023 20:37:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KbdqD073549; Fri, 8 Sep 2023 20:37:39 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:37:39 GMT Message-Id: <202309082037.388KbdqD073549@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: 5623352ec005 - stable/14 - release: remove inet blackhole sysctls from GCE config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5623352ec00532193e9cd44332814f8d482422e4 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5623352ec00532193e9cd44332814f8d482422e4 commit 5623352ec00532193e9cd44332814f8d482422e4 Author: Ed Maste AuthorDate: 2023-09-06 00:03:25 +0000 Commit: Ed Maste CommitDate: 2023-09-08 19:39:09 +0000 release: remove inet blackhole sysctls from GCE config Other cloud images do not do this, and it can produce confusing results. Reviewed by: Jose Luis Duran, delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41751 (cherry picked from commit b7528b16c6039a9f0af28f8f3ccdd6ea4eb7e604) --- release/tools/gce.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index d219852b63a2..aad4a74d2e39 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -83,8 +83,6 @@ EOF cat << EOF >> ${DESTDIR}/etc/sysctl.conf net.inet.icmp.drop_redirect=1 net.inet.ip.redirect=0 -net.inet.tcp.blackhole=2 -net.inet.udp.blackhole=1 kern.ipc.soacceptqueue=1024 debug.trace_on_panic=1 debug.debugger_on_panic=0 From nobody Fri Sep 8 20:41:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7Lq0TTsz4skVf; Fri, 8 Sep 2023 20:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7Lp74NQz4gKk; Fri, 8 Sep 2023 20:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXZzPokeZ215LKmidqc0YwvSvZ48mdOAzsi60yetN3Q=; b=ZH3GhGZAFpPaNUjT9B7zn+ZEZC8ObTZo4TnEHkNsMgGIcVgrx1/LLe3DrzDZk41GCv0gw9 dANmtLt+b52QsdIpwXqq9HTY/S6bARUPMycGtELBlzQ7XQ3AtueCDoAd9j6W1ohhq5AFYt F9cOTAdXIeNHvXZF53mMOsxfbI49Y5irFpbYn7DTTllDGn3XOEzQvW07EHBUCWmt3hpvwu pL+R2QnrAvACf/F5dQyfC7srjPIx4we7Ro1Jxae7cuhd/Vc2IwHfcSsn1abvM023R1LUEp yAoRAu2GUD+rFmCWXAEVn9F9TUn035onT7jvEBDbc4Tgx8eGy8SiUJqGXrNE7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694205699; a=rsa-sha256; cv=none; b=NKlLspakSzsf50LLd7IvtsgasoyNCabmL/erzkTzNFYhBsnwyVXUjSTZtTPtMwlN7nSvC8 ir3tZf9RdNylQTWiKBXtKIizM+QtK8VeQSzJT3IFL5s4Bsn9dCfkcred2kkepMwSHmH8KS MGZka4i2PuXW8x3ggpXB+rN/KBK4dOKlNA69JekXrLwrkTy3vMfaKCIcH9uEPsr2gp6cb1 lMSkg/GC/Tk67GJwscNivzdcUZ5vwDFATxLz+kuKY2WosLbqfVQl6cQOZPYsY8KGMWFWc3 4cRHf6uXIjHYaVvBcQfyuNVCg5e0roQs7H7gHs70loXfn8KqqIeKM2nrKeZzqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gXZzPokeZ215LKmidqc0YwvSvZ48mdOAzsi60yetN3Q=; b=h5ZUNYZvh/LkITXxGuwzSHg2pvJKHWIL6IsvmVi758rfwgGoT8bghOvmUQ9uqqaM0z6/59 r/HiMsOv+LaSxKz4bEFKE/FI0uORZDtWFRCMx136dGVf84P61VjXD7LHsHwae6nJy7VU2M fOjgmdizKY5GXwqqCj/QA+XEPoDZYaquLv/e3f2Kyptmy/p9lCmzBNf7FTctkx17FnY9gg owRxuK8KCHbt0ULBxGYlmT2f3aSZdROreG27/I1iy1jGYgfzRa4AH+kI+J2wqME7641lv1 mVFhMpk4PJ/zlcQ9wXxy9TXVoqU+SzfIRWQKAmnQUiMTB2k1JMRKNJtizhsAEQ== 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 4Rj7Lp68K6zwxx; Fri, 8 Sep 2023 20:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KfcfH085670; Fri, 8 Sep 2023 20:41:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KfcOp085667; Fri, 8 Sep 2023 20:41:38 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:41:38 GMT Message-Id: <202309082041.388KfcOp085667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: cb7a046afe00 - stable/14 - arcmsr(4): Fix typo: rebulid -> rebuild List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cb7a046afe0038e280f8789fcbbd76b5ac9a4899 Auto-Submitted: auto-generated The branch stable/14 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=cb7a046afe0038e280f8789fcbbd76b5ac9a4899 commit cb7a046afe0038e280f8789fcbbd76b5ac9a4899 Author: Mustafa Ateş Uzun AuthorDate: 2023-08-17 13:45:14 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-08 20:40:54 +0000 arcmsr(4): Fix typo: rebulid -> rebuild Pull Request: https://github.com/freebsd/freebsd-src/pull/819 (cherry picked from commit 2f7e72bd1c024e1e8274acbe1ce57514fd444583) --- sys/dev/arcmsr/arcmsr.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index b43e9b8b3813..9dd3142d1933 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -1366,7 +1366,7 @@ static void arcmsr_stop_hba_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBA_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); if(!arcmsr_hba_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n" + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n" , acb->pci_unit); } } @@ -1380,7 +1380,7 @@ static void arcmsr_stop_hbb_bgrb(struct AdapterControlBlock *acb) acb->acb_flags &= ~ACB_F_MSG_START_BGRB; WRITE_CHIP_REG32(0, phbbmu->drv2iop_doorbell, ARCMSR_MESSAGE_STOP_BGRB); if(!arcmsr_hbb_wait_msgint_ready(acb)) { - printf( "arcmsr%d: wait 'stop adapter background rebulid' timeout \n" + printf( "arcmsr%d: wait 'stop adapter background rebuild' timeout \n" , acb->pci_unit); } } @@ -1394,7 +1394,7 @@ static void arcmsr_stop_hbc_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_doorbell,ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE); if(!arcmsr_hbc_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -1406,7 +1406,7 @@ static void arcmsr_stop_hbd_bgrb(struct AdapterControlBlock *acb) acb->acb_flags &= ~ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBD_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); if(!arcmsr_hbd_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -1420,7 +1420,7 @@ static void arcmsr_stop_hbe_bgrb(struct AdapterControlBlock *acb) acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); if(!arcmsr_hbe_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3367,7 +3367,7 @@ static void arcmsr_start_hba_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBA_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); if(!arcmsr_hba_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3380,7 +3380,7 @@ static void arcmsr_start_hbb_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; WRITE_CHIP_REG32(0, phbbmu->drv2iop_doorbell, ARCMSR_MESSAGE_START_BGRB); if(!arcmsr_hbb_wait_msgint_ready(acb)) { - printf( "arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf( "arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3393,7 +3393,7 @@ static void arcmsr_start_hbc_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_doorbell, ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE); if(!arcmsr_hbc_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3405,7 +3405,7 @@ static void arcmsr_start_hbd_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBD_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); if(!arcmsr_hbd_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3419,7 +3419,7 @@ static void arcmsr_start_hbe_bgrb(struct AdapterControlBlock *acb) acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); if(!arcmsr_hbe_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* From nobody Fri Sep 8 20:42:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7MW2lrnz4skkk; Fri, 8 Sep 2023 20:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7MW2HGvz4h31; Fri, 8 Sep 2023 20:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7LgChFicWrQ+OTy3MeDkGt2E48nM3XPp42mAa0NyaY=; b=yl96kUD39ll1ODhV49/Mz30EVrtaf+O414/XCkVGgDhzkW93r/4IlzEOcdX0u3I+arOXlK mmAi9POcf6OhVqG8Uj7oJkprLtxOLcMTr2vsrn9LgeoOVylnftg+yy4pZLNw8Xhm8rGsfh E7yP5X6sgjjEojTmBL9p0PIl9BAo5R9vDQpE4n4Z+qNBwL5Q1cOp+xXt4TfmkznFvlBYTC MGRaStgvytTPQvb02e9njIzckKb93HIEvM2CefWp+j9ttIdVdUXbSns9/dxktuW+8i9SuI jatLh9oV00y94CmwLj8ti20vj0xz0BbJsLSQvE0ZltX322PRpr1xNSs01tvo4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694205735; a=rsa-sha256; cv=none; b=Mg7e7ZewbkT5CHlFfOzMAFtsEFy6361vehXePU61F6K6Lp4kHhPSqLs8tYgydfih9WH8PT yXBgj3KKIcyfKz2WTUP3EVbvVRgk4if1/aR3WF8gP/LzZNgVKCQwhn2jxDoPpvjEmAGHyq 92wDZDtwG8d4j+1pYTqVO5oz09RKjimW5pdWBOGfNamwbvCr98HzFtNbhOqvlHy6nWQEe3 87DMuazxJKO8kJdly+VzKP8qH6m1crmUfk1dypZahtUv9WhlVYUJfFzt6p5PcY2IWuET9/ 2pzA2iB5LKjaRLbD7oJDe+8N3lun2lHKW1PzrKX7Hj/JqyGXlVoLkORF6sacjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694205735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t7LgChFicWrQ+OTy3MeDkGt2E48nM3XPp42mAa0NyaY=; b=bwOKx1KmgjxeSYzLkWTDiiNcoDV3pMz7hNWfMbfA4w6diusTlu0Iqt3rPK2SGRv/2rwaOn YNlOBGM68mYeO7sE4OyoISnx2ZgP1DWd1Pwp7OGvkxOx4374mkNvW1L8fFIRaxPDqLw8Fj sQiI2E5V9zpTiILpuAyZ5rZFYtyiQoBxOYIdUqsraZzx52lWITOzH7z5yB1sIvKc45X9HE anQyxWF7Y1vqW8dA9wjCrTz/WUrZZhQPdFBZ5nOW70v6aY9qB8D6N/ohHmBf+2/G4/8YOq A2qCBiligU+IKTA7LWz65iq1Ihyu2HJcrR0jl7X26hcbXo8bWDGo7x8ITolAdQ== 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 4Rj7MW1N0TzwvW; Fri, 8 Sep 2023 20:42:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KgF0m089064; Fri, 8 Sep 2023 20:42:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KgFr8089061; Fri, 8 Sep 2023 20:42:15 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:42:15 GMT Message-Id: <202309082042.388KgFr8089061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Li-Wen Hsu Subject: git: ef310d3a7111 - stable/13 - arcmsr(4): Fix typo: rebulid -> rebuild List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ef310d3a711180e5805a3491f40d3631d68eb3ec Auto-Submitted: auto-generated The branch stable/13 has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=ef310d3a711180e5805a3491f40d3631d68eb3ec commit ef310d3a711180e5805a3491f40d3631d68eb3ec Author: Mustafa Ateş Uzun AuthorDate: 2023-08-17 13:45:14 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-08 20:41:48 +0000 arcmsr(4): Fix typo: rebulid -> rebuild Pull Request: https://github.com/freebsd/freebsd-src/pull/819 (cherry picked from commit 2f7e72bd1c024e1e8274acbe1ce57514fd444583) --- sys/dev/arcmsr/arcmsr.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index d4e9fb3f8e00..bcad86c95f04 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -1372,7 +1372,7 @@ static void arcmsr_stop_hba_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBA_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); if(!arcmsr_hba_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n" + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n" , acb->pci_unit); } } @@ -1386,7 +1386,7 @@ static void arcmsr_stop_hbb_bgrb(struct AdapterControlBlock *acb) acb->acb_flags &= ~ACB_F_MSG_START_BGRB; WRITE_CHIP_REG32(0, phbbmu->drv2iop_doorbell, ARCMSR_MESSAGE_STOP_BGRB); if(!arcmsr_hbb_wait_msgint_ready(acb)) { - printf( "arcmsr%d: wait 'stop adapter background rebulid' timeout \n" + printf( "arcmsr%d: wait 'stop adapter background rebuild' timeout \n" , acb->pci_unit); } } @@ -1400,7 +1400,7 @@ static void arcmsr_stop_hbc_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_doorbell,ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE); if(!arcmsr_hbc_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -1412,7 +1412,7 @@ static void arcmsr_stop_hbd_bgrb(struct AdapterControlBlock *acb) acb->acb_flags &= ~ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBD_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_STOP_BGRB); if(!arcmsr_hbd_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -1426,7 +1426,7 @@ static void arcmsr_stop_hbe_bgrb(struct AdapterControlBlock *acb) acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); if(!arcmsr_hbe_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'stop adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'stop adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3373,7 +3373,7 @@ static void arcmsr_start_hba_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBA_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); if(!arcmsr_hba_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3386,7 +3386,7 @@ static void arcmsr_start_hbb_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; WRITE_CHIP_REG32(0, phbbmu->drv2iop_doorbell, ARCMSR_MESSAGE_START_BGRB); if(!arcmsr_hbb_wait_msgint_ready(acb)) { - printf( "arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf( "arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3399,7 +3399,7 @@ static void arcmsr_start_hbc_bgrb(struct AdapterControlBlock *acb) CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); CHIP_REG_WRITE32(HBC_MessageUnit, 0, inbound_doorbell, ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE); if(!arcmsr_hbc_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3411,7 +3411,7 @@ static void arcmsr_start_hbd_bgrb(struct AdapterControlBlock *acb) acb->acb_flags |= ACB_F_MSG_START_BGRB; CHIP_REG_WRITE32(HBD_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_START_BGRB); if(!arcmsr_hbd_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* @@ -3425,7 +3425,7 @@ static void arcmsr_start_hbe_bgrb(struct AdapterControlBlock *acb) acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBE_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); if(!arcmsr_hbe_wait_msgint_ready(acb)) { - printf("arcmsr%d: wait 'start adapter background rebulid' timeout \n", acb->pci_unit); + printf("arcmsr%d: wait 'start adapter background rebuild' timeout \n", acb->pci_unit); } } /* From nobody Fri Sep 8 20:49:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7Ww4nJFz4spBW; Fri, 8 Sep 2023 20:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7Ww4Mhzz4kCP; Fri, 8 Sep 2023 20:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mev21pshAp02b6iRAb6X9zGdB9Ien9e7VNLQaNIftE0=; b=LsjBWniVt3Fno8LBW4WR3fmq1kYzvNx3fmkCdpzwS8lPzjna1DdhSFmlai+ZypFuXgqlH+ CGVCkr2SurJXdv0Izg/zhqk2Qx5gcDOgse+fHNhyqCGF7qhtBTEssDLFNVU1t+BWPhKD+p Yb+DUIkRt4wrYcfy4libzTYR9JCy1rEeHxa391LgIHG/GyA21Fu67UTke9bbyyxFGa028e xtlopEdJE4fktiCwQRmgNSnpzNlbJpS18nhqA6mYwGdUdDNXFZE+hRTCVoFpfBzsnzDC7b EMVSSEC/D3j0KFM0NXiqS1cFuCaghsoLEm6K4kJw4s1ZHTh3/RjVvM00DOpTYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694206172; a=rsa-sha256; cv=none; b=s8Q05b5HStpPK6sUmd30KU3MWFnGyRoLsb+4Ar5aZ00gLLslLJnbTWe6/4KiP4HdXbqFkI 2KSdFQpZUiYNOzzHFcMAJPUUyWntQBCpGwDai5ZQDEzS6hTya4YTItgNkwmBVzMajqX0eO q8BNi5RgU6RjJYdAe/ZigWc0NB5+IRDDHUlFH8JRUBE/vQlwarlOgjk+WeShAVJs7LdbYn /o97skG+t66nybJ8egQGgovGzBRf7nIIeYujlrJzuFAzfETWQWN6yotGNb2CoqIdpxzSVK MTgackSAUteVztdd6P0Y5a3QJinwXz1WgkZ59USfvne0UqI1nITVHG2RDmNuQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mev21pshAp02b6iRAb6X9zGdB9Ien9e7VNLQaNIftE0=; b=Vg87Hjb+PKbkCHSDee+/tP2PQzokOpG8Fuzh9FeygLtc4bks08VGd6EJzrB0/to2KHHOe/ 7stKVzbYfro9e71iLac5Vb9GpGGUjps5JigZAP2kReJWyLWSkOZ/M0xoZ+iI/vsnhk/Fx9 1l3d2d8fvCD/8rXfNmNBXtLSL/LyI5mS+EDxzR9lW0XfKZ2NqHg69sv+qiaU73jXUq9xwb F5xxslNj1jb4B3+77/gMBx+xLriILUkCxFWlHMT5fbAqZcwVDd9ivgKxJ4Y07+vhDvh9Lg L/FNl/f4QhaC0Ye0eOMVK1Pxfm+LjO1nT9vNUS0aFMOZHhbDhyQV7Nvmqbx2ww== 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 4Rj7Ww34hkzws1; Fri, 8 Sep 2023 20:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KnW8B090898; Fri, 8 Sep 2023 20:49:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KnW4e090895; Fri, 8 Sep 2023 20:49:32 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:49:32 GMT Message-Id: <202309082049.388KnW4e090895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 604f6bf022ce - main - powerpcspe: Fix build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 604f6bf022cea7e48f3675aa82e756a440716fd9 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=604f6bf022cea7e48f3675aa82e756a440716fd9 commit 604f6bf022cea7e48f3675aa82e756a440716fd9 Author: Li-Wen Hsu AuthorDate: 2023-09-08 20:46:25 +0000 Commit: Li-Wen Hsu CommitDate: 2023-09-08 20:46:25 +0000 powerpcspe: Fix build Copy _fpmath.h from powerpc, which is the same as the one in powerpc64. Sponsored by: The FreeBSD Foundation --- lib/libc/powerpcspe/_fpmath.h | 56 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/lib/libc/powerpcspe/_fpmath.h b/lib/libc/powerpcspe/_fpmath.h new file mode 100644 index 000000000000..9bc7450aacaf --- /dev/null +++ b/lib/libc/powerpcspe/_fpmath.h @@ -0,0 +1,56 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2003 David Schultz + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +union IEEEl2bits { + long double e; + struct { +#if _BYTE_ORDER == _LITTLE_ENDIAN + unsigned int manl :32; + unsigned int manh :20; + unsigned int exp :11; + unsigned int sign :1; +#else /* _BYTE_ORDER == _LITTLE_ENDIAN */ + unsigned int sign :1; + unsigned int exp :11; + unsigned int manh :20; + unsigned int manl :32; +#endif + } bits; +}; + +#define mask_nbit_l(u) ((void)0) +#define LDBL_IMPLICIT_NBIT +#define LDBL_NBIT 0 + +#define LDBL_MANH_SIZE 20 +#define LDBL_MANL_SIZE 32 + +#define LDBL_TO_ARRAY32(u, a) do { \ + (a)[0] = (uint32_t)(u).bits.manl; \ + (a)[1] = (uint32_t)(u).bits.manh; \ +} while(0) From nobody Fri Sep 8 20:56:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7h65wy6z4sshv; Fri, 8 Sep 2023 20:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7h65T5Tz4m6G; Fri, 8 Sep 2023 20:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9pRdApN7UgtDHRqIA40zsN/5ylnKnS9O9qleh+COzA=; b=a2xNNY6SWkUjy2qUU+KT7m5M8szWDWbA03OpcP/3eXpMiEThoHI/LWG1JwCHbOA41FjCQW PDB6mJE/ccawwiKfm3kdzaBaFysiTORATFcI24Ubm6DI4eBu1MEVDvIDR0W4ysP8DIljgU 7RLJ5cARf/COcwgPuRynZtYSFqfUttPtvQ4kM2ZtTN2s6fm6o7JO8g/zhAjHsbtrtvjrAa /HvZZA7LNSyp46hVj30RdHvpqYrc0GnjdgoOsUV17GtKEqAq/MGrR+JdC1gCvuS5odiy6n sVPJMuIKHjByRpUcPWgV4560K5c4bxl1LbY2dz0rK2WJt6GHX2t78UIO1b4AUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694206598; a=rsa-sha256; cv=none; b=J4ip2prQWwfbbJCF2vMGx+WZoEYov/E94WG/ZxdsOFLwDVtN89Kr5MhqgwoBZWiWsAh0VC XpXEB8y+jTVp/v3UcZq0ykMaV74fa/F4AqdfnFP1+8AgKIwlAMcbzGzLoPBd0DKb1h4sHR 1LAgMbYgd33ZpS2uISbeKKRYJdINRvl4C27viKm9L4WUm1bZNxPH7VGpgqpFHEzWFCZUHn EPE4jOqkPQItxTdGoHxfXaKbyQE0Jeck5O/Jroc27zDuxg/Qw29aNrzWs9AlHrb1jUKqle qeP3alXcs/4V9mBauUyDJaOh3+oegsH33qIUr43a69oYe+dF8d0AKhZC26T/4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G9pRdApN7UgtDHRqIA40zsN/5ylnKnS9O9qleh+COzA=; b=w+AQ9BkN0XN4Dh428tUdPwLPeUq9erbZBzBZ6MIgg0muQasgQv3ggOOayKnLAGXuVsQcvW oqYxaPEabPgv37RsoTPVZgAPin/d4d+CaFGqNYi5UKVBnOB7QBQ/Nc/TfJxE14KrgRKIgG Z8vZiHXaBy3sZ1bm1vkiPcyKJ67zH+f22THYoeynPORUXKwq9mxCz2FaejxmzrboMdkKTR qrqXksWO387tdAv/F7i5jsNPg0jm8sOHD6ssGQg7Q7MvriJNWJfShHclMSzRtefR0Y/tTV LCpKzTLbSGKokVQprlJc4Rr/IBxYHxY9N6itMECRqq9gcDipydvvWe5kr023uw== 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 4Rj7h64CjCzx4X; Fri, 8 Sep 2023 20:56:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KucVZ007307; Fri, 8 Sep 2023 20:56:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388Kuc6l007304; Fri, 8 Sep 2023 20:56:38 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:56:38 GMT Message-Id: <202309082056.388Kuc6l007304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a3f973f2ea09 - stable/14 - Makefile.asm: Simplify variable expansions in generated headers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a3f973f2ea0909be26666d3dcac3c4c45562a678 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a3f973f2ea0909be26666d3dcac3c4c45562a678 commit a3f973f2ea0909be26666d3dcac3c4c45562a678 Author: John Baldwin AuthorDate: 2023-08-29 21:38:27 +0000 Commit: John Baldwin CommitDate: 2023-09-08 20:55:44 +0000 Makefile.asm: Simplify variable expansions in generated headers The :R:S expressions removed the .pl extension only to add it back again, so just trim them to using :T alone. Reviewed by: Pierre Pronchery , markj, emaste Differential Revision: https://reviews.freebsd.org/D41588 (cherry picked from commit 7406b6f9761c35eb53f91f54d1a687d96d638907) --- secure/lib/libcrypto/Makefile.asm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index 1199dc830a50..0ee8c17369e9 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -51,12 +51,12 @@ CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s sha256-armv8.S: sha512-armv8.pl env CC=cc perl ${.ALLSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_amd64) @@ -192,7 +192,7 @@ aes-armv4.S: aes-armv4.pl .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_i386) @@ -331,22 +331,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64) @@ -398,22 +398,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64v2 ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .elif defined(ASM_powerpc64le) @@ -465,22 +465,22 @@ CLEANFILES= ${ASM} bn-ppc.S: ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256-ppc.S: sha512-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} sha256p8-ppc.S: sha512p8-ppc.pl env CC=cc perl ${.ALLSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .pl.S: env CC=cc perl ${.IMPSRC} linux64le ${.TARGET:R:S/$/.s/} - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T:R:S/$/.pl/}. */' ;\ + ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ cat ${.TARGET:R:S/$/.s/}) > ${.TARGET} .endif From nobody Fri Sep 8 20:56:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7h75fRyz4sstb; Fri, 8 Sep 2023 20:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7h75CcLz4mJ6; Fri, 8 Sep 2023 20:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzxI0VApPbD1Py96victABwPFFvjf3zGTBYN1BuURoY=; b=wp1ekEp/p8iyVMydsGmnNhROE5GOIdCU3cAeHHKqrG6t77hRO7UdK8X+T4bkFmZSb/48T/ +8j43jV3qu5bbfs1zRKpLZ0nF0j+r17pp2SpQvLU8Pmt0FGITq39bQMP4NZSUDKGwXVFgE InOdHhKFO96MV45hDO4mAEagcSIYE21tkl1bUpNSjhavyMGTWtc7IgVpBQL3dSNjQTGCmV KWBNA9cEr/pLm3euXXQe150H/QIkar6+6FIydWF27bISkdpPWGw+N9BXsMCCeXwECstmlp WrhqjuMt2mcyogFJ/Jo5rIvuyrQ98g04+CoDfQFOtVxe4arPm5JtxtI9l105Dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694206599; a=rsa-sha256; cv=none; b=JqDHerxX+gqiQE+NxZ3HvTOi50Goh0hDpYM9pA3G5dq0q5Pq2Fvv/4ink0kWV/aQEvfiGn FY7iU+Hsgi6whCzHz3bwBZC/xHGjnAh2IRu6v8clmjsb/0eIeOvuBLI/A1N0ocVBrA2hQ4 9F7U3KYbCMaXhSkxjIDWTjxWVZ85xfwHc1EF0KIOPG7iMGtr2/aE6ih72l0XgSvycRmNyI MeD5T/lASz5Ct4EvD5B5pYEJmJvsbmWyVT6tk3Ws5d8JxPgrmMUeize0WEAG+fMFLV+n1e Uk4gUjnk1tpplVvOTIeiGGs0PZ7VP4X2U+cCZvv16P2Hn95+zJnl7uFhzaMetw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CzxI0VApPbD1Py96victABwPFFvjf3zGTBYN1BuURoY=; b=dFShjmpO4qesqumIt4YZHamidGmO/RaiN0GawWV+HzGB0o6brEk7TDBTKNvaIQT9VCOS9E CG10pkldkCR756p+4wmr+ImMwM6YI/R+sGZ6P0XJspLwcm/LoFPzsvefqJ0UJe+VhKx+Nd ohgyEWwccak3XifjuhkmxrYuDisqGDg/B65a20AokVOOc03g9iR4vWgcrt604W9kWbzqwW EZTJ67cauW1v8UNozgTez5v+9AfjbsicPNIWwuOjuPzsfFhsQnk4YOVWrAggklUGWofUsi x0Jlu+rfF1pcZwosN4b9noX2ckE8RmXRd/k/rFi9jHCoA6agBbXcPoS47JPjZA== 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 4Rj7h74CFlzx07; Fri, 8 Sep 2023 20:56:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KudPk007369; Fri, 8 Sep 2023 20:56:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388Kudnb007366; Fri, 8 Sep 2023 20:56:39 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:56:39 GMT Message-Id: <202309082056.388Kudnb007366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 14dc723496c1 - stable/14 - libcrypto: Refactor Makefile.asm so it can be run outside of buildenv List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14dc723496c1b2244a2b2ce29f9fd754494f4eea Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=14dc723496c1b2244a2b2ce29f9fd754494f4eea commit 14dc723496c1b2244a2b2ce29f9fd754494f4eea Author: John Baldwin AuthorDate: 2023-08-29 21:39:36 +0000 Commit: John Baldwin CommitDate: 2023-09-08 20:55:44 +0000 libcrypto: Refactor Makefile.asm so it can be run outside of buildenv Currently Makefile.asm relies on the current buildenv to set CFLAGS for i386. The current approach also leaves various temporary *.s files around in the current directory. To make this a bit better: - Instead of using CFLAGS from buildenv for i386, define the actual flags the perl scripts need: -DOPENSSL_IA32_SSE2 to enable SSE2. - Change i386 to have the perl scripts write to /dev/stdout to avoid creating temporaries. Previously i386 was generating the temporary files in the OpenSSL contrib src. - Cleanup temporary *.s files in the all target after generating the real *.S files for architectures which need them. - Remove a duplicate rule for aes-armv4.S. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41589 (cherry picked from commit c0fe6b9d7506d6ce6f9ec3688ee0cc5656a8707e) --- secure/lib/libcrypto/Makefile.asm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/secure/lib/libcrypto/Makefile.asm b/secure/lib/libcrypto/Makefile.asm index 0ee8c17369e9..d3243e5b20b8 100644 --- a/secure/lib/libcrypto/Makefile.asm +++ b/secure/lib/libcrypto/Makefile.asm @@ -45,8 +45,9 @@ SRCS+= keccak1600-armv8.pl sha1-armv8.pl sha512-armv8.pl ASM= ${SRCS:R:S/$/.S/} sha256-armv8.S all: ${ASM} + rm -f ${ASM:R:S/$/.s/} -CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} sha256-armv8.s +CLEANFILES= ${ASM} .SUFFIXES: .pl sha256-armv8.S: sha512-armv8.pl @@ -125,8 +126,9 @@ SHA_TMP= ${SHA_ASM:S/$/.s/} ASM= ${SRCS:R:S/$/.S/} ${SHA_ASM:S/$/.S/} all: ${ASM} + rm -f ${SHA_TMP} -CLEANFILES= ${ASM} ${SHA_ASM:S/$/.s/} +CLEANFILES= ${ASM} .SUFFIXES: .pl .pl.S: @@ -179,17 +181,14 @@ SRCS+= poly1305-armv4.pl # sha SRCS+= keccak1600-armv4.pl sha1-armv4-large.pl sha256-armv4.pl sha512-armv4.pl -ASM= aes-armv4.S ${SRCS:R:S/$/.S/} +ASM= ${SRCS:R:S/$/.S/} all: ${ASM} + rm -f ${ASM:R:S/$/.s/} -CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} +CLEANFILES= ${ASM} .SUFFIXES: .pl -aes-armv4.S: aes-armv4.pl - ( echo '/* Do not modify. This file is auto-generated from ${.ALLSRC:T}. */' ;\ - env CC=cc perl ${.ALLSRC} linux32 ) > ${.TARGET} - .pl.S: env CC=cc perl ${.IMPSRC} linux32 ${.TARGET:R:S/$/.s/} ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ @@ -217,6 +216,7 @@ aes-armv4.S: aes-armv4.pl ${LCRYPTO_SRC}/engines/asm #PERLPATH= -I${LCRYPTO_SRC}/crypto/des/asm -I${LCRYPTO_SRC}/crypto/perlasm +CFLAGS= -DOPENSSL_IA32_SSE2 # cpuid SRCS= x86cpuid.pl @@ -276,17 +276,15 @@ ASM= ${SRCS:R:S/$/.S/} all: ${ASM} -CLEANFILES= ${ASM} ${SRCS:R:S/$/.s/} +CLEANFILES= ${ASM} .SUFFIXES: .pl .pl.S: ( echo '/* Do not modify. This file is auto-generated from ${.IMPSRC:T}. */' ;\ echo '#ifdef PIC' ;\ - env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic -DPIC ${.IMPSRC:R:S/$/.s/} ;\ - cat ${.IMPSRC:R:S/$/.s/} ;\ + env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} -fpic /dev/stdout ;\ echo '#else' ;\ - env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} ${.IMPSRC:R:S/$/.s/} ;\ - cat ${.IMPSRC:R:S/$/.s/} ;\ + env CC=cc perl ${PERLPATH} ${.IMPSRC} elf ${CFLAGS} /dev/stdout ;\ echo '#endif' ) > ${.TARGET} .elif defined(ASM_powerpc) @@ -325,6 +323,7 @@ SRCS+= poly1305-ppc.pl poly1305-ppcfp.pl ASM= ${SRCS:R:S/$/.S/} bn-ppc.S sha256-ppc.S sha256p8-ppc.S all: ${ASM} + rm -f ${ASM:R:S/$/.s/} CLEANFILES= ${ASM} .SUFFIXES: .pl @@ -392,6 +391,7 @@ SRCS+= keccak1600-ppc64.pl ASM= ${SRCS:R:S/$/.S/} bn-ppc.S sha256-ppc.S sha256p8-ppc.S all: ${ASM} + rm -f ${ASM:R:S/$/.s/} CLEANFILES= ${ASM} .SUFFIXES: .pl @@ -459,6 +459,7 @@ SRCS+= keccak1600-ppc64.pl ASM= ${SRCS:R:S/$/.S/} bn-ppc.S sha256-ppc.S sha256p8-ppc.S all: ${ASM} + rm -f ${ASM:R:S/$/.s/} CLEANFILES= ${ASM} .SUFFIXES: .pl From nobody Fri Sep 8 20:56:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7h90FHTz4sstd; Fri, 8 Sep 2023 20:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7h86tlMz4mYr; Fri, 8 Sep 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+Ix68HaUYIBqD6fO2s3r2rJ0juni/kuOMg8MKqCHXI=; b=W9gEvxIw1WheCjP2myJvADvcGKPeSZFHeqqNXWSJL3IOoFiWqONF4PdEEyx3um8J8Rj1Jd 3zxhekJKN6MsUhoCi1keqkBQ2E4kXB4YwXZV3UWIE8Wtpm4IUee7eW8OZt0ivt762oDn9L TbP19LLmwzHUyuO01BWUpSEOdeN56wZJw2GQORsBiETW0NTlBtbUwvl2pnXsmr3mXsab+Q Bao2wcMYNOGGRqstmFh00wuiGWWLOX9FMofHxrupADqP3QcWusx0LmRp0m5EnZrIRYWR1V OYRTLo/LRQ5oOn8YsFPd0DEVpd1z9jzgVONE0kDTrVqAYZ7hTxuuoO24fpEziA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694206601; a=rsa-sha256; cv=none; b=NeSiEHVvjfkIyzYha+lFXETlGweC83QrL0y0+UEEc4HjeIRlF0ItdZsxh7XQ1FgcBL7ACT vjLegKmFEEdspjHqVATb+yFefZKvZm+FprISPYQq5ZvBUIQqOo1LyKTV7ctyeYTVqDnUnh hBMFny6DV4nPbwxN0sWy/cLwP0jWXIUw9FB6LOMiVpdn+nU4eprGBD+l57wzH2BV4wN0Uq y/KNK6f8yghe1U/UJjE7e2M6H9i2XHvveoY3qDuLOIBBoH/wly/9gL4xRxHqfPJqxTCfax dnbqTEjlKY/UbWlL1iMBxAqzXM1cDepRouodYjGhTUamnbaEQo79brxw4kwaLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e+Ix68HaUYIBqD6fO2s3r2rJ0juni/kuOMg8MKqCHXI=; b=h9Uit4fVM9RIyMJzuthvpIQ6RFU3evG1W7kkwSt/u9qzC52+m5rANarW/2sAnZ3NT/bcG/ QW0Lyh+/XZj5e9f4EqCysk38nBO1yIAyOPnd5zeTvokZgJpctU1xFtQrBB9AepBL7CfPDb jUxqsj6UsvOLPnVurirFs6nByO76Uwrzn95B5ZOnLPQrS+6sqgFmRmsRihezONsA1G3KSF PB2G3vtWIBAw90Gxhy4tmDQE838YfGaMHX7oUR7njG/goeoquWWh/1JkaIP5ejJhuAprUr MBlXlSuPN4pm820I/msE2JaX+cGlyJrVZRPe6VJinVCptv6BK1VOs+9rAA1B7w== 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 4Rj7h85bzdzx37; Fri, 8 Sep 2023 20:56:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KueHA007414; Fri, 8 Sep 2023 20:56:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KuefM007411; Fri, 8 Sep 2023 20:56:40 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:56:40 GMT Message-Id: <202309082056.388KuefM007411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: ef81451d114e - stable/14 - libcrypto: Add buildasm and cleanasm targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ef81451d114ebae9f77e195534898b6c4061aa69 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ef81451d114ebae9f77e195534898b6c4061aa69 commit ef81451d114ebae9f77e195534898b6c4061aa69 Author: John Baldwin AuthorDate: 2023-08-29 21:39:54 +0000 Commit: John Baldwin CommitDate: 2023-09-08 20:55:44 +0000 libcrypto: Add buildasm and cleanasm targets These targets generate all the assembly files in sys/crypto/openssl. Reviewed by: markj, emaste (earlier version) Differential Revision: https://reviews.freebsd.org/D41590 (cherry picked from commit 73653b72af65e294dcfedc43a8ea09b2137d72ed) --- secure/lib/libcrypto/Makefile | 7 +++++++ secure/lib/libcrypto/Makefile.common | 2 ++ 2 files changed, 9 insertions(+) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index f4bd4a3247f3..ab9044ad67f9 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -606,6 +606,13 @@ buildinf.h: Makefile echo "static const char compiler_flags[] = \"compiler: ${COMPILER_TYPE}\";" ) \ > ${.TARGET} +buildasm cleanasm: +.for arch in aarch64 amd64 arm i386 powerpc powerpc64 powerpc64le + make MK_AUTO_OBJ=no -DWITHOUT_AUTO_ASM -DASM_${arch} \ + -f ${.CURDIR}/Makefile.asm -C ${SRCTOP}/sys/crypto/openssl/${arch} \ + ${.TARGET:S/build/all/:S/asm$//} +.endfor + .include PICFLAG+= -DOPENSSL_PIC diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common index a52e2979060a..b109fd7f7f4f 100644 --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -7,6 +7,7 @@ CFLAGS+= -DL_ENDIAN CFLAGS+= -DB_ENDIAN .endif +.ifndef WITHOUT_AUTO_ASM .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" ASM_${MACHINE_CPUARCH}= @@ -14,6 +15,7 @@ ASM_${MACHINE_CPUARCH}= ${MACHINE_ARCH} == "powerpc64le" ASM_${MACHINE_ARCH}= .endif +.endif .if defined(ASM_${MACHINE_CPUARCH}) || defined(ASM_${MACHINE_ARCH}) CFLAGS+= -DOPENSSL_CPUID_OBJ From nobody Fri Sep 8 20:56:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7hB6ltQz4ssy9; Fri, 8 Sep 2023 20:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7hB4xgSz4mcQ; Fri, 8 Sep 2023 20:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOFxnyNElhadaOw3jyUTRHDBFHp/rHJ/2YR2vSs24r8=; b=k39z6y9ywBBgy9qq6DhhEj6e4hHs8PX4mOOXgh9UHh1coNqWX4preqnb9cB8jV/xRfCQpA /ROjEIU4lIAhty8zjndJDq5ALR/a7yiWcyPbl2jaIEM8BKO9zOBdlfletmrxEf7dKS1biB Wf+MlAxik8JFCJOCt3IenNF6JVdKQGwsyEepqrSaDWWpMk9ZJPkHQr4I1qPRF1JniN3Vhm UUeyMDhMieVn23Jo7Sa1R2KdRfUlErD6epx0koAm6F6qsZsnM/nxnkgLUJQJd9tQ+Tm6Dy aWrRVuPksECAm/lSPf5m8uJqkEHz37tan0q70pOvRTaBgS3QWaXj4jrdw/U2XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694206602; a=rsa-sha256; cv=none; b=QbbsfwZ3JOQ61dD3BuaSAHsjpL791j0+Eqyo5jE0qG64tFnoIFJdBpLccRtyiEbsrh12xi pNNqepjtsBHl9IGjx6NdiSDfP4CpcJdaqPNt4YRFLp6AG9Hj89Qo3KGUm9u2VJ2jIIyg7I YUN6uh+gDkhnl5/rLrjXsK4c2HzeKVpgguzsXi1guZLCkZFil4qKoKVnqe+nGKaNiZtq57 ItoUAVJDAxVgs87TnAJVGbplOLVZJk5GCN/IeB6uSjyXLWV0as+h3W8/6A22LLA+JTXRjR /fyBTHnEpTN30kCduUWgnK1zlfba7eTXI1g9Y2dPOnh1Y2BWf4b/WPv6xAVojA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LOFxnyNElhadaOw3jyUTRHDBFHp/rHJ/2YR2vSs24r8=; b=qxhiMFUcJShXxqXtgCAvRa9tUF2tV/jp69a+2EapaTJI+7m+fCiAGqOZqxtYMDkclKcMLo 0DuB+X6Gc7kVgqCT6qQY7g5z7nuYO/i2IyU7MIEJCP2UgEj/bJKQIk5r+H5dsJIgS3N7MN UGo7kSMDdLz8cfN9zkcIsuhZsPjP7t2DMWkKFVVHQiceAEUatW4w/+ppwYN8HgY0KhflKh Aiar2YCr3wCIfN75usc8mUW/oTGMWZXJ8Epf1akOIwf/QH+fltenL1x1y+Rq/LT8CKWM2V zNwdBMg/wQT/d+auhcfHFRtpX/hItIOUINZ7NiipM5mgY4MvSEpjzeLBBe0c+Q== 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 4Rj7hB3C9szx4Y; Fri, 8 Sep 2023 20:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KughF007468; Fri, 8 Sep 2023 20:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388Kuffv007465; Fri, 8 Sep 2023 20:56:41 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:56:41 GMT Message-Id: <202309082056.388Kuffv007465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f0d83d53c3be - stable/14 - ossl: Update the generated assembly files from OpenSSL 3.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0d83d53c3be75ffc7711ba8171af9b934459810 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f0d83d53c3be75ffc7711ba8171af9b934459810 commit f0d83d53c3be75ffc7711ba8171af9b934459810 Author: John Baldwin AuthorDate: 2023-08-29 21:44:15 +0000 Commit: John Baldwin CommitDate: 2023-09-08 20:55:44 +0000 ossl: Update the generated assembly files from OpenSSL 3.0. Tested with: cryptocheck -d ossl0 -a all -z on amd64 Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41568 (cherry picked from commit c0855eaa3ee9614804b6bd6a255aa9f71e095f43) --- sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S | 6390 +++++++++++++++++++ sys/crypto/openssl/aarch64/aesv8-armx.S | 3014 ++++++++- sys/crypto/openssl/aarch64/arm64cpuid.S | 7 + sys/crypto/openssl/aarch64/armv8-mont.S | 732 ++- sys/crypto/openssl/aarch64/chacha-armv8.S | 1553 ++--- sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S | 8 +- sys/crypto/openssl/aarch64/ghashv8-armx.S | 1 + sys/crypto/openssl/aarch64/keccak1600-armv8.S | 190 +- sys/crypto/openssl/aarch64/poly1305-armv8.S | 31 +- sys/crypto/openssl/aarch64/sha1-armv8.S | 54 +- sys/crypto/openssl/aarch64/sha256-armv8.S | 28 +- sys/crypto/openssl/aarch64/sha512-armv8.S | 28 +- sys/crypto/openssl/aarch64/vpaes-armv8.S | 276 +- sys/crypto/openssl/amd64/aes-x86_64.S | 2680 ++++++++ sys/crypto/openssl/amd64/aesni-gcm-x86_64.S | 21 + sys/crypto/openssl/amd64/aesni-mb-x86_64.S | 102 + sys/crypto/openssl/amd64/aesni-sha1-x86_64.S | 21 + sys/crypto/openssl/amd64/aesni-sha256-x86_64.S | 21 + sys/crypto/openssl/amd64/aesni-x86_64.S | 32 + sys/crypto/openssl/amd64/bsaes-x86_64.S | 2619 ++++++++ sys/crypto/openssl/amd64/chacha-x86_64.S | 21 + sys/crypto/openssl/amd64/cmll-x86_64.S | 22 + sys/crypto/openssl/amd64/e_padlock-x86_64.S | 21 + sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S | 21 + sys/crypto/openssl/amd64/ghash-x86_64.S | 27 + sys/crypto/openssl/amd64/keccak1600-x86_64.S | 21 + sys/crypto/openssl/amd64/md5-x86_64.S | 29 +- sys/crypto/openssl/amd64/poly1305-x86_64.S | 21 + sys/crypto/openssl/amd64/rc4-md5-x86_64.S | 21 + sys/crypto/openssl/amd64/rc4-x86_64.S | 24 + sys/crypto/openssl/amd64/rsaz-avx2.S | 21 + sys/crypto/openssl/amd64/rsaz-avx512.S | 902 +++ sys/crypto/openssl/amd64/rsaz-x86_64.S | 21 + sys/crypto/openssl/amd64/sha1-mb-x86_64.S | 57 + sys/crypto/openssl/amd64/sha1-x86_64.S | 21 + sys/crypto/openssl/amd64/sha256-mb-x86_64.S | 57 + sys/crypto/openssl/amd64/sha256-x86_64.S | 21 + sys/crypto/openssl/amd64/sha512-x86_64.S | 21 + sys/crypto/openssl/amd64/vpaes-x86_64.S | 26 + sys/crypto/openssl/amd64/wp-x86_64.S | 21 + sys/crypto/openssl/amd64/x25519-x86_64.S | 21 + sys/crypto/openssl/amd64/x86_64-gf2m.S | 21 + sys/crypto/openssl/amd64/x86_64-mont.S | 21 + sys/crypto/openssl/amd64/x86_64-mont5.S | 21 + sys/crypto/openssl/amd64/x86_64cpuid.S | 49 + sys/crypto/openssl/arm/aes-armv4.S | 7 +- sys/crypto/openssl/arm/aesv8-armx.S | 776 ++- sys/crypto/openssl/arm/armv4-gf2m.S | 13 +- sys/crypto/openssl/arm/armv4-mont.S | 17 +- sys/crypto/openssl/arm/armv4cpuid.S | 3 +- sys/crypto/openssl/arm/bsaes-armv7.S | 47 +- sys/crypto/openssl/arm/chacha-armv4.S | 11 +- sys/crypto/openssl/arm/ecp_nistz256-armv4.S | 4 +- sys/crypto/openssl/arm/ghash-armv4.S | 3 +- sys/crypto/openssl/arm/ghashv8-armx.S | 64 +- sys/crypto/openssl/arm/keccak1600-armv4.S | 34 +- sys/crypto/openssl/arm/poly1305-armv4.S | 37 +- sys/crypto/openssl/arm/sha1-armv4-large.S | 15 +- sys/crypto/openssl/arm/sha256-armv4.S | 17 +- sys/crypto/openssl/arm/sha512-armv4.S | 15 +- sys/crypto/openssl/i386/aes-586.S | 6644 ++++++++++++++++++++ sys/crypto/openssl/i386/aesni-x86.S | 254 + sys/crypto/openssl/i386/bf-586.S | 134 + sys/crypto/openssl/i386/bn-586.S | 104 + sys/crypto/openssl/i386/cast-586.S | 134 + sys/crypto/openssl/i386/chacha-x86.S | 64 + sys/crypto/openssl/i386/cmll-x86.S | 144 + sys/crypto/openssl/i386/co-586.S | 74 + sys/crypto/openssl/i386/crypt586.S | 44 + sys/crypto/openssl/i386/des-586.S | 254 + sys/crypto/openssl/i386/e_padlock-x86.S | 214 + sys/crypto/openssl/i386/ecp_nistz256-x86.S | 254 + sys/crypto/openssl/i386/ghash-x86.S | 104 + sys/crypto/openssl/i386/md5-586.S | 64 +- sys/crypto/openssl/i386/poly1305-x86.S | 114 + sys/crypto/openssl/i386/rc4-586.S | 64 + sys/crypto/openssl/i386/rc5-586.S | 134 + sys/crypto/openssl/i386/rmd-586.S | 44 + sys/crypto/openssl/i386/sha1-586.S | 74 + sys/crypto/openssl/i386/sha256-586.S | 44 + sys/crypto/openssl/i386/sha512-586.S | 44 + sys/crypto/openssl/i386/vpaes-x86.S | 164 + sys/crypto/openssl/i386/wp-mmx.S | 44 + sys/crypto/openssl/i386/x86-gf2m.S | 64 + sys/crypto/openssl/i386/x86-mont.S | 44 + sys/crypto/openssl/i386/x86cpuid.S | 154 + sys/crypto/openssl/powerpc/bn-ppc.S | 1855 ++++++ sys/crypto/openssl/powerpc/poly1305-ppc.S | 1091 +++- sys/crypto/openssl/powerpc/vpaes-ppc.S | 14 +- sys/crypto/openssl/powerpc64/bn-ppc.S | 1876 ++++++ sys/crypto/openssl/powerpc64/ecp_nistp521-ppc64.S | 354 ++ sys/crypto/openssl/powerpc64/keccak1600-ppc64.S | 32 +- sys/crypto/openssl/powerpc64/poly1305-ppc.S | 1011 ++- sys/crypto/openssl/powerpc64/vpaes-ppc.S | 14 +- sys/crypto/openssl/powerpc64le/bn-ppc.S | 1876 ++++++ .../openssl/powerpc64le/ecp_nistp521-ppc64.S | 354 ++ sys/crypto/openssl/powerpc64le/keccak1600-ppc64.S | 32 +- sys/crypto/openssl/powerpc64le/poly1305-ppc.S | 1002 ++- sys/crypto/openssl/powerpc64le/vpaes-ppc.S | 14 +- 99 files changed, 37489 insertions(+), 1910 deletions(-) diff --git a/sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S b/sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S new file mode 100644 index 000000000000..eb85dbc9f996 --- /dev/null +++ b/sys/crypto/openssl/aarch64/aes-gcm-armv8_64.S @@ -0,0 +1,6390 @@ +/* Do not modify. This file is auto-generated from aes-gcm-armv8_64.pl. */ +#include "arm_arch.h" + +#if __ARM_MAX_ARCH__>=8 +.arch armv8-a+crypto +.text +.globl aes_gcm_enc_128_kernel +.type aes_gcm_enc_128_kernel,%function +.align 4 +aes_gcm_enc_128_kernel: + cbz x1, .L128_enc_ret + stp x19, x20, [sp, #-112]! + mov x16, x4 + mov x8, x5 + stp x21, x22, [sp, #16] + stp x23, x24, [sp, #32] + stp d8, d9, [sp, #48] + stp d10, d11, [sp, #64] + stp d12, d13, [sp, #80] + stp d14, d15, [sp, #96] + + ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 +#ifdef __AARCH64EB__ + rev x10, x10 + rev x11, x11 +#endif + ldp x13, x14, [x8, #160] //load rk10 +#ifdef __AARCH64EB__ + ror x13, x13, #32 + ror x14, x14, #32 +#endif + ld1 {v11.16b}, [x3] + ext v11.16b, v11.16b, v11.16b, #8 + rev64 v11.16b, v11.16b + lsr x5, x1, #3 //byte_len + mov x15, x5 + + ld1 {v18.4s}, [x8], #16 //load rk0 + add x4, x0, x1, lsr #3 //end_input_ptr + sub x5, x5, #1 //byte_len - 1 + + lsr x12, x11, #32 + ldr q15, [x3, #112] //load h4l | h4h +#ifndef __AARCH64EB__ + ext v15.16b, v15.16b, v15.16b, #8 +#endif + fmov d1, x10 //CTR block 1 + rev w12, w12 //rev_ctr32 + + add w12, w12, #1 //increment rev_ctr32 + orr w11, w11, w11 + ld1 {v19.4s}, [x8], #16 //load rk1 + + rev w9, w12 //CTR block 1 + add w12, w12, #1 //CTR block 1 + fmov d3, x10 //CTR block 3 + + orr x9, x11, x9, lsl #32 //CTR block 1 + ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible + + fmov v1.d[1], x9 //CTR block 1 + rev w9, w12 //CTR block 2 + + fmov d2, x10 //CTR block 2 + orr x9, x11, x9, lsl #32 //CTR block 2 + add w12, w12, #1 //CTR block 2 + + fmov v2.d[1], x9 //CTR block 2 + rev w9, w12 //CTR block 3 + + orr x9, x11, x9, lsl #32 //CTR block 3 + ld1 {v20.4s}, [x8], #16 //load rk2 + + add w12, w12, #1 //CTR block 3 + fmov v3.d[1], x9 //CTR block 3 + + ldr q14, [x3, #80] //load h3l | h3h +#ifndef __AARCH64EB__ + ext v14.16b, v14.16b, v14.16b, #8 +#endif + aese v1.16b, v18.16b + aesmc v1.16b, v1.16b //AES block 1 - round 0 + ld1 {v21.4s}, [x8], #16 //load rk3 + + aese v2.16b, v18.16b + aesmc v2.16b, v2.16b //AES block 2 - round 0 + ldr q12, [x3, #32] //load h1l | h1h +#ifndef __AARCH64EB__ + ext v12.16b, v12.16b, v12.16b, #8 +#endif + + aese v0.16b, v18.16b + aesmc v0.16b, v0.16b //AES block 0 - round 0 + ld1 {v22.4s}, [x8], #16 //load rk4 + + aese v3.16b, v18.16b + aesmc v3.16b, v3.16b //AES block 3 - round 0 + ld1 {v23.4s}, [x8], #16 //load rk5 + + aese v2.16b, v19.16b + aesmc v2.16b, v2.16b //AES block 2 - round 1 + trn2 v17.2d, v14.2d, v15.2d //h4l | h3l + + aese v0.16b, v19.16b + aesmc v0.16b, v0.16b //AES block 0 - round 1 + ld1 {v24.4s}, [x8], #16 //load rk6 + + aese v1.16b, v19.16b + aesmc v1.16b, v1.16b //AES block 1 - round 1 + ld1 {v25.4s}, [x8], #16 //load rk7 + + aese v3.16b, v19.16b + aesmc v3.16b, v3.16b //AES block 3 - round 1 + trn1 v9.2d, v14.2d, v15.2d //h4h | h3h + + aese v0.16b, v20.16b + aesmc v0.16b, v0.16b //AES block 0 - round 2 + ld1 {v26.4s}, [x8], #16 //load rk8 + + aese v1.16b, v20.16b + aesmc v1.16b, v1.16b //AES block 1 - round 2 + ldr q13, [x3, #64] //load h2l | h2h +#ifndef __AARCH64EB__ + ext v13.16b, v13.16b, v13.16b, #8 +#endif + + aese v3.16b, v20.16b + aesmc v3.16b, v3.16b //AES block 3 - round 2 + + aese v2.16b, v20.16b + aesmc v2.16b, v2.16b //AES block 2 - round 2 + eor v17.16b, v17.16b, v9.16b //h4k | h3k + + aese v0.16b, v21.16b + aesmc v0.16b, v0.16b //AES block 0 - round 3 + + aese v1.16b, v21.16b + aesmc v1.16b, v1.16b //AES block 1 - round 3 + + aese v2.16b, v21.16b + aesmc v2.16b, v2.16b //AES block 2 - round 3 + ld1 {v27.4s}, [x8], #16 //load rk9 + + aese v3.16b, v21.16b + aesmc v3.16b, v3.16b //AES block 3 - round 3 + + and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) + trn2 v16.2d, v12.2d, v13.2d //h2l | h1l + + aese v3.16b, v22.16b + aesmc v3.16b, v3.16b //AES block 3 - round 4 + add x5, x5, x0 + + aese v2.16b, v22.16b + aesmc v2.16b, v2.16b //AES block 2 - round 4 + cmp x0, x5 //check if we have <= 4 blocks + + aese v0.16b, v22.16b + aesmc v0.16b, v0.16b //AES block 0 - round 4 + + aese v3.16b, v23.16b + aesmc v3.16b, v3.16b //AES block 3 - round 5 + + aese v2.16b, v23.16b + aesmc v2.16b, v2.16b //AES block 2 - round 5 + + aese v0.16b, v23.16b + aesmc v0.16b, v0.16b //AES block 0 - round 5 + + aese v3.16b, v24.16b + aesmc v3.16b, v3.16b //AES block 3 - round 6 + + aese v1.16b, v22.16b + aesmc v1.16b, v1.16b //AES block 1 - round 4 + + aese v2.16b, v24.16b + aesmc v2.16b, v2.16b //AES block 2 - round 6 + trn1 v8.2d, v12.2d, v13.2d //h2h | h1h + + aese v0.16b, v24.16b + aesmc v0.16b, v0.16b //AES block 0 - round 6 + + aese v1.16b, v23.16b + aesmc v1.16b, v1.16b //AES block 1 - round 5 + + aese v3.16b, v25.16b + aesmc v3.16b, v3.16b //AES block 3 - round 7 + + aese v0.16b, v25.16b + aesmc v0.16b, v0.16b //AES block 0 - round 7 + + aese v1.16b, v24.16b + aesmc v1.16b, v1.16b //AES block 1 - round 6 + + aese v2.16b, v25.16b + aesmc v2.16b, v2.16b //AES block 2 - round 7 + + aese v0.16b, v26.16b + aesmc v0.16b, v0.16b //AES block 0 - round 8 + + aese v1.16b, v25.16b + aesmc v1.16b, v1.16b //AES block 1 - round 7 + + aese v2.16b, v26.16b + aesmc v2.16b, v2.16b //AES block 2 - round 8 + + aese v3.16b, v26.16b + aesmc v3.16b, v3.16b //AES block 3 - round 8 + + aese v1.16b, v26.16b + aesmc v1.16b, v1.16b //AES block 1 - round 8 + + aese v2.16b, v27.16b //AES block 2 - round 9 + + aese v0.16b, v27.16b //AES block 0 - round 9 + + eor v16.16b, v16.16b, v8.16b //h2k | h1k + + aese v1.16b, v27.16b //AES block 1 - round 9 + + aese v3.16b, v27.16b //AES block 3 - round 9 + b.ge .L128_enc_tail //handle tail + + ldp x6, x7, [x0, #0] //AES block 0 - load plaintext +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif + ldp x21, x22, [x0, #32] //AES block 2 - load plaintext +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif + ldp x19, x20, [x0, #16] //AES block 1 - load plaintext +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif + ldp x23, x24, [x0, #48] //AES block 3 - load plaintext +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif + eor x6, x6, x13 //AES block 0 - round 10 low + eor x7, x7, x14 //AES block 0 - round 10 high + + eor x21, x21, x13 //AES block 2 - round 10 low + fmov d4, x6 //AES block 0 - mov low + + eor x19, x19, x13 //AES block 1 - round 10 low + eor x22, x22, x14 //AES block 2 - round 10 high + fmov v4.d[1], x7 //AES block 0 - mov high + + fmov d5, x19 //AES block 1 - mov low + eor x20, x20, x14 //AES block 1 - round 10 high + + eor x23, x23, x13 //AES block 3 - round 10 low + fmov v5.d[1], x20 //AES block 1 - mov high + + fmov d6, x21 //AES block 2 - mov low + eor x24, x24, x14 //AES block 3 - round 10 high + rev w9, w12 //CTR block 4 + + fmov v6.d[1], x22 //AES block 2 - mov high + orr x9, x11, x9, lsl #32 //CTR block 4 + + eor v4.16b, v4.16b, v0.16b //AES block 0 - result + fmov d0, x10 //CTR block 4 + add w12, w12, #1 //CTR block 4 + + fmov v0.d[1], x9 //CTR block 4 + rev w9, w12 //CTR block 5 + + eor v5.16b, v5.16b, v1.16b //AES block 1 - result + fmov d1, x10 //CTR block 5 + orr x9, x11, x9, lsl #32 //CTR block 5 + + add w12, w12, #1 //CTR block 5 + add x0, x0, #64 //AES input_ptr update + fmov v1.d[1], x9 //CTR block 5 + + fmov d7, x23 //AES block 3 - mov low + rev w9, w12 //CTR block 6 + st1 { v4.16b}, [x2], #16 //AES block 0 - store result + + fmov v7.d[1], x24 //AES block 3 - mov high + orr x9, x11, x9, lsl #32 //CTR block 6 + + add w12, w12, #1 //CTR block 6 + eor v6.16b, v6.16b, v2.16b //AES block 2 - result + st1 { v5.16b}, [x2], #16 //AES block 1 - store result + + fmov d2, x10 //CTR block 6 + cmp x0, x5 //check if we have <= 8 blocks + + fmov v2.d[1], x9 //CTR block 6 + rev w9, w12 //CTR block 7 + st1 { v6.16b}, [x2], #16 //AES block 2 - store result + + orr x9, x11, x9, lsl #32 //CTR block 7 + + eor v7.16b, v7.16b, v3.16b //AES block 3 - result + st1 { v7.16b}, [x2], #16 //AES block 3 - store result + b.ge .L128_enc_prepretail //do prepretail + +.L128_enc_main_loop: //main loop start + ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext +#ifdef __AARCH64EB__ + rev x23, x23 + rev x24, x24 +#endif + rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) + rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) + + aese v2.16b, v18.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 0 + fmov d3, x10 //CTR block 4k+3 + + ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 + rev64 v5.16b, v5.16b //GHASH block 4k+1 (t0 and t1 free) + + aese v1.16b, v18.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 + add w12, w12, #1 //CTR block 4k+3 + fmov v3.d[1], x9 //CTR block 4k+3 + + aese v0.16b, v18.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 + mov d31, v6.d[1] //GHASH block 4k+2 - mid + + aese v2.16b, v19.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 + mov d30, v5.d[1] //GHASH block 4k+1 - mid + + aese v1.16b, v19.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 + eor v4.16b, v4.16b, v11.16b //PRE 1 + + aese v3.16b, v18.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 + eor x24, x24, x14 //AES block 4k+3 - round 10 high + + pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high + eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid + ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif + aese v0.16b, v19.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 + rev w9, w12 //CTR block 4k+8 + + eor v30.8b, v30.8b, v5.8b //GHASH block 4k+1 - mid + mov d8, v4.d[1] //GHASH block 4k - mid + orr x9, x11, x9, lsl #32 //CTR block 4k+8 + + pmull2 v9.1q, v4.2d, v15.2d //GHASH block 4k - high + add w12, w12, #1 //CTR block 4k+8 + mov d10, v17.d[1] //GHASH block 4k - mid + + aese v0.16b, v20.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 + + pmull v11.1q, v4.1d, v15.1d //GHASH block 4k - low + eor v8.8b, v8.8b, v4.8b //GHASH block 4k - mid + + aese v1.16b, v20.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 2 + + aese v0.16b, v21.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 + eor v9.16b, v9.16b, v28.16b //GHASH block 4k+1 - high + + pmull v28.1q, v6.1d, v13.1d //GHASH block 4k+2 - low + + pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid + rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) + + pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid + + pmull v29.1q, v5.1d, v14.1d //GHASH block 4k+1 - low + ins v31.d[1], v31.d[0] //GHASH block 4k+2 - mid + + pmull2 v8.1q, v6.2d, v13.2d //GHASH block 4k+2 - high + eor x7, x7, x14 //AES block 4k+4 - round 10 high + + eor v10.16b, v10.16b, v30.16b //GHASH block 4k+1 - mid + mov d30, v7.d[1] //GHASH block 4k+3 - mid + + aese v3.16b, v19.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 + eor v11.16b, v11.16b, v29.16b //GHASH block 4k+1 - low + + aese v2.16b, v20.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 + eor x6, x6, x13 //AES block 4k+4 - round 10 low + + aese v1.16b, v21.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 3 + eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid + + pmull2 v4.1q, v7.2d, v12.2d //GHASH block 4k+3 - high + + aese v2.16b, v21.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 3 + eor v9.16b, v9.16b, v8.16b //GHASH block 4k+2 - high + + pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid + + pmull v29.1q, v7.1d, v12.1d //GHASH block 4k+3 - low + movi v8.8b, #0xc2 + + pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid + eor v11.16b, v11.16b, v28.16b //GHASH block 4k+2 - low + + aese v1.16b, v22.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 + + aese v3.16b, v20.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 + shl d8, d8, #56 //mod_constant + + aese v0.16b, v22.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 4 + eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high + + aese v1.16b, v23.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 + ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext +#ifdef __AARCH64EB__ + rev x19, x19 + rev x20, x20 +#endif + aese v3.16b, v21.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 + eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid + + aese v0.16b, v23.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 + ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext +#ifdef __AARCH64EB__ + rev x21, x21 + rev x22, x22 +#endif + pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid + eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low + + aese v2.16b, v22.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 4 + eor x19, x19, x13 //AES block 4k+5 - round 10 low + + aese v3.16b, v22.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 4 + eor v10.16b, v10.16b, v30.16b //GHASH block 4k+3 - mid + + aese v1.16b, v24.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 6 + eor x23, x23, x13 //AES block 4k+3 - round 10 low + + aese v2.16b, v23.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 5 + eor v30.16b, v11.16b, v9.16b //MODULO - karatsuba tidy up + + fmov d4, x6 //AES block 4k+4 - mov low + aese v0.16b, v24.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 + fmov v4.d[1], x7 //AES block 4k+4 - mov high + + add x0, x0, #64 //AES input_ptr update + fmov d7, x23 //AES block 4k+3 - mov low + ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment + + aese v3.16b, v23.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 + fmov d5, x19 //AES block 4k+5 - mov low + + aese v0.16b, v25.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 7 + eor v10.16b, v10.16b, v30.16b //MODULO - karatsuba tidy up + + aese v2.16b, v24.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 + eor x20, x20, x14 //AES block 4k+5 - round 10 high + + aese v1.16b, v25.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 + fmov v5.d[1], x20 //AES block 4k+5 - mov high + + aese v0.16b, v26.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 8 + fmov v7.d[1], x24 //AES block 4k+3 - mov high + + aese v3.16b, v24.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 + cmp x0, x5 //.LOOP CONTROL + + aese v1.16b, v26.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 + eor v10.16b, v10.16b, v31.16b //MODULO - fold into mid + + aese v0.16b, v27.16b //AES block 4k+4 - round 9 + eor x21, x21, x13 //AES block 4k+6 - round 10 low + eor x22, x22, x14 //AES block 4k+6 - round 10 high + + aese v3.16b, v25.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 7 + fmov d6, x21 //AES block 4k+6 - mov low + + aese v1.16b, v27.16b //AES block 4k+5 - round 9 + fmov v6.d[1], x22 //AES block 4k+6 - mov high + + aese v2.16b, v25.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 + eor v4.16b, v4.16b, v0.16b //AES block 4k+4 - result + + fmov d0, x10 //CTR block 4k+8 + aese v3.16b, v26.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 + + fmov v0.d[1], x9 //CTR block 4k+8 + rev w9, w12 //CTR block 4k+9 + eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid + + aese v2.16b, v26.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 + eor v5.16b, v5.16b, v1.16b //AES block 4k+5 - result + + add w12, w12, #1 //CTR block 4k+9 + orr x9, x11, x9, lsl #32 //CTR block 4k+9 + fmov d1, x10 //CTR block 4k+9 + + pmull v9.1q, v10.1d, v8.1d //MODULO - mid 64b align with low + fmov v1.d[1], x9 //CTR block 4k+9 + rev w9, w12 //CTR block 4k+10 + + aese v2.16b, v27.16b //AES block 4k+6 - round 9 + st1 { v4.16b}, [x2], #16 //AES block 4k+4 - store result + eor v6.16b, v6.16b, v2.16b //AES block 4k+6 - result + orr x9, x11, x9, lsl #32 //CTR block 4k+10 + + aese v3.16b, v27.16b //AES block 4k+7 - round 9 + add w12, w12, #1 //CTR block 4k+10 + ext v10.16b, v10.16b, v10.16b, #8 //MODULO - other mid alignment + fmov d2, x10 //CTR block 4k+10 + + eor v11.16b, v11.16b, v9.16b //MODULO - fold into low + st1 { v5.16b}, [x2], #16 //AES block 4k+5 - store result + + fmov v2.d[1], x9 //CTR block 4k+10 + st1 { v6.16b}, [x2], #16 //AES block 4k+6 - store result + rev w9, w12 //CTR block 4k+11 + + orr x9, x11, x9, lsl #32 //CTR block 4k+11 + eor v7.16b, v7.16b, v3.16b //AES block 4k+3 - result + + eor v11.16b, v11.16b, v10.16b //MODULO - fold into low + st1 { v7.16b}, [x2], #16 //AES block 4k+3 - store result + b.lt .L128_enc_main_loop + +.L128_enc_prepretail: //PREPRETAIL + rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) + fmov d3, x10 //CTR block 4k+3 + rev64 v5.16b, v5.16b //GHASH block 4k+1 (t0 and t1 free) + + ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 + add w12, w12, #1 //CTR block 4k+3 + fmov v3.d[1], x9 //CTR block 4k+3 + + aese v1.16b, v18.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 + rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) + + pmull v29.1q, v5.1d, v14.1d //GHASH block 4k+1 - low + + rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) + eor v4.16b, v4.16b, v11.16b //PRE 1 + + pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high + + aese v3.16b, v18.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 + mov d30, v5.d[1] //GHASH block 4k+1 - mid + + pmull v11.1q, v4.1d, v15.1d //GHASH block 4k - low + mov d8, v4.d[1] //GHASH block 4k - mid + + mov d31, v6.d[1] //GHASH block 4k+2 - mid + mov d10, v17.d[1] //GHASH block 4k - mid + + aese v1.16b, v19.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 + eor v30.8b, v30.8b, v5.8b //GHASH block 4k+1 - mid + + eor v8.8b, v8.8b, v4.8b //GHASH block 4k - mid + + pmull2 v9.1q, v4.2d, v15.2d //GHASH block 4k - high + eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid + + aese v3.16b, v19.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 + + pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid + eor v11.16b, v11.16b, v29.16b //GHASH block 4k+1 - low + + pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid + + aese v0.16b, v18.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 + ins v31.d[1], v31.d[0] //GHASH block 4k+2 - mid + + aese v2.16b, v18.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 0 + + eor v10.16b, v10.16b, v30.16b //GHASH block 4k+1 - mid + mov d30, v7.d[1] //GHASH block 4k+3 - mid + + aese v0.16b, v19.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 + eor v9.16b, v9.16b, v28.16b //GHASH block 4k+1 - high + + pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid + + pmull2 v8.1q, v6.2d, v13.2d //GHASH block 4k+2 - high + eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid + + pmull2 v4.1q, v7.2d, v12.2d //GHASH block 4k+3 - high + + pmull v28.1q, v6.1d, v13.1d //GHASH block 4k+2 - low + + aese v2.16b, v19.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 + eor v9.16b, v9.16b, v8.16b //GHASH block 4k+2 - high + + aese v0.16b, v20.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 + + pmull v29.1q, v7.1d, v12.1d //GHASH block 4k+3 - low + movi v8.8b, #0xc2 + + aese v2.16b, v20.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 + eor v11.16b, v11.16b, v28.16b //GHASH block 4k+2 - low + + aese v3.16b, v20.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 + + pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid + eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid + + aese v2.16b, v21.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 3 + + aese v1.16b, v20.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 2 + eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high + + aese v0.16b, v21.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 + + eor v10.16b, v10.16b, v30.16b //GHASH block 4k+3 - mid + shl d8, d8, #56 //mod_constant + + aese v1.16b, v21.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 3 + eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low + + aese v0.16b, v22.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 4 + + pmull v28.1q, v9.1d, v8.1d + eor v10.16b, v10.16b, v9.16b //karatsuba tidy up + + aese v1.16b, v22.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 + + aese v0.16b, v23.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 + ext v9.16b, v9.16b, v9.16b, #8 + + aese v3.16b, v21.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 + + aese v2.16b, v22.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 4 + eor v10.16b, v10.16b, v11.16b + + aese v0.16b, v24.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 + + aese v3.16b, v22.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 4 + + aese v1.16b, v23.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 + + aese v2.16b, v23.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 5 + eor v10.16b, v10.16b, v28.16b + + aese v3.16b, v23.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 + + aese v1.16b, v24.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 6 + + aese v2.16b, v24.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 + + aese v3.16b, v24.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 + eor v10.16b, v10.16b, v9.16b + + aese v0.16b, v25.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 7 + + aese v2.16b, v25.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 + + aese v3.16b, v25.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 7 + + pmull v28.1q, v10.1d, v8.1d + + aese v1.16b, v25.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 + ext v10.16b, v10.16b, v10.16b, #8 + + aese v3.16b, v26.16b + aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 + + aese v0.16b, v26.16b + aesmc v0.16b, v0.16b //AES block 4k+4 - round 8 + eor v11.16b, v11.16b, v28.16b + + aese v1.16b, v26.16b + aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 + + aese v3.16b, v27.16b //AES block 4k+7 - round 9 + + aese v2.16b, v26.16b + aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 + + aese v0.16b, v27.16b //AES block 4k+4 - round 9 + + aese v1.16b, v27.16b //AES block 4k+5 - round 9 + eor v11.16b, v11.16b, v10.16b + + aese v2.16b, v27.16b //AES block 4k+6 - round 9 +.L128_enc_tail: //TAIL + + sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process + ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif + cmp x5, #48 + + ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag + eor x6, x6, x13 //AES block 4k+4 - round 10 low + eor x7, x7, x14 //AES block 4k+4 - round 10 high + + fmov d4, x6 //AES block 4k+4 - mov low + + fmov v4.d[1], x7 //AES block 4k+4 - mov high + + eor v5.16b, v4.16b, v0.16b //AES block 4k+4 - result + + b.gt .L128_enc_blocks_more_than_3 + + sub w12, w12, #1 + movi v11.8b, #0 + mov v3.16b, v2.16b + + cmp x5, #32 + mov v2.16b, v1.16b + movi v9.8b, #0 + + movi v10.8b, #0 + b.gt .L128_enc_blocks_more_than_2 + + mov v3.16b, v1.16b + cmp x5, #16 + + sub w12, w12, #1 + b.gt .L128_enc_blocks_more_than_1 + + sub w12, w12, #1 + b .L128_enc_blocks_less_than_1 +.L128_enc_blocks_more_than_3: //blocks left > 3 + st1 { v5.16b}, [x2], #16 //AES final-3 block - store result + + ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif + rev64 v4.16b, v5.16b //GHASH final-3 block + + eor v4.16b, v4.16b, v8.16b //feed in partial tag + eor x7, x7, x14 //AES final-2 block - round 10 high + eor x6, x6, x13 //AES final-2 block - round 10 low + + fmov d5, x6 //AES final-2 block - mov low + + movi v8.8b, #0 //suppress further partial tag feed in + fmov v5.d[1], x7 //AES final-2 block - mov high + + pmull v11.1q, v4.1d, v15.1d //GHASH final-3 block - low + mov d22, v4.d[1] //GHASH final-3 block - mid + + pmull2 v9.1q, v4.2d, v15.2d //GHASH final-3 block - high + + mov d10, v17.d[1] //GHASH final-3 block - mid + + eor v5.16b, v5.16b, v1.16b //AES final-2 block - result + eor v22.8b, v22.8b, v4.8b //GHASH final-3 block - mid + + pmull v10.1q, v22.1d, v10.1d //GHASH final-3 block - mid +.L128_enc_blocks_more_than_2: //blocks left > 2 + + st1 { v5.16b}, [x2], #16 //AES final-2 block - store result + + rev64 v4.16b, v5.16b //GHASH final-2 block + ldp x6, x7, [x0], #16 //AES final-1 block - load input low & high +#ifdef __AARCH64EB__ + rev x6, x6 + rev x7, x7 +#endif + eor v4.16b, v4.16b, v8.16b //feed in partial tag + + eor x6, x6, x13 //AES final-1 block - round 10 low + + fmov d5, x6 //AES final-1 block - mov low + eor x7, x7, x14 //AES final-1 block - round 10 high + + pmull2 v20.1q, v4.2d, v14.2d //GHASH final-2 block - high + fmov v5.d[1], x7 //AES final-1 block - mov high + + mov d22, v4.d[1] //GHASH final-2 block - mid + + pmull v21.1q, v4.1d, v14.1d //GHASH final-2 block - low + + eor v9.16b, v9.16b, v20.16b //GHASH final-2 block - high + + eor v22.8b, v22.8b, v4.8b //GHASH final-2 block - mid + + eor v5.16b, v5.16b, v2.16b //AES final-1 block - result + + eor v11.16b, v11.16b, v21.16b //GHASH final-2 block - low + + pmull v22.1q, v22.1d, v17.1d //GHASH final-2 block - mid + + movi v8.8b, #0 //suppress further partial tag feed in + + eor v10.16b, v10.16b, v22.16b //GHASH final-2 block - mid +.L128_enc_blocks_more_than_1: //blocks left > 1 + + st1 { v5.16b}, [x2], #16 //AES final-1 block - store result + *** 45314 LINES SKIPPED *** From nobody Fri Sep 8 20:56:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj7hG1CCtz4ssjS; Fri, 8 Sep 2023 20:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj7hG0wdCz4mdl; Fri, 8 Sep 2023 20:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDZAWeGEEll8Py9KQO5jUdj2USO9Mfh/FWvEfMLQxtI=; b=ZkoN4ee2QL9Fm15uPhbGsixUNuNvNqh8nLx02HovA6PZQackcLgwcXDsHpgIntPoUtlb6u +KwxfX+KF6ASIPbXDj+t4ZflbPqK8je7DKAPMevLiiC7BsC4OkaPsgNugaz9Yso79Wt8w/ HUQxCcLbm0M3aar+Inx3ZNRgwslYbcorV7TsYYYIwZgcDo6iw0rF2EIRouKX5Zq6+Y3Dxv 4+3sjkRnooHDtdbNQDoWtdcZBdGeEXb1BrenwUtWHr33Rwe+hxglL8uuhklNxfmWet3mkr H8ZZHV2WvNQvSyE7UYLQzF1PxOuPJtOHMhQ4fBkY58ERQO2spTyJMzER/LEFhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694206606; a=rsa-sha256; cv=none; b=MicunhEigdqXDAr2PY3ZrM9jmRr+9ul+IvOhFyn31FGbmXtryfpSqTQxQnv+guT11KahsX DnqyMcBqnQGDk6vhdVJhWqxb0K2u6soOSudORuZw2XyIJPgYiqMhHj+4aPELZl10htP8Wd eknxzydc3ISubFrbr10x1jtPrhYvEpbv72e2C4bHU4ACL+0/8M7xK8L70cAKecGRa9fXD5 JkXcYEkXqzBAwBkhPuaryFCcn5gEyquOUZJyRW+8T5M5RnSY7k05dzH9L202SdOPNkLcxS BIMhMjjeQ1WAW/VpeYHU8TOVOd1XQXtUDpA66ZjKrpoPFbxoGCumebbjLMUqhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694206606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tDZAWeGEEll8Py9KQO5jUdj2USO9Mfh/FWvEfMLQxtI=; b=sG8XHalPSL8aexHswAu2kL8Sr4FzAm+skDNzO+6eT+wdbKUi7N55lOPQU2WyOgJi/UvaDO t3i6i8Uaa6Lkz/O1A05MfHnw1Ta3lQqEB+8sRFtZ1UhcoZjxKX9pHjQTy/q4rEUHFb7/rZ eN7R+iSw/LHajH6NBNF1eTdFLgjF0fTY5zv4bYVYJeB20cSl7hy4UNLahf+ago+9TkAoCd 80RmzFPlT2LcP8BbcF6JZUvuPWySPk4NKOWfOr8TUstO/qjS+qkYvGgL4qshuL3VSPrXF/ HndrQx14eaQu9Wb/itxRywarfIIz6Th1pwAReXgLsj9W5xBAhICWUt1g8+QTGQ== 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 4Rj7hG02b8zx38; Fri, 8 Sep 2023 20:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388KujUg007538; Fri, 8 Sep 2023 20:56:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388KuhQq007527; Fri, 8 Sep 2023 20:56:43 GMT (envelope-from git) Date: Fri, 8 Sep 2023 20:56:43 GMT Message-Id: <202309082056.388KuhQq007527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bf5069fb6a3f - stable/14 - libcrypto: Switch back to the generated assembly in sys/crypto/openssl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf5069fb6a3fc8fbf08ed23a4fd958af48cf902f Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bf5069fb6a3fc8fbf08ed23a4fd958af48cf902f commit bf5069fb6a3fc8fbf08ed23a4fd958af48cf902f Author: John Baldwin AuthorDate: 2023-08-29 21:46:44 +0000 Commit: John Baldwin CommitDate: 2023-09-08 20:55:44 +0000 libcrypto: Switch back to the generated assembly in sys/crypto/openssl Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41569 (cherry picked from commit 47d997021fbc7b662e9507deec1897d514d1224c) --- secure/lib/libcrypto/Makefile | 4 +- .../lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S | 6390 --------- secure/lib/libcrypto/arch/aarch64/aesv8-armx.S | 3181 ----- secure/lib/libcrypto/arch/aarch64/arm64cpuid.S | 130 - secure/lib/libcrypto/arch/aarch64/armv8-mont.S | 2125 --- secure/lib/libcrypto/arch/aarch64/chacha-armv8.S | 2035 --- .../libcrypto/arch/aarch64/ecp_nistz256-armv8.S | 4243 ------ secure/lib/libcrypto/arch/aarch64/ghashv8-armx.S | 553 - .../lib/libcrypto/arch/aarch64/keccak1600-armv8.S | 1010 -- secure/lib/libcrypto/arch/aarch64/poly1305-armv8.S | 864 -- secure/lib/libcrypto/arch/aarch64/sha1-armv8.S | 1212 -- secure/lib/libcrypto/arch/aarch64/sha256-armv8.S | 2052 --- secure/lib/libcrypto/arch/aarch64/sha512-armv8.S | 1607 --- secure/lib/libcrypto/arch/aarch64/vpaes-armv8.S | 1197 -- secure/lib/libcrypto/arch/amd64/aes-x86_64.S | 2680 ---- secure/lib/libcrypto/arch/amd64/aesni-gcm-x86_64.S | 811 -- secure/lib/libcrypto/arch/amd64/aesni-mb-x86_64.S | 1610 --- .../lib/libcrypto/arch/amd64/aesni-sha1-x86_64.S | 3057 ----- .../lib/libcrypto/arch/amd64/aesni-sha256-x86_64.S | 4457 ------ secure/lib/libcrypto/arch/amd64/aesni-x86_64.S | 4507 ------ secure/lib/libcrypto/arch/amd64/bsaes-x86_64.S | 2619 ---- secure/lib/libcrypto/arch/amd64/chacha-x86_64.S | 2215 --- secure/lib/libcrypto/arch/amd64/cmll-x86_64.S | 1947 --- secure/lib/libcrypto/arch/amd64/e_padlock-x86_64.S | 1059 -- .../lib/libcrypto/arch/amd64/ecp_nistz256-x86_64.S | 7365 ---------- secure/lib/libcrypto/arch/amd64/ghash-x86_64.S | 1875 --- .../lib/libcrypto/arch/amd64/keccak1600-x86_64.S | 546 - secure/lib/libcrypto/arch/amd64/md5-x86_64.S | 705 - secure/lib/libcrypto/arch/amd64/poly1305-x86_64.S | 2090 --- secure/lib/libcrypto/arch/amd64/rc4-md5-x86_64.S | 1303 -- secure/lib/libcrypto/arch/amd64/rc4-x86_64.S | 657 - secure/lib/libcrypto/arch/amd64/rsaz-avx2.S | 1766 --- secure/lib/libcrypto/arch/amd64/rsaz-avx512.S | 902 -- secure/lib/libcrypto/arch/amd64/rsaz-x86_64.S | 2037 --- secure/lib/libcrypto/arch/amd64/sha1-mb-x86_64.S | 7325 ---------- secure/lib/libcrypto/arch/amd64/sha1-x86_64.S | 5472 -------- secure/lib/libcrypto/arch/amd64/sha256-mb-x86_64.S | 8006 ----------- secure/lib/libcrypto/arch/amd64/sha256-x86_64.S | 5478 -------- secure/lib/libcrypto/arch/amd64/sha512-x86_64.S | 5483 -------- secure/lib/libcrypto/arch/amd64/vpaes-x86_64.S | 880 -- secure/lib/libcrypto/arch/amd64/wp-x86_64.S | 901 -- secure/lib/libcrypto/arch/amd64/x25519-x86_64.S | 824 -- secure/lib/libcrypto/arch/amd64/x86_64-gf2m.S | 333 - secure/lib/libcrypto/arch/amd64/x86_64-mont.S | 1261 -- secure/lib/libcrypto/arch/amd64/x86_64-mont5.S | 3625 ----- secure/lib/libcrypto/arch/amd64/x86_64cpuid.S | 513 - secure/lib/libcrypto/arch/arm/aes-armv4.S | 1198 -- secure/lib/libcrypto/arch/arm/aesv8-armx.S | 1088 -- secure/lib/libcrypto/arch/arm/armv4-gf2m.S | 236 - secure/lib/libcrypto/arch/arm/armv4-mont.S | 961 -- secure/lib/libcrypto/arch/arm/armv4cpuid.S | 273 - secure/lib/libcrypto/arch/arm/bsaes-armv7.S | 2561 ---- secure/lib/libcrypto/arch/arm/chacha-armv4.S | 1478 -- secure/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S | 4430 ------ secure/lib/libcrypto/arch/arm/ghash-armv4.S | 565 - secure/lib/libcrypto/arch/arm/ghashv8-armx.S | 244 - secure/lib/libcrypto/arch/arm/keccak1600-armv4.S | 2694 ---- secure/lib/libcrypto/arch/arm/poly1305-armv4.S | 1169 -- secure/lib/libcrypto/arch/arm/sha1-armv4-large.S | 1499 -- secure/lib/libcrypto/arch/arm/sha256-armv4.S | 2823 ---- secure/lib/libcrypto/arch/arm/sha512-armv4.S | 1877 --- secure/lib/libcrypto/arch/i386/aes-586.S | 6644 --------- secure/lib/libcrypto/arch/i386/aesni-x86.S | 6732 --------- secure/lib/libcrypto/arch/i386/bf-586.S | 1928 --- secure/lib/libcrypto/arch/i386/bn-586.S | 3157 ----- secure/lib/libcrypto/arch/i386/cast-586.S | 2002 --- secure/lib/libcrypto/arch/i386/chacha-x86.S | 2084 --- secure/lib/libcrypto/arch/i386/cmll-x86.S | 4896 ------- secure/lib/libcrypto/arch/i386/co-586.S | 2584 ---- secure/lib/libcrypto/arch/i386/crypt586.S | 1800 --- secure/lib/libcrypto/arch/i386/des-586.S | 3932 ------ secure/lib/libcrypto/arch/i386/e_padlock-x86.S | 2300 ---- secure/lib/libcrypto/arch/i386/ecp_nistz256-x86.S | 10584 -------------- secure/lib/libcrypto/arch/i386/ghash-x86.S | 2636 ---- secure/lib/libcrypto/arch/i386/md5-586.S | 1404 -- secure/lib/libcrypto/arch/i386/poly1305-x86.S | 3938 ------ secure/lib/libcrypto/arch/i386/rc4-586.S | 819 -- secure/lib/libcrypto/arch/i386/rc5-586.S | 1264 -- secure/lib/libcrypto/arch/i386/rmd-586.S | 3976 ------ secure/lib/libcrypto/arch/i386/sha1-586.S | 8016 ----------- secure/lib/libcrypto/arch/i386/sha256-586.S | 13612 ------------------- secure/lib/libcrypto/arch/i386/sha512-586.S | 5704 -------- secure/lib/libcrypto/arch/i386/vpaes-x86.S | 1488 -- secure/lib/libcrypto/arch/i386/wp-mmx.S | 2260 --- secure/lib/libcrypto/arch/i386/x86-gf2m.S | 755 - secure/lib/libcrypto/arch/i386/x86-mont.S | 995 -- secure/lib/libcrypto/arch/i386/x86cpuid.S | 1217 -- secure/lib/libcrypto/arch/powerpc/aes-ppc.S | 1561 --- secure/lib/libcrypto/arch/powerpc/aesp8-ppc.S | 3642 ----- secure/lib/libcrypto/arch/powerpc/bn-ppc.S | 1855 --- secure/lib/libcrypto/arch/powerpc/chacha-ppc.S | 1492 -- secure/lib/libcrypto/arch/powerpc/ghashp8-ppc.S | 569 - secure/lib/libcrypto/arch/powerpc/poly1305-ppc.S | 1301 -- secure/lib/libcrypto/arch/powerpc/poly1305-ppcfp.S | 586 - secure/lib/libcrypto/arch/powerpc/ppc-mont.S | 1787 --- secure/lib/libcrypto/arch/powerpc/ppc.S | 1855 --- secure/lib/libcrypto/arch/powerpc/ppccpuid.S | 356 - secure/lib/libcrypto/arch/powerpc/sha1-ppc.S | 1118 -- secure/lib/libcrypto/arch/powerpc/sha256-ppc.S | 1321 -- secure/lib/libcrypto/arch/powerpc/sha256p8-ppc.S | 735 - secure/lib/libcrypto/arch/powerpc/sha512-ppc.S | 3071 ----- secure/lib/libcrypto/arch/powerpc/sha512p8-ppc.S | 833 -- secure/lib/libcrypto/arch/powerpc/vpaes-ppc.S | 1468 -- secure/lib/libcrypto/arch/powerpc64/aes-ppc.S | 1533 --- secure/lib/libcrypto/arch/powerpc64/aesp8-ppc.S | 3659 ----- secure/lib/libcrypto/arch/powerpc64/bn-ppc.S | 1876 --- secure/lib/libcrypto/arch/powerpc64/chacha-ppc.S | 1499 -- .../libcrypto/arch/powerpc64/ecp_nistp521-ppc64.S | 354 - .../libcrypto/arch/powerpc64/ecp_nistz256-ppc64.S | 4854 ------- secure/lib/libcrypto/arch/powerpc64/ghashp8-ppc.S | 576 - .../libcrypto/arch/powerpc64/keccak1600-ppc64.S | 670 - secure/lib/libcrypto/arch/powerpc64/poly1305-ppc.S | 1142 -- .../lib/libcrypto/arch/powerpc64/poly1305-ppcfp.S | 596 - secure/lib/libcrypto/arch/powerpc64/ppc-mont.S | 1790 --- secure/lib/libcrypto/arch/powerpc64/ppc.S | 1876 --- secure/lib/libcrypto/arch/powerpc64/ppccpuid.S | 387 - secure/lib/libcrypto/arch/powerpc64/sha1-ppc.S | 1121 -- secure/lib/libcrypto/arch/powerpc64/sha256-ppc.S | 1324 -- secure/lib/libcrypto/arch/powerpc64/sha256p8-ppc.S | 738 - secure/lib/libcrypto/arch/powerpc64/sha512-ppc.S | 1420 -- secure/lib/libcrypto/arch/powerpc64/sha512p8-ppc.S | 836 -- secure/lib/libcrypto/arch/powerpc64/vpaes-ppc.S | 1479 -- secure/lib/libcrypto/arch/powerpc64/x25519-ppc64.S | 349 - secure/lib/libcrypto/arch/powerpc64le/aes-ppc.S | 1581 --- secure/lib/libcrypto/arch/powerpc64le/aesp8-ppc.S | 3659 ----- secure/lib/libcrypto/arch/powerpc64le/bn-ppc.S | 1876 --- secure/lib/libcrypto/arch/powerpc64le/chacha-ppc.S | 1371 -- .../arch/powerpc64le/ecp_nistp521-ppc64.S | 354 - .../arch/powerpc64le/ecp_nistz256-ppc64.S | 4854 ------- .../lib/libcrypto/arch/powerpc64le/ghashp8-ppc.S | 576 - .../libcrypto/arch/powerpc64le/keccak1600-ppc64.S | 670 - .../lib/libcrypto/arch/powerpc64le/poly1305-ppc.S | 1128 -- .../libcrypto/arch/powerpc64le/poly1305-ppcfp.S | 591 - secure/lib/libcrypto/arch/powerpc64le/ppc-mont.S | 1790 --- secure/lib/libcrypto/arch/powerpc64le/ppc.S | 1876 --- secure/lib/libcrypto/arch/powerpc64le/ppccpuid.S | 387 - secure/lib/libcrypto/arch/powerpc64le/sha1-ppc.S | 1169 -- secure/lib/libcrypto/arch/powerpc64le/sha256-ppc.S | 1372 -- .../lib/libcrypto/arch/powerpc64le/sha256p8-ppc.S | 746 - secure/lib/libcrypto/arch/powerpc64le/sha512-ppc.S | 1516 --- .../lib/libcrypto/arch/powerpc64le/sha512p8-ppc.S | 848 -- secure/lib/libcrypto/arch/powerpc64le/vpaes-ppc.S | 1479 -- .../lib/libcrypto/arch/powerpc64le/x25519-ppc64.S | 349 - secure/lib/libcrypto/engines/padlock/Makefile | 2 +- secure/lib/libcrypto/modules/fips/Makefile | 4 +- 145 files changed, 5 insertions(+), 310557 deletions(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index ab9044ad67f9..585e89861815 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -618,12 +618,12 @@ buildasm cleanasm: PICFLAG+= -DOPENSSL_PIC .if defined(ASM_${MACHINE_CPUARCH}) -.PATH: ${SRCTOP}/secure/lib/libcrypto/arch/${MACHINE_CPUARCH} +.PATH: ${SRCTOP}/sys/crypto/openssl/${MACHINE_CPUARCH} .if defined(ASM_amd64) .PATH: ${LCRYPTO_SRC}/crypto/bn/asm .endif .elif defined(ASM_${MACHINE_ARCH}) -.PATH: ${SRCTOP}/secure/lib/libcrypto/arch/${MACHINE_ARCH} +.PATH: ${SRCTOP}/sys/crypto/openssl/${MACHINE_ARCH} .endif .PATH: ${LCRYPTO_SRC}/crypto \ diff --git a/secure/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S b/secure/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S deleted file mode 100644 index eb85dbc9f996..000000000000 --- a/secure/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S +++ /dev/null @@ -1,6390 +0,0 @@ -/* Do not modify. This file is auto-generated from aes-gcm-armv8_64.pl. */ -#include "arm_arch.h" - -#if __ARM_MAX_ARCH__>=8 -.arch armv8-a+crypto -.text -.globl aes_gcm_enc_128_kernel -.type aes_gcm_enc_128_kernel,%function -.align 4 -aes_gcm_enc_128_kernel: - cbz x1, .L128_enc_ret - stp x19, x20, [sp, #-112]! - mov x16, x4 - mov x8, x5 - stp x21, x22, [sp, #16] - stp x23, x24, [sp, #32] - stp d8, d9, [sp, #48] - stp d10, d11, [sp, #64] - stp d12, d13, [sp, #80] - stp d14, d15, [sp, #96] - - ldp x10, x11, [x16] //ctr96_b64, ctr96_t32 -#ifdef __AARCH64EB__ - rev x10, x10 - rev x11, x11 -#endif - ldp x13, x14, [x8, #160] //load rk10 -#ifdef __AARCH64EB__ - ror x13, x13, #32 - ror x14, x14, #32 -#endif - ld1 {v11.16b}, [x3] - ext v11.16b, v11.16b, v11.16b, #8 - rev64 v11.16b, v11.16b - lsr x5, x1, #3 //byte_len - mov x15, x5 - - ld1 {v18.4s}, [x8], #16 //load rk0 - add x4, x0, x1, lsr #3 //end_input_ptr - sub x5, x5, #1 //byte_len - 1 - - lsr x12, x11, #32 - ldr q15, [x3, #112] //load h4l | h4h -#ifndef __AARCH64EB__ - ext v15.16b, v15.16b, v15.16b, #8 -#endif - fmov d1, x10 //CTR block 1 - rev w12, w12 //rev_ctr32 - - add w12, w12, #1 //increment rev_ctr32 - orr w11, w11, w11 - ld1 {v19.4s}, [x8], #16 //load rk1 - - rev w9, w12 //CTR block 1 - add w12, w12, #1 //CTR block 1 - fmov d3, x10 //CTR block 3 - - orr x9, x11, x9, lsl #32 //CTR block 1 - ld1 { v0.16b}, [x16] //special case vector load initial counter so we can start first AES block as quickly as possible - - fmov v1.d[1], x9 //CTR block 1 - rev w9, w12 //CTR block 2 - - fmov d2, x10 //CTR block 2 - orr x9, x11, x9, lsl #32 //CTR block 2 - add w12, w12, #1 //CTR block 2 - - fmov v2.d[1], x9 //CTR block 2 - rev w9, w12 //CTR block 3 - - orr x9, x11, x9, lsl #32 //CTR block 3 - ld1 {v20.4s}, [x8], #16 //load rk2 - - add w12, w12, #1 //CTR block 3 - fmov v3.d[1], x9 //CTR block 3 - - ldr q14, [x3, #80] //load h3l | h3h -#ifndef __AARCH64EB__ - ext v14.16b, v14.16b, v14.16b, #8 -#endif - aese v1.16b, v18.16b - aesmc v1.16b, v1.16b //AES block 1 - round 0 - ld1 {v21.4s}, [x8], #16 //load rk3 - - aese v2.16b, v18.16b - aesmc v2.16b, v2.16b //AES block 2 - round 0 - ldr q12, [x3, #32] //load h1l | h1h -#ifndef __AARCH64EB__ - ext v12.16b, v12.16b, v12.16b, #8 -#endif - - aese v0.16b, v18.16b - aesmc v0.16b, v0.16b //AES block 0 - round 0 - ld1 {v22.4s}, [x8], #16 //load rk4 - - aese v3.16b, v18.16b - aesmc v3.16b, v3.16b //AES block 3 - round 0 - ld1 {v23.4s}, [x8], #16 //load rk5 - - aese v2.16b, v19.16b - aesmc v2.16b, v2.16b //AES block 2 - round 1 - trn2 v17.2d, v14.2d, v15.2d //h4l | h3l - - aese v0.16b, v19.16b - aesmc v0.16b, v0.16b //AES block 0 - round 1 - ld1 {v24.4s}, [x8], #16 //load rk6 - - aese v1.16b, v19.16b - aesmc v1.16b, v1.16b //AES block 1 - round 1 - ld1 {v25.4s}, [x8], #16 //load rk7 - - aese v3.16b, v19.16b - aesmc v3.16b, v3.16b //AES block 3 - round 1 - trn1 v9.2d, v14.2d, v15.2d //h4h | h3h - - aese v0.16b, v20.16b - aesmc v0.16b, v0.16b //AES block 0 - round 2 - ld1 {v26.4s}, [x8], #16 //load rk8 - - aese v1.16b, v20.16b - aesmc v1.16b, v1.16b //AES block 1 - round 2 - ldr q13, [x3, #64] //load h2l | h2h -#ifndef __AARCH64EB__ - ext v13.16b, v13.16b, v13.16b, #8 -#endif - - aese v3.16b, v20.16b - aesmc v3.16b, v3.16b //AES block 3 - round 2 - - aese v2.16b, v20.16b - aesmc v2.16b, v2.16b //AES block 2 - round 2 - eor v17.16b, v17.16b, v9.16b //h4k | h3k - - aese v0.16b, v21.16b - aesmc v0.16b, v0.16b //AES block 0 - round 3 - - aese v1.16b, v21.16b - aesmc v1.16b, v1.16b //AES block 1 - round 3 - - aese v2.16b, v21.16b - aesmc v2.16b, v2.16b //AES block 2 - round 3 - ld1 {v27.4s}, [x8], #16 //load rk9 - - aese v3.16b, v21.16b - aesmc v3.16b, v3.16b //AES block 3 - round 3 - - and x5, x5, #0xffffffffffffffc0 //number of bytes to be processed in main loop (at least 1 byte must be handled by tail) - trn2 v16.2d, v12.2d, v13.2d //h2l | h1l - - aese v3.16b, v22.16b - aesmc v3.16b, v3.16b //AES block 3 - round 4 - add x5, x5, x0 - - aese v2.16b, v22.16b - aesmc v2.16b, v2.16b //AES block 2 - round 4 - cmp x0, x5 //check if we have <= 4 blocks - - aese v0.16b, v22.16b - aesmc v0.16b, v0.16b //AES block 0 - round 4 - - aese v3.16b, v23.16b - aesmc v3.16b, v3.16b //AES block 3 - round 5 - - aese v2.16b, v23.16b - aesmc v2.16b, v2.16b //AES block 2 - round 5 - - aese v0.16b, v23.16b - aesmc v0.16b, v0.16b //AES block 0 - round 5 - - aese v3.16b, v24.16b - aesmc v3.16b, v3.16b //AES block 3 - round 6 - - aese v1.16b, v22.16b - aesmc v1.16b, v1.16b //AES block 1 - round 4 - - aese v2.16b, v24.16b - aesmc v2.16b, v2.16b //AES block 2 - round 6 - trn1 v8.2d, v12.2d, v13.2d //h2h | h1h - - aese v0.16b, v24.16b - aesmc v0.16b, v0.16b //AES block 0 - round 6 - - aese v1.16b, v23.16b - aesmc v1.16b, v1.16b //AES block 1 - round 5 - - aese v3.16b, v25.16b - aesmc v3.16b, v3.16b //AES block 3 - round 7 - - aese v0.16b, v25.16b - aesmc v0.16b, v0.16b //AES block 0 - round 7 - - aese v1.16b, v24.16b - aesmc v1.16b, v1.16b //AES block 1 - round 6 - - aese v2.16b, v25.16b - aesmc v2.16b, v2.16b //AES block 2 - round 7 - - aese v0.16b, v26.16b - aesmc v0.16b, v0.16b //AES block 0 - round 8 - - aese v1.16b, v25.16b - aesmc v1.16b, v1.16b //AES block 1 - round 7 - - aese v2.16b, v26.16b - aesmc v2.16b, v2.16b //AES block 2 - round 8 - - aese v3.16b, v26.16b - aesmc v3.16b, v3.16b //AES block 3 - round 8 - - aese v1.16b, v26.16b - aesmc v1.16b, v1.16b //AES block 1 - round 8 - - aese v2.16b, v27.16b //AES block 2 - round 9 - - aese v0.16b, v27.16b //AES block 0 - round 9 - - eor v16.16b, v16.16b, v8.16b //h2k | h1k - - aese v1.16b, v27.16b //AES block 1 - round 9 - - aese v3.16b, v27.16b //AES block 3 - round 9 - b.ge .L128_enc_tail //handle tail - - ldp x6, x7, [x0, #0] //AES block 0 - load plaintext -#ifdef __AARCH64EB__ - rev x6, x6 - rev x7, x7 -#endif - ldp x21, x22, [x0, #32] //AES block 2 - load plaintext -#ifdef __AARCH64EB__ - rev x21, x21 - rev x22, x22 -#endif - ldp x19, x20, [x0, #16] //AES block 1 - load plaintext -#ifdef __AARCH64EB__ - rev x19, x19 - rev x20, x20 -#endif - ldp x23, x24, [x0, #48] //AES block 3 - load plaintext -#ifdef __AARCH64EB__ - rev x23, x23 - rev x24, x24 -#endif - eor x6, x6, x13 //AES block 0 - round 10 low - eor x7, x7, x14 //AES block 0 - round 10 high - - eor x21, x21, x13 //AES block 2 - round 10 low - fmov d4, x6 //AES block 0 - mov low - - eor x19, x19, x13 //AES block 1 - round 10 low - eor x22, x22, x14 //AES block 2 - round 10 high - fmov v4.d[1], x7 //AES block 0 - mov high - - fmov d5, x19 //AES block 1 - mov low - eor x20, x20, x14 //AES block 1 - round 10 high - - eor x23, x23, x13 //AES block 3 - round 10 low - fmov v5.d[1], x20 //AES block 1 - mov high - - fmov d6, x21 //AES block 2 - mov low - eor x24, x24, x14 //AES block 3 - round 10 high - rev w9, w12 //CTR block 4 - - fmov v6.d[1], x22 //AES block 2 - mov high - orr x9, x11, x9, lsl #32 //CTR block 4 - - eor v4.16b, v4.16b, v0.16b //AES block 0 - result - fmov d0, x10 //CTR block 4 - add w12, w12, #1 //CTR block 4 - - fmov v0.d[1], x9 //CTR block 4 - rev w9, w12 //CTR block 5 - - eor v5.16b, v5.16b, v1.16b //AES block 1 - result - fmov d1, x10 //CTR block 5 - orr x9, x11, x9, lsl #32 //CTR block 5 - - add w12, w12, #1 //CTR block 5 - add x0, x0, #64 //AES input_ptr update - fmov v1.d[1], x9 //CTR block 5 - - fmov d7, x23 //AES block 3 - mov low - rev w9, w12 //CTR block 6 - st1 { v4.16b}, [x2], #16 //AES block 0 - store result - - fmov v7.d[1], x24 //AES block 3 - mov high - orr x9, x11, x9, lsl #32 //CTR block 6 - - add w12, w12, #1 //CTR block 6 - eor v6.16b, v6.16b, v2.16b //AES block 2 - result - st1 { v5.16b}, [x2], #16 //AES block 1 - store result - - fmov d2, x10 //CTR block 6 - cmp x0, x5 //check if we have <= 8 blocks - - fmov v2.d[1], x9 //CTR block 6 - rev w9, w12 //CTR block 7 - st1 { v6.16b}, [x2], #16 //AES block 2 - store result - - orr x9, x11, x9, lsl #32 //CTR block 7 - - eor v7.16b, v7.16b, v3.16b //AES block 3 - result - st1 { v7.16b}, [x2], #16 //AES block 3 - store result - b.ge .L128_enc_prepretail //do prepretail - -.L128_enc_main_loop: //main loop start - ldp x23, x24, [x0, #48] //AES block 4k+3 - load plaintext -#ifdef __AARCH64EB__ - rev x23, x23 - rev x24, x24 -#endif - rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) - rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) - - aese v2.16b, v18.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 0 - fmov d3, x10 //CTR block 4k+3 - - ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 - rev64 v5.16b, v5.16b //GHASH block 4k+1 (t0 and t1 free) - - aese v1.16b, v18.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 - add w12, w12, #1 //CTR block 4k+3 - fmov v3.d[1], x9 //CTR block 4k+3 - - aese v0.16b, v18.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 - mov d31, v6.d[1] //GHASH block 4k+2 - mid - - aese v2.16b, v19.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 - mov d30, v5.d[1] //GHASH block 4k+1 - mid - - aese v1.16b, v19.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 - eor v4.16b, v4.16b, v11.16b //PRE 1 - - aese v3.16b, v18.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 - eor x24, x24, x14 //AES block 4k+3 - round 10 high - - pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high - eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid - ldp x6, x7, [x0, #0] //AES block 4k+4 - load plaintext -#ifdef __AARCH64EB__ - rev x6, x6 - rev x7, x7 -#endif - aese v0.16b, v19.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 - rev w9, w12 //CTR block 4k+8 - - eor v30.8b, v30.8b, v5.8b //GHASH block 4k+1 - mid - mov d8, v4.d[1] //GHASH block 4k - mid - orr x9, x11, x9, lsl #32 //CTR block 4k+8 - - pmull2 v9.1q, v4.2d, v15.2d //GHASH block 4k - high - add w12, w12, #1 //CTR block 4k+8 - mov d10, v17.d[1] //GHASH block 4k - mid - - aese v0.16b, v20.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 - - pmull v11.1q, v4.1d, v15.1d //GHASH block 4k - low - eor v8.8b, v8.8b, v4.8b //GHASH block 4k - mid - - aese v1.16b, v20.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 2 - - aese v0.16b, v21.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 - eor v9.16b, v9.16b, v28.16b //GHASH block 4k+1 - high - - pmull v28.1q, v6.1d, v13.1d //GHASH block 4k+2 - low - - pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid - rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) - - pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid - - pmull v29.1q, v5.1d, v14.1d //GHASH block 4k+1 - low - ins v31.d[1], v31.d[0] //GHASH block 4k+2 - mid - - pmull2 v8.1q, v6.2d, v13.2d //GHASH block 4k+2 - high - eor x7, x7, x14 //AES block 4k+4 - round 10 high - - eor v10.16b, v10.16b, v30.16b //GHASH block 4k+1 - mid - mov d30, v7.d[1] //GHASH block 4k+3 - mid - - aese v3.16b, v19.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 - eor v11.16b, v11.16b, v29.16b //GHASH block 4k+1 - low - - aese v2.16b, v20.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 - eor x6, x6, x13 //AES block 4k+4 - round 10 low - - aese v1.16b, v21.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 3 - eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid - - pmull2 v4.1q, v7.2d, v12.2d //GHASH block 4k+3 - high - - aese v2.16b, v21.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 3 - eor v9.16b, v9.16b, v8.16b //GHASH block 4k+2 - high - - pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid - - pmull v29.1q, v7.1d, v12.1d //GHASH block 4k+3 - low - movi v8.8b, #0xc2 - - pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid - eor v11.16b, v11.16b, v28.16b //GHASH block 4k+2 - low - - aese v1.16b, v22.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 - - aese v3.16b, v20.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 - shl d8, d8, #56 //mod_constant - - aese v0.16b, v22.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 4 - eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high - - aese v1.16b, v23.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 - ldp x19, x20, [x0, #16] //AES block 4k+5 - load plaintext -#ifdef __AARCH64EB__ - rev x19, x19 - rev x20, x20 -#endif - aese v3.16b, v21.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 - eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid - - aese v0.16b, v23.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 - ldp x21, x22, [x0, #32] //AES block 4k+6 - load plaintext -#ifdef __AARCH64EB__ - rev x21, x21 - rev x22, x22 -#endif - pmull v31.1q, v9.1d, v8.1d //MODULO - top 64b align with mid - eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low - - aese v2.16b, v22.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 4 - eor x19, x19, x13 //AES block 4k+5 - round 10 low - - aese v3.16b, v22.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 4 - eor v10.16b, v10.16b, v30.16b //GHASH block 4k+3 - mid - - aese v1.16b, v24.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 6 - eor x23, x23, x13 //AES block 4k+3 - round 10 low - - aese v2.16b, v23.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 5 - eor v30.16b, v11.16b, v9.16b //MODULO - karatsuba tidy up - - fmov d4, x6 //AES block 4k+4 - mov low - aese v0.16b, v24.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 - fmov v4.d[1], x7 //AES block 4k+4 - mov high - - add x0, x0, #64 //AES input_ptr update - fmov d7, x23 //AES block 4k+3 - mov low - ext v9.16b, v9.16b, v9.16b, #8 //MODULO - other top alignment - - aese v3.16b, v23.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 - fmov d5, x19 //AES block 4k+5 - mov low - - aese v0.16b, v25.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 7 - eor v10.16b, v10.16b, v30.16b //MODULO - karatsuba tidy up - - aese v2.16b, v24.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 - eor x20, x20, x14 //AES block 4k+5 - round 10 high - - aese v1.16b, v25.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 - fmov v5.d[1], x20 //AES block 4k+5 - mov high - - aese v0.16b, v26.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 8 - fmov v7.d[1], x24 //AES block 4k+3 - mov high - - aese v3.16b, v24.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 - cmp x0, x5 //.LOOP CONTROL - - aese v1.16b, v26.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 - eor v10.16b, v10.16b, v31.16b //MODULO - fold into mid - - aese v0.16b, v27.16b //AES block 4k+4 - round 9 - eor x21, x21, x13 //AES block 4k+6 - round 10 low - eor x22, x22, x14 //AES block 4k+6 - round 10 high - - aese v3.16b, v25.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 7 - fmov d6, x21 //AES block 4k+6 - mov low - - aese v1.16b, v27.16b //AES block 4k+5 - round 9 - fmov v6.d[1], x22 //AES block 4k+6 - mov high - - aese v2.16b, v25.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 - eor v4.16b, v4.16b, v0.16b //AES block 4k+4 - result - - fmov d0, x10 //CTR block 4k+8 - aese v3.16b, v26.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 - - fmov v0.d[1], x9 //CTR block 4k+8 - rev w9, w12 //CTR block 4k+9 - eor v10.16b, v10.16b, v9.16b //MODULO - fold into mid - - aese v2.16b, v26.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 - eor v5.16b, v5.16b, v1.16b //AES block 4k+5 - result - - add w12, w12, #1 //CTR block 4k+9 - orr x9, x11, x9, lsl #32 //CTR block 4k+9 - fmov d1, x10 //CTR block 4k+9 - - pmull v9.1q, v10.1d, v8.1d //MODULO - mid 64b align with low - fmov v1.d[1], x9 //CTR block 4k+9 - rev w9, w12 //CTR block 4k+10 - - aese v2.16b, v27.16b //AES block 4k+6 - round 9 - st1 { v4.16b}, [x2], #16 //AES block 4k+4 - store result - eor v6.16b, v6.16b, v2.16b //AES block 4k+6 - result - orr x9, x11, x9, lsl #32 //CTR block 4k+10 - - aese v3.16b, v27.16b //AES block 4k+7 - round 9 - add w12, w12, #1 //CTR block 4k+10 - ext v10.16b, v10.16b, v10.16b, #8 //MODULO - other mid alignment - fmov d2, x10 //CTR block 4k+10 - - eor v11.16b, v11.16b, v9.16b //MODULO - fold into low - st1 { v5.16b}, [x2], #16 //AES block 4k+5 - store result - - fmov v2.d[1], x9 //CTR block 4k+10 - st1 { v6.16b}, [x2], #16 //AES block 4k+6 - store result - rev w9, w12 //CTR block 4k+11 - - orr x9, x11, x9, lsl #32 //CTR block 4k+11 - eor v7.16b, v7.16b, v3.16b //AES block 4k+3 - result - - eor v11.16b, v11.16b, v10.16b //MODULO - fold into low - st1 { v7.16b}, [x2], #16 //AES block 4k+3 - store result - b.lt .L128_enc_main_loop - -.L128_enc_prepretail: //PREPRETAIL - rev64 v4.16b, v4.16b //GHASH block 4k (only t0 is free) - fmov d3, x10 //CTR block 4k+3 - rev64 v5.16b, v5.16b //GHASH block 4k+1 (t0 and t1 free) - - ext v11.16b, v11.16b, v11.16b, #8 //PRE 0 - add w12, w12, #1 //CTR block 4k+3 - fmov v3.d[1], x9 //CTR block 4k+3 - - aese v1.16b, v18.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 0 - rev64 v6.16b, v6.16b //GHASH block 4k+2 (t0, t1, and t2 free) - - pmull v29.1q, v5.1d, v14.1d //GHASH block 4k+1 - low - - rev64 v7.16b, v7.16b //GHASH block 4k+3 (t0, t1, t2 and t3 free) - eor v4.16b, v4.16b, v11.16b //PRE 1 - - pmull2 v28.1q, v5.2d, v14.2d //GHASH block 4k+1 - high - - aese v3.16b, v18.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 0 - mov d30, v5.d[1] //GHASH block 4k+1 - mid - - pmull v11.1q, v4.1d, v15.1d //GHASH block 4k - low - mov d8, v4.d[1] //GHASH block 4k - mid - - mov d31, v6.d[1] //GHASH block 4k+2 - mid - mov d10, v17.d[1] //GHASH block 4k - mid - - aese v1.16b, v19.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 1 - eor v30.8b, v30.8b, v5.8b //GHASH block 4k+1 - mid - - eor v8.8b, v8.8b, v4.8b //GHASH block 4k - mid - - pmull2 v9.1q, v4.2d, v15.2d //GHASH block 4k - high - eor v31.8b, v31.8b, v6.8b //GHASH block 4k+2 - mid - - aese v3.16b, v19.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 1 - - pmull v30.1q, v30.1d, v17.1d //GHASH block 4k+1 - mid - eor v11.16b, v11.16b, v29.16b //GHASH block 4k+1 - low - - pmull v10.1q, v8.1d, v10.1d //GHASH block 4k - mid - - aese v0.16b, v18.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 0 - ins v31.d[1], v31.d[0] //GHASH block 4k+2 - mid - - aese v2.16b, v18.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 0 - - eor v10.16b, v10.16b, v30.16b //GHASH block 4k+1 - mid - mov d30, v7.d[1] //GHASH block 4k+3 - mid - - aese v0.16b, v19.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 1 - eor v9.16b, v9.16b, v28.16b //GHASH block 4k+1 - high - - pmull2 v31.1q, v31.2d, v16.2d //GHASH block 4k+2 - mid - - pmull2 v8.1q, v6.2d, v13.2d //GHASH block 4k+2 - high - eor v30.8b, v30.8b, v7.8b //GHASH block 4k+3 - mid - - pmull2 v4.1q, v7.2d, v12.2d //GHASH block 4k+3 - high - - pmull v28.1q, v6.1d, v13.1d //GHASH block 4k+2 - low - - aese v2.16b, v19.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 1 - eor v9.16b, v9.16b, v8.16b //GHASH block 4k+2 - high - - aese v0.16b, v20.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 2 - - pmull v29.1q, v7.1d, v12.1d //GHASH block 4k+3 - low - movi v8.8b, #0xc2 - - aese v2.16b, v20.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 2 - eor v11.16b, v11.16b, v28.16b //GHASH block 4k+2 - low - - aese v3.16b, v20.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 2 - - pmull v30.1q, v30.1d, v16.1d //GHASH block 4k+3 - mid - eor v10.16b, v10.16b, v31.16b //GHASH block 4k+2 - mid - - aese v2.16b, v21.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 3 - - aese v1.16b, v20.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 2 - eor v9.16b, v9.16b, v4.16b //GHASH block 4k+3 - high - - aese v0.16b, v21.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 3 - - eor v10.16b, v10.16b, v30.16b //GHASH block 4k+3 - mid - shl d8, d8, #56 //mod_constant - - aese v1.16b, v21.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 3 - eor v11.16b, v11.16b, v29.16b //GHASH block 4k+3 - low - - aese v0.16b, v22.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 4 - - pmull v28.1q, v9.1d, v8.1d - eor v10.16b, v10.16b, v9.16b //karatsuba tidy up - - aese v1.16b, v22.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 4 - - aese v0.16b, v23.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 5 - ext v9.16b, v9.16b, v9.16b, #8 - - aese v3.16b, v21.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 3 - - aese v2.16b, v22.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 4 - eor v10.16b, v10.16b, v11.16b - - aese v0.16b, v24.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 6 - - aese v3.16b, v22.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 4 - - aese v1.16b, v23.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 5 - - aese v2.16b, v23.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 5 - eor v10.16b, v10.16b, v28.16b - - aese v3.16b, v23.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 5 - - aese v1.16b, v24.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 6 - - aese v2.16b, v24.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 6 - - aese v3.16b, v24.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 6 - eor v10.16b, v10.16b, v9.16b - - aese v0.16b, v25.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 7 - - aese v2.16b, v25.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 7 - - aese v3.16b, v25.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 7 - - pmull v28.1q, v10.1d, v8.1d - - aese v1.16b, v25.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 7 - ext v10.16b, v10.16b, v10.16b, #8 - - aese v3.16b, v26.16b - aesmc v3.16b, v3.16b //AES block 4k+7 - round 8 - - aese v0.16b, v26.16b - aesmc v0.16b, v0.16b //AES block 4k+4 - round 8 - eor v11.16b, v11.16b, v28.16b - - aese v1.16b, v26.16b - aesmc v1.16b, v1.16b //AES block 4k+5 - round 8 - - aese v3.16b, v27.16b //AES block 4k+7 - round 9 - - aese v2.16b, v26.16b - aesmc v2.16b, v2.16b //AES block 4k+6 - round 8 - - aese v0.16b, v27.16b //AES block 4k+4 - round 9 - - aese v1.16b, v27.16b //AES block 4k+5 - round 9 - eor v11.16b, v11.16b, v10.16b - - aese v2.16b, v27.16b //AES block 4k+6 - round 9 -.L128_enc_tail: //TAIL - - sub x5, x4, x0 //main_end_input_ptr is number of bytes left to process - ldp x6, x7, [x0], #16 //AES block 4k+4 - load plaintext -#ifdef __AARCH64EB__ - rev x6, x6 - rev x7, x7 -#endif - cmp x5, #48 - - ext v8.16b, v11.16b, v11.16b, #8 //prepare final partial tag - eor x6, x6, x13 //AES block 4k+4 - round 10 low - eor x7, x7, x14 //AES block 4k+4 - round 10 high - - fmov d4, x6 //AES block 4k+4 - mov low - - fmov v4.d[1], x7 //AES block 4k+4 - mov high - - eor v5.16b, v4.16b, v0.16b //AES block 4k+4 - result - - b.gt .L128_enc_blocks_more_than_3 - - sub w12, w12, #1 - movi v11.8b, #0 - mov v3.16b, v2.16b - - cmp x5, #32 - mov v2.16b, v1.16b - movi v9.8b, #0 - - movi v10.8b, #0 - b.gt .L128_enc_blocks_more_than_2 - - mov v3.16b, v1.16b - cmp x5, #16 - - sub w12, w12, #1 - b.gt .L128_enc_blocks_more_than_1 - - sub w12, w12, #1 - b .L128_enc_blocks_less_than_1 -.L128_enc_blocks_more_than_3: //blocks left > 3 - st1 { v5.16b}, [x2], #16 //AES final-3 block - store result - - ldp x6, x7, [x0], #16 //AES final-2 block - load input low & high -#ifdef __AARCH64EB__ - rev x6, x6 - rev x7, x7 *** 310632 LINES SKIPPED *** From nobody Fri Sep 8 21:19:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8BY5HK0z4t6M1; Fri, 8 Sep 2023 21:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8BY4R8xz4vJK; Fri, 8 Sep 2023 21:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694207973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sYF9AhziXGf2GKXGlfQ6yv8uXOCMdWPeQGGf81UM6Wg=; b=funDG1FgPnfOP/3aO3NkBS8he+PYmjixrctx/N7VQ9gtFDwwZa18s1GnvwKZoxdMimzpVs Ho9RvtaIbTqG8LiRa2qjAAjZZJ5JbV7Dvi7ZfY7JW4N+86x+Y2L3wnQui+NBqLO74i8+1a 8kHe/kc1ACIdRzGTT9ngWF8FHQ4WHQ2p2EIIeKVo72QapyxgCe7UVS6zJsx4sqkq5q4Rxa YWipJe2CM6XbRan3ioOXTU8ZMsfB1f2AjSxjyY12UD31Ar7lXaKN4qvC4rCrW4eES8//yZ /LPUeocJHj6BJWW08C9j3kZqRc3c+1gHHxxFudXbdjtKuBcTewnJpDJu9i73Zw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694207973; a=rsa-sha256; cv=none; b=BcTVMoh50BCwS68qUwPMllJxKp46ibvSlvwAc9CVs5ppMAc1NGCQctMpuVns/AXj0aOqy1 mfPwGg2irCbQEpktJirPQFX/Iwwg0lT0qipeQI7HTD7fxLPrqHkE21IiF3qUh8Tdsw8IG/ pqqQ8VLfS44TfE/04X+f3XOBPvYNau9a2sVcNZ+88qcnFAJbgT6NTRLxs6DGu+30ZsIA10 1JFX+I9UnUfSG6HMr90bGuB1nW5HHg+qR0gDkcKe5tRqhFxkuXtrSY7WXEDd07p6ymcv5g eFDzo8CamApBMExV13kf6IV682Rp4Z32r7tZ2PT0mZIMap52uikvg/ybiz++6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694207973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sYF9AhziXGf2GKXGlfQ6yv8uXOCMdWPeQGGf81UM6Wg=; b=Jbatkcf/KxGbKxPbe7kv1kO6JhSacUOV9ELAumHOFE8V3CS9FMQDIbr6rR/crY0LgXP7cw gIDy/iN/s4espvnXJUFXqyrh5p0QuGWQUKwvlL4QrnBwXguuOdNklS2Kk90BrMZhMJO2wN iU4070l5difoHYWMeNTrwoskNmmCw4uOK8a6fZMWdkbHsYwEYSs876Fd34I85h5aFQTSPQ KvMgAtJH9NDJvLbc2OfyALAE6ujSvBtBFCiiRMll6fkiIe+Xnp3hEV+jvNfaYFVCCHirC0 BZ++ZiFiYojXH8IM7kO+E5ARUy8XdlQYpCmsR6hrSd65QzwTyab+OTE2kmzf0g== 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 4Rj8BY3WBnzxZV; Fri, 8 Sep 2023 21:19:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LJXYp041534; Fri, 8 Sep 2023 21:19:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LJXGu041531; Fri, 8 Sep 2023 21:19:33 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:19:33 GMT Message-Id: <202309082119.388LJXGu041531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 7ec2ae8c7cd4 - stable/14 - */string.3,arch.7,environ.7: add cross-references to simd(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ec2ae8c7cd4400d5c0db690a1fe43cf85b6c5d3 Auto-Submitted: auto-generated The branch stable/14 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7ec2ae8c7cd4400d5c0db690a1fe43cf85b6c5d3 commit 7ec2ae8c7cd4400d5c0db690a1fe43cf85b6c5d3 Author: Robert Clausecker AuthorDate: 2023-09-02 14:27:23 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:19:04 +0000 */string.3,arch.7,environ.7: add cross-references to simd(7) With the new simd-dispatch framework documented in simd(7), add cross-references to the new man pages to appropriate places. Sponsored by: The FreeBSD Foundation Approved by: emaste MFC to: stable/14 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41697 (cherry picked from commit d41afb814612ce005d93d2f8d127dcf6ea751cc4) --- lib/libc/string/string.3 | 5 +++-- share/man/man7/arch.7 | 5 +++-- share/man/man7/environ.7 | 12 ++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3 index a164aae01eec..b389c58acc07 100644 --- a/lib/libc/string/string.3 +++ b/lib/libc/string/string.3 @@ -29,7 +29,7 @@ .\" .\" @(#)string.3 8.2 (Berkeley) 12/11/93 .\" -.Dd December 11, 1993 +.Dd September 2, 2023 .Dt STRING 3 .Os .Sh NAME @@ -132,7 +132,8 @@ for size limitations. .Xr strsep 3 , .Xr strspn 3 , .Xr strstr 3 , -.Xr strtok 3 +.Xr strtok 3 , +.Xr simd 7 .Sh STANDARDS The .Fn strcat , diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 8e89203e4003..14c6af612087 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 12, 2023 +.Dd September 2, 2023 .Dt ARCH 7 .Os .Sh NAME @@ -431,7 +431,8 @@ it is unused outside of that scope. .El .Sh SEE ALSO .Xr src.conf 5 , -.Xr build 7 +.Xr build 7 , +.Xr simd 7 .Sh HISTORY An .Nm diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7 index 7e3437e7c6d4..8a927c0f9f3d 100644 --- a/share/man/man7/environ.7 +++ b/share/man/man7/environ.7 @@ -27,7 +27,7 @@ .\" .\" @(#)environ.7 8.3 (Berkeley) 4/19/94 .\" -.Dd August 5, 2020 +.Dd September 3, 2023 .Dt ENVIRON 7 .Os .Sh NAME @@ -66,6 +66,13 @@ are documented in the section of the appropriate manual page. .Sh ENVIRONMENT .Bl -tag -width LD_LIBRARY_PATH +.It Ev ARCHLEVEL +On +.Em amd64 , +controls the level of SIMD enhancements used. +See +.Xr simd 7 +for details. .It Ev BLOCKSIZE The size of the block units used by several disk-related commands, most notably @@ -305,7 +312,8 @@ built-in command in .Xr setlocale 3 , .Xr system 3 , .Xr termcap 3 , -.Xr termcap 5 +.Xr termcap 5 , +.Xr simd 7 .Sh HISTORY The .Nm From nobody Fri Sep 8 21:23:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8H346WTz4t8F5; Fri, 8 Sep 2023 21:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8H33fKTz3CTV; Fri, 8 Sep 2023 21:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4G6in0Rn9KMfeSCga2W+x6hlo1L2w6EbH+OsygOLwiw=; b=LRKHJn8hk8hPouq5gMw8JVLg0irQ9Q3lleqjnm203XSxgBY2jw9Z0RQrFkB7Ng64XUd+qU 7xLKHjTpgO2w3TEr0sdaFdSWzVBr+gO+B0Dcr2/ZcxSMHRljX7cWqFslraexzcHiJ26fQB ovbPB8LFoeMqWFD+cuuDtfEueOENetFLLrNiaTqn1ObcSpAPcY+3nJsxQ5+1ii6ew96urB RBmsbqB+q69gu9MwBxjHGZaSFi4VWe4+GjG/nMD7vRE8JBgSu8l7cSVhaiYxhqOW/HqZeY YL0AjhHXR3TepOmqjdCS4MnnTMkyfLtS06CSvmktLGgEJvYcy2xFJbZgcM7opw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208207; a=rsa-sha256; cv=none; b=FQps3kUX45kgAjMcZhFtgSV3eJY8I9+kQ8ixQST1u2FKjFH1PjhIgCXi7+kySRGuG316N4 /iZXuxuA//4zQMm29oNDT7wR2WoxOdxnEqs+1Q9mzfjpk1RVTpjIDrbNcGpff9SizKjHCG Us1yjWF4zQrd/gonQlHSDR0W/xiGeL3nn80QF04E5wbKJpNoU9MynPu8uMjm3gAP06NBaY 3hhfHfgZNtOicpgnTBa/OkUWUXExh5uvy0x6SbXnF6S4WDguWCcvODIM7EridAeN9S8z0P XMHakcrg+pEGqzPYcTR5YCOha+QZ6ntrwn25hUyp1RP3diEgbXP4d91urtrFVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4G6in0Rn9KMfeSCga2W+x6hlo1L2w6EbH+OsygOLwiw=; b=GvggBqb8g7gWzOrdtPXLAFYPWWEL40rEU7RsoDVeWWTqD+q6wG0V8QVSCacPdhXei/0Epy 8YUt/vCEBM+vG2eFvCQtwJSWTua7CUSC/pgf2KRt8AcUfa9nMo2SGOECScCbFWIaoWTHnr +CUH/DZPU3jXqAdbaURXEBd8MA6JGkEc3suuv0Uj6fOiZDYjy3M3k7gPB1ZnuZPdfqSHjV UEO2noEXawyz+wpjxVJNzfdxXtwWvo2EQd2oQwjq9Y1134vda+E70CIOdMKXPLYxBcP0Uh cdH6Xy4OW56F+QHe73sJhC8pZMv4Vw+sMxcGzRF/VyL/La1e0mQ41KSwOc41vQ== 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 4Rj8H32hKkzxlr; Fri, 8 Sep 2023 21:23:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNRWe057268; Fri, 8 Sep 2023 21:23:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNRtE057265; Fri, 8 Sep 2023 21:23:27 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:27 GMT Message-Id: <202309082123.388LNRtE057265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 474408bb7933 - main - lib/libc/amd64/string: add strcspn(3) scalar, x86-64-v2 implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 474408bb7933f0383a0da2b01e717bfe683ae77c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=474408bb7933f0383a0da2b01e717bfe683ae77c commit 474408bb7933f0383a0da2b01e717bfe683ae77c Author: Robert Clausecker AuthorDate: 2023-08-13 17:35:01 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:20:19 +0000 lib/libc/amd64/string: add strcspn(3) scalar, x86-64-v2 implementation This changeset adds both a scalar and an x86-64-v2 implementation of the strcspn(3) function to libc. A baseline implementation does not appear to be feasible given the requirements of the function. The scalar implementation is similar to the generic libc implementation, but expands the bit set into a byte set to reduce latency, improving performance. This approach could probably be backported to the generic C version to benefit other platforms. The x86-64-v2 implementation is built around the infamous pcmpistri instruction. An alternative implementation based on the Muła/Langdale algorithm [1] was prototyped, but performed worse than the pcmpistri approach except for sets of more than 16 characters with long input strings. All implementations provide special cases for the empty set (reduces to strlen as well as single-character sets (reduces to strchr). The x86-64-v2 kernel falls back to the scalar implementation for sets of more than 32 characters. This limit could be raised by additional multiples of 16 through the use of additional pcmpistri code paths, but I consider this case to be too rare to be of importance. [1]: http://0x80.pl/articles/simd-byte-lookup.html Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41557 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/strcspn.S | 368 +++++++++++++++++++++++++++++++++++++ 2 files changed, 369 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 4df4ff8f1417..f01a52d9ebea 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -10,5 +10,6 @@ MDSRCS+= \ strcat.S \ strchrnul.S \ strcmp.S \ + strcspn.S \ strlen.S \ strcpy.c diff --git a/lib/libc/amd64/string/strcspn.S b/lib/libc/amd64/string/strcspn.S new file mode 100644 index 000000000000..de409db6d472 --- /dev/null +++ b/lib/libc/amd64/string/strcspn.S @@ -0,0 +1,368 @@ +/* + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + +ARCHFUNCS(strcspn) + ARCHFUNC(strcspn, scalar) + NOARCHFUNC + ARCHFUNC(strcspn, x86_64_v2) +ENDARCHFUNCS(strcspn) + +ARCHENTRY(strcspn, scalar) + push %rbp # align stack to enable function call + mov %rsp, %rbp + sub $256, %rsp # allocate space for lookup table + + /* check for special cases */ + movzbl (%rsi), %eax # first character in the set + test %eax, %eax + jz .Lstrlen + + movzbl 1(%rsi), %edx # second character in the set + test %edx, %edx + jz .Lstrchr + + /* no special case matches -- prepare lookup table */ + xor %r8d, %r8d + mov $28, %ecx +0: mov %r8, (%rsp, %rcx, 8) + mov %r8, 8(%rsp, %rcx, 8) + mov %r8, 16(%rsp, %rcx, 8) + mov %r8, 24(%rsp, %rcx, 8) + sub $4, %ecx + jnc 0b + + add $2, %rsi + movb $1, (%rsp, %rax, 1) # register first chars in set + movb $1, (%rsp, %rdx, 1) + mov %rdi, %rax # a copy of the source to iterate over + + /* process remaining chars in set */ + ALIGN_TEXT +0: movzbl (%rsi), %ecx + movb $1, (%rsp, %rcx, 1) + test %ecx, %ecx + jz 1f + + movzbl 1(%rsi), %ecx + movb $1, (%rsp, %rcx, 1) + test %ecx, %ecx + jz 1f + + add $2, %rsi + jmp 0b + + /* find match */ + ALIGN_TEXT +1: movzbl (%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + jne 2f + + movzbl 1(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + jne 3f + + movzbl 2(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + jne 4f + + movzbl 3(%rax), %ecx + add $4, %rax + cmpb $0, (%rsp, %rcx, 1) + je 1b + + sub $3, %rax +4: dec %rdi +3: inc %rax +2: sub %rdi, %rax # number of characters preceding match + leave + ret + + /* set is empty, degrades to strlen */ +.Lstrlen: + leave + jmp CNAME(strlen) + + /* just one character in set, degrades to strchr */ +.Lstrchr: + mov %rdi, (%rsp) # stash a copy of the string + mov %eax, %esi # find the character in the set + call CNAME(strchrnul) + sub (%rsp), %rax # length of prefix before match + leave + ret +ARCHEND(strcspn, scalar) + + /* + * This kernel uses pcmpistri to do the heavy lifting. + * We provide five code paths, depending on set size: + * + * 0: call strlen() + * 1: call strchr() + * 2--16: one pcmpistri per 16 bytes of input + * 17--32: two pcmpistri per 16 bytes of input + * >=33: fall back to look up table + */ +ARCHENTRY(strcspn, x86_64_v2) + push %rbp + mov %rsp, %rbp + sub $256, %rsp + + /* check for special cases */ + movzbl (%rsi), %eax + test %eax, %eax # empty string? + jz .Lstrlenv2 + + cmpb $0, 1(%rsi) # single character string? + jz .Lstrchrv2 + + /* find set size and copy up to 32 bytes to (%rsp) */ + mov %esi, %ecx + and $~0xf, %rsi # align set pointer + movdqa (%rsi), %xmm0 + pxor %xmm1, %xmm1 + and $0xf, %ecx # amount of bytes rsi is past alignment + xor %edx, %edx + pcmpeqb %xmm0, %xmm1 # end of string reached? + movdqa %xmm0, 32(%rsp) # transfer head of set to stack + pmovmskb %xmm1, %eax + shr %cl, %eax # clear out junk before string + test %eax, %eax # end of set reached? + jnz 0f + + movdqa 16(%rsi), %xmm0 # second chunk of the set + mov $16, %edx + sub %ecx, %edx # length of set preceding xmm0 + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 + movdqa %xmm0, 48(%rsp) + movdqu 32(%rsp, %rcx, 1), %xmm2 # head of set + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 1f + + movdqa 32(%rsi), %xmm0 # third chunk + add $16, %edx + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 + movdqa %xmm0, 64(%rsp) + pmovmskb %xmm1, %eax + test %eax, %eax # still not done? + jz .Lgt32v2 + +0: movdqu 32(%rsp, %rcx, 1), %xmm2 # head of set +1: tzcnt %eax, %eax + add %eax, %edx # length of set (excluding NUL byte) + cmp $32, %edx # above 32 bytes? + ja .Lgt32v2 + + /* + * At this point we know that we want to use pcmpistri. + * one last problem obtains: the head of the string is not + * aligned and may cross a cacheline. If this is the case, + * we take the part before the page boundary and repeat the + * last byte to fill up the xmm register. + */ + mov %rdi, %rax # save original string pointer + lea 15(%rdi), %esi # last byte of the head + xor %edi, %esi + test $PAGE_SIZE, %esi # does the head cross a page? + jz 0f + + /* head crosses page: copy to stack to fix up */ + and $~0xf, %rax # align head pointer temporarily + movzbl 15(%rax), %esi # last head byte on the page + movdqa (%rax), %xmm0 + movabs $0x0101010101010101, %r8 + imul %r8, %rsi # repeated 8 times + movdqa %xmm0, (%rsp) # head word on stack + mov %rsi, 16(%rsp) # followed by filler (last byte x8) + mov %rsi, 24(%rsp) + mov %edi, %eax + and $0xf, %eax # offset of head from alignment + add %rsp, %rax # pointer to fake head + +0: movdqu (%rax), %xmm0 # load head (fake or real) + lea 16(%rdi), %rax + and $~0xf, %rax # second 16 bytes of string (aligned) +1: cmp $16, %edx # 16--32 bytes? + ja .Lgt16v2 + + + /* set is 2--16 bytes in size */ + + /* _SIDD_UBYTE_OPS|_SIDD_CMP_EQUAL_ANY|_SIDD_LEAST_SIGNIFICANT */ + pcmpistri $0, %xmm0, %xmm2 # match in head? + jbe .Lheadmatchv2 + + ALIGN_TEXT +0: pcmpistri $0, (%rax), %xmm2 + jbe 1f # match or end of string? + pcmpistri $0, 16(%rax), %xmm2 + lea 32(%rax), %rax + ja 0b # match or end of string? + +3: lea -16(%rax), %rax # go back to second half +1: jc 2f # jump if match found + movdqa (%rax), %xmm0 # reload string piece + pxor %xmm1, %xmm1 + pcmpeqb %xmm1, %xmm0 # where is the NUL byte? + pmovmskb %xmm0, %ecx + tzcnt %ecx, %ecx # location of NUL byte in (%rax) +2: sub %rdi, %rax # offset of %xmm0 from beginning of string + add %rcx, %rax # prefix length before match/NUL + leave + ret + +.Lheadmatchv2: + jc 2f # jump if match found + pxor %xmm1, %xmm1 + pcmpeqb %xmm1, %xmm0 + pmovmskb %xmm0, %ecx + tzcnt %ecx, %ecx # location of NUL byte +2: mov %ecx, %eax # prefix length before match/NUL + leave + ret + +.Lgt16v2: + movdqu 48(%rsp, %rcx, 1), %xmm3 # second part of set + + /* set is 17--32 bytes in size */ + pcmpistri $0, %xmm0, %xmm2 # match in head? + jbe .Lheadmatchv2 + pcmpistri $0, %xmm0, %xmm3 # ZF=1 not possible here + jb .Lheadmatchv2 + + ALIGN_TEXT +0: movdqa (%rax), %xmm0 + pcmpistri $0, %xmm0, %xmm2 + jbe 1b + pcmpistri $0, %xmm0, %xmm3 + jb 1f # ZF=1 not possible here + movdqa 16(%rax), %xmm0 + add $32, %rax + pcmpistri $0, %xmm0, %xmm2 + jbe 3b + pcmpistri $0, %xmm0, %xmm3 + jae 0b # ZF=1 not possible here + + sub $16, %rax # go back to second half +1: add %rcx, %rax + sub %rdi, %rax + leave + ret + + /* set is empty, degrades to strlen */ +.Lstrlenv2: + leave + jmp CNAME(strlen) + + /* just one character in set, degrades to strchr */ +.Lstrchrv2: + mov %rdi, (%rsp) # stash a copy of the string + mov %eax, %esi # find this character + call CNAME(strchrnul) + sub (%rsp), %rax # length of prefix before match + leave + ret + + /* set is >=33 bytes in size */ +.Lgt32v2: + xorps %xmm0, %xmm0 + mov $256-64, %edx + + /* clear out look up table */ +0: movaps %xmm0, (%rsp, %rdx, 1) + movaps %xmm0, 16(%rsp, %rdx, 1) + movaps %xmm0, 32(%rsp, %rdx, 1) + movaps %xmm0, 48(%rsp, %rdx, 1) + sub $64, %edx + jnc 0b + + add %rcx, %rsi # restore string pointer + mov %rdi, %rax # keep a copy of the string + + /* initialise look up table */ + ALIGN_TEXT +0: movzbl (%rsi), %ecx + movb $1, (%rsp, %rcx, 1) + test %ecx, %ecx + jz 1f + + movzbl 1(%rsi), %ecx + movb $1, (%rsp, %rcx, 1) + test %ecx, %ecx + jz 1f + + movzbl 2(%rsi), %ecx + movb $1, (%rsp, %rcx, 1) + test %ecx, %ecx + jz 1f + + movzbl 3(%rsi), %ecx + movb $1, (%rsp, %rcx, 1) + test %ecx, %ecx + jz 1f + + add $4, %rsi + jmp 0b + + /* find match */ + ALIGN_TEXT +1: movzbl (%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + jne 2f + + movzbl 1(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + jne 3f + + movzbl 2(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + jne 4f + + movzbl 3(%rax), %ecx + add $4, %rax + cmpb $0, (%rsp, %rcx, 1) + je 1b + + sub $3, %rax +4: dec %rdi +3: inc %rax +2: sub %rdi, %rax # number of characters preceding match + leave + ret +ARCHEND(strcspn, x86_64_v2) + + .section .note.GNU-stack,"",%progbits From nobody Fri Sep 8 21:23:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8H45Mn8z4t8LC; Fri, 8 Sep 2023 21:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8H44XkTz3CnM; Fri, 8 Sep 2023 21:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avN4LaONcAfLhQPqsq8/DMKWA+1yQyEfLNgz7SqIiXg=; b=ZPiSCApkoiti8dj5EkoZFD+Q+16JmEAvZCJv62rK6UGuGV4710NEWDpLKPoCiREhZr1DzF tTC7EBBUlsqTvSw+4Jm9at5FqSJ/QydO/lhhcTE/BqYyA/DnpL0EZxVZTjsSZTXMXAptWT /tf5P8MabbcWhTynLBlsyyb9O/qcIclK4xMEZhJzk8UNHjyh3gfEYGPKs8dRzK44csvsOV ubzTlxYyQ74V0OtZVEcXhwKoVkqVOKd3TQ1AYWsi9Lo/tlVpZVJqWpsJkWYxJis/lIiXLY 14qHPW8nLIGn8qmgfIEq0dpa1Y1YjUSUR0Esx823+rvd5n8KafcgcHpEBFbpeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208208; a=rsa-sha256; cv=none; b=S7bGhRm6hlOlj460P7bopM/57bRbZua96/bgUcT7CYiRRxAYsOcDYg+hkWYywNFe2dwYOf 87vn2fntcCN+om3NJk1RUTXtc0gcWr9Eg4LfBfhvjsTKcfZduBS+/0L+K4ancczkoOtBGW hUfK3v5PZa7UgjO+IpKmVPlp5JOBZciYtSv3Q2KQP7kDcFt5YTiCKV4cTEsLCpZoPhsmcz gC0JyGrtY6UYeElJyXh31JAO08Nk5zkcAAatt+zkx21tkAmBDSqmuGTQhcD1jOkylTjw5X 9yU6fxexurWLp+wGl/yAVdL3kVZ2cdF0oU/mzYppcT7EdVpKLAGwLdu6E0pqbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=avN4LaONcAfLhQPqsq8/DMKWA+1yQyEfLNgz7SqIiXg=; b=I2LdCi/tE7l2RTEBQpNx1uCcj/YSQDd3pa4gBHOn/NdJk7OP9qq7/2vP/HoZrwXt4q3kQa 9pm/4OsICm2o/hMY4IXRNQJHADfJEIZZfqJatqPh1NL7NC2/yTWze//hF2DqNOqEacNUbH Wz5J1afoELE+HtuoJ4vx7Ldnok6EgeuKf7J5bv1M3lhfzLXx3dJJdLOkjkNS1Ne+Isuvko AyMs/9maHTvas8IOvCfHPGVce7ttzjtCuWhYENECghCWRJSlE2QgkrKcAiQLsA36+SPROK eckegnlaEKeRFeCqMasgUfthPGxSmcU2hPMHOQ6hBdA1v/GEKFoI/BksRLicLg== 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 4Rj8H43QThzy5G; Fri, 8 Sep 2023 21:23:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNSRs057310; Fri, 8 Sep 2023 21:23:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNST3057307; Fri, 8 Sep 2023 21:23:28 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:28 GMT Message-Id: <202309082123.388LNST3057307@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 5fe2597b2319 - main - share/man/man7/simd.7: document simd-enhanced strcspn(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fe2597b23191d49856b1739eef29e383872faf9 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5fe2597b23191d49856b1739eef29e383872faf9 commit 5fe2597b23191d49856b1739eef29e383872faf9 Author: Robert Clausecker AuthorDate: 2023-08-20 21:31:32 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:20:19 +0000 share/man/man7/simd.7: document simd-enhanced strcspn(3) Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41557 --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index bf33d4eb5531..efa1306898ca 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 13, 2023 +.Dd August 14, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -69,6 +69,7 @@ Enhanced functions are present in the following architectures: .It strchrnul Ta Ta Ta S1 .It strcmp Ta Ta S Ta S Ta S .It strcpy Ta Ta Ta S1 Ta S Ta S2 +.It strcspn Ta Ta Ta S2 .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta Ta S .It strncpy Ta Ta Ta Ta Ta S2 From nobody Fri Sep 8 21:23:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8H56jP9z4t8F9; Fri, 8 Sep 2023 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8H55YJlz3Cgw; Fri, 8 Sep 2023 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/sMElcyTjfmuyE6/rI234JPNaCMw/0V3NG4Cg4UfYrM=; b=lO581briQ0a6/9cyKeklgv9m5emDmgQoLv0ObBDbKhqMUbvmsCGFt04LLmeGTAWtVR4dW2 kVmS7MhuEex/7ABt9+avvkiClh1BxDQOtzlLiSrQF/+19Tv9GCXtfSGzTJbWyHPL07TPYE mP9Nk8UVhQ3OCWkUh7Ux73L+58KoRwOFunH1zZayF0+x2wEDZuYkvuXKGyqVTLtbOfD3Jq 50aiPUxci0p2xiLOnSE2Cwhg8RsP7IlJqTKq1eRAUgA2pWjhFu2oVRdRhbmZY59vwh+NNJ af7anXzTSM2y0HyUQn0JzFVsdOvx27JtuVFZvq0bbjYzyflRQRIsEpsDxbJmag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208209; a=rsa-sha256; cv=none; b=aJCWWi3lfxANyXRD6BUzd+eTUWB37VmJgnSyIteadHgUpr95w0wyHKe9pgS44lltVePuC8 4NBTL+tqH9Nu1FgSkKC6U7t+suoo6HEwZzKRa6NBOQkCtwGf+vtBLNItBRyEjPKBvP/jPD SdTsEorxYVEem4acFjb5D1VvzO3HC8tKhDwMm2k/gnGya7a9Iq5xR1sb3g+pQd9dXexdzd rcG2YCextM3KA6iZ1PYsi5TLk5K1uyINwJWWbxQ6h0a2tonjmyDU1jczxSbG+/8hYT/zH0 3mdcHOrObIc7qVsJu1C8c70WuGHKXmGgICvcXA9fB5xSI0TbxF9cPiJeiIViHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/sMElcyTjfmuyE6/rI234JPNaCMw/0V3NG4Cg4UfYrM=; b=kc2/rvayN/c2iWDjRt47Xt99UdzYU2KWrJog+x32bbZvb48T5SCI3UQmjER6J5mPgCivxx s7f49tc+tkyxsT5abymlaAfy4t2NitNouM0hTy7f1lAYacQ/713xdT5YGcqZFFHImYQHSy bjMdo2kNETpGmJQ//JKFtJY/rheeW+wZm2A7HqSpibgUfbkLxqXNn8hEpH6vK+suKGbdU3 mJxXAEBvqveRDUrO9m9spM50E/v6P6++FtX6IVSZvAuNG5hSMbE9TW9/SRebqp52mdV41r LN9fb+8WcOnPxJrj1JRfggi9j0RAq/PBIBVkmX2PMsw66u1KTtAiiL3+pdi6Xg== 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 4Rj8H54Qpyzy5H; Fri, 8 Sep 2023 21:23:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNTFd057355; Fri, 8 Sep 2023 21:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNT3j057352; Fri, 8 Sep 2023 21:23:29 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:29 GMT Message-Id: <202309082123.388LNT3j057352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 35a5359406fe - main - lib/libc/tests/string: add unit tests for strcspn(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35a5359406fe779186d1fd7131c95927fefe20be Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=35a5359406fe779186d1fd7131c95927fefe20be commit 35a5359406fe779186d1fd7131c95927fefe20be Author: Robert Clausecker AuthorDate: 2023-08-20 22:48:41 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:21:31 +0000 lib/libc/tests/string: add unit tests for strcspn(3) We currently use the NetBSD test suite to cover strcspn(3). It only contains a very rudimentary test of this function. This all new set of unit tests for the FreeBSD test suite should cover many more edge cases relating to alignment issues. Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41557 --- lib/libc/tests/string/Makefile | 2 +- lib/libc/tests/string/strcspn_test.c | 137 +++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index a7545b75e0e9..639b7f2d2d2d 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -11,6 +11,7 @@ ATF_TESTS_C+= flsll_test ATF_TESTS_C+= memcmp_test ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= stpncpy_test +ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test @@ -29,7 +30,6 @@ NETBSD_ATF_TESTS_C+= strchr_test NETBSD_ATF_TESTS_C+= strchrnul_test NETBSD_ATF_TESTS_C+= strcmp_test NETBSD_ATF_TESTS_C+= strcpy_test -NETBSD_ATF_TESTS_C+= strcspn_test NETBSD_ATF_TESTS_C+= strerror_test NETBSD_ATF_TESTS_C+= strlen_test NETBSD_ATF_TESTS_C+= strpbrk_test diff --git a/lib/libc/tests/string/strcspn_test.c b/lib/libc/tests/string/strcspn_test.c new file mode 100644 index 000000000000..59da497c16c6 --- /dev/null +++ b/lib/libc/tests/string/strcspn_test.c @@ -0,0 +1,137 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include + +#include +#include +#include +#include +#include +#include + +enum { + MAXALIGN = 16, /* test all offsets from this alignment */ + MAXBUF = 64, /* test up to this buffer length */ +}; + +enum { NOMATCH, MATCH }; + +static void +testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match) +{ + size_t i, outcome, expected; + + assert(setlen < UCHAR_MAX - 2); + + for (i = 0; i < buflen; i++) + buf[i] = 1 + i % (UCHAR_MAX - setlen - 1); + + buf[i] = '\0'; + + for (i = 0; i < setlen; i++) + set[i] = UCHAR_MAX - i; + + set[i] = '\0'; + + if (want_match == MATCH && buflen > 0 && setlen > 0) { + buf[buflen - 1] = UCHAR_MAX; + expected = buflen - 1; + } else + expected = buflen; + + outcome = strcspn(buf, set); + ATF_CHECK_EQ_MSG(expected, outcome, "strcspn(%p[%zu], %p[%zu]) = %zu != %zu", + buf, buflen, set, setlen, outcome, expected); +} + +/* test set with all alignments and lengths of buf */ +static void +test_buf_alignments(char *set, size_t setlen, int want_match) +{ + char buf[MAXALIGN + MAXBUF + 1]; + size_t i, j; + + for (i = 0; i < MAXALIGN; i++) + for (j = 0; j <= MAXBUF; j++) + testcase(buf + i, j, set, setlen, want_match); +} + +/* test buf with all alignments and lengths of set */ +static void +test_set_alignments(char *buf, size_t buflen, int want_match) +{ + char set[MAXALIGN + MAXBUF + 1]; + size_t i, j; + + for (i = 0; i < MAXALIGN; i++) + for (j = 0; j <= MAXBUF; j++) + testcase(buf, buflen, set + i, j, want_match); +} + +ATF_TC_WITHOUT_HEAD(buf_alignments); +ATF_TC_BODY(buf_alignments, tc) +{ + char set[41]; + + test_buf_alignments(set, 0, MATCH); + test_buf_alignments(set, 1, MATCH); + test_buf_alignments(set, 5, MATCH); + test_buf_alignments(set, 20, MATCH); + test_buf_alignments(set, 40, MATCH); + + test_buf_alignments(set, 0, NOMATCH); + test_buf_alignments(set, 1, NOMATCH); + test_buf_alignments(set, 5, NOMATCH); + test_buf_alignments(set, 20, NOMATCH); + test_buf_alignments(set, 40, NOMATCH); +} + +ATF_TC_WITHOUT_HEAD(set_alignments); +ATF_TC_BODY(set_alignments, tc) +{ + char buf[31]; + + test_set_alignments(buf, 0, MATCH); + test_set_alignments(buf, 10, MATCH); + test_set_alignments(buf, 20, MATCH); + test_set_alignments(buf, 30, MATCH); + + test_set_alignments(buf, 0, NOMATCH); + test_set_alignments(buf, 10, NOMATCH); + test_set_alignments(buf, 20, NOMATCH); + test_set_alignments(buf, 30, NOMATCH); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, buf_alignments); + ATF_TP_ADD_TC(tp, set_alignments); + + return (atf_no_error()); +} From nobody Fri Sep 8 21:23:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8H70Lyyz4t8LQ; Fri, 8 Sep 2023 21:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8H66JMyz3D0R; Fri, 8 Sep 2023 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KAYwcaLAaxOKKnuEwXN2ojpuGmfFpXaJFzw/ZzhYTho=; b=wmOEu+csf34zpoFWNqxww5BhzLHl2m9iuTNxgfhEn0Bf25ubIl9G1GpS4XtmBh4/VmnGXE IUSHPF3iJ2AAqu7ERE6dWfvljkgBdi2jZVd4zzAX8vwcEFP3HWj4QGdZAai7JEYMKMxN5/ hL0tn0wCLyC9XY1QMmYtLYHy1NQUxJYUaRLIdRWTRR95pfiKZzRL56FjS6jzGjfmPsefUi yf27gzoLvRyFnUvZOBQXw7H/i7+UmbH4OfhiqhTOJhi9dCbiWTZB5oW7y+Q2EDFsfBOl8L Bw1AVgWLJKM9567geECih7ojs6xrDGXvLit7A9/5K+NjPMvIG2ZAbm9NAgadAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208211; a=rsa-sha256; cv=none; b=BgygDXxfRZcCR+mI0ZwfHv0vm3AtbYtklFghbM50Ykovgcuk27qDp4330NDgc4qtFNF+Gp TSNeRtBKs9tug+3wdqbvX8M8H5H3wSHb6ooO49fxfscIelVcHPKot5Kt3eMPA7uPMr666c A0unCxhLLOYVyFzYTd7eCbBug1GMt4KdDAQoanY0a+qwTdbz9bB6RwWH+2/dV9LgQ7Yk1v yz25WhEdW5B+wrERldMQDyFZ/aJXhseDFiywwJ2/4dLJ8RZzj9Lbtcn9XrnZsoR90UxdaL aJLj7nsYtfFOcd7me754ukgCOke1sq5D9o9sshEm30Pp/bX069P3vjl66SkvlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KAYwcaLAaxOKKnuEwXN2ojpuGmfFpXaJFzw/ZzhYTho=; b=KcAdrGapVY6eTu5XWlD6jM6WveAaK1a4hSQ8T1Mn470E+iOsBYSYbbLop8dLefAQjUUsGw QQXD40YMzNJjuwGopJ5vOFrPUNaQY8PVQ8ABE5/T1hclhffl3uSmN3CAHF8vHn1HPhG+rb j6R81JU2undwPgpOwE7XapsBnlBLi9C1fGIh3W8z4tPSNWQ7k7q3XPDzdou51SNEevJh+s 0TmvNEaHZoC5QGg5tDL5OPJlPgIRWXVCvBIr4T1LaJkH8WCPmOQJJzfCHEUrnXkgt3AvKN 0VWhKr4y+Le+4cDZJmY9wiuiDgtfbroIOWid1zsIE4knuwWSTsqs6kc/RC6KRw== 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 4Rj8H65GnFzxtK; Fri, 8 Sep 2023 21:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNUY1057403; Fri, 8 Sep 2023 21:23:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNU2v057400; Fri, 8 Sep 2023 21:23:30 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:30 GMT Message-Id: <202309082123.388LNU2v057400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 468adddd75f6 - main - lib/libc/tests/string: derive strspn(3) tests from strcspn(3) tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 468adddd75f6461fcdd2151122d85879ec592a5b Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=468adddd75f6461fcdd2151122d85879ec592a5b commit 468adddd75f6461fcdd2151122d85879ec592a5b Author: Robert Clausecker AuthorDate: 2023-08-21 15:30:23 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:21:59 +0000 lib/libc/tests/string: derive strspn(3) tests from strcspn(3) tests To cover the new optimised amd64 strspn(3) SIMD implementation, extend the previously written strcspn(3) unit test to also cover strspn(3). Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41567 --- lib/libc/tests/string/Makefile | 2 +- lib/libc/tests/string/strcspn_test.c | 26 +++++++++++++++++++++++--- lib/libc/tests/string/strspn_test.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index 639b7f2d2d2d..1994b128ab57 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -13,6 +13,7 @@ ATF_TESTS_C+= memset_s_test ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strcspn_test ATF_TESTS_C+= strerror2_test +ATF_TESTS_C+= strspn_test ATF_TESTS_C+= strverscmp_test ATF_TESTS_C+= strxfrm_test ATF_TESTS_C+= wcscasecmp_test @@ -34,7 +35,6 @@ NETBSD_ATF_TESTS_C+= strerror_test NETBSD_ATF_TESTS_C+= strlen_test NETBSD_ATF_TESTS_C+= strpbrk_test NETBSD_ATF_TESTS_C+= strrchr_test -NETBSD_ATF_TESTS_C+= strspn_test NETBSD_ATF_TESTS_C+= swab_test SRCS.strerror2_test= strerror_test.c diff --git a/lib/libc/tests/string/strcspn_test.c b/lib/libc/tests/string/strcspn_test.c index 59da497c16c6..abacdcbbf18a 100644 --- a/lib/libc/tests/string/strcspn_test.c +++ b/lib/libc/tests/string/strcspn_test.c @@ -42,6 +42,12 @@ enum { enum { NOMATCH, MATCH }; +#ifdef STRSPN +#define STRXSPN strspn +#else +#define STRXSPN strcspn +#endif + static void testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match) { @@ -50,7 +56,11 @@ testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match) assert(setlen < UCHAR_MAX - 2); for (i = 0; i < buflen; i++) +#ifdef STRSPN + buf[i] = UCHAR_MAX - i % (setlen > 0 ? setlen : 1); +#else /* strcspn */ buf[i] = 1 + i % (UCHAR_MAX - setlen - 1); +#endif buf[i] = '\0'; @@ -59,15 +69,25 @@ testcase(char *buf, size_t buflen, char *set, size_t setlen, int want_match) set[i] = '\0'; +#ifdef STRSPN + if (setlen == 0) + expected = 0; + else if (want_match == MATCH && buflen > 0) { + buf[buflen - 1] = 1; + expected = buflen - 1; + } else + expected = buflen; +#else /* strcspn */ if (want_match == MATCH && buflen > 0 && setlen > 0) { buf[buflen - 1] = UCHAR_MAX; expected = buflen - 1; } else expected = buflen; +#endif - outcome = strcspn(buf, set); - ATF_CHECK_EQ_MSG(expected, outcome, "strcspn(%p[%zu], %p[%zu]) = %zu != %zu", - buf, buflen, set, setlen, outcome, expected); + outcome = STRXSPN(buf, set); + ATF_CHECK_EQ_MSG(expected, outcome, "%s(%p[%zu], %p[%zu]) = %zu != %zu", + __XSTRING(STRXSPN), buf, buflen, set, setlen, outcome, expected); } /* test set with all alignments and lengths of buf */ diff --git a/lib/libc/tests/string/strspn_test.c b/lib/libc/tests/string/strspn_test.c new file mode 100644 index 000000000000..73a08ddefa1b --- /dev/null +++ b/lib/libc/tests/string/strspn_test.c @@ -0,0 +1,30 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#define STRSPN +#include "strcspn_test.c" From nobody Fri Sep 8 21:23:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8H81Q8pz4t8FN; Fri, 8 Sep 2023 21:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8H8048Sz3D38; Fri, 8 Sep 2023 21:23:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCPFBjjsw62JnmDVqZqibJJvSZwsdYrIJDGhpO/3pMc=; b=jN+fhIZwQvMTJTyNysNAI72DNmAxZKuDfdQ3J/Z1H3ATfrjWro68JLXzmzUSgslwxDiA3H tQUJQDIA2RLauYJtpyOSn9nbvboNtZcjSSCdU0l1clPaGOClJe+sa8if72beNwolu7i3yo qzt/IC9kcQje1ARuUNWwpbdqISY0/B206OWf01R+Tiu66OsUS938zcVmM/jHpVxUHg9SbO +M7c4boOTveXskrEcoaM0FNyF8GsT6mLa0QZQpF/kAjZLxJJaLfWzsF0o1r3n4ZNSsUR3y P9DtWDC3gZNKKM5nbHsZFr8aGQ6TUYeMhy9FDFF3iMvU0C2NeMKHljAKvnJ5Rw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208212; a=rsa-sha256; cv=none; b=YrVL1YDzjVsaHp6A8U+SNuh4tgK5PmlHB6Mr/XPI2/1rZmrFiJNTW5oFtdLBhNKA9i+S2j pt8TMmysaLGR29Ee68u811PxRf5y1JiLM1MnYaAiAHwYcgwyA9W6BbTULrWAHtpKyfRiKO HyZyNS5fxExSveTmVeFM1jh2JEVYJ4EMn2HoZWK25xvmQMi9wp/bUG24LI2/3T9L3e1jFc /bAfeC0dT/JCZFkspnlVAHIxT30I1wxACv4SFiBDfp6gg3qDYQ8gG9jGUMHudX0fnLDoNl yAAFWq8u0C/+OEMLUyBgZ8701eyY5OvF03B9IPrr0c5s+E4KvDPo5cVpl/PBIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HCPFBjjsw62JnmDVqZqibJJvSZwsdYrIJDGhpO/3pMc=; b=og7gyCNq8UWEqo7LPyEXRmRwEv4sYkOBeLePizCwdasCon84gfpYWnHgj2eaFMUPVKMGgb p48SZ6eGV9+pxYvB0IJdVtwWhVXoGt4trf+5t1lctd/F7xyOD9bRU1rOo42ns1ITBn6phP yAszIdM5Bahgt3knVM5RKJfABEzLtBphCSI3e1QAkJDr/GSkL+cuTgMz62jFbX5rVr/Z/g us4kUW0YbcWMoK6PR31KKXNOpQtdrJOe+VFrR/XT+eqh7vnWXUiNUFM6ns7WmmTspSfYjk DDTfEi2+D0jru55Z6euOy7rXHOyjfX4pX6C0S+d27wNIpiIna1LaTYKt5wxUEg== 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 4Rj8H76D2dzy7m; Fri, 8 Sep 2023 21:23:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNVVS057451; Fri, 8 Sep 2023 21:23:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNVNw057447; Fri, 8 Sep 2023 21:23:31 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:31 GMT Message-Id: <202309082123.388LNVNw057447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 7084133cde6a - main - lib/libc/amd64/string: add strspn(3) scalar, x86-64-v2 implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7084133cde6a58412d86bae9f8a55b86141fb304 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=7084133cde6a58412d86bae9f8a55b86141fb304 commit 7084133cde6a58412d86bae9f8a55b86141fb304 Author: Robert Clausecker AuthorDate: 2023-08-21 16:06:42 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:21:59 +0000 lib/libc/amd64/string: add strspn(3) scalar, x86-64-v2 implementation This is conceptually very similar to the strcspn(3) implementations from D41557, but we can't do the fast paths the same way. Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41567 --- lib/libc/amd64/string/Makefile.inc | 3 +- lib/libc/amd64/string/strspn.S | 358 +++++++++++++++++++++++++++++++++++++ 2 files changed, 360 insertions(+), 1 deletion(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index f01a52d9ebea..b03811f40062 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -12,4 +12,5 @@ MDSRCS+= \ strcmp.S \ strcspn.S \ strlen.S \ - strcpy.c + strcpy.c \ + strspn.S diff --git a/lib/libc/amd64/string/strspn.S b/lib/libc/amd64/string/strspn.S new file mode 100644 index 000000000000..565330f0c385 --- /dev/null +++ b/lib/libc/amd64/string/strspn.S @@ -0,0 +1,358 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + +ARCHFUNCS(strspn) + ARCHFUNC(strspn, scalar) + NOARCHFUNC + ARCHFUNC(strspn, x86_64_v2) +ENDARCHFUNCS(strspn) + +ARCHENTRY(strspn, scalar) + push %rbp # align stack to enable function call + mov %rsp, %rbp + sub $256, %rsp # allocate space for lookup table + + /* check for special cases */ + movzbl (%rsi), %edx # first character in the set + test %edx, %edx + jz .Lzero # empty set always returns 0 + + movzbl 1(%rsi), %eax # second character in the set + test %eax, %eax + jz .Lsingle + + /* no special case matches -- prepare lookup table */ + xor %r8d, %r8d + mov $28, %ecx +0: mov %r8, (%rsp, %rcx, 8) + mov %r8, 8(%rsp, %rcx, 8) + mov %r8, 16(%rsp, %rcx, 8) + mov %r8, 24(%rsp, %rcx, 8) + sub $4, %ecx + jnc 0b + + movb $1, (%rsp, %rdx, 1) # register first char in set + add $2, %rsi + + /* process remaining chars in set */ + ALIGN_TEXT +0: movb $1, (%rsp, %rax, 1) # register previous char + movzbl (%rsi), %eax # next char in set + test %eax, %eax # end of string? + jz 1f + + movb $1, (%rsp, %rax, 1) + add $2, %rsi + movzbl -1(%rsi), %eax + test %eax, %eax + jnz 0b + +1: mov %rdi, %rax # a copy of the source to iterate over + + /* find mismatch */ + ALIGN_TEXT +0: movzbl (%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + je 2f + + movzbl 1(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + je 3f + + movzbl 2(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + je 4f + + movzbl 3(%rax), %ecx + add $4, %rax + cmpb $0, (%rsp, %rcx, 1) + jne 0b + + sub $3, %rax +4: dec %rdi +3: inc %rax +2: sub %rdi, %rax # number of characters preceding match + leave + ret + + /* empty set never matches */ +.Lzero: xor %eax, %eax + leave + ret + + /* find repeated single character */ + ALIGN_TEXT +.Lsingle: + cmpb %dl, (%rdi, %rax, 1) + jne 1f + + cmpb %dl, 1(%rdi, %rax, 1) + jne 2f + + cmpb %dl, 2(%rdi, %rax, 1) + jne 3f + + cmpb %dl, 3(%rdi, %rax, 1) + lea 4(%rax), %rax + je .Lsingle + + sub $3, %rax +3: inc %rax +2: inc %rax +1: leave + ret +ARCHEND(strspn, scalar) + + /* + * This kernel uses pcmpistri to do the heavy lifting. + * We provide three code paths, depending on set size: + * + * 0--16: one pcmpistri per 16 bytes of input + * 17--32: two pcmpistri per 16 bytes of input + * >=33: fall back to look up table + */ +ARCHENTRY(strspn, x86_64_v2) + push %rbp + mov %rsp, %rbp + sub $256, %rsp + + /* find set size and copy up to 32 bytes to (%rsp) */ + mov %esi, %ecx + and $~0xf, %rsi # align set pointer + movdqa (%rsi), %xmm0 + pxor %xmm1, %xmm1 + and $0xf, %ecx # amount of bytes rsi is past alignment + xor %edx, %edx + pcmpeqb %xmm0, %xmm1 # end of string reached? + movdqa %xmm0, 32(%rsp) # transfer head of set to stack + pmovmskb %xmm1, %eax + shr %cl, %eax # clear out junk before string + test %eax, %eax # end of set reached? + jnz 0f + + movdqa 16(%rsi), %xmm0 # second chunk of the set + mov $16, %edx + sub %ecx, %edx # length of set preceding xmm0 + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 + movdqa %xmm0, 48(%rsp) + movdqu 32(%rsp, %rcx, 1), %xmm2 # head of set + pmovmskb %xmm1, %eax + test %eax, %eax + jnz 1f + + movdqa 32(%rsi), %xmm0 # third chunk + add $16, %edx + pxor %xmm1, %xmm1 + pcmpeqb %xmm0, %xmm1 + movdqa %xmm0, 64(%rsp) + pmovmskb %xmm1, %eax + test %eax, %eax # still not done? + jz .Lgt32v2 + +0: movdqu 32(%rsp, %rcx, 1), %xmm2 # head of set +1: tzcnt %eax, %eax + add %eax, %edx # length of set (excluding NUL byte) + cmp $32, %edx # above 32 bytes? + ja .Lgt32v2 + + /* + * At this point we know that we want to use pcmpistri. + * one last problem obtains: the head of the string is not + * aligned and may cross a cacheline. If this is the case, + * we take the part before the page boundary and repeat the + * last byte to fill up the xmm register. + */ + mov %rdi, %rax # save original string pointer + lea 15(%rdi), %esi # last byte of the head + xor %edi, %esi + test $PAGE_SIZE, %esi # does the head cross a page? + jz 0f + + /* head crosses page: copy to stack to fix up */ + and $~0xf, %rax # align head pointer temporarily + movzbl 15(%rax), %esi # last head byte on the page + movdqa (%rax), %xmm0 + movabs $0x0101010101010101, %r8 + imul %r8, %rsi # repeated 8 times + movdqa %xmm0, (%rsp) # head word on stack + mov %rsi, 16(%rsp) # followed by filler (last byte x8) + mov %rsi, 24(%rsp) + mov %edi, %eax + and $0xf, %eax # offset of head from alignment + add %rsp, %rax # pointer to fake head + +0: movdqu (%rax), %xmm1 # load head (fake or real) + lea 16(%rdi), %rax + and $~0xf, %rax # second 16 bytes of string (aligned) +1: cmp $16, %edx # 16--32 bytes? + ja .Lgt16v2 + + + /* set is 2--16 bytes in size */ + + /* _SIDD_UBYTE_OPS|_SIDD_CMP_EQUAL_ANY|_SIDD_LEAST_SIGNIFICANT|_SIDD_NEGATIVE_POLARITY */ + pcmpistri $0x10, %xmm1, %xmm2 # match in head? + jc .Lheadmismatchv2 + + ALIGN_TEXT +0: pcmpistri $0x10, (%rax), %xmm2 + jc 1f # match or end of string? + pcmpistri $0x10, 16(%rax), %xmm2 + lea 32(%rax), %rax + jnc 0b # match or end of string? + + sub $16, %rax # go back to second half +1: sub %rdi, %rax # offset of (%rax) from beginning of string + add %rcx, %rax # prefix length before match/NUL + leave + ret + +.Lheadmismatchv2: + mov %ecx, %eax # prefix length before mismatch/NUL + leave + ret + + /* set is 17--32 bytes in size */ +.Lgt16v2: + movdqu 48(%rsp, %rcx, 1), %xmm3 # second part of set + + /* _SIDD_UBYTE_OPS|_SIDD_CMP_EQUAL_ANY|_SIDD_BIT_MASK|_SIDD_NEGATIVE_POLARITY */ + pcmpistrm $0x10, %xmm1, %xmm2 # any mismatch in first half? + movdqa %xmm0, %xmm4 + pcmpistrm $0x10, %xmm1, %xmm3 # any mismatch in the second half? + ptest %xmm0, %xmm4 # any entry that doesn't match either? + jnz 2f + + ALIGN_TEXT +0: movdqa (%rax), %xmm1 + pcmpistrm $0x10, %xmm1, %xmm2 + movdqa %xmm0, %xmm4 + pcmpistrm $0x10, %xmm1, %xmm3 + ptest %xmm0, %xmm4 + jnz 1f + movdqa 16(%rax), %xmm1 + add $32, %rax + pcmpistrm $0x10, %xmm1, %xmm2 + movdqa %xmm0, %xmm4 + pcmpistrm $0x10, %xmm1, %xmm3 + ptest %xmm0, %xmm4 + jz 0b + + sub $16, %rax +1: pand %xmm4, %xmm0 + movd %xmm0, %ecx + sub %rdi, %rax # offset of %xmm1 from beginning of string + tzcnt %ecx, %ecx + add %rcx, %rax # prefix length before match/NUL + leave + ret + + /* mismatch or string end in head */ +2: pand %xmm4, %xmm0 # bit mask of mismatches (end of string counts) + movd %xmm0, %eax + tzcnt %eax, %eax # prefix length before mismatch/NUL + leave + ret + + /* set is >=33 bytes in size */ +.Lgt32v2: + xorps %xmm0, %xmm0 + mov $256-64, %edx + + /* clear out look up table */ +0: movaps %xmm0, (%rsp, %rdx, 1) + movaps %xmm0, 16(%rsp, %rdx, 1) + movaps %xmm0, 32(%rsp, %rdx, 1) + movaps %xmm0, 48(%rsp, %rdx, 1) + sub $64, %edx + jnc 0b + + add %rcx, %rsi # restore string pointer + mov %rdi, %rax # keep a copy of the string + + /* initialise look up table */ + movzbl (%rsi), %ecx # string is known not to be empty + + ALIGN_TEXT +0: movb $1, (%rsp, %rcx, 1) + movzbl 1(%rsi), %ecx + test %ecx, %ecx + jz 1f + + movb $1, (%rsp, %rcx, 1) + movzbl 2(%rsi), %ecx + test %ecx, %ecx + jz 1f + + movb $1, (%rsp, %rcx, 1) + movzbl 3(%rsi), %ecx + add $4, %rsi + test %ecx, %ecx + jz 1f + + movb $1, (%rsp, %rcx, 1) + movzbl (%rsi), %ecx + test %ecx, %ecx + jnz 0b + + /* find match */ + ALIGN_TEXT +1: movzbl (%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + je 2f + + movzbl 1(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + je 3f + + movzbl 2(%rax), %ecx + cmpb $0, (%rsp, %rcx, 1) + je 4f + + movzbl 3(%rax), %ecx + add $4, %rax + cmpb $0, (%rsp, %rcx, 1) + jne 1b + + sub $3, %rax +4: dec %rdi +3: inc %rax +2: sub %rdi, %rax # number of characters preceding match + leave + ret +ARCHEND(strspn, x86_64_v2) + + .section .note.GNU-stack,"",%progbits From nobody Fri Sep 8 21:23:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8H92pxhz4t8bY; Fri, 8 Sep 2023 21:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8H90zyqz3CsB; Fri, 8 Sep 2023 21:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hisb2B82OU5FXFdDAwJJBcjiBqm6wTJ6OlXBiZWYEJg=; b=prA2/h1veiit2CHR678vMd6J6Ze4z27oqmCTPprvQhum2nhny+zw11l5iMQ7Kf9KxSjZEK XsG5KfzoNlcnLDLLHwGO1PTkrN/dcgAQi7EvoP8IPv2jcYq8DyEOVYookODrIzLEC0FUoK o5HX6MCLUPHcpRQfCXg+ftxpOBYNCD4eql+7lMX5lyB2yWdRWhu3jOHtKiYaBUokY/47Nz B76QSlykvjpAkg7qbqQi+wL3gxCF/j3wq2xMl46Ro+DungGTL5vcADTHDf9MClDU4launW /ZU+q0DVVCaf0SHjxW5KxE/YlEj8rcFEprKl4iysrsyAl0EbILV9044bPSOM0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208213; a=rsa-sha256; cv=none; b=MYkijGXbSQfkjFasHRM4kj7+avuXHh6p59xdgfmb5zdBkNKvYT9DGl5X/1r1q5PyzNg71r 6M29xiQ4PHrrgVYuFbumbU1BKTQCoTGQ8Yco05+MBUVBh3PVbiqJi1eX9idKIytVLmM6H5 VcXsd2oARIFo6OC8WRW/oLtH0SSDR/6xtEdeAEqlMV17K+fZzWkNiLU5oEwqiv1n1EKxnE J89GdoY0/fCbig9B5XY/Cjq99f4opV9E9BIGRaTMXjifgFKTGb1FilQrpDNk+i2dyKb1Zb aHwaVplgwJA1Q3lD1w9V/xQ6X8+lgYeuXuiUdeZv5r5dD/AoRRq+7t6oxVGPRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hisb2B82OU5FXFdDAwJJBcjiBqm6wTJ6OlXBiZWYEJg=; b=B8nmPKQrY+1KjuoGH/ZqNu0sImDdsDVL1D83P4p9HtG5Z+cmx+rZgmT4zn0Wi5gnBFpocA WNBu7xz7uE/y1obAOiQUiKvC2D8UIgI3CkhVjuCrrbeJkfrY8l9O6td61DzAp6BRcMouzT 1rtaGTqkBKdNYb4ak/BqEfid2+LPlEqW7rJLsafMJmSRE8Qwzxt6dPYMwF/qUNHqAneofe m++oTCVwNQEI9qA9JRLRkG2osenXgFgCRJdGvA+aO2zkT3/WOqFX8O1x9+RlxBVfW1RwBO 3357dyCiac6C/AxdSKneWrpa/jNGC3l8f+4xsavnKzAaXqkA2Q4DvGmVz6hSxQ== 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 4Rj8H9053kzy3m; Fri, 8 Sep 2023 21:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNWZ3057495; Fri, 8 Sep 2023 21:23:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNWD4057492; Fri, 8 Sep 2023 21:23:32 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:32 GMT Message-Id: <202309082123.388LNWD4057492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: a559ef1ac859 - main - share/man/man7/simd.7: document simd-enhanced strspn(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a559ef1ac85947df1bff82b867bbfc07a8085092 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=a559ef1ac85947df1bff82b867bbfc07a8085092 commit a559ef1ac85947df1bff82b867bbfc07a8085092 Author: Robert Clausecker AuthorDate: 2023-08-23 15:52:42 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:21:59 +0000 share/man/man7/simd.7: document simd-enhanced strspn(3) Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41567 --- share/man/man7/simd.7 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index efa1306898ca..b0a668e6ade7 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 14, 2023 +.Dd August 23, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -74,6 +74,7 @@ Enhanced functions are present in the following architectures: .It strncmp Ta Ta S Ta Ta S .It strncpy Ta Ta Ta Ta Ta S2 .It strrchr Ta S Ta Ta Ta S +.It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S .It wcschr Ta Ta Ta Ta S .It wcscmp Ta Ta Ta Ta S From nobody Fri Sep 8 21:23:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8HB2xcgz4t8WG; Fri, 8 Sep 2023 21:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8HB2C4mz3D6s; Fri, 8 Sep 2023 21:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4KWAX9eYBEwCwie3f3okG2R1SFtEcWgkP5Ba/2Lk7Y=; b=SJLhK+LMEKoojLfyaQ3oLheUFqDvBC86JDer5n6KQ0KRY8qvVN4QabVOGDY1jNVO16hF8X IpVXjSAeSz+9J2VIVc7R1snEiOzzTZZyCjFjaM1HjSgen/lqhSoKlHUtO6JuL65WoHqOGv 5BcaTlk2HVlQVhl5n7U6PeDvJF4kjv8Y8Nkc4CsPZhKp32WB+Nk4p4oNTNInEjICFN1ZAo P6KiVTLK4GFsLivPEzTrpZOQuS37GE6AEyO1Dg06U5b/Z/d5TAs3U4Fa1nllE65eKoRtDH acqquVcGpnJuVxHDzHDDa5xsSqTzYGzEYoYGiuGrUpdB8BvpkT3CC1TM/yWTDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208214; a=rsa-sha256; cv=none; b=dZSnQaylUopIPoRfHfrUwxcZ3xEUapIPd7ipZ6mimkZb0CshOWw+axdoSE4FV9MUWMoDix hxXZ4HdCgnPDQow1E1PLvgzz+X1iofRNB+VvigJaxfRZ2IgCD3ZMKx4TskaZKmFX4RiqvI J9w6b79SfCQMZhfDgkykqA2RDbUnNXuldlwVtyHwopPQZhW4pC6VcNrCqoDlqeyR25bWUh 3t/qs01kNUOFiX2u4DGoaej6PHcaOC9qMElN3RWFMJM4U/BsECgFU+PvxXlotMuZDvs9xx ko4rVMci/51lSDNAnrOrXnNfKakLsmJ1ll8n3rmrLWRKXimWAHbvPOuiZW/xHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k4KWAX9eYBEwCwie3f3okG2R1SFtEcWgkP5Ba/2Lk7Y=; b=ow6jHuWruQGJSWiH23BdkmoEd8I0ZeifrhV3CrY0jBg/Jnvc0q98fDh/969iMlk6ruLSmi D3QkIfyMp6Q9uTk1tc8e1J/ivqu65wnqU3m/WJMiD6pwDSCKvU0pirSwJw8iCH2TNDTOEx 5emJwkTDy02x1dNuN5vJeCI0mb4xzX4wBCf2dCPJ+bRcgk+QYrWMa+yB12tu6fjv9x6tFR Tkxq0C+zdJYWg8ywbsW2lLU/MDEbOlTwlRZ0cOrlR3YgF+6QyXNvIMbV2lxQwiyUgMm35s ad6oQmv6Q/HWSA9K+c5c9VWovjfIpDEz5q1fyuwLkcYTjb8lOz3uxLWo8UVfwA== 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 4Rj8HB1BbfzxtL; Fri, 8 Sep 2023 21:23:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNYmJ057540; Fri, 8 Sep 2023 21:23:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNYdv057537; Fri, 8 Sep 2023 21:23:34 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:34 GMT Message-Id: <202309082123.388LNYdv057537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: de12a689fad2 - main - lib/libc/amd64/string: add memchr(3) scalar, baseline implementation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de12a689fad271f5a2ba7c188b0b5fb5cabf48e7 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=de12a689fad271f5a2ba7c188b0b5fb5cabf48e7 commit de12a689fad271f5a2ba7c188b0b5fb5cabf48e7 Author: Robert Clausecker AuthorDate: 2023-08-24 16:43:40 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:22:20 +0000 lib/libc/amd64/string: add memchr(3) scalar, baseline implementation This is conceptually similar to strchr(3), but there are slight changes to account for the buffer having an explicit buffer length. Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41598 --- lib/libc/amd64/string/Makefile.inc | 1 + lib/libc/amd64/string/memchr.S | 204 +++++++++++++++++++++++++++++++++++++ 2 files changed, 205 insertions(+) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index b03811f40062..7c6a1f429590 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -2,6 +2,7 @@ MDSRCS+= \ amd64_archlevel.c \ bcmp.S \ + memchr.S \ memcmp.S \ memcpy.S \ memmove.S \ diff --git a/lib/libc/amd64/string/memchr.S b/lib/libc/amd64/string/memchr.S new file mode 100644 index 000000000000..e10bd6c22f90 --- /dev/null +++ b/lib/libc/amd64/string/memchr.S @@ -0,0 +1,204 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include + +#include "amd64_archlevel.h" + +#define ALIGN_TEXT .p2align 4,0x90 /* 16-byte alignment, nop filled */ + + .weak memchr + .set memchr, __memchr +ARCHFUNCS(__memchr) + ARCHFUNC(__memchr, scalar) + ARCHFUNC(__memchr, baseline) +ENDARCHFUNCS(__memchr) + +ARCHENTRY(__memchr, scalar) + test %rdx, %rdx # empty input? + je .Lnomatch + + lea (, %rdi, 8), %ecx + add %rdi, %rdx # pointer to end of buffer + and $~7, %rdi # align to 8 bytes + mov (%rdi), %rax # load first word + movzbl %sil, %esi # clear stray high bits + movabs $0x0101010101010101, %r8 + imul %r8, %rsi # replicate char 8 times + + /* compute head and tail masks */ + mov %r8, %r10 + movabs $0x8080808080808080, %r9 + shl %cl, %r10 # 0x01 where string head is + lea (, %rdx, 8), %ecx + xor %r8, %r10 # 0x01 where it is not + neg %r8 # negate 01..01 so we can use lea + mov %r9, %r11 + xor %rsi, %rax # str ^ c (0x00 where str[i] == c) + neg %ecx + or %r10, %rax # except before the string + shr %cl, %r11 # 0x80 where string tail is + + add $8, %rdi # advance to next 8 bytes + cmp %rdx, %rdi # end of buffer reached during head? + jae .Ltail # and go to tail-processing code + + /* main loop, unrolled twice */ + ALIGN_TEXT +0: lea (%rax, %r8, 1), %rcx # (str ^ c) - 0x01..01 + not %rax # ~(str ^ c) + and %r9, %rax # ((str^c) - 0x01..01) & ~(str^c) + and %rcx, %rax # not including junk bytes + jnz .Lmatch + + mov (%rdi), %rax + add $8, %rdi + xor %rsi, %rax # str ^ c + cmp %rdx, %rdi + jae .Ltail + + lea (%rax, %r8, 1), %rcx # (str ^ c) - 0x01..01 + not %rax # ~(str ^ c) + and %r9, %rax # ((str^c) - 0x01..01) & ~(str^c) + and %rcx, %rax # not including junk bytes + jnz .Lmatch + + mov (%rdi), %rax + add $8, %rdi + xor %rsi, %rax # str ^ c + cmp %rdx, %rdi + jb 0b + +.Ltail: lea (%rax, %r8, 1), %rcx # (str ^ c) - 0x01..01 + not %rax # ~(str ^ c) + and %r11, %rax # ((str^c) - 0x01..01) & ~(str^c) + and %rcx, %rax # not including junk bytes or bytes past buffer + jz .Lnomatch + +.Lmatch: + tzcnt %rax, %rax # first match + shr $3, %eax # scale from bit to byte index + lea -8(%rdi, %rax), %rax # pointer to found c + ret + + /* no match found */ +.Lnomatch: + xor %eax, %eax # return null pointer + ret +ARCHEND(__memchr, scalar) + +ARCHENTRY(__memchr, baseline) + test %rdx, %rdx # empty input? + je .Lnomatchb + + movd %esi, %xmm2 + mov %edi, %ecx + add %rdi, %rdx # pointer to end of buffer + and $~0x1f, %rdi # align to 32 bytes + movdqa (%rdi), %xmm0 # load first 32 bytes + movdqa 16(%rdi), %xmm1 + + punpcklbw %xmm2, %xmm2 # c -> cc + + mov $-1, %r9d + shl %cl, %r9d # mask with zeroes before the string + + punpcklwd %xmm2, %xmm2 # cc -> cccc + + mov $-1, %r8d + xor %ecx, %ecx + sub %edx, %ecx # edx = -ecx + shr %cl, %r8d # bytes in tail that are part of the buffer + + pshufd $0, %xmm2, %xmm2 # cccc -> cccccccccccccccc + + add $32, %rdi # advance to next 32 bytes + mov $-1, %eax + cmp %rdx, %rdi # end of buffer reached during head? + cmovae %r8d, %eax # if yes, do combined head/tail processing + and %r9d, %eax # mask of bytes in head part of string + + /* process head */ + pcmpeqb %xmm2, %xmm1 + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm1, %esi + pmovmskb %xmm0, %ecx + shl $16, %esi + or %esi, %ecx # locations of matches + and %ecx, %eax # any match inside buffer? + jnz .Lprecisematchb + + cmp %rdx, %rdi # did the buffer end here? + jae .Lnomatchb # if yes we are done + + /* main loop */ + ALIGN_TEXT +0: movdqa (%rdi), %xmm0 # load next string chunk + movdqa 16(%rdi), %xmm1 + add $32, %rdi + cmp %rdx, %rdi # ready for main loop? + jae .Ltailb + + pcmpeqb %xmm2, %xmm0 + pcmpeqb %xmm2, %xmm1 + por %xmm1, %xmm0 # match in either half? + pmovmskb %xmm0, %eax + test %eax, %eax + jz 0b + +.Lmatchb: + pcmpeqb -32(%rdi), %xmm2 # redo comparison of first 16 bytes + pmovmskb %xmm1, %ecx + pmovmskb %xmm2, %eax + shl $16, %ecx + or %ecx, %eax # location of matches + +.Lprecisematchb: + tzcnt %eax, %eax # find location of match + lea -32(%rdi, %rax, 1), %rax # point to matching byte + ret + +.Ltailb: + pcmpeqb %xmm2, %xmm1 + pcmpeqb %xmm2, %xmm0 + pmovmskb %xmm1, %edx + pmovmskb %xmm0, %eax + shl $16, %edx + or %edx, %eax # location of matches + and %r8d, %eax # mask out matches beyond buffer + bsf %eax, %edx # location of match + lea -32(%rdi, %rdx, 1), %rdx # pointer to match (if any) + cmovnz %rdx, %rax # point to match if present, + ret # else null pointer + +.Lnomatchb: + xor %eax, %eax # return null pointer + ret +ARCHEND(__memchr, baseline) + + .section .note.GNU-stack,"",%progbits From nobody Fri Sep 8 21:23:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8HC3wPmz4t8R0; Fri, 8 Sep 2023 21:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8HC3CGtz3D9D; Fri, 8 Sep 2023 21:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od3o/1DP4O2Cvx+Ahfllx9OcSKaxh9+T59njlFGpRtc=; b=KLsqHEeEz279Fr5CDoMLaL4J3cJv2pgZJRWoeHH6aenMAGVM733IlOvvvevT/AiU/G/ZNi /Q7JqvGIuOT+YQBWrSmBvzYEcdXATZKm0HOqvTU3+LzhL/1g7pewWGxAh+JSFXKoxUu1Z/ 7/eQilYcn3eJAuNaI909o7QrEoehzUbTupQ5/PpWlDX7fqHDdioFLQOiEXWMfMq1+z02sA SPbIz1tO06FzGi1p7y2INHkoEBEdJNp96p5YSv+liTL+5L1Ko8eoewWXQizFdMhWVbOmi7 k55qMuHzP8aHURc0e9kOVD4d6sdIc01bd4QjBEhpZotPFH0VowC1ipCnhQ4BKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208215; a=rsa-sha256; cv=none; b=wH8/exXIEj5SAq4pKuBUbmygEtOm91OSseM3NviikiLTyeKc4v2ilA2J4oJ+YhpKDRh87X 7x1UtbOL4cOQf5NcA9Kt0OR9yqmp7yyShIOjqvkO7jaw72kp3V2sQjviTOrUYmrfS5mosF SP+Zd6nwdJvUAuyw7rejye9PGCCI8MpOaH3DlXqlp5x0Nkv0Pv1ALXrcM/styFJdwhZkp1 wSrkBi1x5dk96T5uAhaNcqys9rdORfYm1J5mc/WhUuTk3GbIcXv9ccwF7ys3YN2Qiiegq5 Bl2jIbiLcQNLWRahJrFc3cHAC0QXu0UeN6LEtgICRwrna0ypw8yjeX1/yKoBrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=od3o/1DP4O2Cvx+Ahfllx9OcSKaxh9+T59njlFGpRtc=; b=yLHIJRpWM9Uw7vPYQXXonnOESRQFOuBXfy+ocp5bLesN8IBzViNGIhtemjHTc+cpOl1Iwq b9ewEL5u13leatUNrmEuaVeylN0H/43jFQdqmKfZ8LUxcgB7oBS8iTAI2IaSyWI/B8DZ2D ezio9jfdz0YJdtLt7nT/MEIFghKw67r+SgY+G+tdUpKZRCa2s3/OyqbSE7RhzzaqQj15e0 Oxs2ARG8A1Rj9ebzHz2MWgYZBI1Z1gDYm1XLoJJUT7tnb2rqCGTi0S9cyQ52m5JdUKcbOC 8GfLeyqN+dvxJjAiDOKIT5FFMBef4lI5JiiYXj1XrkUxR4ajDRUZ1IGASuu8LA== 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 4Rj8HC2DYHzxtM; Fri, 8 Sep 2023 21:23:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNZLU057582; Fri, 8 Sep 2023 21:23:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNZpW057579; Fri, 8 Sep 2023 21:23:35 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:35 GMT Message-Id: <202309082123.388LNZpW057579@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 331737281c19 - main - lib/libc/amd64/string: implement strnlen(3) trough memchr(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 331737281c1929c29e679e48783055351ac4fbd9 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=331737281c1929c29e679e48783055351ac4fbd9 commit 331737281c1929c29e679e48783055351ac4fbd9 Author: Robert Clausecker AuthorDate: 2023-09-08 21:11:55 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:22:31 +0000 lib/libc/amd64/string: implement strnlen(3) trough memchr(3) Now that we have an optimised memchr(3), we can use it to implement strnlen(3) with better perofrmance. Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41598 --- lib/libc/amd64/string/Makefile.inc | 3 ++- lib/libc/amd64/string/strnlen.c | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/lib/libc/amd64/string/Makefile.inc b/lib/libc/amd64/string/Makefile.inc index 7c6a1f429590..73973a6d69de 100644 --- a/lib/libc/amd64/string/Makefile.inc +++ b/lib/libc/amd64/string/Makefile.inc @@ -11,7 +11,8 @@ MDSRCS+= \ strcat.S \ strchrnul.S \ strcmp.S \ + strcpy.c \ strcspn.S \ strlen.S \ - strcpy.c \ + strnlen.c \ strspn.S diff --git a/lib/libc/amd64/string/strnlen.c b/lib/libc/amd64/string/strnlen.c new file mode 100644 index 000000000000..9db4ce30dfd4 --- /dev/null +++ b/lib/libc/amd64/string/strnlen.c @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2023 The FreeBSD Foundation + * + * This software was developed by Robert Clausecker + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ''AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE + */ + +#include +#include + +char *__memchr(const void *, int, size_t); + +size_t +strnlen(const char *s, size_t maxlen) +{ + const char *loc; + + loc = __memchr(s, '\0', maxlen); + + return (loc == NULL ? maxlen : (size_t)(loc - s)); +} From nobody Fri Sep 8 21:23:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj8HD4nP2z4t8bk; Fri, 8 Sep 2023 21:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj8HD4MWrz3DGQ; Fri, 8 Sep 2023 21:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3VI6dtnW1Xon4Q1CvI5N6pv+xmr2uQjKrnKA6pJua0=; b=iSSvUbJGfVaLsZogCpkldWOwBRDeARgg3dDsNAPYPZjaodqTgp4/xNvGl9ktMiSeOqOixL Cme9Hs6N4/0IOwhfHOmruadyVnC1UC1J/rSmQUn6Hj0DWFC7/X82oeN5uqmQas7KuxNje1 Ylv6g6PEbsZxcGdrWKe29+ke3jhg8VDoCG7SbJ1lpU7eD1y5Pa/UilABi0++/jb8aTMO+N 59t2dItt98+tztcJhJ7EFB/uL7dLW/FMObpgCVh1SBih/hrddscsliJGyk3Qkub+Pay7TS /qtDsxGag/M6YJDZ+0RBTgeQq+vaHs9Enw2rll88AgpvEIoF7IsZoRVh/PSnbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694208216; a=rsa-sha256; cv=none; b=Q5rbaRaEV6Qv26XfgyuR5DuB6nvpkprryy1w/FGzpScuBgrjD35Ht8ZJu0kUx8dWaDjxeu K5v3r6uIk0Okgi9V5fV8K7XOPEetenUwEDWlqzP3aWG2a47K3n2pAW/43yjXcm/Z4lA9Wr Sno7VXWdY/SQ/XOfOJ+X7ROyf5EfCmb7PgSuKArOvmZP7CD8T78SfSCVhjY3eL1MwSA4NC 0tzJAgj6LbFezrqFhHVWxcwffAx2mentunL9fNUCI6EWIys0vBcjQTU/HCtYtEjcJPHadX uld415AT5ng9mN2fXY8XO9nQjVEVH6SSvcJhQOH1uniCnbWO9BBzZ6tod0zJ9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694208216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3VI6dtnW1Xon4Q1CvI5N6pv+xmr2uQjKrnKA6pJua0=; b=sbTPzdWi4RP73u5PZDrZQfV+L7SRXPcAvM67tfLdBnrMO13twKYCJUHM71SRyj0mO1vw79 1OxG8Z7yURySxm9Em1nneUvhPn/5wSdSTSt2zBXpu5GhDtwZUMv/TZuUMnvZKsndB9JJki efxSgmqkCcOg9yGfMc2gRbZo6fAcToyb9TGSXWNufcfxXULi7cezAI9b7kcspFluv4IAp0 cVsCuWibCG6+QG3g5O6E1XpTJjzMlDZO05vIrQ/3M9NdCk9g7YBwqiVRZSSrcb90vfGwH8 7JiJQZaNuh/7WCwrmSaCaVYYu8gZY24ShSlFpPKYtSPOdee6Rn418E18oi0ojQ== 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 4Rj8HD3M5kzy3n; Fri, 8 Sep 2023 21:23:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388LNaxF057627; Fri, 8 Sep 2023 21:23:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388LNa7R057624; Fri, 8 Sep 2023 21:23:36 GMT (envelope-from git) Date: Fri, 8 Sep 2023 21:23:36 GMT Message-Id: <202309082123.388LNa7R057624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Clausecker Subject: git: 2a4096b01244 - main - share/man/man7/simd.7: documend simd-enhanced memchr(3), strnlen(3) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a4096b012449d09e9bc3e912f762e4786092a3c Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=2a4096b012449d09e9bc3e912f762e4786092a3c commit 2a4096b012449d09e9bc3e912f762e4786092a3c Author: Robert Clausecker AuthorDate: 2023-08-25 20:41:07 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 21:22:31 +0000 share/man/man7/simd.7: documend simd-enhanced memchr(3), strnlen(3) Sponsored by: The FreeBSD Foundation Approved by: mjg MFC after: 1 week MFC to: stable/14 Differential Revision: https://reviews.freebsd.org/D41598 --- share/man/man7/simd.7 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man7/simd.7 b/share/man/man7/simd.7 index b0a668e6ade7..e5823f463ffb 100644 --- a/share/man/man7/simd.7 +++ b/share/man/man7/simd.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE . -.Dd August 23, 2023 +.Dd August 25, 2023 .Dt SIMD 7 .Os .Sh NAME @@ -58,6 +58,7 @@ Enhanced functions are present in the following architectures: .It index Ta S Ta Ta S1 .It ldiv Ta Ta Ta S Ta S .It lldiv Ta Ta Ta S +.It memchr Ta Ta Ta S1 .It memcmp Ta Ta S Ta S1 Ta S .It memcpy Ta S Ta S Ta S Ta S Ta SV .It memmove Ta S Ta S Ta S Ta S Ta SV @@ -73,6 +74,7 @@ Enhanced functions are present in the following architectures: .It strlen Ta Ta S Ta S1 .It strncmp Ta Ta S Ta Ta S .It strncpy Ta Ta Ta Ta Ta S2 +.It strnlen Ta Ta Ta S1 .It strrchr Ta S Ta Ta Ta S .It strspn Ta Ta Ta S2 .It swab Ta Ta Ta Ta S From nobody Fri Sep 8 22:17:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rj9TV4Jd8z4sX3n; Fri, 8 Sep 2023 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rj9TV3jzjz3Zyf; Fri, 8 Sep 2023 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694211454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nIEn16FQp+u/empuvjL5rfMLrhbnu8evKx/dJW14Xk4=; b=P9Y4mDEi/UqkKWSPPZFSWaGyLqLqqyXqEsRWSvpA2sUqYpDk0dht1WMqWxYCN7nGsL4qqz NrJP8i9vziFEjnfjDXwKMmYJ5ezgIjwvQk2cMVnaB1mzivBCYZvyZOVGmzg7QuR67H5Orl fcITizWxSGrE3cEUnI9VOejWlZx0IsQ3Hxsc8OFazr4tiOi34YSh3gFSUQXxkqae2/P+gq Q2u6AD3/R+p/0cFTA5TtU3fxPyDPITUs9x7BUUTQ+kHqoPDn4Nxixn4XRtkSbWCiJXQRHF fRVwYuhXRZPRggkJ2YEpviECrhQy872n0EMePcHKPlxjyEalqDzpnBgQsWHGfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694211454; a=rsa-sha256; cv=none; b=nyQd8+6waQ/sUb4I8d27lxi8BRpE7hUSVw9c2sHaZnnUtPyQ/QUmCZly3CM0YnLOODBCZF T3Tlh7m0GRsewCQBnUS3SFyJODTzqwNz2IEMXQ3Gd83TE8rAspjtLf7xSrvEqGvA8b5hUz IfsjkUXKNr986y2nxmLTo8IA9xR5/L60NMUDhLxwkQe9kJktOGcyjSylRQihC3zgeLTgBt xxSKSaS4KLjzKh0RVu+K1jbGeTFCyf+nghjbVMo3rv8mym/yBA8NhTs2w+T4PhtZDqamqG 9s5JwHvEXzBwnpjjDmm4KenWd7qwVAJqVKTzdXHcFDHMHA84i0uu31mWWFAxYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694211454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nIEn16FQp+u/empuvjL5rfMLrhbnu8evKx/dJW14Xk4=; b=DUXxCXx7ebuNuUAmRyYTsCzuBmffBpHtNw46GFcp3UabAdkuJ8it1gB4SbX7JxKmC6XSqz 1pqC8kZQD4GhXBr7L/adgm92GMIotiNS25KXGCLYlS4OQN/ILvD7UWWUTYjCEy0s6KhdEu jyhW4KMwGSqYh1oLUwpnNKUZicKvxF22GWazPovL8Jh5D6C1qtcXWIU1PXh+kyKWiEoFtQ IbWS/ChwyFGCwMYE4/bwxsQi5x3FgyIyFXlFYz3awrYLu6RzVSaekOwi+6/kfRPubxw19w f6V7hpBujTTS6VdoW69ZB/dY5VnTNR1L2h20T5udLm+NxaNLsVDnmeKo8InBMg== 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 4Rj9TV2NW1z1019; Fri, 8 Sep 2023 22:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388MHYiN041341; Fri, 8 Sep 2023 22:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388MHYWn041339; Fri, 8 Sep 2023 22:17:34 GMT (envelope-from git) Date: Fri, 8 Sep 2023 22:17:34 GMT Message-Id: <202309082217.388MHYWn041339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5e5854520ee6 - releng/14.0 - */string.3,arch.7,environ.7: add cross-references to simd(7) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 5e5854520ee62549bc250e28263a4fd7d5a5b471 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by fuz: URL: https://cgit.FreeBSD.org/src/commit/?id=5e5854520ee62549bc250e28263a4fd7d5a5b471 commit 5e5854520ee62549bc250e28263a4fd7d5a5b471 Author: Robert Clausecker AuthorDate: 2023-09-02 14:27:23 +0000 Commit: Robert Clausecker CommitDate: 2023-09-08 22:16:40 +0000 */string.3,arch.7,environ.7: add cross-references to simd(7) With the new simd-dispatch framework documented in simd(7), add cross-references to the new man pages to appropriate places. Sponsored by: The FreeBSD Foundation Approved by: emaste, re (gjb) MFC to: stable/14, releng/14.0 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41697 (cherry picked from commit d41afb814612ce005d93d2f8d127dcf6ea751cc4) (cherry picked from commit 7ec2ae8c7cd4400d5c0db690a1fe43cf85b6c5d3) --- lib/libc/string/string.3 | 5 +++-- share/man/man7/arch.7 | 5 +++-- share/man/man7/environ.7 | 12 ++++++++++-- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/lib/libc/string/string.3 b/lib/libc/string/string.3 index a164aae01eec..b389c58acc07 100644 --- a/lib/libc/string/string.3 +++ b/lib/libc/string/string.3 @@ -29,7 +29,7 @@ .\" .\" @(#)string.3 8.2 (Berkeley) 12/11/93 .\" -.Dd December 11, 1993 +.Dd September 2, 2023 .Dt STRING 3 .Os .Sh NAME @@ -132,7 +132,8 @@ for size limitations. .Xr strsep 3 , .Xr strspn 3 , .Xr strstr 3 , -.Xr strtok 3 +.Xr strtok 3 , +.Xr simd 7 .Sh STANDARDS The .Fn strcat , diff --git a/share/man/man7/arch.7 b/share/man/man7/arch.7 index 8e89203e4003..14c6af612087 100644 --- a/share/man/man7/arch.7 +++ b/share/man/man7/arch.7 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 12, 2023 +.Dd September 2, 2023 .Dt ARCH 7 .Os .Sh NAME @@ -431,7 +431,8 @@ it is unused outside of that scope. .El .Sh SEE ALSO .Xr src.conf 5 , -.Xr build 7 +.Xr build 7 , +.Xr simd 7 .Sh HISTORY An .Nm diff --git a/share/man/man7/environ.7 b/share/man/man7/environ.7 index 7e3437e7c6d4..8a927c0f9f3d 100644 --- a/share/man/man7/environ.7 +++ b/share/man/man7/environ.7 @@ -27,7 +27,7 @@ .\" .\" @(#)environ.7 8.3 (Berkeley) 4/19/94 .\" -.Dd August 5, 2020 +.Dd September 3, 2023 .Dt ENVIRON 7 .Os .Sh NAME @@ -66,6 +66,13 @@ are documented in the section of the appropriate manual page. .Sh ENVIRONMENT .Bl -tag -width LD_LIBRARY_PATH +.It Ev ARCHLEVEL +On +.Em amd64 , +controls the level of SIMD enhancements used. +See +.Xr simd 7 +for details. .It Ev BLOCKSIZE The size of the block units used by several disk-related commands, most notably @@ -305,7 +312,8 @@ built-in command in .Xr setlocale 3 , .Xr system 3 , .Xr termcap 3 , -.Xr termcap 5 +.Xr termcap 5 , +.Xr simd 7 .Sh HISTORY The .Nm From nobody Fri Sep 8 23:34:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjCBM0P3Nz4sblc; Fri, 8 Sep 2023 23:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjCBL6z2bz4X5V; Fri, 8 Sep 2023 23:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LE80OsH6G0cg9u1RE4f885NPOatmo9jcwxeSSzV2lEM=; b=Ov0Xl924pjhdn2PSDU9WTl6UIVpL6+M7NVaiMkBJ55oPFM6OIP2mp8TiiSs9eoNDmCLVBu ecbEdpG6rKpVAuyU+xyqQDLmJI24S+SOodpGIQQrt2bH/jiJpvIMUPl5VIv0tdNfy14fP/ D7+GsuAUWTY04LUJaL/99GzrwDORmP7mtlykz/7spD6Tw2wUGcpKy6FGZ1oyGbWpvqUw5J ZMjfU6qQluXjoRa9dIvfVzbwXsEbmMjcZ4sf4JjJqqOUaN7f2V+/JwlTGOBs4ca9CYf+hn c+P+eCzpELU7QOzGxsl4WrLH2pGwo9ez4NYc1Dez9heRerqVZZbwS6C9tIHQGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216075; a=rsa-sha256; cv=none; b=Z0sGt+SUD0135iOHwb6+K4hTkPlophS9RfnrDyjPt5aLl/e+AFbhH37WtOsCrKclW7Hw80 Kc6NBMsVkgBnE2SiX23d7dHxjE2JpPR0YHcvfUUwXlavoKXjEBSyAToYKBbJn6nPR7b05w MzfNZFadwP1GBBx7zSSSAGV11XZBBJXv6j4LpwF2Ts6Kmlkt8td5h13hR+AaPnBVu4Ee/G jWJTf9IK3PFBnm7udZ2f5UJYzKdqHmOIAWMo6N9MdsxpwYEwM3zEhiFQAkPRyqua91owpA 6b3ygIlac2GgtRweAfOfMIHf0BdTsptluaIWM+Y+aDdZHb2/pK5UkUPprYtUdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LE80OsH6G0cg9u1RE4f885NPOatmo9jcwxeSSzV2lEM=; b=dolQzPEboQF+VJIGMngZllvnmso8eSdZzCZIrIxObU5xtdDN1d8YuWxJBbVFA3DfiJJTrS F/8jFxbSd/RSTECjj7R47uFGV+DQysXJf+ddPlWbyj4i3D+J+idR1Pgo/uL4KngYIdZD+f iCJLvHjccbV6j7IxQ3+7xiFPIVnNssrrZDcmvqmFcxVZ5mXLUcoG5FRS7OnL000i5praIr LwtntjhVXA+nYJmzbFbhnDkhjD9tC4vYeoHgUkasE4jeIN8/CKi/+pgbEBG1aGwGaGWzEP pkOzVx4OD1149KIBkTj/qM2bP8Amnt11hnXVAwe4lwXU6sLneDl3na1yfKgnqA== 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 4RjCBL5wzCz11xs; Fri, 8 Sep 2023 23:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388NYYlR072485; Fri, 8 Sep 2023 23:34:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NYYVi072482; Fri, 8 Sep 2023 23:34:34 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:34:34 GMT Message-Id: <202309082334.388NYYVi072482@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: dcfddc8dc091 - main - cxgbe tom: Call t4_rcvd_locked from do_rx_data to return RX credits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dcfddc8dc091e7688abc8488a0307eba425fa7a2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dcfddc8dc091e7688abc8488a0307eba425fa7a2 commit dcfddc8dc091e7688abc8488a0307eba425fa7a2 Author: John Baldwin AuthorDate: 2023-09-08 23:30:35 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:31:21 +0000 cxgbe tom: Call t4_rcvd_locked from do_rx_data to return RX credits In particular, the kernel RPC layer used by the NFS client never invokes pru_rcvd since it always reads data from the socket upcall via MSG_SOCALLBCK which avoids calling pru_rcvd. As a result, on an NFS client connection managed by t4_tom, RX credits were never returned to the TOE connection to open the TCP window resulting in connection hangs. To fix, expand the set of conditions in do_rx_data where RX credits are returned to match those in t4_rcvd_locked by calling the function directly. Reviewed by: np Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41688 --- sys/dev/cxgbe/tom/t4_cpl_io.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c index 9b48b2891f64..235d4196226d 100644 --- a/sys/dev/cxgbe/tom/t4_cpl_io.c +++ b/sys/dev/cxgbe/tom/t4_cpl_io.c @@ -1647,7 +1647,7 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) struct socket *so; struct sockbuf *sb; struct epoch_tracker et; - int len, rx_credits; + int len; uint32_t ddp_placed = 0; if (__predict_false(toep->flags & TPF_SYNQE)) { @@ -1779,12 +1779,7 @@ do_rx_data(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) } sbappendstream_locked(sb, m, 0); - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(sc, toep, rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } + t4_rcvd_locked(&toep->td->tod, tp); if (ulp_mode(toep) == ULP_MODE_TCPDDP && toep->ddp.waiting_count > 0 && sbavail(sb) != 0) { From nobody Fri Sep 8 23:34:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjCBN3qkNz4sbdP; Fri, 8 Sep 2023 23:34: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjCBN0Dtpz4X3G; Fri, 8 Sep 2023 23:34:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVcB7jCAlKnhJBUuH0jNLK0cTzOjMBrFkjSZoXRKmLc=; b=ZDSXWHFPG4kenwFCxICOyk/yGVZ/yns0jwUnsL+uW/H9pHjqNVFw1oCOTsz3eDvi4GRW70 0G/t8p82qZ1c7mg8cb1uqgZFbxFpygWSylZmXja7tVfxO9VXnkmfMM3WXJaV8DI0NYRiBY qQWxKhQapi3mACdJey8BkvxdHDw1swso1AGlA1y7DXKslaT25aWVoiFH1gUEYlZQ9ov10d RPuAIENuBrLu9VFErCYeRAGgZzGdaoSB8ys5W0wb97PzJQ5ldQsj2VovHc2ETtTsi5AL9p LPtcOKuE1clCamoG/i6P4YJqiA6Cw61IwHBivkSsw/Qw6nzhQ3HgCk3yb4ZT9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216076; a=rsa-sha256; cv=none; b=bWNAVby/rLo7dMJSitnEq1UcRuvLGMZ7BM9OIuKIY4E2+UpSjElk4wRhDgGC0b2hOBBCkC nzOCUrPNXDnax6PCOwC9gdC2IC04s9BJHmqc+A3a8iSRmuK+EFTvfAKgTQpMeq8yWM5ctu BNmdS/HIEoL/fGhe5LhwgRUT2Cqy4EhiR0Zg1eTUTV7fwmQHMjW0o4rlJP1M2aujILCgoE GBgLh4gkjdeWcpCTauE/xkWH6cre+EGUtjP4k63rMTrRE6Fvxsd+wRmRsRDFh91gR/yK82 alM6xWg8ZtmM9G4m3KBFxWkEAc9YbWtJX4PUZLaDl97QUg0VEubfO2dZD9JrKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JVcB7jCAlKnhJBUuH0jNLK0cTzOjMBrFkjSZoXRKmLc=; b=utcHnTFwnuUxO4fpsi8I98XRnAUEfoUo3LrFIhnMiktdRBVeZxomMiQtF4kZar5H+u5O4c Cp80BxN7s+mfFvSDnjpiOD0OSyG0DmHYnuMluNCFo2qRIFrjV9rYpu38mxeGw+/ZI/Ne7N SQcyQg2iuD0ZoFMbsHF8pEEPIlCcG9oW7XS8on7x0vQ/onuXLTyd0YIohzpVFWToaudOmG /zQa04/Duqd1bsoo4oyBiKV/QnubgoLZ4wdwLgrk7p4z2f7bgzMtSvbtwVvOhkaIYFpbmF KEVY5ei/3rVxssK3N/gF9LD79n6jJ+fccmzmTMTbSj1qmVy7TmQx19Npx0Z/lg== 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 4RjCBM6SW5z11xt; Fri, 8 Sep 2023 23:34:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388NYZmT072551; Fri, 8 Sep 2023 23:34:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NYZC8072548; Fri, 8 Sep 2023 23:34:35 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:34:35 GMT Message-Id: <202309082334.388NYZC8072548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 75af2d951cce - main - cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 75af2d951cce7d51d2033405f96f083c01f39f04 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=75af2d951cce7d51d2033405f96f083c01f39f04 commit 75af2d951cce7d51d2033405f96f083c01f39f04 Author: John Baldwin AuthorDate: 2023-09-08 23:30:52 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:31:25 +0000 cxgbe t4_tls: Don't bother returning RX credits for a protocol receive error Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41689 --- sys/dev/cxgbe/tom/t4_tls.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index b8005e213621..29a840067c62 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -1004,7 +1004,7 @@ do_rx_data_tls(const struct cpl_rx_data *cpl, struct toepcb *toep, struct tcpcb *tp; struct socket *so; struct sockbuf *sb; - int len, rx_credits; + int len; len = m->m_pkthdr.len; @@ -1075,22 +1075,6 @@ do_rx_data_tls(const struct cpl_rx_data *cpl, struct toepcb *toep, so->so_error = EBADMSG; out: - /* - * This connection is going to die anyway, so probably don't - * need to bother with returning credits. - */ - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; -#ifdef VERBOSE_TRACES - CTR4(KTR_CXGBE, "%s: tid %u rx_credits %u rcv_wnd %u", - __func__, toep->tid, rx_credits, tp->rcv_wnd); -#endif - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(toep->vi->adapter, toep, - rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } - sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(sb); From nobody Fri Sep 8 23:34:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjCBP27PQz4sbrN; Fri, 8 Sep 2023 23:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjCBP1Kxvz4X9R; Fri, 8 Sep 2023 23:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEC0+O/Zz61Wlky+QDMdBc8dPvCdVoDrafZVdJj5vzw=; b=donaxBpt+sVN+c/NJkxT9LxPfiLRf75VPNWHue6Y1uMcs/HyjyGxBoT9tR1MPxoOskAF9F acTOWSOj2n8bCZ7Vv2CLg5MQ9yxrGMMlIXE6hCsMjOVTdKLyLh5RIMFrBS7T9tZomCzhNm AnRoScHZ8hcxw4AgmkW2txxWpFBkqgkZtbGUoOg+DJ1w7eTqgbytfawVKFPxFEQRc/IseC LtTuq3LStU87oVhBdLeOn28m/sCTidjIcy8gcQxFVXCxKNf3RguJedcTlDhS3edbwGitTI EelsenR3WpaS4rz8aGj/XU8Bcgx4zzAv2rCRhXwmH33yq/nwGkbEoPCaaTiIwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216077; a=rsa-sha256; cv=none; b=c8OymvFtYKNidJhNtC/RontZgCeZ0PUpZbmGsi+RYZpXGDtgxxkJx0C8DDvbMJPMi5V2Xm iCdlPW9O+gEJLRnfaoZUzUr6pddX1a9J6Xb+8yOIk0sbT2TFAvNfS0JXzZv7KaE/BVvb2a ZJCkg7psC89RUbwgkl0NvYZi+uTir/uwOzXYGspmp8yDoRPUDwjDYUltQ6VC/Lx6UuAFfn cVenVWDhnKYDVq700pc9CRVzEGEiEwvbYrn3bUv+tfVWSjInR+E1PBmdiZ4vn8lGSmyLWK EigrZFasEPurji94M3+0F2tdRKscwcttf6kwirIN1rWkDrKfFLFCyNKRkQ9NcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iEC0+O/Zz61Wlky+QDMdBc8dPvCdVoDrafZVdJj5vzw=; b=MeR/+a2WCDZXhFyKkZAUWgRXJtPnr5Z/Dx0etZuxsqqgh3VSWQ+9+/F8ca8w8UeGgV9NxR nYEWDJTN5EBpP3BIJDGAy7skTDlx/ftKRRZ3GYPaTojSWrulAd9xRWGaocRRPI9RLfCRR3 uEkV8CrbBQwa7GN5em/x+TQ91VEXWdqUM7x0FNZ/Pihdm1RZPiME8mw4j9FOu6mC90xVvZ zsi3y7up6RJ0jQCkOJWGdSKeh+ZijQxaGmoxyf+gyBAJYlvP8vZPc/ucWDrF3EKdBfd21s +ffJIvQK2WGFlZRtSXPF85xIZli1OEMUReSxPy8HBeKx7wFHiTYBulRGmtv3YQ== 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 4RjCBP0K9Cz11mh; Fri, 8 Sep 2023 23:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388NYa6u072601; Fri, 8 Sep 2023 23:34:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NYaCl072598; Fri, 8 Sep 2023 23:34:36 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:34:36 GMT Message-Id: <202309082334.388NYaCl072598@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 897e56436162 - main - cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 897e564361624411c4e557e0817642e1477f0af4 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=897e564361624411c4e557e0817642e1477f0af4 commit 897e564361624411c4e557e0817642e1477f0af4 Author: John Baldwin AuthorDate: 2023-09-08 23:31:38 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:31:38 +0000 cxgbe t4_tls: Call t4_rcvd_locked from do_rx_tls_cmp Similar to dcfddc8dc091e7688abc8488a0307eba425fa7a2, replace the simpler, inlined version with the full version. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41690 --- sys/dev/cxgbe/tom/t4_tls.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/sys/dev/cxgbe/tom/t4_tls.c b/sys/dev/cxgbe/tom/t4_tls.c index 29a840067c62..3a0c1a392e6c 100644 --- a/sys/dev/cxgbe/tom/t4_tls.c +++ b/sys/dev/cxgbe/tom/t4_tls.c @@ -794,7 +794,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) struct mbuf *tls_data; struct tls_get_record *tgr; struct mbuf *control; - int pdu_length, rx_credits, trailer_len; + int pdu_length, trailer_len; #if defined(KTR) || defined(INVARIANTS) int len; #endif @@ -975,16 +975,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m) sbappendcontrol_locked(sb, m, control, 0); else sbappendstream_locked(sb, m, 0); - rx_credits = sbspace(sb) > tp->rcv_wnd ? sbspace(sb) - tp->rcv_wnd : 0; -#ifdef VERBOSE_TRACES - CTR4(KTR_CXGBE, "%s: tid %u rx_credits %u rcv_wnd %u", - __func__, tid, rx_credits, tp->rcv_wnd); -#endif - if (rx_credits > 0 && sbused(sb) + tp->rcv_wnd < sb->sb_lowat) { - rx_credits = send_rx_credits(sc, toep, rx_credits); - tp->rcv_wnd += rx_credits; - tp->rcv_adv += rx_credits; - } + t4_rcvd_locked(&toep->td->tod, tp); sorwakeup_locked(so); SOCKBUF_UNLOCK_ASSERT(sb); From nobody Fri Sep 8 23:37:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjCFQ4xdYz4scwS; Fri, 8 Sep 2023 23:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjCFQ3wkpz4YF7; Fri, 8 Sep 2023 23:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mKnKWwrIs3Y4mqmOk5KnNBlDf72W4udsHKXOq2fPlR4=; b=L1apmLjo+YWxRipLPVItw4g4eTPMozuns1o/KnXIRQYcQI0DRWSG4mV4Su1Msh9y+CEeD0 K99kbOFRMfVlA2QGcvLEpL/tj7THA6efB1831nGZcs0i6k/vmryGYEIpbBJRPbIQZ15/Jl Ha2x/vO43AetXKvSq+1FsN1h0S28hmI2QGyHeWHazwabyGWGdSCWz7z3mVT0vkXc79+1Jt oVKBZJAV8tqTZcij10bqELEL1ViEAV1hQJ348QZF9wY8ZR4D8s3H/NFQTzV4fh4G4bTHyU nbPXjUqXXAgoYMbXHqeiuGx4bapXgKI1plwga39TBnpqvHcvgxhACCHZBl2J5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216234; a=rsa-sha256; cv=none; b=PTyZyRH7qg5Jq6uGKl0H8GpvaYzbrOcqPoKYBUJGN9heepC/uWiRpm93Rkb5cra95ygOiZ FTLqPE5S53x4ye1F3aiKrqKIJdD8VQD8DbXHqE+INPOzxoPvXmSo76w5pugSBCfsSIt+Pg kgUaM7jwdd/dPEF6HLirNh28dwj75hg9W7ZPqN6dp5YeKENIr0VgBTuPiylc9uf/TmPdw9 QLI3CV/dqD11o/Hm/Z4LQ40bR1NH1g/7+Mssk+eVQwZlMoYFcTle4t1OhLsyQosjsVYl42 2e1SPN/vPnxm/S7VWZlWoz2qZVlw1qnQHl+6B7QQfkjMpI+m0LQuH3KNaQEXvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mKnKWwrIs3Y4mqmOk5KnNBlDf72W4udsHKXOq2fPlR4=; b=xBqjRxeUIeJAvqW92R5FtJACFRXaQk9pvagUMGNEb0lMw+4szsaXZiLNND1Y8q2LKBD6eP l3a0MzuSDjYOKSXOJAOZRnP8XhIz13xXVoSd8a1G8fGVEtq6A7ol8lOPwxTB/hKrEkBDfB TxoPY7eMyHoMObepgszHDVYFc3LDEuRahtobZxRajlQfvXdVfskcA3gP0WBc9ldRroBAG8 OIsentG8L+y/XSzqKZ24vBQtJytjVMEDQcwdfxs1h/TVkGuFlt2J44LTJDv2VEqxernb7o UVdHL6I9ZjH0ndudcwNJI4QrMVytLYK1gkaaeO5TZGlXuikSmRmiqf8d0zCGfA== 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 4RjCFQ2hCjz1250; Fri, 8 Sep 2023 23:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388NbE1D073149; Fri, 8 Sep 2023 23:37:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NbEcO073146; Fri, 8 Sep 2023 23:37:14 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:37:14 GMT Message-Id: <202309082337.388NbEcO073146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3b5fc5eead84 - main - riscv: Print stval in dump_regs for fatal exceptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b5fc5eead84bd75dedead71a7f3771882942fa7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3b5fc5eead84bd75dedead71a7f3771882942fa7 commit 3b5fc5eead84bd75dedead71a7f3771882942fa7 Author: John Baldwin AuthorDate: 2023-09-08 23:35:59 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:35:59 +0000 riscv: Print stval in dump_regs for fatal exceptions Reviewed by: mhorne, markj Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41700 --- sys/riscv/riscv/trap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index bde402c1cc16..b855fcc4163a 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -186,6 +186,7 @@ dump_regs(struct trapframe *frame) print_with_symbol("tp", frame->tf_tp); print_with_symbol("sepc", frame->tf_sepc); printf("sstatus: 0x%016lx\n", frame->tf_sstatus); + printf("stval : 0x%016lx\n", frame->tf_stval); } static void From nobody Fri Sep 8 23:37:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjCFR58MFz4sd2M; Fri, 8 Sep 2023 23:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjCFR4NtBz4YHR; Fri, 8 Sep 2023 23:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8d1cWiT5+Whhcmz/TGam5cyZtDfR/E9aChTHWEBUE4=; b=s+sLbnKiGD7trFZJeGPUXMulB50xashggw/83iHueHz5693o6SeeX1GAyjGOdT8x21ndc3 zPI0KMPgS6WqWhreZdcvRutaFbuMM3rqAM8jmP8AM1UcE3VMk4WP/Ka5Z9ETi29T65Hqbf gCj26/cdWzwVRG0XqJ37xii2UXNn1MYFTDfJrUhCI/3Eg0QgdiywJvGf9UK6KV3sGr29yV yIZZfT31IoMjCq7b4mdGeUxvS97yG4by8TIZZHCPq6a/eBKpTsh95LzoHlx/+uNRDipyFK qcJFz9mwaqFVFhaj4hWCWra2aZ3kmPOPKKXf+MaQy4qwV421CHwU6VHMdHQ/7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216235; a=rsa-sha256; cv=none; b=HeYd2f9K5GgZPPGXsGKw+mRa6oH8CZ0ZueUHIrTMHXxW/z6SK43q1ldnpy8lIKs7mkZhsu KlNc3ZiJBYozLa5VxiLYlrpFJqOTqYkQkntF+vPJhb2WZP6mTB8Ohj6v0/WJQ27dIVYzPD xcDxTJJ6pzWzwlkyDaVXTfpo+uWHbVfIcjBlf/XueMZ1s9RSZT9ULQIY7yjxyGAovSN7p8 Tx7X4o8PThoCZGo4rU0PXinMzFVNAvF8oVIz19+jT7TFc8h7PvMzP5TvxI9ynlICpy/TN3 zoW225GhF5ELcLVQY1WiYTkhENq5jO/PBGkjEurXU3SNa38d0lgqm84tx+W/Eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R8d1cWiT5+Whhcmz/TGam5cyZtDfR/E9aChTHWEBUE4=; b=t0bjQDZ2fnYEkSpiFbCu7yHATWZnt+lQI3WBzk+EPjEsfguZfQsF3wVFaR8M6rYEAOyHEE EkeQ1jNvK5BNtffiQs8Adutk5Pftkn6vdIlANfMCSmd6emYed2KuAyV9PwGLcznoeLHmZN 6SVyPZIujPWjRlwxXCCVhJe95y9UiEVRVEHU6RqdRGW+GU5s5wIstswpOubSVEw6EVq3eL g/SDzFiPmUX4uNerQVgcoxfwBpqzXrE7+PrPpXqTdtspABPWfuiqWUNH35oxwu1yzZjyLC r8cp8VRfLXIU8ilckMiaBMbWyALwTrs6VzficaLMVEpZB6CAT5OWBv2b7/Onkw== 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 4RjCFR3Pnvz125r; Fri, 8 Sep 2023 23:37:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388NbFo0073198; Fri, 8 Sep 2023 23:37:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NbFjo073195; Fri, 8 Sep 2023 23:37:15 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:37:15 GMT Message-Id: <202309082337.388NbFjo073195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3555be0124a4 - main - Move kern_extattr_* prototypes to List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3555be0124a4f105c72d932f00071f332691e8cf Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3555be0124a4f105c72d932f00071f332691e8cf commit 3555be0124a4f105c72d932f00071f332691e8cf Author: John Baldwin AuthorDate: 2023-09-08 23:36:28 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:36:28 +0000 Move kern_extattr_* prototypes to All of the kern_* prototypes belong in this header. While here, sort the prototypes by function name. Reviewed by: dchagin Fixes: 6453d4240f6b vfs: Export exattr methods to reuse by Linuxulator Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41766 --- sys/kern/vfs_extattr.c | 1 + sys/sys/extattr.h | 22 ---------------------- sys/sys/syscallsubr.h | 20 ++++++++++++++++++++ 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index e178589067c1..dc1bbb58644b 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include diff --git a/sys/sys/extattr.h b/sys/sys/extattr.h index a6689c869c0c..a16ef238656f 100644 --- a/sys/sys/extattr.h +++ b/sys/sys/extattr.h @@ -62,33 +62,11 @@ #ifdef _KERNEL #include -enum uio_seg; -struct uio; struct thread; struct ucred; struct vnode; int extattr_check_cred(struct vnode *vp, int attrnamespace, struct ucred *cred, struct thread *td, accmode_t accmode); -int kern_extattr_set_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, void *data, - size_t nbytes, int follow, enum uio_seg pathseg); -int kern_extattr_set_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname, void *data, size_t nbytes); -int kern_extattr_get_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, void *data, - size_t nbytes, int follow, enum uio_seg pathseg); -int kern_extattr_get_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname, void *data, size_t nbytes); -int kern_extattr_delete_path(struct thread *td, const char *path, - int attrnamespace, const char *attrname, int follow, - enum uio_seg pathseg); -int kern_extattr_delete_fd(struct thread *td, int fd, int attrnamespace, - const char *attrname); -int kern_extattr_list_path(struct thread *td, const char *path, - int attrnamespace, struct uio *auiop, int follow, - enum uio_seg pathseg); -int kern_extattr_list_fd(struct thread *td, int fd, int attrnamespace, - struct uio *auiop); #else #include diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 8be860dc0fd4..0480eda2fca4 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -139,6 +139,26 @@ int kern_cpuset_setid(struct thread *td, cpuwhich_t which, int kern_dup(struct thread *td, u_int mode, int flags, int old, int new); int kern_execve(struct thread *td, struct image_args *args, struct mac *mac_p, struct vmspace *oldvmspace); +int kern_extattr_delete_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname); +int kern_extattr_delete_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, int follow, + enum uio_seg pathseg); +int kern_extattr_get_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname, void *data, size_t nbytes); +int kern_extattr_get_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, void *data, + size_t nbytes, int follow, enum uio_seg pathseg); +int kern_extattr_list_fd(struct thread *td, int fd, int attrnamespace, + struct uio *auiop); +int kern_extattr_list_path(struct thread *td, const char *path, + int attrnamespace, struct uio *auiop, int follow, + enum uio_seg pathseg); +int kern_extattr_set_fd(struct thread *td, int fd, int attrnamespace, + const char *attrname, void *data, size_t nbytes); +int kern_extattr_set_path(struct thread *td, const char *path, + int attrnamespace, const char *attrname, void *data, + size_t nbytes, int follow, enum uio_seg pathseg); int kern_fchmodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, mode_t mode, int flag); int kern_fchownat(struct thread *td, int fd, const char *path, From nobody Fri Sep 8 23:37:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjCFT1mpsz4sd00; Fri, 8 Sep 2023 23:37:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjCFS64fdz4YTg; Fri, 8 Sep 2023 23:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meF95dFA6RPds2rvEBxGU904DjFu5aiU3so0C5xfNC0=; b=otSSxE0nGjzWCq5OgqXISqhV5OurZxamgpgI43D0kOGUBdGm5KyBNMjQQrh9xj4iyNVpUf HTGAL1+bkwG9B4r7XMwPLnp+mPuW2Kyurwbnvy8BOK/THqQaO4FDzdzoMEtgkJHx2GHc36 8n5LCJydgA23f0eYq8YHRRlUBIKh0OB0rwjQ6ejwO+T7WQSY7QKeOMTUKYMhHXEqWqt2+w St9Z8Rr4rNW01yCzk5pbY5lDDI70S/r2AlBVt38nc0cYA6qoLwLYbkoT4Gd2ipmbMmnjJE tE1YCYr34dkGF0ijpzHZZukUEvC2oItR1VOCyEvau7CK7oz9/vCQWTby//4lWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694216236; a=rsa-sha256; cv=none; b=EQYerFR8vkfnYl1gAlMPkwibNPBXxjE4IndC7ltLsS2xauB77uHK9/V9QIKGiDR/dGPTNL g8AXaO9IQKDAK+/nZSmqNv3N4gS3R/vbhyac9xk/QNhu/tyjKihpXW93JjArt/t9O4uQfP xdsvkHjm8WMA6HK+lx1cWyj0aOojw06bT9KR6hYnLdQUWzymfzdbF4MNsvHkTgEpiTjgX1 xMyqCZIj5JsiMDCfpV74jIPGTGdkMfAAZhVE+N4wNnIQ1Na/zX/ubkQQW3OY7svzL61zcZ NH8OCTL2uxbNk3YqM3hPTOqsMbIL44s4YP3W1RYBvwxuys4eEAWC2JuKwd3S7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694216236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=meF95dFA6RPds2rvEBxGU904DjFu5aiU3so0C5xfNC0=; b=ZzBz26kjUNtA34r4BIjGV8JxuTlUJA8owLXfiilJX1VirqwfWQKlL9uq2hwIcyvqZoHQRG HOcVrG/TkyX0zIaHHJkx4asmSECg57cYcFMNJJ33oJoUq+n/OJH7uOHhAz4se4qT2arW7e PJ5nYZtxilyxhwQMynbNxJmfqSs1bMN8I14m/LVC8UrP4KsSlkUn8pDrECKSGtjuhCfidX qT27JyvAlMh9UPa0ujrMgSXWEWAQHUr3Zqh8IScmcMOZluqwVrwdPfG5L92rNw4YkRWN27 KaxrZC9BqVUuN6wg5uby+08xrhKZxdvIcNlwkytUVDPJHEXUV1XkH2QZPeXv5Q== 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 4RjCFS4J4vz125s; Fri, 8 Sep 2023 23:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 388NbGev073256; Fri, 8 Sep 2023 23:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 388NbGCx073253; Fri, 8 Sep 2023 23:37:16 GMT (envelope-from git) Date: Fri, 8 Sep 2023 23:37:16 GMT Message-Id: <202309082337.388NbGCx073253@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9c80d66ec1b4 - main - makeman: Use ${make} instead of plain make to compute ${requireds} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181 commit 9c80d66ec1b4c5b9ac7aaf5b0fdbb1628d49c181 Author: John Baldwin AuthorDate: 2023-09-08 23:36:52 +0000 Commit: John Baldwin CommitDate: 2023-09-08 23:36:52 +0000 makeman: Use ${make} instead of plain make to compute ${requireds} This is currently a no-op but can matter for downstreams whose ${make} includes additional settings. Reviewed by: imp, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41777 --- tools/build/options/makeman | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/options/makeman b/tools/build/options/makeman index f4089d453801..30416b03b983 100755 --- a/tools/build/options/makeman +++ b/tools/build/options/makeman @@ -127,7 +127,7 @@ show() exit 1 ;; esac - requireds=`env -i make -f ${srcdir}/share/mk/src.opts.mk \ + requireds=`env -i ${make} -f ${srcdir}/share/mk/src.opts.mk \ -V '${__REQUIRED_OPTIONS:ts,}'` env -i ${make} .MAKE.MODE=normal "$@" showconfig __MAKE_CONF=/dev/null \ SRCCONF=/dev/null | From nobody Sat Sep 9 03:53:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjJxC3Ldlz4sq7T; Sat, 9 Sep 2023 03:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjJxC2wklz3Qc1; Sat, 9 Sep 2023 03:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694231615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXxsjDux3Ms4FjNPb6+j/l+MERNoX0IlvbqhKy1rdsQ=; b=bFjdIWQqvq6y5OhWybRL8o93Mm5qEgH7pxBAvFk6jbYQfOlqngkF5noN5wyK8JeuC9w46b 76oVDYqbif8XR+ScTQspBWN4rgULkHpQTXHPbCGtRxNe64ND3d1kcvLX8udCX6DyqpOvFa ndbW8lk5A2iZf1OfWu6a0zH62X3CxQ2H6Mafl920ZcmhHH0ijDzYa9TgnoPJECgTfQKWHp +GeqW8zKCdrTlLX/Bgjr/8j9sphaSrzTS59qVSkZ23Qtf+9ncouism3U3RakJIGq5z2dP8 QbGhUKybKlVqun2JA+LgSYW5ewsi75OWR9/rl2nrXFnKsV+RjTsHont4oLzR0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694231615; a=rsa-sha256; cv=none; b=O1hoLMm6u4BTl2nRbloUFpTCxFN9pfiaRUuDPaHpk+xO+3X1yXm1eflMbLCwhGsVsN1Bzm +54XNNYDyEAQlPmjzZZblRgO5MNa4EwEFJyGWz9Bl0K0EdSX0eba0jQQXSS3Pq43fpJSz/ nuwZ0RfXXpj2QPNohRSQ7tsIPaszvJ3giQkNmKRRllj/IFLu7OLJf9c3/f3/cQxKWQNFB6 FLg3g3mkDNOCEH0qtHi30laDQpCrAqNyWLFdRC851iW2lzXMCNWDYWSVHnGMYUPmuXv3MG AQe1FLbhJ/vgSHPnmyOnVn7Vooilxq6vXpn8UG4HHvp2NYVbYaLhghBc9s8beQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694231615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXxsjDux3Ms4FjNPb6+j/l+MERNoX0IlvbqhKy1rdsQ=; b=oa4c6V4XL6+EZpt5dDIYFVBd6KAhlMZUNBm4hnqhvMyyj29mp8j3xcesdvPpLD4IvVhXjN jJ1ef7glPxu8QNvGxl/dSGBQtWC5unT/6QUGBLZ3fsCYof8K4hCYsYoM+JaVKhH6eoRfCm a4+usul3wP8bSAbbJf6B/fppKoB3WhkuoG5a376QTdfouvwqdIWbQkIxhCmi47zKfuN/KX dDrdXjKHhm/ezklyS0F1yBEe5bX9XSKfRivkCTB6NGx5MvDST/u1dyOLcLKY5EPqQIuWfC UO0q5Xnuzh0ZoALeNvnRcpADO3fzwiz17Se7HTlJVU01HBdmjBoRpGvK8LK9tw== 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 4RjJxC1zqNz185F; Sat, 9 Sep 2023 03:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3893rZXM003297; Sat, 9 Sep 2023 03:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3893rZL8003294; Sat, 9 Sep 2023 03:53:35 GMT (envelope-from git) Date: Sat, 9 Sep 2023 03:53:35 GMT Message-Id: <202309090353.3893rZL8003294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8d98eb4e51eb - stable/14 - localedef: correct definition of right-parenthesis in default charmap List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d98eb4e51eb1777b6bdb3682dbd7472c9cc2c71 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8d98eb4e51eb1777b6bdb3682dbd7472c9cc2c71 commit 8d98eb4e51eb1777b6bdb3682dbd7472c9cc2c71 Author: Kyle Evans AuthorDate: 2023-09-02 05:56:31 +0000 Commit: Kyle Evans CommitDate: 2023-09-09 03:52:54 +0000 localedef: correct definition of right-parenthesis in default charmap It turns out that right parentheses do exist and are different than left parentheses, so let's switch to that. Sponsored by: Klara, Inc. (cherry picked from commit 07bc20e4740d09f554c3787bb1940fc503300822) --- usr.bin/localedef/charmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c index bc302965de1a..44b7e3292eae 100644 --- a/usr.bin/localedef/charmap.c +++ b/usr.bin/localedef/charmap.c @@ -86,7 +86,7 @@ static const struct { { "ampersand", '&' }, { "apostrophe", '\'' }, { "left-parenthesis", '(' }, - { "right-parenthesis", '(' }, + { "right-parenthesis", ')' }, { "asterisk", '*' }, { "plus-sign", '+' }, { "comma", ','}, From nobody Sat Sep 9 03:53:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjJxD51X3z4sq0s; Sat, 9 Sep 2023 03:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjJxD4NgBz3R27; Sat, 9 Sep 2023 03:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694231616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUG7w4mUKCKpEOfeWaHZrHxHIYDXSSrRwKeouCYJqHU=; b=JLVOAiuTQNRjdvPNvQQH5NYtOm55qwLyjsxzb/kfYkn6lk7UsPJlVF7xPo6jHnDbgqVYy0 xv+nxTqtTncrWAtkGUaD0Y7KvWtzt+FRT0aOw3cKAq+uPKl/TPHyidXNLD8De3EFbHDq6Q bXj1ddGEQmDrZJg9TFAl3HkRc0yfjxgFqiI/SMO6GrX5WDn6zeQrdb94Wm6QHZVVYNJfwZ dKdNO88RjbcPy4L7DCyAEw0B6ojJU+j6+zLiaq1EZTSDMD6yxspA+0qOOrafuJtJpgN1P7 Wb0KyBjZhntVRSGaOxFIIIs+fDDqRUgxdQ+yCs1A2MubWLcVfz/dyVcmn4jIVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694231616; a=rsa-sha256; cv=none; b=hvXU6HTrBantXuXNjaTY4YCI73a/z7xauA9XdmIGrtZz7x8lNDfFvQrt/cBaJMZ/h+gE81 TPNR17TvjKEAzmNUmylULfnuGCWR1aZM0xodsUHjqGj4l3XK8mlckTG6955T525KGP7C1Y rfTkmxMGon+b7/uPL9iQRlML/Gt3hhYaXIzed2EgCU7Vv1kPGfyt0tDof+VkkPR+7KRtN1 4rXGjdytB09WOpewb71IrW7eF/aSZN3TsgC67415jT0RlJxQfC3KNOsbgniLZwq8q7oqC3 hmJhc9Y2tlWEHNRKmRyp+fNMYBc5CvZ77NlO+YgS3QkMNAQCLxhysFPpT+NhBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694231616; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nUG7w4mUKCKpEOfeWaHZrHxHIYDXSSrRwKeouCYJqHU=; b=qbzTzF4/3XA/ghbUnlUOrC2rOKXzPaePn7vAXu2+NMmuFd+qThvXxqcfkKwmS+lpgza8O4 v6rOJkZad4eeJ5Gjs8t5hgc4RNoTxIKKSSmCvvK50w4ggWCNq5BsrYak4/JiCEtIfUYXU6 3vireIGFX/2+3nLtqHN0+Tpe8lCEdD8/cK2gpDfeeTYBLywn3XBZWV/OVSj6EgfP3WwMlS qKbyFqZzrlyuMs+IBYUyp8i5o40NdtD2oXbrowCGqOWZ+yGWtCsQrPvJOOuBxUjF9Suk2c vuUUkP8sE40Kx4X137prwfuSyttl9U7YMiCTmYvl+qxFpOKWqxgOjN8k3PYC4A== 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 4RjJxD3H9fz189c; Sat, 9 Sep 2023 03:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3893rabF003345; Sat, 9 Sep 2023 03:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3893raI3003342; Sat, 9 Sep 2023 03:53:36 GMT (envelope-from git) Date: Sat, 9 Sep 2023 03:53:36 GMT Message-Id: <202309090353.3893raI3003342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: dc8ee27074d4 - stable/14 - localedef: add newlines to error messages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dc8ee27074d4060549c6ecdc88eeec386691b479 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dc8ee27074d4060549c6ecdc88eeec386691b479 commit dc8ee27074d4060549c6ecdc88eeec386691b479 Author: Kyle Evans AuthorDate: 2023-09-02 06:24:34 +0000 Commit: Kyle Evans CommitDate: 2023-09-09 03:52:58 +0000 localedef: add newlines to error messages These won't be added elsewhere, so add a little bit of room to make these messages a little easier to read. The existing set is a mixed bag, there are somewhere in the ballpark of 45, 46 printfs to stderr and 19 of those had newlines. Reviewed by: yuripv Sponsored by: Klara, Inc. (cherry picked from commit 3141e51d2e38fa7b9e6d81477dfa860d087c514d) --- usr.bin/localedef/collate.c | 34 +++++++++++++++++----------------- usr.bin/localedef/localedef.c | 4 ++-- usr.bin/localedef/localedef.h | 2 +- usr.bin/localedef/monetary.c | 4 ++-- usr.bin/localedef/numeric.c | 2 +- usr.bin/localedef/time.c | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index d76c2c2c08b2..2a080773a95e 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -272,7 +272,7 @@ new_pri(void) maxpri = maxpri ? maxpri * 2 : 1024; prilist = realloc(prilist, sizeof (collpri_t) * maxpri); if (prilist == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return (-1); } for (i = numpri; i < maxpri; i++) { @@ -333,7 +333,7 @@ resolve_pri(int32_t ref) if (pri->pass == pass) { /* report a line with the circular symbol */ lineno = pri->lineno; - fprintf(stderr,"circular reference in order list"); + fprintf(stderr,"circular reference in order list\n"); return (-1); } if ((pri->pri < 0) || (pri->pri >= numpri)) { @@ -494,7 +494,7 @@ define_collsym(char *name) collsym_t *sym; if ((sym = calloc(1, sizeof(*sym))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } sym->name = name; @@ -541,7 +541,7 @@ get_collundef(char *name) if ((ud = RB_FIND(collundefs, &collundefs, &srch)) == NULL) { if (((ud = calloc(1, sizeof(*ud))) == NULL) || ((ud->name = strdup(name)) == NULL)) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); free(ud); return (NULL); } @@ -565,7 +565,7 @@ get_collchar(wchar_t wc, int create) cc = RB_FIND(collchars, &collchars, &srch); if ((cc == NULL) && create) { if ((cc = calloc(1, sizeof(*cc))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return (NULL); } for (i = 0; i < NUM_WT; i++) { @@ -687,7 +687,7 @@ start_order(int type) /* this is used to protect ELLIPSIS processing */ if ((lastorder == T_ELLIPSIS) && (type != T_CHAR)) { - fprintf(stderr, "character value expected"); + fprintf(stderr, "character value expected\n"); } for (i = 0; i < COLL_WEIGHTS_MAX; i++) { @@ -728,7 +728,7 @@ start_order_char(wchar_t wc) int i; if (wc < ellipsis_start) { - fprintf(stderr, "malformed range!"); + fprintf(stderr, "malformed range!\n"); return; } while (ellipsis_start < wc) { @@ -776,7 +776,7 @@ start_order_ellipsis(void) start_order(T_ELLIPSIS); if (lastorder != T_CHAR) { - fprintf(stderr, "illegal starting point for range"); + fprintf(stderr, "illegal starting point for range\n"); return; } @@ -792,12 +792,12 @@ define_collelem(char *name, wchar_t *wcs) int i; if (wcslen(wcs) >= COLLATE_STR_LEN) { - fprintf(stderr,"expanded collation element too long"); + fprintf(stderr,"expanded collation element too long\n"); return; } if ((e = calloc(1, sizeof(*e))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } e->expand = wcs; @@ -816,7 +816,7 @@ define_collelem(char *name, wchar_t *wcs) /* A character sequence can only reduce to one element. */ if ((RB_FIND(elem_by_symbol, &elem_by_symbol, e) != NULL) || (RB_FIND(elem_by_expand, &elem_by_expand, e) != NULL)) { - fprintf(stderr, "duplicate collating element definition"); + fprintf(stderr, "duplicate collating element definition\n"); free(e); return; } @@ -932,7 +932,7 @@ add_order_subst(void) if (s == NULL) { if ((s = calloc(1, sizeof(*s))) == NULL) { - fprintf(stderr,"out of memory"); + fprintf(stderr,"out of memory\n"); return; } s->key = new_pri(); @@ -976,7 +976,7 @@ static void add_subst_pri(int32_t ref) { if (curr_subst >= COLLATE_STR_LEN) { - fprintf(stderr,"substitution string is too long"); + fprintf(stderr,"substitution string is too long\n"); return; } subst_weights[curr_subst] = ref; @@ -1040,7 +1040,7 @@ add_weight(int32_t ref, int pass) return; if ((w = calloc(1, sizeof(*w))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } w->pri = srch.pri; @@ -1214,7 +1214,7 @@ dump_collate(void) RB_COUNT(temp, substs, &substs[i], n); subst_count[i] = n; if ((st = calloc(n, sizeof(collate_subst_t))) == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1245,7 +1245,7 @@ dump_collate(void) RB_NUMNODES(collelem_t, elem_by_expand, &elem_by_expand, chain_count); chain = calloc(chain_count, sizeof(collate_chain_t)); if (chain == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } n = 0; @@ -1265,7 +1265,7 @@ dump_collate(void) RB_NUMNODES(collchar_t, collchars, &collchars, n); large = calloc(n, sizeof(collate_large_t)); if (large == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } diff --git a/usr.bin/localedef/localedef.c b/usr.bin/localedef/localedef.c index ae0bd052b40c..5ff146d6f655 100644 --- a/usr.bin/localedef/localedef.c +++ b/usr.bin/localedef/localedef.c @@ -167,7 +167,7 @@ copy_category(char *src) } if (rv != 0) { - fprintf(stderr,"source locale data unavailable: %s", src); + fprintf(stderr,"source locale data unavailable: %s\n", src); return; } @@ -182,7 +182,7 @@ copy_category(char *src) (void) mkdir(dirname(category_file()), 0755); if (link(srcpath, category_file()) != 0) { - fprintf(stderr,"unable to copy locale data: %s", + fprintf(stderr,"unable to copy locale data: %s\n", strerror(errno)); return; } diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h index 2aece1543d5b..4b141ac8dc09 100644 --- a/usr.bin/localedef/localedef.h +++ b/usr.bin/localedef/localedef.h @@ -174,4 +174,4 @@ const char *get_wide_encoding(void); int max_wide(void); //#define _(x) gettext(x) -#define INTERR fprintf(stderr,"internal fault (%s:%d)", __FILE__, __LINE__) +#define INTERR fprintf(stderr,"internal fault (%s:%d)\n", __FILE__, __LINE__) diff --git a/usr.bin/localedef/monetary.c b/usr.bin/localedef/monetary.c index 659c495a71fe..7a77ac7e256c 100644 --- a/usr.bin/localedef/monetary.c +++ b/usr.bin/localedef/monetary.c @@ -93,7 +93,7 @@ add_monetary_num(int n) (void) asprintf(&str, "%d", n); if (str == NULL) { - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); return; } @@ -167,7 +167,7 @@ add_monetary_group(int n) (void) asprintf(&s, "%s;%d", mon.mon_grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)mon.mon_grouping); mon.mon_grouping = s; diff --git a/usr.bin/localedef/numeric.c b/usr.bin/localedef/numeric.c index 358355fe96ae..5533b7c10e1a 100644 --- a/usr.bin/localedef/numeric.c +++ b/usr.bin/localedef/numeric.c @@ -93,7 +93,7 @@ add_numeric_group(int n) (void) asprintf(&s, "%s;%d", numeric.grouping, n); } if (s == NULL) - fprintf(stderr, "out of memory"); + fprintf(stderr, "out of memory\n"); free((char *)numeric.grouping); numeric.grouping = s; diff --git a/usr.bin/localedef/time.c b/usr.bin/localedef/time.c index 2de922a8eb12..7a56e244c921 100644 --- a/usr.bin/localedef/time.c +++ b/usr.bin/localedef/time.c @@ -104,7 +104,7 @@ add_list(const char *ptr[], char *str, int limit) return; } } - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); } void @@ -137,7 +137,7 @@ add_time_list(wchar_t *wcs) } else if (tm.pm == NULL) { tm.pm = str; } else { - fprintf(stderr,"too many list elements"); + fprintf(stderr,"too many list elements\n"); free(str); } break; @@ -180,11 +180,11 @@ check_time_list(void) case T_ALT_DIGITS: return; default: - fprintf(stderr,"unknown list"); + fprintf(stderr,"unknown list\n"); break; } - fprintf(stderr,"too few items in list (%d)", last_kw); + fprintf(stderr,"too few items in list (%d)\n", last_kw); } void From nobody Sat Sep 9 05:37:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjMFg561vz4sfn1; Sat, 9 Sep 2023 05:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjMFg4lxGz4Rm6; Sat, 9 Sep 2023 05:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694237879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wi5pxP0Iep9SgfieAhftjdg1uDaytGGOOYqO8smEi8M=; b=M4b4vAIMnj7v6gKXZnjaBRdCG3z2gP3SNueaZldupmCAiKTKcjVKzcGC6StoV+F8nraiNE 3o+vgkwApAKB9UbqgSQCAJ7fzzN+DrP4njGwF3rxzMTce5ibjxceql9sRJV3VF06t1ypDZ N8EYVGGMwtYP6jD+kSp2U+xUKyAyaik+LkfmSeR/LJGcCpM1V8xLhFg5vzmFCMaB6z7TG7 0En2nExzlyg64uk2gIZp12mkiFTTw07re+o3eBv4dNJeaFGDRWOGbDPl5uQ4BEXGZ5k788 ZZ1DBzL64GkXH3bG9G7AyUKBlWDa/Te5eZjUsqnqJYOdUUQdpEZlS2npnulEVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694237879; a=rsa-sha256; cv=none; b=MsBBolz9xRa4EdpSCiwBWoDihd3bYPdQCJ9wT7WZkjCK3K7QfoPC2eVmeo69yRvkAV72LE 3TlTjXmc3NZKihjZ+xf1FdjHwix+OUofTI51tUFU42R3n7jCvQ7yhgmiVdYAMCQgXvjlA6 2vc2Z7ZFOrUvBDSFHd6LH+n8mv09KKHJJ6iTVQqVd5lDCeRF14s8gPyDNNrKlIqvOV5cwg qMvsuxvnMeTSnUXuUhKXV2LM0jy0dwxFoHc0pNwsq8fm7S99VSix0/+WNkfGhT2LrLI3j7 dqEuhI2MuwYvmf7F5oXbDUG49EBlrOpAQ0NadOm/BK90EPcrOFZKefWFEnC0uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694237879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wi5pxP0Iep9SgfieAhftjdg1uDaytGGOOYqO8smEi8M=; b=JSCWmNh0RSwI2E3nR4aWOAZTHFpa1Dn/obQ4L5DMlCz2d14WoN601CGkemrWkOgK2ZCu3l PxZ3eDAlgOYdWPEfWYrSgWaBe6aXifdTusr/Bm/+M5R+/WEwfmEDve6aQRKwEovlvhX334 KtWhciyG0/wbN+6r3wlla7lRetTRZRw+C53ggp1CMBBwsPTJSyEAxUu5nAZ/kez8Q0v56l vrPmV/Jsv1iOpj2jDmDzE8NZlQh/vp88tRpPP0rvAoRGeaezXIlS0TqUkzk+fmWlwkJA1B t4gDrVXek1IKvcSSJOh5h5WtpxPcTkGR2Eql8ctndf3ZrvQXGk4dHs540fzvtg== 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 4RjMFg3Nc5z1Bfr; Sat, 9 Sep 2023 05:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3895bxAA069786; Sat, 9 Sep 2023 05:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3895bxp1069783; Sat, 9 Sep 2023 05:37:59 GMT (envelope-from git) Date: Sat, 9 Sep 2023 05:37:59 GMT Message-Id: <202309090537.3895bxp1069783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: a8e9827d4e1e - stable/12 - caroot: update the root bundle and regenerate with OpenSSL 3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a8e9827d4e1e220f3593256ab97ed60b007f0d55 Auto-Submitted: auto-generated The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e9827d4e1e220f3593256ab97ed60b007f0d55 commit a8e9827d4e1e220f3593256ab97ed60b007f0d55 Author: Kyle Evans AuthorDate: 2023-06-15 04:26:23 +0000 Commit: Kyle Evans CommitDate: 2023-09-09 05:34:16 +0000 caroot: update the root bundle and regenerate with OpenSSL 3 Summary: - Twenty six (26) newly trusted - Thirteen (13) distrusted (cherry picked from commit f5e5dcdbeb699bda5a43c5600b522108cc612ac8) (cherry picked from commit ee0aa1ce12b3caea34477a31e9d2111a329e33b9) (cherry picked from commit 65fd80909e196c8be2ce5e948775e9cbda2ef069) (cherry picked from commit 8ed0ecf8024d10e9cd21f5880723a6cec4fd4ae6) --- ObsoleteFiles.inc | 15 +++ .../caroot/blacklisted/AddTrust_External_Root.pem | 34 ++--- .../AddTrust_Low-Value_Services_Root.pem | 34 ++--- .../Camerfirma_Chambers_of_Commerce_Root.pem | 36 +++--- .../Camerfirma_Global_Chambersign_Root.pem | 36 +++--- secure/caroot/blacklisted/Certum_Root_CA.pem | 33 ++--- .../Chambers_of_Commerce_Root_-_2008.pem | 65 +++++----- .../Cybertrust_Global_Root.pem | 38 +++--- .../caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem | 36 +++--- .../{trusted => blacklisted}/DST_Root_CA_X3.pem | 33 ++--- .../E-Tugra_Certification_Authority.pem | 64 +++++----- .../blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem | 73 +++++++++++ .../blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem | 140 +++++++++++++++++++++ secure/caroot/blacklisted/EC-ACC.pem | 34 ++--- .../EE_Certification_Centre_Root_CA.pem | 33 ++--- secure/caroot/blacklisted/GeoTrust_Global_CA.pem | 36 +++--- .../GeoTrust_Primary_Certification_Authority.pem | 33 ++--- ...oTrust_Primary_Certification_Authority_-_G2.pem | 13 +- ...oTrust_Primary_Certification_Authority_-_G3.pem | 33 ++--- .../caroot/blacklisted/GeoTrust_Universal_CA.pem | 64 +++++----- .../caroot/blacklisted/GeoTrust_Universal_CA_2.pem | 64 +++++----- .../GlobalSign_Root_CA_-_R2.pem | 38 +++--- .../blacklisted/Global_Chambersign_Root_-_2008.pem | 65 +++++----- ...demic_and_Research_Institutions_RootCA_2011.pem | 34 ++--- .../Hongkong_Post_Root_CA_1.pem | 33 ++--- .../caroot/blacklisted/LuxTrust_Global_Root_2.pem | 65 +++++----- .../Network_Solutions_Certificate_Authority.pem | 35 +++--- .../OISTE_WISeKey_Global_Root_GA_CA.pem | 33 ++--- secure/caroot/blacklisted/QuoVadis_Root_CA.pem | 36 +++--- .../caroot/blacklisted/Sonera_Class_2_Root_CA.pem | 33 ++--- .../Staat_der_Nederlanden_EV_Root_CA.pem | 61 ++++----- .../Staat_der_Nederlanden_Root_CA_-_G2.pem | 62 ++++----- .../Staat_der_Nederlanden_Root_CA_-_G3.pem | 61 ++++----- .../blacklisted/SwissSign_Platinum_CA_-_G2.pem | 65 +++++----- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G6.pem | 33 ++--- secure/caroot/blacklisted/Taiwan_GRCA.pem | 61 ++++----- .../{trusted => blacklisted}/TrustCor_ECA-1.pem | 36 +++--- .../TrustCor_RootCert_CA-1.pem | 36 +++--- .../TrustCor_RootCert_CA-2.pem | 64 +++++----- secure/caroot/blacklisted/Trustis_FPS_Root_CA.pem | 36 +++--- ...Public_Primary_Certification_Authority_-_G4.pem | 13 +- ...Public_Primary_Certification_Authority_-_G5.pem | 33 ++--- ...Sign_Universal_Root_Certification_Authority.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- ...Public_Primary_Certification_Authority_-_G3.pem | 33 ++--- .../caroot/blacklisted/thawte_Primary_Root_CA.pem | 33 ++--- .../blacklisted/thawte_Primary_Root_CA_-_G2.pem | 13 +- .../blacklisted/thawte_Primary_Root_CA_-_G3.pem | 33 ++--- secure/caroot/trusted/ACCVRAIZ1.pem | 68 +++++----- secure/caroot/trusted/AC_RAIZ_FNMT-RCM.pem | 62 ++++----- .../AC_RAIZ_FNMT-RCM_SERVIDORES_SEGUROS.pem | 13 +- .../caroot/trusted/ANF_Secure_Server_Root_CA.pem | 64 +++++----- .../trusted/Actalis_Authentication_Root_CA.pem | 64 +++++----- secure/caroot/trusted/AffirmTrust_Commercial.pem | 33 ++--- secure/caroot/trusted/AffirmTrust_Networking.pem | 33 ++--- secure/caroot/trusted/AffirmTrust_Premium.pem | 61 ++++----- secure/caroot/trusted/AffirmTrust_Premium_ECC.pem | 13 +- secure/caroot/trusted/Amazon_Root_CA_1.pem | 33 ++--- secure/caroot/trusted/Amazon_Root_CA_2.pem | 61 ++++----- secure/caroot/trusted/Amazon_Root_CA_3.pem | 9 +- secure/caroot/trusted/Amazon_Root_CA_4.pem | 13 +- secure/caroot/trusted/Atos_TrustedRoot_2011.pem | 37 +++--- .../Atos_TrustedRoot_Root_CA_ECC_TLS_2021.pem | 68 ++++++++++ .../Atos_TrustedRoot_Root_CA_RSA_TLS_2021.pem | 135 ++++++++++++++++++++ ...ertificacion_Firmaprofesional_CIF_A62634068.pem | 62 ++++----- secure/caroot/trusted/BJCA_Global_Root_CA1.pem | 136 ++++++++++++++++++++ secure/caroot/trusted/BJCA_Global_Root_CA2.pem | 68 ++++++++++ .../caroot/trusted/Baltimore_CyberTrust_Root.pem | 33 ++--- secure/caroot/trusted/Buypass_Class_2_Root_CA.pem | 61 ++++----- secure/caroot/trusted/Buypass_Class_3_Root_CA.pem | 61 ++++----- secure/caroot/trusted/CA_Disig_Root_R2.pem | 61 ++++----- secure/caroot/trusted/CFCA_EV_ROOT.pem | 64 +++++----- .../trusted/COMODO_Certification_Authority.pem | 35 +++--- .../trusted/COMODO_ECC_Certification_Authority.pem | 13 +- .../trusted/COMODO_RSA_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/Certainly_Root_E1.pem | 67 ++++++++++ secure/caroot/trusted/Certainly_Root_R1.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/Certigna.pem | 34 ++--- secure/caroot/trusted/Certigna_Root_CA.pem | 68 +++++----- secure/caroot/trusted/Certum_EC-384_CA.pem | 13 +- .../caroot/trusted/Certum_Trusted_Network_CA.pem | 33 ++--- .../caroot/trusted/Certum_Trusted_Network_CA_2.pem | 61 ++++----- secure/caroot/trusted/Certum_Trusted_Root_CA.pem | 61 ++++----- secure/caroot/trusted/Comodo_AAA_Services_root.pem | 36 +++--- .../caroot/trusted/D-TRUST_BR_Root_CA_1_2020.pem | 77 ++++++++++++ .../caroot/trusted/D-TRUST_EV_Root_CA_1_2020.pem | 77 ++++++++++++ .../trusted/D-TRUST_Root_Class_3_CA_2_2009.pem | 36 +++--- .../trusted/D-TRUST_Root_Class_3_CA_2_EV_2009.pem | 36 +++--- .../caroot/trusted/DigiCert_Assured_ID_Root_CA.pem | 36 +++--- .../caroot/trusted/DigiCert_Assured_ID_Root_G2.pem | 33 ++--- .../caroot/trusted/DigiCert_Assured_ID_Root_G3.pem | 13 +- secure/caroot/trusted/DigiCert_Global_Root_CA.pem | 36 +++--- secure/caroot/trusted/DigiCert_Global_Root_G2.pem | 33 ++--- secure/caroot/trusted/DigiCert_Global_Root_G3.pem | 13 +- .../trusted/DigiCert_High_Assurance_EV_Root_CA.pem | 36 +++--- .../trusted/DigiCert_TLS_ECC_P384_Root_G5.pem | 68 ++++++++++ .../trusted/DigiCert_TLS_RSA4096_Root_G5.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/DigiCert_Trusted_Root_G4.pem | 61 ++++----- .../Entrust_Root_Certification_Authority.pem | 36 +++--- .../Entrust_Root_Certification_Authority_-_EC1.pem | 13 +- .../Entrust_Root_Certification_Authority_-_G2.pem | 33 ++--- .../Entrust_Root_Certification_Authority_-_G4.pem | 61 ++++----- .../Entrust_net_Premium_2048_Secure_Server_CA.pem | 33 ++--- secure/caroot/trusted/GDCA_TrustAUTH_R5_ROOT.pem | 61 ++++----- secure/caroot/trusted/GLOBALTRUST_2020.pem | 64 +++++----- secure/caroot/trusted/GTS_Root_R1.pem | 125 +++++++++--------- secure/caroot/trusted/GTS_Root_R2.pem | 125 +++++++++--------- secure/caroot/trusted/GTS_Root_R3.pem | 41 +++--- secure/caroot/trusted/GTS_Root_R4.pem | 41 +++--- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R4.pem | 36 +++--- .../caroot/trusted/GlobalSign_ECC_Root_CA_-_R5.pem | 13 +- secure/caroot/trusted/GlobalSign_Root_CA.pem | 33 ++--- secure/caroot/trusted/GlobalSign_Root_CA_-_R3.pem | 33 ++--- secure/caroot/trusted/GlobalSign_Root_CA_-_R6.pem | 64 +++++----- secure/caroot/trusted/GlobalSign_Root_E46.pem | 13 +- secure/caroot/trusted/GlobalSign_Root_R46.pem | 61 ++++----- secure/caroot/trusted/Go_Daddy_Class_2_CA.pem | 34 ++--- .../Go_Daddy_Root_Certificate_Authority_-_G2.pem | 33 ++--- .../caroot/trusted/HARICA_TLS_ECC_Root_CA_2021.pem | 69 ++++++++++ .../caroot/trusted/HARICA_TLS_RSA_Root_CA_2021.pem | 137 ++++++++++++++++++++ ...c_and_Research_Institutions_ECC_RootCA_2015.pem | 13 +- ...demic_and_Research_Institutions_RootCA_2015.pem | 61 ++++----- secure/caroot/trusted/HiPKI_Root_CA_-_G1.pem | 135 ++++++++++++++++++++ secure/caroot/trusted/Hongkong_Post_Root_CA_3.pem | 64 +++++----- secure/caroot/trusted/ISRG_Root_X1.pem | 61 ++++----- secure/caroot/trusted/ISRG_Root_X2.pem | 68 ++++++++++ .../trusted/IdenTrust_Commercial_Root_CA_1.pem | 61 ++++----- .../trusted/IdenTrust_Public_Sector_Root_CA_1.pem | 61 ++++----- secure/caroot/trusted/Izenpe_com.pem | 61 ++++----- .../trusted/Microsec_e-Szigno_Root_CA_2009.pem | 36 +++--- ...crosoft_ECC_Root_Certificate_Authority_2017.pem | 13 +- ...crosoft_RSA_Root_Certificate_Authority_2017.pem | 61 ++++----- .../NAVER_Global_Root_Certification_Authority.pem | 61 ++++----- ...etLock_Arany__Class_Gold__F__tan__s__tv__ny.pem | 33 ++--- .../trusted/OISTE_WISeKey_Global_Root_GB_CA.pem | 33 ++--- .../trusted/OISTE_WISeKey_Global_Root_GC_CA.pem | 13 +- secure/caroot/trusted/QuoVadis_Root_CA_1_G3.pem | 61 ++++----- secure/caroot/trusted/QuoVadis_Root_CA_2.pem | 62 ++++----- secure/caroot/trusted/QuoVadis_Root_CA_2_G3.pem | 61 ++++----- secure/caroot/trusted/QuoVadis_Root_CA_3.pem | 63 +++++----- secure/caroot/trusted/QuoVadis_Root_CA_3_G3.pem | 61 ++++----- ...SSL_com_EV_Root_Certification_Authority_ECC.pem | 16 +-- ..._com_EV_Root_Certification_Authority_RSA_R2.pem | 64 +++++----- .../SSL_com_Root_Certification_Authority_ECC.pem | 16 +-- .../SSL_com_Root_Certification_Authority_RSA.pem | 64 +++++----- .../trusted/SSL_com_TLS_ECC_Root_CA_2022.pem | 70 +++++++++++ .../trusted/SSL_com_TLS_RSA_Root_CA_2022.pem | 138 ++++++++++++++++++++ secure/caroot/trusted/SZAFIR_ROOT_CA2.pem | 33 ++--- ...ctigo_Public_Server_Authentication_Root_E46.pem | 68 ++++++++++ ...ctigo_Public_Server_Authentication_Root_R46.pem | 136 ++++++++++++++++++++ secure/caroot/trusted/SecureSign_RootCA11.pem | 33 ++--- secure/caroot/trusted/SecureTrust_CA.pem | 35 +++--- secure/caroot/trusted/Secure_Global_CA.pem | 35 +++--- .../trusted/Security_Communication_ECC_RootCA1.pem | 68 ++++++++++ .../trusted/Security_Communication_RootCA2.pem | 33 ++--- .../trusted/Security_Communication_RootCA3.pem | 136 ++++++++++++++++++++ .../trusted/Security_Communication_Root_CA.pem | 33 ++--- secure/caroot/trusted/Starfield_Class_2_CA.pem | 34 ++--- .../Starfield_Root_Certificate_Authority_-_G2.pem | 33 ++--- ...ld_Services_Root_Certificate_Authority_-_G2.pem | 33 ++--- secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem | 65 +++++----- secure/caroot/trusted/SwissSign_Silver_CA_-_G2.pem | 65 +++++----- .../trusted/T-TeleSec_GlobalRoot_Class_2.pem | 33 ++--- .../trusted/T-TeleSec_GlobalRoot_Class_3.pem | 33 ++--- ...BITAK_Kamu_SM_SSL_Kok_Sertifikasi_-_Surum_1.pem | 33 ++--- secure/caroot/trusted/TWCA_Global_Root_CA.pem | 61 ++++----- .../trusted/TWCA_Root_Certification_Authority.pem | 33 ++--- secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem | 61 ++++----- secure/caroot/trusted/Telia_Root_CA_v2.pem | 138 ++++++++++++++++++++ .../Trustwave_Global_Certification_Authority.pem | 61 ++++----- ...ave_Global_ECC_P256_Certification_Authority.pem | 9 +- ...ave_Global_ECC_P384_Certification_Authority.pem | 13 +- secure/caroot/trusted/TunTrust_Root_CA.pem | 139 ++++++++++++++++++++ .../trusted/UCA_Extended_Validation_Root.pem | 61 ++++----- secure/caroot/trusted/UCA_Global_G2_Root.pem | 61 ++++----- .../USERTrust_ECC_Certification_Authority.pem | 13 +- .../USERTrust_RSA_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/XRamp_Global_CA_Root.pem | 35 +++--- secure/caroot/trusted/certSIGN_ROOT_CA.pem | 33 ++--- secure/caroot/trusted/certSIGN_Root_CA_G2.pem | 61 ++++----- secure/caroot/trusted/e-Szigno_Root_CA_2017.pem | 12 +- .../trusted/ePKI_Root_Certification_Authority.pem | 61 ++++----- secure/caroot/trusted/emSign_ECC_Root_CA_-_C3.pem | 13 +- secure/caroot/trusted/emSign_ECC_Root_CA_-_G3.pem | 13 +- secure/caroot/trusted/emSign_Root_CA_-_C1.pem | 33 ++--- secure/caroot/trusted/emSign_Root_CA_-_G1.pem | 33 ++--- secure/caroot/trusted/vTrus_ECC_Root_CA.pem | 68 ++++++++++ secure/caroot/trusted/vTrus_Root_CA.pem | 135 ++++++++++++++++++++ 192 files changed, 6176 insertions(+), 3411 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 50e53f0c4109..230bc8b5a6d9 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,21 @@ # xargs -n1 | sort | uniq -d; # done +# 20230909: caroot bundle updated +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Certification_Authority.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_ECC_v3.pem +OLD_FILES+=usr/share/certs/trusted/E-Tugra_Global_Root_CA_RSA_v3.pem +OLD_FILES+=usr/share/certs/trusted/Hongkong_Post_Root_CA_1.pem +OLD_FILES+=usr/share/certs/trusted/Cybertrust_Global_Root.pem +OLD_FILES+=usr/share/certs/trusted/DST_Root_CA_X3.pem +OLD_FILES+=usr/share/certs/trusted/GlobalSign_Root_CA_-_R2.pem +OLD_FILES+=usr/share/certs/trusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem +OLD_FILES+=usr/share/certs/trusted/Network_Solutions_Certificate_Authority.pem +OLD_FILES+=usr/share/certs/trusted/Staat_der_Nederlanden_EV_Root_CA.pem +OLD_FILES+=usr/share/certs/trusted/TrustCor_ECA-1.pem +OLD_FILES+=usr/share/certs/trusted/TrustCor_RootCert_CA-1.pem +OLD_FILES+=usr/share/certs/trusted/TrustCor_RootCert_CA-2.pem + # 20220410: zlib 1.0.4 removed from kernel OLD_FILES+=/usr/include/sys/zlib.h OLD_FILES+=/usr/include/sys/zutil.h diff --git a/secure/caroot/blacklisted/AddTrust_External_Root.pem b/secure/caroot/blacklisted/AddTrust_External_Root.pem index 701bc7bce072..97fe312d0e8f 100644 --- a/secure/caroot/blacklisted/AddTrust_External_Root.pem +++ b/secure/caroot/blacklisted/AddTrust_External_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = SE, O = AddTrust AB, OU = AddTrust External TTP Network, CN = AddTrust External CA Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + 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: @@ -54,23 +54,23 @@ Certificate: 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 - 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 + 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 diff --git a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem b/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem index 0595db909a49..afb471de944f 100644 --- a/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem +++ b/secure/caroot/blacklisted/AddTrust_Low-Value_Services_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = SE, O = AddTrust AB, OU = AddTrust TTP Network, CN = AddTrust Class 1 CA Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + 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: @@ -54,23 +54,23 @@ Certificate: 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 - 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 + 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 diff --git a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem index cf7de6cc122b..1b2ffb4f5dc8 100644 --- a/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Chambers_of_Commerce_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = EU, O = AC Camerfirma SA CIF A82743287, OU = http://www.chambersign.org, CN = Chambers of Commerce Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:b7:36:55:e5:a5:5d:18:30:e0:da:89:54:91:fc: c8:c7:52:f8:2f:50:d9:ef:b1:75:73:65:47:7d:1b: @@ -47,10 +47,8 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE, pathlen:12 X509v3 CRL Distribution Points: - Full Name: URI:http://crl.chambersign.org/chambersroot.crl - X509v3 Subject Key Identifier: E3:94:F5:B1:4D:E9:DB:A1:29:5B:57:8B:4D:76:06:76:E1:D1:A2:8A X509v3 Key Usage: critical @@ -64,23 +62,23 @@ Certificate: X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.17326.10.3.1 CPS: http://cps.chambersign.org/cps/chambersroot.html - Signature Algorithm: sha1WithRSAEncryption - 0c:41:97:c2:1a:86:c0:22:7c:9f:fb:90:f3:1a:d1:03:b1:ef: - 13:f9:21:5f:04:9c:da:c9:a5:8d:27:6c:96:87:91:be:41:90: - 01:72:93:e7:1e:7d:5f:f6:89:c6:5d:a7:40:09:3d:ac:49:45: - 45:dc:2e:8d:30:68:b2:09:ba:fb:c3:2f:cc:ba:0b:df:3f:77: - 7b:46:7d:3a:12:24:8e:96:8f:3c:05:0a:6f:d2:94:28:1d:6d: - 0c:c0:2e:88:22:d5:d8:cf:1d:13:c7:f0:48:d7:d7:05:a7:cf: - c7:47:9e:3b:3c:34:c8:80:4f:d4:14:bb:fc:0d:50:f7:fa:b3: - ec:42:5f:a9:dd:6d:c8:f4:75:cf:7b:c1:72:26:b1:01:1c:5c: - 2c:fd:7a:4e:b4:01:c5:05:57:b9:e7:3c:aa:05:d9:88:e9:07: - 46:41:ce:ef:41:81:ae:58:df:83:a2:ae:ca:d7:77:1f:e7:00: - 3c:9d:6f:8e:e4:32:09:1d:4d:78:34:78:34:3c:94:9b:26:ed: - 4f:71:c6:19:7a:bd:20:22:48:5a:fe:4b:7d:03:b7:e7:58:be: - c6:32:4e:74:1e:68:dd:a8:68:5b:b3:3e:ee:62:7d:d9:80:e8: - 0a:75:7a:b7:ee:b4:65:9a:21:90:e0:aa:d0:98:bc:38:b5:73: - 3c:8b:f8:dc + Signature Value: + 0c:41:97:c2:1a:86:c0:22:7c:9f:fb:90:f3:1a:d1:03:b1:ef: + 13:f9:21:5f:04:9c:da:c9:a5:8d:27:6c:96:87:91:be:41:90: + 01:72:93:e7:1e:7d:5f:f6:89:c6:5d:a7:40:09:3d:ac:49:45: + 45:dc:2e:8d:30:68:b2:09:ba:fb:c3:2f:cc:ba:0b:df:3f:77: + 7b:46:7d:3a:12:24:8e:96:8f:3c:05:0a:6f:d2:94:28:1d:6d: + 0c:c0:2e:88:22:d5:d8:cf:1d:13:c7:f0:48:d7:d7:05:a7:cf: + c7:47:9e:3b:3c:34:c8:80:4f:d4:14:bb:fc:0d:50:f7:fa:b3: + ec:42:5f:a9:dd:6d:c8:f4:75:cf:7b:c1:72:26:b1:01:1c:5c: + 2c:fd:7a:4e:b4:01:c5:05:57:b9:e7:3c:aa:05:d9:88:e9:07: + 46:41:ce:ef:41:81:ae:58:df:83:a2:ae:ca:d7:77:1f:e7:00: + 3c:9d:6f:8e:e4:32:09:1d:4d:78:34:78:34:3c:94:9b:26:ed: + 4f:71:c6:19:7a:bd:20:22:48:5a:fe:4b:7d:03:b7:e7:58:be: + c6:32:4e:74:1e:68:dd:a8:68:5b:b3:3e:ee:62:7d:d9:80:e8: + 0a:75:7a:b7:ee:b4:65:9a:21:90:e0:aa:d0:98:bc:38:b5:73: + 3c:8b:f8:dc SHA1 Fingerprint=6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1 -----BEGIN CERTIFICATE----- MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn diff --git a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem index b1fa96bc405e..8b9a160051bd 100644 --- a/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem +++ b/secure/caroot/blacklisted/Camerfirma_Global_Chambersign_Root.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = EU, O = AC Camerfirma SA CIF A82743287, OU = http://www.chambersign.org, CN = Global Chambersign Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:a2:70:a2:d0:9f:42:ae:5b:17:c7:d8:7d:cf:14: 83:fc:4f:c9:a1:b7:13:af:8a:d7:9e:3e:04:0a:92: @@ -47,10 +47,8 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE, pathlen:12 X509v3 CRL Distribution Points: - Full Name: URI:http://crl.chambersign.org/chambersignroot.crl - X509v3 Subject Key Identifier: 43:9C:36:9F:B0:9E:30:4D:C6:CE:5F:AD:10:AB:E5:03:A5:FA:A9:14 X509v3 Key Usage: critical @@ -64,23 +62,23 @@ Certificate: X509v3 Certificate Policies: Policy: 1.3.6.1.4.1.17326.10.1.1 CPS: http://cps.chambersign.org/cps/chambersignroot.html - Signature Algorithm: sha1WithRSAEncryption - 3c:3b:70:91:f9:04:54:27:91:e1:ed:ed:fe:68:7f:61:5d:e5: - 41:65:4f:32:f1:18:05:94:6a:1c:de:1f:70:db:3e:7b:32:02: - 34:b5:0c:6c:a1:8a:7c:a5:f4:8f:ff:d4:d8:ad:17:d5:2d:04: - d1:3f:58:80:e2:81:59:88:be:c0:e3:46:93:24:fe:90:bd:26: - a2:30:2d:e8:97:26:57:35:89:74:96:18:f6:15:e2:af:24:19: - 56:02:02:b2:ba:0f:14:ea:c6:8a:66:c1:86:45:55:8b:be:92: - be:9c:a4:04:c7:49:3c:9e:e8:29:7a:89:d7:fe:af:ff:68:f5: - a5:17:90:bd:ac:99:cc:a5:86:57:09:67:46:db:d6:16:c2:46: - f1:e4:a9:50:f5:8f:d1:92:15:d3:5f:3e:c6:00:49:3a:6e:58: - b2:d1:d1:27:0d:25:c8:32:f8:20:11:cd:7d:32:33:48:94:54: - 4c:dd:dc:79:c4:30:9f:eb:8e:b8:55:b5:d7:88:5c:c5:6a:24: - 3d:b2:d3:05:03:51:c6:07:ef:cc:14:72:74:3d:6e:72:ce:18: - 28:8c:4a:a0:77:e5:09:2b:45:44:47:ac:b7:67:7f:01:8a:05: - 5a:93:be:a1:c1:ff:f8:e7:0e:67:a4:47:49:76:5d:75:90:1a: - f5:26:8f:f0 + Signature Value: + 3c:3b:70:91:f9:04:54:27:91:e1:ed:ed:fe:68:7f:61:5d:e5: + 41:65:4f:32:f1:18:05:94:6a:1c:de:1f:70:db:3e:7b:32:02: + 34:b5:0c:6c:a1:8a:7c:a5:f4:8f:ff:d4:d8:ad:17:d5:2d:04: + d1:3f:58:80:e2:81:59:88:be:c0:e3:46:93:24:fe:90:bd:26: + a2:30:2d:e8:97:26:57:35:89:74:96:18:f6:15:e2:af:24:19: + 56:02:02:b2:ba:0f:14:ea:c6:8a:66:c1:86:45:55:8b:be:92: + be:9c:a4:04:c7:49:3c:9e:e8:29:7a:89:d7:fe:af:ff:68:f5: + a5:17:90:bd:ac:99:cc:a5:86:57:09:67:46:db:d6:16:c2:46: + f1:e4:a9:50:f5:8f:d1:92:15:d3:5f:3e:c6:00:49:3a:6e:58: + b2:d1:d1:27:0d:25:c8:32:f8:20:11:cd:7d:32:33:48:94:54: + 4c:dd:dc:79:c4:30:9f:eb:8e:b8:55:b5:d7:88:5c:c5:6a:24: + 3d:b2:d3:05:03:51:c6:07:ef:cc:14:72:74:3d:6e:72:ce:18: + 28:8c:4a:a0:77:e5:09:2b:45:44:47:ac:b7:67:7f:01:8a:05: + 5a:93:be:a1:c1:ff:f8:e7:0e:67:a4:47:49:76:5d:75:90:1a: + f5:26:8f:f0 SHA1 Fingerprint=33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9 -----BEGIN CERTIFICATE----- MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn diff --git a/secure/caroot/blacklisted/Certum_Root_CA.pem b/secure/caroot/blacklisted/Certum_Root_CA.pem index f815c49ddae0..9bf2ebd318a3 100644 --- a/secure/caroot/blacklisted/Certum_Root_CA.pem +++ b/secure/caroot/blacklisted/Certum_Root_CA.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = PL, O = Unizeto Sp. z o.o., CN = Certum CA Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:ce:b1:c1:2e:d3:4f:7c:cd:25:ce:18:3e:4f:c4: 8c:6f:80:6a:73:c8:5b:51:f8:9b:d2:dc:bb:00:5c: @@ -47,21 +47,22 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE Signature Algorithm: sha1WithRSAEncryption - b8:8d:ce:ef:e7:14:ba:cf:ee:b0:44:92:6c:b4:39:3e:a2:84: - 6e:ad:b8:21:77:d2:d4:77:82:87:e6:20:41:81:ee:e2:f8:11: - b7:63:d1:17:37:be:19:76:24:1c:04:1a:4c:eb:3d:aa:67:6f: - 2d:d4:cd:fe:65:31:70:c5:1b:a6:02:0a:ba:60:7b:6d:58:c2: - 9a:49:fe:63:32:0b:6b:e3:3a:c0:ac:ab:3b:b0:e8:d3:09:51: - 8c:10:83:c6:34:e0:c5:2b:e0:1a:b6:60:14:27:6c:32:77:8c: - bc:b2:72:98:cf:cd:cc:3f:b9:c8:24:42:14:d6:57:fc:e6:26: - 43:a9:1d:e5:80:90:ce:03:54:28:3e:f7:3f:d3:f8:4d:ed:6a: - 0a:3a:93:13:9b:3b:14:23:13:63:9c:3f:d1:87:27:79:e5:4c: - 51:e3:01:ad:85:5d:1a:3b:b1:d5:73:10:a4:d3:f2:bc:6e:64: - f5:5a:56:90:a8:c7:0e:4c:74:0f:2e:71:3b:f7:c8:47:f4:69: - 6f:15:f2:11:5e:83:1e:9c:7c:52:ae:fd:02:da:12:a8:59:67: - 18:db:bc:70:dd:9b:b1:69:ed:80:ce:89:40:48:6a:0e:35:ca: - 29:66:15:21:94:2c:e8:60:2a:9b:85:4a:40:f3:6b:8a:24:ec: - 06:16:2c:73 + Signature Value: + b8:8d:ce:ef:e7:14:ba:cf:ee:b0:44:92:6c:b4:39:3e:a2:84: + 6e:ad:b8:21:77:d2:d4:77:82:87:e6:20:41:81:ee:e2:f8:11: + b7:63:d1:17:37:be:19:76:24:1c:04:1a:4c:eb:3d:aa:67:6f: + 2d:d4:cd:fe:65:31:70:c5:1b:a6:02:0a:ba:60:7b:6d:58:c2: + 9a:49:fe:63:32:0b:6b:e3:3a:c0:ac:ab:3b:b0:e8:d3:09:51: + 8c:10:83:c6:34:e0:c5:2b:e0:1a:b6:60:14:27:6c:32:77:8c: + bc:b2:72:98:cf:cd:cc:3f:b9:c8:24:42:14:d6:57:fc:e6:26: + 43:a9:1d:e5:80:90:ce:03:54:28:3e:f7:3f:d3:f8:4d:ed:6a: + 0a:3a:93:13:9b:3b:14:23:13:63:9c:3f:d1:87:27:79:e5:4c: + 51:e3:01:ad:85:5d:1a:3b:b1:d5:73:10:a4:d3:f2:bc:6e:64: + f5:5a:56:90:a8:c7:0e:4c:74:0f:2e:71:3b:f7:c8:47:f4:69: + 6f:15:f2:11:5e:83:1e:9c:7c:52:ae:fd:02:da:12:a8:59:67: + 18:db:bc:70:dd:9b:b1:69:ed:80:ce:89:40:48:6a:0e:35:ca: + 29:66:15:21:94:2c:e8:60:2a:9b:85:4a:40:f3:6b:8a:24:ec: + 06:16:2c:73 SHA1 Fingerprint=62:52:DC:40:F7:11:43:A2:2F:DE:9E:F7:34:8E:06:42:51:B1:81:18 -----BEGIN CERTIFICATE----- MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBM diff --git a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem index 1e3864180a66..6cc3d5349202 100644 --- a/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem +++ b/secure/caroot/blacklisted/Chambers_of_Commerce_Root_-_2008.pem @@ -23,7 +23,7 @@ Certificate: Subject: C = EU, L = Madrid (see current address at www.camerfirma.com/address), serialNumber = A82743287, O = AC Camerfirma S.A., CN = Chambers of Commerce Root - 2008 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (4096 bit) + Public-Key: (4096 bit) Modulus: 00:af:00:cb:70:37:2b:80:5a:4a:3a:6c:78:94:7d: a3:7f:1a:1f:f6:35:d5:bd:db:cb:0d:44:72:3e:26: @@ -68,45 +68,44 @@ Certificate: F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19 X509v3 Authority Key Identifier: keyid:F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19 - DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Chambers of Commerce Root - 2008 + DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com\/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Chambers of Commerce Root - 2008 serial:A3:DA:42:7E:A4:B1:AE:DA - X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 Certificate Policies: Policy: X509v3 Any Policy CPS: http://policy.camerfirma.com - Signature Algorithm: sha1WithRSAEncryption - 90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be: - 3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a: - e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5: - c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d: - 13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d: - c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d: - 92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82: - 56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a: - 90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a: - 7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22: - 08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e: - 45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a: - ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60: - 97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0: - 29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6: - f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c: - b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29: - a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22: - d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba: - cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34: - 20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8: - f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e: - c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e: - 18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da: - bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6: - be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3: - 82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a: - 0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c: - 7c:80:c5:f0:d9:77:48:d0 + Signature Value: + 90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be: + 3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a: + e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5: + c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d: + 13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d: + c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d: + 92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82: + 56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a: + 90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a: + 7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22: + 08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e: + 45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a: + ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60: + 97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0: + 29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6: + f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c: + b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29: + a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22: + d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba: + cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34: + 20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8: + f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e: + c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e: + 18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da: + bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6: + be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3: + 82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a: + 0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c: + 7c:80:c5:f0:d9:77:48:d0 SHA1 Fingerprint=78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C -----BEGIN CERTIFICATE----- MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD diff --git a/secure/caroot/trusted/Cybertrust_Global_Root.pem b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem similarity index 79% rename from secure/caroot/trusted/Cybertrust_Global_Root.pem rename to secure/caroot/blacklisted/Cybertrust_Global_Root.pem index b780a314ccd1..b0d70308e06a 100644 --- a/secure/caroot/trusted/Cybertrust_Global_Root.pem +++ b/secure/caroot/blacklisted/Cybertrust_Global_Root.pem @@ -25,7 +25,7 @@ Certificate: Subject: O = "Cybertrust, Inc", CN = Cybertrust Global Root Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + 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: @@ -54,29 +54,27 @@ Certificate: 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: - keyid:B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 - + B6:08:7B:0D:7A:CC:AC:20:4C:86:56:32:5E:CF:AB:6E:85:2D:70:57 Signature Algorithm: sha1WithRSAEncryption - 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 + 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 diff --git a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem index debf7b30c2ef..1e01f2011bdd 100644 --- a/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem +++ b/secure/caroot/blacklisted/D-TRUST_Root_CA_3_2013.pem @@ -22,7 +22,7 @@ Certificate: Subject: C = DE, O = D-Trust GmbH, CN = D-TRUST Root CA 3 2013 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + Public-Key: (2048 bit) Modulus: 00:c4:7b:42:92:82:1f:ec:ed:54:98:8e:12:c0:ca: 09:df:93:6e:3a:93:5c:1b:e4:10:77:9e:4e:69:88: @@ -51,29 +51,27 @@ Certificate: X509v3 Key Usage: critical Certificate Sign, CRL Sign X509v3 CRL Distribution Points: - Full Name: URI:ldap://directory.d-trust.net/CN=D-TRUST%20Root%20CA%203%202013,O=D-Trust%20GmbH,C=DE?certificaterevocationlist - Full Name: URI:http://crl.d-trust.net/crl/d-trust_root_ca_3_2013.crl - Signature Algorithm: sha256WithRSAEncryption - 0e:59:0e:58:e4:74:48:23:44:cf:34:21:b5:9c:14:1a:ad:9a: - 4b:b7:b3:88:6d:5c:a9:17:70:f0:2a:9f:8d:7b:f9:7b:85:fa: - c7:39:e8:10:08:b0:35:2b:5f:cf:02:d2:d3:9c:c8:0b:1e:ee: - 05:54:ae:37:93:04:09:7d:6c:8f:c2:74:bc:f8:1c:94:be:31: - 01:40:2d:f3:24:20:b7:84:55:2c:5c:c8:f5:74:4a:10:19:8b: - a3:c7:ed:35:d6:09:48:d3:0e:c0:ba:39:a8:b0:46:02:b0:db: - c6:88:59:c2:be:fc:7b:b1:2b:cf:7e:62:87:55:96:cc:01:6f: - 9b:67:21:95:35:8b:f8:10:fc:71:1b:b7:4b:37:69:a6:3b:d6: - ec:8b:ee:c1:b0:f3:25:c9:8f:92:7d:a1:ea:c3:ca:44:bf:26: - a5:74:92:9c:e3:74:eb:9d:74:d9:cb:4d:87:d8:fc:b4:69:6c: - 8b:a0:43:07:60:78:97:e9:d9:93:7c:c2:46:bc:9b:37:52:a3: - ed:8a:3c:13:a9:7b:53:4b:49:9a:11:05:2c:0b:6e:56:ac:1f: - 2e:82:6c:e0:69:67:b5:0e:6d:2d:d9:e4:c0:15:f1:3f:fa:18: - 72:e1:15:6d:27:5b:2d:30:28:2b:9f:48:9a:64:2b:99:ef:f2: - 75:49:5f:5c + Signature Value: + 0e:59:0e:58:e4:74:48:23:44:cf:34:21:b5:9c:14:1a:ad:9a: + 4b:b7:b3:88:6d:5c:a9:17:70:f0:2a:9f:8d:7b:f9:7b:85:fa: + c7:39:e8:10:08:b0:35:2b:5f:cf:02:d2:d3:9c:c8:0b:1e:ee: + 05:54:ae:37:93:04:09:7d:6c:8f:c2:74:bc:f8:1c:94:be:31: + 01:40:2d:f3:24:20:b7:84:55:2c:5c:c8:f5:74:4a:10:19:8b: + a3:c7:ed:35:d6:09:48:d3:0e:c0:ba:39:a8:b0:46:02:b0:db: + c6:88:59:c2:be:fc:7b:b1:2b:cf:7e:62:87:55:96:cc:01:6f: + 9b:67:21:95:35:8b:f8:10:fc:71:1b:b7:4b:37:69:a6:3b:d6: + ec:8b:ee:c1:b0:f3:25:c9:8f:92:7d:a1:ea:c3:ca:44:bf:26: + a5:74:92:9c:e3:74:eb:9d:74:d9:cb:4d:87:d8:fc:b4:69:6c: + 8b:a0:43:07:60:78:97:e9:d9:93:7c:c2:46:bc:9b:37:52:a3: + ed:8a:3c:13:a9:7b:53:4b:49:9a:11:05:2c:0b:6e:56:ac:1f: + 2e:82:6c:e0:69:67:b5:0e:6d:2d:d9:e4:c0:15:f1:3f:fa:18: + 72:e1:15:6d:27:5b:2d:30:28:2b:9f:48:9a:64:2b:99:ef:f2: + 75:49:5f:5c SHA1 Fingerprint=6C:7C:CC:E7:D4:AE:51:5F:99:08:CD:3F:F6:E8:C3:78:DF:6F:EF:97 -----BEGIN CERTIFICATE----- MIIEDjCCAvagAwIBAgIDD92sMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkRF diff --git a/secure/caroot/trusted/DST_Root_CA_X3.pem b/secure/caroot/blacklisted/DST_Root_CA_X3.pem similarity index 79% rename from secure/caroot/trusted/DST_Root_CA_X3.pem rename to secure/caroot/blacklisted/DST_Root_CA_X3.pem index 8cb0d1c990db..3e6bdc2e022c 100644 --- a/secure/caroot/trusted/DST_Root_CA_X3.pem +++ b/secure/caroot/blacklisted/DST_Root_CA_X3.pem @@ -25,7 +25,7 @@ Certificate: Subject: O = Digital Signature Trust Co., CN = DST Root CA X3 Subject Public Key Info: Public Key Algorithm: rsaEncryption - RSA Public-Key: (2048 bit) + 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: @@ -54,21 +54,22 @@ Certificate: 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 - 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 + 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/ diff --git a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem b/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem similarity index 75% rename from secure/caroot/trusted/E-Tugra_Certification_Authority.pem rename to secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem index 1f5aa1a16a84..a23c7347110c 100644 --- a/secure/caroot/trusted/E-Tugra_Certification_Authority.pem +++ b/secure/caroot/blacklisted/E-Tugra_Certification_Authority.pem @@ -24,7 +24,7 @@ Certificate: 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 - RSA Public-Key: (4096 bit) + 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: @@ -68,40 +68,40 @@ Certificate: X509v3 Basic Constraints: critical CA:TRUE X509v3 Authority Key Identifier: - keyid:2E:E3:DB:B2:49:D0:9C:54:79:5C:FA:27:2A:FE:CC:4E:D2:E8:4E:54 - + 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 - 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 + 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 diff --git a/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem new file mode 100644 index 000000000000..a1053534806d --- /dev/null +++ b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_ECC_v3.pem @@ -0,0 +1,73 @@ +## +## E-Tugra Global Root CA ECC v3 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 26:46:19:77:31:e1:4f:6f:28:36:de:39:51:86:e6:d4:97:88:22:c1 + Signature Algorithm: ecdsa-with-SHA384 + Issuer: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA ECC v3 + Validity + Not Before: Mar 18 09:46:58 2020 GMT + Not After : Mar 12 09:46:58 2045 GMT + Subject: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA ECC v3 + Subject Public Key Info: + Public Key Algorithm: id-ecPublicKey + Public-Key: (384 bit) + pub: + 04:8e:98:29:bf:c7:10:1e:27:db:ab:03:cc:28:2c: + d8:5e:48:19:10:29:cc:cb:59:81:cc:8c:b8:92:17: + 89:83:2a:92:f6:c3:a4:1d:4c:62:d5:9f:d6:a0:46: + dc:1c:bc:76:c1:e3:47:d0:5b:13:da:e7:a5:b3:66: + 48:e7:21:9a:4a:4f:86:0a:7d:6c:ea:4d:32:80:0a: + b2:7a:09:9b:69:4b:98:81:e2:2e:ec:02:70:96:1f: + fd:f5:46:ce:ca:dc:82 + ASN1 OID: secp384r1 + NIST CURVE: P-384 + X509v3 extensions: + X509v3 Basic Constraints: critical + CA:TRUE + X509v3 Authority Key Identifier: + FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 + X509v3 Subject Key Identifier: + FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5 + X509v3 Key Usage: critical + Certificate Sign, CRL Sign + Signature Algorithm: ecdsa-with-SHA384 + Signature Value: + 30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08: + bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa: + 07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02: + 31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8: + 8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00: + ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37 +SHA1 Fingerprint=8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84 +-----BEGIN CERTIFICATE----- +MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw +gYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVn +cmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYD +VQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIEVDQyB2MzAeFw0yMDAzMTgwOTQ2 +NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMGQW5r +YXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1Z3Jh +IFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBF +Q0MgdjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQ +KczLWYHMjLiSF4mDKpL2w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YK +fWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMB +Af8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQzPUwHQYDVR0OBBYEFP+C +MXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNp +ADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/6 +7W4WAie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFx +vmjkI6TZraE3 +-----END CERTIFICATE----- diff --git a/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem new file mode 100644 index 000000000000..b2573c69f8f4 --- /dev/null +++ b/secure/caroot/blacklisted/E-Tugra_Global_Root_CA_RSA_v3.pem @@ -0,0 +1,140 @@ +## +## E-Tugra Global Root CA RSA v3 +## +## 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 +## with $FreeBSD$ +## +## @generated +## +Certificate: + Data: + Version: 3 (0x2) + Serial Number: + 0d:4d:c5:cd:16:22:95:96:08:7e:b8:0b:7f:15:06:34:fb:79:10:34 + Signature Algorithm: sha256WithRSAEncryption + Issuer: C = TR, L = Ankara, O = E-Tugra EBG A.S., OU = E-Tugra Trust Center, CN = E-Tugra Global Root CA RSA v3 *** 12087 LINES SKIPPED *** From nobody Sat Sep 9 05:38:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjMFj1PD2z4sfsF; Sat, 9 Sep 2023 05:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjMFh6VQzz4RrL; Sat, 9 Sep 2023 05:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694237881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8IVt12aVq2QzcOEz+Zq4SviK8xa0NphFVZie8kW7Fc=; b=RJIvaxqO1V+3dNVPRetxP5dLYrgvduh6aACrO0+KcgSvfzm6yEC5JNe70VWqX0C8FUt+zk IDErQpXrwPEHlxpdNtb7bqNZnfCESu05uqNDngMFBN1O1fqHT5u28wCamEi2aUsjr3wiMC ARMd/gYC5DwAXAH/6tUioM6uOJwqrI4+RSrfrBoCO0TybXLRdjaVpb2cpbfPy6k/bkkwkr 34zPY6MeRyThlU52gpjDeITy1q9M1HINxBA/CXcYmSrjd8Fn26ale5mIVKIOrOuE7ymA0u VtiR49xhp2Qb+Ge0PzfBmTNRLzcf93vATaXfiaaI2o4mDwYt+9ms8UXsYfuvmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694237881; a=rsa-sha256; cv=none; b=raUne3kLjQ3mH9ODxnrWKOpPv1+8s7VX/nPkDB6eVVyrnbZsRwRI9QtPSFekAVyf9mT8hA MOY3zDN5984HgOp+dKleMIrftX6n6IbV2oAaBT3fTFBwysMjZQyXuxhXkI3McwEPxiYWFI ZE2Rs2MuYObPT2EqpZUXZRIVhADod5kbEthXdROeKPPvbTg04Qp5faqqKmLl6TcRulCA4m qTdnkTVVK1owMLXj2tjQQufnsjZWbwQ7P1CUBgCm/DPI4zms8wDbUK4PMmHxag5Y581yFv lAHFlG4pBM+yGZZZUikO/m8tFpbp9vxdHL+TM1FhVhqRV9s2unBgyt80ScYKJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694237881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q8IVt12aVq2QzcOEz+Zq4SviK8xa0NphFVZie8kW7Fc=; b=XYfXvmjmEPvbbl0MfFDhG5LSCJmYFMStgun8hNIXexc0udlCjDrDBEuU8uoLCUxsvqEz2U 6RNQ+SBgRkBlj8kQKqNHPDlHCpEA6zIA35W/LRvyRPERWrzKSGMigjtoVj2XqcUBZS8wDm YLXAFzS7J1j7spMJPiiWNlRrOoSXPRXdE9HjjTly90I4sGAvRDysL6s0bmF9XxZ5MO/Pg9 +1kqnxXP00zs42g+PHriYL93Gh9+mtPhOwbk2l8tP3AhVZpJWkwtrBl43faugXE2Ra5IqT wRpepI53+yKOeICHJce0HKWTJzpyhh4tQE/im7N3QcKaerChF8Yo6e3D5sYwng== 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 4RjMFh3NZbz1BcZ; Sat, 9 Sep 2023 05:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3895c0Gx069844; Sat, 9 Sep 2023 05:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3895c0VM069841; Sat, 9 Sep 2023 05:38:00 GMT (envelope-from git) Date: Sat, 9 Sep 2023 05:38:00 GMT Message-Id: <202309090538.3895c0VM069841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b06aed1e7810 - stable/12 - caroot: add a primitive script to re-stamp certs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b06aed1e781051a55e11a04408ea14a95e079e34 Auto-Submitted: auto-generated The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b06aed1e781051a55e11a04408ea14a95e079e34 commit b06aed1e781051a55e11a04408ea14a95e079e34 Author: Kyle Evans AuthorDate: 2023-09-09 05:34:31 +0000 Commit: Kyle Evans CommitDate: 2023-09-09 05:34:31 +0000 caroot: add a primitive script to re-stamp certs The tooling in main isn't stamping output with $FreeBSD$ strings going forward, so we need to remember to do that in this branch with each update. Add a stupid simple script that we can just run every time we MFC an update without having to put much thought into it. Direct commit to stable/12 because we don't need this in stable/13 or stable/14. --- secure/caroot/stamp-certs.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/secure/caroot/stamp-certs.sh b/secure/caroot/stamp-certs.sh new file mode 100755 index 000000000000..8e702cd56668 --- /dev/null +++ b/secure/caroot/stamp-certs.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +scriptdir=$(dirname $(realpath "$0")) + +files=$(grep -Lr '$FreeBSD' "$scriptdir"/*/*.pem) + +if [ -z "$files" ]; then + 1>&2 echo "No certs to stamp." + exit 0 +fi + +for f in $files; do + echo "Stamping $f" + sed -i.bak -e $'/Extracted from/a\\\n## with $FreeBSD$' "$f" && \ + rm "$f.bak" +done + +1>&2 echo "Done." From nobody Sat Sep 9 07:27:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjPhT63mcz4t2j3; Sat, 9 Sep 2023 07:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjPhT5SP6z3Wr3; Sat, 9 Sep 2023 07:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FeQUdIYR7MLQ37sedfIvl2J6aPcOkUbPSD4lDFmDGnE=; b=BdnP4FL1JvYQYTABo9x8NBqkg9bLmEq7t/oJJv8SxemcFyH0T4dzalBnfeblIYXAmJaY6X N1rvNgeCNAbjxGtmEsPC2cQqDEFbMsxn90mzKTlA30okexO7hwNQ4w0iR10wjAsS1kqRqn w87Kjw4T77oDG93ik0KAiRQSIG3bGjkWyOEul7BT184ovK30T/vg8yyUjCHIaVkqJLTM8/ y5pQm+GBoZT8h3YEYSnOyoJlD1LixC1iXdNBOjDowK4KEilP2JtTO+35YLxZnVWWQe9r/R OdDuN4jyH2rtS1M7x/CaVK1q+p1NdK+jofUJtULdwUrGYWBws+ByTa0LYBDEow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694244473; a=rsa-sha256; cv=none; b=uTmXyz6q1EtwqqHG41/1RtMDMNFlYCk++9+ExtsDdXc5C+dm4p5SKk6m1sz/JMi0stftb9 E+pCPvDOmUEBKS4ioz+6H55cMoaB49skg3THGf3v9ihciEOKW+HuSMDLwl0DDZu4iN+BOE CxhFT6iXXGRMLCuJtQKuZt6BW04NPCN4fFdFOikedZhcaxKQyPGQ7HPxBJkDpzjL6hYvT+ ZQrES2+xlc1e8OPGgb3EhEEv4sT9TUBnxLy/Pz3+hNKk35dZBmGXWaJW7xJ/J5hicqlhb2 b5+XOLu32KkQjPwlr8I0+SmF43iJ+GTHhde7rKbUmXYuRE5IlKmKr4wl0bKm0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FeQUdIYR7MLQ37sedfIvl2J6aPcOkUbPSD4lDFmDGnE=; b=yns4/An2mKZsHi+b/IOFYEUGB0WfCK9g31yWV73h9nBG1DvA1Iq8TmkS9Pzd60+z/BnmKq hxahGnNUVnEnsR3Nepa/fJo6CDFAjHGQb18ezHL6EEuCsRBw206lOuZnxlZozcxPYhdgrK uMWIm7gdEThuqmYjo7LbLKKKfLaABGCTxP7bB7fB2CA22LufDp9JRvDdbAIXqb89it3aUh sCJpGOh/zx+bevyeTeP/qjTPagbNpLmolweIaL/AWpAk2G6v/RxOuYFwxsrpalm/GEgFiW Qge/BqWcJwn1Sac+hBlCnYXDeW6QUYGIIslKL11SA8foGXh6W6hf0QOJZj3y/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 4RjPhT4V0Qz1Nj; Sat, 9 Sep 2023 07:27:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3897RrGY052668; Sat, 9 Sep 2023 07:27:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3897RrXj052665; Sat, 9 Sep 2023 07:27:53 GMT (envelope-from git) Date: Sat, 9 Sep 2023 07:27:53 GMT Message-Id: <202309090727.3897RrXj052665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 579455e8f01d - stable/14 - MFC: MFV: zlib: examples: define functions as static ones. (PR #855) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 579455e8f01d319ccf01afab86f1e89d9fb159a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=579455e8f01d319ccf01afab86f1e89d9fb159a4 commit 579455e8f01d319ccf01afab86f1e89d9fb159a4 Author: Xin LI AuthorDate: 2023-09-05 03:14:31 +0000 Commit: Xin LI CommitDate: 2023-09-09 07:26:52 +0000 MFC: MFV: zlib: examples: define functions as static ones. (PR #855) (cherry picked from commit ef3a764bc5bed4bc071a81e04c4d3254010274c3) --- sys/contrib/zlib/test/example.c | 24 ++++++++++++------------ sys/contrib/zlib/test/minigzip.c | 30 +++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sys/contrib/zlib/test/example.c b/sys/contrib/zlib/test/example.c index 582a17a3ce94..f27ba8e2fdcb 100644 --- a/sys/contrib/zlib/test/example.c +++ b/sys/contrib/zlib/test/example.c @@ -36,12 +36,12 @@ static uLong dictId; /* Adler32 value of the dictionary */ #ifdef Z_SOLO -void *myalloc(void *q, unsigned n, unsigned m) { +static void *myalloc(void *q, unsigned n, unsigned m) { (void)q; return calloc(n, m); } -void myfree(void *q, void *p) { +static void myfree(void *q, void *p) { (void)q; free(p); } @@ -57,7 +57,7 @@ static free_func zfree = (free_func)0; /* =========================================================================== * Test compress() and uncompress() */ -void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; uLong len = (uLong)strlen(hello)+1; @@ -81,7 +81,7 @@ void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test read/write of .gz files */ -void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { +static void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { #ifdef NO_GZCOMPRESS fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n"); #else @@ -163,7 +163,7 @@ void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { /* =========================================================================== * Test deflate() with small buffers */ -void test_deflate(Byte *compr, uLong comprLen) { +static void test_deflate(Byte *compr, uLong comprLen) { z_stream c_stream; /* compression stream */ int err; uLong len = (uLong)strlen(hello)+1; @@ -198,7 +198,7 @@ void test_deflate(Byte *compr, uLong comprLen) { /* =========================================================================== * Test inflate() with small buffers */ -void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -237,7 +237,7 @@ void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test deflate() with large buffers and dynamic change of compression level */ -void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { z_stream c_stream; /* compression stream */ int err; @@ -290,7 +290,7 @@ void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test inflate() with large buffers */ -void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -329,7 +329,7 @@ void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test deflate() with full flush */ -void test_flush(Byte *compr, uLong *comprLen) { +static void test_flush(Byte *compr, uLong *comprLen) { z_stream c_stream; /* compression stream */ int err; uInt len = (uInt)strlen(hello)+1; @@ -364,7 +364,7 @@ void test_flush(Byte *compr, uLong *comprLen) { /* =========================================================================== * Test inflateSync() */ -void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { +static void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -404,7 +404,7 @@ void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { /* =========================================================================== * Test deflate() with preset dictionary */ -void test_dict_deflate(Byte *compr, uLong comprLen) { +static void test_dict_deflate(Byte *compr, uLong comprLen) { z_stream c_stream; /* compression stream */ int err; @@ -438,7 +438,7 @@ void test_dict_deflate(Byte *compr, uLong comprLen) { /* =========================================================================== * Test inflate() with a preset dictionary */ -void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ diff --git a/sys/contrib/zlib/test/minigzip.c b/sys/contrib/zlib/test/minigzip.c index 8a21ddfb57e9..c72356dbccf2 100644 --- a/sys/contrib/zlib/test/minigzip.c +++ b/sys/contrib/zlib/test/minigzip.c @@ -149,12 +149,12 @@ static void pwinerror (s) # include /* for unlink() */ #endif -void *myalloc(void *q, unsigned n, unsigned m) { +static void *myalloc(void *q, unsigned n, unsigned m) { (void)q; return calloc(n, m); } -void myfree(void *q, void *p) { +static void myfree(void *q, void *p) { (void)q; free(p); } @@ -167,7 +167,7 @@ typedef struct gzFile_s { z_stream strm; } *gzFile; -gzFile gz_open(const char *path, int fd, const char *mode) { +static gzFile gz_open(const char *path, int fd, const char *mode) { gzFile gz; int ret; @@ -201,15 +201,15 @@ gzFile gz_open(const char *path, int fd, const char *mode) { return gz; } -gzFile gzopen(const char *path, const char *mode) { +static gzFile gzopen(const char *path, const char *mode) { return gz_open(path, -1, mode); } -gzFile gzdopen(int fd, const char *mode) { +static gzFile gzdopen(int fd, const char *mode) { return gz_open(NULL, fd, mode); } -int gzwrite(gzFile gz, const void *buf, unsigned len) { +static int gzwrite(gzFile gz, const void *buf, unsigned len) { z_stream *strm; unsigned char out[BUFLEN]; @@ -227,7 +227,7 @@ int gzwrite(gzFile gz, const void *buf, unsigned len) { return len; } -int gzread(gzFile gz, void *buf, unsigned len) { +static int gzread(gzFile gz, void *buf, unsigned len) { int ret; unsigned got; unsigned char in[1]; @@ -258,7 +258,7 @@ int gzread(gzFile gz, void *buf, unsigned len) { return len - strm->avail_out; } -int gzclose(gzFile gz) { +static int gzclose(gzFile gz) { z_stream *strm; unsigned char out[BUFLEN]; @@ -283,7 +283,7 @@ int gzclose(gzFile gz) { return Z_OK; } -const char *gzerror(gzFile gz, int *err) { +static const char *gzerror(gzFile gz, int *err) { *err = gz->err; return gz->msg; } @@ -295,7 +295,7 @@ static char *prog; /* =========================================================================== * Display error message and exit */ -void error(const char *msg) { +static void error(const char *msg) { fprintf(stderr, "%s: %s\n", prog, msg); exit(1); } @@ -305,7 +305,7 @@ void error(const char *msg) { /* Try compressing the input file at once using mmap. Return Z_OK if * if success, Z_ERRNO otherwise. */ -int gz_compress_mmap(FILE *in, gzFile out) { +static int gz_compress_mmap(FILE *in, gzFile out) { int len; int err; int ifd = fileno(in); @@ -338,7 +338,7 @@ int gz_compress_mmap(FILE *in, gzFile out) { * Compress input to output then close both files. */ -void gz_compress(FILE *in, gzFile out) { +static void gz_compress(FILE *in, gzFile out) { local char buf[BUFLEN]; int len; int err; @@ -366,7 +366,7 @@ void gz_compress(FILE *in, gzFile out) { /* =========================================================================== * Uncompress input to output then close both files. */ -void gz_uncompress(gzFile in, FILE *out) { +static void gz_uncompress(gzFile in, FILE *out) { local char buf[BUFLEN]; int len; int err; @@ -390,7 +390,7 @@ void gz_uncompress(gzFile in, FILE *out) { * Compress the given file: create a corresponding .gz file and remove the * original. */ -void file_compress(char *file, char *mode) { +static void file_compress(char *file, char *mode) { local char outfile[MAX_NAME_LEN]; FILE *in; gzFile out; @@ -426,7 +426,7 @@ void file_compress(char *file, char *mode) { /* =========================================================================== * Uncompress the given file and remove the original. */ -void file_uncompress(char *file) { +static void file_uncompress(char *file) { local char buf[MAX_NAME_LEN]; char *infile, *outfile; FILE *out; From nobody Sat Sep 9 07:27:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjPhV6cRKz4t2ck; Sat, 9 Sep 2023 07:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjPhV6PKfz3Wwn; Sat, 9 Sep 2023 07:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWKplXAE7pHZLUEm6NajJRQJoxwD+CbJTtWuX1wwvzY=; b=i0F9ODh0hQyIKvAd7sSX8exLMcCnaChYQOGRkbLu7eLQXWDZpTzuHS35HT8qXKcGmvWJt4 /l3iKTKn3BZjIC+MJ7SfAji684gpddrB+LukKzQsRkXJQPjB6uuwiOq8KYGhg9ec36yqna NZHywUxRjwq3/m1Fhay9bX52Q4Omrcr8eUhLR6sM9cr+odNIQfzTaPwnlcgUkJPIpeGzV/ Le0ctCUvllY5hhLVr7uwWzscpPID6IPjR5nsY1Xvyprq9vTs9TfOvI5uQLYeIpRnNvxzzK f9rO2IKvZa94r7dC1Kd4d7ifEu8vv++dY079LchF7zYQRv+6yoHQ+HewYGuu3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694244474; a=rsa-sha256; cv=none; b=U7G8cXvzKAEnMrvJSnsI9pHcCGec02+OzmNkf7AJm3XG3KrKHX01odk77Uf2aBIbBxmOGZ uFuUsDs2QD06MrdOngGSow8S+Xu7LV+nAeqRaW71RSCJ3AO9OaurUgOuHIwPf4LT9HfMpn eLXOCS/Lj9/g410X8rl0NBIT9wX+sELMYSEMNzNdZPgsQBnwS8yl7B/HXTRWnYtgu6pSe7 FFo9uR/rU7uXex0ijXEjc6pPFZmemHYM3ZwrlcjPOgqTIpi9Tyw4YKS568a5ChBMsnreb9 gjL8Zc+eTBMM8p3sefB8JcH4FnI2/fm/xEeobv9HAkMmRqO/TM/DTdYNEUhy/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MWKplXAE7pHZLUEm6NajJRQJoxwD+CbJTtWuX1wwvzY=; b=Ibe19lvcZBibM6nDyaNQ2noW6ziSWPGdbNX7S2dl3v3T3maM3pqOY//zIPFzmVSt3oPAgc 1F/CUreWvKM+chiC9/gjpsqhur2be/goqn0JQ+/uFuAkZ2RrQhJTLj5QVkIhFoZSXfRAvy 3a3ZhUBZnjYVC8REBP5XMYXaQs5XvxXNLc4rgu0rVLLXwqLnjinGfkE0+jE1BBxWLVy0GK We8pJT4P8K96/OsfqiP1d8siiiTg4mhKmJcByOwpY3C7cZ5WTQgj0o6YeUf4UB5Z1tuI0b 12NpgbEJsXTRThhks3txmbTDaNnZzCA7KgH4VNPNBt34lTIw42xVdjOdWT20Hw== 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 4RjPhV5M1pz1lj; Sat, 9 Sep 2023 07:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3897Rsnb052723; Sat, 9 Sep 2023 07:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3897RsrG052720; Sat, 9 Sep 2023 07:27:54 GMT (envelope-from git) Date: Sat, 9 Sep 2023 07:27:54 GMT Message-Id: <202309090727.3897RsrG052720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 72a9f518d597 - stable/14 - sys/dev/arcmsr: Update Areca RAID driver to version 1.50.00.06. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 72a9f518d5973bb1cd371cff8ee4e3f24c410e42 Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=72a9f518d5973bb1cd371cff8ee4e3f24c410e42 commit 72a9f518d5973bb1cd371cff8ee4e3f24c410e42 Author: 黃清隆 AuthorDate: 2023-09-06 07:59:22 +0000 Commit: Xin LI CommitDate: 2023-09-09 07:27:08 +0000 sys/dev/arcmsr: Update Areca RAID driver to version 1.50.00.06. - Suppressed a harmless warning message, "arcmsr_dr_handle: target=f, lun=0, GONE!!!," which could appear a few seconds after UEFI system boot due to the boot volume UEFI initialization. - Corrected various typing errors. - Refactored arcmsr_initialize() to improve code readability. - Added support for device IDs 1883 and 1886 controllers. - Introduced support for controllers requiring host memory for the RAID 5 and 6 XOR engines. Many thanks to Areca for continuing to support FreeBSD. (cherry picked from commit cb1a0aab4f3ca169509ab86a67a4630e72790869) --- sys/dev/arcmsr/arcmsr.c | 693 ++++++++++++++++++++++++++++++++---------------- sys/dev/arcmsr/arcmsr.h | 51 +++- 2 files changed, 507 insertions(+), 237 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index 9dd3142d1933..ea37da30db93 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -88,6 +88,8 @@ ** 1.50.00.03 05/04/2021 Ching Huang Fixed doorbell status arrived late on ARC-1886 ** 1.50.00.04 12/08/2021 Ching Huang Fixed boot up hung under ARC-1886 with no volume created ** 1.50.00.05 03/23/2023 Ching Huang Fixed reading buffer empty length error +** 1.50.00.06 08/07/2023 Ching Huang Add support adapter using system memory as XOR buffer, +** Add support device ID 1883,1886 ****************************************************************************************** */ @@ -143,7 +145,7 @@ #define arcmsr_callout_init(a) callout_init(a, /*mpsafe*/1); -#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.05 2023-03-23" +#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.06 2023-08-07" #include /* ************************************************************************** @@ -1071,7 +1073,7 @@ static void arcmsr_build_srb(struct CommandControlBlock *srb, */ static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandControlBlock *srb) { - u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr_low; + u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr; struct ARCMSR_CDB *arcmsr_cdb = (struct ARCMSR_CDB *)&srb->arcmsr_cdb; bus_dmamap_sync(acb->srb_dmat, acb->srb_dmamap, (srb->srb_flags & SRB_FLAG_WRITE) ? BUS_DMASYNC_POSTWRITE:BUS_DMASYNC_POSTREAD); @@ -1131,10 +1133,10 @@ static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandContr ARCMSR_LOCK_ACQUIRE(&acb->postDone_lock); postq_index = phbdmu->postq_index; pinbound_srb = (struct InBound_SRB *)&phbdmu->post_qbuffer[postq_index & 0xFF]; - pinbound_srb->addressHigh = srb->cdb_phyaddr_high; - pinbound_srb->addressLow = srb->cdb_phyaddr_low; + pinbound_srb->addressHigh = (u_int32_t)((srb->cdb_phyaddr >> 16) >> 16); + pinbound_srb->addressLow = (u_int32_t)srb->cdb_phyaddr; pinbound_srb->length = srb->arc_cdb_size >> 2; - arcmsr_cdb->Context = srb->cdb_phyaddr_low; + arcmsr_cdb->Context = (u_int32_t)srb->cdb_phyaddr; if (postq_index & 0x4000) { index_stripped = postq_index & 0xFF; index_stripped += 1; @@ -1742,7 +1744,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBA_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1751,7 +1753,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBB_RWBUFFER, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1], devicemap); devicemap += 4; } break; @@ -1760,7 +1762,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBC_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1768,7 +1770,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBD_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1776,7 +1778,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBE_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1813,14 +1815,15 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { { if(acb->device_map[target] & bit_check) {/* unit departed */ - printf("arcmsr_dr_handle: Target=%x, lun=%x, GONE!!!\n",target,lun); + if (target != 0x0f) + printf("arcmsr_dr_handle: Target=0x%x, lun=%x, GONE!!!\n",target,lun); arcmsr_abort_dr_ccbs(acb, target, lun); arcmsr_rescan_lun(acb, target, lun); acb->devstate[target][lun] = ARECA_RAID_GONE; } else {/* unit arrived */ - printf("arcmsr_dr_handle: Target=%x, lun=%x, Plug-IN!!!\n",target,lun); + printf("arcmsr_dr_handle: Target=0x%x, lun=%x, Plug-IN!!!\n",target,lun); arcmsr_rescan_lun(acb, target, lun); acb->devstate[target][lun] = ARECA_RAID_GOOD; } @@ -3170,7 +3173,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) return; } - if(target == 16) { + if(target == ARCMSR_VIRTUAL_DEVICE_ID) { /* virtual device for iop message transfer */ arcmsr_handle_virtual_command(acb, pccb); return; @@ -3216,7 +3219,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) else cpi->base_transfer_speed = 300000; if((acb->vendor_device_id == PCIDevVenIDARC1880) || + (acb->vendor_device_id == PCIDevVenIDARC1883) || (acb->vendor_device_id == PCIDevVenIDARC1884) || + (acb->vendor_device_id == PCIDevVenIDARC1886) || (acb->vendor_device_id == PCIDevVenIDARC1680) || (acb->vendor_device_id == PCIDevVenIDARC1214)) { @@ -3282,7 +3287,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) case XPT_GET_TRAN_SETTINGS: { struct ccb_trans_settings *cts; - if(pccb->ccb_h.target_id == 16) { + if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) { pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL; xpt_done(pccb); break; @@ -3299,7 +3304,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) cts->protocol = PROTO_SCSI; if((acb->vendor_device_id == PCIDevVenIDARC1880) || + (acb->vendor_device_id == PCIDevVenIDARC1883) || (acb->vendor_device_id == PCIDevVenIDARC1884) || + (acb->vendor_device_id == PCIDevVenIDARC1886) || (acb->vendor_device_id == PCIDevVenIDARC1680) || (acb->vendor_device_id == PCIDevVenIDARC1214)) { @@ -3344,7 +3351,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) break; } case XPT_CALC_GEOMETRY: - if(pccb->ccb_h.target_id == 16) { + if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) { pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL; xpt_done(pccb); break; @@ -4047,6 +4054,7 @@ static void arcmsr_get_hbf_config(struct AdapterControlBlock *acb) acb->firm_sdram_size = acb->msgcode_rwbuffer[3]; /*firm_sdram_size, 3, 12-15*/ acb->firm_ide_channels = acb->msgcode_rwbuffer[4]; /*firm_ide_channels, 4, 16-19*/ acb->firm_cfg_version = acb->msgcode_rwbuffer[ARCMSR_FW_CFGVER_OFFSET]; /*firm_cfg_version, 25*/ + acb->firm_PicStatus = acb->msgcode_rwbuffer[ARCMSR_FW_PICSTATUS]; /* firm_PicStatus, 30 */ if(acb->firm_numbers_queue > ARCMSR_MAX_OUTSTANDING_CMD) acb->maxOutstanding = ARCMSR_MAX_OUTSTANDING_CMD - 1; else @@ -4340,6 +4348,12 @@ static u_int32_t arcmsr_iop_confirm(struct AdapterControlBlock *acb) acb->msgcode_rwbuffer[5] = cdb_phyaddr_lo32; acb->msgcode_rwbuffer[6] = srb_phyaddr_hi32; acb->msgcode_rwbuffer[7] = COMPLETION_Q_POOL_SIZE; + if (acb->xor_mega) { + acb->msgcode_rwbuffer[8] = 0x555AA; //FreeBSD init 2 + acb->msgcode_rwbuffer[9] = 0; + acb->msgcode_rwbuffer[10] = (uint32_t)acb->xor_sgtable_phy; + acb->msgcode_rwbuffer[11] = (uint32_t)((acb->xor_sgtable_phy >> 16) >> 16); + } CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_SET_CONFIG); acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); @@ -4414,20 +4428,48 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in if((acb->adapter_type == ACB_ADAPTER_TYPE_C) || (acb->adapter_type == ACB_ADAPTER_TYPE_D) || (acb->adapter_type == ACB_ADAPTER_TYPE_E) || (acb->adapter_type == ACB_ADAPTER_TYPE_F)) { - srb_tmp->cdb_phyaddr_low = srb_phyaddr; - srb_tmp->cdb_phyaddr_high = (u_int32_t)((srb_phyaddr >> 16) >> 16); + srb_tmp->cdb_phyaddr = srb_phyaddr; } else - srb_tmp->cdb_phyaddr_low = srb_phyaddr >> 5; + srb_tmp->cdb_phyaddr = srb_phyaddr >> 5; srb_tmp->acb = acb; srb_tmp->smid = i << 16; acb->srbworkingQ[i] = acb->psrb_pool[i] = srb_tmp; srb_phyaddr = srb_phyaddr + SRB_SIZE; srb_tmp = (struct CommandControlBlock *)((unsigned long)srb_tmp + SRB_SIZE); } - if (acb->adapter_type == ACB_ADAPTER_TYPE_E) + srb_tmp = (struct CommandControlBlock *)(acb->uncacheptr + ARCMSR_SRBS_POOL_SIZE); + srb_phyaddr = (unsigned long)segs->ds_addr + ARCMSR_SRBS_POOL_SIZE; + switch (acb->adapter_type) { + case ACB_ADAPTER_TYPE_B: { + struct HBB_MessageUnit *phbbmu; + + acb->pmu = (struct MessageUnit_UNION *)srb_tmp; + phbbmu = (struct HBB_MessageUnit *)acb->pmu; + phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)acb->mem_base0; + phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)acb->mem_base1; + if (acb->vendor_device_id == PCIDevVenIDARC1203) { + phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell); + phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask); + phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell); + phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask); + } else { + phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell); + phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask); + phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell); + phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask); + } + } + break; + case ACB_ADAPTER_TYPE_D: + acb->pmu = (struct MessageUnit_UNION *)srb_tmp; + acb->pmu->muu.hbdmu.phbdmu = (struct HBD_MessageUnit *)acb->mem_base0; + break; + case ACB_ADAPTER_TYPE_E: acb->pCompletionQ = (pCompletion_Q)srb_tmp; - else if (acb->adapter_type == ACB_ADAPTER_TYPE_F) { + break; + case ACB_ADAPTER_TYPE_F: { + unsigned long host_buffer_dma; acb->pCompletionQ = (pCompletion_Q)srb_tmp; acb->completeQ_phys = srb_phyaddr; memset(acb->pCompletionQ, 0xff, COMPLETION_Q_POOL_SIZE); @@ -4435,9 +4477,62 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in acb->message_rbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x100); acb->msgcode_rwbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x200); memset((void *)acb->message_wbuffer, 0, MESG_RW_BUFFER_SIZE); + arcmsr_wait_firmware_ready(acb); + host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE; + CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1)); /* host buffer low addr, bit0:1 all buffer active */ + CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */ + CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1); /* set host buffer physical address */ + acb->firm_PicStatus = CHIP_REG_READ32(HBF_MessageUnit, 0, outbound_msgaddr1); /* get firmware spec info */ + break; + } } acb->vir2phy_offset = (unsigned long)srb_tmp - (unsigned long)srb_phyaddr; } + +static void arcmsr_map_xor_sgtable(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct AdapterControlBlock *acb = arg; + + acb->xor_sgtable_phy = (unsigned long)segs->ds_addr; + if ((nseg != 1) || ((u_int32_t)segs->ds_len != acb->init2cfg_size)) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor table seg num or size not as i wish!\n", acb->pci_unit); + return; + } +} + +static void arcmsr_map_xor_sg(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct AdapterControlBlock *acb = arg; + int i; + struct HostRamBuf *pRamBuf; + struct XorSg *pxortable = (struct XorSg *)(acb->xortable + sizeof(struct HostRamBuf)); + + if (nseg != acb->xor_mega) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor seg NUM not as i wish!\n", acb->pci_unit); + return; + } + for (i = 0; i < nseg; i++) { + if ((u_int32_t)segs->ds_len != ARCMSR_XOR_SEG_SIZE) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor seg SIZE not as i wish!\n", acb->pci_unit); + return; + } + pxortable->xorPhys = (u_int64_t)segs->ds_addr; + pxortable->xorBufLen = (u_int64_t)segs->ds_len; + pxortable++; + segs++; + } + pRamBuf = (struct HostRamBuf *)acb->xortable; + pRamBuf->hrbSignature = 0x53425248; //HRBS + pRamBuf->hrbSize = ARCMSR_XOR_SEG_SIZE * nseg; + pRamBuf->hrbRes[0] = 0; + pRamBuf->hrbRes[1] = 0; + bus_dmamap_sync(acb->xortable_dmat, acb->xortable_dmamap, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(acb->xor_dmat, acb->xor_dmamap, BUS_DMASYNC_PREWRITE); +} + /* ************************************************************************ ************************************************************************ @@ -4448,11 +4543,55 @@ static void arcmsr_free_resource(struct AdapterControlBlock *acb) if(acb->ioctl_dev != NULL) { destroy_dev(acb->ioctl_dev); } - bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap); - bus_dmamap_destroy(acb->srb_dmat, acb->srb_dmamap); - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); + if (acb->acb_flags & ACB_F_DMAMAP_SG) + bus_dmamap_unload(acb->xor_dmat, acb->xor_dmamap); + if (acb->xor_dmamap) { + bus_dmamem_free(acb->xor_dmat, acb->xorptr, acb->xor_dmamap); + } + if (acb->acb_flags & ACB_F_DMAMAP_SGTABLE) + bus_dmamap_unload(acb->xortable_dmat, acb->xortable_dmamap); + if (acb->xortable_dmamap) { + bus_dmamem_free(acb->xortable_dmat, acb->xortable, acb->xortable_dmamap); + } + if (acb->acb_flags & ACB_F_DMAMAP_SRB) + bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap); + if (acb->srb_dmamap) { + bus_dmamem_free(acb->srb_dmat, acb->uncacheptr, acb->srb_dmamap); + } + if (acb->srb_dmat) + bus_dma_tag_destroy(acb->srb_dmat); + if (acb->dm_segs_dmat) + bus_dma_tag_destroy(acb->dm_segs_dmat); + if (acb->parent_dmat) + bus_dma_tag_destroy(acb->parent_dmat); + switch(acb->adapter_type) { + case ACB_ADAPTER_TYPE_A: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_B: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + if (acb->sys_res_arcmsr[1]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(2), acb->sys_res_arcmsr[1]); + break; + case ACB_ADAPTER_TYPE_C: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_D: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_E: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_F: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + } } /* ************************************************************************ @@ -4480,21 +4619,16 @@ static void arcmsr_mutex_destroy(struct AdapterControlBlock *acb) ************************************************************************ ************************************************************************ */ -static u_int32_t arcmsr_initialize(device_t dev) +static int arcmsr_define_adapter_type(struct AdapterControlBlock *acb) { - struct AdapterControlBlock *acb = device_get_softc(dev); - u_int16_t pci_command; - int i, j,max_coherent_size; - u_int32_t vendor_dev_id; - - vendor_dev_id = pci_get_devid(dev); - acb->vendor_device_id = vendor_dev_id; - acb->sub_device_id = pci_read_config(dev, PCIR_SUBDEV_0, 2); - switch (vendor_dev_id) { - case PCIDevVenIDARC1880: - case PCIDevVenIDARC1882: - case PCIDevVenIDARC1213: - case PCIDevVenIDARC1223: { + int rc = 0; + + switch (acb->vendor_device_id) { + case PCIDevVenIDARC1880: + case PCIDevVenIDARC1882: + case PCIDevVenIDARC1883: + case PCIDevVenIDARC1213: + case PCIDevVenIDARC1223: { acb->adapter_type = ACB_ADAPTER_TYPE_C; if ((acb->sub_device_id == ARECA_SUB_DEV_ID_1883) || (acb->sub_device_id == ARECA_SUB_DEV_ID_1216) || @@ -4502,158 +4636,78 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->adapter_bus_speed = ACB_BUS_SPEED_12G; else acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE; - } - break; - case PCIDevVenIDARC1884: - acb->adapter_type = ACB_ADAPTER_TYPE_E; - acb->adapter_bus_speed = ACB_BUS_SPEED_12G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE; - acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); - break; - case PCIDevVenIDARC1886_: - case PCIDevVenIDARC1886: - acb->adapter_type = ACB_ADAPTER_TYPE_F; - acb->adapter_bus_speed = ACB_BUS_SPEED_12G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE; - acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); - break; - case PCIDevVenIDARC1214: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE; + } + break; + case PCIDevVenIDARC1884: + acb->adapter_type = ACB_ADAPTER_TYPE_E; + acb->adapter_bus_speed = ACB_BUS_SPEED_12G; + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE; + acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); + break; + case PCIDevVenIDARC1886_0: + case PCIDevVenIDARC1886_: + case PCIDevVenIDARC1886: + acb->adapter_type = ACB_ADAPTER_TYPE_F; + acb->adapter_bus_speed = ACB_BUS_SPEED_12G; + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE; + acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); + break; + case PCIDevVenIDARC1214: + case PCIDevVenIDARC1224: { acb->adapter_type = ACB_ADAPTER_TYPE_D; acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0)); - } - break; - case PCIDevVenIDARC1200: - case PCIDevVenIDARC1201: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0)); + } + break; + case PCIDevVenIDARC1200: + case PCIDevVenIDARC1201: { acb->adapter_type = ACB_ADAPTER_TYPE_B; acb->adapter_bus_speed = ACB_BUS_SPEED_3G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); - } - break; - case PCIDevVenIDARC1203: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); + } + break; + case PCIDevVenIDARC1203: { acb->adapter_type = ACB_ADAPTER_TYPE_B; acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); - } - break; - case PCIDevVenIDARC1110: - case PCIDevVenIDARC1120: - case PCIDevVenIDARC1130: - case PCIDevVenIDARC1160: - case PCIDevVenIDARC1170: - case PCIDevVenIDARC1210: - case PCIDevVenIDARC1220: - case PCIDevVenIDARC1230: - case PCIDevVenIDARC1231: - case PCIDevVenIDARC1260: - case PCIDevVenIDARC1261: - case PCIDevVenIDARC1270: - case PCIDevVenIDARC1280: - case PCIDevVenIDARC1212: - case PCIDevVenIDARC1222: - case PCIDevVenIDARC1380: - case PCIDevVenIDARC1381: - case PCIDevVenIDARC1680: - case PCIDevVenIDARC1681: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); + } + break; + case PCIDevVenIDARC1110: + case PCIDevVenIDARC1120: + case PCIDevVenIDARC1130: + case PCIDevVenIDARC1160: + case PCIDevVenIDARC1170: + case PCIDevVenIDARC1210: + case PCIDevVenIDARC1220: + case PCIDevVenIDARC1230: + case PCIDevVenIDARC1231: + case PCIDevVenIDARC1260: + case PCIDevVenIDARC1261: + case PCIDevVenIDARC1270: + case PCIDevVenIDARC1280: + case PCIDevVenIDARC1212: + case PCIDevVenIDARC1222: + case PCIDevVenIDARC1380: + case PCIDevVenIDARC1381: + case PCIDevVenIDARC1680: + case PCIDevVenIDARC1681: { acb->adapter_type = ACB_ADAPTER_TYPE_A; acb->adapter_bus_speed = ACB_BUS_SPEED_3G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE; - } - break; - default: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE; + } + break; + default: { printf("arcmsr%d:" - " unknown RAID adapter type \n", device_get_unit(dev)); - return ENOMEM; + " unknown RAID adapter type \n", acb->pci_unit); + rc = ENOMEM; } } - if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev), - /*alignemnt*/ 1, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ BUS_SPACE_MAXSIZE_32BIT, - /*nsegments*/ BUS_SPACE_UNRESTRICTED, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ NULL, - /*lockarg*/ NULL, - &acb->parent_dmat) != 0) - { - printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENOMEM; - } - - /* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */ - if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, - /*alignment*/ 1, - /*boundary*/ 0, -#ifdef PAE - /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, -#else - /*lowaddr*/ BUS_SPACE_MAXADDR, -#endif - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM, - /*nsegments*/ ARCMSR_MAX_SG_ENTRIES, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ busdma_lock_mutex, - /*lockarg*/ &acb->isr_lock, - &acb->dm_segs_dmat) != 0) - { - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENOMEM; - } + return rc; +} - /* DMA tag for our srb structures.... Allocate the freesrb memory */ - if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, - /*alignment*/ 0x20, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ max_coherent_size, - /*nsegments*/ 1, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ NULL, - /*lockarg*/ NULL, - &acb->srb_dmat) != 0) - { - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENXIO; - } - /* Allocation for our srbs */ - if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &acb->srb_dmamap) != 0) { - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", device_get_unit(dev)); - return ENXIO; - } - /* And permanently map them */ - if(bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0)) { - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", device_get_unit(dev)); - return ENXIO; - } - pci_command = pci_read_config(dev, PCIR_COMMAND, 2); - pci_command |= PCIM_CMD_BUSMASTEREN; - pci_command |= PCIM_CMD_PERRESPEN; - pci_command |= PCIM_CMD_MWRICEN; - /* Enable Busmaster */ - pci_write_config(dev, PCIR_COMMAND, pci_command, 2); +static int arcmsr_map_pcireg(device_t dev, struct AdapterControlBlock *acb) +{ switch(acb->adapter_type) { case ACB_ADAPTER_TYPE_A: { u_int32_t rid0 = PCIR_BAR(0); @@ -4662,18 +4716,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4683,47 +4737,33 @@ static u_int32_t arcmsr_initialize(device_t dev) } break; case ACB_ADAPTER_TYPE_B: { - struct HBB_MessageUnit *phbbmu; - struct CommandControlBlock *freesrb; u_int32_t rid[]={ PCIR_BAR(0), PCIR_BAR(2) }; vm_offset_t mem_base[]={0,0}; + u_int16_t i; + for(i=0; i < 2; i++) { acb->sys_res_arcmsr[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid[i], RF_ACTIVE); if(acb->sys_res_arcmsr[i] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: bus_alloc_resource %d failure!\n", acb->pci_unit, i); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[i]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: rman_get_start %d failure!\n", acb->pci_unit, i); return ENXIO; } mem_base[i] = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[i]); if(mem_base[i] == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: rman_get_virtual %d failure!\n", acb->pci_unit, i); return ENXIO; } acb->btag[i] = rman_get_bustag(acb->sys_res_arcmsr[i]); acb->bhandle[i] = rman_get_bushandle(acb->sys_res_arcmsr[i]); } - freesrb = (struct CommandControlBlock *)acb->uncacheptr; - acb->pmu = (struct MessageUnit_UNION *)((unsigned long)freesrb+ARCMSR_SRBS_POOL_SIZE); - phbbmu = (struct HBB_MessageUnit *)acb->pmu; - phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)mem_base[0]; - phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)mem_base[1]; - if (vendor_dev_id == PCIDevVenIDARC1203) { - phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell); - phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask); - phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell); - phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask); - } else { - phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell); - phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask); - phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell); - phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask); - } + acb->mem_base0 = mem_base[0]; + acb->mem_base1 = mem_base[1]; acb->rid[0] = rid[0]; acb->rid[1] = rid[1]; } @@ -4735,18 +4775,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4756,32 +4796,29 @@ static u_int32_t arcmsr_initialize(device_t dev) } break; case ACB_ADAPTER_TYPE_D: { - struct HBD_MessageUnit0 *phbdmu; u_int32_t rid0 = PCIR_BAR(0); vm_offset_t mem_base0; acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); acb->bhandle[0] = rman_get_bushandle(acb->sys_res_arcmsr[0]); - acb->pmu = (struct MessageUnit_UNION *)((unsigned long)acb->uncacheptr+ARCMSR_SRBS_POOL_SIZE); - phbdmu = (struct HBD_MessageUnit0 *)acb->pmu; - phbdmu->phbdmu = (struct HBD_MessageUnit *)mem_base0; + acb->mem_base0 = mem_base0; acb->rid[0] = rid0; } break; @@ -4792,18 +4829,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4820,23 +4857,22 @@ static u_int32_t arcmsr_initialize(device_t dev) case ACB_ADAPTER_TYPE_F: { u_int32_t rid0 = PCIR_BAR(0); vm_offset_t mem_base0; - unsigned long host_buffer_dma; acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4848,17 +4884,203 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->rid[0] = rid0; CHIP_REG_WRITE32(HBF_MessageUnit, 0, host_int_status, 0); /*clear interrupt*/ CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBEMU_DOORBELL_SYNC); /* synchronize doorbell to 0 */ - arcmsr_wait_firmware_ready(acb); - host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE; - CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1)); /* host buffer low addr, bit0:1 all buffer active */ - CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */ - CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1); /* set host buffer physical address */ } break; } - if(acb->acb_flags & ACB_F_MAPFREESRB_FAILD) { + return (0); +} + +static int arcmsr_alloc_srb(device_t dev, struct AdapterControlBlock *acb) +{ + int rc; + + if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev), + /*alignemnt*/ 1, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ BUS_SPACE_MAXSIZE_32BIT, + /*nsegments*/ BUS_SPACE_UNRESTRICTED, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->parent_dmat) != 0) + { + printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENOMEM; + } + + /* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 1, + /*boundary*/ 0, +#ifdef PAE + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, +#else + /*lowaddr*/ BUS_SPACE_MAXADDR, +#endif + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM, + /*nsegments*/ ARCMSR_MAX_SG_ENTRIES, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ busdma_lock_mutex, + /*lockarg*/ &acb->isr_lock, + &acb->dm_segs_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENOMEM; + } + + /* DMA tag for our srb structures.... Allocate the freesrb memory */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x20, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ acb->max_coherent_size, + /*nsegments*/ 1, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->srb_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for our srbs */ + if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, ARCMSR_DMA_ALLOC_FLAG, &acb->srb_dmamap) != 0) { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", acb->pci_unit); + return ENXIO; + } + /* And permanently map them */ + rc = bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, acb->max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0); + if((rc != 0) && (rc != EINPROGRESS)) { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", acb->pci_unit); + return ENXIO; + } + acb->acb_flags |= ACB_F_DMAMAP_SRB; + return (0); +} + +static int arcmsr_alloc_xor_mem(device_t dev, struct AdapterControlBlock *acb) +{ + int rc, xor_ram; + + xor_ram = (acb->firm_PicStatus >> 24) & 0x0f; + acb->xor_mega = (xor_ram - 1) * 32 + 128 + 3; + acb->init2cfg_size = sizeof(struct HostRamBuf) + (sizeof(struct XorSg) * acb->xor_mega); + /* DMA tag for XOR engine of Raid 5,6 */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x40, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ acb->init2cfg_size, + /*nsegments*/ 1, + /*maxsegsz*/ acb->init2cfg_size, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->xortable_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor table bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for xors */ + if(bus_dmamem_alloc(acb->xortable_dmat, (void **)&acb->xortable, ARCMSR_DMA_ALLOC_FLAG, &acb->xortable_dmamap) != 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: map free srb failure!\n", device_get_unit(dev)); + printf("arcmsr%d: xor table bus_dmamem_alloc failure!\n", acb->pci_unit); + return ENXIO; + } + /* And permanently map xor segs */ + rc = bus_dmamap_load(acb->xortable_dmat, acb->xortable_dmamap, acb->xortable, acb->init2cfg_size, arcmsr_map_xor_sgtable, acb, /*flags*/0); + if((rc != 0) && (rc != EINPROGRESS)) { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor table bus_dmamap_load failure!\n", acb->pci_unit); + return ENXIO; + } + acb->acb_flags |= ACB_F_DMAMAP_SGTABLE; + + /* DMA tag for XOR engine of Raid 5,6 */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x1000, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ (ARCMSR_XOR_SEG_SIZE * acb->xor_mega), + /*nsegments*/ acb->xor_mega, + /*maxsegsz*/ ARCMSR_XOR_SEG_SIZE, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->xor_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for xors */ + if(bus_dmamem_alloc(acb->xor_dmat, (void **)&acb->xorptr, ARCMSR_DMA_ALLOC_FLAG, &acb->xor_dmamap) != 0) { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor bus_dmamem_alloc failure!\n", acb->pci_unit); *** 247 LINES SKIPPED *** From nobody Sat Sep 9 07:30:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjPlN5zXGz4t3xk; Sat, 9 Sep 2023 07:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjPlN5WLjz3XfV; Sat, 9 Sep 2023 07:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dkfno27pVUCptw/WoBNTKMSVzMfyNRjm+V1d2qeQrfA=; b=H63pVb4M1k4MWurl3j30yk0zD7ezbEGR/cBP092IKlcR2FPjh8f8qZb3xHh9wG8ZiECkPT WwdfthzMvniKxURiylxMFU3280Vm3FoFDYXgAxidtMoIfmoPOW308Jq16B5hEZceTnt5SG K4ynwsw7I8TF8RcWt1Lzsn/AojRxnr/B0guy2zr1ysdbHi6MPvew6/04vwKtMBb8giHn8T faTNYsXDfQCwBoz/v+OZem6RR4JE2Bb0qy625DbtRTFapkqJF4p7Ch7iZJBcdFX/jMdeJh p/Zd8RYm3l0wrrD273EzhFUbTGFyBMYYMp6dq61G0DARnUyrI7wN5IySaw348w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694244624; a=rsa-sha256; cv=none; b=QVMx0iLWOx4yd6unB4XUjNhNXMaIbNwT8ua7Z+4OqWx8zu7/UEFuo754oy916agth3HjbC OeA3+WtGxqbuSOlMbvLKqsqzsjK8FNz6D7dr/SwmAoYpVT9PqRUBgFGkU0s9sKt9MuNSI1 YFE3Z3D7lDfZOxppJ6k3O+HQWOL4AHkLogqd+5nFzErV7c1EwhCeSKG2f6I1qjPSXImVwc 3hrwV7V1T0YWRVevYB9wiWpzWG4j7h3wb4xxLfSFOXp2zrXTRZoZ0GFWlYbLwPXgGRZK7N GQXEw8Da38CHo6j02cfqATOVGl3tr3WDdp1hzjcsxoTvLEl4D4WCabqT1lzBcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dkfno27pVUCptw/WoBNTKMSVzMfyNRjm+V1d2qeQrfA=; b=TooP6Kcdw5lRycCWIn5+jsvybMH5i2lQPez05hi/myvjZRfuDmbcSuvvAGchRT2g+HvJRY h/caspncrnxvTWvdT26jpSvJToMxFX+ngrXZL5i4ltwaXEAmeodTVxm3/tfszoXDrKkxQn 6p8IDWWuA/3fl/ekNVV/AwPqKaICUQF3ZvSe0yPvipN8Yqw0g4v77wEhwovV+T9db93VEK ld7Yd5pzcfg0Rxod+S36Ztr/RrV4uGmwHP3sWLL6lqmnKawNCwk+fr/7SU+B0hCVzol9s+ V/Dk1Y7p4VwynjcAkRBZbu0jqsRKRsQwS7bcxWpY2s+0U1wfTG5zhzlc7PxzWw== 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 4RjPlN4D6fz1Bx; Sat, 9 Sep 2023 07:30:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3897UOpu061617; Sat, 9 Sep 2023 07:30:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3897UObn061614; Sat, 9 Sep 2023 07:30:24 GMT (envelope-from git) Date: Sat, 9 Sep 2023 07:30:24 GMT Message-Id: <202309090730.3897UObn061614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: cdf43639fcc4 - releng/14.0 - MFC: MFV: zlib: examples: define functions as static ones. (PR #855) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: cdf43639fcc41f8f2654af65dd1b0fb2c07f7968 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=cdf43639fcc41f8f2654af65dd1b0fb2c07f7968 commit cdf43639fcc41f8f2654af65dd1b0fb2c07f7968 Author: Xin LI AuthorDate: 2023-09-05 03:14:31 +0000 Commit: Xin LI CommitDate: 2023-09-09 07:29:58 +0000 MFC: MFV: zlib: examples: define functions as static ones. (PR #855) Approved by: re (gjb) (cherry picked from commit ef3a764bc5bed4bc071a81e04c4d3254010274c3) (cherry picked from commit 579455e8f01d319ccf01afab86f1e89d9fb159a4) --- sys/contrib/zlib/test/example.c | 24 ++++++++++++------------ sys/contrib/zlib/test/minigzip.c | 30 +++++++++++++++--------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/sys/contrib/zlib/test/example.c b/sys/contrib/zlib/test/example.c index 582a17a3ce94..f27ba8e2fdcb 100644 --- a/sys/contrib/zlib/test/example.c +++ b/sys/contrib/zlib/test/example.c @@ -36,12 +36,12 @@ static uLong dictId; /* Adler32 value of the dictionary */ #ifdef Z_SOLO -void *myalloc(void *q, unsigned n, unsigned m) { +static void *myalloc(void *q, unsigned n, unsigned m) { (void)q; return calloc(n, m); } -void myfree(void *q, void *p) { +static void myfree(void *q, void *p) { (void)q; free(p); } @@ -57,7 +57,7 @@ static free_func zfree = (free_func)0; /* =========================================================================== * Test compress() and uncompress() */ -void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; uLong len = (uLong)strlen(hello)+1; @@ -81,7 +81,7 @@ void test_compress(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test read/write of .gz files */ -void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { +static void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { #ifdef NO_GZCOMPRESS fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n"); #else @@ -163,7 +163,7 @@ void test_gzio(const char *fname, Byte *uncompr, uLong uncomprLen) { /* =========================================================================== * Test deflate() with small buffers */ -void test_deflate(Byte *compr, uLong comprLen) { +static void test_deflate(Byte *compr, uLong comprLen) { z_stream c_stream; /* compression stream */ int err; uLong len = (uLong)strlen(hello)+1; @@ -198,7 +198,7 @@ void test_deflate(Byte *compr, uLong comprLen) { /* =========================================================================== * Test inflate() with small buffers */ -void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -237,7 +237,7 @@ void test_inflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test deflate() with large buffers and dynamic change of compression level */ -void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { z_stream c_stream; /* compression stream */ int err; @@ -290,7 +290,7 @@ void test_large_deflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test inflate() with large buffers */ -void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -329,7 +329,7 @@ void test_large_inflate(Byte *compr, uLong comprLen, Byte *uncompr, /* =========================================================================== * Test deflate() with full flush */ -void test_flush(Byte *compr, uLong *comprLen) { +static void test_flush(Byte *compr, uLong *comprLen) { z_stream c_stream; /* compression stream */ int err; uInt len = (uInt)strlen(hello)+1; @@ -364,7 +364,7 @@ void test_flush(Byte *compr, uLong *comprLen) { /* =========================================================================== * Test inflateSync() */ -void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { +static void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ @@ -404,7 +404,7 @@ void test_sync(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { /* =========================================================================== * Test deflate() with preset dictionary */ -void test_dict_deflate(Byte *compr, uLong comprLen) { +static void test_dict_deflate(Byte *compr, uLong comprLen) { z_stream c_stream; /* compression stream */ int err; @@ -438,7 +438,7 @@ void test_dict_deflate(Byte *compr, uLong comprLen) { /* =========================================================================== * Test inflate() with a preset dictionary */ -void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr, +static void test_dict_inflate(Byte *compr, uLong comprLen, Byte *uncompr, uLong uncomprLen) { int err; z_stream d_stream; /* decompression stream */ diff --git a/sys/contrib/zlib/test/minigzip.c b/sys/contrib/zlib/test/minigzip.c index 8a21ddfb57e9..c72356dbccf2 100644 --- a/sys/contrib/zlib/test/minigzip.c +++ b/sys/contrib/zlib/test/minigzip.c @@ -149,12 +149,12 @@ static void pwinerror (s) # include /* for unlink() */ #endif -void *myalloc(void *q, unsigned n, unsigned m) { +static void *myalloc(void *q, unsigned n, unsigned m) { (void)q; return calloc(n, m); } -void myfree(void *q, void *p) { +static void myfree(void *q, void *p) { (void)q; free(p); } @@ -167,7 +167,7 @@ typedef struct gzFile_s { z_stream strm; } *gzFile; -gzFile gz_open(const char *path, int fd, const char *mode) { +static gzFile gz_open(const char *path, int fd, const char *mode) { gzFile gz; int ret; @@ -201,15 +201,15 @@ gzFile gz_open(const char *path, int fd, const char *mode) { return gz; } -gzFile gzopen(const char *path, const char *mode) { +static gzFile gzopen(const char *path, const char *mode) { return gz_open(path, -1, mode); } -gzFile gzdopen(int fd, const char *mode) { +static gzFile gzdopen(int fd, const char *mode) { return gz_open(NULL, fd, mode); } -int gzwrite(gzFile gz, const void *buf, unsigned len) { +static int gzwrite(gzFile gz, const void *buf, unsigned len) { z_stream *strm; unsigned char out[BUFLEN]; @@ -227,7 +227,7 @@ int gzwrite(gzFile gz, const void *buf, unsigned len) { return len; } -int gzread(gzFile gz, void *buf, unsigned len) { +static int gzread(gzFile gz, void *buf, unsigned len) { int ret; unsigned got; unsigned char in[1]; @@ -258,7 +258,7 @@ int gzread(gzFile gz, void *buf, unsigned len) { return len - strm->avail_out; } -int gzclose(gzFile gz) { +static int gzclose(gzFile gz) { z_stream *strm; unsigned char out[BUFLEN]; @@ -283,7 +283,7 @@ int gzclose(gzFile gz) { return Z_OK; } -const char *gzerror(gzFile gz, int *err) { +static const char *gzerror(gzFile gz, int *err) { *err = gz->err; return gz->msg; } @@ -295,7 +295,7 @@ static char *prog; /* =========================================================================== * Display error message and exit */ -void error(const char *msg) { +static void error(const char *msg) { fprintf(stderr, "%s: %s\n", prog, msg); exit(1); } @@ -305,7 +305,7 @@ void error(const char *msg) { /* Try compressing the input file at once using mmap. Return Z_OK if * if success, Z_ERRNO otherwise. */ -int gz_compress_mmap(FILE *in, gzFile out) { +static int gz_compress_mmap(FILE *in, gzFile out) { int len; int err; int ifd = fileno(in); @@ -338,7 +338,7 @@ int gz_compress_mmap(FILE *in, gzFile out) { * Compress input to output then close both files. */ -void gz_compress(FILE *in, gzFile out) { +static void gz_compress(FILE *in, gzFile out) { local char buf[BUFLEN]; int len; int err; @@ -366,7 +366,7 @@ void gz_compress(FILE *in, gzFile out) { /* =========================================================================== * Uncompress input to output then close both files. */ -void gz_uncompress(gzFile in, FILE *out) { +static void gz_uncompress(gzFile in, FILE *out) { local char buf[BUFLEN]; int len; int err; @@ -390,7 +390,7 @@ void gz_uncompress(gzFile in, FILE *out) { * Compress the given file: create a corresponding .gz file and remove the * original. */ -void file_compress(char *file, char *mode) { +static void file_compress(char *file, char *mode) { local char outfile[MAX_NAME_LEN]; FILE *in; gzFile out; @@ -426,7 +426,7 @@ void file_compress(char *file, char *mode) { /* =========================================================================== * Uncompress the given file and remove the original. */ -void file_uncompress(char *file) { +static void file_uncompress(char *file) { local char buf[MAX_NAME_LEN]; char *infile, *outfile; FILE *out; From nobody Sat Sep 9 07:31:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjPm64dJjz4t4Cj; Sat, 9 Sep 2023 07:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjPm6424Dz3YBH; Sat, 9 Sep 2023 07:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLxrRcT6+wpFkqZ53BUBIz11V7oB4k0MKHX/u6ZHD4o=; b=TKMYISSItq6h7MVKr1az5vcSs6ZE/mZtg9gEgkjubM3RBOqDaWn04b2+uGCurfBXGr3nrY rsaFnn7rv5dndrBEOoKzrh3ponxnHDBIH1Ix84ML//k064AfXQRaG1alHZkZAmF0Jrzmxr 9S6nF3CMbbrn8hBY0Ktk4k0H4TZdZExGRms8Lv2TdIIr75/Faz11rIcu6FNxKbh+a2Phdv hJ2wubtyzZ1smsFLK3JTCeQW4bDFy/oFzyIkpdkFaTFLIbr0w/NyPBbTVgU6v7wcYsICFB 65Qo1wplBhezfRSX7hjC/E8rytqXMd3nB4TnL5mN710jz76knPFmsd0qd4SkcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694244662; a=rsa-sha256; cv=none; b=lA/dFSWfmuCmRaa75Em4S34eHOQyVDO0QqOC43sgzCYaixtQSwaPYt3Q+ErQVEGFJ/r77I JhiZPAdOnDrfE146FSp8GEbUl4FeBG8BCM0wWVufmLDvywkrey4YSUOrfgfQKz/VUB0TD8 P4XnJB5MLNPYTbHOh1wDUoSzBXgMLDOCAW2Go/bz2dOyrrPjTb8nBHdxYqXyCy5FSQg33X ACjUcKB5fAj71c5y5y3vMkUTY3YytXnYrjRFRvfsUct7v8frf2BRKjtRqENtX9ps6DqCDx CVjr1Ewbwc8xFKHTzJySTmVPHfCriL3O/pPR/358nUrgAQpdCzQYZz72wxwBew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694244662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nLxrRcT6+wpFkqZ53BUBIz11V7oB4k0MKHX/u6ZHD4o=; b=LziYEzRYxJl0+WmfPGuH8XHk/ucNyawYXQ8FZWDErTCETHrUv8uXi50DxsAYxXp+Z5WjFL S6g86rJqxUpHxJdPha0W3uEqNuH2fWGoGdZo04bvMDMgbN+qOMD/Vi/OC6x9/quqneTXfm 3ibkzJHqSKYk6/x7rDDIpyPpfH3l0ahra/WGfLD4s8wIkp5tpvMkheVjuU9l90tBAy1XVt qOJjiEj7UZ4zyYxX8cvL6Fmf5zSe7QZFNRkyB/VfxMBqX3zA8T1WyELUjospvPU0Z9E7o8 g5iQ8j0LJvYdLiV0U27o/CQhD/YvR9r9FsJob4wfo10BTirEpIhsVrzGrifscg== 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 4RjPm61GFCz1C4; Sat, 9 Sep 2023 07:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3897V2dk061860; Sat, 9 Sep 2023 07:31:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3897V2B2061857; Sat, 9 Sep 2023 07:31:02 GMT (envelope-from git) Date: Sat, 9 Sep 2023 07:31:02 GMT Message-Id: <202309090731.3897V2B2061857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: c92758cfd8ce - releng/14.0 - sys/dev/arcmsr: Update Areca RAID driver to version 1.50.00.06. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: c92758cfd8cecd542269b6ae6622b3efad8f66a7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=c92758cfd8cecd542269b6ae6622b3efad8f66a7 commit c92758cfd8cecd542269b6ae6622b3efad8f66a7 Author: 黃清隆 AuthorDate: 2023-09-06 07:59:22 +0000 Commit: Xin LI CommitDate: 2023-09-09 07:30:39 +0000 sys/dev/arcmsr: Update Areca RAID driver to version 1.50.00.06. - Suppressed a harmless warning message, "arcmsr_dr_handle: target=f, lun=0, GONE!!!," which could appear a few seconds after UEFI system boot due to the boot volume UEFI initialization. - Corrected various typing errors. - Refactored arcmsr_initialize() to improve code readability. - Added support for device IDs 1883 and 1886 controllers. - Introduced support for controllers requiring host memory for the RAID 5 and 6 XOR engines. Many thanks to Areca for continuing to support FreeBSD. Approved by: re (gjb) (cherry picked from commit cb1a0aab4f3ca169509ab86a67a4630e72790869) (cherry picked from commit 72a9f518d5973bb1cd371cff8ee4e3f24c410e42) --- sys/dev/arcmsr/arcmsr.c | 693 ++++++++++++++++++++++++++++++++---------------- sys/dev/arcmsr/arcmsr.h | 51 +++- 2 files changed, 507 insertions(+), 237 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index b43e9b8b3813..bbb1b6a9b53f 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -88,6 +88,8 @@ ** 1.50.00.03 05/04/2021 Ching Huang Fixed doorbell status arrived late on ARC-1886 ** 1.50.00.04 12/08/2021 Ching Huang Fixed boot up hung under ARC-1886 with no volume created ** 1.50.00.05 03/23/2023 Ching Huang Fixed reading buffer empty length error +** 1.50.00.06 08/07/2023 Ching Huang Add support adapter using system memory as XOR buffer, +** Add support device ID 1883,1886 ****************************************************************************************** */ @@ -143,7 +145,7 @@ #define arcmsr_callout_init(a) callout_init(a, /*mpsafe*/1); -#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.05 2023-03-23" +#define ARCMSR_DRIVER_VERSION "arcmsr version 1.50.00.06 2023-08-07" #include /* ************************************************************************** @@ -1071,7 +1073,7 @@ static void arcmsr_build_srb(struct CommandControlBlock *srb, */ static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandControlBlock *srb) { - u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr_low; + u_int32_t cdb_phyaddr_low = (u_int32_t) srb->cdb_phyaddr; struct ARCMSR_CDB *arcmsr_cdb = (struct ARCMSR_CDB *)&srb->arcmsr_cdb; bus_dmamap_sync(acb->srb_dmat, acb->srb_dmamap, (srb->srb_flags & SRB_FLAG_WRITE) ? BUS_DMASYNC_POSTWRITE:BUS_DMASYNC_POSTREAD); @@ -1131,10 +1133,10 @@ static void arcmsr_post_srb(struct AdapterControlBlock *acb, struct CommandContr ARCMSR_LOCK_ACQUIRE(&acb->postDone_lock); postq_index = phbdmu->postq_index; pinbound_srb = (struct InBound_SRB *)&phbdmu->post_qbuffer[postq_index & 0xFF]; - pinbound_srb->addressHigh = srb->cdb_phyaddr_high; - pinbound_srb->addressLow = srb->cdb_phyaddr_low; + pinbound_srb->addressHigh = (u_int32_t)((srb->cdb_phyaddr >> 16) >> 16); + pinbound_srb->addressLow = (u_int32_t)srb->cdb_phyaddr; pinbound_srb->length = srb->arc_cdb_size >> 2; - arcmsr_cdb->Context = srb->cdb_phyaddr_low; + arcmsr_cdb->Context = (u_int32_t)srb->cdb_phyaddr; if (postq_index & 0x4000) { index_stripped = postq_index & 0xFF; index_stripped += 1; @@ -1742,7 +1744,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBA_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1751,7 +1753,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBB_RWBUFFER, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[1], acb->bhandle[1], devicemap); devicemap += 4; } break; @@ -1760,7 +1762,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBC_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1768,7 +1770,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBD_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1776,7 +1778,7 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { devicemap = offsetof(struct HBE_MessageUnit, msgcode_rwbuffer[ARCMSR_FW_DEVMAP_OFFSET]); for (target = 0; target < 4; target++) { - deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); + deviceMapCurrent[target]=bus_space_read_4(acb->btag[0], acb->bhandle[0], devicemap); devicemap += 4; } break; @@ -1813,14 +1815,15 @@ static void arcmsr_dr_handle(struct AdapterControlBlock *acb) { { if(acb->device_map[target] & bit_check) {/* unit departed */ - printf("arcmsr_dr_handle: Target=%x, lun=%x, GONE!!!\n",target,lun); + if (target != 0x0f) + printf("arcmsr_dr_handle: Target=0x%x, lun=%x, GONE!!!\n",target,lun); arcmsr_abort_dr_ccbs(acb, target, lun); arcmsr_rescan_lun(acb, target, lun); acb->devstate[target][lun] = ARECA_RAID_GONE; } else {/* unit arrived */ - printf("arcmsr_dr_handle: Target=%x, lun=%x, Plug-IN!!!\n",target,lun); + printf("arcmsr_dr_handle: Target=0x%x, lun=%x, Plug-IN!!!\n",target,lun); arcmsr_rescan_lun(acb, target, lun); acb->devstate[target][lun] = ARECA_RAID_GOOD; } @@ -3170,7 +3173,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) return; } - if(target == 16) { + if(target == ARCMSR_VIRTUAL_DEVICE_ID) { /* virtual device for iop message transfer */ arcmsr_handle_virtual_command(acb, pccb); return; @@ -3216,7 +3219,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) else cpi->base_transfer_speed = 300000; if((acb->vendor_device_id == PCIDevVenIDARC1880) || + (acb->vendor_device_id == PCIDevVenIDARC1883) || (acb->vendor_device_id == PCIDevVenIDARC1884) || + (acb->vendor_device_id == PCIDevVenIDARC1886) || (acb->vendor_device_id == PCIDevVenIDARC1680) || (acb->vendor_device_id == PCIDevVenIDARC1214)) { @@ -3282,7 +3287,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) case XPT_GET_TRAN_SETTINGS: { struct ccb_trans_settings *cts; - if(pccb->ccb_h.target_id == 16) { + if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) { pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL; xpt_done(pccb); break; @@ -3299,7 +3304,9 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) cts->protocol = PROTO_SCSI; if((acb->vendor_device_id == PCIDevVenIDARC1880) || + (acb->vendor_device_id == PCIDevVenIDARC1883) || (acb->vendor_device_id == PCIDevVenIDARC1884) || + (acb->vendor_device_id == PCIDevVenIDARC1886) || (acb->vendor_device_id == PCIDevVenIDARC1680) || (acb->vendor_device_id == PCIDevVenIDARC1214)) { @@ -3344,7 +3351,7 @@ static void arcmsr_action(struct cam_sim *psim, union ccb *pccb) break; } case XPT_CALC_GEOMETRY: - if(pccb->ccb_h.target_id == 16) { + if(pccb->ccb_h.target_id == ARCMSR_VIRTUAL_DEVICE_ID) { pccb->ccb_h.status |= CAM_FUNC_NOTAVAIL; xpt_done(pccb); break; @@ -4047,6 +4054,7 @@ static void arcmsr_get_hbf_config(struct AdapterControlBlock *acb) acb->firm_sdram_size = acb->msgcode_rwbuffer[3]; /*firm_sdram_size, 3, 12-15*/ acb->firm_ide_channels = acb->msgcode_rwbuffer[4]; /*firm_ide_channels, 4, 16-19*/ acb->firm_cfg_version = acb->msgcode_rwbuffer[ARCMSR_FW_CFGVER_OFFSET]; /*firm_cfg_version, 25*/ + acb->firm_PicStatus = acb->msgcode_rwbuffer[ARCMSR_FW_PICSTATUS]; /* firm_PicStatus, 30 */ if(acb->firm_numbers_queue > ARCMSR_MAX_OUTSTANDING_CMD) acb->maxOutstanding = ARCMSR_MAX_OUTSTANDING_CMD - 1; else @@ -4340,6 +4348,12 @@ static u_int32_t arcmsr_iop_confirm(struct AdapterControlBlock *acb) acb->msgcode_rwbuffer[5] = cdb_phyaddr_lo32; acb->msgcode_rwbuffer[6] = srb_phyaddr_hi32; acb->msgcode_rwbuffer[7] = COMPLETION_Q_POOL_SIZE; + if (acb->xor_mega) { + acb->msgcode_rwbuffer[8] = 0x555AA; //FreeBSD init 2 + acb->msgcode_rwbuffer[9] = 0; + acb->msgcode_rwbuffer[10] = (uint32_t)acb->xor_sgtable_phy; + acb->msgcode_rwbuffer[11] = (uint32_t)((acb->xor_sgtable_phy >> 16) >> 16); + } CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, ARCMSR_INBOUND_MESG0_SET_CONFIG); acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE; CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, acb->out_doorbell); @@ -4414,20 +4428,48 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in if((acb->adapter_type == ACB_ADAPTER_TYPE_C) || (acb->adapter_type == ACB_ADAPTER_TYPE_D) || (acb->adapter_type == ACB_ADAPTER_TYPE_E) || (acb->adapter_type == ACB_ADAPTER_TYPE_F)) { - srb_tmp->cdb_phyaddr_low = srb_phyaddr; - srb_tmp->cdb_phyaddr_high = (u_int32_t)((srb_phyaddr >> 16) >> 16); + srb_tmp->cdb_phyaddr = srb_phyaddr; } else - srb_tmp->cdb_phyaddr_low = srb_phyaddr >> 5; + srb_tmp->cdb_phyaddr = srb_phyaddr >> 5; srb_tmp->acb = acb; srb_tmp->smid = i << 16; acb->srbworkingQ[i] = acb->psrb_pool[i] = srb_tmp; srb_phyaddr = srb_phyaddr + SRB_SIZE; srb_tmp = (struct CommandControlBlock *)((unsigned long)srb_tmp + SRB_SIZE); } - if (acb->adapter_type == ACB_ADAPTER_TYPE_E) + srb_tmp = (struct CommandControlBlock *)(acb->uncacheptr + ARCMSR_SRBS_POOL_SIZE); + srb_phyaddr = (unsigned long)segs->ds_addr + ARCMSR_SRBS_POOL_SIZE; + switch (acb->adapter_type) { + case ACB_ADAPTER_TYPE_B: { + struct HBB_MessageUnit *phbbmu; + + acb->pmu = (struct MessageUnit_UNION *)srb_tmp; + phbbmu = (struct HBB_MessageUnit *)acb->pmu; + phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)acb->mem_base0; + phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)acb->mem_base1; + if (acb->vendor_device_id == PCIDevVenIDARC1203) { + phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell); + phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask); + phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell); + phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask); + } else { + phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell); + phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask); + phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell); + phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask); + } + } + break; + case ACB_ADAPTER_TYPE_D: + acb->pmu = (struct MessageUnit_UNION *)srb_tmp; + acb->pmu->muu.hbdmu.phbdmu = (struct HBD_MessageUnit *)acb->mem_base0; + break; + case ACB_ADAPTER_TYPE_E: acb->pCompletionQ = (pCompletion_Q)srb_tmp; - else if (acb->adapter_type == ACB_ADAPTER_TYPE_F) { + break; + case ACB_ADAPTER_TYPE_F: { + unsigned long host_buffer_dma; acb->pCompletionQ = (pCompletion_Q)srb_tmp; acb->completeQ_phys = srb_phyaddr; memset(acb->pCompletionQ, 0xff, COMPLETION_Q_POOL_SIZE); @@ -4435,9 +4477,62 @@ static void arcmsr_map_free_srb(void *arg, bus_dma_segment_t *segs, int nseg, in acb->message_rbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x100); acb->msgcode_rwbuffer = (u_int32_t *)((unsigned long)acb->message_wbuffer + 0x200); memset((void *)acb->message_wbuffer, 0, MESG_RW_BUFFER_SIZE); + arcmsr_wait_firmware_ready(acb); + host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE; + CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1)); /* host buffer low addr, bit0:1 all buffer active */ + CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */ + CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1); /* set host buffer physical address */ + acb->firm_PicStatus = CHIP_REG_READ32(HBF_MessageUnit, 0, outbound_msgaddr1); /* get firmware spec info */ + break; + } } acb->vir2phy_offset = (unsigned long)srb_tmp - (unsigned long)srb_phyaddr; } + +static void arcmsr_map_xor_sgtable(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct AdapterControlBlock *acb = arg; + + acb->xor_sgtable_phy = (unsigned long)segs->ds_addr; + if ((nseg != 1) || ((u_int32_t)segs->ds_len != acb->init2cfg_size)) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor table seg num or size not as i wish!\n", acb->pci_unit); + return; + } +} + +static void arcmsr_map_xor_sg(void *arg, bus_dma_segment_t *segs, int nseg, int error) +{ + struct AdapterControlBlock *acb = arg; + int i; + struct HostRamBuf *pRamBuf; + struct XorSg *pxortable = (struct XorSg *)(acb->xortable + sizeof(struct HostRamBuf)); + + if (nseg != acb->xor_mega) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor seg NUM not as i wish!\n", acb->pci_unit); + return; + } + for (i = 0; i < nseg; i++) { + if ((u_int32_t)segs->ds_len != ARCMSR_XOR_SEG_SIZE) { + acb->acb_flags |= ACB_F_MAPXOR_FAILD; + printf("arcmsr%d: alloc xor seg SIZE not as i wish!\n", acb->pci_unit); + return; + } + pxortable->xorPhys = (u_int64_t)segs->ds_addr; + pxortable->xorBufLen = (u_int64_t)segs->ds_len; + pxortable++; + segs++; + } + pRamBuf = (struct HostRamBuf *)acb->xortable; + pRamBuf->hrbSignature = 0x53425248; //HRBS + pRamBuf->hrbSize = ARCMSR_XOR_SEG_SIZE * nseg; + pRamBuf->hrbRes[0] = 0; + pRamBuf->hrbRes[1] = 0; + bus_dmamap_sync(acb->xortable_dmat, acb->xortable_dmamap, BUS_DMASYNC_PREREAD); + bus_dmamap_sync(acb->xor_dmat, acb->xor_dmamap, BUS_DMASYNC_PREWRITE); +} + /* ************************************************************************ ************************************************************************ @@ -4448,11 +4543,55 @@ static void arcmsr_free_resource(struct AdapterControlBlock *acb) if(acb->ioctl_dev != NULL) { destroy_dev(acb->ioctl_dev); } - bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap); - bus_dmamap_destroy(acb->srb_dmat, acb->srb_dmamap); - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); + if (acb->acb_flags & ACB_F_DMAMAP_SG) + bus_dmamap_unload(acb->xor_dmat, acb->xor_dmamap); + if (acb->xor_dmamap) { + bus_dmamem_free(acb->xor_dmat, acb->xorptr, acb->xor_dmamap); + } + if (acb->acb_flags & ACB_F_DMAMAP_SGTABLE) + bus_dmamap_unload(acb->xortable_dmat, acb->xortable_dmamap); + if (acb->xortable_dmamap) { + bus_dmamem_free(acb->xortable_dmat, acb->xortable, acb->xortable_dmamap); + } + if (acb->acb_flags & ACB_F_DMAMAP_SRB) + bus_dmamap_unload(acb->srb_dmat, acb->srb_dmamap); + if (acb->srb_dmamap) { + bus_dmamem_free(acb->srb_dmat, acb->uncacheptr, acb->srb_dmamap); + } + if (acb->srb_dmat) + bus_dma_tag_destroy(acb->srb_dmat); + if (acb->dm_segs_dmat) + bus_dma_tag_destroy(acb->dm_segs_dmat); + if (acb->parent_dmat) + bus_dma_tag_destroy(acb->parent_dmat); + switch(acb->adapter_type) { + case ACB_ADAPTER_TYPE_A: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_B: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + if (acb->sys_res_arcmsr[1]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(2), acb->sys_res_arcmsr[1]); + break; + case ACB_ADAPTER_TYPE_C: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_D: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_E: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(1), acb->sys_res_arcmsr[0]); + break; + case ACB_ADAPTER_TYPE_F: + if (acb->sys_res_arcmsr[0]) + bus_release_resource(acb->pci_dev, SYS_RES_MEMORY, PCIR_BAR(0), acb->sys_res_arcmsr[0]); + break; + } } /* ************************************************************************ @@ -4480,21 +4619,16 @@ static void arcmsr_mutex_destroy(struct AdapterControlBlock *acb) ************************************************************************ ************************************************************************ */ -static u_int32_t arcmsr_initialize(device_t dev) +static int arcmsr_define_adapter_type(struct AdapterControlBlock *acb) { - struct AdapterControlBlock *acb = device_get_softc(dev); - u_int16_t pci_command; - int i, j,max_coherent_size; - u_int32_t vendor_dev_id; - - vendor_dev_id = pci_get_devid(dev); - acb->vendor_device_id = vendor_dev_id; - acb->sub_device_id = pci_read_config(dev, PCIR_SUBDEV_0, 2); - switch (vendor_dev_id) { - case PCIDevVenIDARC1880: - case PCIDevVenIDARC1882: - case PCIDevVenIDARC1213: - case PCIDevVenIDARC1223: { + int rc = 0; + + switch (acb->vendor_device_id) { + case PCIDevVenIDARC1880: + case PCIDevVenIDARC1882: + case PCIDevVenIDARC1883: + case PCIDevVenIDARC1213: + case PCIDevVenIDARC1223: { acb->adapter_type = ACB_ADAPTER_TYPE_C; if ((acb->sub_device_id == ARECA_SUB_DEV_ID_1883) || (acb->sub_device_id == ARECA_SUB_DEV_ID_1216) || @@ -4502,158 +4636,78 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->adapter_bus_speed = ACB_BUS_SPEED_12G; else acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE; - } - break; - case PCIDevVenIDARC1884: - acb->adapter_type = ACB_ADAPTER_TYPE_E; - acb->adapter_bus_speed = ACB_BUS_SPEED_12G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE; - acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); - break; - case PCIDevVenIDARC1886_: - case PCIDevVenIDARC1886: - acb->adapter_type = ACB_ADAPTER_TYPE_F; - acb->adapter_bus_speed = ACB_BUS_SPEED_12G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE; - acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); - break; - case PCIDevVenIDARC1214: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE; + } + break; + case PCIDevVenIDARC1884: + acb->adapter_type = ACB_ADAPTER_TYPE_E; + acb->adapter_bus_speed = ACB_BUS_SPEED_12G; + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE; + acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); + break; + case PCIDevVenIDARC1886_0: + case PCIDevVenIDARC1886_: + case PCIDevVenIDARC1886: + acb->adapter_type = ACB_ADAPTER_TYPE_F; + acb->adapter_bus_speed = ACB_BUS_SPEED_12G; + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + COMPLETION_Q_POOL_SIZE + MESG_RW_BUFFER_SIZE; + acb->completionQ_entry = COMPLETION_Q_POOL_SIZE / sizeof(struct deliver_completeQ); + break; + case PCIDevVenIDARC1214: + case PCIDevVenIDARC1224: { acb->adapter_type = ACB_ADAPTER_TYPE_D; acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0)); - } - break; - case PCIDevVenIDARC1200: - case PCIDevVenIDARC1201: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBD_MessageUnit0)); + } + break; + case PCIDevVenIDARC1200: + case PCIDevVenIDARC1201: { acb->adapter_type = ACB_ADAPTER_TYPE_B; acb->adapter_bus_speed = ACB_BUS_SPEED_3G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); - } - break; - case PCIDevVenIDARC1203: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); + } + break; + case PCIDevVenIDARC1203: { acb->adapter_type = ACB_ADAPTER_TYPE_B; acb->adapter_bus_speed = ACB_BUS_SPEED_6G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); - } - break; - case PCIDevVenIDARC1110: - case PCIDevVenIDARC1120: - case PCIDevVenIDARC1130: - case PCIDevVenIDARC1160: - case PCIDevVenIDARC1170: - case PCIDevVenIDARC1210: - case PCIDevVenIDARC1220: - case PCIDevVenIDARC1230: - case PCIDevVenIDARC1231: - case PCIDevVenIDARC1260: - case PCIDevVenIDARC1261: - case PCIDevVenIDARC1270: - case PCIDevVenIDARC1280: - case PCIDevVenIDARC1212: - case PCIDevVenIDARC1222: - case PCIDevVenIDARC1380: - case PCIDevVenIDARC1381: - case PCIDevVenIDARC1680: - case PCIDevVenIDARC1681: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE + (sizeof(struct HBB_MessageUnit)); + } + break; + case PCIDevVenIDARC1110: + case PCIDevVenIDARC1120: + case PCIDevVenIDARC1130: + case PCIDevVenIDARC1160: + case PCIDevVenIDARC1170: + case PCIDevVenIDARC1210: + case PCIDevVenIDARC1220: + case PCIDevVenIDARC1230: + case PCIDevVenIDARC1231: + case PCIDevVenIDARC1260: + case PCIDevVenIDARC1261: + case PCIDevVenIDARC1270: + case PCIDevVenIDARC1280: + case PCIDevVenIDARC1212: + case PCIDevVenIDARC1222: + case PCIDevVenIDARC1380: + case PCIDevVenIDARC1381: + case PCIDevVenIDARC1680: + case PCIDevVenIDARC1681: { acb->adapter_type = ACB_ADAPTER_TYPE_A; acb->adapter_bus_speed = ACB_BUS_SPEED_3G; - max_coherent_size = ARCMSR_SRBS_POOL_SIZE; - } - break; - default: { + acb->max_coherent_size = ARCMSR_SRBS_POOL_SIZE; + } + break; + default: { printf("arcmsr%d:" - " unknown RAID adapter type \n", device_get_unit(dev)); - return ENOMEM; + " unknown RAID adapter type \n", acb->pci_unit); + rc = ENOMEM; } } - if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev), - /*alignemnt*/ 1, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ BUS_SPACE_MAXSIZE_32BIT, - /*nsegments*/ BUS_SPACE_UNRESTRICTED, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ NULL, - /*lockarg*/ NULL, - &acb->parent_dmat) != 0) - { - printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENOMEM; - } - - /* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */ - if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, - /*alignment*/ 1, - /*boundary*/ 0, -#ifdef PAE - /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, -#else - /*lowaddr*/ BUS_SPACE_MAXADDR, -#endif - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM, - /*nsegments*/ ARCMSR_MAX_SG_ENTRIES, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ busdma_lock_mutex, - /*lockarg*/ &acb->isr_lock, - &acb->dm_segs_dmat) != 0) - { - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENOMEM; - } + return rc; +} - /* DMA tag for our srb structures.... Allocate the freesrb memory */ - if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, - /*alignment*/ 0x20, - /*boundary*/ 0, - /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, - /*highaddr*/ BUS_SPACE_MAXADDR, - /*filter*/ NULL, - /*filterarg*/ NULL, - /*maxsize*/ max_coherent_size, - /*nsegments*/ 1, - /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, - /*flags*/ 0, - /*lockfunc*/ NULL, - /*lockarg*/ NULL, - &acb->srb_dmat) != 0) - { - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", device_get_unit(dev)); - return ENXIO; - } - /* Allocation for our srbs */ - if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &acb->srb_dmamap) != 0) { - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", device_get_unit(dev)); - return ENXIO; - } - /* And permanently map them */ - if(bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0)) { - bus_dma_tag_destroy(acb->srb_dmat); - bus_dma_tag_destroy(acb->dm_segs_dmat); - bus_dma_tag_destroy(acb->parent_dmat); - printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", device_get_unit(dev)); - return ENXIO; - } - pci_command = pci_read_config(dev, PCIR_COMMAND, 2); - pci_command |= PCIM_CMD_BUSMASTEREN; - pci_command |= PCIM_CMD_PERRESPEN; - pci_command |= PCIM_CMD_MWRICEN; - /* Enable Busmaster */ - pci_write_config(dev, PCIR_COMMAND, pci_command, 2); +static int arcmsr_map_pcireg(device_t dev, struct AdapterControlBlock *acb) +{ switch(acb->adapter_type) { case ACB_ADAPTER_TYPE_A: { u_int32_t rid0 = PCIR_BAR(0); @@ -4662,18 +4716,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev,SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4683,47 +4737,33 @@ static u_int32_t arcmsr_initialize(device_t dev) } break; case ACB_ADAPTER_TYPE_B: { - struct HBB_MessageUnit *phbbmu; - struct CommandControlBlock *freesrb; u_int32_t rid[]={ PCIR_BAR(0), PCIR_BAR(2) }; vm_offset_t mem_base[]={0,0}; + u_int16_t i; + for(i=0; i < 2; i++) { acb->sys_res_arcmsr[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid[i], RF_ACTIVE); if(acb->sys_res_arcmsr[i] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: bus_alloc_resource %d failure!\n", acb->pci_unit, i); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[i]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: rman_get_start %d failure!\n", acb->pci_unit, i); return ENXIO; } mem_base[i] = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[i]); if(mem_base[i] == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual %d failure!\n", device_get_unit(dev), i); + printf("arcmsr%d: rman_get_virtual %d failure!\n", acb->pci_unit, i); return ENXIO; } acb->btag[i] = rman_get_bustag(acb->sys_res_arcmsr[i]); acb->bhandle[i] = rman_get_bushandle(acb->sys_res_arcmsr[i]); } - freesrb = (struct CommandControlBlock *)acb->uncacheptr; - acb->pmu = (struct MessageUnit_UNION *)((unsigned long)freesrb+ARCMSR_SRBS_POOL_SIZE); - phbbmu = (struct HBB_MessageUnit *)acb->pmu; - phbbmu->hbb_doorbell = (struct HBB_DOORBELL *)mem_base[0]; - phbbmu->hbb_rwbuffer = (struct HBB_RWBUFFER *)mem_base[1]; - if (vendor_dev_id == PCIDevVenIDARC1203) { - phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell); - phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, drv2iop_doorbell_mask); - phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell); - phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL_1203, iop2drv_doorbell_mask); - } else { - phbbmu->drv2iop_doorbell = offsetof(struct HBB_DOORBELL, drv2iop_doorbell); - phbbmu->drv2iop_doorbell_mask = offsetof(struct HBB_DOORBELL, drv2iop_doorbell_mask); - phbbmu->iop2drv_doorbell = offsetof(struct HBB_DOORBELL, iop2drv_doorbell); - phbbmu->iop2drv_doorbell_mask = offsetof(struct HBB_DOORBELL, iop2drv_doorbell_mask); - } + acb->mem_base0 = mem_base[0]; + acb->mem_base1 = mem_base[1]; acb->rid[0] = rid[0]; acb->rid[1] = rid[1]; } @@ -4735,18 +4775,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4756,32 +4796,29 @@ static u_int32_t arcmsr_initialize(device_t dev) } break; case ACB_ADAPTER_TYPE_D: { - struct HBD_MessageUnit0 *phbdmu; u_int32_t rid0 = PCIR_BAR(0); vm_offset_t mem_base0; acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); acb->bhandle[0] = rman_get_bushandle(acb->sys_res_arcmsr[0]); - acb->pmu = (struct MessageUnit_UNION *)((unsigned long)acb->uncacheptr+ARCMSR_SRBS_POOL_SIZE); - phbdmu = (struct HBD_MessageUnit0 *)acb->pmu; - phbdmu->phbdmu = (struct HBD_MessageUnit *)mem_base0; + acb->mem_base0 = mem_base0; acb->rid[0] = rid0; } break; @@ -4792,18 +4829,18 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4820,23 +4857,22 @@ static u_int32_t arcmsr_initialize(device_t dev) case ACB_ADAPTER_TYPE_F: { u_int32_t rid0 = PCIR_BAR(0); vm_offset_t mem_base0; - unsigned long host_buffer_dma; acb->sys_res_arcmsr[0] = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid0, RF_ACTIVE); if(acb->sys_res_arcmsr[0] == NULL) { arcmsr_free_resource(acb); - printf("arcmsr%d: bus_alloc_resource failure!\n", device_get_unit(dev)); + printf("arcmsr%d: bus_alloc_resource failure!\n", acb->pci_unit); return ENOMEM; } if(rman_get_start(acb->sys_res_arcmsr[0]) <= 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_start failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_start failure!\n", acb->pci_unit); return ENXIO; } mem_base0 = (vm_offset_t) rman_get_virtual(acb->sys_res_arcmsr[0]); if(mem_base0 == 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: rman_get_virtual failure!\n", device_get_unit(dev)); + printf("arcmsr%d: rman_get_virtual failure!\n", acb->pci_unit); return ENXIO; } acb->btag[0] = rman_get_bustag(acb->sys_res_arcmsr[0]); @@ -4848,17 +4884,203 @@ static u_int32_t arcmsr_initialize(device_t dev) acb->rid[0] = rid0; CHIP_REG_WRITE32(HBF_MessageUnit, 0, host_int_status, 0); /*clear interrupt*/ CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBEMU_DOORBELL_SYNC); /* synchronize doorbell to 0 */ - arcmsr_wait_firmware_ready(acb); - host_buffer_dma = acb->completeQ_phys + COMPLETION_Q_POOL_SIZE; - CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr0, (u_int32_t)(host_buffer_dma | 1)); /* host buffer low addr, bit0:1 all buffer active */ - CHIP_REG_WRITE32(HBF_MessageUnit, 0, inbound_msgaddr1, (u_int32_t)((host_buffer_dma >> 16) >> 16));/* host buffer high addr */ - CHIP_REG_WRITE32(HBF_MessageUnit, 0, iobound_doorbell, ARCMSR_HBFMU_DOORBELL_SYNC1); /* set host buffer physical address */ } break; } - if(acb->acb_flags & ACB_F_MAPFREESRB_FAILD) { + return (0); +} + +static int arcmsr_alloc_srb(device_t dev, struct AdapterControlBlock *acb) +{ + int rc; + + if(bus_dma_tag_create( /*PCI parent*/ bus_get_dma_tag(dev), + /*alignemnt*/ 1, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ BUS_SPACE_MAXSIZE_32BIT, + /*nsegments*/ BUS_SPACE_UNRESTRICTED, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->parent_dmat) != 0) + { + printf("arcmsr%d: parent_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENOMEM; + } + + /* Create a single tag describing a region large enough to hold all of the s/g lists we will need. */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 1, + /*boundary*/ 0, +#ifdef PAE + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, +#else + /*lowaddr*/ BUS_SPACE_MAXADDR, +#endif + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ ARCMSR_MAX_SG_ENTRIES * PAGE_SIZE * ARCMSR_MAX_FREESRB_NUM, + /*nsegments*/ ARCMSR_MAX_SG_ENTRIES, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ busdma_lock_mutex, + /*lockarg*/ &acb->isr_lock, + &acb->dm_segs_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: dm_segs_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENOMEM; + } + + /* DMA tag for our srb structures.... Allocate the freesrb memory */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x20, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ acb->max_coherent_size, + /*nsegments*/ 1, + /*maxsegsz*/ BUS_SPACE_MAXSIZE_32BIT, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->srb_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for our srbs */ + if(bus_dmamem_alloc(acb->srb_dmat, (void **)&acb->uncacheptr, ARCMSR_DMA_ALLOC_FLAG, &acb->srb_dmamap) != 0) { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dmamem_alloc failure!\n", acb->pci_unit); + return ENXIO; + } + /* And permanently map them */ + rc = bus_dmamap_load(acb->srb_dmat, acb->srb_dmamap, acb->uncacheptr, acb->max_coherent_size, arcmsr_map_free_srb, acb, /*flags*/0); + if((rc != 0) && (rc != EINPROGRESS)) { + arcmsr_free_resource(acb); + printf("arcmsr%d: srb_dmat bus_dmamap_load failure!\n", acb->pci_unit); + return ENXIO; + } + acb->acb_flags |= ACB_F_DMAMAP_SRB; + return (0); +} + +static int arcmsr_alloc_xor_mem(device_t dev, struct AdapterControlBlock *acb) +{ + int rc, xor_ram; + + xor_ram = (acb->firm_PicStatus >> 24) & 0x0f; + acb->xor_mega = (xor_ram - 1) * 32 + 128 + 3; + acb->init2cfg_size = sizeof(struct HostRamBuf) + (sizeof(struct XorSg) * acb->xor_mega); + /* DMA tag for XOR engine of Raid 5,6 */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x40, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ acb->init2cfg_size, + /*nsegments*/ 1, + /*maxsegsz*/ acb->init2cfg_size, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->xortable_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor table bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for xors */ + if(bus_dmamem_alloc(acb->xortable_dmat, (void **)&acb->xortable, ARCMSR_DMA_ALLOC_FLAG, &acb->xortable_dmamap) != 0) { arcmsr_free_resource(acb); - printf("arcmsr%d: map free srb failure!\n", device_get_unit(dev)); + printf("arcmsr%d: xor table bus_dmamem_alloc failure!\n", acb->pci_unit); + return ENXIO; + } + /* And permanently map xor segs */ + rc = bus_dmamap_load(acb->xortable_dmat, acb->xortable_dmamap, acb->xortable, acb->init2cfg_size, arcmsr_map_xor_sgtable, acb, /*flags*/0); + if((rc != 0) && (rc != EINPROGRESS)) { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor table bus_dmamap_load failure!\n", acb->pci_unit); + return ENXIO; + } + acb->acb_flags |= ACB_F_DMAMAP_SGTABLE; + + /* DMA tag for XOR engine of Raid 5,6 */ + if(bus_dma_tag_create( /*parent_dmat*/ acb->parent_dmat, + /*alignment*/ 0x1000, + /*boundary*/ 0, + /*lowaddr*/ BUS_SPACE_MAXADDR_32BIT, + /*highaddr*/ BUS_SPACE_MAXADDR, + /*filter*/ NULL, + /*filterarg*/ NULL, + /*maxsize*/ (ARCMSR_XOR_SEG_SIZE * acb->xor_mega), + /*nsegments*/ acb->xor_mega, + /*maxsegsz*/ ARCMSR_XOR_SEG_SIZE, + /*flags*/ 0, + /*lockfunc*/ NULL, + /*lockarg*/ NULL, + &acb->xor_dmat) != 0) + { + arcmsr_free_resource(acb); + printf("arcmsr%d: xor bus_dma_tag_create failure!\n", acb->pci_unit); + return ENXIO; + } + /* Allocation for xors */ *** 250 LINES SKIPPED *** From nobody Sat Sep 9 08:21:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjQt40rPcz4sKs6; Sat, 9 Sep 2023 08:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjQt40P4tz4JMl; Sat, 9 Sep 2023 08:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jy7uhSiqDWpckJhhpRAUl77DXQ1NsN9NdSOq2uW1R9k=; b=cUMzurpX25v7WKU96rmZpeoNLZkYZ/y9HFOB1WqJ1goQWJyFohROBcZ2cHsosfr6vY+1Ij Ml7Ht8017Dayn/Dof0f5kxGUOaC27INk5ZoSJUHH5DIN1aBJx9NiQmKHJPOej/LNYAUstH hZuj9oeomGTkQEOFYBKbK10heD8TxS8VAlTrbEI+sx3ofLv0O9iOy3kJULsMnI8PaK2BTK skUVpJkPHCirdCAdunG6gdpFzBEVTDvy3UNz7sn9ok0FxgFZxClbyCMox1jG0bi4lMfqf5 qlP/2fNdZFtnlHCzjf+D4sCOLQVF7XvqjHpUCg5Z+296sVepLo+Fns3s5OZ3Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694247676; a=rsa-sha256; cv=none; b=xw+aD1dNKSSp7UK/+DZUBduoSzAf6T/jgke3UnQuYjoQM8YfB+Icgg/zW6bgflpo03ZxGQ I5YfTIeiDQkhi9TVu9uiLpNHQuGUtY678oeXvpKcGHsxVZIGkaUSIOhiJHVMJqgT4ue+dV +TatLG+24GOoWQ/TSDrmZejRdMz5hb1oilFsgWDML8ZUS1zpf7TVGzpGb32hlgE8JlGxki Eqx3onuUmI9wlYR+ftY6EpB1uSQ+0V0K5y9+hCN5t/wvvH+UPrMY59C2i3xf6MsUz0liZ9 Kg+U0PC0OYpWEv2WbfYoMkjt0Ia8VR4/MmpP8LxphqCfySkc3G8OofxF9CNVfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247676; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jy7uhSiqDWpckJhhpRAUl77DXQ1NsN9NdSOq2uW1R9k=; b=fJJNhHxR3k1kX/pzNhkVZi/OthzLnj5DQQosd+cjKhBk/QUKNfb6roNhEQ5pfXiMAG8lPz XYjq6Qf3O5ZUM3L5DKoRVp1W512kcFz984+1mVH2WXhoZHtRJMQ7qgqLWSbGbfukPaB8xC 8U0SdH0CAVVjlYplmljG351GHDr1Ry+fJl4ChTcrO1zk7KSij+SWrp55IIdSabbC31SRIK eHng6q1NzUouLEbm+rikBTOvmgxb8kjUnQi1GEKt9L65K3GMoOt4Yg5mWOglIqRoTZS14U 4EE2Jo52FgmokzzT1TxHlqTYIgj314bmIomCaRz8Gjk+SPsi6uI0xANOoqWkMQ== 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 4RjQt36Qscz2T1; Sat, 9 Sep 2023 08:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898LFWJ046733; Sat, 9 Sep 2023 08:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898LFsx046730; Sat, 9 Sep 2023 08:21:15 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:21:15 GMT Message-Id: <202309090821.3898LFsx046730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 110113bc086f - main - sysctl(9): Enable vnet sysctl variables to be loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 110113bc086f5df1a9b6547edb1ab0cec698c55c Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=110113bc086f5df1a9b6547edb1ab0cec698c55c commit 110113bc086f5df1a9b6547edb1ab0cec698c55c Author: Zhenlei Huang AuthorDate: 2023-09-09 08:06:23 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-09 08:06:23 +0000 sysctl(9): Enable vnet sysctl variables to be loader tunable Complete phase two of 3da1cf1e88f8. In 3da1cf1e88f8, the meaning of the flag CTLFLAG_TUN is extended to automatically check if there is a kernel environment variable which shall initialize the SYSCTL during early boot. It works for all SYSCTL types both statically and dynamically created ones, except for the SYSCTLs which belong to VNETs. This change extends the meaning further, to allow it also works for the SYSCTLs which belong to VNETs. A typical usage is ``` VNET_DEFINE_STATIC(int, foo) = 0; SYSCTL_INT(_net, OID_AUTO, foo, CTLFLAG_RWTUN | CTLFLAG_VNET, &VNET_NAME(foo), 0, "Description of the foo loader tunable"); ``` Note that the implementation has a limitation. It behaves the same way as that of non-vnet loader tunables. That is, after the kernel or modules being initialized, any changes (e.g. via kenv) to kernel environment variable will not affect the corresponding vnet variable of subsequently created VNETs. To overcome it, we can use TUNABLE_XXX_FETCH to fetch the kernel environment variable into those vnet variables during vnet constructing. This change will fix the following SYSCTLs those belong to VNETs and have CTLFLAG_TUN flag: ``` net.add_addr_allfibs net.bpf.optimize_writers net.inet.tcp.fastopen.ccache_buckets net.link.bridge.inherit_mac net.link.bridge.ipfw_arp net.link.bridge.log_stp net.link.bridge.pfil_bridge net.link.bridge.pfil_local_phys net.link.bridge.pfil_member net.link.bridge.pfil_onlyip net.link.lagg.default_use_flowid net.link.lagg.default_use_numa net.link.lagg.default_flowid_shift net.link.lagg.lacp.debug net.link.lagg.lacp.default_strict_mode ``` Although the following vnet SYSCTLs have CTLFLAG_TUN flag, theirs values are re-fetched via TUNABLE_XXX_FETCH, thus are not affected by this change. ``` net.inet.ip.reass_hashsize net.inet.tcp.hostcache.cachelimit net.inet.tcp.hostcache.hashsize net.inet.tcp.hostcache.bucketlimit net.inet.tcp.syncache.bucketlimit net.inet.tcp.syncache.cachelimit net.inet.tcp.syncache.hashsize net.key.spdcache.maxentries net.key.spdcache.threshold ``` In memoriam: hselasky Discussed with: hselasky, glebius Fixes: 3da1cf1e88f8 Extend the meaning of the CTLFLAG_TUN flag ... MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D39638 --- sys/kern/kern_linker.c | 3 +++ sys/kern/kern_sysctl.c | 3 --- sys/kern/link_elf.c | 20 ++++++++++++++++++++ sys/kern/link_elf_obj.c | 30 +++++++++++++++++++++++++++++- sys/kern/linker_if.m | 9 +++++++++ 5 files changed, 61 insertions(+), 4 deletions(-) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index a1073512e856..2367bf35da76 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -471,6 +471,9 @@ linker_load_file(const char *filename, linker_file_t *result) } modules = !TAILQ_EMPTY(&lf->modules); linker_file_register_sysctls(lf, false); +#ifdef VIMAGE + LINKER_PROPAGATE_VNETS(lf); +#endif linker_file_sysinit(lf); lf->flags |= LINKER_FILE_LINKED; diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 814579a80f5a..a1d502d58bff 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -510,9 +510,6 @@ sysctl_register_oid(struct sysctl_oid *oidp) RB_INSERT(sysctl_oid_list, parent, oidp); if ((oidp->oid_kind & CTLTYPE) != CTLTYPE_NODE && -#ifdef VIMAGE - (oidp->oid_kind & CTLFLAG_VNET) == 0 && -#endif (oidp->oid_kind & CTLFLAG_TUN) != 0 && (oidp->oid_kind & CTLFLAG_NOFETCH) == 0) { /* only fetch value once */ diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 5be2db9d32bf..3e9998f27baa 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -160,6 +160,9 @@ static int link_elf_each_function_nameval(linker_file_t, static void link_elf_reloc_local(linker_file_t); static long link_elf_symtab_get(linker_file_t, const Elf_Sym **); static long link_elf_strtab_get(linker_file_t, caddr_t *); +#ifdef VIMAGE +static void link_elf_propagate_vnets(linker_file_t); +#endif static int elf_lookup(linker_file_t, Elf_Size, int, Elf_Addr *); static kobj_method_t link_elf_methods[] = { @@ -178,6 +181,9 @@ static kobj_method_t link_elf_methods[] = { KOBJMETHOD(linker_ctf_get, link_elf_ctf_get), KOBJMETHOD(linker_symtab_get, link_elf_symtab_get), KOBJMETHOD(linker_strtab_get, link_elf_strtab_get), +#ifdef VIMAGE + KOBJMETHOD(linker_propagate_vnets, link_elf_propagate_vnets), +#endif KOBJMETHOD_END }; @@ -1923,6 +1929,20 @@ link_elf_strtab_get(linker_file_t lf, caddr_t *strtab) return (ef->ddbstrcnt); } +#ifdef VIMAGE +static void +link_elf_propagate_vnets(linker_file_t lf) +{ + elf_file_t ef = (elf_file_t)lf; + int size; + + if (ef->vnet_base != 0) { + size = (uintptr_t)ef->vnet_stop - (uintptr_t)ef->vnet_start; + vnet_data_copy((void *)ef->vnet_base, size); + } +} +#endif + #if defined(__i386__) || defined(__amd64__) || defined(__aarch64__) || defined(__powerpc__) /* * Use this lookup routine when performing relocations early during boot. diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index b853ca284f7d..768808d2102e 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -150,6 +150,9 @@ static int link_elf_each_function_nameval(linker_file_t, static int link_elf_reloc_local(linker_file_t, bool); static long link_elf_symtab_get(linker_file_t, const Elf_Sym **); static long link_elf_strtab_get(linker_file_t, caddr_t *); +#ifdef VIMAGE +static void link_elf_propagate_vnets(linker_file_t); +#endif static int elf_obj_lookup(linker_file_t lf, Elf_Size symidx, int deps, Elf_Addr *); @@ -170,6 +173,9 @@ static kobj_method_t link_elf_methods[] = { KOBJMETHOD(linker_ctf_get, link_elf_ctf_get), KOBJMETHOD(linker_symtab_get, link_elf_symtab_get), KOBJMETHOD(linker_strtab_get, link_elf_strtab_get), +#ifdef VIMAGE + KOBJMETHOD(linker_propagate_vnets, link_elf_propagate_vnets), +#endif KOBJMETHOD_END }; @@ -1848,7 +1854,7 @@ link_elf_symtab_get(linker_file_t lf, const Elf_Sym **symtab) return (0); return (ef->ddbsymcnt); } - + static long link_elf_strtab_get(linker_file_t lf, caddr_t *strtab) { @@ -1859,3 +1865,25 @@ link_elf_strtab_get(linker_file_t lf, caddr_t *strtab) return (0); return (ef->ddbstrcnt); } + +#ifdef VIMAGE +static void +link_elf_propagate_vnets(linker_file_t lf) +{ + elf_file_t ef = (elf_file_t) lf; + + if (ef->progtab) { + for (int i = 0; i < ef->nprogtab; i++) { + if (ef->progtab[i].size == 0) + continue; + if (ef->progtab[i].name == NULL) + continue; + if (strcmp(ef->progtab[i].name, VNET_SETNAME) == 0) { + vnet_data_copy(ef->progtab[i].addr, + ef->progtab[i].size); + break; + } + } + } +} +#endif diff --git a/sys/kern/linker_if.m b/sys/kern/linker_if.m index 0722390d4e20..a50ed1ea84a3 100644 --- a/sys/kern/linker_if.m +++ b/sys/kern/linker_if.m @@ -154,3 +154,12 @@ STATICMETHOD int link_preload { METHOD int link_preload_finish { linker_file_t file; }; + +#ifdef VIMAGE +# +# Propagate system tunable values to all vnets. +# +METHOD void propagate_vnets { + linker_file_t file; +}; +#endif From nobody Sat Sep 9 08:21:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjQt52NcRz4sKbt; Sat, 9 Sep 2023 08:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjQt51kt6z4JW7; Sat, 9 Sep 2023 08:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DU9sJp7jyr5YEySMQlzhQRcAWiwMc2138P8zh7eM6Lw=; b=GVUMnWrjB73zudt1AeFoFr7va/d8PHT2hqiLlQ3G6Nz9AKpg+xkO1y+3tzvhtjjeR2REc8 KpZNCWsIHGiF8yjLYMvNtgiFhSa1KwVqw3cgqBz5XMldSFIeDWLN+XyANlLBKPB6BQl+p/ 2HRsAgtfUrbZ81d4oOt6d7SVhlK5qKD2UsPOyHtwyAH23iOb2W7Tv68fIX7JAMVrvBNfg+ IR8w83MT8FE/PsMI3pmJSU+O2sKAFnQCVEcyAa1bAp3cMHl67WQOu5SFlWn3PFfR/+doTt 49MiaulA7hAd4hHPB4PkfAUixbiS7b5dh9k8YShYEy6G0MYemBOTw6Zph/82Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694247677; a=rsa-sha256; cv=none; b=PkZ4bSmyg21Riy18C8DeKtxW98y4MiKHuKF5KyhHWWnLscY+CYm3msxOq3xXQIPi9q8bOf FNUxXDU0dJrgC/LN8ddgAjDwJm6cHufb7WDUGOeqjVBNNUxYiN2v4NvYneoX5DH4MefSga NYcN1D0rF/7rRhVrdLsTkTuLGFqll9WKYZDw3oXa0LjdSopy0kS4Ito3BfXnFXl+drwKPY vP5zv8/bmsE230sgNCqmfJAaivbEhHSVU8a2ngxbIRxfHw0gLqHqVEgr4PQkk1ZlvzscZd nzkfaEijSamHpDcRmfD5EHHw6V6qhtSUPv/JlfAezEBq2v18T6embVbh+4QR6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247677; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DU9sJp7jyr5YEySMQlzhQRcAWiwMc2138P8zh7eM6Lw=; b=FBRurl0dbcYdKuWXpgB8RKSkDMX+aIT5/k2lCLum7Jazd655lcPtMu2WYRjZ6veqTg2g85 6wLh5KSK/CMaY1Ei3TxOqsDZuaSaMAABOnJZlR5XcI6C/NEt7/ljr0IzxnHhtigT7gIoXy BzPvpoChxQTDyaYtQP4og8UyTgvBY2JAE9Ak2BsDld2s00x+ZZus87iGX+9JaQwr7AMMUk XeZqgZAZq4Lf9fGPE/C6Q227GFiACIXDSaeKbmDn8gdMZp90hKjCyQNHcQI4pfS+YvUJIg GV0H/QY3qj6As4hE75NWSAd8oObWsq7Xtag0Jk285YgUMIAgEmPMM1ihAdvr2w== 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 4RjQt50HVBz36X; Sat, 9 Sep 2023 08:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898LGEO046778; Sat, 9 Sep 2023 08:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898LGVH046775; Sat, 9 Sep 2023 08:21:16 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:21:16 GMT Message-Id: <202309090821.3898LGVH046775@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 205821a70ddd - main - kernel linker: Eliminate unneeded vnet propagation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 205821a70dddfa106f6792e95693f411e8ce52d4 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=205821a70dddfa106f6792e95693f411e8ce52d4 commit 205821a70dddfa106f6792e95693f411e8ce52d4 Author: Zhenlei Huang AuthorDate: 2023-09-09 08:06:23 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-09 08:06:24 +0000 kernel linker: Eliminate unneeded vnet propagation The module preload happens before vnet0 creation, at this moment the vnet list is empty thus invoking vnet_data_copy() during preload is a noop. With recent change 110113bc086f, for dynamic module load, aka via kldload, linker will do vnet propagation right after registering sysctls which happens after module load, then previous propagation (during module load) is redundant. No functional change intended. MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D39852 --- sys/kern/link_elf.c | 2 +- sys/kern/link_elf_obj.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 3e9998f27baa..568f1e1dbd95 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -724,6 +724,7 @@ parse_vnet(elf_file_t ef) ef->vnet_start = 0; ef->vnet_stop = 0; + ef->vnet_base = 0; error = link_elf_lookup_set(&ef->lf, "vnet", (void ***)&ef->vnet_start, (void ***)&ef->vnet_stop, NULL); /* Error just means there is no vnet data set to relocate. */ @@ -766,7 +767,6 @@ parse_vnet(elf_file_t ef) return (ENOSPC); } memcpy((void *)ef->vnet_base, (void *)ef->vnet_start, size); - vnet_data_copy((void *)ef->vnet_base, size); elf_set_add(&set_vnet_list, ef->vnet_start, ef->vnet_stop, ef->vnet_base); diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 768808d2102e..d4ad963e8181 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -546,7 +546,6 @@ link_elf_link_preload(linker_class_t cls, const char *filename, } memcpy(vnet_data, ef->progtab[pb].addr, ef->progtab[pb].size); - vnet_data_copy(vnet_data, shdr[i].sh_size); ef->progtab[pb].addr = vnet_data; #endif } else if ((ef->progtab[pb].name != NULL && @@ -1113,18 +1112,11 @@ link_elf_load_file(linker_class_t cls, const char *filename, error = EINVAL; goto out; } - /* Initialize the per-cpu or vnet area. */ + /* Initialize the per-cpu area. */ if (ef->progtab[pb].addr != (void *)mapbase && !strcmp(ef->progtab[pb].name, DPCPU_SETNAME)) dpcpu_copy(ef->progtab[pb].addr, shdr[i].sh_size); -#ifdef VIMAGE - else if (ef->progtab[pb].addr != - (void *)mapbase && - !strcmp(ef->progtab[pb].name, VNET_SETNAME)) - vnet_data_copy(ef->progtab[pb].addr, - shdr[i].sh_size); -#endif } else bzero(ef->progtab[pb].addr, shdr[i].sh_size); From nobody Sat Sep 9 08:21:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjQt62yTvz4sKsV; Sat, 9 Sep 2023 08:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjQt62KRDz4Jbf; Sat, 9 Sep 2023 08:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZSp1/gx0KjIPAv+5F5WyzphGXgthtL/TRsDpz3FgWMQ=; b=dUoHFxrW9JZypRQ8h1XKKzZg1xMoXVnn3JevvXRTDk1LNR5fOXrWAFxmwS2G1muV3C9HwJ z1Hub9tDx34e+ZSANtnmBJ8ia2rxY0MMrsQkP1+9K8pxq5XmsBrVBr1SdqDA/VotHK4Ve7 Hus0iezCDT4F2vZYELpkRbldj5k5QJr7coAZ7xwH2njBfKX/wmsjPbz2CyKXuPzchNOcMq 0aOCyHrR4EFel5CPn6O5KBPdDlvRApWLrLZuxIMpHWPFzX6M6fZ/YTjdXrCgZ6jB2YA7aZ TZXXc7hKiXBWIC7sFKIYVSnjxAEk9cORxMwE+h7twVRBf3VIq8/kPPvnIUCGDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694247678; a=rsa-sha256; cv=none; b=PvAR1iT2bGMILW03Om2k5dRvauN7veDc2V+LSz7lfg2Oilo2ubINXsF53nNkTjMxZr1u9I XZgU1fb5UV3c6GWWhibbwT6s7C8ZuyPs1TOnF+TCjwYSSkbrjkqWx/FVTRQfuSCLhghKXB uZ+zmIiD8L1MpvdzOq6KOv+iqgJNqPUB6CIr17fgxi+TLbOk2TwZ+a/f1SXtX2MIKXH6pa zJqW1PxzPCPYpi50qgtVS9raly/I7gdiEu8hXsbsQGJSj19grF9Sfhq15med6w/VleCd8x OeNc2FAlAPVcWDjJzwfqzvGPjWxOAXlQz1cfdLPXEH1LQxnNzJaKiCdPjFyIMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZSp1/gx0KjIPAv+5F5WyzphGXgthtL/TRsDpz3FgWMQ=; b=B12P+CeMe2OCVrFO/MRshnUHwt9yqLwb4bp8cNAjhRPy5B1fWht8DK4dJCiDbAzKMjs8XB cy5xng1zVRtR4pWEApWarsQjPHPnkkhmiqIFQ1so8MLfe2wS5wJPf4upCMlIoaT34OaweE tZTr/x/irx92ewDffxQSscRrNKey8nVzpHPjJV+hx7162DFYuxWsx1CHHaG3ZptYSFtRI+ RtXZ6yrJVXcyTi9URFVqhHdZlK5ztv1XIYtw8reaqGrXZrFmRB9YWx3zOtNcKuVsyNmPeF a9yfQDFOIy+lthQmTAy7M8pv7deWphHF7sglNzfn6bCiNIaiGe73LO26j/KbPQ== 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 4RjQt61LjQz30N; Sat, 9 Sep 2023 08:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898LIY2046828; Sat, 9 Sep 2023 08:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898LI8d046825; Sat, 9 Sep 2023 08:21:18 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:21:18 GMT Message-Id: <202309090821.3898LI8d046825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: 242fa308f3c3 - main - carp: Explicitly mark tunnable net.inet.carp.allow with CTLFLAG_NOFETCH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 242fa308f3c3def32b2e61e0b78c11b3697e4492 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=242fa308f3c3def32b2e61e0b78c11b3697e4492 commit 242fa308f3c3def32b2e61e0b78c11b3697e4492 Author: Zhenlei Huang AuthorDate: 2023-09-09 08:10:32 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-09 08:10:32 +0000 carp: Explicitly mark tunnable net.inet.carp.allow with CTLFLAG_NOFETCH With recent change 110113bc086f, a vnet tunable can be initialized when there is a corresponding kernel environment variable unless it is marked with the flag CTLFLAG_NOFETCH. The initialization may happen during early boot(linker preload), at that time vnet0 has not been created. The hander carp_allow_sysctl() for the tunable net.inet.carp.allow requires vnet, thus invoking it during early boot will cause kernel panic. The tunnable is initialized by vnet sysinit routine ipcarp_sysinit() so let's just mark it with flag CTLFLAG_NOFETCH. No functional change intended. Fixes: 110113bc086f sysctl(9): Enable vnet sysctl variables to be loader tunable MFC after: 2 week Differential Revision: https://reviews.freebsd.org/D41525 --- sys/netinet/ip_carp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index 28c1e535b783..e8ed6afd3853 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -239,7 +239,7 @@ static int carp_demote_adj_sysctl(SYSCTL_HANDLER_ARGS); SYSCTL_NODE(_net_inet, IPPROTO_CARP, carp, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "CARP"); SYSCTL_PROC(_net_inet_carp, OID_AUTO, allow, - CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, + CTLFLAG_VNET | CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE, &VNET_NAME(carp_allow), 0, carp_allow_sysctl, "I", "Accept incoming CARP packets"); SYSCTL_PROC(_net_inet_carp, OID_AUTO, dscp, From nobody Sat Sep 9 08:21:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjQt755cxz4sKsb; Sat, 9 Sep 2023 08:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjQt73PLxz4JfW; Sat, 9 Sep 2023 08:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibniejqcuEIxsrW1330K1chSt4xK+dIN1IShVGaCdSg=; b=ObiV4B0hYs0pYPXV7uHg8bE7mgHEu54Jw5x7JJpgo0dxNjKOseDoBBCHNOqiqfeAslZLPd IQRLqfFrhCvxbyf1gfhQTGiZW3ej+4OEZaNgY0AhYw0ziZ+vxmriIHgu9Wol47B3fsHBYl cXeQ4Ra//KFAONIZSbUk+MNSojESt7ZJlPE0iPqzD1T+K5VkrvxIaVqISe1Xg3M3ZTU8Ok owHr2kOd7h/InTaXtxlwZ6zo7aaOr16Sv/jZbEOK02LGQMusLVp13i8tC+IexdNj2P0FDz LCYaOiGoQkSCajswY4lhvoysiE2OrpkkKtJUArAmofKfkTIZ966JWgOOtp+Vvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694247679; a=rsa-sha256; cv=none; b=YMC70YzmcvDEQqP+OPEoxi87+ebqxaYV+7+qFny6uuqDgm3RnsE6XwsJgvW5bdziG1yJPM LTme3hKfjeGVwHHLXSTm0fPHNxA10OF5nQ6bivek1DpWGVPzIMmlVPvitJ2PaDfKdKa0gz 26C8o2xDN20i3ACA1hc5s7RGP5i/vktaFyyU7dwammlACQafeRD4n+hbjiEbUqAGK79OFy OTqtuaFzwMMaViJH1bb9tVu39SE6UYy0VmO663NrTJDVG/X3JpBwTOmI3UxwKY18pvgbFD ul4PfqFufTdFCG7d0EC/t6nIZ8ChEMgrc2hUhZ0bdqVGxC6O//Es5SAyFATnNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694247679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ibniejqcuEIxsrW1330K1chSt4xK+dIN1IShVGaCdSg=; b=F3kXzr+dvozcSVUaD6nuCPi4sm5t+/EYdu2/B6obVSNsvbU99pO7j+V45gYep+TMuNWBCX U4Nu+5Ak/2/i+vccUyEUy75lZIwMsRRqtff/in5eEOwaaHjMgCnyzFHSnZUk3zlR8n2vH7 W1dS50EDTTmzEQf6xVUA4icGbsHVyBaH8CikkjyCf/oYAvryVifAFaCnYVHy8ikNEg0S8P AXN4KBXZbOv1OB6oRY/iA5tdIpm6miigwj0gv7bbLLXY0D1Uv9bSjpV9nsk1ch7iU2k5sM RXdtKfZ0DPJXTauWnk8wbG8lcObJQ9U/gGBNI7mvjUv0M2j9h7XO3CSvdUCb2w== 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 4RjQt72PSNz30Q; Sat, 9 Sep 2023 08:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898LJYj046894; Sat, 9 Sep 2023 08:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898LJE1046891; Sat, 9 Sep 2023 08:21:19 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:21:19 GMT Message-Id: <202309090821.3898LJE1046891@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: c1b26df2972d - main - UPDATING: Document the change that enable vnet sysctl variables to be loader tunable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1b26df2972da98b56cfe7b2c1f5b09ab9e51a05 Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=c1b26df2972da98b56cfe7b2c1f5b09ab9e51a05 commit c1b26df2972da98b56cfe7b2c1f5b09ab9e51a05 Author: Zhenlei Huang AuthorDate: 2023-09-09 08:11:24 +0000 Commit: Zhenlei Huang CommitDate: 2023-09-09 08:15:27 +0000 UPDATING: Document the change that enable vnet sysctl variables to be loader tunable --- UPDATING | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UPDATING b/UPDATING index 3b056eec8227..b370f2f3ebb4 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230909: + Enable vnet sysctl variables to be loader tunable. SYSCTLs which + belongs to VNETs can be initialized during early boot or module + loading if they are marked with CTLFLAG_TUN and there are + corresponding kernel environment variables. + 20230901: The WITH_INIT_ALL_PATTERN and WITH_INIT_ALL_ZERO build options have been replaced by INIT_ALL=pattern and INIT_ALL=zero respectively. From nobody Sat Sep 9 08:27:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR0h5vXfz4sP1x; Sat, 9 Sep 2023 08:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR0h2yQyz4Lyd; Sat, 9 Sep 2023 08:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0g8vBkqBa8XEuZ2OuC1jvbEAmh0SxXudc+3FBiOZiAw=; b=l7DRw9Gu3ooyo4epIUaGV0e4kswUodNjLeOuUcB+vXWqk4PnM5TwjedBEVCNIRJuVsLoZM +KxUPZjDgKSC1xWNWba/qJ+K2pxmTZ+YMy3UYJIIwm/6EkdmnyVuzoqex0hl67TnsTMcc6 Si5B7qv/HU6MI+lCJFYP+p6ctHp1U3M5tN/fyFtMYI37ELV0qcscaKb5GhPME63hoOxHrS MMV3G8Ob9c1E7eaGytqQaxZ+JZib6QDs0/N95xV0bkPrc0zpXoySw0tzHnWy6lynTCWU3W M8EP3cvSuiVS2XorZ9h2gT5iqIRlwsH80JBqjBa6HxzTHqgmq8/LODb5SSvf6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248020; a=rsa-sha256; cv=none; b=if8G4+PcRvtZHRZNGWOjITSrbq2yiRA/VlxkZJR8u8nUU1NtAzh2AREISq9wUipITFwIqg 3aB66swLIjvw48z4Rm9mhuDXC/2hzkr3npeiPC8SieJGWnOr8/boLvvFJB+EP3XSb8iZFf 4L+diFbvyLDDHwIRB34Z0FxOXsf9Ep/51X7vSfposv+Nkiwe7aVq6dsWIv2oWrOnP19KH5 r2+Nc6y1AaaiqHjjG3RTtVl++seI/JPMMf9mv1NPjgZ+ZjtBHnRQ1WX33GnGzzOqCTqwK8 FEMfl1uCQARNJ1ntkT8MTSu8KsJKlvSZRfS/KtIky3tPWZ7HXWWA6fPS58cEuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0g8vBkqBa8XEuZ2OuC1jvbEAmh0SxXudc+3FBiOZiAw=; b=ENwpeuJ63B4TRQG3gs32+Y9LrEdOLInN9TJbXEXWBdpWLtV/YtjjYrKSDxsX8z2OoErBuW d0R9uazofOYkrrvlnUFz5Jw3YJY5/tYSv/CVu5jiwJth4Vu7oyJwn0mJfTEl70c8WkQ3u8 3/FVcLQ7coA2hRLzuQX2Z3t4QeYCHRB5isbo0wXntmXTK/BXNZ9vbSNcNLPFSweQpzjxn7 4Vs+TFQkglX1jkkbGaVabZVFZyHXiYVXQ/+79WaII9nYQ6Wqvqut7yGZhxt/jJc5ytuO3L l6W8Qfr0eVxlLek+KDE7NSco0a2Yl9Rgce0LkLFC3E/vK6N84J9cpK82DQOJFA== 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 4RjR0h1m1tz319; Sat, 9 Sep 2023 08:27:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898R0a0053600; Sat, 9 Sep 2023 08:27:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898R0a8053597; Sat, 9 Sep 2023 08:27:00 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:00 GMT Message-Id: <202309090827.3898R0a8053597@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: c3325cc44d0b - stable/14 - kern_kthread.c: some style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3325cc44d0b7ecc6749e4f0d7575412e78fd7f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c3325cc44d0b7ecc6749e4f0d7575412e78fd7f8 commit c3325cc44d0b7ecc6749e4f0d7575412e78fd7f8 Author: Konstantin Belousov AuthorDate: 2023-09-02 07:05:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:26:33 +0000 kern_kthread.c: some style (cherry picked from commit ea70866bb15dd707c1a6a729c44e5ae611c83dd1) --- sys/kern/kern_kthread.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index bf481cafc72e..3604d63531da 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -63,7 +63,7 @@ kproc_start(const void *udata) int error; error = kproc_create((void (*)(void *))kp->func, NULL, - kp->global_procpp, 0, 0, "%s", kp->arg0); + kp->global_procpp, 0, 0, "%s", kp->arg0); if (error) panic("kproc_start: %s: error %d", kp->arg0, error); } @@ -97,8 +97,8 @@ kproc_create(void (*func)(void *), void *arg, fr.fr_pages = pages; fr.fr_procp = &p2; error = fork1(&thread0, &fr); - if (error) - return error; + if (error != 0) + return (error); /* save a global descriptor, if desired */ if (newpp != NULL) @@ -134,12 +134,12 @@ kproc_create(void (*func)(void *), void *arg, sched_user_prio(td, PUSER); /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) + if ((flags & RFSTOPPED) == 0) sched_add(td, SRQ_BORING); else thread_unlock(td); - return 0; + return (0); } void @@ -188,7 +188,8 @@ kproc_suspend(struct proc *p, int timo) } SIGADDSET(p->p_siglist, SIGSTOP); wakeup(p); - return msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, "suspkp", timo); + return (msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, + "suspkp", timo)); } int @@ -230,11 +231,11 @@ kproc_suspend_check(struct proc *p) void kthread_start(const void *udata) { - const struct kthread_desc *kp = udata; + const struct kthread_desc *kp = udata; int error; error = kthread_add((void (*)(void *))kp->func, NULL, - NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); + NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); if (error) panic("kthread_start: %s: error %d", kp->arg0, error); } @@ -313,13 +314,13 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, PMC_CALL_HOOK_UNLOCKED(td, PMC_FN_THR_CREATE_LOG, NULL); #endif /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) { + if ((flags & RFSTOPPED) == 0) { thread_lock(newtd); sched_add(newtd, SRQ_BORING); } if (newtdp) *newtdp = newtd; - return 0; + return (0); } void @@ -451,8 +452,8 @@ kthread_suspend_check(void) int kproc_kthread_add(void (*func)(void *), void *arg, - struct proc **procptr, struct thread **tdptr, - int flags, int pages, const char *procname, const char *fmt, ...) + struct proc **procptr, struct thread **tdptr, + int flags, int pages, const char *procname, const char *fmt, ...) { int error; va_list ap; @@ -461,7 +462,7 @@ kproc_kthread_add(void (*func)(void *), void *arg, if (*procptr == NULL) { error = kproc_create(func, arg, - procptr, flags, pages, "%s", procname); + procptr, flags, pages, "%s", procname); if (error) return (error); td = FIRST_THREAD_IN_PROC(*procptr); @@ -479,6 +480,6 @@ kproc_kthread_add(void (*func)(void *), void *arg, vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); error = kthread_add(func, arg, *procptr, - tdptr, flags, pages, "%s", buf); + tdptr, flags, pages, "%s", buf); return (error); } From nobody Sat Sep 9 08:27:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR0j4C7fz4sNwP; Sat, 9 Sep 2023 08:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR0j3NG9z4Lsv; Sat, 9 Sep 2023 08: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=1694248021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/Wevc37xAgbYx0wgA0tnychBrFFM4fuGbOU6o28fv0=; b=o3WlhqFejWNkd/80mRzmL7GpjTAwui4FSIp1m+IiZUs2W3YvWriggaKfJbF7Sw0qCXGjyV I9xaRe9oJKUoadYRGfAjC2PuLL3aRMFzisYBoyCAQBMQETsxv3BNDQn1zLaDd8ue1vkbUW yt/3ZQ1nL2ab5HXNox+w5l0AORnsZA+s+UkOoo/dyzmdCgKV4OWIJ2JDD24CrBABCLjQkW zpEZJbxHRVEL1zc523aksaBKTOwN/Z9gJXeoIMV81qCTCYSVxtnaVm2LyJsk2dJ7JMab45 SBdIR7DLCc6vpG082+tUYbnPAF0NF5nvvdPU38JHMD3HMxN4PRPuVkxI5VS2ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248021; a=rsa-sha256; cv=none; b=nVki6hCLXxD3D07ts5gEpjesU+3PfzrtkTz8q9WHRV9j6hVJXymfLUgB4bXIHaydWp0xIZ 87lgPuKb6FCDDT0N7tk1c9Nfdds09HHsJN0VTPDitwrnrS5uBW1eUcC/2jWWMQr4Uutibg IpPHCL4vb7GnVbNcVvVaGtzhwkIsC36Ak3tws63NMzWVRP0lX4R5FaiOHUtUVNfjCNM5yd It2LAxLGIxRVGur1Qr6xvLXz6UgOmM3N46MVf2aJAugiiT/vi8DGnvEYX9cvuX7E1OxGz5 yHABgZX80P+EeS6Qz+18hZwpFtjgi6uBce5XHmdmH7du46XACm7tbHCStFpqLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248021; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y/Wevc37xAgbYx0wgA0tnychBrFFM4fuGbOU6o28fv0=; b=ddzZQ8Iw0oSVRaudLYZN/maKkq51s4FCysSkCdu87F8X2hnOWXp4gH823iPxMMCpV4D+kd etKjLtxQ9bE4ra6d9XuE7sYvnm0fnQz9Q7GG6WYHZx8L6wcXIMq7ZZRgVfWpBgOW2lcQ1w 7/BY/C9wQliAcmAx0vkpWyomzPZPlWOPjDuOaBkfd3Rf/GN4/3QWYnXxW1g0uruO9p6EJp sbH7PgccA9R7f49NPKHK6KOk0g7vQwhsoKhYbhQLGX+41v7ezs5ILMJG9HvBU4SKSOLVQL EX//zPwG23tXOobPaOAk/YDUmR8Uc2/3zA2X0nFMKyIWaptP3wUrizV8FS9iwA== 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 4RjR0j2Qskz2X3; Sat, 9 Sep 2023 08:27:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898R1Ia053649; Sat, 9 Sep 2023 08:27:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898R1wO053646; Sat, 9 Sep 2023 08:27:01 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:01 GMT Message-Id: <202309090827.3898R1wO053646@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: 689e7b5a86b9 - stable/14 - kern_kthread: fork1() does not handle locked Giant List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 689e7b5a86b9950944a961487aeb620611584e4d Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=689e7b5a86b9950944a961487aeb620611584e4d commit 689e7b5a86b9950944a961487aeb620611584e4d Author: Konstantin Belousov AuthorDate: 2023-09-02 07:16:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:26:33 +0000 kern_kthread: fork1() does not handle locked Giant (cherry picked from commit 525bc87f54f288793a95abbcd0a845efddb8c41b) --- sys/kern/kern_kthread.c | 60 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 3604d63531da..5e32aea1f56d 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -78,13 +78,12 @@ kproc_start(const void *udata) * flags are flags to fork1 (in unistd.h) * fmt and following will be *printf'd into (*newpp)->p_comm (for ps, etc.). */ -int -kproc_create(void (*func)(void *), void *arg, - struct proc **newpp, int flags, int pages, const char *fmt, ...) +static int +kproc_create1(void (*func)(void *), void *arg, + struct proc **newpp, int flags, int pages, const char *tdname) { struct fork_req fr; int error; - va_list ap; struct thread *td; struct proc *p2; @@ -105,13 +104,9 @@ kproc_create(void (*func)(void *), void *arg, *newpp = p2; /* set up arg0 for 'ps', et al */ - va_start(ap, fmt); - vsnprintf(p2->p_comm, sizeof(p2->p_comm), fmt, ap); - va_end(ap); + strcpy(p2->p_comm, tdname); td = FIRST_THREAD_IN_PROC(p2); - va_start(ap, fmt); - vsnprintf(td->td_name, sizeof(td->td_name), fmt, ap); - va_end(ap); + strcpy(td->td_name, tdname); #ifdef KTR sched_clear_tdname(td); #endif @@ -142,6 +137,23 @@ kproc_create(void (*func)(void *), void *arg, return (0); } +int +kproc_create(void (*func)(void *), void *arg, + struct proc **newpp, int flags, int pages, const char *fmt, ...) +{ + va_list ap; + int error; + char tdname[MAXCOMLEN + 1]; + + va_start(ap, fmt); + vsnprintf(tdname, sizeof(tdname), fmt, ap); + va_end(ap); + DROP_GIANT(); + error = kproc_create1(func, arg, newpp, flags, pages, tdname); + PICKUP_GIANT(); + return (error); +} + void kproc_exit(int ecode) { @@ -250,11 +262,10 @@ kthread_start(const void *udata) * ** XXX fix this --> flags are flags to fork1 (in unistd.h) * fmt and following will be *printf'd into (*newtd)->td_name (for ps, etc.). */ -int -kthread_add(void (*func)(void *), void *arg, struct proc *p, - struct thread **newtdp, int flags, int pages, const char *fmt, ...) +static int +kthread_add1(void (*func)(void *), void *arg, struct proc *p, + struct thread **newtdp, int flags, int pages, const char *tdname) { - va_list ap; struct thread *newtd, *oldtd; if (!proc0.p_stats) @@ -278,9 +289,7 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, __rangeof(struct thread, td_startcopy, td_endcopy)); /* set up arg0 for 'ps', et al */ - va_start(ap, fmt); - vsnprintf(newtd->td_name, sizeof(newtd->td_name), fmt, ap); - va_end(ap); + strcpy(newtd->td_name, tdname); TSTHREAD(newtd, newtd->td_name); @@ -323,6 +332,23 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, return (0); } +int +kthread_add(void (*func)(void *), void *arg, struct proc *p, + struct thread **newtdp, int flags, int pages, const char *fmt, ...) +{ + va_list ap; + int error; + char tdname[MAXCOMLEN + 1]; + + va_start(ap, fmt); + vsnprintf(tdname, sizeof(tdname), fmt, ap); + va_end(ap); + DROP_GIANT(); + error = kthread_add1(func, arg, p, newtdp, flags, pages, tdname); + PICKUP_GIANT(); + return (error); +} + void kthread_exit(void) { From nobody Sat Sep 9 08:27:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR0k52NGz4sNtv; Sat, 9 Sep 2023 08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR0k4V7yz4M0T; Sat, 9 Sep 2023 08: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=1694248022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/a6i4Q0Xktl4WeFlc40gLPMvWmhj6MJ7QZ/jPK2HtI=; b=MQfC0Kwr/ku3q+D/ulTexmotcpvtmtAuDj5DeAzthW91Pzt1qp1LX3yf4I4zvnYIyGZ+NB z0X4K7xzHTPu0e6JlKZ09hOsEIe0vZ4C1Hpy8+qOIYU6vtMYdRRMfg6Xplg4vlANTUAs4N /Z9pAnsOZc0FADc+F+zJpxD5OZrAlrKhI4kizrwniXy9sMtbu3k8KGzfWxHL59qPypBHvh 35phS1eRrdWWS8+pf+VscxIDAOcBqT8CtAg+MfSMX2uVd7H7K7dvk3NkYKvJG6O3j59YRk FiIsR+nZldTGrYMo3oVu2pGjyj92yRnLLYuFsD8jt1YuxrzLBEJkGjqdbdv3vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248022; a=rsa-sha256; cv=none; b=eBOYIjqWTXSeCa6Q7cUITiFoEn4PmWE6WPK1UA7iSSGOUP9ER/XHAzQ+tV8ag3QpSFN707 h1bbyTqBI0ImrxUqf7LW6j4nEkm6EtEbOK01U+I4wiV5oD2aCYVBcpZ+tINPlk7QdVSlAu i2AjH3pLhmUkOccB6LDg+M6NRcqPzOw0Y0qG+yF8l1Icz2EbLrOLg4M9SAHcw/I4bVSAnZ hKlU0n1AfFhAvT0WBiQI6Vkp/IqoG9QLwumIIG0Y4txVYioKAGWNVY+wzlr7BmpfMkxy8Q 7U5MvndbY3QuC9ru02KLyRQRFwpbrDCB7wfQVMi3qSWZeLkpFdN1lZ25Ikd7uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/a6i4Q0Xktl4WeFlc40gLPMvWmhj6MJ7QZ/jPK2HtI=; b=bqs19WhPouu6uUCx+AO25Q8XGZaj6CwkCwiqiLjFoe9IKFQWiZGOg65iAdfQkkGzqUTl1u QRCexHr7WMCWd0IcT2QEsizX488COT5BeK5tIaGgqO9XhHg45RnTkAuO1A56M+ImNBhzX9 djAQTovOVr64cjOQ2lvKI2He0dpvr62zh0xdWeaz08wkev9pE0CHu0lY65Z/2ZKFQZM98k kOIbEwJYogyV+m60y9eHmawqwdxF6MZIITXWNHCJzGY1QO7qXmy6N++RUfeDubXBGbbxaH A8R+KCKtfVSnx7fa/qV290iMw8JwQ0LJ6kC02dmoT9mwj7whKIu2oJUaMfrsWA== 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 4RjR0k3Fj0z38K; Sat, 9 Sep 2023 08:27:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898R2cA053718; Sat, 9 Sep 2023 08:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898R2rh053715; Sat, 9 Sep 2023 08:27:02 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:02 GMT Message-Id: <202309090827.3898R2rh053715@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: 70e76f81e594 - stable/14 - kthread_add(): do not allow to attach the thread to a dead or dying process List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 70e76f81e594e108054446bfc890eeaeace5a839 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=70e76f81e594e108054446bfc890eeaeace5a839 commit 70e76f81e594e108054446bfc890eeaeace5a839 Author: Konstantin Belousov AuthorDate: 2023-09-05 10:54:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:26:33 +0000 kthread_add(): do not allow to attach the thread to a dead or dying process (cherry picked from commit 96362992330894787a4485f0adc5e867879c5893) --- sys/kern/kern_kthread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 5e32aea1f56d..6f7fd8b3d555 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -281,6 +281,10 @@ kthread_add1(void (*func)(void *), void *arg, struct proc *p, return (ENOMEM); PROC_LOCK(p); + if (p->p_state == PRS_ZOMBIE || (p->p_flag2 & P2_WEXIT) != 0) { + PROC_UNLOCK(p); + return (ESRCH); + } oldtd = FIRST_THREAD_IN_PROC(p); bzero(&newtd->td_startzero, From nobody Sat Sep 9 08:27:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR0l6C1bz4sNv4; Sat, 9 Sep 2023 08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR0l5XtHz4M7b; Sat, 9 Sep 2023 08: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=1694248023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WO4CnjVVD5WaXH7zpMAtelG1fA8WyaFEVgqmoWgcGQ0=; b=tGMvS9sjHoE8RNT4fulD8bV66S9BajRfj2bJ1mLDqh/PqvYpdUuYksWyjEwCEn3CCJAdou p0jCs5xTDeGYVwO4HC+p5jm9jM76KJDVFpVvvdgexUQfd8cxMXlGtS1vlPHl+Hr1u8ZyJv 68JQkX2t53eXHsAMjoc5hOGNBUyAyZJTMyiZJB2pIgtVgU7/WK7R4vARVtQfiYtD7ibGmD SzOnwgXpEPjy5BZnUNXO4CeWIUaelrFiMVtGrgW7R0HcQBGsv0sbttJum6M5VO/JkLop4O FmYKio+EnldUPtMOSBblGcj/7WOudOmAUAC0qpfqN6Hs+MuYHyHgOC8sOozqwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248023; a=rsa-sha256; cv=none; b=Uc4Fz62GL/yViE2/DlD3LNT/g2xt8GUhftDpWMS33SYo7M0VtdXf2pHHAyaR6r5IzkYefU g+WstGE6Z1fWJSXhUM2/LP/nrY8qyXR43HRDbuSbUR4k5mageD8YrlpUX6gMsfB1vEHQ/I qOUwAX4RuP1e4VKV0a6eLx1697prgFsEFsazCe/oiMQCefKjqcyoJWQkw5qNmzyG4UMZBW 4s7rXdNu48pL/FpPnxeyhFtD+rwH9BQuaO588Av8forD/QlrcrhIL3uojD/79zzvYNQAiC M3NQe0CgoqKne9IzYQn09XttRYenJGz8v9c1AGqJ5tCi+VJZMLwQu/y3bIvN1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WO4CnjVVD5WaXH7zpMAtelG1fA8WyaFEVgqmoWgcGQ0=; b=u04ZY7RjbEPhnJPBEVBfQrpHUO/Ld4v9vg7WbJXvIOG8tDL0eZt4HUxigp2k0OiJf4TKbB ZazJ9pAq9KgFT6UcMk+vzEs0AMcSXzlCljj/8AzED9TY7T7TYfKhzYvPGvWjJKc9O4V2rG eoeUzw8i82SHWhFvFiBVvloEzL8MFDs5SZ2xnuzP7icvWK5S1AoA3takoxypGLbqMlnCjx H4OfTMjhbv/czMG+pGaKNRTO/snYkn2ROcL8Xc2Qo603XsLv00S/FxFjJa9HXyTKBUiK4Z nwj5H97qHFkeMlnF2b3NZwxR1VXLUVQLCvPGOkRc5yKIzVbA3BF5pMvwM6wK3Q== 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 4RjR0l4KQzz31B; Sat, 9 Sep 2023 08:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898R3f8053766; Sat, 9 Sep 2023 08:27:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898R3qQ053763; Sat, 9 Sep 2023 08:27:03 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:03 GMT Message-Id: <202309090827.3898R3qQ053763@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: cbf1bbe5c8b5 - stable/14 - __crt_aligned_alloc_offset(): fix ov_index for backing allocation address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9 commit cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9 Author: Konstantin Belousov AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:26:33 +0000 __crt_aligned_alloc_offset(): fix ov_index for backing allocation address (cherry picked from commit 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55) --- libexec/rtld-elf/rtld_malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6e011e88ba5a..4b5140551675 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -188,7 +188,7 @@ __crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) x += offset; ov = cp2op((void *)x); ov1.ov_magic = AMAGIC; - ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + ov1.ov_index = x - (uintptr_t)mem + sizeof(union overhead); memcpy(ov, &ov1, sizeof(ov1)); return ((void *)x); } From nobody Sat Sep 9 08:27:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR1n439Vz4sPLt; Sat, 9 Sep 2023 08:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR1n3bvKz4N43; Sat, 9 Sep 2023 08:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rfmlgm68ugrfmUWOyNL1IRYaZbjLTMGFw6zK2mPsdBA=; b=Cl6CosX2lY75QsBdyPp92r6KQVwipjKScaHirHepiZu4LHLkNJ5UKBlrM+glfbGeN224CQ x2Wa9o4JzE9Zdg4VE5u9JmvaYgJU2Ch+gFb8VPFj8G7Qzclh8ApmFh3f0v2LiGnuDGjuL6 hmwpLMZePaTHI2p/sPQiPDY/XSDHy1eIkQ5u52Lw0Box89yxogxSSUxf7EbYG+bxPhgaRX 0AqqobgG2QRadDdPfMahLnMPiZwqb01NIFGlTolmZAXaaMduDkkJc2h/WOWF8ssyBksrUk RhbsIfZCglZ3RVxF+jbOka2oWcYbhAlGTtD1GFHftQx42aGgbZ0bxWVU+eRIkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248077; a=rsa-sha256; cv=none; b=ZGCWRHyjfUxyIwX9BBCOmzk00wNTl/fZwQd1yewaX/LUqlwP/R7VpWZ8r80LgT2onPzJeH 0cldcE3QL3btRhutlma1DGofpr6NnpUk4igxfdhrMMxV2rJgeDI8tUBK35bPWQP4aTEdQu rpxehU0kEEIbmw5upb8O/WQX7/S8Lw+cOKUmsVmTX/g+s2JmndA34CjywCTOyvTNpyXX6w PkuYigLrSCbkAY5oWPM1pt4ZGSdLuP6nTtWAV3JHwblddaFN/RZAzwq9mu4bqmdYR5lH3+ powYno4N5DQ4Lpqj9mlIRDc5FacGaMXEeDnckFIVi9Lwqi3gHRFGpAcz0IjKEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rfmlgm68ugrfmUWOyNL1IRYaZbjLTMGFw6zK2mPsdBA=; b=B974dqOI37zbuvFhyCVlrSeKKkJ1HhJ4lVRFBOpq50AWnHxB9wZgSkv6XkCvIaRT3RknOO 98v+NGLj0LuYfV67b8VkxkaTsiZIvHKvGq5OhaAminGtFb/w9/acyQrTkoT1sGUKr7cxOX Fp3i3il0vw4XaZdQnDOAcD+rBVq3dpjl9pusHxNoQVmy0salzOHJps7PQfIRKxyrsQR78m Mpdoocwele+rnub1M1uF1SmDuoc67NXf61cu/NYBhptdzDdHIfy3XCj0UCG7bxal6F8bvL HqVQ8E8FLFVI+7y3y0p0pIDfsWfSeuOB0+2jm1COpARHv3qJUCbyuEDorQNr0Q== 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 4RjR1n2bW4z38L; Sat, 9 Sep 2023 08:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898RvUH054002; Sat, 9 Sep 2023 08:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898RvpU053999; Sat, 9 Sep 2023 08:27:57 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:57 GMT Message-Id: <202309090827.3898RvpU053999@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: 2ccb043eb818 - stable/13 - kern_kthread.c: some style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2ccb043eb818b7d3cc31c72d26cff143c79dadcd Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2ccb043eb818b7d3cc31c72d26cff143c79dadcd commit 2ccb043eb818b7d3cc31c72d26cff143c79dadcd Author: Konstantin Belousov AuthorDate: 2023-09-02 07:05:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:27:32 +0000 kern_kthread.c: some style (cherry picked from commit ea70866bb15dd707c1a6a729c44e5ae611c83dd1) --- sys/kern/kern_kthread.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index bf481cafc72e..3604d63531da 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -63,7 +63,7 @@ kproc_start(const void *udata) int error; error = kproc_create((void (*)(void *))kp->func, NULL, - kp->global_procpp, 0, 0, "%s", kp->arg0); + kp->global_procpp, 0, 0, "%s", kp->arg0); if (error) panic("kproc_start: %s: error %d", kp->arg0, error); } @@ -97,8 +97,8 @@ kproc_create(void (*func)(void *), void *arg, fr.fr_pages = pages; fr.fr_procp = &p2; error = fork1(&thread0, &fr); - if (error) - return error; + if (error != 0) + return (error); /* save a global descriptor, if desired */ if (newpp != NULL) @@ -134,12 +134,12 @@ kproc_create(void (*func)(void *), void *arg, sched_user_prio(td, PUSER); /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) + if ((flags & RFSTOPPED) == 0) sched_add(td, SRQ_BORING); else thread_unlock(td); - return 0; + return (0); } void @@ -188,7 +188,8 @@ kproc_suspend(struct proc *p, int timo) } SIGADDSET(p->p_siglist, SIGSTOP); wakeup(p); - return msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, "suspkp", timo); + return (msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, + "suspkp", timo)); } int @@ -230,11 +231,11 @@ kproc_suspend_check(struct proc *p) void kthread_start(const void *udata) { - const struct kthread_desc *kp = udata; + const struct kthread_desc *kp = udata; int error; error = kthread_add((void (*)(void *))kp->func, NULL, - NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); + NULL, kp->global_threadpp, 0, 0, "%s", kp->arg0); if (error) panic("kthread_start: %s: error %d", kp->arg0, error); } @@ -313,13 +314,13 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, PMC_CALL_HOOK_UNLOCKED(td, PMC_FN_THR_CREATE_LOG, NULL); #endif /* Delay putting it on the run queue until now. */ - if (!(flags & RFSTOPPED)) { + if ((flags & RFSTOPPED) == 0) { thread_lock(newtd); sched_add(newtd, SRQ_BORING); } if (newtdp) *newtdp = newtd; - return 0; + return (0); } void @@ -451,8 +452,8 @@ kthread_suspend_check(void) int kproc_kthread_add(void (*func)(void *), void *arg, - struct proc **procptr, struct thread **tdptr, - int flags, int pages, const char *procname, const char *fmt, ...) + struct proc **procptr, struct thread **tdptr, + int flags, int pages, const char *procname, const char *fmt, ...) { int error; va_list ap; @@ -461,7 +462,7 @@ kproc_kthread_add(void (*func)(void *), void *arg, if (*procptr == NULL) { error = kproc_create(func, arg, - procptr, flags, pages, "%s", procname); + procptr, flags, pages, "%s", procname); if (error) return (error); td = FIRST_THREAD_IN_PROC(*procptr); @@ -479,6 +480,6 @@ kproc_kthread_add(void (*func)(void *), void *arg, vsnprintf(buf, sizeof(buf), fmt, ap); va_end(ap); error = kthread_add(func, arg, *procptr, - tdptr, flags, pages, "%s", buf); + tdptr, flags, pages, "%s", buf); return (error); } From nobody Sat Sep 9 08:27:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR1p5LZmz4sPcK; Sat, 9 Sep 2023 08:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR1p4Z36z4NLB; Sat, 9 Sep 2023 08:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ZPhH98oFnvpZqK5kErgaIptB+9Sn+kMDYmoar3acTI=; b=YxTSB6Vq2iTjZFzuJ0OoJxQoqDTIlfIAWHlfftkFchhWqm9rnUA1FqHSx0q/fNDdMAdefd MiYGv+oPEdp5cuUff+uM1vB+tu6YDVQ537gRc9W48HrS3cPEsHni5YpgJuy4MkDJFqp4ll gKYRlnI/GZAjNvqLEaPV1MfK7yTWwBz8LZ/7eMI9sW+pfd7OtOjwh4g8YBZfMgnj9bMV9o tPO8ZixOn7KN8X2Ua2UNCZFRIQoI+63+Q7BRbiBb8GNNXTiMNmpnzwY3LDvPx7xTq+waUm mzZOSjIqPsC1SEbptkvPq4qxLEs3ogTZEiYSO0Ppx9hgcN+EvP3IYpZpIaf8bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248078; a=rsa-sha256; cv=none; b=lwxw9B9OTE1+mf2CRMAm/vQ/JfwKf6yZ6JcGwOF0QJztNExtCnV7Mx77eJrJ71yQMhZGNu WEY5gGlgZjJHUz2avuTg8gj8p2N/lxXZydaKNfS6eDxlvUMH5Ia4bZn552vnm1qMZMq7yc xQXvJjnyKtDNzp3zga2KMuDM3OqxWXP8O04MpCl5D0s0MstBTWg79WQiMC6zCn2ddJ02W0 6gaqk2LfO32ebhs90KwOTM9C4/KPNEMCWxwdCcWYIJI3A2r5If+pxIz7cw0Tgb+hfiLPyu 2thyyKeT1cuMo+B78sEPP6VrTyJJ7Iz+Y/dQ6bGIQB/S2vduAJvu7hZT3MhA3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6ZPhH98oFnvpZqK5kErgaIptB+9Sn+kMDYmoar3acTI=; b=pA2QRLJCzgaQdt9CqGqawD2Inv/cFhZ8FlkovpFCMOLX3eSXIRDf/vkPJtpS4ePQybhP9A ypj4ko5LYHRYMuxYPKLaZykhsa23ZydCltJhpDDuQQobdLTLScqkDxYjG9PYIw52qhBKqe KWDKulzAtpE0E6ALuUi+J4TjlDhFwYIBRE2N8Uq3gMdTfQZyO7Thrug9SuBv5ovkB0V7dr 0SrMcJXVZ5mni873bfszwEjcP8ssZMBp6ciPQQd/iJ3vjFnWFwyA6VqK/GLS7nnL2w7VQv nFtj+K4gj9uI3xYkHhOc57QX00N97uTmPEHt68rT88ylEeuKFtFP8/GjBEycKw== 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 4RjR1p3bRWz3Bb; Sat, 9 Sep 2023 08:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898Rw04054050; Sat, 9 Sep 2023 08:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898Rw09054047; Sat, 9 Sep 2023 08:27:58 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:58 GMT Message-Id: <202309090827.3898Rw09054047@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: a39c6d1ce008 - stable/13 - kern_kthread: fork1() does not handle locked Giant List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a39c6d1ce008180059ec32facdba92e1468b44b0 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a39c6d1ce008180059ec32facdba92e1468b44b0 commit a39c6d1ce008180059ec32facdba92e1468b44b0 Author: Konstantin Belousov AuthorDate: 2023-09-02 07:16:48 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:27:32 +0000 kern_kthread: fork1() does not handle locked Giant (cherry picked from commit 525bc87f54f288793a95abbcd0a845efddb8c41b) --- sys/kern/kern_kthread.c | 60 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 17 deletions(-) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 3604d63531da..5e32aea1f56d 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -78,13 +78,12 @@ kproc_start(const void *udata) * flags are flags to fork1 (in unistd.h) * fmt and following will be *printf'd into (*newpp)->p_comm (for ps, etc.). */ -int -kproc_create(void (*func)(void *), void *arg, - struct proc **newpp, int flags, int pages, const char *fmt, ...) +static int +kproc_create1(void (*func)(void *), void *arg, + struct proc **newpp, int flags, int pages, const char *tdname) { struct fork_req fr; int error; - va_list ap; struct thread *td; struct proc *p2; @@ -105,13 +104,9 @@ kproc_create(void (*func)(void *), void *arg, *newpp = p2; /* set up arg0 for 'ps', et al */ - va_start(ap, fmt); - vsnprintf(p2->p_comm, sizeof(p2->p_comm), fmt, ap); - va_end(ap); + strcpy(p2->p_comm, tdname); td = FIRST_THREAD_IN_PROC(p2); - va_start(ap, fmt); - vsnprintf(td->td_name, sizeof(td->td_name), fmt, ap); - va_end(ap); + strcpy(td->td_name, tdname); #ifdef KTR sched_clear_tdname(td); #endif @@ -142,6 +137,23 @@ kproc_create(void (*func)(void *), void *arg, return (0); } +int +kproc_create(void (*func)(void *), void *arg, + struct proc **newpp, int flags, int pages, const char *fmt, ...) +{ + va_list ap; + int error; + char tdname[MAXCOMLEN + 1]; + + va_start(ap, fmt); + vsnprintf(tdname, sizeof(tdname), fmt, ap); + va_end(ap); + DROP_GIANT(); + error = kproc_create1(func, arg, newpp, flags, pages, tdname); + PICKUP_GIANT(); + return (error); +} + void kproc_exit(int ecode) { @@ -250,11 +262,10 @@ kthread_start(const void *udata) * ** XXX fix this --> flags are flags to fork1 (in unistd.h) * fmt and following will be *printf'd into (*newtd)->td_name (for ps, etc.). */ -int -kthread_add(void (*func)(void *), void *arg, struct proc *p, - struct thread **newtdp, int flags, int pages, const char *fmt, ...) +static int +kthread_add1(void (*func)(void *), void *arg, struct proc *p, + struct thread **newtdp, int flags, int pages, const char *tdname) { - va_list ap; struct thread *newtd, *oldtd; if (!proc0.p_stats) @@ -278,9 +289,7 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, __rangeof(struct thread, td_startcopy, td_endcopy)); /* set up arg0 for 'ps', et al */ - va_start(ap, fmt); - vsnprintf(newtd->td_name, sizeof(newtd->td_name), fmt, ap); - va_end(ap); + strcpy(newtd->td_name, tdname); TSTHREAD(newtd, newtd->td_name); @@ -323,6 +332,23 @@ kthread_add(void (*func)(void *), void *arg, struct proc *p, return (0); } +int +kthread_add(void (*func)(void *), void *arg, struct proc *p, + struct thread **newtdp, int flags, int pages, const char *fmt, ...) +{ + va_list ap; + int error; + char tdname[MAXCOMLEN + 1]; + + va_start(ap, fmt); + vsnprintf(tdname, sizeof(tdname), fmt, ap); + va_end(ap); + DROP_GIANT(); + error = kthread_add1(func, arg, p, newtdp, flags, pages, tdname); + PICKUP_GIANT(); + return (error); +} + void kthread_exit(void) { From nobody Sat Sep 9 08:27:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR1q6JRrz4sPTW; Sat, 9 Sep 2023 08:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR1q5pPRz4NCp; Sat, 9 Sep 2023 08:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tSwPI/6OuQb4S1j2H/hV5gBwXG63oFm0/YrLoibpLY=; b=sm5S8UqpuEX9i26HKKS2L2I8fbfO5s9kb3l/AQJB4RkKmNxAL7ahCX5eU/hoQPpZrWHBEt M6rbpcXmZwPGAQivJaCU0NfRU4bFYuCtE0w+YsFhwCVYrZl6iz69SIIOl9TJROQapuot0x CK+uAx9hf51YXUZO/x9AulNX1W7psTgZzQHYxRPa1eIogBPh6cB6IvC6eiNzyfVST79uPq 7+X40y/e3ch98EfHcy5JRxqxzWkm+Ye/7JoKk9BAw0DzPRpA0NBhoStVglKR/YBtcqpDz1 I4mxxWKy23xUK2rpDeCEXfwKVuQlM1JvLOenECjsWteDJOLA3ChtRDou9FAklQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248079; a=rsa-sha256; cv=none; b=aLy8uhjrSpJ7D/TCVXDf5Drs9rR5H6tLLhx824Ez3UdhZlw+OfzVvo1sGgT/8BRgpsfUeu Qq1iOh6FA84jjJodp7jrHGZX5YNZkw0jN57dBpb2AMj0dmYAsnwKr9z2PAKBPJD1oQZaYU kA/Hrb3FNpWuxu7HRGezInfXcJYb7YUBT6sqTN3goPWDzqmXWB1KUz1sEAI/O0glyG6lxE hCpbyqejwGfHvWs+02sbNvHhMzKf8H4URznLUUF98sr5v8k42dAOiv2dtCzckLm/3ZeDbp bcZYH/VYrGfkiN9x3TWSkp+CF4MR2WgKwww/6n00MHx1cJF3R6ro0lk6Gv2BJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tSwPI/6OuQb4S1j2H/hV5gBwXG63oFm0/YrLoibpLY=; b=jEXmqBTzPSFKeWvApRuisB2418tQ2p/4vh+ND1Obt8PmSbOL8hHfmMFdqKzgfQmw7Oasa/ W9IwGtQ8stwOWHngpWK+jATNTXtKGyDr0Ofu2SFvaNR9xBTWAUbBldqSqhtSYut0+Xf8ew ix8tjRMPtVf9bPo0s/Rr6s8isZOuFSknv2M9UGaNSlgP/YsKcnp9zNSjUeIeGDOnM4pzxJ /FVbGpwLug8w5dyKLwrLdWk+NUBXXLFWlTm5FJqocHk75ySTwoku5MKAo3KPxlL+2B29gZ VWhUigurcsuNyesaeID6zcc3VNjNhJgrnhUbByV6plkH/9NokiYpggee3teVKg== 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 4RjR1q4RFSz31D; Sat, 9 Sep 2023 08:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898RxJb054120; Sat, 9 Sep 2023 08:27:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898Rx6k054117; Sat, 9 Sep 2023 08:27:59 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:27:59 GMT Message-Id: <202309090827.3898Rx6k054117@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: 52ea025eba6c - stable/13 - kthread_add(): do not allow to attach the thread to a dead or dying process List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 52ea025eba6c4b9cf560f0dc90ed6c49846637ef Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=52ea025eba6c4b9cf560f0dc90ed6c49846637ef commit 52ea025eba6c4b9cf560f0dc90ed6c49846637ef Author: Konstantin Belousov AuthorDate: 2023-09-05 10:54:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:27:32 +0000 kthread_add(): do not allow to attach the thread to a dead or dying process (cherry picked from commit 96362992330894787a4485f0adc5e867879c5893) --- sys/kern/kern_kthread.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c index 5e32aea1f56d..6f7fd8b3d555 100644 --- a/sys/kern/kern_kthread.c +++ b/sys/kern/kern_kthread.c @@ -281,6 +281,10 @@ kthread_add1(void (*func)(void *), void *arg, struct proc *p, return (ENOMEM); PROC_LOCK(p); + if (p->p_state == PRS_ZOMBIE || (p->p_flag2 & P2_WEXIT) != 0) { + PROC_UNLOCK(p); + return (ESRCH); + } oldtd = FIRST_THREAD_IN_PROC(p); bzero(&newtd->td_startzero, From nobody Sat Sep 9 08:28:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjR1s4K34z4sPhl; Sat, 9 Sep 2023 08:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjR1s0bnHz4NMD; Sat, 9 Sep 2023 08:28:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/gIOis+X9h38LwEeNfQaEo/qIDJXTL8StCEHWGaY5c=; b=hcSBt3u5zdDVgipBBigE+e5QQvuZq7F2xRIWSffTXNqujDURL0Aq40IaA+EjdhrNHCagjp Am4l6ib/BHFDC8V5txOjXR8GT/wRrO8vi2bskaaAAnU1K7t0Sc0WHW0zVXBjvA7/qbNYSC 12dgj8pFAJTh904Et7NkSkc9r999MF0H6+HOSdRulgvEm1+OVfszZoG+PqrFV6rdeP+a92 HNNXeMPO+g15T206S/G+OmbkNh5J+IiVMPntQBaRtuTDmJnAhCMj30RaDFKwtTvzo25cS9 Y9PVtXZ7TzVgRr34Lw5CDknzbktnyE5TpogXSU++ZD1cBDGkZTjywH3g2TskOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694248081; a=rsa-sha256; cv=none; b=QrzzFwlQ2EoK5SJP28waKq1tWRtbnDCXmnOaMqXyc9AyrCVJfGdVJv8S/zwy8hji5ENyZZ iMxeQ5Mc/F6s2kCVmM8HLiZ0wXKUyiRQbCWJNuJEYOU5q9S+TZ0RDUmVMb7I3+p57yDbAa Rh+5vG31VPGUNsRorZD17/fsV1aEqO0qieP7b+x7ae+0CP2vBTeFd52kvu7B/Ja3Mp/rLT aUJqv123L9hu520yac4G1ws2g23t+zf8oDtXDWfuYygKyHqmwasz3JrhDoHtrXrp5MtQci eD3SH9vSBsdA1O6I7o3B+5Ndoi+EMw+BqZRWNNSSBMKNYkcgO7OFDULKG5vgqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694248081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o/gIOis+X9h38LwEeNfQaEo/qIDJXTL8StCEHWGaY5c=; b=d91QG0AXKRGh4UeNG6yHo7Oh8MFheSkMaqvI8Wg/EZtBBvHhLEOH60aRcWjR7CmntNBtA6 VVrlNr44Z+IBSf8QUgBW1+KVZKv7fIY8j8osls7pUeJNs6CIhrUbhN5yx2OX0IkCzVt9nY A5k5plXOs8Eckfb/7U/llOVDMvkHa340+/nz62q0rWYVLPNt9E/kLmHtyk5wJR0U7OmOkR lYOWtUH1LLys9Zgqx1GQPVEqfwyTJvpylFC4te1Oh51yR+MjKYG0eUUzATBs3wlsyDNWzs lv55s6gdpBJ8FUfGg599YoHqw25GTUNdKyC4j1u6PS7tl7xU6HEJ4ZLk2gFPbg== 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 4RjR1r5gBxz2vk; Sat, 9 Sep 2023 08:28:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3898S0XM054174; Sat, 9 Sep 2023 08:28:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3898S0jJ054171; Sat, 9 Sep 2023 08:28:00 GMT (envelope-from git) Date: Sat, 9 Sep 2023 08:28:00 GMT Message-Id: <202309090828.3898S0jJ054171@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: 875f06276b8d - stable/13 - __crt_aligned_alloc_offset(): fix ov_index for backing allocation address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 875f06276b8d5e1b7bc435b0436c9f203c492e36 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=875f06276b8d5e1b7bc435b0436c9f203c492e36 commit 875f06276b8d5e1b7bc435b0436c9f203c492e36 Author: Konstantin Belousov AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 08:27:32 +0000 __crt_aligned_alloc_offset(): fix ov_index for backing allocation address (cherry picked from commit 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55) --- libexec/rtld-elf/rtld_malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6e011e88ba5a..4b5140551675 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -188,7 +188,7 @@ __crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) x += offset; ov = cp2op((void *)x); ov1.ov_magic = AMAGIC; - ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + ov1.ov_index = x - (uintptr_t)mem + sizeof(union overhead); memcpy(ov, &ov1, sizeof(ov1)); return ((void *)x); } From nobody Sat Sep 9 11:40:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjWJW3rMLz4tPJH; Sat, 9 Sep 2023 11:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjWJW39W0z4Lwn; Sat, 9 Sep 2023 11:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694259659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifCgl8wRDJRQAcQ1aG5GbiWHmg42+RQQP/j9yq4UMvc=; b=lJnaAz817k7HbJ/X3Try0LPd5E5a+fwEg7kG79BsdLOfBXHkfdB6y1aE0j2PFIOG83kXGa UkdxdW07cEUyNaGFYE6zT0PBXsjwhEx4PrPbV0vilYuOZkhExbcu3wk5PMlTv2lAV8bAWL W+ET6S9UeGKOhTSfsBYd2BG5p2IJqLoGf/DRTfzdh1TpaZukZkdapQuu2t0g/dClHroPzx HsxvN8rCLIFS+s5aYmkAHrPw0C4bBYebWCEucMEYd1VP0m+woyNpCa0HXTyVOh01/envVb x1qWx1EClWAl5WuxbBTDEoG+W3EVdkTEWeW8MdTCFWyuoxINV3Z+telD5GbbXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694259659; a=rsa-sha256; cv=none; b=AcIRSYrMkjnZIq5SiP45hRJiCiZpvXq9BkdFIbDxpzjUGAWpO5BKmkfp2aU2CRqV2haMNF vl0G7eOyNEs2QNo9aRFPBztrbsRQ6FKQa0N7awT6pjc/I3ki0wDhvSyGIVgUSFjWlLai3Y lifeY25/sg0bNigqdf6twrBdCNsOWSc3+HTh77L0JchQMuIefnVZcVUq7Is6fzRrzbGlM/ pC59m8oOtva1LfhZF0tFYbJE7L44HAcWf4nPzHg054FMFJ2MXipYSoKgiyCKCwqCXC/XeT y9qDobG/VBjtxF1DgbjJu9a8mZwlC3mPIvL2ghXkpncCSqGyJaDJqMqaLvMDGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694259659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifCgl8wRDJRQAcQ1aG5GbiWHmg42+RQQP/j9yq4UMvc=; b=SuPXL0dXPzv/6nH2+EsNg8iQ3/ZK/wox1+1FEYecZ/iF0ldAY/Bi+Rtu1TprOnHnITrfTb vvZ2Uy42gik6tms4J5wLAuCF9KbOfwiTgm/LwdA1BE7nR9aXb9qtR6OZ8ZMyWNnW7/6c3r Zqymzpnzfs8LlVHe/Sx//EFRQHOdsIqSczjctaGGfQc7Fbpp00NLmyw4v3pydZdudj3Iux RBQPSRRUTYcjxIUTY58YBqxoUDJAgGooPS3wXtD2NCVzp4+u+70flkzzP6s6dHi4pFY6sy DWbGvpdMJEDY+4GrIBMC/FB8eWwPNx9QTniWzmTn5GwY6aORAlBqZv0SrpjhWg== 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 4RjWJW2GVVz7rQ; Sat, 9 Sep 2023 11:40:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389Bexg3077020; Sat, 9 Sep 2023 11:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389Bexhk077017; Sat, 9 Sep 2023 11:40:59 GMT (envelope-from git) Date: Sat, 9 Sep 2023 11:40:59 GMT Message-Id: <202309091140.389Bexhk077017@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: 17922d7028d9 - releng/14.0 - __crt_aligned_alloc_offset(): fix ov_index for backing allocation address List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 17922d7028d9ba4e6ea68243a79bee3008abbe1e Auto-Submitted: auto-generated The branch releng/14.0 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=17922d7028d9ba4e6ea68243a79bee3008abbe1e commit 17922d7028d9ba4e6ea68243a79bee3008abbe1e Author: Konstantin Belousov AuthorDate: 2023-09-06 13:50:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 11:40:24 +0000 __crt_aligned_alloc_offset(): fix ov_index for backing allocation address Approved by: re (gjb) (cherry picked from commit 03a7c36ddbc0ddb1063d2c8a37c64d83e1519c55) (cherry picked from commit cbf1bbe5c8b5afedff247dbc20f4bccd888a06e9) --- libexec/rtld-elf/rtld_malloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld_malloc.c b/libexec/rtld-elf/rtld_malloc.c index 6e011e88ba5a..4b5140551675 100644 --- a/libexec/rtld-elf/rtld_malloc.c +++ b/libexec/rtld-elf/rtld_malloc.c @@ -188,7 +188,7 @@ __crt_aligned_alloc_offset(size_t align, size_t size, size_t offset) x += offset; ov = cp2op((void *)x); ov1.ov_magic = AMAGIC; - ov1.ov_index = x - (uintptr_t)mem - sizeof(union overhead); + ov1.ov_index = x - (uintptr_t)mem + sizeof(union overhead); memcpy(ov, &ov1, sizeof(ov1)); return ((void *)x); } From nobody Sat Sep 9 11:51:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjWXM4bHkz4sGTJ; Sat, 9 Sep 2023 11:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjWXM49Vtz4PMN; Sat, 9 Sep 2023 11:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cLu+TO+CFFgJa4zEKzhpL9CNC27HFdm6A01BVi0JV8o=; b=bywWe9f457+IjNvPFJQ+RaMFpwTQAEBUGpL7mNWOFfYZaQaykO4Q6nDxY7I/x2TWMGjVMg 3ARwFPfVu4uDArhS+8YjpPIh17i3HnDBIWYzMNU+0yVSiP3OWWLcnwZj0h9Nf3QhFx9mdc y4OKWCi74PbyqZ7n54NIhY+XEvfuYduCB/3dfKVtYtbXSJgRqDL2DqnDrMZcNO1WAHuMCM qZHTtdQqVR0+Ga6RvTU0+dAg5Ai0ULoaBhIY5henUsF6OSOMvwNI67Dt94WOUZMibGBDk6 PKYPlChRbRGOYIb9mnovagZO8PbXBg2KmWUst6EyCjDIoKz4lliCNXAJCMfF+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694260275; a=rsa-sha256; cv=none; b=BdVzcIB7svdOyZy3FAVgxTo09bj4Va/WTTTdgMIwmVmqdKztb1UWqPMOnLBTFyPTsedQ3w SwjNa6qci5lYUgIx2/P6kQQY7eb7hBhzw8+AHXsB4hspa3104CF/dzS5qaP524JzH7Q+jB IFtUigTBLeY8awg6SwYd37mIbjAWjFPE+o5YHrE2E5vON5tj2ex8nUVwFc/ecvzLrbhKxS gEOAt2DprbAhHct8lZiYbkOKGwO1Se8gz/XdsQvxX+2+AL/c6tUsWWCbBVkd7y2zRxf2Sv bcmIXCt+BEz3pwm2G2M6vBLDrZpVe1zg4PQiThG1u8XSXjfOlVLby/cQDWe3ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cLu+TO+CFFgJa4zEKzhpL9CNC27HFdm6A01BVi0JV8o=; b=CTR2g/jWsfZXjVR1tfUDR6UdWeQlp/PabQLisxdeF3DN8FErLrl4EMyN6X8+6lnF5y/MJE FROoFFgPOO6nPbeiD++/ebcjwAWymmS3qX+mKUZIM8gZ08Vt1fbVuj6u+EG4PG2h1hSBk6 JOm5mKvtnHRs8DF21W5RxyQcvaKM8nlyuLr7z6tzWotZ8EPqau9UweXPWZrzq4ByinRSiX 6KNA9pBbzqMmG4too6XqpiWtXXdZrSaiy7qEGQzV7McYZH1Q8tLwWr9L2io2Cb7QVIyARY S8r830X/7VnFAzecTqS3s5Q/uawaZ547t+QtvHJTRE3rZ2DlNwEt7OrtUZ3fmg== 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 4RjWXM3FL6z8Gk; Sat, 9 Sep 2023 11:51:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389BpFRx099693; Sat, 9 Sep 2023 11:51:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389BpFbK099690; Sat, 9 Sep 2023 11:51:15 GMT (envelope-from git) Date: Sat, 9 Sep 2023 11:51:15 GMT Message-Id: <202309091151.389BpFbK099690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 50eccf98b27d - stable/14 - pf (t)ftp-proxy: use libpfctl instead of DIOCGETSTATUS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 50eccf98b27dcf027f2afb7f8838ca750a076f05 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=50eccf98b27dcf027f2afb7f8838ca750a076f05 commit 50eccf98b27dcf027f2afb7f8838ca750a076f05 Author: Kristof Provost AuthorDate: 2023-08-29 15:00:44 +0000 Commit: Kristof Provost CommitDate: 2023-09-09 09:05:50 +0000 pf (t)ftp-proxy: use libpfctl instead of DIOCGETSTATUS Prefer libpfctl functions over direct access to the ioctl whenever possible. This will allow subsequent removal of DIOCGETSTATUS (in 15) as there already is an nvlist-based alternative. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41647 (cherry picked from commit ddd08375c85576b49fb9a34968ba2c2f4f8d56cf) --- contrib/pf/ftp-proxy/filter.c | 9 ++++++--- contrib/pf/tftp-proxy/filter.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/contrib/pf/ftp-proxy/filter.c b/contrib/pf/ftp-proxy/filter.c index e4787985e99f..4277e079f3be 100644 --- a/contrib/pf/ftp-proxy/filter.c +++ b/contrib/pf/ftp-proxy/filter.c @@ -169,7 +169,7 @@ do_rollback(void) void init_filter(const char *opt_qname, const char *opt_tagname, int opt_verbose) { - struct pf_status status; + struct pfctl_status *status; qname = opt_qname; tagname = opt_tagname; @@ -182,10 +182,13 @@ init_filter(const char *opt_qname, const char *opt_tagname, int opt_verbose) dev = open("/dev/pf", O_RDWR); if (dev == -1) err(1, "open /dev/pf"); - if (ioctl(dev, DIOCGETSTATUS, &status) == -1) + status = pfctl_get_status(dev); + if (status == NULL) err(1, "DIOCGETSTATUS"); - if (!status.running) + if (!status->running) errx(1, "pf is disabled"); + + pfctl_free_status(status); } int diff --git a/contrib/pf/tftp-proxy/filter.c b/contrib/pf/tftp-proxy/filter.c index 1689d3465fd3..966628464d28 100644 --- a/contrib/pf/tftp-proxy/filter.c +++ b/contrib/pf/tftp-proxy/filter.c @@ -173,7 +173,7 @@ do_rollback(void) void init_filter(char *opt_qname, int opt_verbose) { - struct pf_status status; + struct pfctl_status *status; qname = opt_qname; @@ -187,14 +187,17 @@ init_filter(char *opt_qname, int opt_verbose) syslog(LOG_ERR, "can't open /dev/pf"); exit(1); } - if (ioctl(dev, DIOCGETSTATUS, &status) == -1) { + status = pfctl_get_status(dev); + if (status == NULL) { syslog(LOG_ERR, "DIOCGETSTATUS"); exit(1); } - if (!status.running) { + if (!status->running) { syslog(LOG_ERR, "pf is disabled"); exit(1); } + + pfctl_free_status(status); } int From nobody Sat Sep 9 11:51:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjWXN5wpgz4sGTW; Sat, 9 Sep 2023 11:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjWXN5Nzlz4PVm; Sat, 9 Sep 2023 11:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wVPSJMkE+LhPGcLVnmYIgrLvM+lYn2vZONKwurbyCA=; b=LZvMTt7vOJdbVnePdbEjITMN9Ch8NOjKAELh1K1+0S4cVcioktnb8fmDavMnVlxKvPTY+a 65nBMHh6tiaBrVlAFNLZvvGlKoBjC2IQcK+PXXsbkBmBzrg0j6jFxJEER6NBnvM2GVWjAj B/ZZcVbXitChRcpdR2dnIWgKOkLt0N2J/L+8Yx5rzidEe5I1cjaTZapMAivj3g0MWr7hBh ccy7NXJSUSkiIRQGKv6DMJZfR7VB0JSOypPpxN+0j5M8uiGtO+mCQ2x+CbpYNW2+N0qi5v 6AFD9qkGiMdja4T3+DW5tiCp9qp9q0eZum5r3VDhlna5Jhyh8QgSlV+tWNhi8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694260276; a=rsa-sha256; cv=none; b=oiSL0SeDqCnr14z1jNyGeBsVccpk6pNScNRCc9QQnJ1AEhG3UjxPYrnCzABgYIo15KipgV 3uBykKcuYTuWMtv4yusXhUpeu9SkWf7NT17zGearqZBbFwGub+NfjKo6ZMAgi3Z5twNnNl 1QyuTRW+4qSf0Zaf9JfLS5zOjyTpTTRbVEi863aORugi47KGjGJOvxuCHG9p1uEQ0XmXH2 fUJOL6yjL7YEkewDEpkLmNuBgCwjjB7g/YI9mEBipFU+TFJR20ek13+87BIc+KL76K/uoa yMspcr19lI3jjO8AdUDx0fC4PO7v54PFKEMXq1kCQMr11BVvGib+3wr7QS53Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wVPSJMkE+LhPGcLVnmYIgrLvM+lYn2vZONKwurbyCA=; b=ZL1fFpaAoNV78FBVmob+qE32vQIVdn79lNBAKeZT2uXmGjh+nP+NfkbWYrQnGu/vstHJBq tHMPPQkD54shUR2dFDWsV/DnF+v7qk7B8WHj6FxUVqRoR1mh4n2qhbRB2Rh4P4SeKelrIR KjIJe4c7czB+MHLuuFLbo9uPJLCBYuQud2Y0MWYkAhVfE8FA9gsAC9tAKdgFb61xpNtEuQ DQtfM2ghnshbf/Q1oti8M9grrARPSqMZP3JtV5yKsWXpMaSCRodWJ1PqKcZjHZYb9SeL5Y KdGxKl5pnIIra8+8G4LmurYOTMp5U52PHqgpAvW6nttYb4C5qnUfwC9tSTp/0g== 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 4RjWXN4M5fz7wZ; Sat, 9 Sep 2023 11:51:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389BpGbL099736; Sat, 9 Sep 2023 11:51:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389BpG2E099733; Sat, 9 Sep 2023 11:51:16 GMT (envelope-from git) Date: Sat, 9 Sep 2023 11:51:16 GMT Message-Id: <202309091151.389BpG2E099733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: be47dc1f7132 - stable/14 - libpfctl: allow pfctl_free_status(NULL) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: be47dc1f713217358f882794a85361206f562109 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=be47dc1f713217358f882794a85361206f562109 commit be47dc1f713217358f882794a85361206f562109 Author: Kristof Provost AuthorDate: 2023-08-29 15:02:34 +0000 Commit: Kristof Provost CommitDate: 2023-09-09 09:05:50 +0000 libpfctl: allow pfctl_free_status(NULL) Mimic free() and friends, and allow free()ing of NULL. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41648 (cherry picked from commit 0b01878fd00b128ce3dead119b37781048744d39) --- lib/libpfctl/libpfctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index f98b43f62cda..7d79d0abb970 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -257,6 +257,9 @@ pfctl_free_status(struct pfctl_status *status) { struct pfctl_status_counter *c, *tmp; + if (status == NULL) + return; + TAILQ_FOREACH_SAFE(c, &status->counters, entry, tmp) { free(c->name); free(c); From nobody Sat Sep 9 11:51:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjWXQ0DXFz4sGZJ; Sat, 9 Sep 2023 11:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjWXP6ZMhz4Ps8; Sat, 9 Sep 2023 11:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLkRVOPB0Amgfk7hS33VXFd9vZp/QfkNP9ZsxqJvi00=; b=NwxSIQ5zed0Bvn5I2o+zZyXZg+enlX1u0oguphYp0iYc8GWIJ6/09BL0RJQ32HWLFyreWx jYTEJowPuqoHmGOEdrE7H9ZvTTfvMRKel4QNMMvQocsSl87KmrWzQoe5f8amWQk/e4sBYl iePXZK1K6+TlRXMUSsQL64mhwbLuR8HR7xKK297rPX5ycbNfVydhJJaqKXFxR+mrjtByvX aSWStf37bERR2FmHrkzmpSjLiikhCxElzx+zzV1qhoTJ1sRwYutv/H6RtWr/YVjeikqgDN R9amgYFDZ4Iz3kz+hORiu6CzFJZEZXIEQVukcdIvHJQ0EBoQHoS1Hs38vLFxrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694260277; a=rsa-sha256; cv=none; b=rdDgQQmzFa6jVzRL6CRLiMT1qg38DMXqTFhkUd2HdL41p2w0emh5KWRUSJG2xq5hG938Tg GvWZSDIcuTTHki2RqeA836OSCQtbqN17z+jmMnzXWw6Xdx6+AJ0q/2FzM0PtNXYy0SMF7R rqSZg7iN9mmTT36km4xvNGwwnQM1JEXcw2wDnjxUPb1qjx2COP9VnD6hFTclVQS+ZCDQ9l /n3LeR2eAcahw54lTpMzMSzbfledqfanDQZdtnlWhwMZuHnnxlh9GHirFqfuxLZaqzxiaw lzpTlrWtg4cLyX3thY6Q98atgAEZs+DQznnJpCdoeuu7MX8r1x3LbL6+rPMGZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iLkRVOPB0Amgfk7hS33VXFd9vZp/QfkNP9ZsxqJvi00=; b=XgZO3IXWNJZOO9fv2zbyAZKBRJDjXxSeNItKKGSHBrCNNIhdcjPXPxQuy9ZJMFIDWnhsIG IY6ihmVfujwCtHccVfU3KZrxGgvuVgf/ECvcDXDO+VOXs6aovnyS2+Hz3NCrvXeAFGqlOo xLyR+PWLNtlJqK4LAN5zkaMjhRqxXc0iwhucizmWmaOof5/f0vkeWYKfGBo53lvq3h4As0 743akxkmHemN0xDFI4lHtS+EZ3nwjAkqmoH87oJKUmhDw4phFDyFGStDC3qslOgQFTk68k riXXznRTTkY+4E1i1GVwp7MeZSxubJWNlwEiK7Uzx5SlaHAdW/qY+b+nTdADFA== 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 4RjWXP5KXTz7wb; Sat, 9 Sep 2023 11:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389BpHJI099782; Sat, 9 Sep 2023 11:51:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389BpHh3099779; Sat, 9 Sep 2023 11:51:17 GMT (envelope-from git) Date: Sat, 9 Sep 2023 11:51:17 GMT Message-Id: <202309091151.389BpHh3099779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 9a9535e4df50 - stable/14 - libpfctl: implement status counter accessor functions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9a9535e4df507957fc173208e7c1fd0080bd7a73 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a9535e4df507957fc173208e7c1fd0080bd7a73 commit 9a9535e4df507957fc173208e7c1fd0080bd7a73 Author: Kristof Provost AuthorDate: 2023-08-29 15:04:17 +0000 Commit: Kristof Provost CommitDate: 2023-09-09 09:05:50 +0000 libpfctl: implement status counter accessor functions The new nvlist-based status call allows us to easily add new counters. However, the libpfctl interface defines a TAILQ, so it's not quite trivial to find the counter consumers are interested in. Provide convenience functions to access the counters. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41649 (cherry picked from commit e3d3d61a7d94a4155ef70048a8b578985fca8383) --- lib/libpfctl/libpfctl.c | 31 +++++++++++++++++++++++++++++++ lib/libpfctl/libpfctl.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/lib/libpfctl/libpfctl.c b/lib/libpfctl/libpfctl.c index 7d79d0abb970..1eccf3dfbcdf 100644 --- a/lib/libpfctl/libpfctl.c +++ b/lib/libpfctl/libpfctl.c @@ -252,6 +252,37 @@ pfctl_get_status(int dev) return (status); } +static uint64_t +_pfctl_status_counter(struct pfctl_status_counters *counters, uint64_t id) +{ + struct pfctl_status_counter *c; + + TAILQ_FOREACH(c, counters, entry) { + if (c->id == id) + return (c->counter); + } + + return (0); +} + +uint64_t +pfctl_status_counter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->counters, id)); +} + +uint64_t +pfctl_status_fcounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->fcounters, id)); +} + +uint64_t +pfctl_status_scounter(struct pfctl_status *status, int id) +{ + return (_pfctl_status_counter(&status->scounters, id)); +} + void pfctl_free_status(struct pfctl_status *status) { diff --git a/lib/libpfctl/libpfctl.h b/lib/libpfctl/libpfctl.h index 35c662816f3b..2559fc9c4843 100644 --- a/lib/libpfctl/libpfctl.h +++ b/lib/libpfctl/libpfctl.h @@ -385,6 +385,9 @@ struct pfctl_syncookies { }; struct pfctl_status* pfctl_get_status(int dev); +uint64_t pfctl_status_counter(struct pfctl_status *status, int id); +uint64_t pfctl_status_fcounter(struct pfctl_status *status, int id); +uint64_t pfctl_status_scounter(struct pfctl_status *status, int id); void pfctl_free_status(struct pfctl_status *status); int pfctl_get_eth_rulesets_info(int dev, From nobody Sat Sep 9 11:51:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjWXR0mCtz4sGMH; Sat, 9 Sep 2023 11:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjWXQ71MBz4Pf1; Sat, 9 Sep 2023 11:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrBhP3d2PSgwKpgW+do1o2xGWblcgK1u3Hy3LiXmtBk=; b=Je1U1Wk8mANhBRLLj1wkC+z198HLPppBQpjcPdW3Jh5d5F6ftMi82IlqGxhkqCnOwIUiu6 1WaTwnMiufLXKwWq6lqZ/H37yYns9Rg64GNpAfrr2FjF+rd593h1EdSlQF6rKDa1l+psAu KBs8lZL/xNhs7qLANC/rUSh6941RI/QYUX5xeU4ANQYgX+K5gqvQYIdmPtiWVXmz4peWaq 5q1K7nI9xPlGJFKJnkxpCaZonEb4kDjryFTmRYrEuxVSj4fbo70c1JU2ktYaryLR/1hwEp oxhfIvad9K41JY6Sa3kqPuBDCOq+pueW742mQIt6jpfg1f6xgKNnD1V/fTbzlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694260279; a=rsa-sha256; cv=none; b=xuZCSwudFeIZ27bYYCjz42kz+5LKCsl/WfXvgqRGwhP3M++5prpqxNHw2l/VsjHU7bovo7 XFTsfHoQJMHY+S0rY0zEaASBJPaPgTY+6cBgySgxhSnJTjMS3LF1mKG3t1A2ldTOHgn65U lRgjOEZTgBqoFc2mXY1RDWw+5TSy8AOP1AmTYw3ZLzTPMTsuxO0kESGUujcC14ZlLhMg9Q 7lMTCWuddbbwLsuWPsmbc05QuDeLpTdvV5kcA01eVanD/qibV8xHUhGta6g3RH4yKZNS3y nGl25J1Chq0cocgIbnW0tayh116io44UBcSFyfxR0IMz5HJ3iwnaH6LyfkPdaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694260279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DrBhP3d2PSgwKpgW+do1o2xGWblcgK1u3Hy3LiXmtBk=; b=ZL8SlViqXxfo3OiJHOB0O5hBCZpgfYBSI4PfnC1N6krdbXnTbSI4jr5R+mXzvU/A/+wwRm nQuINzdW8BNu4awc8b7DFqqUel8f05szkI+ZnYpRK1mvCkD+AxOV1tgoruLpiwKZuhizEK ixKQob4Nk2tMTTux4SbjMyo95txo3uj1pTjg8ykvHSwJYt/2Os4oUV9ZbpPWfpBAh+u/UN LW4c7uYekiaUfXzCiOqhYfirlFoahiXdrzdnJZ6zG9tmambgQOjodTbDEf9jCb7b3Lb1ZV 7WjaRLLFTYWBktqEpCjO4r64y2FcpUnSNxKPZs+IHhVTHWRrQwOcKS0kw8ELbg== 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 4RjWXQ61Y8z8Jw; Sat, 9 Sep 2023 11:51:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389BpIwA099833; Sat, 9 Sep 2023 11:51:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389BpIDf099830; Sat, 9 Sep 2023 11:51:18 GMT (envelope-from git) Date: Sat, 9 Sep 2023 11:51:18 GMT Message-Id: <202309091151.389BpIDf099830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 1332487c3720 - stable/14 - snmp_pf: use libpfctl's pfctl_get_status() rather than DIOCGETSTATUS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1332487c372095c88bd67d2834d71295956e4f2c Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1332487c372095c88bd67d2834d71295956e4f2c commit 1332487c372095c88bd67d2834d71295956e4f2c Author: Kristof Provost AuthorDate: 2023-08-29 15:16:19 +0000 Commit: Kristof Provost CommitDate: 2023-09-09 09:05:50 +0000 snmp_pf: use libpfctl's pfctl_get_status() rather than DIOCGETSTATUS Prefer libpfctl functions over direct access to the ioctl whenever possible. This will allow subsequent removal of DIOCGETSTATUS (in 15) as there already is an nvlist-based alternative. MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D41650 (cherry picked from commit 6fbb9fbf7d659574512d706912e8fd0576b13573) --- usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c | 74 ++++++++++++++++--------------- 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c index 134c05171749..a5786007d3f4 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c +++ b/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c @@ -54,7 +54,7 @@ static int dev = -1; static int started; static uint64_t pf_tick; -static struct pf_status pfs; +static struct pfctl_status *pfs; enum { IN, OUT }; enum { IPV4, IPV6 }; @@ -166,18 +166,18 @@ pf_status(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfStatusRunning: - val->v.uint32 = pfs.running; + val->v.uint32 = pfs->running; break; case LEAF_pfStatusRuntime: - runtime = (pfs.since > 0) ? - time(NULL) - pfs.since : 0; + runtime = (pfs->since > 0) ? + time(NULL) - pfs->since : 0; val->v.uint32 = runtime * 100; break; case LEAF_pfStatusDebug: - val->v.uint32 = pfs.debug; + val->v.uint32 = pfs->debug; break; case LEAF_pfStatusHostId: - sprintf(str, "0x%08x", ntohl(pfs.hostid)); + sprintf(str, "0x%08x", ntohl(pfs->hostid)); return (string_get(val, str, strlen(str))); default: @@ -205,22 +205,22 @@ pf_counter(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfCounterMatch: - val->v.counter64 = pfs.counters[PFRES_MATCH]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_MATCH); break; case LEAF_pfCounterBadOffset: - val->v.counter64 = pfs.counters[PFRES_BADOFF]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_BADOFF); break; case LEAF_pfCounterFragment: - val->v.counter64 = pfs.counters[PFRES_FRAG]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_FRAG); break; case LEAF_pfCounterShort: - val->v.counter64 = pfs.counters[PFRES_SHORT]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_SHORT); break; case LEAF_pfCounterNormalize: - val->v.counter64 = pfs.counters[PFRES_NORM]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_NORM); break; case LEAF_pfCounterMemDrop: - val->v.counter64 = pfs.counters[PFRES_MEMORY]; + val->v.counter64 = pfctl_status_counter(pfs, PFRES_MEMORY); break; default: @@ -248,19 +248,19 @@ pf_statetable(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfStateTableCount: - val->v.uint32 = pfs.states; + val->v.uint32 = pfs->states; break; case LEAF_pfStateTableSearches: val->v.counter64 = - pfs.fcounters[FCNT_STATE_SEARCH]; + pfctl_status_fcounter(pfs, FCNT_STATE_SEARCH); break; case LEAF_pfStateTableInserts: val->v.counter64 = - pfs.fcounters[FCNT_STATE_INSERT]; + pfctl_status_fcounter(pfs, FCNT_STATE_INSERT); break; case LEAF_pfStateTableRemovals: val->v.counter64 = - pfs.fcounters[FCNT_STATE_REMOVALS]; + pfctl_status_fcounter(pfs, FCNT_STATE_REMOVALS); break; default: @@ -288,19 +288,19 @@ pf_srcnodes(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfSrcNodesCount: - val->v.uint32 = pfs.src_nodes; + val->v.uint32 = pfs->src_nodes; break; case LEAF_pfSrcNodesSearches: val->v.counter64 = - pfs.scounters[SCNT_SRC_NODE_SEARCH]; + pfctl_status_scounter(pfs, SCNT_SRC_NODE_SEARCH); break; case LEAF_pfSrcNodesInserts: val->v.counter64 = - pfs.scounters[SCNT_SRC_NODE_INSERT]; + pfctl_status_scounter(pfs, SCNT_SRC_NODE_INSERT); break; case LEAF_pfSrcNodesRemovals: val->v.counter64 = - pfs.scounters[SCNT_SRC_NODE_REMOVALS]; + pfctl_status_scounter(pfs, SCNT_SRC_NODE_REMOVALS); break; default: @@ -461,51 +461,51 @@ pf_logif(struct snmp_context __unused *ctx, struct snmp_value *val, switch (which) { case LEAF_pfLogInterfaceName: - strlcpy(str, pfs.ifname, sizeof str); + strlcpy(str, pfs->ifname, sizeof str); return (string_get(val, str, strlen(str))); case LEAF_pfLogInterfaceIp4BytesIn: - val->v.counter64 = pfs.bcounters[IPV4][IN]; + val->v.counter64 = pfs->bcounters[IPV4][IN]; break; case LEAF_pfLogInterfaceIp4BytesOut: - val->v.counter64 = pfs.bcounters[IPV4][OUT]; + val->v.counter64 = pfs->bcounters[IPV4][OUT]; break; case LEAF_pfLogInterfaceIp4PktsInPass: val->v.counter64 = - pfs.pcounters[IPV4][IN][PF_PASS]; + pfs->pcounters[IPV4][IN][PF_PASS]; break; case LEAF_pfLogInterfaceIp4PktsInDrop: val->v.counter64 = - pfs.pcounters[IPV4][IN][PF_DROP]; + pfs->pcounters[IPV4][IN][PF_DROP]; break; case LEAF_pfLogInterfaceIp4PktsOutPass: val->v.counter64 = - pfs.pcounters[IPV4][OUT][PF_PASS]; + pfs->pcounters[IPV4][OUT][PF_PASS]; break; case LEAF_pfLogInterfaceIp4PktsOutDrop: val->v.counter64 = - pfs.pcounters[IPV4][OUT][PF_DROP]; + pfs->pcounters[IPV4][OUT][PF_DROP]; break; case LEAF_pfLogInterfaceIp6BytesIn: - val->v.counter64 = pfs.bcounters[IPV6][IN]; + val->v.counter64 = pfs->bcounters[IPV6][IN]; break; case LEAF_pfLogInterfaceIp6BytesOut: - val->v.counter64 = pfs.bcounters[IPV6][OUT]; + val->v.counter64 = pfs->bcounters[IPV6][OUT]; break; case LEAF_pfLogInterfaceIp6PktsInPass: val->v.counter64 = - pfs.pcounters[IPV6][IN][PF_PASS]; + pfs->pcounters[IPV6][IN][PF_PASS]; break; case LEAF_pfLogInterfaceIp6PktsInDrop: val->v.counter64 = - pfs.pcounters[IPV6][IN][PF_DROP]; + pfs->pcounters[IPV6][IN][PF_DROP]; break; case LEAF_pfLogInterfaceIp6PktsOutPass: val->v.counter64 = - pfs.pcounters[IPV6][OUT][PF_PASS]; + pfs->pcounters[IPV6][OUT][PF_PASS]; break; case LEAF_pfLogInterfaceIp6PktsOutDrop: val->v.counter64 = - pfs.pcounters[IPV6][OUT][PF_DROP]; + pfs->pcounters[IPV6][OUT][PF_DROP]; break; default: @@ -1286,9 +1286,10 @@ pfs_refresh(void) if (started && this_tick <= pf_tick) return (0); - bzero(&pfs, sizeof(struct pf_status)); + pfctl_free_status(pfs); + pfs = pfctl_get_status(dev); - if (ioctl(dev, DIOCGETSTATUS, &pfs)) { + if (pfs == NULL) { syslog(LOG_ERR, "pfs_refresh(): ioctl(): %s", strerror(errno)); return (-1); @@ -1755,6 +1756,9 @@ pf_fini(void) l1 = l2; } + pfctl_free_status(pfs); + pfs = NULL; + close(dev); return (0); } From nobody Sat Sep 9 13:02:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjY735MMxz4t2qX; Sat, 9 Sep 2023 13:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjY734s99z4ldD; Sat, 9 Sep 2023 13:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694264575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdc5fSTeGFS/O9AP7Lqu5QzRvHej95ksEn0F3lZJAcw=; b=Y8lLBqRc0N48KMdJzv2Gpe2N9+TV8cZayXV9L99DJ7eCXUPQ85qrcsbYxTisHr6X6UzLkc 5OxeCgLnrOGBJ5fMe8pmaERHRI6havHa+agdH45bdnzhY1Km+for6q49cLbaa1rGMKN7Cr MK7ePClCEwIPS5bJjZ9F7zIkUyMeTlW7xE+k6+DvOjh2+QSERo+cxCf3sus8VKvpEwWy4v zznZR9eUHVsyvUjrkZnL/18lvsRnVRzWJJ6j9jWn0DLEHfIfvjOG+b2cRBZfII7pTF9d0b q6SWwuQQy/MFkiINp/wbExPBGIJzcjptGI02dCCRM/o28t8paEIt+AGKGYYgBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694264575; a=rsa-sha256; cv=none; b=pG4/OOH7KdIeftboRa1rVZZwE0CT3fLufqTzpv63VPtlwNrAluHJPGmS3xDbaJ4NYAOObh OEXTtGNTgASB/ddJbKjnBWGCxTV2dAiGKePYjgwd6xg7DUnwa4JxTseeAHJA19mTNbSKa0 dPFAH9F5/hIsbdiXzahNJWoUP/8MGXe4075+irsH/R8ka5hkumjXYs2mhj+W//+efZGh1q E3FGr8Yr+rrhPLLCKZW0jmiSlDdxEbY71U4tqVOTBHFtlX0qo7af3gqJ/9XKRtFHI2NJHB qcnXjYADAk55mRctc0om+/TMsolDSgQyYtStinG7KTDm7mymjnKlrKijgyyzfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694264575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tdc5fSTeGFS/O9AP7Lqu5QzRvHej95ksEn0F3lZJAcw=; b=RKfIDMgyBad6/ABOPqhkQomVbTBjX/529hvVx/EZnc0WmobG9YUJl93oMJRYDZqD1jIQh+ 3CXX38fSXa8urL+ylb+oq7R7o8UqkbIEG8f8MtME2Rge6IVVmO8A+pAIaunEXZ5hCo2Ccc IPozINeUTYBCp+mxqJdglFksqUnTbi8t5fwy9TKDM1ArpXx8vYPigN9R7c3t6AaHfD4CwU pFKU/c1b0oBgb7cJU78zs+RuISlAeIizeqJVgnEDeJWsGvM1ZvwJHqZQNW6YIJKZCEuG65 UaFibJvK0Ge5h3oAGPuzcZwtArSgjqfq2mbNeG9k9LnvXvBALnNEJumrccBlSA== 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 4RjY733vWYzB2V; Sat, 9 Sep 2023 13:02:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389D2tZE017369; Sat, 9 Sep 2023 13:02:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389D2t4D017366; Sat, 9 Sep 2023 13:02:55 GMT (envelope-from git) Date: Sat, 9 Sep 2023 13:02:55 GMT Message-Id: <202309091302.389D2t4D017366@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: 55b7a8233e3d - stable/14 - mana: batch ringing RX queue doorbell on receiving packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 55b7a8233e3da9355d555dff80011a97fac23079 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=55b7a8233e3da9355d555dff80011a97fac23079 commit 55b7a8233e3da9355d555dff80011a97fac23079 Author: Wei Hu AuthorDate: 2023-08-28 09:15:16 +0000 Commit: Wei Hu CommitDate: 2023-09-09 12:51:57 +0000 mana: batch ringing RX queue doorbell on receiving packets It's inefficient to ring the doorbell page every time a WQE is posted to the received queue. Excessive MMIO writes result in CPU spending more time waiting on LOCK instructions (atomic operations), resulting in poor scaling performance. Move the code for ringing doorbell page to where after we have posted all WQEs to the receive queue in mana_poll_rx_cq(). In addition, use the correct WQE count for ringing RQ doorbell. The hardware specification specifies that WQE_COUNT should set to 0 for the Receive Queue. Although currently the hardware doesn't enforce the check, in the future releases it may check on this value. Tested by: whu MFC after: 1 week Sponsored by: Microsoft (cherry picked from commit e4e11c1d07f5d58ff8cf4e07ac8f61eecbbb5417) --- sys/dev/mana/gdma_main.c | 2 +- sys/dev/mana/mana_en.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index 2de606d54957..a601873876cb 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -471,7 +471,7 @@ void mana_gd_wq_ring_doorbell(struct gdma_context *gc, struct gdma_queue *queue) { mana_gd_ring_doorbell(gc, queue->gdma_dev->doorbell, queue->type, - queue->id, queue->head * GDMA_WQE_BU_SIZE, 1); + queue->id, queue->head * GDMA_WQE_BU_SIZE, 0); } void diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 49558cdc97c6..fa49e06e4862 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -1524,7 +1524,7 @@ mana_post_pkt_rxq(struct mana_rxq *rxq) recv_buf_oob = &rxq->rx_oobs[curr_index]; - err = mana_gd_post_and_ring(rxq->gdma_rq, &recv_buf_oob->wqe_req, + err = mana_gd_post_work_request(rxq->gdma_rq, &recv_buf_oob->wqe_req, &recv_buf_oob->wqe_inf); if (err) { mana_err(NULL, "WARNING: rxq %u post pkt err %d\n", @@ -1757,6 +1757,13 @@ 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 Sat Sep 9 13:37:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjYvM2QRsz4sQm2; Sat, 9 Sep 2023 13:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjYvM1yltz3C4x; Sat, 9 Sep 2023 13:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694266671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poT3hJbcoVv4v4RKxU3pOXIj5L5am7w3JfWByntEfss=; b=D6MJiZmRPr5YLlmNyd97K1opdY6nVTjTs/TgI81D8l6HdD75/ns3NtFSwMcYNYKmFY2+yH gBvYixiHOgrRuZ99vc9G1sQEK1eVgXy0TVumkmgwfORU4eKIimZfAshEg5A67905Gii67/ yAF94FiKg5UfkReMv/yQB7kg7jEl7ckbqQZApHSrPppOZxrb+G3aOM7rlUO5pazUXyUQ52 8Sx0HBfE4o5Xx7Qky7tOswszD1sEsUT8Mztcytjirt1Ff4cx8aCA0Qp8de4i1ms+9EJdAV otCedGRrmQ2a6nJZz637fWDAajim5kjrxq3TsYeyPJjV/m+vgpMELzKBU0RTMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694266671; a=rsa-sha256; cv=none; b=yaUMjza39PCWV0eMRQ0WcFrBWFGzRvaI6nE/N3x0A2I14XWmlRk0KrW7L4Vrqk2EhtgV3b VomPaWgp6ueGUE0qJBf1oXXjvbbMsAQoVzgTQE/vFAt8SUq09Ircy75FexbLd4fpcN7ZCR NHMrJMfA/VYa48aElqqSZ6I4rCP3lenWbJpcWyK80MPv2lOdh3N80T2ynpi1AWHEj7LNx1 bnO2aUDtKlGLVM4rHhR/DI3GvW/koqZpdaj6j4ia1f3m5mXnRXzcjSDx7j4fWZ+KmCm1cQ RxVhXUjonFpTfFoJQ4gtWgfsJjgmtCZbVUWUVdlk6SuWANtURwbKJKXjMkHzEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694266671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=poT3hJbcoVv4v4RKxU3pOXIj5L5am7w3JfWByntEfss=; b=GejfqUxEqkP9fVldr7kev6iToVi0aP6Zj9GLf+qKizM7b8rwSDU/fBBFeU26VwDBdomcuM Mjnc5f/Gme+EeIuarVw6DyI9u1vIGdJsvkrazaDwGF6QCI6bAbrgG062Yq3VS3j/uZxIEK NsoX3Qc5eSmmKkoowVuZJNpaqg2J0fnVKjM0Gq/8rJloDapuHpM3clP50l7NBzfDLkghZS PY4Q+VMYB8P2r/WzfZFwVYw4IfDNpOwNVz6wIZSY5FN46of5YE/fI5rF0umVyVD+ZQyA4m yhwyUfS+lVmPI6AAk/SdsNlsGB8l6A1Pv7c7G50xByQYXKYqK1FREo1NwBmn7A== 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 4RjYvM0YjRzBS6; Sat, 9 Sep 2023 13:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389DboEq067122; Sat, 9 Sep 2023 13:37:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389Dbot8067119; Sat, 9 Sep 2023 13:37:50 GMT (envelope-from git) Date: Sat, 9 Sep 2023 13:37:50 GMT Message-Id: <202309091337.389Dbot8067119@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: 63a564508b1a - releng/14.0 - mana: batch ringing RX queue doorbell on receiving packets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 63a564508b1a4247386cd77d44b679fcdc0436bb Auto-Submitted: auto-generated The branch releng/14.0 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=63a564508b1a4247386cd77d44b679fcdc0436bb commit 63a564508b1a4247386cd77d44b679fcdc0436bb Author: Wei Hu AuthorDate: 2023-08-28 09:15:16 +0000 Commit: Wei Hu CommitDate: 2023-09-09 13:27:03 +0000 mana: batch ringing RX queue doorbell on receiving packets It's inefficient to ring the doorbell page every time a WQE is posted to the received queue. Excessive MMIO writes result in CPU spending more time waiting on LOCK instructions (atomic operations), resulting in poor scaling performance. Move the code for ringing doorbell page to where after we have posted all WQEs to the receive queue in mana_poll_rx_cq(). In addition, use the correct WQE count for ringing RQ doorbell. The hardware specification specifies that WQE_COUNT should set to 0 for the Receive Queue. Although currently the hardware doesn't enforce the check, in the future releases it may check on this value. Approved by: re (gjb) Sponsored by: Microsoft (cherry picked from commit e4e11c1d07f5d58ff8cf4e07ac8f61eecbbb5417) (cherry picked from commit 55b7a8233e3da9355d555dff80011a97fac23079) --- sys/dev/mana/gdma_main.c | 2 +- sys/dev/mana/mana_en.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index 2de606d54957..a601873876cb 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -471,7 +471,7 @@ void mana_gd_wq_ring_doorbell(struct gdma_context *gc, struct gdma_queue *queue) { mana_gd_ring_doorbell(gc, queue->gdma_dev->doorbell, queue->type, - queue->id, queue->head * GDMA_WQE_BU_SIZE, 1); + queue->id, queue->head * GDMA_WQE_BU_SIZE, 0); } void diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index 49558cdc97c6..fa49e06e4862 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -1524,7 +1524,7 @@ mana_post_pkt_rxq(struct mana_rxq *rxq) recv_buf_oob = &rxq->rx_oobs[curr_index]; - err = mana_gd_post_and_ring(rxq->gdma_rq, &recv_buf_oob->wqe_req, + err = mana_gd_post_work_request(rxq->gdma_rq, &recv_buf_oob->wqe_req, &recv_buf_oob->wqe_inf); if (err) { mana_err(NULL, "WARNING: rxq %u post pkt err %d\n", @@ -1757,6 +1757,13 @@ 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 Sat Sep 9 13:52:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjZDG53ztz4sZwb; Sat, 9 Sep 2023 13:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjZDG3T1vz3HQM; Sat, 9 Sep 2023 13:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694267550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXOEaEGKa5bN/NmjnHgj0GLs4br8YblIV7H5s6Ivt/E=; b=aHuPXGvYIZz8IbVetCL4FhR9IztHFOSheC+DY6DYRMcF4t0i4OShSP8JNdaKyrf9N5HUHR x/BfZ5Bxz+fvItOP0qHVRhdfBYQ63yEIAiW0f9jzHvIFpxGuK3vTLoN4inmwA31AF1ZI1T ucBd00QR1SXCPhHjq/cDkxAboB5Wh/xdUgdkXIY/6oBIRoqvSJ4xJ6akNQWpgJkyJjsXWc +Bq5dYmpNzxAOcBHXHoqqDNmWzgFgSztdcCYXtfnivNIhXwx+5HssPX38NbUNHPxV40mcH KN0ZYcb9gBLPZPRK2aYbbtAyHP/bVh1g1jLLsPGR2IiVPq8KqbcrZDRAs3hhTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694267550; a=rsa-sha256; cv=none; b=vk6/e3B2S+Jx4kY3Gv+R9nV31pvz/6Ppzvvdk0nuW5bNLicq9IB5SXOkPyjyjl7WDS7Hhm WW8aJVLQS2WL+ZB5KzPrns6CZ8GTHj6mAXsr6thKgB82plZkfRbWvzbFFFEVybijLrqyBr IbSIPv4qSzBg3Xaz4mzieShxjj08j+9250GAoLZhcbtS/iHSaQ2/WqKa7c4Smky3R9B5Rk NPkCKLoGZJyS8Y/3MpkmorMfxysFsythXBzRrrjQALWxswjRTDXlYf8725nHJ1MGAXEYCE mdKcb5yI27S3/0Yqbb480ayMxP3vbt5TDICvEqr4csNJM6iPb2zc+LH4V2TN3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694267550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZXOEaEGKa5bN/NmjnHgj0GLs4br8YblIV7H5s6Ivt/E=; b=cxXaVEWJHJizjB66QowIZWy3mojnSISZ+GOjXQdrQ74vn6nnRxz7nQziDCLtcbTqKXXUmk LwKKgWgzWCt0TgdZCQ7PAjsVQD2q1yM1vzmLgtxzF6vMjkVAHW568W63dByd6Ol5gsOt0Z shVdDcnkuw3I9KPogRjDJX3VPvmCs/qS7mIucDBRDs8ayyqsZXVIpVHGkwSS0QZ5Ru+Qxf b/pgz+D+Yd/8d48EsfXUobEZhaQOHuuJ7hLOOtyNzX8yVFRXN6LB8ZBaRYtVL2sTgQT+CY 2GkNVNsbpqiTt4M8rcmmcq9T4Lt8Y6y/jOb0fV/kvQLpD7rZY7Dz3/6SZeXxfA== 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 4RjZDG2QJkzBj3; Sat, 9 Sep 2023 13:52:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389DqUL0000097; Sat, 9 Sep 2023 13:52:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389DqU8Q000094; Sat, 9 Sep 2023 13:52:30 GMT (envelope-from git) Date: Sat, 9 Sep 2023 13:52:30 GMT Message-Id: <202309091352.389DqU8Q000094@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: c9b4782ec336 - stable/14 - Hyper-V: hn: use VF's capabilities when it is attached List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c9b4782ec336c122d8ede81be0823969e0748332 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b4782ec336c122d8ede81be0823969e0748332 commit c9b4782ec336c122d8ede81be0823969e0748332 Author: Wei Hu AuthorDate: 2023-09-04 10:15:06 +0000 Commit: Wei Hu CommitDate: 2023-09-09 13:43:59 +0000 Hyper-V: hn: use VF's capabilities when it is attached Current code in hn/netvsc tries to merge (logical AND) VF and its own capability bits when a VF is attached. This results in losing some key VF features, especially in tx path. For example, the VF's txcsum, rxcsum or tso bits could be lost if any of these are not in hn/netvsc's own capablility field. Actually when VF is attached, hn just needs to use VF's caps as all the tx packets would be forwarded to the VF interface. Fix this problem by doing so. Reported by: whu Tested by: whu MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 289ba6b870f79d8dbd9e8022c4fa23469be11a73) --- sys/dev/hyperv/netvsc/if_hn.c | 63 +++++++--------------------------------- sys/dev/hyperv/netvsc/if_hnvar.h | 2 ++ 2 files changed, 13 insertions(+), 52 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index 206a35f7bac8..7d8e1914163e 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -1261,60 +1261,21 @@ hn_ifaddr_event(void *arg, if_t ifp) } static int -hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr) +hn_xpnt_vf_iocsetcaps(struct hn_softc *sc, struct ifreq *ifr __unused) { if_t ifp, vf_ifp; - uint64_t tmp; - int error; HN_LOCK_ASSERT(sc); ifp = sc->hn_ifp; vf_ifp = sc->hn_vf_ifp; /* - * Fix up requested capabilities w/ supported capabilities, - * since the supported capabilities could have been changed. - */ - ifr->ifr_reqcap &= if_getcapabilities(ifp); - /* Pass SIOCSIFCAP to VF. */ - error = ifhwioctl(SIOCSIFCAP, vf_ifp, (caddr_t)ifr, curthread); - - /* - * NOTE: - * The error will be propagated to the callers, however, it - * is _not_ useful here. - */ - - /* - * Merge VF's enabled capabilities. + * Just sync up with VF's enabled capabilities. */ - if_setcapenable(ifp, if_getcapenable(vf_ifp) & if_getcapabilities(ifp)); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & HN_CSUM_IP6_HWASSIST(sc); - if (if_getcapenable(ifp) & IFCAP_TXCSUM_IPV6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); + if_setcapenable(ifp, if_getcapenable(vf_ifp)); + if_sethwassist(ifp, if_gethwassist(vf_ifp)); - tmp = if_gethwassist(vf_ifp) & CSUM_IP_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO4) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - tmp = if_gethwassist(vf_ifp) & CSUM_IP6_TSO; - if (if_getcapenable(ifp) & IFCAP_TSO6) - if_sethwassistbits(ifp, tmp, 0); - else - if_sethwassistbits(ifp, 0, tmp); - - return (error); + return (0); } static int @@ -1698,6 +1659,8 @@ hn_xpnt_vf_setready(struct hn_softc *sc) sc->hn_saved_tsomax = if_gethwtsomax(ifp); sc->hn_saved_tsosegcnt = if_gethwtsomaxsegcount(ifp); sc->hn_saved_tsosegsz = if_gethwtsomaxsegsize(ifp); + sc->hn_saved_capenable = if_getcapenable(ifp); + sc->hn_saved_hwassist = if_gethwassist(ifp); /* * Intersect supported/enabled capabilities. @@ -2017,18 +1980,14 @@ hn_ifnet_detevent(void *xsc, if_t ifp) * The VF was ready; restore some settings. */ if_setcapabilities(ifp, sc->hn_saved_caps); - /* - * NOTE: - * There is _no_ need to fixup if_capenable and - * if_hwassist, since the if_capabilities before - * restoration was an intersection of the VF's - * if_capabilites and the synthetic device's - * if_capabilites. - */ + if_sethwtsomax(ifp, sc->hn_saved_tsomax); if_sethwtsomaxsegcount(sc->hn_ifp, sc->hn_saved_tsosegcnt); if_sethwtsomaxsegsize(ifp, sc->hn_saved_tsosegsz); + + if_setcapenable(ifp, sc->hn_saved_capenable); + if_sethwassist(ifp, sc->hn_saved_hwassist); } if (sc->hn_flags & HN_FLAG_SYNTH_ATTACHED) { diff --git a/sys/dev/hyperv/netvsc/if_hnvar.h b/sys/dev/hyperv/netvsc/if_hnvar.h index 0d8ed6bdef19..f46adcbf9245 100644 --- a/sys/dev/hyperv/netvsc/if_hnvar.h +++ b/sys/dev/hyperv/netvsc/if_hnvar.h @@ -277,6 +277,8 @@ struct hn_softc { u_int hn_saved_tsomax; u_int hn_saved_tsosegcnt; u_int hn_saved_tsosegsz; + u_int hn_saved_capenable; + u_int hn_saved_hwassist; /* * RSC switch, default off From nobody Sat Sep 9 14:06:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjZWt2jq5z4skLd; Sat, 9 Sep 2023 14:06: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjZWt2GQjz3LWS; Sat, 9 Sep 2023 14:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694268362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfkz2gCPpK2reuqYuEaex8BzYPDSX6Qacdkk+fSzSsg=; b=tD3g9yLnRWiX5dDYgjjRu/eMp9h9lCtZUqWn5e/cy6eXjv89z7myu5dfIXTg7rBioM5Kae K8MnEGZxjm/2LuQAHnqACNByWwy1nrFSVoSH7Ulkyz3YChDsoGsdX+YcuIYPbR4qUASLyg /czr8kZOXAhpdkI6M4O9fs9FTByl/dkvAKPxxAIX+4GwIqcPEj4gELpwOYVe8DqVZSfZko xNGeaQlCEGs9OcY2hd73MEC5q98v/xrAChZHlg6m3tpKdl/OIFhNlrTdRkI9cwa9+TK7oi /DsZyhhyXRNmRiTtV9yGxtaGNZLBoT+GcbyB+sdQ3XNt0YRT6pBoX1h96y1Beg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694268362; a=rsa-sha256; cv=none; b=F1+jvWdqRkzjN0qKXAAqx1p0ncANoFVJzXfPwr69FXVA1tg+vDd9qyJ/jJNyfmrV/wnGUi apG3s1iRZAN0F5NlzOmcnFdhoB5hDpqykX0BcdiTqQB04JlIJuNfwuhMbOV46QCCZKD0WJ 6WyBzHklEnp5315ljn38f5CH2y5Ouc+qOAQ16VdIvQvPnTzcWyWrYePA5oePOaMAZcZfeY 78MCcvtUZJlIEM9JFpfhLsbyHKW1AsPOkUOQA8b0Ui0rOmbEaOizgIq14n1th4Aq7J7VCT UdhLJ32WLmQLrzy+uo//ivDwdLupX3JnpoCkHJWzEwLH3GfNAa/ykKSsCEOIOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694268362; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gfkz2gCPpK2reuqYuEaex8BzYPDSX6Qacdkk+fSzSsg=; b=HWngJprdnb9Ytl6GNS9Ez5j1+IFaN8LlL1PS2L7//LD7c5u5d6jiuqjqdyfvTW5KenE1AM cgisaDdBHw/UcpEWxkmfmP82RrUZka7srbneDcaKwb2fmjaKgm04X762xcuaGJcBDgEwVi ieiSZkUzbqu6oME+PMFEAqDnJ5uzvQkPE1x4roYE6EttLLqI4RlBLUsswdskdGHekMqXi3 CRSGzfnQa+cbX1kIbXPw+r6FJRaH0+l7Em0NRaZi5MZxlQCDxk3WIlv135s8xbPWCOrkgS 1hheBPhvDY95ZcotRw/xrDNHeHFg8MlUvco1w1JabwxAm4vOlpq7yVh+Zl8wQA== 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 4RjZWt16BXzCSS; Sat, 9 Sep 2023 14:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389E62Sp017649; Sat, 9 Sep 2023 14:06:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389E62tJ017646; Sat, 9 Sep 2023 14:06:02 GMT (envelope-from git) Date: Sat, 9 Sep 2023 14:06:02 GMT Message-Id: <202309091406.389E62tJ017646@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: 4b22565f8598 - stable/14 - mana: fix tso parameters and set hwassist bits List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4b22565f8598f2890d41e179fd36a0845f781262 Auto-Submitted: auto-generated The branch stable/14 has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=4b22565f8598f2890d41e179fd36a0845f781262 commit 4b22565f8598f2890d41e179fd36a0845f781262 Author: Wei Hu AuthorDate: 2023-09-04 14:53:10 +0000 Commit: Wei Hu CommitDate: 2023-09-09 13:57:50 +0000 mana: fix tso parameters and set hwassist bits The parameters for tso on mana were not set correctly. Also the hwassist bits were not set. These two cause tso on mana not work. Fixed the issues and make tso working on mana. Tested by: whu MFC after: 3 days Sponsored by: Microsoft (cherry picked from commit 643fd7b4bc57de87ddfeb75a8f0bdb27dbb8c3ce) --- sys/dev/mana/mana.h | 1 + sys/dev/mana/mana_en.c | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sys/dev/mana/mana.h b/sys/dev/mana/mana.h index df527df10296..9a22ea87baa3 100644 --- a/sys/dev/mana/mana.h +++ b/sys/dev/mana/mana.h @@ -186,6 +186,7 @@ struct mana_txq { */ #define MAX_MBUF_FRAGS 30 #define MANA_TSO_MAXSEG_SZ PAGE_SIZE +#define MANA_TSO_MAX_SZ IP_MAXPACKET /* mbuf data and frags dma mappings */ struct mana_mbuf_head { diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c index fa49e06e4862..56fa4e51ba26 100644 --- a/sys/dev/mana/mana_en.c +++ b/sys/dev/mana/mana_en.c @@ -798,8 +798,7 @@ mana_init_port_context(struct mana_port_context *apc) uint32_t tso_maxsize; int err; - tso_maxsize = MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN); + tso_maxsize = MANA_TSO_MAX_SZ; /* Create DMA tag for tx bufs */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ @@ -2712,6 +2711,7 @@ mana_probe_port(struct mana_context *ac, int port_idx, { struct gdma_context *gc = ac->gdma_dev->gdma_context; struct mana_port_context *apc; + uint32_t hwassist; if_t ndev; int err; @@ -2774,11 +2774,21 @@ mana_probe_port(struct mana_context *ac, int port_idx, if_setcapenable(ndev, if_getcapabilities(ndev)); /* TSO parameters */ - if_sethwtsomax(ndev, MAX_MBUF_FRAGS * MANA_TSO_MAXSEG_SZ - + if_sethwtsomax(ndev, MANA_TSO_MAX_SZ - (ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN)); if_sethwtsomaxsegcount(ndev, MAX_MBUF_FRAGS); if_sethwtsomaxsegsize(ndev, PAGE_SIZE); + hwassist = 0; + if (if_getcapenable(ndev) & (IFCAP_TSO4 | IFCAP_TSO6)) + hwassist |= CSUM_TSO; + if (if_getcapenable(ndev) & IFCAP_TXCSUM) + hwassist |= (CSUM_TCP | CSUM_UDP | CSUM_IP); + if (if_getcapenable(ndev) & IFCAP_TXCSUM_IPV6) + hwassist |= (CSUM_UDP_IPV6 | CSUM_TCP_IPV6); + mana_dbg(NULL, "set hwassist 0x%x\n", hwassist); + if_sethwassist(ndev, hwassist); + ifmedia_init(&apc->media, IFM_IMASK, mana_ifmedia_change, mana_ifmedia_status); ifmedia_add(&apc->media, IFM_ETHER | IFM_AUTO, 0, NULL); From nobody Sat Sep 9 14:13:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjZj06BCNz4spSr; Sat, 9 Sep 2023 14:13:56 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjZj05kjtz3NpP; Sat, 9 Sep 2023 14:13:56 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694268836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GDvGDk/QaXmyusErHICrMEDARA6phzrBGIV7VddHhMA=; b=gOpMjkfeOzCgWasdiyzeDdCmufGHfD0qXA3ko8uFl8IxdbS9uRg9Nq2ue4z8X7AGl8B36Q 0bGdb9ro/t8RF3fvbBK0k73e3l24eeoiincuM2WGNLHscRkeKOtEIwkOLBm+DBshtAQXsF bcwa9hJLt5ZcWhihjiVO6GpE2hrpGJSp8iLm55gM3hyzX/1dFYIOQ+YZzDF69UR8ibKmnr ZyAjgrwXh5AbDPc9xlujGvOIvN/aRvE3mnYWKs1mpt1dgDkw/hOTmqSxOKTxb4bu1vggu4 B5VSrqZ4Wzs3snAcrLhFbZQMwh/8YLR57AkbFD0DTWh75t9UUHeBgDKHObQvMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694268836; a=rsa-sha256; cv=none; b=fZOWW6E8PZqfY6gOEqNtvXEQMK6PD2TzmwffODXALcWgqaxueRfflg9ngTOpGgtxnL/R0j ywgWek3pzW4wVbrFQPMmhwRbmKJTj2FREOw+u/8DFl06FIQcBW5padUzu1ivDEqdK0yyFD 1o5onVvC0extsuqiLbqUJdFZ4DvVdFGc6UJTjuMsnS1QW60yuSSQKSzIDoqO/chk3X2PXW ApfkApcfE/E5JFUp5TP04Hi7Mc8yt5oJ5vpA1GATD3hCUtYufqGF5p8qFpHNiKt9rQDjQ5 YTB789DC+mp420Cg0YZZVrgLVr/j93E8/1s8sfk/geTuJtQq7HCw1hM7URPrwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694268836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=GDvGDk/QaXmyusErHICrMEDARA6phzrBGIV7VddHhMA=; b=gb+hPaxlOjGaErrbZgn//1M8WUODSKVoT3tsyRt2JozITjbgQfKBj9jEjnPlTOdt++kZdu pr7S91kUz/+JZE/UrNywqO3RHS3Y3rDjGhFYMYDx0j3yQJj/y1oh997saaZI2BNizEx2iU iyTpBirYRHkOZf+ziTr5XoVjVdmBa9ZsAbeEhFdFpS5UG/8bNaBC4JQ1VJKiEHtGtBBrY6 bkYRD1m1dKcH2uoOh0hAqHa7DiO8AN9X2vi8xIwf/p8aUxs9mj0SLNp/fJcbK/NXRzSBmO tE217pqL7qgLdguuerjWh2sIrC+HHvlBYQ0ukvjCnXjHOWRpgI/hanQvjrfrHQ== Received: from smtpclient.apple (unknown [IPv6:2001:19f0:6001:9db:98f0:9fe0:3545:10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RjZhy58Yqz17Sj; Sat, 9 Sep 2023 14:13:54 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: Content-Type: multipart/alternative; boundary="Apple-Mail=_CD835773-8AD4-41BF-9806-5410F5B78A3A" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 1926d5cef6ea - main - init_main: Record completed SYSINITs Date: Sat, 9 Sep 2023 22:13:46 +0800 In-Reply-To: Cc: Colin Percival , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Brooks Davis References: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> <5BC96D9F-E4C4-4D34-B7B3-41576AD296DA@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) --Apple-Mail=_CD835773-8AD4-41BF-9806-5410F5B78A3A Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Sep 8, 2023, at 2:19 AM, Brooks Davis wrote: >=20 > On Wed, Sep 06, 2023 at 06:46:59PM -0700, Colin Percival wrote: >> On 9/6/23 18:12, Zhenlei Huang wrote: >>>> On Sep 7, 2023, at 2:37 AM, Colin Percival = wrote: >>>> init_main: Record completed SYSINITs >>>>=20 >>>> When removing them from sysinit_list, append them to = sysinit_done_list; >>>> print this list from 'show sysinit' along with the list of = future >>>> sysinits. >>>=20 >>> So the `sysinit_done_list` is for DDB only. >>=20 >> Well... sort of. You can open up kgdb and run 'p sysinit_done_list'. >>=20 >>>> static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; >>>> +static struct sysinitlist sysinit_done_list =3D >>>> + STAILQ_HEAD_INITIALIZER(sysinit_done_list); >>>=20 >>> Then it should be wrapped around with #ifdef DDB and #endif >> I considered that, but since we're literally talking about 2 pointers = of >> memory I figured it wasn't worth making it conditional. >=20 > IMO loss of the run order in a dump was a (minor) regression so this > should be unconditionally available. No, we do NOT loss the run order. Given a kernel dump, we known its git commit hash, then the order of all = sysinit is determined, unless we have non-stable sort of sysinits. That is somewhat not as flexible as previous sysinit array, or current = `sysinit_done_list`. So IMO `sysinit_done_list` is still useful only for debugging, either = DDB or kgdb. >=20 > -- Brooks Best regards, Zhenlei --Apple-Mail=_CD835773-8AD4-41BF-9806-5410F5B78A3A Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Sep 8, 2023, at 2:19 AM, Brooks Davis <brooks@freebsd.org> = wrote:

On Wed, Sep 06, 2023 at 06:46:59PM -0700, Colin Percival = wrote:
On = 9/6/23 18:12, Zhenlei Huang wrote:
On Sep 7, 2023, at 2:37 = AM, Colin Percival <cperciva@FreeBSD.org> wrote:
   init_main: Record completed SYSINITs

   When removing them from = sysinit_list, append them to sysinit_done_list;
   print this list from 'show sysinit' along = with the list of future
   sysinits.

So the `sysinit_done_list` is for = DDB only.

Well... sort of. =  You can open up kgdb and run 'p sysinit_done_list'.

static STAILQ_HEAD(sysinitlist, sysinit) = sysinit_list;
+static struct sysinitlist sysinit_done_list = =3D
+ =    STAILQ_HEAD_INITIALIZER(sysinit_done_list);

Then it should be wrapped around = with #ifdef DDB and #endif
I considered that, = but since we're literally talking about 2 pointers of
memory= I figured it wasn't worth making it conditional.

IMO loss of the run order in a dump was a (minor) regression = so this
should be = unconditionally available.

No, we do NOT loss the run order.

Given a kernel dump, we known its git commit hash, = then the order of all sysinit is determined, unless
we have = non-stable sort of sysinits.

That is somewhat not as flexible as = previous sysinit array, or current = `sysinit_done_list`.

So IMO `sysinit_done_list` is = still useful only for debugging, either DDB or kgdb.


-- = Brooks

Best regards,
Zhenlei

= --Apple-Mail=_CD835773-8AD4-41BF-9806-5410F5B78A3A-- From nobody Sat Sep 9 14:25:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjZyh1cQwz4swwp; Sat, 9 Sep 2023 14:25:48 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjZyh19Y5z3RpW; Sat, 9 Sep 2023 14:25:48 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694269548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8nOX1HnKmktAJPhYdXT4bn7yKMgHoWWLMivI7OApijY=; b=Muti3JyfUVTNxNg2K66GebPn5FUA/NY/bUP5d0AVoY/bhlx/QtcubEFJSK+Yc5Qa9AxjAP GZA4KnnpuX8P9V/9YKY+h54tXrzk4fHnyNVQl9F2IuRTL7n30LObubL/oKGY5bjrfpAuFh 1GD8/jDmAOV+TDpAj1KRBYGQBN+49Rq56wS0EBG1oijsaAQEOttBTewIojyq3qd8IJ/ZSv 1eun8/xnVEfrZ6diSqCnfP0FMRuc9NS7Efcih+nOg6pITLnS5pDTVJdeLX7GHi/W+pC3zx ni3hm9V1Zf4dGsIFA8mUlkhmaoMMCmrnff7swiynFeSaoceCku7GKTB4pvC3PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694269548; a=rsa-sha256; cv=none; b=ru0mhRm3YEi/5ZFRmYFamxRwcwMkCOMFkLYd6VXv2st1tjT4h7vOK3ixgCqYWq1IsrgfTA BhoMw0lNxD9nTDmzKf4LKp9QQvY2YXnP6v/IjSVCuJAwzf3N1SkOncrSFxiikU28MIdvtf X5si17pj9Xvu2/gZr6XuocVy+W8XETnz+BgMCvazLH/G7GjizGA6KxIp3UoWfvaeLuxFui kLxzLBYJ89+lbeO08QBFg1qp2lkYh7v+6U867P1I2X1uhwTCBVH50ihjP2cQUQCH8NFVjF zCkBhpfpw/68us92eP471N/p2xtx0XWQeDmPYSYUdWDIpb1rLPLpzXutiULU2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694269548; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8nOX1HnKmktAJPhYdXT4bn7yKMgHoWWLMivI7OApijY=; b=Q9NiS63gSrdVFdXaaYuXsygrhv13dQb6Zt1H1K3xHJliDpqQ8n7x5Q1TXHmotewPmaP3+E 9lew46N1M7z+wHnPvajvpJvRC03nKwq4pYEe6MdG+F2/9xt2UHzYnnDDQtNBL0NpNxJrxi eyERgOd+vDDhS5ZhOf/MUv9mfMqs+/mWA8+3MgN66Ij0kzPzTf6jMiDnRYGZqT/AAFdeXI nhlp/c4s/w71sGT0w6QqzywPtNKeQBQyuBuSUjfZ4ij6Hqryx1fIY4oBDMC20coRmPhh1U BvixEslTYlMuIq61tbIqsioivfXZl9dx7DkPVlK+SlzUhcYPjefd62+b/G+38Q== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RjZyf0pL8z17w6; Sat, 9 Sep 2023 14:25:45 +0000 (UTC) (envelope-from zlei@FreeBSD.org) From: Zhenlei Huang Message-Id: <095B47B6-A6EE-4AC7-A91B-3E12E72B0CE6@FreeBSD.org> Content-Type: multipart/alternative; boundary="Apple-Mail=_4172FBA6-63CD-4596-B5A3-95D6667CC331" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 1926d5cef6ea - main - init_main: Record completed SYSINITs Date: Sat, 9 Sep 2023 22:25:39 +0800 In-Reply-To: Cc: Colin Percival , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Brooks Davis References: <202309061837.386Ib5AK086264@gitrepo.freebsd.org> <5BC96D9F-E4C4-4D34-B7B3-41576AD296DA@FreeBSD.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) --Apple-Mail=_4172FBA6-63CD-4596-B5A3-95D6667CC331 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Sep 9, 2023, at 10:13 PM, Zhenlei Huang wrote: >=20 >=20 >=20 >> On Sep 8, 2023, at 2:19 AM, Brooks Davis > wrote: >>=20 >> On Wed, Sep 06, 2023 at 06:46:59PM -0700, Colin Percival wrote: >>> On 9/6/23 18:12, Zhenlei Huang wrote: >>>>> On Sep 7, 2023, at 2:37 AM, Colin Percival > wrote: >>>>> init_main: Record completed SYSINITs >>>>>=20 >>>>> When removing them from sysinit_list, append them to = sysinit_done_list; >>>>> print this list from 'show sysinit' along with the list of = future >>>>> sysinits. >>>>=20 >>>> So the `sysinit_done_list` is for DDB only. >>>=20 >>> Well... sort of. You can open up kgdb and run 'p = sysinit_done_list'. >>>=20 >>>>> static STAILQ_HEAD(sysinitlist, sysinit) sysinit_list; >>>>> +static struct sysinitlist sysinit_done_list =3D >>>>> + STAILQ_HEAD_INITIALIZER(sysinit_done_list); >>>>=20 >>>> Then it should be wrapped around with #ifdef DDB and #endif >>> I considered that, but since we're literally talking about 2 = pointers of >>> memory I figured it wasn't worth making it conditional. >>=20 >> IMO loss of the run order in a dump was a (minor) regression so this >> should be unconditionally available. >=20 > No, we do NOT loss the run order. >=20 > Given a kernel dump, we known its git commit hash, then the order of = all sysinit is determined, unless > we have non-stable sort of sysinits. >=20 > That is somewhat not as flexible as previous sysinit array, or current = `sysinit_done_list`. >=20 > So IMO `sysinit_done_list` is still useful only for debugging, either = DDB or kgdb. Think about it twice. End user may have custom kernel config. It can be = much useful when this system=20 has buggy sysinit order (not caught during dev / test), then a = `sysinit_done_list` can ease the debugging greatly.=20 >=20 >>=20 >> -- Brooks >=20 > Best regards, > Zhenlei --Apple-Mail=_4172FBA6-63CD-4596-B5A3-95D6667CC331 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=us-ascii

On Sep 9, 2023, at 10:13 PM, Zhenlei Huang <zlei@FreeBSD.org> = wrote:



On Sep 8, 2023, at 2:19 AM, = Brooks Davis <brooks@freebsd.org> wrote:

On Wed, Sep 06, 2023 at = 06:46:59PM -0700, Colin Percival wrote:
On 9/6/23 18:12, Zhenlei Huang wrote:
On Sep 7, = 2023, at 2:37 AM, Colin Percival <cperciva@FreeBSD.org> wrote:
   init_main: Record completed SYSINITs

   When removing them from = sysinit_list, append them to sysinit_done_list;
   print this list from 'show sysinit' along = with the list of future
   sysinits.

So the `sysinit_done_list` is for = DDB only.

Well... sort of. =  You can open up kgdb and run 'p sysinit_done_list'.

static STAILQ_HEAD(sysinitlist, sysinit) = sysinit_list;
+static struct sysinitlist sysinit_done_list = =3D
+ =    STAILQ_HEAD_INITIALIZER(sysinit_done_list);

Then it should be wrapped around = with #ifdef DDB and #endif
I considered that, = but since we're literally talking about 2 pointers of
memory= I figured it wasn't worth making it conditional.

IMO = loss of the run order in a dump was a (minor) regression so = this
should = be unconditionally available.

No, we do NOT loss the run = order.

Given a = kernel dump, we known its git commit hash, then the order of all sysinit = is determined, unless
we have non-stable sort = of sysinits.

That is somewhat not as flexible as previous sysinit array, or = current `sysinit_done_list`.

So IMO `sysinit_done_list` is still useful only for debugging, either DDB = or kgdb.

Think about it twice. End = user may have custom kernel config. It can = be much useful when this system 
has buggy sysinit order = (not caught during dev / test), then a `sysinit_done_list` can ease the = debugging
greatly. 



-- = Brooks

Best regards,
Zhenlei



= --Apple-Mail=_4172FBA6-63CD-4596-B5A3-95D6667CC331-- From nobody Sat Sep 9 15:09:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjbxW2TYLz4sPXJ; Sat, 9 Sep 2023 15:09: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjbxW206Dz3fxn; Sat, 9 Sep 2023 15:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kMQeARALGvDpBi43y7D2gISFg+YKDfaicqdLO6Rbl9w=; b=tDFPzFWMsrDoBEr4xfbnQBFh2pvFEacmfe9hdvKVdJUQdA5/flpT/r5QJ6AzKHHs5XBkeI rJD+qsnPAe/LIOzYaadqfll1c87JIG+HILclW0sT7WWxHJEWouDvG9Xsflo3I0xiwSLfto nlu6ZNejAxe92l3yrj/MndUZ4DVS6GaR8ucPVhdpfCsq+MAqyqWrQ2WOg2ilfFgPRJ+bDs 5eEUSMPwIu95n6Wxi2DnD48FKg3+/f2YIAS+RlX5ZyOulheXTCLMQmhpp1MgffVu+i8510 Sj9ad4bR/Lhwt4tyOoCC4DDBn33G1/iXZNzYZ8CLMcG1sQG9C1brjtmZQuosLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694272191; a=rsa-sha256; cv=none; b=a//wyvAx41fhwjJxEjJVPMJLerjvfU5GoZSug/gIq3xmKRuN3UifC6D3u9D5QHXr4q1Dy0 GJHz7rRGiEWDxHVugwRUpu0mTkCslLr5H4t89P+lm/clf4L7C3GowtbeerevQYuIp5lTRm oGzcxnYzvrlYVx+2H7yQoS1hOsxrUXEZe8IOLN7YGP7e6e6ONyCiKcBjcYUAHlWIWDXC0L Pv4mq4Kg0z1IRRzxVx0432ensfG7ly5kg/I9GXjUyop3O6D2AO3lPFQz5qurIIuWsrAYZ0 XBeSHNDZVQfTz4TR9snpZzzJEVkjg9KO9GiVLjVh7rOJKnjb4f1wXBLDEU9qMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kMQeARALGvDpBi43y7D2gISFg+YKDfaicqdLO6Rbl9w=; b=d3iL0mWObWannLIWlBYlc9gjtwU1IviU0nJqrX6/2gdiem2ue40yFNd+OADCeA4qzBC3Dz +nUnyQ+EipZ1RVIKbgNgG8VHEyUSSTUKHzhXqb2EV19R1rOC+8LKPXM1J2C8tIbIeFZZ7a fe3ZaaPx9rJ6KcP+Daf5oGE/HW12BbS1BAOLP+UXHAcEXrYmJKWtOwDtd8+veU0aEK/e8F rUmUX9mCH8a/IVjCfNliEQX0b/x5oBf1xTL9JpFrGyE2gEfeqUW5eFSJiHUObLb1qrbeQO Cy4Lc5rowonpgNYlflGBdQmPX3O1madqs3/ckObQAmX2os5a8aTUETdjBQ5jPA== 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 4RjbxW0xKpzTnr; Sat, 9 Sep 2023 15:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389F9phn018412; Sat, 9 Sep 2023 15:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389F9pso018409; Sat, 9 Sep 2023 15:09:51 GMT (envelope-from git) Date: Sat, 9 Sep 2023 15:09:51 GMT Message-Id: <202309091509.389F9pso018409@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: b67ff0e3cfb9 - stable/14 - syscons: refer to it as the legacy console List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b67ff0e3cfb9da85332377956f200ee7326963f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b67ff0e3cfb9da85332377956f200ee7326963f3 commit b67ff0e3cfb9da85332377956f200ee7326963f3 Author: Ed Maste AuthorDate: 2023-09-07 15:10:33 +0000 Commit: Ed Maste CommitDate: 2023-09-09 15:09:42 +0000 syscons: refer to it as the legacy console vt(4) is the default console, and although there is no firm deprecation plan for syscons(4) yet it it is not actively maintained and is not compatible with contemporary systems (i.e., those booting via UEFI). Reviewed by: manu Sponsored by: The FreeBSD Foundation (cherry picked from commit 2afef29b2c0b59182c6c1e133733943eafab714d) --- share/man/man4/syscons.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4 index f9540ffe9bdc..19ecd5e3746e 100644 --- a/share/man/man4/syscons.4 +++ b/share/man/man4/syscons.4 @@ -30,7 +30,7 @@ .Sh NAME .Nm syscons , .Nm sc -.Nd the console driver +.Nd the legacy console driver .Sh SYNOPSIS .Cd "options MAXCONS=N" .Cd "options SC_ALT_MOUSE_IMAGE" From nobody Sat Sep 9 15:15:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjc3Y148jz4sT1M; Sat, 9 Sep 2023 15:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjc3Y0Pmfz4DMn; Sat, 9 Sep 2023 15:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Is6r8MGxb8/FbUbz5UVGL43tWOVnl7qtsM2aOjOKw8U=; b=uQSsO6qEVBO2jKByoAG884UrlQiRMipxUv66PIRiPo7Qnfi3eBBNxb3NwpxYtLDZrRsCa9 0wm7+am0J7RSXrjVEi7gKQhPAbOIegpmyjJ99/ycz2zi4hHQtl0YD1+nRy/I0aPjfMGOaT /R3IZhaBJPazth2A7Nq7Yjq+F/Yb9PsgtLThiq0uf2JYV1AO0ge8XHnvIpup4x/WGRHkFw e9NF/w+rqhIOLlj3YUFF7OhhC4l6RFdadfBkI+t0N+7oq42++HO9u48CYpO+73dhY+OilR 0zXXJLnZ7Gu+PKmyESER4yGJpQPBn8huNZvdAoIxT8OyO6rJpHwiFn6h1yArtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694272505; a=rsa-sha256; cv=none; b=VwR9IA1VX9IX5hsGvL9VZiiIWobCp8YVEnRjuohlAmMrdGCVZvMsf5uQyDZGqmpH4xWVkF A0PD5WGwXLiVaywFp5P8HMqYZsXwioG4VRxiuCAwwSDjCciQ/Uq8E6cF6iqOlpsoY55DMy +Un57GCDuE9x8jlvo4TqjZ1+J2LxNCnrE3NVJSPM3GKXP8//sEfyDSEP99rYdqbLkCmmPe wuc5v6NVhWKD6jMQJjKjvEECrN1Kga9+HS81QAIDN7EtOLXyxQB4TNx+RhzvINV/O/rioe 6X3/QT75f+Ar2gScws+NamJ/M6MZeP0Ei6Xqz8SynXRHYd9rTqRjcJm4Ndbuqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Is6r8MGxb8/FbUbz5UVGL43tWOVnl7qtsM2aOjOKw8U=; b=jYV/xXi7dfFXGQve/N4+NBMzBCqDCEBtwxNiD7tLPRdVqCeRn2T8Nj85UJEZvI7HR/3USq lX0KaGEwpheYIavP23nVYUqdd8sft0/v8RdZQRJ6x9WLNu/Q5xMqr3+wV7Oi2+6Y2kD674 FRXyULZy8PrxFM0GgNrT5TFhVncmRk7v2tw3u+UXMPEEmjuZlmJVIIDuP0czO/UTtdWxjX cduBfIbb00HbApKuQ1lifuSZFWpn2B0BHjIthLi8wEzFSm+HuvtMdEb0kbL2NJdKLvQDaJ T3AvwMqNf4bXJ0PQvtku/sshFG1dp0HT4N1XFuIJpBGDW18MHk2B9s7O72HRVQ== 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 4Rjc3X68KkzVBx; Sat, 9 Sep 2023 15:15:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389FF4oM034610; Sat, 9 Sep 2023 15:15:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389FF4OT034607; Sat, 9 Sep 2023 15:15:04 GMT (envelope-from git) Date: Sat, 9 Sep 2023 15:15:04 GMT Message-Id: <202309091515.389FF4OT034607@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: 413687812ba7 - stable/13 - release: remove inet blackhole sysctls from GCE config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 413687812ba7e6d25692fa6a75475c006111a788 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=413687812ba7e6d25692fa6a75475c006111a788 commit 413687812ba7e6d25692fa6a75475c006111a788 Author: Ed Maste AuthorDate: 2023-09-06 00:03:25 +0000 Commit: Ed Maste CommitDate: 2023-09-09 15:14:53 +0000 release: remove inet blackhole sysctls from GCE config Other cloud images do not do this, and it can produce confusing results. Reviewed by: Jose Luis Duran, delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41751 (cherry picked from commit b7528b16c6039a9f0af28f8f3ccdd6ea4eb7e604) (cherry picked from commit 5623352ec00532193e9cd44332814f8d482422e4) --- release/tools/gce.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index d219852b63a2..aad4a74d2e39 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -83,8 +83,6 @@ EOF cat << EOF >> ${DESTDIR}/etc/sysctl.conf net.inet.icmp.drop_redirect=1 net.inet.ip.redirect=0 -net.inet.tcp.blackhole=2 -net.inet.udp.blackhole=1 kern.ipc.soacceptqueue=1024 debug.trace_on_panic=1 debug.debugger_on_panic=0 From nobody Sat Sep 9 15:16:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjc5H02DDz4sTdk; Sat, 9 Sep 2023 15:16:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjc5G3zw0z4FgC; Sat, 9 Sep 2023 15:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLx0U05w3tXXq6+TLUZ0LjwldaeNTvceIotgYIvPu4o=; b=tSgSVUVW0CluNyj3A1y5UUAwWyK0GNzjgwmSHcp26wGpfhnHX2QOS2O913p8s+JlbH8OMq Uj0dF88e0ZPxc6stbV2fpx2DG2xmodoKunm6K1BQZ3k4gTHYs65DPHNbU7FCv28tBqCaoY sG5nqrqo5T8vfdcx1Hzd0A0lv9C+sFu7/zWL05IHNM1+l/9qrHoZX+7dZDb93Nmf5ByKqW 55x3ctG0uVmzTXKNKjY1ixYMlWSMi0rmlqsouQAgwInrdFRXpZMUJ0zs1QrE/upIbTS6aE KMT60HHmCxA/Lt3GQgLRJRcu7jseT4a7B3c+LPj33THDGRZMtA27eHDccM67ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694272594; a=rsa-sha256; cv=none; b=qute1/SyEZELhFZIMcqM6SB6rWxRbYYyK+1X6Fy/ymzYwcW4OslAeZBTW2jrUVdzcEx9Ww gD4oWJZlFDxwKqCKmx0MrS6c4NgmiTRyloAQToPlbyO1ZvHNpprdsy8Rsltewndz6TvY6A IA3XlNwULBzfsx/je4dwrn21WT8rcNJ09B0VLatDFA9SrEH5x4nwbRvAbmF4v8PYVo5Ysr TPa1WVyIseuGtbK2wqyEr5YG6jzJYWimKEpwdfgRdFiHnnImK9JCcD8SONdKN8J8GEZmpe y9ucN3JsqqDmSLohWH60iDOEimyQCIJ5JNHxL/IFP4OugKnZcYWob/rAIf9Rig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QLx0U05w3tXXq6+TLUZ0LjwldaeNTvceIotgYIvPu4o=; b=MqNlWtLdxvWZgx6hIk4dZvB/71haFo6bRU/qrFxvvaXB59DNyNg18IEaC9592o/VR8UsrY 6MQ1KhuircTUuuw1kXAlwISLVPZ5UG45NmjzUUQUeYzyxBG5czU1hqCpxDJX4Qzvxih/V1 yzo9TGY5YUZHSUb7GVcTUpskvYGDOTcx5O4xGCl9N+155Owj1AVSvAoo1vKgjICa3K9JKi /HCKHeSp/Y9/Azta/GO341SnVv71dxLrjI8j1w//3qDq04tKx4W4GQ0gp1em0MnjmG5vBU yF6XxkCY4aUdIIBdSQYE9qv1Cp7UyuMgcaIGNJ41zQecjHCExvY9crumNO/+7w== 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 4Rjc5G1klkzVXN; Sat, 9 Sep 2023 15:16:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389FGYiX034990; Sat, 9 Sep 2023 15:16:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389FGYhA034987; Sat, 9 Sep 2023 15:16:34 GMT (envelope-from git) Date: Sat, 9 Sep 2023 15:16:34 GMT Message-Id: <202309091516.389FGYhA034987@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: 3284a5929d50 - stable/12 - release: remove inet blackhole sysctls from GCE config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3284a5929d50131be0c453805558d7f3311f7ed5 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3284a5929d50131be0c453805558d7f3311f7ed5 commit 3284a5929d50131be0c453805558d7f3311f7ed5 Author: Ed Maste AuthorDate: 2023-09-06 00:03:25 +0000 Commit: Ed Maste CommitDate: 2023-09-09 15:16:18 +0000 release: remove inet blackhole sysctls from GCE config Other cloud images do not do this, and it can produce confusing results. Reviewed by: Jose Luis Duran, delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41751 (cherry picked from commit b7528b16c6039a9f0af28f8f3ccdd6ea4eb7e604) (cherry picked from commit 5623352ec00532193e9cd44332814f8d482422e4) (cherry picked from commit 413687812ba7e6d25692fa6a75475c006111a788) --- release/tools/gce.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index 474cf53de8be..75f296b277b8 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -84,8 +84,6 @@ EOF cat << EOF >> ${DESTDIR}/etc/sysctl.conf net.inet.icmp.drop_redirect=1 net.inet.ip.redirect=0 -net.inet.tcp.blackhole=2 -net.inet.udp.blackhole=1 kern.ipc.soacceptqueue=1024 debug.trace_on_panic=1 debug.debugger_on_panic=0 From nobody Sat Sep 9 15:18:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjc7B6LWPz4sVk8; Sat, 9 Sep 2023 15:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjc7B5wf9z4G9P; Sat, 9 Sep 2023 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CdLAgJMFtmMZikGBUrGXGbzc2QsZCfj2HYobbpLe4DM=; b=kXMW1tMAdpiXhi9i0ZcQnsXhuDEEnxaORVsrGOGqimkCzE36oPJ8q2pJ0pKSiTUevSgU9R 0Emm1/uVYHRZMZZzhcspnubrV5JNYuc8ggQvx2oUircRPB0Ng2ORfR0TsmPbsMFtUmRfl+ 8l1Ax0/6JGZRDgW/sAk78912AFbHf62ZipGeSIaLOxZwy4EG2FzScD4jOdlgG8XOB8Rn7d dN0iJEJXH4Aa7S8dpJnFlNuKrbxFXCzo57L3AqaPU8IeYvIQdKa5N05lIOf1LcNz6YPw6N 2cuIzyL+VlvX8TLnTHqH0w3YVQXj8lOED8AA4NkFtqqqZUkfEtvZ0R4hEtYJcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694272694; a=rsa-sha256; cv=none; b=ARxefwuHCD+ydOR9h2eJ8VmpsUyv9dXflTZn1Qv288YO56wUtPN2Yg8GCP5yFiU8grblv1 74tJqM9fFSvnVgYCVPRvYU1rc2TsntQc7JSGKrxdNXPqNShG7KY/eZq6NWBIwJTDQ2qPV2 6+vZzqKZXc39XvZwJ67RpGXBDp6AeuXCuxwdOJTF5/vAmDjpsK1CFW4BHM7Z5gn9McCgqz cVlm9v2LBdg7LK4UAsctfHhs6xIVE3UmlIK9+SW2iPdTkVORtODnqv9/Cfg+q1CaYd4xkH f4rh3fjla+x5FFfdkMgCiw7KchSpiQLF82S6cjqzKnndaWMs4uO1rmBqqYEtlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694272694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CdLAgJMFtmMZikGBUrGXGbzc2QsZCfj2HYobbpLe4DM=; b=g9+1ldfNC+nV2X5Z/4tklB8jgxG7oTKBSwtEnpVljeLF/Z49f9QNuzvOQP2KZXUOn02XZw INd4b4aijob8fJEmWzYma6tNtUMDv4ucfpq65IXx74BEtP5j07r8oEEc0eTRj/Rz+bVp9O GRterZAwmn3aTwCzowJunGlm8h7BRmrMamYTpM1F0uWIqEsJ6jLIw9fM2JL+Y3Fwform74 rFwslxSN7fnuuBeRuWAgacsUHjhWnjTuwpovsxgeeHV0OmB/aY/P3a/NPkfQwa6yBPZiOM qFEmichFhVJdR+1a81ltpdEEt7y+Stz2IANCiD+ie1w5D2oM8XOU9xZPI1ML4A== 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 4Rjc7B4tdgzTpb; Sat, 9 Sep 2023 15:18:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389FIE1q035316; Sat, 9 Sep 2023 15:18:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389FIEcn035313; Sat, 9 Sep 2023 15:18:14 GMT (envelope-from git) Date: Sat, 9 Sep 2023 15:18:14 GMT Message-Id: <202309091518.389FIEcn035313@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: e4e41b39a4dc - stable/12 - iir: prevent negative offsets in ioctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e4e41b39a4dc22a31c7d239ca1ac29bdd6c10b47 Auto-Submitted: auto-generated The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e4e41b39a4dc22a31c7d239ca1ac29bdd6c10b47 commit e4e41b39a4dc22a31c7d239ca1ac29bdd6c10b47 Author: Ed Maste AuthorDate: 2023-08-28 03:38:30 +0000 Commit: Ed Maste CommitDate: 2023-09-09 15:16:19 +0000 iir: prevent negative offsets in ioctl MFS of direct commit to stable/13 as this driver has been removed from main in commit 399188a2c60c ("iir: Remove"). PR: 273328 Reported by: ChenHao Lu Sponsored by: The FreeBSD Foundation (cherry picked from commit b5a5a06fc012d27c6937776bff8469ea465c3873) --- sys/dev/iir/iir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c index 35ceef8d66a5..f6430b7c5a71 100644 --- a/sys/dev/iir/iir.c +++ b/sys/dev/iir/iir.c @@ -1855,7 +1855,7 @@ int gdt_read_event(int handle, gdt_evt_str *estr) eindex = handle; estr->event_source = 0; - if (eindex >= GDT_MAX_EVENTS) { + if (eindex < 0 || eindex >= GDT_MAX_EVENTS) { mtx_unlock(&elock); return eindex; } From nobody Sat Sep 9 15:48:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjcnf4dQGz4spXN; Sat, 9 Sep 2023 15:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjcnf4CNHz4Pjj; Sat, 9 Sep 2023 15:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694274486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNhoj6MU8kd8+h59bDMchTVB5m1LCYuVKesMDKvCGvw=; b=XPdB0r3e0BpUPZAZVUmiwNYnNrlnNK3qln8+4FPbfOY5607jGzwFxwbqD1/ymHH+2dQFqN NDhlQlvfN+Shf+2YsxT0Q+/pS7hr9QLQtSXptMDOlDz/s/qrWC//XzBCKzYVfOqgqrRaYP JA+FGFbdgFDtOBn3yKNa6iXukdPVugRrxRO5fzWnZTIVhaeV/IvP1NnvErla0Y1T86FdLA 8ri2u46nEsjS5wISiL4OV5VMVoGO7wtab6HfTVjTsLcAxtRaWzehkluEWFd1Q150g7KxJN SYvKvx9CLzADgkkG+00kIOrJApWdKmwHmBUUnyUN8uSQRgl72lMq83rw9yRR0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694274486; a=rsa-sha256; cv=none; b=r5a1Tat5xGwyw8ik1B3S91Kv9pG6h+YMu+HA+RpmIJDhCbwUYGBstBYPIsp6qO9FOGkPs0 F3uaqsaQMkM9QWcRxkqTARrmOzKX2cn2Ne+8ECb56yiuVUIxrXir4jjBeoDq+wLYkrlMvV Hca+VArKh8hBi6FXno5cHGWNG0/9TPeGeBZ66D8ISDfAlCL7Y0Z+9KRbLR+RxcnDCxyLuz nIQXvRbEB7oiznD46GHr2OUpsjwBuTGDD/uLBEEtejzPB+LKK7IcAMs1Q1rmMFFLLNvgKH AKWLRzpQxQ8fAMuH/9g9EWBPRb5jwqlbrjlDgAv8V/4YGxSoLWYRJ4uq6+swNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694274486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PNhoj6MU8kd8+h59bDMchTVB5m1LCYuVKesMDKvCGvw=; b=GfdsM1obA4c9JHc+EitrMeCeuh+6lN3fCB8fI0xipuWnQUCfLjvs2BEXHktBKQYs/skJoA si5n0e3l7RkeZk5ueHBfqxznlcfcbSoa7gKlnH5OB3pklDSH+k6QICi1ZRQZh6ntJiFlFl wRVEDxdrAHHPkEGafjHJgMXn1ptU/lxtl5GeTz8vgao//10wlqPZXnayBQHDjogBO1gT50 lPV+q6t7a4wXIPovPxrjTzF2q8AvNh9yqfc759DfjYKm8rQeWGkrM2KoUa0mOJCkbHs8v0 WUiITGKXdAOqcd5k/053TY/OxxH58Cg0otJWCi5EezLq03a+rEnP9l8sT1VZZQ== 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 4Rjcnf34DvzWNj; Sat, 9 Sep 2023 15:48:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389Fm6Ju084530; Sat, 9 Sep 2023 15:48:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389Fm6nZ084527; Sat, 9 Sep 2023 15:48:06 GMT (envelope-from git) Date: Sat, 9 Sep 2023 15:48:06 GMT Message-Id: <202309091548.389Fm6nZ084527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d0a5da5c1cf9 - stable/14 - scandir.3: Fix several typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0a5da5c1cf9c8d2c19b267e4db0fa2e28838f9d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d0a5da5c1cf9c8d2c19b267e4db0fa2e28838f9d commit d0a5da5c1cf9c8d2c19b267e4db0fa2e28838f9d Author: Trond Endrestøl AuthorDate: 2023-09-01 20:48:16 +0000 Commit: Mark Johnston CommitDate: 2023-09-09 15:41:02 +0000 scandir.3: Fix several typos PR: 273480 Reviewed by: markj MFC after: 1 week (cherry picked from commit b7000cadfbf312b6a8acff6b7a3bbbbe55509565) --- lib/libc/gen/scandir.3 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3 index e6d1fb38c2b1..033042acbb05 100644 --- a/lib/libc/gen/scandir.3 +++ b/lib/libc/gen/scandir.3 @@ -48,9 +48,9 @@ .Fa "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" .Fa "int \*(lp*compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp" .Fc -.Ft +.Ft int .Fo scandirat -.Fa int dirfd +.Fa "int dirfd" .Fa "const char *dirname" .Fa "struct dirent ***namelist" .Fa "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" @@ -60,7 +60,7 @@ .Fo scandir_b .Fa "const char *dirname" .Fa "struct dirent ***namelist" -.Fa "int \*(lp*select\^(rp\*(lpconst struct dirent *\*(rp" +.Fa "int \*(lp^select\*(rp\*(lpconst struct dirent *\*(rp" .Fa "int \*(lp^compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp" .Fc .Ft int @@ -186,7 +186,6 @@ functions appeared in The .Fn scandirat and -.Fn -versionsort +.Fn versionsort functions were added in .Fx 13.2 . From nobody Sat Sep 9 16:56:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjfJg1f6gz4s0Hp; Sat, 9 Sep 2023 16:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjfJg19qVz3Krn; Sat, 9 Sep 2023 16:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qhM7oDrhGukyTJW2xItJvUQPEBKF24eHgZgov82Cucc=; b=W/c2VkhtExO/us8D1EZlkjq0LIzQytyXEnSQoL8emfkvwO35ZZkroY3f+E9Txr4ucawfGj HL4EzsY/feZMRdWzux6mrniSzussY/XarBlQaCFRIGbVpyd0QA/y0ifklETgoilHNk+2KF Y5VzHMmavvX9QAVJhJz7Fkm2T8D4RmHdEIkvOscm/DjrmZR8BP08Y6PWF9u8kG5Y3Fp8KN JEFQ8li7t7HrvyxIb0K6BfDVOlAtZpRBi/hPu9yPjxQWHOm34udENvBTbHxfuRfYwxVE0N apakUrKrvpOhmmAWxq4r90IU+BlaK2lGb9w3mFQlz/ZWOWVF/nwODP+pc/WRLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694278595; a=rsa-sha256; cv=none; b=daVPKss8yS9yWsGfel4pNRDWb+uVQKgEOM5VA5gxFoyQPROjz1fJT9QUtpcD51U4Mv9rVG jUGEhKyGJq1pesSao1mUE8xed2BrAcliJo6kBgHL/f1bKKMmgz8MpE8OtU6zsyO/neDumT Np+G5gwKvNyl42fdRSbVsd6tJP3dbfcefExu+qt/DnrPQlTwGmkputjq1eMRE1xWuPjgVq UowpSNfWRtI7Dwk8zFF91i+zclZ1PWIg9FMtc2oiZYQgT3LLeuUPjie9HamvhW2MAWw3sL oR//WdL9jtYUIlAtpsBWzZj/vk2yJpazCSNEvRrPG945EH+PM9O4bPxSLpWk3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qhM7oDrhGukyTJW2xItJvUQPEBKF24eHgZgov82Cucc=; b=CPXOT0gEXLItXCzlsHKLFC7ajcTqw75a3AKbYj1V1MBlIoDfwLybNjm+rKFvckDlWoaviq OiKs48M1aQ0dsAPoWdYTOD3x+rMa/AWp+eBJRA2CQ5ZmJnZAnnwUv39LyaEi7i8UmAbVeY 4KE6wfhWKOaEW8SULXA05VCFfcxIBsk3VjamazM8taYoyvSLPW5fToJskBN3/kImsBn6+r /FjXoI3q+NzQyo3Hbpgd0slU3PxzBy+6C4Rk9ZwgEbrTkZJTa/19tgBC4GeRpJ4FYY93cU rpP3vsyLodBVAKmNvG2U5c+Ky+x2xroA/vbOvcnz/BRZQAhnCJiz2hvPzq0t+w== 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 4RjfJg07GhzY8H; Sat, 9 Sep 2023 16:56:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389GuY72000208; Sat, 9 Sep 2023 16:56:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389GuY9D000205; Sat, 9 Sep 2023 16:56:34 GMT (envelope-from git) Date: Sat, 9 Sep 2023 16:56:34 GMT Message-Id: <202309091656.389GuY9D000205@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: bebd79e63847 - releng/14.0 - release: remove inet blackhole sysctls from GCE config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: bebd79e63847d91ed7bffe06c02663d6f823b0df Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bebd79e63847d91ed7bffe06c02663d6f823b0df commit bebd79e63847d91ed7bffe06c02663d6f823b0df Author: Ed Maste AuthorDate: 2023-09-06 00:03:25 +0000 Commit: Ed Maste CommitDate: 2023-09-09 16:55:40 +0000 release: remove inet blackhole sysctls from GCE config Other cloud images do not do this, and it can produce confusing results. Reviewed by: Jose Luis Duran, delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41751 (cherry picked from commit b7528b16c6039a9f0af28f8f3ccdd6ea4eb7e604) (cherry picked from commit 5623352ec00532193e9cd44332814f8d482422e4) Approved by: re (gjb) --- release/tools/gce.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/release/tools/gce.conf b/release/tools/gce.conf index d219852b63a2..aad4a74d2e39 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -83,8 +83,6 @@ EOF cat << EOF >> ${DESTDIR}/etc/sysctl.conf net.inet.icmp.drop_redirect=1 net.inet.ip.redirect=0 -net.inet.tcp.blackhole=2 -net.inet.udp.blackhole=1 kern.ipc.soacceptqueue=1024 debug.trace_on_panic=1 debug.debugger_on_panic=0 From nobody Sat Sep 9 16:56:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjfJh33Z3z4s0Nl; Sat, 9 Sep 2023 16:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjfJh2S5Pz3Kpk; Sat, 9 Sep 2023 16:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8nWqL3XPkZopJGmNakSDMiOb1rDh34hDaTQyl9oUpE=; b=N1Symmv2JR0OjfoEHz/1QI3tNmMkeeF6mDuosrBOZsHD/dX7EoGsVHWevahUv349e9HCwx sscbRdkwhygtXxoC/bEtsfcnxBfWx2zz3ugJ/FeOk49cHHfhs5TyEdLI1h1qeoEAtqKVu2 mWbMfHveOhGEZdrvYDPCDqdgANPGZ/8+xgKC+iI94QTn3WOAlBL73vZxbkCaondAz/9pv1 Onv1zwhZdxiU5aGVR9H3HME5CamkRFk89uSvabp5Y07TATBy4ZpS56Dr8UxDC4dnMhQ0nG 7OjneSbcXe5EWUk+V67pBf0iqTg3pZWIzMFcNzrsvFGkrwIC+7X2wfF2TsQoBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694278596; a=rsa-sha256; cv=none; b=RhXuchFKMSszyZxuX7CgZ4GcCaTVLIzW94FJ88evsfUaE2OWf2zv6/DnWZg1NeRktHE3ZU 0H6p/TlFlpSwBF8I+5hwJ8AU0U7vnNLyEPK+j+zvxIfJmDlmhi5g0IV0KCeMzArvnVrhN+ NH5beYfW3tnne6JMHKR3DOrhajonDL87AZNXbomRhZa7VLuvwusbTBuS68rlpEdIWmHMQk lgZHotTN2tAz08k9vXOiTn/WyJbyXO/2+ilwtQduadXUQ6fYOzUfKp35bBWhSS++/VQaaN oDP4wdB/LcAbMUGva8oacEUtQMrOfG5cbhpyNhWSRHzCiqbgsv68jWd4hxk8Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z8nWqL3XPkZopJGmNakSDMiOb1rDh34hDaTQyl9oUpE=; b=Zcj8UKTdm+bsO5Jk4iIfu8+XdM3Gzz1PEHkIbKefPhPhmiqXPiMe0LZ4o3lgQKGChviwlT 4EkafzjiHXRtsgtANVZFaMYmVFWJ90lEEPGa+2e6y8PeZTHDmGnfsdwofBuhkIrMZQh2bn xLn1R4kL2yAfiz1SmqI8DpfnpNEGkVw6ZfTg8ggUoR1ef8ROwDXfjU6RajRKRJ3sJ1uNFY h7DeYnZMDAe4PSh8jg07TTR8xN65PAZta9CyER6JeDJkfPlhh9zqsDFJVeWvCueO+5f8xc nPspNl72uF6isldMM/7ioi7p7um77mOK0Fv5Oq17FzdXDWp6Di05O+ON/qnubg== 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 4RjfJh1Kg3zYGX; Sat, 9 Sep 2023 16:56:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389GuaPc000256; Sat, 9 Sep 2023 16:56:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389GuaMV000253; Sat, 9 Sep 2023 16:56:36 GMT (envelope-from git) Date: Sat, 9 Sep 2023 16:56:36 GMT Message-Id: <202309091656.389GuaMV000253@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: fb04691a1af3 - releng/14.0 - libcasper: reference system.fileargs service List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: fb04691a1af34d5595a28d122bf43b907babc0d9 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fb04691a1af34d5595a28d122bf43b907babc0d9 commit fb04691a1af34d5595a28d122bf43b907babc0d9 Author: Ed Maste AuthorDate: 2023-09-06 13:45:31 +0000 Commit: Ed Maste CommitDate: 2023-09-09 16:55:51 +0000 libcasper: reference system.fileargs service Reviewed by: oshogbo Fixes: cdd6ea94b0a4 ("libcasper: introduce cap_fileargs...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41761 (cherry picked from commit 56e3123fc864b6d08ee5b3752538d2f9be52027b) (cherry picked from commit 99f8ee196deb0ca2b2a19602a317ac61e9ca25a0) Approved by: re (gjb) --- lib/libcasper/libcasper/libcasper.3 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/libcasper/libcasper/libcasper.3 b/lib/libcasper/libcasper/libcasper.3 index c98a3044df25..ccd347232777 100644 --- a/lib/libcasper/libcasper/libcasper.3 +++ b/lib/libcasper/libcasper/libcasper.3 @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 10, 2023 +.Dd September 6, 2023 .Dt LIBCASPER 3 .Os .Sh NAME @@ -212,6 +212,8 @@ Casper supports the following services in the base system: .Bl -tag -width "system.random" -compact -offset indent .It system.dns provides libc compatible DNS API +.It system.fileargs +provides an API for opening files specified on a command line .It system.grp provides a .Xr getgrent 3 @@ -272,6 +274,7 @@ functions always succeed. .Xr poll 2 , .Xr select 2 , .Xr cap_dns 3 , +.Xr cap_fileargs 3 , .Xr cap_grp 3 , .Xr cap_net 3 , .Xr cap_netdb 3 , From nobody Sat Sep 9 16:56:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjfJj4JXpz4s0Kp; Sat, 9 Sep 2023 16:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjfJj3XPhz3L35; Sat, 9 Sep 2023 16:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yXcRSvnlpb8E8ovw/1lNBAq2scXM/jayiI47FnUUqc=; b=CYiB+z80fhuZEoD1tZm+OhyaqDEHZD0kbyfRzfW88FrSecqLolXiGNQKtYrdUgExMRnQNV ihzcyBBBdILzRPwmkhS9/fk3/NxGsKLi0GkXBUlmERIcUOOR8+wFC/+SOFZKihkmNMAkOL K7aIvopefhwpJOKGiS295FhOC4bkMKYD3gUSHxqjlSsIHu3kUf+6UX1jesRCNJ5xkEI1wl byz/F9P6IkeuJiaqBcc2BrD0jgILAM5Fp9fTPM772Z9mdAhAutaWb0WA341a0jCG9rPUwg rVzJLw46sneT4vd7mMGnEdykOjs2naTgZbMycHWyGs/35ecvLD6IWZTeK3DkzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694278597; a=rsa-sha256; cv=none; b=Bto1Abkz6b0FHt7k3FG2QvXDDGLfy3AJKhcQQXi3CiVmh/Vf7WdWUr0E1UQoBneAqriXxo 9hpKgxLAW6roqOTdLxBnm0Ftot9ec1diVZsDeBijRf1vMwalGQgAIU4ibAcqST4ivbQIjr iclclHSPNF6k9WNVzng+xty5xOOdbU7rBaLbMMlBeZX18ew3ZfyEY7mLMl5UkFyEzeAWCC p1fpE/GRMoK+PWfmmmN6dw/IhpTAJcHntZmM/IHfw4NT4WhnWULGWxsYOjHUk0uLJtxEIK avRWJN7RvagzlHvL6edVwpvjmvCDx0qFqykxWzomjwF83pTB+lNYcGmpnPzyjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278597; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7yXcRSvnlpb8E8ovw/1lNBAq2scXM/jayiI47FnUUqc=; b=UNrasijkMDYZGZ3tb5SOGKE6CI7AouZEgTJQ/BtGu+jfnw5FNQnUT7WVupBVm2ZjE4YjSo wb+waNrF8fWNDJSJ4gnx8K82BcfOVyWZt1XzNJ+WepnrQa5oLmOG0ZEPOxHcUaptRcvzgH uhaHgYMj1b2By8NyPk3ZpknQKDb8eKw2PnfUXei+48ju4LegIrwYnpoTzhFagaQBjXsZEC a++QAm5fRrk4DgpOrLZAc/hKdZaXXzJjem9JnjK02dM/QUJMM554R8XpnrYuWyDIPF5qH4 POJKJitfNXAyyxBbgYV2gviSgWMCesM09pLgMWSjR8gfUAjVgcJ+HWksRREMgg== 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 4RjfJj2PkQzXWd; Sat, 9 Sep 2023 16:56:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389Gubi2000312; Sat, 9 Sep 2023 16:56:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389Gub99000309; Sat, 9 Sep 2023 16:56:37 GMT (envelope-from git) Date: Sat, 9 Sep 2023 16:56:37 GMT Message-Id: <202309091656.389Gub99000309@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: 88bb052a75aa - releng/14.0 - syscons: refer to it as the legacy console List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 88bb052a75aa5c8b6049b3ee0e60f2364fbd01a7 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=88bb052a75aa5c8b6049b3ee0e60f2364fbd01a7 commit 88bb052a75aa5c8b6049b3ee0e60f2364fbd01a7 Author: Ed Maste AuthorDate: 2023-09-07 15:10:33 +0000 Commit: Ed Maste CommitDate: 2023-09-09 16:55:59 +0000 syscons: refer to it as the legacy console vt(4) is the default console, and although there is no firm deprecation plan for syscons(4) yet it it is not actively maintained and is not compatible with contemporary systems (i.e., those booting via UEFI). Reviewed by: manu Sponsored by: The FreeBSD Foundation (cherry picked from commit 2afef29b2c0b59182c6c1e133733943eafab714d) (cherry picked from commit b67ff0e3cfb9da85332377956f200ee7326963f3) Approved by: re (gjb) --- share/man/man4/syscons.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man4/syscons.4 b/share/man/man4/syscons.4 index f9540ffe9bdc..19ecd5e3746e 100644 --- a/share/man/man4/syscons.4 +++ b/share/man/man4/syscons.4 @@ -30,7 +30,7 @@ .Sh NAME .Nm syscons , .Nm sc -.Nd the console driver +.Nd the legacy console driver .Sh SYNOPSIS .Cd "options MAXCONS=N" .Cd "options SC_ALT_MOUSE_IMAGE" From nobody Sat Sep 9 16:58:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjfLZ0fLMz4s1Nh; Sat, 9 Sep 2023 16:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjfLY4qmmz3Lln; Sat, 9 Sep 2023 16:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jh7lmdIz512UoLknXbRSJdO7Aw7ehISznAMFAYHrkN8=; b=xP3bX6bEGnlSbQxqzBUFM6sCWmfn1iPn6UBGknAAhbW1lm9F8nZBAYTbFEzQM43WE89T57 rHmwiNTescnwakf2ffsS7UrpJZtv6vXCBhc8AxGijbsOXbWRAen363uYD+LiocEt3OX2+u RCj4THaZRw65fjbJs/YWOZYF1reMJ6ZljRNP0ht91zoc3CIrSn+2ASvV37Y7DZD8IseuXw K50uiT434vtUGPWeHrcqHJFL9vRydXMkS87dyZe0kQojb39DGm/MlVh7Q1NDu+Ccy8EJOJ 95DKNJgVHQ3/mBQ0QCrSZk404PggttwuZxB2K2V3CAUKn0UmfGIc6i5ihrzc4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694278693; a=rsa-sha256; cv=none; b=Nk44WRBD+SP6DYcPJp63YzFcWA0TPKKX7FZ5YxcivhRiE5T9pwS8Spf21rNbdjF0zyKugQ VWF3xcXuiSqevmWd5EWSEQBo2oZNj7TNEBWucvmarHBddn5+RiCBEJluJLhVGuwvkkRvUm wwGtBUaqUewX55R97/P9ZCpHCGPv0fg3GhFbnD3/5rVvNMWD2my1bCEk8kRWOcatkC1sQI 88uj54WwQLHKA53WIKdydzLECmHZPoC+iapGBT+AruOBm1k1J7846DvyZLFR8pg7sWmzEJ zHGsajHR6fTILeIV8LuigHLriNGuHfPnCDcs71vwwqKy63eYDIhbWnIaFxdRkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694278693; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jh7lmdIz512UoLknXbRSJdO7Aw7ehISznAMFAYHrkN8=; b=h6DNyD9VscA5IiLi+YVPfnWd9O+SKlPtBrxyUYJLMpNISrmQK/i0EFFLbDHd9teVrPzfnU ZAZqhW7XBs6OG2Wm1g3R2R1ugxGYS8fpt2QnU33RNJaflbw8+GmXpu4aLJz5zZHCh/2XtX xp2X3Fd5QrrU1oqTqdJOW5Uov/7DKB75pSXO90a83yeSQMk/yoSr5PZ1ocLr7cW3OkOR7b V3l1t4JyPkx/O6NErxOk7ULfXvx3xqwAZX5EMwZpemlKRYJE4tDw1eF1RiEPnRdRv22WuO wRKQ561ANXI3oI23yH+pJ4gj+LUpv+sa/md53C+Y7O4YCPDHXy6dsBCpPRrNFQ== 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 4RjfLY3nmLzYGY; Sat, 9 Sep 2023 16:58:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389GwDss000638; Sat, 9 Sep 2023 16:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389GwD8F000636; Sat, 9 Sep 2023 16:58:13 GMT (envelope-from git) Date: Sat, 9 Sep 2023 16:58:13 GMT Message-Id: <202309091658.389GwD8F000636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 402d5960cb82 - stable/14 - MFC jail.conf(5): Fix and expand description of ".include". List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 402d5960cb82eaccc33177aac821dbad1b42db1c Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=402d5960cb82eaccc33177aac821dbad1b42db1c commit 402d5960cb82eaccc33177aac821dbad1b42db1c Author: Jamie Gritton AuthorDate: 2023-09-05 20:35:54 +0000 Commit: Jamie Gritton CommitDate: 2023-09-09 16:57:33 +0000 MFC jail.conf(5): Fix and expand description of ".include". Escape a period that caused a line not to be includesd. Also mention that glob(3) patterns may be included, and a consequence of that. PR: 273561 Reported by: crest@rlwinm.de Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41723 (cherry picked from commit 165234d5527440b7755b01554ff7633e33c0d285) --- usr.sbin/jail/jail.conf.5 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/usr.sbin/jail/jail.conf.5 b/usr.sbin/jail/jail.conf.5 index 33a66c85e7ea..0b82a972020c 100644 --- a/usr.sbin/jail/jail.conf.5 +++ b/usr.sbin/jail/jail.conf.5 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd Jun 3, 2023 +.Dd September 5, 2023 .Dt JAIL.CONF 5 .Os .Sh NAME @@ -164,11 +164,22 @@ and .Ss Includes A line of the form .Bd -literal -offset ident -.include "filename"; +\&.include "filename"; .Ed .Pp -will include another file in the configuration. The filename must be -a literal string, and cannot contain variable expansions. +will include another file (or files) in the configuration. +The filename should be either absolute, or relative to the +configuration file's directory. It cannot contain variable +expansions, but may contain +.Xr glob 3 +patterns. +.Pp +The included file must exist, though a filename glob may match zero or +more files. This allows inclusion of any/all files in a directory, +such as +.Dq /etc/jail.conf.d/*.conf , +or conditional inclusion of a single file, such as +.Dq jail.foo[.]conf . .Ss Comments The configuration file may contain comments in the common C, C++, and shell formats: From nobody Sat Sep 9 17:14:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjfj13kJGz4sBZy; Sat, 9 Sep 2023 17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjfj13Hrnz3SWC; Sat, 9 Sep 2023 17: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=1694279653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qvZ+GEaJxZ80qX0ct+swVrRNaAc/x+ARGnR/YsOq91E=; b=GW+01O503co1gXZ7FSncN0IDHy3MLEDLFP9fgNWOpPxxkRGa5+PHn78SAn2X5XIxAXxvZz GnWkCDv8tijx5idS0E7PrtbGfoXCpZLVUyg7CDZ/wj3LRIUOHvAR9+DwppuOAItAgAcIEd 21peIdHaFESWW85yN0b7T/zV3v9lXu7eYQo/po3icrumXfZISBkVunqvBCkidP8exXwycA zmlENylqtuXv1Sg1Ethuiu3/ehHw+PA8gn6WEMWhpVCjsKggBtNNeYDoo9/G2J48v8OfOV sFyXvxoHfOwR62Yjlrsev0Z1z8ndlCGEHttTtzCt+pP7x9lHk50LtGmE2uJtTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694279653; a=rsa-sha256; cv=none; b=PcIHWeZGV3oVo50F60WAxkLX/9NqMgE0VemF0J0s99q46HuJCx3u4+L+z/Cx9Xi+po3EZx mpvjs429cJyRxQGBSt95M3UcSDBDGX2HZeX9eaZ4tVJneJXFIf6sh30F4WMvBTEtuSAR4r 4BSmpjPolPzHWkmGrkvTaJG+8uP8l3Z3qMaopbc9QQaieXBo5K7mZhK3WlezY7kGFkzt5g SZLTBlwXNLLkUQXgvqbwz5WJF0QllZOPDqDSFnV+dofhEZu0j7P+rLseLSXFen7nrZMJje /cEA1/tvXp/0EgllOdQEE21x9OM8ZD1XnKivgZXcuwOnx2dUzEu2LtALWyzEiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694279653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qvZ+GEaJxZ80qX0ct+swVrRNaAc/x+ARGnR/YsOq91E=; b=LjM6F2V9W9DYu09GQpbT5JhRwDMvPZl5b6o/mkIi54SjrNzJjaA/x5olGhmeqSoQRt7Ja0 DjN6VsnFEUyUI+V1l7jCfQbDumU8zM3s7nEJmEPJA2YTrQfeziVqJwTwncl57Jm57RgVFh X95OJa8Gd4FwMxpTm6P71QBFf2cXiHmjhi2LVOsdrJQFuDSc4hKARNSSOBHyoBq/qbg3h2 /ZEBbpBpgnkZqp8lxArS09DV45OF0bPEts2IxbmX+N7DY+Q9asWkG0doOqK0Silppaf0ou X+oTYmMfLoUt4zr9Eudy4hjHqZxh3X8tcYnN1vFLk8nH8TqZuXwDlAJ4uocJYg== 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 4Rjfj12HjpzYgQ; Sat, 9 Sep 2023 17:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389HEDtu033967; Sat, 9 Sep 2023 17:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389HEDdm033964; Sat, 9 Sep 2023 17:14:13 GMT (envelope-from git) Date: Sat, 9 Sep 2023 17:14:13 GMT Message-Id: <202309091714.389HEDdm033964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5657e065bcf0 - main - procdesc: Remove stray references to pdwait4 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5657e065bcf06803b26f52b59ed2facd806c5efe Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5657e065bcf06803b26f52b59ed2facd806c5efe commit 5657e065bcf06803b26f52b59ed2facd806c5efe Author: Warner Losh AuthorDate: 2023-08-28 17:58:58 +0000 Commit: Warner Losh CommitDate: 2023-09-09 17:13:24 +0000 procdesc: Remove stray references to pdwait4 We've never had pdwait4, and have no plans of adding pdwait4. Remove the stray references here. Sponsored by: Netflix --- sys/kern/sys_procdesc.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c index ac94c3b44730..16d9de008d96 100644 --- a/sys/kern/sys_procdesc.c +++ b/sys/kern/sys_procdesc.c @@ -55,8 +55,6 @@ * generate SIGCHLD on termination, or be picked up by waitpid(). * - The pdkill(2) system call may be used to deliver a signal to the process * using its process descriptor. - * - The pdwait4(2) system call may be used to block (or not) on a process - * descriptor to collect termination information. * * Open questions: * @@ -322,8 +320,8 @@ procdesc_exit(struct proc *p) } /* - * When a process descriptor is reaped, perhaps as a result of close() or - * pdwait4(), release the process's reference on the process descriptor. + * When a process descriptor is reaped, perhaps as a result of close(), release + * the process's reference on the process descriptor. */ void procdesc_reap(struct proc *p) From nobody Sat Sep 9 17:14:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjfj24tK9z4sBWT; Sat, 9 Sep 2023 17:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjfj24GD1z3ShR; Sat, 9 Sep 2023 17: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=1694279654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=78+i9tMpq5Wl2YGGtgMK0KPtTrTRHLed2+i8c5fHBzE=; b=GOrPSazTObnh4dO8xa4IIBnih9mELhQ7ntqVofypq3j3HoLUZbYxl1bCHmB04mfANFU4PM xufmfmFS8ItgmGnClIDE8RSmk+N3WiN1MRyN/YfpbbIV7+Ji6SMToU6cMiid2jbINI1/c7 F/Sr6YID0oOcA/VcYPHcePFLRYztHJdmaHUu2+UnimNHax9AihScgTrKHSxNOj1VVuyIxl 6kOr8889wHzICzJF9pjBJyIPBwgTSemu0MuuM4BPDSkilHcB0wdI/z3j70Zxa/hiypDZSl auPgB2rBkdVnq33W4jkBNXGOBzUUSRViWNZebWUnkiloH6S+i9MiiF44e3a23A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694279654; a=rsa-sha256; cv=none; b=p44BtGBNyR4JqN5njH0yUdFAZJWZRJPE5/+pY0x4KWSBM3rHx7vzyNTxaZtZwiZR2kKPTR EmgInq++3BFsywwEBNxPLx+uge9KHgW2gOqia8ZwsuQw/H161Fu3v2+iic9wJotW5T9o49 mDdgLcftYvGPj3jm9MSJ9USWN2YdEvoHxprxIhHkUY/NfhFaG7DWW2p4FwdN+K4X/q+qRc WgFjZdcFE0+6XZbsXOylZTTDjjKGkLzHf0ZKL34UXlpKQiHaprzbrvroByetVowFtcizDN zL1O30WZuWfJcGVXtSL+YgC1zT8V7/vO4tZtE5gBZhXUAoS963xNK7qWIVQcew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694279654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=78+i9tMpq5Wl2YGGtgMK0KPtTrTRHLed2+i8c5fHBzE=; b=iT1juIRvhEkuQbGse2yc02pfDV6BjZMYdpyXfngHRX8PzuaOdQBvuXi8uEeHquXJrBEby6 Dg7KDAQKfYw4FqXyIgRV9dOxWEfDn0JPXwFWzoKysITlcCztlMqVURJq+pPwUUvgB+BKaC eW+jb2ljahqS4s+grWZ3ZzEf3LIDEMNsN7n3v0xk8pcaQ6Qr7xtcOZTw0cw4cQLswcTPuw sC/+T0Z6fGpZeR8Tbm/GB1chuv/IaPPNK2FTtmgv3VAffUFz4AQq77IKgHcR91KnkkfBM2 aQqWOFj9S9PIc43h12FgyZag+LBxqqXDo4ItTs2/iuxRe+yjWnqJ2GhWumsBtw== 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 4Rjfj23HXczYpH; Sat, 9 Sep 2023 17:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389HEENL034015; Sat, 9 Sep 2023 17:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389HEE5u034012; Sat, 9 Sep 2023 17:14:14 GMT (envelope-from git) Date: Sat, 9 Sep 2023 17:14:14 GMT Message-Id: <202309091714.389HEE5u034012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4cd94c8afb31 - main - atkbdc: Add additional heurstic for Chromebook keyboards List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cd94c8afb31965c7f18471eaa0b2d5e661c24fb Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4cd94c8afb31965c7f18471eaa0b2d5e661c24fb commit 4cd94c8afb31965c7f18471eaa0b2d5e661c24fb Author: Warner Losh AuthorDate: 2023-09-09 02:18:33 +0000 Commit: Warner Losh CommitDate: 2023-09-09 17:13:25 +0000 atkbdc: Add additional heurstic for Chromebook keyboards It turns out that that heurstic used to determine if we have a Google coreboot, and thus have the i8042 emulation bugs, is incorrect. At least one Acer "Peppy" Chromebook has an issue because Acer space'd out the smbios.bios.version string we're using as part of the heuristic. So, if the version starts with a space, then enable the workarounds if the smbios.bios.reldate is 2018 or earlier. While not perfect, it should be a reasonable dividing line and still allow newer core boot-based machines that aren't Chromebooks to not have the workaround. Tested by: Matthias Apitz Sponsored by: Netflix MFC After: 3 days (14.0 candiate) --- sys/dev/atkbdc/atkbdc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/dev/atkbdc/atkbdc.c b/sys/dev/atkbdc/atkbdc.c index 6168b389841b..c23afe3323cf 100644 --- a/sys/dev/atkbdc/atkbdc.c +++ b/sys/dev/atkbdc/atkbdc.c @@ -147,6 +147,7 @@ atkbdc_getquirks(void) char *maker = kern_getenv("smbios.system.maker"); char *product = kern_getenv("smbios.system.product"); char *version = kern_getenv("smbios.bios.version"); + char *reldate = kern_getenv("smbios.bios.reldate"); for (i = 0; i < nitems(quirks); i++) if (QUIRK_STR_EQUAL(quirks[i].bios_vendor, bios_vendor) && @@ -154,6 +155,16 @@ atkbdc_getquirks(void) QUIRK_STR_EQUAL(quirks[i].product, product) && QUIRK_STR_MATCH(quirks[i].version, version)) return (quirks[i].quirk); + /* + * Some Chromebooks don't conform to the google comment above so do the + * Chromebook workaround for all <= 2018 coreboot systems that have a + * 'blank' version. At least one Acer "Peppy" chromebook has this issue, + * with a reldate of 08/13/2014. + */ + if (QUIRK_STR_EQUAL("coreboot", bios_vendor) && + (version != NULL && *version == ' ') && + (reldate != NULL && strlen(reldate) >= 10 && strcmp(reldate + 6, "2018") <= 0)) + return (CHROMEBOOK_WORKAROUND); return (0); } From nobody Sat Sep 9 17:14:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjfj367Jfz4sBmb; Sat, 9 Sep 2023 17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjfj35Wsdz3Sl8; Sat, 9 Sep 2023 17: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=1694279655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K49yICDNRYBchdbW0J9AeJtQtrOcHOXIyFjrgJjYHIk=; b=LiCQGI+SNknT2AeIbhJ9s6qJHC0j0+++l+v7I8eDW2BG5DY7ysfYHWShW5ZCu7thBKbf7/ 5uzDlCZ/+dtM/BJ754Y5OdwhBQo/HkRbgcsHhNQfvXDXK5Ftv8sPFGHhitzXcBzfMaJBE1 vXBUqBtadzWhuxRD5RnT1qghT1UBJHzp6SXr1ApTc5MtB+S+We1msQielW4jAazxDNSTNA 7QrcazbhyraMdJ06R0DoVR2lsZHk0RQPQbxvXCVJgNgyJUt/h4/HMnCJwgGuATwsjtxsHH cdWRynlQdl4iKbJiCzZdGXj0AOrD7YnKDFcOKBURSp/5cRGRigMY+ZCMk7EBIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694279655; a=rsa-sha256; cv=none; b=lJZYcPXOwO3QdiTrLjo5Cd9RlKHRMfnMZHDLIz2Wf3WasICQSyeApPziOQVLrhuI/b7YqN XclBuBKfWM0PXIUtcOCWacUfLEbPMR87xH1xe5ICzWT9TVyKDC1373/QhZ0kS77a73lBxG rll4kiD77BZz6t3ic5OsmpGiecV9TVDqHZRZD+fCsmWs0VCLDWTy1BBrS+z0GWXklHcjSl FfpcGKQKbem1+z1e/bS4avS3Gr22laQd7QLpnPY5p7pVEZJFawLXLmgrA8rB//aEw5c9Bt QEitakWlpxnKCj0K2nlWJzWf60pbvTrFD4OixSt6Fw7eGLyfO1HBUHnx7tCmew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694279655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K49yICDNRYBchdbW0J9AeJtQtrOcHOXIyFjrgJjYHIk=; b=BEiplk6FQQctP5C7CemRSexy7ANMTy0v4krGjk4o6xYs0aFKWaLj1Kq7R9+rjtlC7/ZU1d vGjjtfBUB0YuS8Na6vgiqnQUFglgXfHYrAH3l1oDWz8xvPtKgnTylod2Dfa3ZWviD4cvGk EYGtE8O1oPaLl6C9SQRafHpzmGJ2UID+zNzE61O5eD83EM24AksfdjGVQ5oXP//3aOmP8m LUid6zGNzdnF3bqWrfLzi0d1bG1KCzspOAhHrJCNm3Lobpn6HNnx+G/NMN+4RRTSaf/LzD m55fdWzjLd9sJs0PPAs/cfcq3AHsWBsL4kRbPqOpL8yL9MOYK4UUs2waFXzM3Q== 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 4Rjfj34VG5zYjR; Sat, 9 Sep 2023 17:14:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389HEFrb034063; Sat, 9 Sep 2023 17:14:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389HEFf5034060; Sat, 9 Sep 2023 17:14:15 GMT (envelope-from git) Date: Sat, 9 Sep 2023 17:14:15 GMT Message-Id: <202309091714.389HEFf5034060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c1944a82ae5f - main - cam: Remove extra break List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1944a82ae5f4f0a2cfe7d58896209a2e58a9743 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c1944a82ae5f4f0a2cfe7d58896209a2e58a9743 commit c1944a82ae5f4f0a2cfe7d58896209a2e58a9743 Author: Warner Losh AuthorDate: 2023-09-09 17:12:42 +0000 Commit: Warner Losh CommitDate: 2023-09-09 17:13:25 +0000 cam: Remove extra break Sponsored by: Netflix --- sys/cam/scsi/scsi_xpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c index 2d93a7053183..9e936330fb27 100644 --- a/sys/cam/scsi/scsi_xpt.c +++ b/sys/cam/scsi/scsi_xpt.c @@ -840,7 +840,7 @@ again: } scsi_report_luns(csio, 5, probedone, MSG_SIMPLE_Q_TAG, RPL_REPORT_DEFAULT, rp, periph->path->target->rpl_size, - SSD_FULL_SIZE, 60000); break; + SSD_FULL_SIZE, 60000); break; } case PROBE_MODE_SENSE: From nobody Sat Sep 9 17:22:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjft85hz2z4sHZ3; Sat, 9 Sep 2023 17:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjft84yHHz3WBN; Sat, 9 Sep 2023 17:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694280128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LMz7PnszfAHxRNXJJjYAX/Cdhwa2RkImyB5PB8KwD7s=; b=sAVqS5Z1BysMg1vSlRELPe50gJjYLYYk9epRYuKi8U1Aheyq882qUd3W+n6A3DY8xcbw+F dLzHHuhhOSyboy9PirEGESFd2z19qx6Fu/gVeLV4KoLwv1uRcYRR9iwj8nmIf9LHKZ9jP4 LB254ZulLdy8dw/sW12gShCOvGYN1AQhXCtUQkOvHKed6r0j8n2LbY4mn2UtAhHcCCaNFp b9ZPVULshN++BGeK+bGH+XTiilpzE7iNBbtwYskhLsyLEdziNHMZQjGqd9bbagwNWlNWwa aREl73marZczEr/LsvypJ8s77sFtjgNAr4oQJDZUZ7BpfKzIUS3dEqMx0TmDZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694280128; a=rsa-sha256; cv=none; b=aU70H3C07Wj/EOFqGRHLpAKd6NQWGO58UufPjfKanDjHs53bnjE3+17fIcRmoGqDpLW926 W20RBFB69FMWpf7F0DpKkeunTFRocQ83m/X1xMdiQt1S6jHgGRUleB4KgYsneoeD0JlJ7o TXZGwKfWrFuwQ+LOSZOHHfJ6sl1bZespRlijSyl2dMArW0M+voCokX1B8ux2gQAlWyGzZ5 YwYRqTNMAjjoVzWc+oRJ9h04bG1OqntxVjfmqVl4XcLxKZwTwocHjUpar78J8pNDmlrOxx ajyLAGXPf90szfNXX25quLKTYzycvyhVXkdiRR8gd5eiAkYpTUMXueT1nq0bTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694280128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LMz7PnszfAHxRNXJJjYAX/Cdhwa2RkImyB5PB8KwD7s=; b=e/GRmTad24H//PGkiX7lVvCDtfUskDxa2iRF+3QjKMVBHWD9F94TwYlfWxYzByVCcthybW bLnkEOHs4IrmcnGLoBKFSV9W8uDX7wRmMOBDXLw7MXuN4iiVm+km1YHtHrshJ2iN20uVXL MBc2nEYlzt7j5RIQTuAwvOwtPJ0lc/Z/MlGdBzHfPMPIL87+vgNdykWA0ItUfpjUXLrSz9 J1TPk4nUaMj2jsFgUUTySEE70KDgLQGYOJ+H3sPEfS0HYfS0+KdeR68mNFqS8kouRLZ1Uf B357mTi6UjDfKHzh/rLG4InEopCo7Z1xJ7XMAYZ2JwtIOP7JktfNNPmteiCwQw== 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 4Rjft841lyzYpw; Sat, 9 Sep 2023 17:22:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389HM84p049888; Sat, 9 Sep 2023 17:22:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389HM8Qn049886; Sat, 9 Sep 2023 17:22:08 GMT (envelope-from git) Date: Sat, 9 Sep 2023 17:22:08 GMT Message-Id: <202309091722.389HM8Qn049886@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 425c8e509df1 - releng/14.0 - scandir.3: Fix several typos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.0 X-Git-Reftype: branch X-Git-Commit: 425c8e509df1c83a11bf887d2c70ff164fc9ca0f Auto-Submitted: auto-generated The branch releng/14.0 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=425c8e509df1c83a11bf887d2c70ff164fc9ca0f commit 425c8e509df1c83a11bf887d2c70ff164fc9ca0f Author: Trond Endrestøl AuthorDate: 2023-09-01 20:48:16 +0000 Commit: Mark Johnston CommitDate: 2023-09-09 17:21:37 +0000 scandir.3: Fix several typos Approved by: re (cperciva) PR: 273480 Reviewed by: markj MFC after: 1 week (cherry picked from commit b7000cadfbf312b6a8acff6b7a3bbbbe55509565) (cherry picked from commit d0a5da5c1cf9c8d2c19b267e4db0fa2e28838f9d) --- lib/libc/gen/scandir.3 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/libc/gen/scandir.3 b/lib/libc/gen/scandir.3 index e6d1fb38c2b1..033042acbb05 100644 --- a/lib/libc/gen/scandir.3 +++ b/lib/libc/gen/scandir.3 @@ -48,9 +48,9 @@ .Fa "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" .Fa "int \*(lp*compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp" .Fc -.Ft +.Ft int .Fo scandirat -.Fa int dirfd +.Fa "int dirfd" .Fa "const char *dirname" .Fa "struct dirent ***namelist" .Fa "int \*(lp*select\*(rp\*(lpconst struct dirent *\*(rp" @@ -60,7 +60,7 @@ .Fo scandir_b .Fa "const char *dirname" .Fa "struct dirent ***namelist" -.Fa "int \*(lp*select\^(rp\*(lpconst struct dirent *\*(rp" +.Fa "int \*(lp^select\*(rp\*(lpconst struct dirent *\*(rp" .Fa "int \*(lp^compar\*(rp\*(lpconst struct dirent **, const struct dirent **\*(rp" .Fc .Ft int @@ -186,7 +186,6 @@ functions appeared in The .Fn scandirat and -.Fn -versionsort +.Fn versionsort functions were added in .Fx 13.2 . From nobody Sat Sep 9 17:40:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjgHC2Yhgz4sTkc; Sat, 9 Sep 2023 17:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjgHC24y0z3cDK; Sat, 9 Sep 2023 17:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694281223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bD8qKEW1yPF/j7turKhntSCIOx1V7aJoTEls8T685AA=; b=kMV6VBJx7JwHKqwBKAAAnkmlj0GsmpDK1d3Vd1Tft7jcskQR2zWt1aKxcq3ASX1X/UTZnE w1sCQ+/TMi1XMYYlUkyzoAxwEkCDKfmQU68S2J4Z32jRUFYGyQX/oLVfHpeiENKcLPDw85 hIc2Jq1rNECxqXTYgFwKzlhSI4aR+XXxrxWBGk0PJVJCQGTWFev3s9BkDCm0eeGWiQHiZZ 3ymjsSWTxBHOQbLe+X2hb2aK91zF+Y171jbDlYYyICPIgTUuwqHxHbrG/QxxU+997YtndX nxW1Rl9JbV0QYY77YYJqEFzUnFOTKygk4fqpnnoH36q9ojni/EhyZv7q/fo5qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694281223; a=rsa-sha256; cv=none; b=vy+NQ1rxqX/XVViMHVbTfFcDuUooR98v/WqjINTDT5iD3DGVYvawFv59wfWLHkdzKAOCCp OhN3HWhRiFzNbw3C66RG4F+QescD4mZ9GOdItMkWmgxXcj5YUBblUZPzNXtOgLZkOh+OEW 7jS/YXkTPvxTYA0LOlKq9UE0dozmIL0cL8S/AxIMx8MFlJeGRTwaAcRAopskwCdoZlG+za ivWZ1mvT/q4Fb41pP6GefP5Efxrjj5hfDeHmAvc0XqwdphzCzZIDTXnwgpik9k12Eosof8 EoUdzHDHwwJvRhbKrdSwH6uCZJvUzt+KbF7181zdliOQ2w8KaDntM08fXB1pvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694281223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bD8qKEW1yPF/j7turKhntSCIOx1V7aJoTEls8T685AA=; b=YkBaFHTa7I8a+SBQkevrHp8AZt164it+ZgzmeHvVTtyqVS2CDzwe0npVSZXUwWBnn9EoBB ByuU3KfWLTyg9eD+uvPKzVn9XcVoLdiUVvCpjSL8SMgKBk8B537AhgrT2qdY6U7MnLlm0F Yc7nHRS0ZrP+6/b5tbR7kpvke3tkW7p1aL8z7ddNJibsoTXu6Am5oVWcO3hYJmT4J4YP5j LojVJhUspHJ0yHEa60f7qwf9FzjAV4LoIaalXOoKTivWbkv6n5kS+/W1BcoNtfzVkThmVb PoGs6IIb+bcvRQF5YkJoQgUjhEOsUipsnwRSLGgU52kzT4yXlcopqodOcBAEIg== 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 4RjgHC0kl3zZG0; Sat, 9 Sep 2023 17:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389HeMf5076101; Sat, 9 Sep 2023 17:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389HeMKv076098; Sat, 9 Sep 2023 17:40:22 GMT (envelope-from git) Date: Sat, 9 Sep 2023 17:40:22 GMT Message-Id: <202309091740.389HeMKv076098@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9888a79adad2 - main - udl.4: note that "device videomode" is also required List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9888a79adad22ba06b5aff17d05abac0029c537a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9888a79adad22ba06b5aff17d05abac0029c537a commit 9888a79adad22ba06b5aff17d05abac0029c537a Author: Archimedes Gaviola AuthorDate: 2023-09-09 17:39:17 +0000 Commit: Ed Maste CommitDate: 2023-09-09 17:39:46 +0000 udl.4: note that "device videomode" is also required Reviewed by: emaste --- share/man/man4/udl.4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/share/man/man4/udl.4 b/share/man/man4/udl.4 index fa6e96343a2a..b2cfeba2489c 100644 --- a/share/man/man4/udl.4 +++ b/share/man/man4/udl.4 @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd February 15, 2015 +.Dd September 9, 2023 .Dt UDL 4 .Os .Sh NAME @@ -22,10 +22,11 @@ .Nd DisplayLink DL-120 / DL-160 USB display devices .Sh SYNOPSIS To compile this driver into the kernel, -place the following line in your +place the following lines in your kernel configuration file: .Bd -ragged -offset indent .Cd "device udl" +.Cd "device videomode" .Ed .Pp Alternatively, to load the driver as a From nobody Sat Sep 9 18:47:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjhml38q2z4sRrK; Sat, 9 Sep 2023 18:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjhml2kcDz4TVZ; Sat, 9 Sep 2023 18:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694285255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9fJC64+BLQwsKXLqsaHE5o1ISBCZLI7Pls+sb2C2Rk=; b=Q2+WaoKKQcN6OxtJfEKDOIfIwnF3SxyHHOKr3jF3HtruO6P0/jafqq7Urpk1HSYTfxmG85 Jm5IUlUHZ9BCYW5qO8bqQb+xmTd05lTlb7F9plkNMZ0+3UVGJE7JXfLtlh6a3oC38i7fOZ Roi/WzN0FhlTTshjjWLOAq51c2Tf+Ywpp9KaRLCFCgC396KqxcRCorMF28Bh/TXDqsyBna ALe+KvmaRN2jS2xfLH4TBg+I+Wg4k5qawd68acvQP00Rf+zvBcfubrYO9pDvVDX6kx7y/N qafYlcpYAz26Sw5YPNZ11UDU6ZBCL0a37ddma+EDCVjZQEDNI0W35KRx7dm5MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694285255; a=rsa-sha256; cv=none; b=vx2YsYnc2vrmr7OPXVlsVDHDCWtEfeJj29dBu23gPxqjcbQ+PLOZzZvWUIg4Cv8YICk3bQ xo/976418p5cFg258OxTTtv++mD7KV3GYk90vZLkzRT21CnuDO3k4kgyHVpLXFGSAWmbtg 40m4kL1ohtO+6UfMSFkN7uinGXsYIH8mNwQ7gOzNvyqB4VzridR1FRWI6RSANYtHBR1QtK LG5zQcdeCLxVxujWgif8uZ7HVR9cBHUgjOJuo/K7Wrz0Kbk9QOclVEUz01uSwZFDY6NThV lUOJe8ddvxmcsMkUGxFqBN3ksJrULYMbjXq98qKuxt+m0ivOrpemZRHo1XovMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694285255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o9fJC64+BLQwsKXLqsaHE5o1ISBCZLI7Pls+sb2C2Rk=; b=dPrThFPr1Od+ErDoFSoBbbKj/k5evfeBt+x1P/u6DozVKOhMnTgEBsXBaKusf2Ivf7tEpn K/RY/oGvYklhVkA0ZEsZk5u6a7O46xF7vtGeAz16wQ1CwiM48jzzXuPAnim1OnixIy8J1X sRv7NQ9Knm3qEIehm1qAC3Bt56k/JPFP/FdKyxNlgOkAMVs7zauYbK38ZZhGKziCAv9Lqh BnA9gPnq+WIXL+bxgXcHUOOt+rTUo6j/BXiQbATtFLhAyDCCGC9BVDjE/ilvCFkuVlL0J+ IXlcP7ekb9YbiuZP+kUW32QzRz1WcfDTCOUjQTI95N6dglCS2kywa4k/yzpTFw== 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 4Rjhml1qFZzblb; Sat, 9 Sep 2023 18:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389IlZpq083351; Sat, 9 Sep 2023 18:47:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389IlZed083348; Sat, 9 Sep 2023 18:47:35 GMT (envelope-from git) Date: Sat, 9 Sep 2023 18:47:35 GMT Message-Id: <202309091847.389IlZed083348@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 98b98ec1bc7e - main - ftpd: add deprecation notice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98b98ec1bc7e961c3d3468b0e481080580c902cf Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=98b98ec1bc7e961c3d3468b0e481080580c902cf commit 98b98ec1bc7e961c3d3468b0e481080580c902cf Author: Ed Maste AuthorDate: 2023-09-09 17:34:14 +0000 Commit: Ed Maste CommitDate: 2023-09-09 18:46:58 +0000 ftpd: add deprecation notice Approved by: gordon Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26447 --- libexec/ftpd/ftpd.8 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libexec/ftpd/ftpd.8 b/libexec/ftpd/ftpd.8 index c45df161575c..f5353be894fe 100644 --- a/libexec/ftpd/ftpd.8 +++ b/libexec/ftpd/ftpd.8 @@ -43,6 +43,16 @@ .Op Fl T Ar maxtimeout .Op Fl t Ar timeout .Op Fl u Ar umask +.Sh .Sh DEPRECATION NOTICE +The +.Fx +base system +.Nm +is deprecated, and will be removed in +.Fx 15.0. +Users are advised to install the +.Pa ftp/freebsd-ftpd +port or package instead. .Sh DESCRIPTION The .Nm From nobody Sat Sep 9 19:14:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjjMY6Bh2z4sjW9; Sat, 9 Sep 2023 19:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjjMY5mRrz4dFF; Sat, 9 Sep 2023 19: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=1694286857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ynq1+Cx42Ca6PFnEp2YUfYGyHxLQfj9JT7yBdu6SU0=; b=oZADfjQSsRPKYpj53iwo/O1AuMqyBXPVQZorfPPC0A7U/iVVXxyVUFQTfe3aard1Gfb3X9 EkMncQk8YVyF/6XrD11RjgzkTH4VHMulYOSME1v1OYTGln+/Y2yBZnsQVhsKduEgkNXa2K CnwwS+V1jLRJhjy6XDvLX6BRYrH31tOeBMA9pXqDiuCiUUZK+HzlZk6pOL841XmNSbcui3 jlaqEU/j+RsYm7Rb6d7V7TAqzDgnJ1bzkCrvV8i7vJYHVTe3RqTIFRUQs3qkhzE75AjOJ+ STW/cuYJAD/B0giFGS78LekUhEUhghEbgkobC4zjHVv5RGLad2RL54OBGx0fIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694286857; a=rsa-sha256; cv=none; b=JJYSgnnSywYkQs2ssyinXzrFRVjbiqGVlAUeWbgI3anij8P+dCJ4hD6GXXdQcQAGDtTzFO bqo08fny+OJmte1Ugag3YNcM70OodJy0I1BNs30bpMoPvvaq0uMItRpwsDvrtq9CbMyAZy H96DbFPwgZjKJbSIehexcvXcv2efwjsJYy2QBXR09HaEKv+QIy/4ay5J6u3lSJKrFr4pHF uodLGOvNy6aVI23Z7B4goh4cjta31IjdozLrkzB18kTOyD+RglbVz9C6bULoExb4lyMlWQ +S/4HMehh0wj/lnOru1J8xZeR9i0knph5Wtc9dthZ+gkdWOB51atPofnEJMcgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694286857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ynq1+Cx42Ca6PFnEp2YUfYGyHxLQfj9JT7yBdu6SU0=; b=AYhdJsn7JGKZekY4lK1BLk8YQuNh6s3wrSZUX9pqfYBxnd5ZtviMWbkizNxvev3QJ6oSgg a4aNGBv3VcCRy/uFZplNJ2P5YOM6Hx5QW5zIkaI4mMTjO7dN2h3rvLDjRRIJCze2PU7oz9 iAwCtT28+UddDIP3ZqWxXk6kAviBts787ZWT0RTtXqYym/1kMoKHmbxFUwIify8gAdYs3n zOIpr6UddGrn1GAHr/Zu59MJYvnigHhaeuyFw3R/Xv/zwExHMT8Gkqr4YeJMb62yT/wDhs ofLNrKb+jXJ7tr/baBF5DdhSDKGIpkEFjuJWklR62SWxwghsAu9ulkekUW/0/Q== 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 4RjjMY4dbDzcX4; Sat, 9 Sep 2023 19:14:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389JEHCp033490; Sat, 9 Sep 2023 19:14:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389JEHGW033487; Sat, 9 Sep 2023 19:14:17 GMT (envelope-from git) Date: Sat, 9 Sep 2023 19:14:17 GMT Message-Id: <202309091914.389JEHGW033487@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: d0af08c4ba3e - main - gic_acpi: Limit the number of CPUs to GIC_MAXCPU List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0af08c4ba3e400049d246d72401ce36d3bee98a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d0af08c4ba3e400049d246d72401ce36d3bee98a commit d0af08c4ba3e400049d246d72401ce36d3bee98a Author: John Baldwin AuthorDate: 2023-09-09 19:13:57 +0000 Commit: John Baldwin CommitDate: 2023-09-09 19:13:57 +0000 gic_acpi: Limit the number of CPUs to GIC_MAXCPU madt_table_data contains an array of pointers for each CPU and was allocated on the stack. If MAXCPU is raised to a sufficiently large value this can overflow the kernel stack. Cap the stack growth by using GIC_MAXCPU instead as for other parts of the gicv1/v2 driver in commit a0e20c0ded1a. Suggested by: andrew Reviewed by: andrew, emaste Obtained from: CheriBSD Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41800 --- sys/arm/arm/gic_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm/arm/gic_acpi.c b/sys/arm/arm/gic_acpi.c index e18bc12faf4d..56ff78f9b685 100644 --- a/sys/arm/arm/gic_acpi.c +++ b/sys/arm/arm/gic_acpi.c @@ -84,7 +84,7 @@ EARLY_DRIVER_MODULE(gic, acpi, gic_acpi_driver, 0, 0, struct madt_table_data { device_t parent; ACPI_MADT_GENERIC_DISTRIBUTOR *dist; - ACPI_MADT_GENERIC_INTERRUPT *intr[MAXCPU]; + ACPI_MADT_GENERIC_INTERRUPT *intr[GIC_MAXCPU]; }; static void @@ -107,7 +107,7 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) break; case ACPI_MADT_TYPE_GENERIC_INTERRUPT: intr = (ACPI_MADT_GENERIC_INTERRUPT *)entry; - if (intr->CpuInterfaceNumber < MAXCPU) + if (intr->CpuInterfaceNumber < GIC_MAXCPU) madt_data->intr[intr->CpuInterfaceNumber] = intr; break; } @@ -151,7 +151,7 @@ gic_acpi_identify(driver_t *driver, device_t parent) } intr = NULL; - for (i = 0; i < MAXCPU; i++) { + for (i = 0; i < GIC_MAXCPU; i++) { if (madt_data.intr[i] != NULL) { if (intr == NULL) { intr = madt_data.intr[i]; From nobody Sat Sep 9 20:52:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjlXq53V0z4sR5h; Sat, 9 Sep 2023 20:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjlXq3BxQz3bgM; Sat, 9 Sep 2023 20:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694292747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9POF+bgudpOJJDTO27Oplouju6KOXVsfePCQO76rEA=; b=JC6P3gc0+NLJDrmJazK5mxxG18660jgc90u7/Td0XK1QGHx13CXfcFgE+I6ge71f2hrp6n NrzaVMNKxDnviGPvqcasSAf647SiypfDtlfbSPvIJ2e9MSJRcGo9vPSyqHlHLOpzr2qdRl wu7D98O6nlag6JRkL3TBKfXoy+Fs0q1mEOTl3yZe5lCquiV9ihalpArMYjuDmwt9ChJh8B t5JsdABPjjcNvB5l/wm2lzKP9T5E5lQKIvqQ1PYUkp7OmiZfAhIV/KzL/vZaycbnN53SQ8 N561cdjRT/XFT72AX/uMU72l7ex+2c0NCrsSEf4bySJV6z4/xLHf2aZkLPnu/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694292747; a=rsa-sha256; cv=none; b=tppSekKxTd1kQbttm4P0gN60uqwu60MDIZ09dZx5DnAICIQhjq12QU5q6F34nWeiJFOryq 8m7ntDB1TJL5WaVWf4wy4eWjcCrR9pViwz5+6Le0Z3wGujW5Y1TJtMITpvLyZsGuJn8Up5 QZ6vBYwQERqIVI9xWbVqDiKgaYxFnc5B4Ys3vHb9iLC8oobS9+9w+P7BBXNMiZB74PHCsb igcMFx/HuckSpT1yK3jDVXtX11XvenQ63pHIXmogDwIropKGQvfKaLbnusFWjYAptoXMoA GbCUaFopJMO7uiq2E0UjkhtTXRANzYJoZs+ftLpgJkV0PwD57eeMRLXLNU0ARA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694292747; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=a9POF+bgudpOJJDTO27Oplouju6KOXVsfePCQO76rEA=; b=UyafwhOmp9AOrkaeSV0ayJTutqCu4j7N+SYOjpciIzIbBEFTbgbb5Qqzwxj+UpC93tFq/9 eN9gvPzwfOgHp0AVCqgWfM6mnVhrYyBVA/FWNQtmTCsKV6mZN6jFJRF6MOBxPg30ocJlb5 o097dkcumo+1tWm/sN7d76p16Fht2f06iNSBp0Weyfx0/BPZ1zdScDsKnJFQrvL7HaYCXO MBoHiksi41UuwUlG1pqnQg8fnb3e6Cl4eHUhDp1BnQkmCQZRyjwk/0KcCkw3dOjvC8OIDm 1wyfkkkKYHU2z6rVpJ3/kkEBU0v4lT2vu34xEdYRGeuGrPj22HVpwzh2eNixzA== 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 4RjlXq2FXKzg9Q; Sat, 9 Sep 2023 20:52:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389KqRKm098033; Sat, 9 Sep 2023 20:52:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389KqR2U098030; Sat, 9 Sep 2023 20:52:27 GMT (envelope-from git) Date: Sat, 9 Sep 2023 20:52:27 GMT Message-Id: <202309092052.389KqR2U098030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: ef545fe7ba66 - main - drm2: fix build after abs64 became global List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef545fe7ba6628054765c81624bb5f95884d45f2 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ef545fe7ba6628054765c81624bb5f95884d45f2 commit ef545fe7ba6628054765c81624bb5f95884d45f2 Author: Mateusz Guzik AuthorDate: 2023-09-09 20:50:55 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-09 20:50:55 +0000 drm2: fix build after abs64 became global Fixes: 229c65a83fb ("kern: Globally define abs64") Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/dev/drm2/drm_os_freebsd.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/drm2/drm_os_freebsd.h b/sys/dev/drm2/drm_os_freebsd.h index 7f5bb22aff03..0ce0dede6d73 100644 --- a/sys/dev/drm2/drm_os_freebsd.h +++ b/sys/dev/drm2/drm_os_freebsd.h @@ -304,13 +304,6 @@ ilog2(unsigned long x) return (flsl(x) - 1); } -static inline int64_t -abs64(int64_t x) -{ - - return (x < 0 ? -x : x); -} - int64_t timeval_to_ns(const struct timeval *tv); struct timeval ns_to_timeval(const int64_t nsec); From nobody Sat Sep 9 21:50:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RjmrL1kX9z4sy2b; Sat, 9 Sep 2023 21:50: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RjmrL14MGz4QGT; Sat, 9 Sep 2023 21:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694296258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VB5ssB65fQ24XC4Tf5DaVh28twdI4zKexMZLqkeR4Wg=; b=IbRzrvvI+EdkKrEPByLOstrqsfX5y3vXKDnVblIHb3LuRK2FwTwGDR7unB6Tksb6pM72Fm WOSnMuPL1pqjWCrsUPCMvFNDcujuDcgQvR/whDa4UQu01JZo/oFe5HS1PoCZ2n9EksC3eG 5a33HRnkaBJdf6wmpcf4zwXeHaaTtLim081yslMk95rFtjCDLGReoyIoj4bO3ZLMA5TIRG eTaHJtN8PZz9ct2XoKmLlyun2rTJe8+gJfRLLhuUrtMaH0Lp6UR6niZHbigMyl1XFICtOu DrEACN+SJyocdI5i5PHrEv2EyIAwTY9CkZ9q7NDXvQ1fix/5wQN0wE7X0Ox5/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694296258; a=rsa-sha256; cv=none; b=tFbXzY5gMQN1EbSjsmSO9YLUUWzw0xKXvw3Bw4v6sEesDk9H5p1OMAyD/ETuXkQJShcKZ2 YY/82kR4ebwHc/8oPLwJg/v+80uks2xA3J3A4ZdBsUNOnby3nF+UJEtsQyzHUwXSNR5FN6 NvdybuCD88IfSA1y6gHTPKPKM8jO8nZzo9koWJ+Cw9QNDnonkhqZWc8TKdFz2Y5hIFiYmW zWxMbNXhCvV4/Pj71F8+rekzV/GzJWsmNhL5Y1nfCwlmE6LFL1GUpKH6SSJGbiR6J5lP0y N3CXo3D+UEjLjfx1U4XkqTY6TIE0PsZFlpt+rPDCwpGX0KWJyH+72AZmKaRFfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694296258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VB5ssB65fQ24XC4Tf5DaVh28twdI4zKexMZLqkeR4Wg=; b=hmf/RbwJl7fNEDjK96lS43Tyu4/9SsQT+a8zdzafI6ZCegkFpU64sx6T3oN6/a/P654xWL V8zeJSPnoGfCH9yIgHdVoIcNWmC93+OTcp06mtzaSJjD0tLQ+g/2Eqg5EjZJIlsfL4Y70J 83D1TUhuNAI70UxCN13YJqKh6PmQ9CLqxAu504WNO4SOEjSnG/SmhEAUMVPO1xPU4N35B4 c/2VfEeBdhh1KrZx3ASH6OXDtOsz1s7iBAFvQ6v3TeP4YYSAHXtdf/lDB8dDaVPVTSZP1o er8SYtVqNs/k/GDE1z+HWvtiNlhbEKsfpd8ud7zehBvav0ikwmLw0fCdCWXhbg== 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 4RjmrL08mZzh9j; Sat, 9 Sep 2023 21:50:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389Lovtx091946; Sat, 9 Sep 2023 21:50:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389LovR0091943; Sat, 9 Sep 2023 21:50:57 GMT (envelope-from git) Date: Sat, 9 Sep 2023 21:50:57 GMT Message-Id: <202309092150.389LovR0091943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: a87c6962affc - main - ufs: restore name cache fast path lookup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a87c6962affc2d1994d8f30806c934eb4cb7af22 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a87c6962affc2d1994d8f30806c934eb4cb7af22 commit a87c6962affc2d1994d8f30806c934eb4cb7af22 Author: Mateusz Guzik AuthorDate: 2023-09-09 21:48:57 +0000 Commit: Mateusz Guzik CommitDate: 2023-09-09 21:48:57 +0000 ufs: restore name cache fast path lookup Found by: dchagin Fixes: f3c81b973897 ("ufs: add missing vop_fplookup ops") --- sys/ufs/ffs/ffs_vnops.c | 6 ++++-- sys/ufs/ufs/ufs_vnops.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 0dd64f696e0c..2b11a15c46c9 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -135,6 +135,8 @@ static vop_setextattr_t ffs_setextattr; static vop_vptofh_t ffs_vptofh; static vop_vput_pair_t ffs_vput_pair; +vop_fplookup_vexec_t ufs_fplookup_vexec; + /* Global vfs data structures for ufs. */ struct vop_vector ffs_vnodeops1 = { .vop_default = &ufs_vnodeops, @@ -151,7 +153,7 @@ struct vop_vector ffs_vnodeops1 = { .vop_write = ffs_write, .vop_vptofh = ffs_vptofh, .vop_vput_pair = ffs_vput_pair, - .vop_fplookup_vexec = VOP_EAGAIN, + .vop_fplookup_vexec = ufs_fplookup_vexec, .vop_fplookup_symlink = VOP_EAGAIN, }; VFS_VOP_VECTOR_REGISTER(ffs_vnodeops1); @@ -192,7 +194,7 @@ struct vop_vector ffs_vnodeops2 = { .vop_setextattr = ffs_setextattr, .vop_vptofh = ffs_vptofh, .vop_vput_pair = ffs_vput_pair, - .vop_fplookup_vexec = VOP_EAGAIN, + .vop_fplookup_vexec = ufs_fplookup_vexec, .vop_fplookup_symlink = VOP_EAGAIN, }; VFS_VOP_VECTOR_REGISTER(ffs_vnodeops2); diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index a7d5e8ba96fc..79cca75fc563 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -101,7 +101,7 @@ VFS_SMR_DECLARE; #include static vop_accessx_t ufs_accessx; -static vop_fplookup_vexec_t ufs_fplookup_vexec; +vop_fplookup_vexec_t ufs_fplookup_vexec; static int ufs_chmod(struct vnode *, int, struct ucred *, struct thread *); static int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct thread *); @@ -475,7 +475,7 @@ ufs_accessx( * VOP_FPLOOKUP_VEXEC routines are subject to special circumstances, see * the comment above cache_fplookup for details. */ -static int +int ufs_fplookup_vexec( struct vop_fplookup_vexec_args /* { struct vnode *a_vp; From nobody Sat Sep 9 22:01:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjn4c6gNlz4t3YF; Sat, 9 Sep 2023 22:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjn4c6Dsxz4T0j; Sat, 9 Sep 2023 22:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694296896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=63WmoviD+8gklmcblFoEvgkC5GIpol/mvzLckDYIL6I=; b=bDAF5GOw4c9WhZlKLmmPlD4hW+1xAYW0M2llDLBRNk8JhsUiPTZeIxV8CXYBk2DhiyuHIQ 0UB1MLGexaO/CwUAKN5/3FfVfyooF7uoR9RYfy1T6lV4kp/ntKlAYK1Qmts83Zs+5od3ho QXBSX8Zip+Q0bBBjaw6CAvGfGfD69GzwVEnzHZNO/aRdeIrQtG83efZh9uNpc6qDemRXr5 e00RqkBm0Z41mFXNVROB6l53FQA4DaFLwaODwTqdZc+S3pZpDZHWHTQ69eqUode07SyOxH zsRwcNhuXebCbHAmHg+KqgATUxr4yAJ0sZy0K0qUyXFgoilgQs0HyZ/gn7gGiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694296896; a=rsa-sha256; cv=none; b=Pgi8mSG59XQqQBdp75WO/0ctUYJkz2E0ht+pbr7chSCaXHS3Hvx19Ugpveh3znDh7khq9L +nO4PAEggoPAEPs8PQob3Kz6pEjvk30XwlXl07ryVPUYD01OQl1XCvGHgbyn0qa3lwVLQ1 ylf1HygMRtqo7iTKk5qOSmJW4/hJ1MXa64OXXEnDvP4KLWny/ctBFOI6BHYrlvhiFIJabt d+Iy0XdgjzgjAiY2Sg08jeMl5WJeMV89YHCr89buVG22EabF07JVXdd3TqbW3Trr1/9lgE ryrz3z/v9QtVgbwB30kh6b2LppT2SoTgTKxWm2G+nNTfWoWSVxmTChTBjEW1eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694296896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=63WmoviD+8gklmcblFoEvgkC5GIpol/mvzLckDYIL6I=; b=pMjyPIcqiouNjlS9iHXyEOrv5mnNMGS4iZoDQekRuERA/xlUv7mqnP0P3huRRfEdO3ZXTs lqkkUCTdvTZy653ZqqNROaBNdwrh7IEm0Su81NEdPgc5c6ollhqEx9Qz8hDoUrsREJ3n1v uJQcdCpgTUngR8vF7a9r6SqqBVZkF7hz4ROOHov/6gyOp0FkGfuSR/9+OjZ5MEHKyYEmeT 2rbVCAaK07DoJaWle7mH1jgFLMtOLJhPwcQ3R2GPWDXOEPyZ2+QYwHMLHv1X19k38YGZTn qkwh+1+e2UveQFMpPdtHVT8TOoRbJAe/DIUGDs2iE7M3n3DD5Ut8id/Kl1rzGw== 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 4Rjn4c5KhbzhNr; Sat, 9 Sep 2023 22:01:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389M1aud013911; Sat, 9 Sep 2023 22:01:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389M1aV4013892; Sat, 9 Sep 2023 22:01:36 GMT (envelope-from git) Date: Sat, 9 Sep 2023 22:01:36 GMT Message-Id: <202309092201.389M1aV4013892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 6df6facf44f9 - main - shmfd: hide direct rangelock(9) use under a wrapper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6df6facf44f952f64753bee00831fd93f16c99a9 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6df6facf44f952f64753bee00831fd93f16c99a9 commit 6df6facf44f952f64753bee00831fd93f16c99a9 Author: Konstantin Belousov AuthorDate: 2023-08-18 12:38:28 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 22:00:06 +0000 shmfd: hide direct rangelock(9) use under a wrapper Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/uipc_shm.c | 69 +++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 1975f0d60f89..a8e2502808a0 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -182,6 +182,15 @@ SYSCTL_INT(_vm_largepages, OID_AUTO, reclaim_tries, CTLFLAG_RWTUN, &largepage_reclaim_tries, 0, "Number of contig reclaims before giving up for default alloc policy"); +#define shm_rangelock_unlock(shmfd, cookie) \ + rangelock_unlock(&(shmfd)->shm_rl, (cookie), &(shmfd)->shm_mtx) +#define shm_rangelock_rlock(shmfd, start, end) \ + rangelock_rlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_tryrlock(shmfd, start, end) \ + rangelock_tryrlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) +#define shm_rangelock_wlock(shmfd, start, end) \ + rangelock_wlock(&(shmfd)->shm_rl, (start), (end), &(shmfd)->shm_mtx) + static int uiomove_object_page(vm_object_t obj, size_t len, struct uio *uio) { @@ -456,10 +465,10 @@ shm_read(struct file *fp, struct uio *uio, struct ucred *active_cred, return (error); #endif foffset_lock_uio(fp, uio, flags); - rl_cookie = rangelock_rlock(&shmfd->shm_rl, uio->uio_offset, - uio->uio_offset + uio->uio_resid, &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, uio->uio_offset, + uio->uio_offset + uio->uio_resid); error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -497,13 +506,10 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, } else { size = uio->uio_offset + uio->uio_resid; } - if ((flags & FOF_OFFSET) == 0) { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); - } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, uio->uio_offset, - size, &shmfd->shm_mtx); - } + if ((flags & FOF_OFFSET) == 0) + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); + else + rl_cookie = shm_rangelock_wlock(shmfd, uio->uio_offset, size); if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { error = EPERM; } else { @@ -516,7 +522,7 @@ shm_write(struct file *fp, struct uio *uio, struct ucred *active_cred, error = uiomove_object(shmfd->shm_object, shmfd->shm_size, uio); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } @@ -571,22 +577,20 @@ shm_ioctl(struct file *fp, u_long com, void *data, struct ucred *active_cred, conf->alloc_policy != SHM_LARGEPAGE_ALLOC_HARD) return (EINVAL); - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); shmfd->shm_lp_psind = conf->psind; shmfd->shm_lp_alloc_policy = conf->alloc_policy; shmfd->shm_object->un_pager.phys.data_val = conf->psind; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); case FIOGSHMLPGCNF: if (!shm_largepage(shmfd)) return (ENOTTY); conf = data; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, OFF_MAX); conf->psind = shmfd->shm_lp_psind; conf->alloc_policy = shmfd->shm_lp_alloc_policy; - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (0); default: return (ENOTTY); @@ -917,10 +921,9 @@ shm_dotruncate(struct shmfd *shmfd, off_t length) void *rl_cookie; int error; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); error = shm_dotruncate_cookie(shmfd, length, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1258,8 +1261,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, error = ENOENT; } } else { - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* * kern_shm_open() likely shouldn't ever error out on @@ -1331,8 +1333,7 @@ kern_shm_open2(struct thread *td, const char *userpath, int flags, mode_t mode, shmfd->shm_seals |= initial_seals; shm_hold(shmfd); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, - &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); } sx_xunlock(&shm_dict_lock); @@ -1648,8 +1649,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, shmfd = fp->f_data; maxprot = VM_PROT_NONE; - rl_cookie = rangelock_rlock(&shmfd->shm_rl, 0, objsize, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_rlock(shmfd, 0, objsize); /* FREAD should always be set. */ if ((fp->f_flag & FREAD) != 0) maxprot |= VM_PROT_EXECUTE | VM_PROT_READ; @@ -1723,7 +1723,7 @@ shm_mmap(struct file *fp, vm_map_t map, vm_offset_t *addr, vm_size_t objsize, vm_object_deallocate(shmfd->shm_object); } out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -1941,8 +1941,7 @@ shm_add_seals(struct file *fp, int seals) error = 0; shmfd = fp->f_data; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, 0, OFF_MAX, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, 0, OFF_MAX); /* Even already-set seals should result in EPERM. */ if ((shmfd->shm_seals & F_SEAL_SEAL) != 0) { @@ -1973,7 +1972,7 @@ shm_add_seals(struct file *fp, int seals) } shmfd->shm_seals |= nseals; out: - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -2067,8 +2066,7 @@ shm_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, off = *offset; len = *length; - rl_cookie = rangelock_wlock(&shmfd->shm_rl, off, off + len, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, off, off + len); switch (cmd) { case SPACECTL_DEALLOC: if ((shmfd->shm_seals & F_SEAL_WRITE) != 0) { @@ -2082,7 +2080,7 @@ shm_fspacectl(struct file *fp, int cmd, off_t *offset, off_t *length, int flags, default: __assert_unreachable(); } - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); return (error); } @@ -2109,11 +2107,10 @@ shm_fallocate(struct file *fp, off_t offset, off_t len, struct thread *td) * the shmfd is not necessarily a concern. If other mechanisms are * added to grow a shmfd, this may need to be re-evaluated. */ - rl_cookie = rangelock_wlock(&shmfd->shm_rl, offset, size, - &shmfd->shm_mtx); + rl_cookie = shm_rangelock_wlock(shmfd, offset, size); if (size > shmfd->shm_size) error = shm_dotruncate_cookie(shmfd, size, rl_cookie); - rangelock_unlock(&shmfd->shm_rl, rl_cookie, &shmfd->shm_mtx); + shm_rangelock_unlock(shmfd, rl_cookie); /* Translate to posix_fallocate(2) return value as needed. */ if (error == ENOMEM) error = ENOSPC; From nobody Sat Sep 9 22:01:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rjn4f0dCjz4t3Qc; Sat, 9 Sep 2023 22:01:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rjn4d75pdz4Sx6; Sat, 9 Sep 2023 22:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694296898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/CipLrMCA/ahrFowJyoS/zGnZgXw6UflNlv9JdLWh84=; b=SBhkgpPpy9zJB2WUNaehLCkUrTphUq1eUM4A9Omo2H5KYGoPQnmOfPSDRv3nJTBjGektev F2q/AmMOfc4EptxjK+W5jEs/ioVv84EZsSUgGWaZBTxftZrgK3xH0IWE6TguaGE5lyA58B /FUQtJ2bg01gCELSXRRBKFa1MmgbbiucMivUHl8VRujynPFd/qXN4vX7cefwfHJRhRX9xc j7xI6yvYZKEK38q6QNtNIBt2fCGJ38Zh62TrV08OEi7jb8/Zt43D6V/MtBXg75UpAUIBrq 5cS+20ulY8O1stZZ3+uh0Vsi+p5IyLg47+vVzK579uZqQN7F53Iw4LoqV6r3uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694296898; a=rsa-sha256; cv=none; b=qtvLlDcqYOQsErPfROUFRfiYwC7R4roRAPUe3o3S8jeGWxItg9figL43l7/ZaoYPl7Clcp 7g7MNdk87Pu6xv/OGU62Wi547gINQeBEwTf+64PjTRaG5debri85kjTdXd92Vu5dGDO3R+ /FUshLkB4dFUFkeSm3GS9m14Ptf3HSCbcZ+nMb2zcE3u9qQCfDbxg9EjEzgwA7yCor++Pk BWZVvAhgOEiUjrxIH4KvztDdlj1FQBuEeR5/Ip2GlEHSD46OiT+UbZTHgJRSTPz/PaRKBk VzrIRfPzjS2HR8ZLJqmYCHqPaylx9UVru2yc3X/jXgeDmPxYqRuvKovGmv9dbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694296898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/CipLrMCA/ahrFowJyoS/zGnZgXw6UflNlv9JdLWh84=; b=j54lavruJPNw/7zeilO29tMleAzoUGGlk3kgc9u+IwJxzl4VUGrEuUSUEjhmERzbIgdP3W QL4cVhvxkJcl9ArSsEPCKWdllL27fg8+Z2Ah4la1GRoVpAsdJj0m1L+Wl7NDe3pyXx7tk7 xqgJCE+YSwrKd9aMGaAmO2j/PQ9utqc0OvZIcojZY5LgTlbT4lQp4GQ3K8/7/qNbOvr+Xq mLleYlmyGHQZ2Cz/CYOYP9j54KKvpstJ4srgyB3XdPiKWJAzG8QU4Ea5O69JneMDTxoLBo 31jD6EfRzDs7Xy9UoygPH079f7rrNP518tQ9uK8qDdSRAvgCE/k7cZkwIMAlnw== 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 4Rjn4d5tqCzhVB; Sat, 9 Sep 2023 22:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 389M1b7G014476; Sat, 9 Sep 2023 22:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 389M1bTV014473; Sat, 9 Sep 2023 22:01:37 GMT (envelope-from git) Date: Sat, 9 Sep 2023 22:01:37 GMT Message-Id: <202309092201.389M1bTV014473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3482f57f0fdf - main - netpfil/pf/pf.c: fix build without dtrace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3482f57f0fdf817d3384bd03289b796ff0863d7e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3482f57f0fdf817d3384bd03289b796ff0863d7e commit 3482f57f0fdf817d3384bd03289b796ff0863d7e Author: Konstantin Belousov AuthorDate: 2023-09-09 21:54:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-09-09 22:00:27 +0000 netpfil/pf/pf.c: fix build without dtrace Sponsored by: The FreeBSD Foundation --- sys/netpfil/pf/pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 9a571b1ee3d9..21d2e16e83dc 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5932,7 +5932,7 @@ pf_sctp_multihome_delayed(struct pf_pdesc *pd, int off, struct pfi_kkif *kif, struct pf_kstate *s) { struct pf_sctp_multihome_job *j, *tmp; - int action;; + int action __unused; struct pf_kstate *sm = NULL; struct pf_krule *ra = NULL; struct pf_krule *r = &V_pf_default_rule;