From nobody Sun Apr 23 05:16:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3xLV625wz46qsp; Sun, 23 Apr 2023 05:16: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 4Q3xLV4jDtz4Br4; Sun, 23 Apr 2023 05:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682226962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4nYHfHdVyyCZPhsRBPODRCAc5Ogg7U7idSFtIDxMuI=; b=XxDO9/Y4KI/A5X+b10sGcDEZogRsNP5zZi8tXM00w0iZ25s4lIaSp54VLx7FwE5fPDBO7W 0yW6F+ld7B+hy2gImV29wjrnYYnBsKp21GR2U+Ki7KKZYp1L3KJZByHAua0dMksxu6hxlw NK3ueJX80pPEPWoUINkuNbKJAT9VB1AggRAamm6n7PFzj9b6kEoHNrIsP4Z07ij7rMETPS UmJ4N5t3xPP327L1V3NkNeHm4vNrsyZ4JNqQZ/BFLt5lkz05MT2dUTzfTS6FwlSn4xjgqe w2+ocltfc6a9Cim4oincMgpDaQEGofddC+TzbmfhnCEBzlcbEbjKHd/rNTDjww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682226962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T4nYHfHdVyyCZPhsRBPODRCAc5Ogg7U7idSFtIDxMuI=; b=DbsUTG5Nd2bevttFFbe25js7iCdFBjePNienzx0XuJXP38sLizhd/i7jbB1X3hJ1NNJUVp TrMGaXAg79R57s7AANyLrpLIPG1ca9ZkO0cR2PQFIKqqoV80B7wjVUXeQGjPxtC039iKCF LOu7X5/UfpOyAKjQm2UjNXF+ksM2oim/qMYe9gCkYad5RW481910js/LO/XIIwezlMUE3e 1tS9GopZ//YnVuSXD/HEmwyeJ9QP92uVXcC5RJdXsasEy5W1cwxCmdOiqjuNcxF572wAkO 73J8tcdKWQ4uJuCECqrDE/g84PBRCncDus1a/eLoGXmdLAaewp1zcGmPrXc5kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682226962; a=rsa-sha256; cv=none; b=fDO77vhCXDID4J5VHiB5qeOD7pYEV+6db3gx+RKV/pY1VLn/+2K/2TVBxGITS75pCPP7w4 QfyqLsjQzRPzpcRKJq9XIrXuGYuDzbQSCFlQjpqtTySbA/StVK6ASzqXCROCbYZKV2LRSh thlUZ/ckh6y4rMtCaiT+d++Z3f908wmqvOdz/wLTgA8HgSOSpGvNB0uKdLpG1DG+RaZmUC 8WiChRdJ1NYvPwAqRkWN2eaOrmvSGDEL19tNmL4gQiP0j7tX9q4nOUVvMhaLfhLgfVbBS8 +LvhZ6rFV/WMzwcc1VAegxQL1qXF5avK/psNvPKf/cQZtoZedDcbxQrOmF7FDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3xLV3hqjzVf8; Sun, 23 Apr 2023 05:16:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N5G20Y071983; Sun, 23 Apr 2023 05:16:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N5G2fp071982; Sun, 23 Apr 2023 05:16:02 GMT (envelope-from git) Date: Sun, 23 Apr 2023 05:16:02 GMT Message-Id: <202304230516.33N5G2fp071982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: f8bab2c0fe49 - stable/13 - stand: Remove a double word in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f8bab2c0fe498444b4dc95fb82545e2876312766 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f8bab2c0fe498444b4dc95fb82545e2876312766 commit f8bab2c0fe498444b4dc95fb82545e2876312766 Author: Gordon Bergling AuthorDate: 2023-04-20 09:11:18 +0000 Commit: Gordon Bergling CommitDate: 2023-04-23 05:14:54 +0000 stand: Remove a double word in a source code comment - s/value value/value/ (cherry picked from commit 66095010d1f4e5ff4a7bc39020106103887a470e) --- stand/libsa/zfs/zfsimpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 865294dafed4..40ac3fc6622f 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -446,7 +446,7 @@ vdev_indirect_mapping_entry(vdev_indirect_mapping_t *vim, uint64_t index) * * It's possible that the given offset will not be in the mapping table * (i.e. no mapping entries contain this offset), in which case, the - * return value value depends on the "next_if_missing" parameter. + * return value depends on the "next_if_missing" parameter. * * If the offset is not found in the table and "next_if_missing" is * B_FALSE, then NULL will always be returned. The behavior is intended From nobody Sun Apr 23 05:16:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3xLW6XDyz46qnV; Sun, 23 Apr 2023 05:16: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 4Q3xLW59HXz4BrJ; Sun, 23 Apr 2023 05:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682226963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MEulfGbmGUm+vgAGSRAGzNfE4sDR9sZ6wWHGolma8O4=; b=mvsQElU2nZ7OqjIrIp9ZZ3aiAwDpn6srlOIb8VqL10oTOEo+ep4TikYRZwQVzdJf4w7Oag JIE3QZH5NZG9DEKvulgumznhirJOxMwJVKP8Or7Hs1wLW3dUaNOYOdKV/PhvFWdcrm3VKO 1HFXtSKGU6YLqxgbjtr1/XDdcz8A8OQrCVWUyHoQMH61AGxQxvIwPazoHWsdQfifEArOIT 82UdB4pdTUBmuTWaF6duCHgXUEXd2HyKxnKelVu76Us0uLGHhI4GvKR21F1+5Gybpoe/V5 5udR5VRELN76Y1ZYc2i06J1JKlbeTlhZq/UkRC9l9d7x2gC/Iyk/sSW64Xgd5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682226963; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MEulfGbmGUm+vgAGSRAGzNfE4sDR9sZ6wWHGolma8O4=; b=ePHUs8axx1ropvIjOF6I5xZLnDArHVAGiJkeJatHY+2V1SXmZVwbNY40376l5MGqrIsdoU h8bc20lTIZe+EqNnRGjLkW8+wjBJpRQfY0P7L81C/MPE4jylUZI7Mi2/wrdNe7GEPSXs3h 0KSI+9rtn8bM25iTSiaw9mpb9GUtYK4O1KC2W1vwbGRDgYH5mxH/veEWXV8vcYKRGAUErh n82P7Li2q8ZzeuN7bYSnXyxdwqCbCagl278dm+9/06s/2KSQhW7ZgaO9FLb0vdy5UJXSN3 gOSPRo1tYkSDQygN0S1aaLpMZgdYtnxVlPePOTrzgnAv0xGzuzaL6P922MXS4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682226963; a=rsa-sha256; cv=none; b=GJuEotJwCSKtyrSs1dnd7S8sxtoE2tPg0FI5rZmmozqK2GZMrBwYpODYTa/Fb0smQnI1GH 36eGADWSWKpfV5/I7PBPYpzMW2tS2TU2naeFeOOYX2jNa99O1qY5BfFg69bvali+iFiCPg q37I3yQDMRuTNbsNVSUSI/FgfkDK3OnE0fxvtbEGxSAe7BNFfS/QRkY2hIMOJI56xVNnO2 bXyMB5/u6vb6xqccy3xp83UalLLzEjIdZFCDK1jh4TgcUyhb1+s3DqvgAf1pnjEx39MVJe Ihp/GTcGBcdC8Qjx+gfg9hWzZ3AIZfi8umDSKb6krq2jP81JHOW3Ck8KRGlaxw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3xLW44YlzWHp; Sun, 23 Apr 2023 05:16:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N5G3gw072009; Sun, 23 Apr 2023 05:16:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N5G3OX072008; Sun, 23 Apr 2023 05:16:03 GMT (envelope-from git) Date: Sun, 23 Apr 2023 05:16:03 GMT Message-Id: <202304230516.33N5G3OX072008@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 22ded21f15a3 - stable/13 - last(1): Remove double words in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 22ded21f15a350e8aa3350c6be5b5a09108e2ccc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=22ded21f15a350e8aa3350c6be5b5a09108e2ccc commit 22ded21f15a350e8aa3350c6be5b5a09108e2ccc Author: Gordon Bergling AuthorDate: 2023-04-18 05:12:45 +0000 Commit: Gordon Bergling CommitDate: 2023-04-23 05:15:36 +0000 last(1): Remove double words in source code comments - s/on on/on/ - s/we we/we/ (cherry picked from commit 1190b82c2294762c77099fc52835d5d07b57e7a3) --- usr.bin/last/last.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index d197afe7eb0b..cc50bb924931 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -319,7 +319,7 @@ doentry(struct utmpx *bp) "crash" : "shutdown"; /* * if we're in snapshot mode, we want to exit if this - * shutdown/reboot appears while we we are tracking the + * shutdown/reboot appears while we are tracking the * active range */ if (snaptime && snapfound) From nobody Sun Apr 23 05:16:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3xLY3DrZz46qbX; Sun, 23 Apr 2023 05:16: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 4Q3xLY14T8z4CRl; Sun, 23 Apr 2023 05:16:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682226965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gffuie3qNWpQStZSXYBDvg0fbpU2v5qetFgnAiHUH8w=; b=ovJJi/i1sstqEjUINdyFfgUFVlhMy7WKmOnFuzeXumt6SZi6D+MB+DE1AZwKBS5pW6Ivxr P9/hnRLAIQOzA9i/ID4a1NESuPrDCkMvOffbNU121SoPKHXzMLmIsmYkecLwCGe07ooNEq lTIBIv2ROArhxiMTRzRQnM3iRWtrsXIPTqDX9gkyiSysfOE//WEUotZYfU02IpoikShFGS qe8BN1CRPJ66vZUXypCUsSMo+ikg7FoCrjLi9UfOarsLdYR2MQHERwYs/tLm+ZC/XuB9Ar WEKzgHRc5zErSHm/0ZE8f7SU3Px7Y4J9q8G/Prt9sFuHY6PFGHMEbYjrE6jurw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682226965; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gffuie3qNWpQStZSXYBDvg0fbpU2v5qetFgnAiHUH8w=; b=lhKSPi7C/p2BCP016vmvgod3mUs/LMIzuIXY4XjW0IGM9WaZhFsZVELZ1gnpsYmupUQBJ7 yHAHzX23R6xAarXl+BE+j5IaLTBsZbCWLyodu7OHZXvgBLfpjWRku4HSuoVxKvQQ5pY2FC 2KY4MbuAU6piqcA3vnulkpYNH7KC8Hz6ZJBh2y3Dr+TlQjmkQ2Ds4pawthsI5ATduJTIXa Efg2QvrzSJWYFt6C57Tk0JwnAeJv9FPeuhIqaDwQ5crvJdfUyPiian73jbSmonSnPjaIKb IA0yKyzITxUC8gBLkSGH+smvNJ0+bHgO9zlMARSmSzaFKNycoeggUp8S2V4Hww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682226965; a=rsa-sha256; cv=none; b=AMBQ8yNY53bLTbgXNnw+3rFxaqwIqVS4omSJbFWv6t4usSFPck7qI1Ysi8oqb82M3b2yw9 8ppy9ynaCCp02Dwvj9EFzIImB/jgLgkyakRE73vJexsRAaRyDvHyG95PSb6WjEA/h8MkgL Ks1v5d8CnXXg9qV80vXn1FnU4a2MthHX5c6Rf6YSS4zo/WmtG/pgnevXe2XtmLpFRXOE0t YKiS4obnADp2Rlf2nHZ4c8YYtHfm+0ulyvaJg5ffhjkB912So1U8j24Zi3wlK0dmJrhXWe IbcLsth2JBkIPPXi2buqDf1fuPi+k36Nvszq3zd5fdU6Hfxybf/jk3gLxXlbjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3xLX5JDpzWkb; Sun, 23 Apr 2023 05:16:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N5G4Im072029; Sun, 23 Apr 2023 05:16:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N5G4cw072028; Sun, 23 Apr 2023 05:16:04 GMT (envelope-from git) Date: Sun, 23 Apr 2023 05:16:04 GMT Message-Id: <202304230516.33N5G4cw072028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 73dafc6b2176 - stable/13 - net80211: Remove double words in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 73dafc6b2176711ea2048a502057e5a48c194db0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=73dafc6b2176711ea2048a502057e5a48c194db0 commit 73dafc6b2176711ea2048a502057e5a48c194db0 Author: Gordon Bergling AuthorDate: 2023-04-18 05:11:43 +0000 Commit: Gordon Bergling CommitDate: 2023-04-23 05:15:53 +0000 net80211: Remove double words in source code comments - s/we we/we/ (cherry picked from commit 93e491481686bb392b36a01e1569069846cf5f7e) --- sys/net80211/ieee80211_node.c | 4 ++-- sys/net80211/ieee80211_proto.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index bc8a240811de..341d77a48f5a 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1688,7 +1688,7 @@ ieee80211_find_vap_node(struct ieee80211_node_table *nt, /* * Fake up a node; this handles node discovery in adhoc mode. - * Note that for the driver's benefit we we treat this like + * Note that for the driver's benefit we treat this like * an association so the driver has an opportunity to setup * it's private state. */ @@ -1895,7 +1895,7 @@ ieee80211_init_neighbor(struct ieee80211_node *ni, /* * Do node discovery in adhoc mode on receipt of a beacon * or probe response frame. Note that for the driver's - * benefit we we treat this like an association so the + * benefit we treat this like an association so the * driver has an opportunity to setup it's private state. */ struct ieee80211_node * diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index 0e485590abd0..b504f0fe98af 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1687,7 +1687,7 @@ ieee80211_wme_updateparams_locked(struct ieee80211vap *vap) do_aggrmode = 1; /* - * IBSS? Only if we we have WME enabled. + * IBSS? Only if we have WME enabled. */ else if ((vap->iv_opmode == IEEE80211_M_IBSS) && (vap->iv_flags & IEEE80211_F_WME)) From nobody Sun Apr 23 05:16:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3xMX3SKfz46r6g; Sun, 23 Apr 2023 05:16: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 4Q3xMX2x0dz4Dvr; Sun, 23 Apr 2023 05:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682227016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V9L5+xnVI538kq0uVu+Wcv0UOyfmawfm0yMH09kLRBk=; b=UZNn6roR6b2deAvvu3hZhOs3ePVpCHXj1LOwCNpzWGGbdPNCbUO2/S/+v4ezz6TLnh2JD3 IchrpZQCFdLvmWIDWd9rsU3WbaDIS9MjggIUYVYV1aNCL1oauqd+TrUdM+5r8hFo+dta8k E5JjxUso/m0RtIPpfXWODn4v5jdGaxNKIkf/e3PdT8ASEZMLR4PW6Br+TKOZMF/ROGHAXC IHLVOTRC2vn2TkvYOVXoxRfHpwU86Gmt9+sNeeynr5onSDbr2bRzwsIx1Jnua/zl2DOEGV 25I8yZ0j2lINwgMAi/9tXe+IJVNYjEJCL1Z9r39/A6QJbB8gfCXpllqkR3nqmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682227016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V9L5+xnVI538kq0uVu+Wcv0UOyfmawfm0yMH09kLRBk=; b=xhhhqmedxHowrcuselFQ4vcnfta9hOcANIaYuo5Jfcqb+ynjbmuI/kn+vPw+D+DwVqhAHy Xuy6b1SQB1tBG+kMmRudth/4D2kGs2jJScpr6RCkl4dEAtlY1ZHb4pcwRdi569UlpC+13n tu0uCN2enpz0mZisQV5coMUuhR93SNGExtmZ6yxivKHMaVbm6+1h5HOCiFWK8hkV+RqW6h 6tDaZmlvVZddVQWyIGSBDIRC42QeY+ulibIQZ66emLTHu4VeGlt8GF6SZbhEbUDUz86Ton m2wuoIvzbLkEgJdKPxXA52cDx5Hpg27QhBI12kd1eLCZ2dadgVpjPFoVtOTKOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682227016; a=rsa-sha256; cv=none; b=Tnfq2ttC11A8h4tDXlVVewE0OEIiNnWyNrM7emvjp5gquki/WzUt7TW0l1LavThNSQWvrm LpYpzNEnuOLwhYJGgvJYTxKQOJi23j7nOnkzeGtmZ9ShLSr0WG6yvZWhZPxwPEvtsHFyK2 bN9/DpJwJ1Sm/j95pN/1gq9MWPnO8ZiFMBU1+9zwWMvSWjxS6jbZmRM7w6GiOABqsKNPHk 15CIXuicdMIQdTmp7WdeK6WBuJrhix73Zm0c1HAPpQyV7HXaHYU1abR8L2zx4STU1+OWSn 0TyjYsp/tiRFO3mOmuXXojZAA8fvDQdSghCPh3hK6OHpdOcZETqCNa4bYFFP9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3xMX20pQzWbX; Sun, 23 Apr 2023 05:16:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N5GuqX072249; Sun, 23 Apr 2023 05:16:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N5GuqK072248; Sun, 23 Apr 2023 05:16:56 GMT (envelope-from git) Date: Sun, 23 Apr 2023 05:16:56 GMT Message-Id: <202304230516.33N5GuqK072248@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 7e61ff285f50 - stable/12 - stand: Remove a double word in a source code comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7e61ff285f501c24be378cbd1e7dd1a343b6acab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7e61ff285f501c24be378cbd1e7dd1a343b6acab commit 7e61ff285f501c24be378cbd1e7dd1a343b6acab Author: Gordon Bergling AuthorDate: 2023-04-20 09:11:18 +0000 Commit: Gordon Bergling CommitDate: 2023-04-23 05:16:27 +0000 stand: Remove a double word in a source code comment - s/value value/value/ (cherry picked from commit 66095010d1f4e5ff4a7bc39020106103887a470e) --- stand/libsa/zfs/zfsimpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index 33f23f88f13a..b926e7a2c4e4 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -424,7 +424,7 @@ vdev_indirect_mapping_entry(vdev_indirect_mapping_t *vim, uint64_t index) * * It's possible that the given offset will not be in the mapping table * (i.e. no mapping entries contain this offset), in which case, the - * return value value depends on the "next_if_missing" parameter. + * return value depends on the "next_if_missing" parameter. * * If the offset is not found in the table and "next_if_missing" is * B_FALSE, then NULL will always be returned. The behavior is intended From nobody Sun Apr 23 05:16:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3xMY4rjHz46rBy; Sun, 23 Apr 2023 05:16: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 4Q3xMY3z63z4Dss; Sun, 23 Apr 2023 05:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682227017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7ZJxmFBWn2MeD2DHysFY0ZPaKhN0yQaZHPTkpAZ0mM=; b=bsq0LG5y9kfZ7Ew8oQZukYAs8T2Q+CHUwVNpdK2zi/7A2utEMQwb0Zdqdp4SZRxjpqKr7H jJCpkP5F9mniepFWBINFGt+2HmwrGIc5NoUIE63nhuqGzuSNjGE5j606kxB8MbXh1IVaKV yCt3w6yOh4Z5mBulaHj6Z0XndH/DD6qNt8wWpuv1Bq82Qi8GxZiWzH3wDYirB/Et49FNQT PQuBawaecehmiNsQ+IcmzEYX/phSuZ5WU1njOslszX6Bn8sTLphXxWcr+C9QP9YJVmrWe9 z0bEfoEqJSrrcZa7+MknwS0gLUofwvQ4Oa9qWV8ct1Zm4sxEVd1qjDQhoSpnMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682227017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F7ZJxmFBWn2MeD2DHysFY0ZPaKhN0yQaZHPTkpAZ0mM=; b=OiUifRlMNPh9mitTEVf1Uh7tE5GjYM+XIJzwfWJ/gBiRhfyNZSLLa4dv70jAJQVFvOnXjs Aiv9OKfp/hJ3EG4SFg29olSpWIm17pGmfzv46iShiVwvkGcggOcMGRtGm6n52XJeXLC67C yu9jFJ9JYQY4AmuIUqaYhN2H5pkyMlll3jwOYJdNZ01dugFWPIZgsu3vXGlUU+mX6biXA/ y8TY45FwG53Yu1t3TK7xP2Z5U1lRydhufqxUiTXZ2rVMX+1Nsi1c2DzON+l0l53O9qGmi4 w+c/pF0DzG999Lq9lQF5U9Ix/USbCLP+len1kYBcjzVtkHzQQ+tHegNLlXGCVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682227017; a=rsa-sha256; cv=none; b=NNsZsNSkWCXLlS1rnV68vCgKgeLziMYoHDLZvEz6TZGwMPheihnl7IOQKdM3R/xlZ5tMQU Az2KylHeptcBYsBa/jJQeJlCcPkGKKnEk65kLhmNsi62MgiqmyJ1pg9wJXliOhhytCYFHs ECUL1i/bZ7DhKbbMzvuNWOmzilNkV5Q1DtTskUJBhFX2fViNStI5HBbII4NH3aDtH2oeTp mKbxDvnM8w/Vw/dpOyZOMON6fSRVlVslYHg2O1niUYir8sWYjNpwV0+AzdISyHnm7z05yj cYJ5RBP5LFPDDBm/8voTRMAerEpZNIWLjDx/pc75b1ERl1/91JoihL+dxnVEXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3xMY2yRszWRs; Sun, 23 Apr 2023 05:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N5GvDX072268; Sun, 23 Apr 2023 05:16:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N5Gv9T072267; Sun, 23 Apr 2023 05:16:57 GMT (envelope-from git) Date: Sun, 23 Apr 2023 05:16:57 GMT Message-Id: <202304230516.33N5Gv9T072267@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 576efbba8693 - stable/12 - last(1): Remove double words in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 576efbba8693c7cbdcf8f1f7cb661ec62c4ffd53 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=576efbba8693c7cbdcf8f1f7cb661ec62c4ffd53 commit 576efbba8693c7cbdcf8f1f7cb661ec62c4ffd53 Author: Gordon Bergling AuthorDate: 2023-04-18 05:12:45 +0000 Commit: Gordon Bergling CommitDate: 2023-04-23 05:16:38 +0000 last(1): Remove double words in source code comments - s/on on/on/ - s/we we/we/ (cherry picked from commit 1190b82c2294762c77099fc52835d5d07b57e7a3) --- usr.bin/last/last.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/last/last.c b/usr.bin/last/last.c index d197afe7eb0b..cc50bb924931 100644 --- a/usr.bin/last/last.c +++ b/usr.bin/last/last.c @@ -319,7 +319,7 @@ doentry(struct utmpx *bp) "crash" : "shutdown"; /* * if we're in snapshot mode, we want to exit if this - * shutdown/reboot appears while we we are tracking the + * shutdown/reboot appears while we are tracking the * active range */ if (snaptime && snapfound) From nobody Sun Apr 23 05:16:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3xMZ6v5Kz46qhB; Sun, 23 Apr 2023 05:16: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 4Q3xMZ4j4Hz4FCx; Sun, 23 Apr 2023 05:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682227018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GoE/kK285mb4JvA3oTH4FWq3+JtW8KZSbiHm6L32yY=; b=DfjCRM4Tu7PlNBExxNxzmnEseDC+3Ejla+ty3my5s3A1Nv0aGaaS1OhTg7x3XMTWpJ94lx bPaeawsh4Eyo2UIfGj+dfKU/R4W18KaiFaufMxQzlRxYw/1Kvxk0lkcpFNkDbLhkE9QyNa /jW672oH8WvOmcNTVqTod0V/53M717Pw7UCsJq9Yn0r9OfKIWMz6afJxa4pRUdnIAjv6ye 4ScBouS7Vruhns2q/GJCk76t3VeWS91g5p9p/2curI5jJXwMU1CwNmcbBdp6vZ8NS3ZK4/ GkYSbGA2dTg/g9DYU2IYYz1auwcbdOTbMY3bDGMkpWqVZegyfhOqd8gR2GIJig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682227018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4GoE/kK285mb4JvA3oTH4FWq3+JtW8KZSbiHm6L32yY=; b=tyiIQZJLXxwD9sX8I0dK84rgMjjttHZCYVdNeJJNFnJRae9QQthjizFJCkSrZk1RTRCcV+ WoQ8Ub8wqmzDUvlJTxZDjRhqNu/qsam5KrqglSEGHxGrzri2fkqOtGKZZUmSk/cV8IRlag ynA5QQhkzfmHES8YxgKKfn9P25gRnJ6ah5I00kpF9oqpKveKs6TcAU8zmIuQgf6GbL659p 5HNLKlA/ZvUfLohy5v4Uq1Tsqtv/w+aa7v8aKQytlWlab1tTaKw7Q9hKvOyGkqmhT+0snL m9ZE08DgWJMjzSuIWh695qLwCCbPoby+7iQZpFVfIMBRun489rpRRoIAcNDgzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682227018; a=rsa-sha256; cv=none; b=k0APBMn/nheJthJctFCtyMNv0z6uHT8Tp1UyL3wk/7CoBvrrZTAJOCeZuBSTmBhJX6mzUc FaEQg3F+ZGYMkyHhTe7tFULkamXEjoNQO/IVHro7fQfU+9bgjQ6dw4yGNtiUgwE+g+knUA ngeJGV1DqWbt57dUZB9xQST04VTX63c7AiIQOpN+MrsnwmTfJ7G0Am+sQjTpENugWLNCHC x7Z0Eh77xXstzYh9IZXWAo2TRJJUrhIhYXTVxenIdu/3GWc8f125fsm0XTnBrmS/NNy9kf 0UY7Mfcb5nvrwBPDIQrSADVzwVQNVGOtYLOgrsZotDVI/McaeGD+hp/Hn9iVEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3xMZ3gK1zWds; Sun, 23 Apr 2023 05:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N5GwKp072287; Sun, 23 Apr 2023 05:16:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N5Gwp5072286; Sun, 23 Apr 2023 05:16:58 GMT (envelope-from git) Date: Sun, 23 Apr 2023 05:16:58 GMT Message-Id: <202304230516.33N5Gwp5072286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 1511a4136c11 - stable/12 - net80211: Remove double words in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 1511a4136c1149054c8401de2d662b35be315de3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1511a4136c1149054c8401de2d662b35be315de3 commit 1511a4136c1149054c8401de2d662b35be315de3 Author: Gordon Bergling AuthorDate: 2023-04-18 05:11:43 +0000 Commit: Gordon Bergling CommitDate: 2023-04-23 05:16:47 +0000 net80211: Remove double words in source code comments - s/we we/we/ (cherry picked from commit 93e491481686bb392b36a01e1569069846cf5f7e) --- sys/net80211/ieee80211_node.c | 4 ++-- sys/net80211/ieee80211_proto.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index 36dfea039df1..9ae9eb623ed8 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -1678,7 +1678,7 @@ ieee80211_find_vap_node(struct ieee80211_node_table *nt, /* * Fake up a node; this handles node discovery in adhoc mode. - * Note that for the driver's benefit we we treat this like + * Note that for the driver's benefit we treat this like * an association so the driver has an opportunity to setup * it's private state. */ @@ -1886,7 +1886,7 @@ ieee80211_init_neighbor(struct ieee80211_node *ni, /* * Do node discovery in adhoc mode on receipt of a beacon * or probe response frame. Note that for the driver's - * benefit we we treat this like an association so the + * benefit we treat this like an association so the * driver has an opportunity to setup it's private state. */ struct ieee80211_node * diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c index c7a2c8cdcea5..2afcfb964894 100644 --- a/sys/net80211/ieee80211_proto.c +++ b/sys/net80211/ieee80211_proto.c @@ -1674,7 +1674,7 @@ ieee80211_wme_updateparams_locked(struct ieee80211vap *vap) do_aggrmode = 1; /* - * IBSS? Only if we we have WME enabled. + * IBSS? Only if we have WME enabled. */ else if ((vap->iv_opmode == IEEE80211_M_IBSS) && (vap->iv_flags & IEEE80211_F_WME)) From nobody Sun Apr 23 06:24:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3ysd41Bhz46w3t; Sun, 23 Apr 2023 06:24: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 4Q3ysc6Yg0z3jgq; Sun, 23 Apr 2023 06:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682231076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rlZuSSJGHL6LDzq9Xn4He26TuPLFypOZhsuRYGHbvfw=; b=rpRUZfaHtDqGMxEYghNCAtzkr9bs4mR/4ItGPV+9zPzdCR50909OTt5mUNZLN0I5ZnKoJs G9vlwwWfsdCA4DfqNUyqVMz7sIBNjnNZow3UxjjrsTGXhBC/wjpDL+2vS08hb1nMTt8Ug6 z6g2PFMRI/VglT8kyy1TcXjeHf5ueUUga4RT2UEBYBd4sg8iSy7+5QRrYDRVSkpQt4g0wu aOuxTZ1xiV1bEQ1bIGpeKTVCZE18hcpHCQWoIjWftrEYinkmH1zIh83lr9OSxy905aOkva xz1RRh5PxdrX3veFzdGH6aCo53eR2nzsqwlguEB4U1cJiXoOVvjZvZRX5D52Gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682231076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rlZuSSJGHL6LDzq9Xn4He26TuPLFypOZhsuRYGHbvfw=; b=BM8ZgvIl6mu9ealS+QFU2xlaL+R3MH6Ow9M4vn3f/7pLPwiB9H5JkhFDzATGP5FYJuNMoQ etfjFj3lrCGjkS/Zts3JWHSf8WBIIHZxcqTkHQtX+UO9iIIWQ+62Guzk+9IVBtICoQTl52 1PA+PimkGxxNlX9Y8e/KsiHKfp9lE0f8GtX/f1yVNFbL+w+IiCVCZAoPvOM88hmXAIYVEi wd6tYzigrQoel9kav3EdQu7w6LgVXVi9U2I4udaVh3PLXbqDyLBVyITrwD9fc42Zank3pW 1j/JsI2GqwiEMY1MIhDzT2TcIQBp/vq+8SMZ+flwOZh56P+fNHAU+cvCBX4v5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682231076; a=rsa-sha256; cv=none; b=UDlhh9YxANkItBlKt1CM72I0BUAj0NMhXCyAekPALVye2SMo00FoKjYvKHSDrwow9Q2wcJ SVQcZ4iR3t2bvIX+/2iqPe/8NNhyPumg54VYcDh0wp25rD0xe/SoAF9FQztORsRDsCYtKD 81DmHBXuPxEIpFSWaW6yDjxwFBZEHsgTigoDX5RCJC5Svep8coSfu1e7CUxK1RksVw0sPo CZvS2XbmwEQxLyP40Q65r4pdqytZjk+7a+YxrfCTSn8EcrZqzzcDyQ63wpE1b9uG1GQl/2 wuYsy5YxRtdL3OYRzydHxlW5NcuveEpDSrvMYFNZDi0x0VtPCcWfXIOxEu+Shg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3ysc3yrSzY3s; Sun, 23 Apr 2023 06:24:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N6OaHH086905; Sun, 23 Apr 2023 06:24:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N6Oahb086904; Sun, 23 Apr 2023 06:24:36 GMT (envelope-from git) Date: Sun, 23 Apr 2023 06:24:36 GMT Message-Id: <202304230624.33N6Oahb086904@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: c34e421db383 - stable/13 - procctl: add state flags to PROC_REAP_GETPIDS reports List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c34e421db38321678ee3298d3a4c209130e7910c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c34e421db38321678ee3298d3a4c209130e7910c commit c34e421db38321678ee3298d3a4c209130e7910c Author: Val Packett AuthorDate: 2023-04-15 17:59:30 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-23 06:23:31 +0000 procctl: add state flags to PROC_REAP_GETPIDS reports (cherry picked from commit 77f0e198d9134b6ca2650d3a84d7db2d786ec0c0) --- lib/libc/sys/procctl.2 | 10 ++++++++-- sys/kern/kern_procctl.c | 6 ++++++ sys/sys/procctl.h | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/procctl.2 b/lib/libc/sys/procctl.2 index 02979e934451..89e4f2d33c64 100644 --- a/lib/libc/sys/procctl.2 +++ b/lib/libc/sys/procctl.2 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 2, 2021 +.Dd April 15, 2023 .Dt PROCCTL 2 .Os .Sh NAME @@ -302,7 +302,7 @@ of the process. The .Fa pi_flags field returns the following flags, further describing the descendant: -.Bl -tag -width REAPER_PIDINFO_REAPER +.Bl -tag -width REAPER_PIDINFO_EXITING .It Dv REAPER_PIDINFO_VALID Set to indicate that the .Vt procctl_reaper_pidinfo @@ -320,6 +320,12 @@ field identifies the direct child of the reaper. .It Dv REAPER_PIDINFO_REAPER The reported process is itself a reaper. The descendants of the subordinate reaper are not reported. +.It Dv REAPER_PIDINFO_ZOMBIE +The reported process is in the zombie state, ready to be reaped. +.It Dv REAPER_PIDINFO_STOPPED +The reported process is stopped by a SIGSTOP/SIGTSTP signal. +.It Dv REAPER_PIDINFO_EXITING +The reported process is in the process of exiting (but not yet a zombie). .El .It Dv PROC_REAP_KILL Request to deliver a signal to some subset of the descendants of the reaper. diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c index 9d48b04dde48..a4f675c2938e 100644 --- a/sys/kern/kern_procctl.c +++ b/sys/kern/kern_procctl.c @@ -234,6 +234,12 @@ reap_getpids(struct thread *td, struct proc *p, void *data) pip->pi_flags |= REAPER_PIDINFO_CHILD; if ((p2->p_treeflag & P_TREE_REAPER) != 0) pip->pi_flags |= REAPER_PIDINFO_REAPER; + if ((p2->p_flag & P_STOPPED) != 0) + pip->pi_flags |= REAPER_PIDINFO_STOPPED; + if (p2->p_state == PRS_ZOMBIE) + pip->pi_flags |= REAPER_PIDINFO_ZOMBIE; + else if ((p2->p_flag & P_WEXIT) != 0) + pip->pi_flags |= REAPER_PIDINFO_EXITING; i++; } sx_sunlock(&proctree_lock); diff --git a/sys/sys/procctl.h b/sys/sys/procctl.h index 0fcb62e94bb9..2d4b19325bbf 100644 --- a/sys/sys/procctl.h +++ b/sys/sys/procctl.h @@ -102,6 +102,9 @@ struct procctl_reaper_pidinfo { #define REAPER_PIDINFO_VALID 0x00000001 #define REAPER_PIDINFO_CHILD 0x00000002 #define REAPER_PIDINFO_REAPER 0x00000004 +#define REAPER_PIDINFO_ZOMBIE 0x00000008 +#define REAPER_PIDINFO_STOPPED 0x00000010 +#define REAPER_PIDINFO_EXITING 0x00000020 struct procctl_reaper_pids { u_int rp_count; From nobody Sun Apr 23 09:33:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q433b6FBYz4775R; Sun, 23 Apr 2023 09:33: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 4Q433b14nQz3JVy; Sun, 23 Apr 2023 09:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682242411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRxEdZwPxKh381NLpZbQmkTeuq85acNmiNK9WnXWP8k=; b=SVWHe4QXhwxFdDxpWyLmEy/L3czGLeVQsh1CtIj+0vf1JWbZooPYQFLR7CkiwslIPleNXh ov1F5tAzmicFVY78cxq2TPSeiw6DyWNKiTfLQJZhpHjDpXnoQgZpkaRF3pWcLqCN/yVbAi Ga8uDibro4JQEpgOsKMGG0op71RY0ZMuiCBIsfgrUm1ctKL4iwu4aeC2f7iy5lseDyksDQ cDmPe93uNSk4LuDt/9P09kScKEVhnpO5F3HMEHdHzVXYBgFSm1Ybj4k1m0dxmUESwpslKV PiPtj1IQy5U6KUa18Z9wD9JfYqbfPE/cDdGSwz9GW1Cbaghr4kX1dbZ1rllxEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682242411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WRxEdZwPxKh381NLpZbQmkTeuq85acNmiNK9WnXWP8k=; b=JO/8l9IlBQeAmYtrHUtukid0umc9zcPxa8gUj1VO0u1YzhFLJhiMNAKib+mGdu5wVL2Gvv iH25Q4WVG0XrQonJ99C3pKkAtjzwca47AicGMcxeDRzjovuJ+bp6ziO2HT14e8Mqw4gIb8 wA4BtU90kF6syJjZae5z1ML+A7uuRn0x4Ksv9577WRdPGAengqnOYRjxR2lwQMCe3oS9rZ JSBTSGzuYBEF5890MiKQmKh9x3UjldY2OoISMjoGkGuOpFRgLpsezvJujbWix/LBVzEyDh 9ZTQXfpJbJduN8VwjYdwel7E34z1cofNfDJe6KnPfhHAhZU5DGZJWLBcbD5r8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682242411; a=rsa-sha256; cv=none; b=uekEF86NiRg2p5GKifZ+p8D7X198BTFbMC/nuMVokCm30zmILS+tuloP5nVoPY/+GWKMec navQGdxbfppbmB17Fupmrj9yf2R8J51An58o8UjRA8X69kRyftaqgqyYg5MvK4Jt+Tx9/e nmXffTEsn3rvlrzOe+2SpCdy1//wOY5u2j1DVMclAWNiAWL/+kPdMJDg1DmBJrH9k9CTYW Lwk5+q0BFlKzCnCVoENRj69tHGmCymx56jfjT+adPpTCbfB4kx2d8QRVZMYh0U/lnmBCy3 SFgTielAxo8HBrBca3RP3ZgSnCB40XTQEKMNOeBBoYik/z5nT23/SpSwAYHkAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q433b0B4hzf5w; Sun, 23 Apr 2023 09:33:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N9XUZO002807; Sun, 23 Apr 2023 09:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N9XUbX002806; Sun, 23 Apr 2023 09:33:30 GMT (envelope-from git) Date: Sun, 23 Apr 2023 09:33:30 GMT Message-Id: <202304230933.33N9XUbX002806@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: 4b0899ae6686 - stable/13 - kern.mk: clang >= 16 already infers ELFv2 for powerpc64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 4b0899ae6686fad5e1ef6dec6e812c94ffadcca1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0899ae6686fad5e1ef6dec6e812c94ffadcca1 commit 4b0899ae6686fad5e1ef6dec6e812c94ffadcca1 Author: Dimitry Andric AuthorDate: 2023-04-20 19:27:11 +0000 Commit: Dimitry Andric CommitDate: 2023-04-23 09:25:16 +0000 kern.mk: clang >= 16 already infers ELFv2 for powerpc64 There is no need to pass -mabi=elfv2 explicitly anymore, and with clang 16 in fact results in a "unused argument" warning. MFC after: 3 days (cherry picked from commit 42140052765e05c83a3ea797dce3eaad94bc3733) --- sys/conf/kern.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 4abef91c7805..87e788666efb 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -208,7 +208,8 @@ CFLAGS.gcc+= -mno-spe # Use dot symbols (or, better, the V2 ELF ABI) on powerpc64 to make # DDB happy. ELFv2, if available, has some other efficiency benefits. # -.if ${MACHINE_ARCH:Mpowerpc64*} != "" +.if ${MACHINE_ARCH:Mpowerpc64*} != "" && \ + ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 160000 CFLAGS+= -mabi=elfv2 .endif From nobody Sun Apr 23 09:33:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q433r3BWhz477T9; Sun, 23 Apr 2023 09:33: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 4Q433q6ZLSz3KM8; Sun, 23 Apr 2023 09:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682242424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gYyEzayVbLcNUGTN3SZoOIVcvK2yJ4xEaVn+Afo3Kpc=; b=wKSWJko8FYAcVWkecH65iUGagovNKu3GvX//XnBM1HMvlfblq1hNhX66VCLA71Lt9qhq2/ slgKCFSoklil96xvDV8dyaOj9B+JgXoEz3325EomDOKF/9GBaHBv02bKLhdgOs5W1PSwKZ lldbIQw88tNqvqTPkX6N1UPoxDXAzmlcfsWv0KiSUDx1KYNH5N79c4xJQxY8bXn19MalX9 wjn35ov6tyk1Dj80uNZKmBJqihn23/LxbvfkcxkY/pMvu6L7XmW6l9gTTEbRbSkyNJTPW7 RjmdeLv7TPsK/3K65fuKGeMAP8sMHAyPKFTLTeme6PIZP9sY+TVn0pRCkEqf3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682242424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gYyEzayVbLcNUGTN3SZoOIVcvK2yJ4xEaVn+Afo3Kpc=; b=a8+vhIkPunibGW2gNaestZfJXNp4CQSPl7H6uHiyDbNLsv1FqM/6jVi2bD0ZzhP4jIDBsu uOH+FkW9QUvvFhB3bONv1xVcZYi42/5mZGFaMTNLS/gRh8gkUA8vyHOMHPUbnUdnhCunAG JNokqR3bRYt5nfOynbSII9gU3q2Aq37Z+R2fdf03gRNqriJNE+WNhJf9ry/HPlKOaPY+pB Jz29Zakiwsap4KthUMDo2+CONzOfVB57HFOEm7940K1ZFL6c/BshSxxFdF70GjNkxClo0m huGLfSQIgsZgrcw5nOu1w3VU5herVK69++AII1QEWh/6CsxW5pxtnG48iSkfYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682242424; a=rsa-sha256; cv=none; b=ZRbj+D1o9+csLScFuG+jIYU5EGKGlh940fnGyFEm+ySo5Cm+XZomCqyIhrFV2dm9FjIiL2 pX9SrIt0W8JoALaNxA5V5Qj7FeznYcx4kPNpuJJEDLDD9pg5sAIT9bqPby2qZMWAO+koQa u0fp6FVwEAbgMDLyUYQClaMqvZIvVdi8IA7B2mlWWelmrFhKIK59a+1JXZjqb8zXh8WWxC Au40NU8UL2pGTpNmNqYSRYssekk36jI14fV5oozHrCH47HqoMMYDnjigmmI7EUHOUaNTJ1 uZfpBP2VEAHMCgfUK/D3u//ZTl+9F9LH5F3RN80qROL40yrwYdBpEh58JWP9gg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q433q59zWzdk1; Sun, 23 Apr 2023 09:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33N9Xhgn002951; Sun, 23 Apr 2023 09:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33N9Xh7j002950; Sun, 23 Apr 2023 09:33:43 GMT (envelope-from git) Date: Sun, 23 Apr 2023 09:33:43 GMT Message-Id: <202304230933.33N9Xh7j002950@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: 4c1575e360c5 - stable/12 - kern.mk: clang >= 16 already infers ELFv2 for powerpc64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 4c1575e360c5a3fb048de69762c039de9583b1b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4c1575e360c5a3fb048de69762c039de9583b1b2 commit 4c1575e360c5a3fb048de69762c039de9583b1b2 Author: Dimitry Andric AuthorDate: 2023-04-20 19:27:11 +0000 Commit: Dimitry Andric CommitDate: 2023-04-23 09:33:12 +0000 kern.mk: clang >= 16 already infers ELFv2 for powerpc64 There is no need to pass -mabi=elfv2 explicitly anymore, and with clang 16 in fact results in a "unused argument" warning. MFC after: 3 days (cherry picked from commit 42140052765e05c83a3ea797dce3eaad94bc3733) --- sys/conf/kern.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index f1e59f2ce497..bbae4ee22009 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -226,8 +226,10 @@ CFLAGS.gcc+= -mabi=elfv2 .else CFLAGS.gcc+= -mcall-aixdesc .endif +.if ${COMPILER_VERSION} < 160000 CFLAGS.clang+= -mabi=elfv2 .endif +.endif # # For MIPS we also tell gcc to use floating point emulation From nobody Sun Apr 23 10:16:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q441S1LrZz47BBH; Sun, 23 Apr 2023 10:16: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 4Q441S0f60z3kYy; Sun, 23 Apr 2023 10:16:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682245004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaDDp49ilAHquSazTVwOFpZtOXaTR87pwpOHolGyhyk=; b=lBIQjdDqlvrywF03pDTmsaiFqzNqlEa6ocSQM1gUH2lc6cIi1dAFRpORiya5IQtQwi0Zzw BXx/Y+NuqQRjUeh4iVCluc43aDv9H6eCWwZ5LGVZ90H8EGA/qFosvtOAFj9KZL42nHnbZ/ u5JaybYiH6jLT3Iy4ExJmv0pY3QiAdxh9jvgdbx+/TqhuY7gg5pCK4hX3tms0E9TTbjw3t w/d9rmLHGML0ACvBvstGMtKiGCq6Bo24Iha5Fd34U0+5zsoi5/p0qhs3aOyzimRozn0OgN YxFZyN/TlP4/RInYz2qBKB/Zv91jQ3emH6o/YK1mmjd8TC2oInCBvJ+N+JsUwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682245004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vaDDp49ilAHquSazTVwOFpZtOXaTR87pwpOHolGyhyk=; b=cHoCavv9pcKjpn7gSD5IvQNsvlWCD9cwULXPLRgToRAB2BMBtr765fUgdZ+g2NPBslgpKe 5SPvsVDgl3TjbADFkEZh+rI/cW28oVoLnlvHE2fn1zY+KjbX9U2D21y+Ey0DvqQXBujk8w Zn6epk0qDhxqaQts6T2O1bMaOk75Rgqk5XOlA9KsySXnbyDq3ppg4UIwCvaPX86LbKS4Di To0wViUFRq4rWN4/O2T0GZroCQi1bkZ4CyhDCxMtXZXyv0/0q1ZGF2pglV3Bj9vQsWSN4Q ac+PnC0Oua2Jf4IiSVtezUBH2PsU23RVUIEdYn+WvYYqk919KVRQcYZfH9c/oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682245004; a=rsa-sha256; cv=none; b=jsXur9OR7v5H1ncfuw9svFKe4c2A/FYPqJyBh/nuAKtRdozNNUYGmRYNAFT3S3SKpX09Dm /6fv65ES1XEexa+qeB3TePJV4Gvri/gZptmbzQKY8MWDQaa+LKPqRABOYBL01YrOj+73c8 pf2g4qnlyik4QlZU+Rw5kANYQFOvoRQKjibXVvRwBrFYcawrx4PN3fTrLpkgThg1TKl1gS 4/YEjgqerQQhEFn05X0/TIf5QTNfoGwr5IVOikXO8LnyTA405GFfuCJY6D9qJfjAWbSyFQ v/PVx4nL944CGdNJFnQUMvIdG9RPP1zKNWJXxqlh1hkul6QSkaqbQsOB1Ijmxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q441R6rSbzfjd; Sun, 23 Apr 2023 10:16:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33NAGh2J070391; Sun, 23 Apr 2023 10:16:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33NAGcib070375; Sun, 23 Apr 2023 10:16:38 GMT (envelope-from git) Date: Sun, 23 Apr 2023 10:16:38 GMT Message-Id: <202304231016.33NAGcib070375@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: 7005cd440405 - stable/13 - zfs: merge openzfs/zfs@e25f9131d (zfs-2.1-release) into stable/13 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 7005cd44040529b55573cff6212fde9e3d845215 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=7005cd44040529b55573cff6212fde9e3d845215 commit 7005cd44040529b55573cff6212fde9e3d845215 Merge: 4b0899ae6686 e25f9131d679 Author: Martin Matuska AuthorDate: 2023-04-23 10:12:49 +0000 Commit: Martin Matuska CommitDate: 2023-04-23 10:12:49 +0000 zfs: merge openzfs/zfs@e25f9131d (zfs-2.1-release) into stable/13 OpenZFS release 2.1.11 Notable upstream pull requeset merges: #13368 ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced() (reverted) #13758 Allow mounting snapshots in .zfs/snapshot as a regular user #13816 Fix a race condition in dsl_dataset_sync() when activating features #14039 Optimize microzaps #14196 Remove atomics from zh_refcount #14198 Switch dnode stats to wmsums #14199 Remove few pointer dereferences in dbuf_read() #14200 Micro-optimize zrl_remove() #14218 Avoid a null pointer dereference in zfs_mount() on FreeBSD #14293 Turn default_bs and default_ibs into ZFS_MODULE_PARAMs #14317 Pack zrlock_t by 8 bytes #14402 Prefetch on deadlists merge #14418 Introduce minimal ZIL block commit delay #14448 Fix console progress reporting for recursive send #14454 Improve arc_read() error reporting #14502 Partially revert f806306ce0 "Activate filesystem features only in syncing context" #14516 System-wide speculative prefetch limit #14523 Move dmu_buf_rele() after dsl_dataset_sync_done() #14563 Optimize the is_l2cacheable functions #14573 Add missing increment to dsl_deadlist_move_bpobj() #14621 Colorize patchset #14639 FreeBSD: Remove extra arc_reduce_target_size() call #14641 Additional limits on hole reporting #14653 Update vdev state for spare vdev #14712 Fix "Add colored output to zfs list" #14761 Revert "ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()" Obtained from: OpenZFS OpenZFS tag: zfs-2.1.11 OpenZFS commit: e25f9131d679692704c11dc0c1df6d4585b70c35 Relnotes: yes .../.github/workflows/build-dependencies.txt | 57 + .../.github/workflows/checkstyle-dependencies.txt | 2 + .../openzfs/.github/workflows/checkstyle.yaml | 23 +- .../workflows/scripts/reclaim_disk_space.sh | 23 + .../.github/workflows/zfs-tests-functional.yml | 38 +- .../openzfs/.github/workflows/zfs-tests-sanity.yml | 40 +- sys/contrib/openzfs/.github/workflows/zloop.yml | 22 +- sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/arc_summary/Makefile.am | 7 +- sys/contrib/openzfs/cmd/arc_summary/arc_summary2 | 1180 -------------------- sys/contrib/openzfs/cmd/arc_summary/arc_summary3 | 14 +- sys/contrib/openzfs/cmd/arcstat/arcstat.in | 2 +- sys/contrib/openzfs/cmd/dbufstat/dbufstat.in | 2 +- sys/contrib/openzfs/cmd/zed/agents/zfs_agents.c | 56 +- sys/contrib/openzfs/cmd/zed/agents/zfs_mod.c | 21 +- sys/contrib/openzfs/cmd/zed/agents/zfs_retire.c | 115 +- sys/contrib/openzfs/cmd/zfs/zfs_main.c | 63 +- sys/contrib/openzfs/cmd/zpool/zpool_main.c | 37 +- sys/contrib/openzfs/cmd/ztest/ztest.c | 2 +- sys/contrib/openzfs/config/always-python.m4 | 25 +- sys/contrib/openzfs/config/always-pyzfs.m4 | 7 +- sys/contrib/openzfs/config/kernel-blkdev.m4 | 55 + .../openzfs/config/kernel-generic_io_acct.m4 | 98 +- sys/contrib/openzfs/config/zfs-build.m4 | 35 +- .../openzfs/contrib/dracut/90zfs/Makefile.am | 1 + .../contrib/dracut/90zfs/module-setup.sh.in | 3 + .../contrib/dracut/90zfs/zfs-env-bootfs.service.in | 15 +- .../contrib/dracut/90zfs/zfs-generator.sh.in | 67 +- .../openzfs/contrib/dracut/90zfs/zfs-lib.sh.in | 2 +- .../90zfs/zfs-nonroot-necessities.service.in | 20 + .../dracut/90zfs/zfs-rollback-bootfs.service.in | 3 +- .../dracut/90zfs/zfs-snapshot-bootfs.service.in | 3 +- .../openzfs/contrib/initramfs/scripts/Makefile.am | 1 + sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 11 +- sys/contrib/openzfs/contrib/pyzfs/setup.py.in | 9 +- sys/contrib/openzfs/include/libzfs.h | 4 + sys/contrib/openzfs/include/libzutil.h | 16 + .../include/os/linux/kernel/linux/blkdev_compat.h | 38 +- .../openzfs/include/os/linux/spl/sys/Makefile.am | 1 + .../openzfs/include/os/linux/spl/sys/misc.h | 29 + sys/contrib/openzfs/include/sys/arc_impl.h | 1 + sys/contrib/openzfs/include/sys/bpobj.h | 1 + sys/contrib/openzfs/include/sys/btree.h | 15 +- sys/contrib/openzfs/include/sys/dnode.h | 35 +- sys/contrib/openzfs/include/sys/fs/zfs.h | 1 + sys/contrib/openzfs/include/sys/spa.h | 2 +- sys/contrib/openzfs/include/sys/vdev.h | 3 + sys/contrib/openzfs/include/sys/vdev_impl.h | 3 + sys/contrib/openzfs/include/sys/zap_impl.h | 11 +- sys/contrib/openzfs/include/sys/zfs_context.h | 1 + sys/contrib/openzfs/include/sys/zfs_znode.h | 4 +- sys/contrib/openzfs/include/sys/zrlock.h | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs.abi | 32 +- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 6 +- sys/contrib/openzfs/lib/libzfs/libzfs_pool.c | 36 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 63 +- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 15 +- .../openzfs/lib/libzfs_core/libzfs_core.abi | 26 + sys/contrib/openzfs/lib/libzutil/Makefile.am | 1 + .../lib/libzutil/os/linux/zutil_setproctitle.c | 299 +++++ sys/contrib/openzfs/man/man4/zfs.4 | 15 +- sys/contrib/openzfs/man/man7/dracut.zfs.7 | 16 +- sys/contrib/openzfs/man/man8/zfs-send.8 | 24 +- sys/contrib/openzfs/man/man8/zfs.8 | 2 + sys/contrib/openzfs/man/man8/zpool.8 | 2 + sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 2 - .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 8 - .../openzfs/module/os/freebsd/zfs/zvol_os.c | 3 + .../openzfs/module/os/linux/spl/spl-generic.c | 33 + .../openzfs/module/os/linux/zfs/qat_compress.c | 2 +- .../openzfs/module/os/linux/zfs/vdev_disk.c | 24 +- .../openzfs/module/os/linux/zfs/zfs_znode.c | 14 +- sys/contrib/openzfs/module/zfs/arc.c | 24 +- sys/contrib/openzfs/module/zfs/bpobj.c | 65 +- sys/contrib/openzfs/module/zfs/btree.c | 52 +- sys/contrib/openzfs/module/zfs/dbuf.c | 69 +- sys/contrib/openzfs/module/zfs/dmu.c | 32 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 36 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 1 + sys/contrib/openzfs/module/zfs/dmu_zfetch.c | 29 +- sys/contrib/openzfs/module/zfs/dnode.c | 140 ++- sys/contrib/openzfs/module/zfs/dsl_crypt.c | 3 - sys/contrib/openzfs/module/zfs/dsl_dataset.c | 45 +- sys/contrib/openzfs/module/zfs/dsl_deadlist.c | 71 +- sys/contrib/openzfs/module/zfs/dsl_pool.c | 1 + sys/contrib/openzfs/module/zfs/dsl_scan.c | 15 + sys/contrib/openzfs/module/zfs/spa.c | 27 +- sys/contrib/openzfs/module/zfs/spa_config.c | 16 +- sys/contrib/openzfs/module/zfs/spa_misc.c | 4 +- sys/contrib/openzfs/module/zfs/vdev.c | 59 + sys/contrib/openzfs/module/zfs/zap_leaf.c | 4 +- sys/contrib/openzfs/module/zfs/zap_micro.c | 241 ++-- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 6 +- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 2 +- sys/contrib/openzfs/module/zfs/zil.c | 36 +- sys/contrib/openzfs/module/zfs/zio.c | 2 +- sys/contrib/openzfs/module/zfs/zrlock.c | 8 +- sys/contrib/openzfs/rpm/generic/zfs-dkms.spec.in | 6 +- sys/contrib/openzfs/rpm/generic/zfs-kmod.spec.in | 11 +- sys/contrib/openzfs/rpm/generic/zfs.spec.in | 81 +- sys/contrib/openzfs/scripts/Makefile.am | 2 +- sys/contrib/openzfs/scripts/zfs-tests.sh | 22 +- sys/contrib/openzfs/tests/Makefile.am | 1 + .../tests/test-runner/bin/test-runner.py.in | 83 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 10 +- .../openzfs/tests/test-runner/man/test-runner.1 | 2 + .../openzfs/tests/zfs-tests/include/commands.cfg | 2 - .../openzfs/tests/zfs-tests/include/libtest.shlib | 2 +- .../cli_root/zfs_program/zfs_program_json.ksh | 16 +- .../cli_root/zfs_send/zfs_send_006_pos.ksh | 32 +- .../functional/fault/auto_offline_001_pos.ksh | 27 +- .../tests/functional/pyzfs/pyzfs_unittest.ksh.in | 2 +- .../functional/rsend/send_encrypted_files.ksh | 2 +- .../functional/rsend/send_realloc_dnode_size.ksh | 2 +- sys/modules/zfs/zfs_config.h | 19 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 116 files changed, 2194 insertions(+), 1972 deletions(-) diff --cc sys/contrib/openzfs/.github/workflows/build-dependencies.txt index 000000000000,73921865c42a..73921865c42a mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/workflows/build-dependencies.txt +++ b/sys/contrib/openzfs/.github/workflows/build-dependencies.txt diff --cc sys/contrib/openzfs/.github/workflows/checkstyle-dependencies.txt index 000000000000,cc68905d8d36..cc68905d8d36 mode 000000,100644..100644 --- a/sys/contrib/openzfs/.github/workflows/checkstyle-dependencies.txt +++ b/sys/contrib/openzfs/.github/workflows/checkstyle-dependencies.txt diff --cc sys/contrib/openzfs/.github/workflows/scripts/reclaim_disk_space.sh index 000000000000,ed23ce31d85c..ed23ce31d85c mode 000000,100755..100755 --- a/sys/contrib/openzfs/.github/workflows/scripts/reclaim_disk_space.sh +++ b/sys/contrib/openzfs/.github/workflows/scripts/reclaim_disk_space.sh diff --cc sys/contrib/openzfs/contrib/dracut/90zfs/zfs-nonroot-necessities.service.in index 000000000000,8f420c737c72..8f420c737c72 mode 000000,100644..100644 --- a/sys/contrib/openzfs/contrib/dracut/90zfs/zfs-nonroot-necessities.service.in +++ b/sys/contrib/openzfs/contrib/dracut/90zfs/zfs-nonroot-necessities.service.in diff --cc sys/contrib/openzfs/include/os/linux/spl/sys/misc.h index 000000000000,299fe9c1ab07..299fe9c1ab07 mode 000000,100644..100644 --- a/sys/contrib/openzfs/include/os/linux/spl/sys/misc.h +++ b/sys/contrib/openzfs/include/os/linux/spl/sys/misc.h diff --cc sys/contrib/openzfs/lib/libzutil/os/linux/zutil_setproctitle.c index 000000000000,4a6d12cf70cf..4a6d12cf70cf mode 000000,100644..100644 --- a/sys/contrib/openzfs/lib/libzutil/os/linux/zutil_setproctitle.c +++ b/sys/contrib/openzfs/lib/libzutil/os/linux/zutil_setproctitle.c diff --cc sys/modules/zfs/zfs_config.h index 90c8cd12b042,000000000000..36a8a00a1d44 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,984 -1,0 +1,993 @@@ +/* + * $FreeBSD$ + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ - /* #undef HAVE_BDEV_IO_ACCT */ ++/* #undef HAVE_BDEV_IO_ACCT_63 */ ++ ++/* bdev_*_io_acct() available */ ++/* #undef HAVE_BDEV_IO_ACCT_OLD */ ++ ++/* bdev_kobj() exists */ ++/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAPPED */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* kernel has asm/fpu/xcr.h */ +/* #undef HAVE_KERNEL_FPU_XCR_HEADER */ + +/* kernel fpu and XSAVE internal */ +/* #undef HAVE_KERNEL_FPU_XSAVE_INTERNAL */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + ++/* part_to_dev() exists */ ++/* #undef HAVE_PART_TO_DEV */ ++ +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + +/* fops->iterate() is available */ +/* #undef HAVE_VFS_ITERATE */ + *** 222 LINES SKIPPED *** From nobody Mon Apr 24 10:00:20 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q4gc4618Yz46bXZ; Mon, 24 Apr 2023 10:00: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 4Q4gc45TTbz40S2; Mon, 24 Apr 2023 10:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682330420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5ad7BREHpSfa+XbEpr8vHmWPjR4R2/2huNoWS96a8c=; b=cqvieqpP/5LoHp5x0KJXAwKLilM1vUbQzvJjXDp6Znw1gQ2PCrfr1ZXz4Lrh4hEtC5xiIK lSKqSpNDXRTXKHmMyBPd165Wbkq6JF40pbMDIi7jpvF7O+DcoO9JLLnGA1Hib3JlNsAFwg iy38uYPRrj9+wuenxe3SkPpun/5VMbX+lmBH9qUcAVT69o5zGsUXNgRbR0g2+ykoS2prLk tOSIXCbRpVC9PqHzSGtiFE8DAXJaglK5oaKonggRhCdwAAHpLfdmgl2tKOxNAiWLBorGzA u7D+GV3aO3ehfqH57KfXCfFzsmNmIkzjDhbDZ9LUhbX1d7myfz7tjhpdEXJIGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682330420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S5ad7BREHpSfa+XbEpr8vHmWPjR4R2/2huNoWS96a8c=; b=BLh+7cseJtQ83FIIpGKK/VRbN9IXtFgCDdYGomg+874Vp4Kbjbi/hbM6i0w21QqFaBiPfI u0pPVDJt0QmvNqBmXdgAuo+g50ExwrtYDWh5Gf3P7Sc/ZZsLPI5bXkd0o2ODaJ3+aaqhml /SG9gxHoMm3LlN9X3Gy02h7INwHKqOo0l4GcgV71m561hFySkEK1ZmUZrgiex0StHDmv/q NHXQe0q3mwGPKhGu436uVvKnC57o7NPiXaUTC6aP9gHrMztdCSAiBKSWWV1C7EHOzLfsyP tF738p9oAqjKKqk2KZ8jycz7FXZqe50meVtQWhpvCEp/0L1Si9AaquPXg60s4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682330420; a=rsa-sha256; cv=none; b=J1kgnYcJIOIIZRGIpRWhFXhv7UvZO9suVx3fg67y4l+CxYPmGRNutxYxgr8akOfL+cZkvt vB1Z+1DaM3K3+58WhBM+Wqs9zLMX2pVKu4GnzqCQt72ZK6sqtNW7xl9ol6jwLFPOtnPnua evWh+t8WbCbQTDIkH76MCGWqrHEgl+wXmNinqjWL+Kt2Zc7QvI+O+w/GlxiuaWi33jEzTv pixp+RXn6MrUd5j5uLDgAERYv8eFcHU3YxVul8SKcIM0gZBIhEnSidoUzTTevEbZfwrdSC dYT84Auwqg6PxE+cWyv8eyP/J2676fY9MG+PCL3M4IxpC5C6We8oP/CIgzHEHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q4gc44ZLCzLkG; Mon, 24 Apr 2023 10:00:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33OA0K8f015885; Mon, 24 Apr 2023 10:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OA0KOW015884; Mon, 24 Apr 2023 10:00:20 GMT (envelope-from git) Date: Mon, 24 Apr 2023 10:00:20 GMT Message-Id: <202304241000.33OA0KOW015884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: eb2e52fb2045 - stable/13 - vmrun.sh: Fix a typo in usage() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: eb2e52fb204552a0fd09f9b685029e9fcea8f973 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=eb2e52fb204552a0fd09f9b685029e9fcea8f973 commit eb2e52fb204552a0fd09f9b685029e9fcea8f973 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-04-20 12:43:57 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-04-24 09:59:58 +0000 vmrun.sh: Fix a typo in usage() MFC after: 3 days Sponsored by: Klara Inc. (cherry picked from commit 607bc91d90a34f4d75cb7738bf23bc4517cd327f) --- share/examples/bhyve/vmrun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh index 9770ff459a67..1ef310b07e92 100755 --- a/share/examples/bhyve/vmrun.sh +++ b/share/examples/bhyve/vmrun.sh @@ -83,7 +83,7 @@ usage() { "(default: ${DEFAULT_ISOFILE})" echo " -l: the OS loader to use (default: /boot/userboot.so)" echo " -L: IP address for UEFI GOP VNC server" \ - "(default: ${DEFAULT_VNCHOST}" + "(default: ${DEFAULT_VNCHOST})" echo " -m: memory size (default: ${DEFAULT_MEMSIZE})" echo " -n: network adapter emulation type" \ "(default: ${DEFAULT_NIC})" From nobody Mon Apr 24 16:16:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q4qy81P4dz473CB; Mon, 24 Apr 2023 16:16: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 4Q4qy80L2pz49KQ; Mon, 24 Apr 2023 16:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682352992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9S0UfgQ/BbfimqUX9wZlfZgRVebNX15GsbEq9Oqa3Yc=; b=i4sE8FE3czhq7cCP0AaGJu3P3eiOkJXUJHto+eB+P0JVcnDARkRyzzTKug7kerit5Bdw/e mGfm9VfPT6+Jpzcix2TdUPbpQNikntFJBLMK5bZz+MQ3NKADwd33bQpEvvkfQ9qkTK+Uu1 VeF4TsMPwtL07DqrTmLvnYzP5jYY+fTjKu4xJ+17r30c4fYXkkSNAa7Fd01zJwwVAkrQk0 DDwjA9TBJyxi+qQvjxtg94svQZPOU6za0JIoqMMfv69HkLWrZEmlWBJvfXGfJ29TEAwjg6 9yQ+DWMnKEVr5txw2cRi1fyoT7UPX9KDN0v33uZVigxbzkW3JPQxwdboh+QcfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682352992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9S0UfgQ/BbfimqUX9wZlfZgRVebNX15GsbEq9Oqa3Yc=; b=k9tqbOWJRcb7am8NIPq3c/r1f1OIeT/2RULSfpB0zZVNskW/c9IChDo836unhLRl9fMTM2 UJdaqutGgb6ZjPC+z2TJjVxH2UPk9cC3POBCRFDN/LQfK7HhVrDGnTnbUAjiyfwXTBQYAg jV+XnPENutnJK51HpX3pJoUeg/gzch13hv9R4R6grQdanu2ErWpWpdg9Dq0BU+6BamQdNi W/02Gma49itEpZpB+ltpt2r8F3/sce/XZNHHlJejYFZbc/RaidgXXx81rGWjgdpZcj5smy ebTfMFzWL2BdGsW0S5bB1wpLzqNbiWjGo9EdlC3mKZ2TdGqbjfeDxTrT6J/GGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682352992; a=rsa-sha256; cv=none; b=JD/Vky6pplNpeU/TcVmTZSVvqk9UtHAIBx5gGo2kywkHGLVPOO3ocgzTJu8S/KjNK7tE1E 1BciCEhZNAIiefwT5RVquFJwPQAV3XUodBRPxzG96P78/qHwGrXAZpfWKzOmP5cBTSUefg 3a+131OB9UfgLuOhSU3RAdkC139Ng5pFDE6uht1MLvc3v4nYziEns8TQzTiTKRBOwhavi7 k5jJS7RvFFeb4oR7OnzYXH/Qjq6YiB1Vnz+K59fX8ysnI0zJBFBj2oYfNSoZvRXck8V6TL adcN3sTJwSmHnbR6lJ1Wq2JMEpqrgMvFBzI5eol9xlRcY4377fIdhm7g36plew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q4qy76QkgzXFY; Mon, 24 Apr 2023 16:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33OGGVAX033585; Mon, 24 Apr 2023 16:16:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OGGVjq033584; Mon, 24 Apr 2023 16:16:31 GMT (envelope-from git) Date: Mon, 24 Apr 2023 16:16:31 GMT Message-Id: <202304241616.33OGGVjq033584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: a0b1e754b7d2 - stable/13 - vfs cache: fix vfs.cache.stats.* name typos List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a0b1e754b7d23a21399934bf968afe5cf07418df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a0b1e754b7d23a21399934bf968afe5cf07418df commit a0b1e754b7d23a21399934bf968afe5cf07418df Author: Igor Ostapenko AuthorDate: 2023-04-19 17:12:25 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-24 16:15:35 +0000 vfs cache: fix vfs.cache.stats.* name typos Two vfs.cache.stats names are fixed: - s/.dotdothis/.dotdothits/ - s/.posszaps/.poszaps/ Signed-off-by: Igor Ostapenko [mjg: massaged the header a little bit] (cherry picked from commit 0e0c47ecd624da976bf7e1ff391cb4a00c76b200) --- sys/kern/vfs_cache.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 2b07dbbc34f0..b9e07a2b8dcb 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -539,10 +539,10 @@ STATNODE_ULONG(count, numcache, "Number of cache entries"); STATNODE_COUNTER(heldvnodes, numcachehv, "Number of namecache entries with vnodes held"); STATNODE_COUNTER(drops, numdrops, "Number of dropped entries due to reaching the limit"); STATNODE_COUNTER(dothits, dothits, "Number of '.' hits"); -STATNODE_COUNTER(dotdothis, dotdothits, "Number of '..' hits"); +STATNODE_COUNTER(dotdothits, dotdothits, "Number of '..' hits"); STATNODE_COUNTER(miss, nummiss, "Number of cache misses"); STATNODE_COUNTER(misszap, nummisszap, "Number of cache misses we do not want to cache"); -STATNODE_COUNTER(posszaps, numposzaps, +STATNODE_COUNTER(poszaps, numposzaps, "Number of cache hits (positive) we do not want to cache"); STATNODE_COUNTER(poshits, numposhits, "Number of cache hits (positive)"); STATNODE_COUNTER(negzaps, numnegzaps, From nobody Mon Apr 24 16:16:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q4qy902NSz472n4; Mon, 24 Apr 2023 16:16: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 4Q4qy86QYTz48vm; Mon, 24 Apr 2023 16:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682352992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZNehjY+dEreUnx/fDpmHLVeGP9/jvM0eTiCxlHB37E=; b=UX6DaW7AmID5O517tDVYMT1PHljASRvpVLuU9tvskf8Mw8CTlAxM4KqIHGTlWiAdFAWwiM TKp5TnkWdeJWxXrA4Bi5T1XrzHs7NgptExsLOaBshWmbZGjSuMAf7hR4i6m9z1DJBMD2q1 c+8QsnVQMnAepWusGIXMjxgRDmNU35JzyOJy2XucTaDM2jtLprlAC1N7rA7X6G/rNZILZL NmZK/MuEaVxFOI+oDlbmnashEx9FS6PyqJxXGGyBawTA2MY9wwqfo9Hv0A3kJGg9o7ONws 0Q4j+5kzwitC/ay5HtaUD9uQgTuiTTDp08xEMs7CB9kMLl8Qp116frPcGk8J+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682352992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lZNehjY+dEreUnx/fDpmHLVeGP9/jvM0eTiCxlHB37E=; b=iKFRFXXF2PrqO1x7cjoAiu96FtMH1Dx7nxljOOtZfkbydC41MoTyhgEWJEryrKDJzaDeMX QfsMwuyzQaM5AGbbmvz87kLnfj69zZev9fuu3CJatJSTV/H2yRIcH4Sa0vNZK44h/+FISL ZWiViH/trO0WhEFwAwgKqgaij1d9QqX6SHMFn34wqtoX3KM9eCFQJOzysg5E1Ft/XZwaF9 UCM56aNnMAAKVxIobddq8lEMpDYTLJz3SBuyIqLMZey3ftDJGjJ2q3f0DloJWZ8wZfRsoa UWLJ1Hd5A3fvDya0j6CttonIWlXWDO1ZQF5cMtRbrMc4Pu/AOjJuUJ7kLRT/Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682352992; a=rsa-sha256; cv=none; b=gqeLmaC9GPkNhywNygeQgd80eGQkUSo9ujX3F7DrHChySPNDN4Zgk2eqXj+ndPH/xGjbx6 iEdegmtbpoziGnmEnQ8jlP7BpA3WPQLztG17QRx6uwDtA8dzsN8PpmIgTzwk5bOEO3njoC a4GAdH46Vy4xi7YByP01ZDUD2+XRCrI0OzgN7naSYkn/QsnE/xC8FODLbXoBFmv6A7gRbi 7Rn4owehHSqE4TC6ONuaGyMmpSNlMod3QY93Srruv12iechBrktr/6yTS5BNjztgVMuT1E /c3Qkz6vCuNYwqmnoxkNpZYSjC/CXmLxJy82hAQIk328S+IubJqtGOHP52YviQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q4qy85LVczX2W; Mon, 24 Apr 2023 16:16:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33OGGWHh033604; Mon, 24 Apr 2023 16:16:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33OGGWwY033603; Mon, 24 Apr 2023 16:16:32 GMT (envelope-from git) Date: Mon, 24 Apr 2023 16:16:32 GMT Message-Id: <202304241616.33OGGWwY033603@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 84b812d5b330 - stable/13 - zfs: fix up EINVAL from getdirentries on .zfs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 84b812d5b330f6f20477da4f6577c3c84655b0a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=84b812d5b330f6f20477da4f6577c3c84655b0a5 commit 84b812d5b330f6f20477da4f6577c3c84655b0a5 Author: Mateusz Guzik AuthorDate: 2023-04-20 08:36:53 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-24 16:16:03 +0000 zfs: fix up EINVAL from getdirentries on .zfs PR: 270909 (cherry picked from commit 9c4e270822a3592bf122f9a8e4e815b4602329f1) --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index 5bd2e1510ddb..6e49fff9a110 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -675,6 +675,17 @@ zfsctl_root_readdir(struct vop_readdir_args *ap) ASSERT3S(vp->v_type, ==, VDIR); + /* + * FIXME: this routine only ever emits 3 entries and does not tolerate + * being called with a buffer too small to handle all of them. + * + * The check below facilitates the idiom of repeating calls until the + * count to return is 0. + */ + if (zfs_uio_offset(&uio) == 3 * sizeof(entry)) { + return (0); + } + error = sfs_readdir_common(zfsvfs->z_root, ZFSCTL_INO_ROOT, ap, &uio, &dots_offset); if (error != 0) { From nobody Tue Apr 25 00:38:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q53581Z06z466XC; Tue, 25 Apr 2023 00:38: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 4Q535812cSz4D4D; Tue, 25 Apr 2023 00:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O5tn+26hZitY/ehp/822o7v2GA6k6wUgJSyT6S6gCwg=; b=UF6z+ieFICeHCy7398qPCBdzyiVTY7Gl6s1tLiAFz099GXYPs3Es01DdBUWanOskzjbCWl 8aeOF2la30D+tlH/6PMt+wPXQW9GuOgcjfR0n8WS0k7WqTPvM3qs2cwFMJAj+mqlJYz2tz tb/fKO+TR/9swPiZ10YD/zbFZGgs+Q6aBWOUkw7UCZP+WZ/P6DObKaME6LKbIoxuKAinON 9ZtvEpFW10XP0fT/q6g5Ot9avRmuGu/djbdHlGeHwBUlK8lBYVihWoF8ub/PZqXtbAqS9Z Sgfcg8IboZK3TAFTVMy8jphTjY4zg9i6aDwYyupEJsZS/b47YSCngZX/dRGHag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O5tn+26hZitY/ehp/822o7v2GA6k6wUgJSyT6S6gCwg=; b=Dj0iXVeDWslWzex1AN9DmTQW5USQBUSr6qn3FHCX8rY2ndWPGQrvoiR2w/1jImkrI0MfiZ dTz/RR2axokCnZ5amRHnevq6826/loA3czHvVZFOqKs9W1Ds+FfJEDCCcbWIW7fxvpqoJn DDuZoCbcvKaSTYni99sg3zlO3/ly8HkYWOTNuD/2vepEimo5vbAUzM1YOfnxLrgp+ymZoN P/nc39AoppnJdSqK3ooB6cpQUaf8xrLnIawvSgAskS5sh2AsB9NsSRO4YOiuTRzrR7/1ud z3hDul33AzEQSl7qMr9QV0PjLtNLVNQCcFWqGP+FtKhSg0vczgvvwVfGBBBZOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682383100; a=rsa-sha256; cv=none; b=kppOsqdWYOMqggjphNsOwIf/a7mVJfCPF4x6f6yT++bY5jWj8K4uKCx5DclQIHlKPT94p6 Eac5dXXuzSlUlE0uFY3Ec9YBVQCkYolYW6IhRpEw82Sei0311nujYoJnUB0nvX/CVlfw5Q FkrFXy5A3gCPu/tbPnTllS8hBrTUqBe57kqbTZi++a52XX/ExxG82dwEAyFqW8ocf6GXGT ivyBMFfitXZK7qAgoDf4FGtKlodKYoGPefkN8DAgtexfz2pwF5AyBiQJ0iKHPfEDzlp6O0 OFFHS9oTtvBLgTid5A/FRfzHgshfxNcMQ5rNYhnZLF3LliM0jwaY9Qv973gL+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 4Q5358072YzmJV; Tue, 25 Apr 2023 00:38:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33P0cJ1o057316; Tue, 25 Apr 2023 00:38:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P0cJ6I057315; Tue, 25 Apr 2023 00:38:19 GMT (envelope-from git) Date: Tue, 25 Apr 2023 00:38:19 GMT Message-Id: <202304250038.33P0cJ6I057315@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: aad9b8f78c31 - stable/13 - sync_vnode(): add assert to check vn_start_write() correctness List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aad9b8f78c311c0ed6182234fe0c441e70f76613 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=aad9b8f78c311c0ed6182234fe0c441e70f76613 commit aad9b8f78c311c0ed6182234fe0c441e70f76613 Author: Konstantin Belousov AuthorDate: 2023-04-15 19:41:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-25 00:27:27 +0000 sync_vnode(): add assert to check vn_start_write() correctness (cherry picked from commit d8a096621bcf4539d0920eb0711d19fcb30c0576) --- sys/kern/vfs_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7ebd63447caa..672000ded079 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2651,6 +2651,9 @@ sync_vnode(struct synclist *slp, struct bufobj **bo, struct thread *td) mtx_lock(&sync_mtx); return (*bo == LIST_FIRST(slp)); } + MPASSERT(mp == NULL || (curthread->td_pflags & TDP_IGNSUSP) != 0 || + (mp->mnt_kern_flag & MNTK_SUSPENDED) == 0, mp, + ("suspended mp syncing vp %p", vp)); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); (void) VOP_FSYNC(vp, MNT_LAZY, td); VOP_UNLOCK(vp); From nobody Tue Apr 25 00:38:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q53592lGQz466cc; Tue, 25 Apr 2023 00:38: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 4Q53592G1hz4Dcn; Tue, 25 Apr 2023 00:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8ZUDpaEoczdOK+Vuv2voYhjuqP2b8cnH1qirmUsGGg=; b=yRZygIZn5714TJnez2QBi07u7Aeu0Rx3VQg087nKXAVewu9Oxu3dHpzyuhfiPCGtboO/Vl Mqi3Z0U9kBoBoaBnu62/Bk/oyW5mVD2aS+qXbx1jrtc48AEg1mx57RNG+Cnzz73LLuKi47 ntyybZeUUM+uVP4eWsloCCyJhg4vuKwnyqa5ug6N9pEwqcyVoYpWbBzr5Nkg+NGc0Jc5lQ +bJJeM2TCv9MvYJyvnbqgfwdo273i+G7HIWMQr86D868z+zo8F8Fol9NfXlxwxBQ08w5KK FnuV5kO/EqLCtvC+edTwucO9TcXf9GzD+KSVP1dNa9m1U83HMw+W8ZGJNbFxQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j8ZUDpaEoczdOK+Vuv2voYhjuqP2b8cnH1qirmUsGGg=; b=dg/hfaGGagV7t/vJ1vdX0BaI/OqssnnkWW1xIUw3JXcooBirlJcBGvsKhtjt/KY6ly8ueP rJkCawQi6Lyhp8XgWUUL3Wt2DETmmVVyXgRBmhLtH0fkMjHNQnWmihxCrGXpPVI7HyfG2p LEX47M/qeQyEi6xAby89hbyD+7QAI0XbRhv6TLcMhKnDlvNxva6v9pCgOQNBdu9tryBna8 qHAV034gjK1c5qf4WU5gSdR0miY5dsakx77vQXy4+jC7sHEcXk1K/IKjciiCpamSkAm0+X Xdr08AXQMw1m89HvO/rJnakkNeqGlUk+Ueo6HNwDaLAGlWxDxZTuyu6iugpXCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682383101; a=rsa-sha256; cv=none; b=PuRINUEXONEc3Yh3NzrxlvASoidUhNm+zAZRN/jMfwSWpnCwn931MYvyyrFAAs7bWJ6DyC hOA+IEWueX7/kwXvGAqXoHGvJ+ryxk9Zt19AG7nXlVEuEjnBNLgJuhSLbEjOzZWG2B2ieK cvVecCjkCENvr1lTuewQqoQOWGTo5HaMT99CkVclWZop2WBayrfCnSZOpzN+hPxXBVBGU7 qzixIHNffo2iYxwtRGCW0HS4sckeFbmgP/GNEu2s8SfbVMkLkcpL/0brUKFsXey2mQDnr8 8P1UQuw19HfsBop4/VEjUV3FOxIi8t2Tm+MjYiHINQabvuZOyH9Iq61tjIL6Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q53591J60zmms; Tue, 25 Apr 2023 00:38:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33P0cL5G057340; Tue, 25 Apr 2023 00:38:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P0cLXW057339; Tue, 25 Apr 2023 00:38:21 GMT (envelope-from git) Date: Tue, 25 Apr 2023 00:38:21 GMT Message-Id: <202304250038.33P0cLXW057339@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: 8b09e4b98e96 - stable/13 - syncer vnode: add VOP_GETWRITEMOUNT() definition explicitly List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b09e4b98e96256c7fa35145f06a51a96bf49c98 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8b09e4b98e96256c7fa35145f06a51a96bf49c98 commit 8b09e4b98e96256c7fa35145f06a51a96bf49c98 Author: Konstantin Belousov AuthorDate: 2023-04-16 17:04:53 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-25 00:27:27 +0000 syncer vnode: add VOP_GETWRITEMOUNT() definition explicitly (cherry picked from commit 7aeea73e30789c8987fbfa52cde93bab577bbc09) --- sys/kern/vfs_subr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 672000ded079..ff5b4822316f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5063,6 +5063,7 @@ static struct vop_vector sync_vnodeops = { .vop_bypass = VOP_EOPNOTSUPP, .vop_close = sync_close, /* close */ .vop_fsync = sync_fsync, /* fsync */ + .vop_getwritemount = vop_stdgetwritemount, .vop_inactive = sync_inactive, /* inactive */ .vop_need_inactive = vop_stdneed_inactive, /* need_inactive */ .vop_reclaim = sync_reclaim, /* reclaim */ From nobody Tue Apr 25 00:38:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q535B3xXwz466ch; Tue, 25 Apr 2023 00:38: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 4Q535B37pBz4DJx; Tue, 25 Apr 2023 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L9fqInqDNySNtARkkmA6L9PHrp6n9mPGlpd0TMiyoPk=; b=yr9/0pKDDKIXvgZqo4MWKnVatJVDMndYFxgVUH9S78FL9ofyikyHTQNkrqwQVrhX0BAmjD KHVK9VNBlbY6PAK0hNzGM9add70oQTMvjnYBEVxlrt/gAw3TnLDl42shZoFocaGmYS+bLj 2/R4xbWspLCNmtMtCMtr8p5tBekkAzztNUiR+V8H5nxqG3y7ebTgPUIMf+bMLTHWW1bPE6 5epAZh9Q/yd+znLlJtKyBvGJE168Z8CsaB7mdvbSpyWADfdLTrUjUR7FsVl7pJQmuPSiEB 5Ds7xL1WqxTXEmoI9wO0Y4C57DIT9L2e/Ulo5dOUl+qdgm0lI43bavkulkW5cw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L9fqInqDNySNtARkkmA6L9PHrp6n9mPGlpd0TMiyoPk=; b=bmstvjFRXUWqTZnQtiZ3AwsISnjw1p7mZrvmDqbEYxF8iEfm/vUqSoBnqE4vRGQq1/T155 hmqYYAJLXrhSl/G/eDsBtwgQaSbDR7MUjtgod+PU1J4Qu3+5bsmT8GnGeeCv3LaHop6/ZS Bt9Uej390zRoUDypIzj+ta74FCz53YL7B0QDh/DeBiRe3d8k1fj2TolkI4S2xnXlq/i0uz f1Hg93S6CX8QqzNllhcsKcAqgng4IRCa8apAlIXy/+cHrx9nNoqneRenLaHH3tsUpQ7dFa UX3okyqSO+uLd1NLXO623srQla5vh+6fGjK0K31IMPW3NYVgW8MQKfVDu8UJBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682383102; a=rsa-sha256; cv=none; b=bNyH1qMHZXrJzyZxY6+pMNuSnjDu7++jenGxS9rc0NTpc+bf2nnbDiQP9mbjFzJxIGJ2HU sNHoVV+fZv0s6v9dH8v76i3of4NU0i8bF+kBTMmANTkBRqFkugLc9jqJAkxfYZgYKstYnE 2lA2RyZrWS0Mm1/v6ofYc+qPFqNxJnnbXOC3nB8C+jd1KLHw+uX3AEY3dR6YorLklvWgd6 VQjF+KveSRvufYNFhrpVQgRI8yORk+eK3tHz5+b2DyBtSwZpPOljHSD09jk1XMXS3sg+t9 gH+e/e37SZkp/tH5bvD36YR1untXzDXiM8rGhdOdizfmKTiPtyz+sEmoRe2T1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q535B2F4tzmYx; Tue, 25 Apr 2023 00:38:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33P0cMrP057361; Tue, 25 Apr 2023 00:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P0cMQC057360; Tue, 25 Apr 2023 00:38:22 GMT (envelope-from git) Date: Tue, 25 Apr 2023 00:38:22 GMT Message-Id: <202304250038.33P0cMQC057360@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: 7f7e8fd3fe7b - stable/13 - x86: initialize use_xsave once List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f7e8fd3fe7b2edba5d90ed5bae25a1a5a8a3ca1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7f7e8fd3fe7b2edba5d90ed5bae25a1a5a8a3ca1 commit 7f7e8fd3fe7b2edba5d90ed5bae25a1a5a8a3ca1 Author: Konstantin Belousov AuthorDate: 2023-04-18 15:50:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-25 00:27:27 +0000 x86: initialize use_xsave once (cherry picked from commit 617a11eab6337693eae9d160453adf1943ab6a37) --- sys/amd64/amd64/fpu.c | 16 ---------------- sys/amd64/amd64/machdep.c | 5 +++++ sys/i386/i386/machdep.c | 6 ++++++ sys/i386/i386/npx.c | 14 -------------- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c index f51c042bf8de..38058f4d3e57 100644 --- a/sys/amd64/amd64/fpu.c +++ b/sys/amd64/amd64/fpu.c @@ -260,22 +260,8 @@ fpurestore_fxrstor(void *addr) fxrstor((char *)addr); } -static void -init_xsave(void) -{ - - if (use_xsave) - return; - if ((cpu_feature2 & CPUID2_XSAVE) == 0) - return; - use_xsave = 1; - TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); -} - DEFINE_IFUNC(, void, fpusave, (void *)) { - - init_xsave(); if (!use_xsave) return (fpusave_fxsave); if ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0) { @@ -288,8 +274,6 @@ DEFINE_IFUNC(, void, fpusave, (void *)) DEFINE_IFUNC(, void, fpurestore, (void *)) { - - init_xsave(); if (!use_xsave) return (fpurestore_fxrstor); return ((cpu_stdext_feature & CPUID_STDEXT_NFPUSG) != 0 ? diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index c27e15c7e1a4..0a21dba19ff0 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1353,6 +1353,11 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) &pmap_pcid_invlpg_workaround_uena); cpu_init_small_core(); + if ((cpu_feature2 & CPUID2_XSAVE) != 0) { + use_xsave = 1; + TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); + } + link_elf_ireloc(kmdp); /* diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index 97b095337852..f32fba72271a 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -1550,6 +1550,11 @@ init386(int first) i386_kdb_init(); } + if (cpu_fxsr && (cpu_feature2 & CPUID2_XSAVE) != 0) { + use_xsave = 1; + TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); + } + kmdp = preload_search_by_type("elf kernel"); link_elf_ireloc(kmdp); @@ -1570,6 +1575,7 @@ init386(int first) msgbufinit(msgbufp, msgbufsize); npxinit(true); + /* * Set up thread0 pcb after npxinit calculated pcb + fpu save * area size. Zero out the extended state header in fpu save diff --git a/sys/i386/i386/npx.c b/sys/i386/i386/npx.c index 86291ae9b96b..d9af3f7bf965 100644 --- a/sys/i386/i386/npx.c +++ b/sys/i386/i386/npx.c @@ -341,22 +341,8 @@ fpusave_fnsave(union savefpu *addr) fnsave((char *)addr); } -static void -init_xsave(void) -{ - - if (use_xsave) - return; - if (!cpu_fxsr || (cpu_feature2 & CPUID2_XSAVE) == 0) - return; - use_xsave = 1; - TUNABLE_INT_FETCH("hw.use_xsave", &use_xsave); -} - DEFINE_IFUNC(, void, fpusave, (union savefpu *)) { - - init_xsave(); if (use_xsave) return ((cpu_stdext_feature & CPUID_EXTSTATE_XSAVEOPT) != 0 ? fpusave_xsaveopt : fpusave_xsave); From nobody Tue Apr 25 00:38:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q535C62Csz466XM; Tue, 25 Apr 2023 00:38: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 4Q535C48QWz4DhN; Tue, 25 Apr 2023 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4sYI5iLewrzxrNKpqwWZY1byx0LPafxfDEUQkfqDKs=; b=HxgayMMBKyfYJerRHl2uLASPsAqaO7Tj9LqKcddlbA7wwtMY76hRDJdhjN5P/q6zMuEOlN tASEvnhDCi+K1hVSwkvKjd6Dp0RVmcO3ngwIu5UWSIWc5XrWjUYpEy+LsqWwy8+xjO60zy dxQFGlaqHrZot+GbeEsKrIbHXHdoGx3RKYzTX+2mazGDUNZztU7H/0KtHRHtcADztPb1DF nVVwPHIwuWNKJrNGNL72YA0IiHTyGDA5thwB/ojUJDjw6yTzAWZAasNNYQWqm3NkpTvMNM qRJvuKigvdf0nEtAD3o/tZGKDXVo9V0cGseO8cy4eZk+ZYi1t7GqdIdEwla5Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682383103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p4sYI5iLewrzxrNKpqwWZY1byx0LPafxfDEUQkfqDKs=; b=JmL+06tUigZhyeaYh7pqw1fX4nSi6nn8ob+D/X52czt0et/5sGh+IniuukyHA387dXXwtF r7kqK8e4su4CgjPpJV5J4PaSDqumZs8/8KHPpvt8rzKLJY1zYTuoIcRIKEzdIRgsqzSHku ridekScheOvdg7+CK5OBu8lAHzJEqPLGSr9AO2AtXIsHSpkYHBOrT7rxLMMGC/f/NvSooZ SytaoFizP1Ba5buoJf8W4akv2g4Y+VwBjcBFtdh4bTp/eXm2C032v0r3peikZUoH8OHLxL T691+S12NakCcGFL4PTUvuLvZmAYVtndkzbEVWpVFblbZBbE8xaM91cI7GQATw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682383103; a=rsa-sha256; cv=none; b=WVlqXWvFbh85jFZBJjSsbzGFtVNp5a/NfNQT5Hax/3o1SV6FeHdzRrN2jHY6I3Z9lvotW/ 9PLGfmAT0IAsmmArvLDQQBgeZ2AStYYjXTjQS8vQ2sQsOOdh4qmjd/wEe3eN3I53IS7AHf /bEH8In2g+uBQ1OeQDuAZG6sPyq8gIlVE7dMgsQTHi92z1lZmxMPGoLac9eAz0ezyxFXLk N++xULVV2MpOfg6djDZ/UFl4kejbxoPWV/zIx4a+0Sc6NGDa2HEGu1ikOk/m93WGNX7Sew SAH3CfHEd6pWdsPPt8C45MljwysKB8qzj1HExVGxEnXBycWr5Cfd0gXNCbNv1A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q535C3FDNzmMW; Tue, 25 Apr 2023 00:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33P0cNTu057380; Tue, 25 Apr 2023 00:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33P0cNBM057379; Tue, 25 Apr 2023 00:38:23 GMT (envelope-from git) Date: Tue, 25 Apr 2023 00:38:23 GMT Message-Id: <202304250038.33P0cNBM057379@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: 68a69739cb90 - stable/13 - umtx: allow to configure minimal timeout (in nanoseconds) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68a69739cb902d083aacdb0974b9b957e0e1353b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=68a69739cb902d083aacdb0974b9b957e0e1353b commit 68a69739cb902d083aacdb0974b9b957e0e1353b Author: Konstantin Belousov AuthorDate: 2023-04-15 17:46:12 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-25 00:27:27 +0000 umtx: allow to configure minimal timeout (in nanoseconds) PR: 270785 (cherry picked from commit 93ca6ff2958cace3b7b883ed797ea6539881a6a2) --- lib/libc/sys/_umtx_op.2 | 11 +++++++++++ lib/libthr/libthr.3 | 6 ++++++ lib/libthr/thread/thr_init.c | 11 +++++++++++ sys/kern/kern_fork.c | 1 + sys/kern/kern_umtx.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ sys/sys/proc.h | 1 + sys/sys/umtx.h | 2 ++ 7 files changed, 77 insertions(+) diff --git a/lib/libc/sys/_umtx_op.2 b/lib/libc/sys/_umtx_op.2 index ecd46b7d0247..7aa095e6532a 100644 --- a/lib/libc/sys/_umtx_op.2 +++ b/lib/libc/sys/_umtx_op.2 @@ -1271,6 +1271,17 @@ in which case list processing is continued. See .Sx ROBUST UMUTEXES subsection for details. +.It Dv UMTX_OP_GET_MIN_TIMEOUT +Writes out the current value of minimal umtx operations timeout, +in nanoseconds, into the long integer variable pointed to by +.Fa uaddr1 . +.It Dv UMTX_OP_SET_MIN_TIMEOUT +Set the minimal amount of time, in nanoseconds, the thread is required +to sleep for umtx operations specifying a timeout using absolute clocks. +The value is taken from the +.Fa val +argument of the call. +Zero means no minimum. .El .Pp The diff --git a/lib/libthr/libthr.3 b/lib/libthr/libthr.3 index 3018a6f20b86..0477ac0647a8 100644 --- a/lib/libthr/libthr.3 +++ b/lib/libthr/libthr.3 @@ -196,6 +196,12 @@ The integer value of the variable specifies how often blocked threads are inserted at the head of the sleep queue, instead of its tail. Bigger values reduce the frequency of the FIFO discipline. The value must be between 0 and 255. +.It Dv LIBPTHREAD_UMTX_MIN_TIMEOUT +The minimal amount of time, in nanoseconds, the thread is required to sleep +for pthread operations specifying a timeout. +If the operation requests a timeout less than the value provided, +it is silently increased to the value. +The value of zero means no minimum (default). .Pp .El The following diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index 1c4867cb8185..6010dd4c0451 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -522,6 +522,17 @@ init_private(void) if (env) _thr_queuefifo = atoi(env); TAILQ_INIT(&_thr_atfork_list); + env = getenv("LIBPTHREAD_UMTX_MIN_TIMEOUT"); + if (env) { + char *endptr; + long mint; + + mint = strtol(env, &endptr, 0); + if (*endptr == '\0' && mint >= 0) { + _umtx_op(NULL, UMTX_OP_SET_MIN_TIMEOUT, + mint, NULL, NULL); + } + } } init_once = 1; } diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index d6d90dd9534c..068dfdb097d3 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -381,6 +381,7 @@ do_fork(struct thread *td, struct fork_req *fr, struct proc *p2, struct thread * bcopy(&p1->p_startcopy, &p2->p_startcopy, __rangeof(struct proc, p_startcopy, p_endcopy)); pargs_hold(p2->p_args); + p2->p_umtx_min_timeout = p1->p_umtx_min_timeout; PROC_UNLOCK(p1); bzero(&p2->p_startzero, diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index dca7bc34700a..efe548a67bd1 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -701,6 +701,19 @@ umtx_abs_timeout_init2(struct umtx_abs_timeout *timo, (umtxtime->_flags & UMTX_ABSTIME) != 0, &umtxtime->_timeout); } +static void +umtx_abs_timeout_enforce_min(sbintime_t *sbt) +{ + sbintime_t when, mint; + + mint = curproc->p_umtx_min_timeout; + if (__predict_false(mint != 0)) { + when = sbinuptime() + mint; + if (*sbt < when) + *sbt = when; + } +} + static int umtx_abs_timeout_getsbt(struct umtx_abs_timeout *timo, sbintime_t *sbt, int *flags) @@ -740,6 +753,7 @@ umtx_abs_timeout_getsbt(struct umtx_abs_timeout *timo, sbintime_t *sbt, return (0); } *sbt = bttosbt(bt); + umtx_abs_timeout_enforce_min(sbt); /* * Check if the absolute time should be aligned to @@ -4595,6 +4609,33 @@ __umtx_op_robust_lists(struct thread *td, struct _umtx_op_args *uap, return (0); } +static int +__umtx_op_get_min_timeout(struct thread *td, struct _umtx_op_args *uap, + const struct umtx_copyops *ops) +{ + long val; + int error, val1; + + val = sbttons(td->td_proc->p_umtx_min_timeout); + if (ops->compat32) { + val1 = (int)val; + error = copyout(&val1, uap->uaddr1, sizeof(val1)); + } else { + error = copyout(&val, uap->uaddr1, sizeof(val)); + } + return (error); +} + +static int +__umtx_op_set_min_timeout(struct thread *td, struct _umtx_op_args *uap, + const struct umtx_copyops *ops) +{ + if (uap->val < 0) + return (EINVAL); + td->td_proc->p_umtx_min_timeout = nstosbt(uap->val); + return (0); +} + #if defined(__i386__) || defined(__amd64__) /* * Provide the standard 32-bit definitions for x86, since native/compat32 use a @@ -4817,6 +4858,8 @@ static const _umtx_op_func op_table[] = { [UMTX_OP_SEM2_WAKE] = __umtx_op_sem2_wake, [UMTX_OP_SHM] = __umtx_op_shm, [UMTX_OP_ROBUST_LISTS] = __umtx_op_robust_lists, + [UMTX_OP_GET_MIN_TIMEOUT] = __umtx_op_get_min_timeout, + [UMTX_OP_SET_MIN_TIMEOUT] = __umtx_op_set_min_timeout, }; static const struct umtx_copyops umtx_native_ops = { @@ -4991,6 +5034,8 @@ umtx_exec(struct proc *p) umtx_thread_cleanup(td); td->td_rb_list = td->td_rbp_list = td->td_rb_inact = 0; } + + p->p_umtx_min_timeout = 0; } /* diff --git a/sys/sys/proc.h b/sys/sys/proc.h index e3806a86c2a2..0f04921fffe6 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -729,6 +729,7 @@ struct proc { char *p_binname; /* (b) Binary hardlink name. */ void *p_elf_brandinfo; /* (x) Elf_Brandinfo, NULL for non ELF binaries. */ + sbintime_t p_umtx_min_timeout; }; #define p_session p_pgrp->pg_session diff --git a/sys/sys/umtx.h b/sys/sys/umtx.h index 82a8e0e4b0f0..ddd3bd387099 100644 --- a/sys/sys/umtx.h +++ b/sys/sys/umtx.h @@ -103,6 +103,8 @@ #define UMTX_OP_SEM2_WAKE 24 #define UMTX_OP_SHM 25 #define UMTX_OP_ROBUST_LISTS 26 +#define UMTX_OP_GET_MIN_TIMEOUT 27 +#define UMTX_OP_SET_MIN_TIMEOUT 28 /* * Flags for ops; the double-underbar convention must be maintained for future From nobody Wed Apr 26 17:32:10 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q65XW1Ptrz473Lb; Wed, 26 Apr 2023 17:32: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 4Q65XW0tgPz3pKy; Wed, 26 Apr 2023 17:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682530331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDwS8iQaX7Ym3fMmlRwmTalPQWJrQJIxec0Y3/IkG50=; b=L8dTzWBTMvxadtjOZwcbKHvQ2COw3/YXbyAlec01nq8Q3CCyOAX8O37Z9Lfgg60Ya+ovfK us2PEY5v+zC73Oaawqz1FG/vmGDwSJVRYRuIr1djs1bbkGT1kW4p2I2iUR6oEqpnfGkPnk tgiiFU5Kf2feWIDg6aQOHjihLvTV2l/b8zGnJoXuumjXazMYkdv+zfsbPtq77sGe9Ag1wc oXcd47SZTq2WG8kDJxRv1ywo3TIINiczOTjPny0pNLTMjcmCyx9Zq0JD/SEksA4U4SGehW 19BggFQbr5AOoTX/uqrvK04X793gI9SJM/XXeCQNrsiKVrjCfD7/0V3wDLfqzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682530331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zDwS8iQaX7Ym3fMmlRwmTalPQWJrQJIxec0Y3/IkG50=; b=VF+hsoV9KgIXzM2+VhNj+YhzNV8uKNB0eV2W6PjGkZ/hj26jUpTuD2Qu9KvOAH+Om/cSfe 1pqPQ1r4kVVDAoeRupF4KU87y0ULBZA0omyAJaMeqoGslQaPYioBkp1r5/JUecNn8meoQA ZtUt5x/K9Lua7+SHnGxgdboG60NBrsVu0Nu6CZ0Zh3kx2A9v9NEYeKUo4p0Ps1K6YgmKwv 8p68YTKsbXjtJKaiUvtglicmCrjOF9tfjHHgm5Oax7fQ50PNi6qx7jZNR5bRLPSyVCSnKy /wMtOcwQ9bvo18lhLiwfWYu6MWjlJZfSkWij/oC4kh6G6Os+que09vMFJGjQKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682530331; a=rsa-sha256; cv=none; b=HxQnnjFjnrd6RSRRjUpmJuA/xylMrdE8J3zCq32Zv8R0Q/YKFuVTQVtsnGXFu7trvDXpM4 blZQYlvD8F4nbJ7s6tPLljpp6nDisWNecy0gSDCo1sN90A96pcY644zcflZO3/5V4/oXVJ +M6Kawg19S7zCJaVRr/eamakxNrUqGC90WUSs89RK9kbc/vDnuxdB1jWtAkdhz4vsksAAO yg8JsQKVOaZ0FhntFX0tOV4L32KF0yFXeZoGIrIc4v44S15HFp2+5Wa0CJfPkc3IPG/HIm TWH79f/oJBani8ew4TcLKcmG9t+e1P3O5+q25NX0QLMmdn4rtmnT+Q3eLnebiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q65XV73Nhzk1c; Wed, 26 Apr 2023 17:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33QHWAHd015982; Wed, 26 Apr 2023 17:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QHWAvd015981; Wed, 26 Apr 2023 17:32:10 GMT (envelope-from git) Date: Wed, 26 Apr 2023 17:32:10 GMT Message-Id: <202304261732.33QHWAvd015981@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: 362677cae8e9 - stable/13 - loader: comconsole: don't unconditionally wipe out hw.uart.console List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 362677cae8e9ac4c6f7ff4d74a4378ea11d47797 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=362677cae8e9ac4c6f7ff4d74a4378ea11d47797 commit 362677cae8e9ac4c6f7ff4d74a4378ea11d47797 Author: Kyle Evans AuthorDate: 2023-04-14 04:41:22 +0000 Commit: Kyle Evans CommitDate: 2023-04-26 17:30:19 +0000 loader: comconsole: don't unconditionally wipe out hw.uart.console It may be the case that we need to set hw.uart.console manually in some scenarios that comconsole can't necessarily support. Avoid clobbering hw.uart.console unless we've actually selected comconsole so that one could at least get kernel console output.. Discussed with: imp Sponsored by: Zenith Electronics LLC Sponsored by: Klara, Inc. (cherry picked from commit ec671f4980437008b0119c6367816083e15fa503) --- stand/i386/libi386/comconsole.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index ed1f1aa08ed7..6d48e876fa37 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -324,12 +324,13 @@ comc_setup(int speed, int port) char intbuf[64]; int tries; - unsetenv("hw.uart.console"); comc_curspeed = speed; comc_port = port; if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) == 0) return; + unsetenv("hw.uart.console"); + #define COMC_TEST 0xbb /* * Write byte to scratch register and read it out. From nobody Wed Apr 26 17:32:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q65XX2qvQz4737K; Wed, 26 Apr 2023 17:32: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 4Q65XX2Cc1z3pj1; Wed, 26 Apr 2023 17:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682530332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoYRU/uKqS6e8Wy5BPlXoKi9W6regw2B+NGJz49FyeQ=; b=NzghfVc0NBiEwPWgbN3dI9PfYcPE/eL6G5rcvh5AmYw5bf0NRjI+dv0NU+vQSPF8YJ0Ft0 4VET9jIjfydYTS2KMp4IgtL/g+Pw/tDEG1gA78CqBTXixd2GaJM4AG25H/4CHiPhOCEK69 XKeS4iGwaC21lKmEQcnbbxvLpb7qSStztklQj2bWjJBf5jYQNFRznNyfrrkBlA7A/ZrReD ciwfPfvZbLgO6YKEPvydmP0e43WV1HUyDdiOaDoUqGasufu1Ysu6GpplBxoJdtTN/WIZva BJ44nFUur/K9vrEkqYSDs5SfdfR9/rfFXkThFuBGJNvVZRnxjFP6f8p6Xg1RZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682530332; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoYRU/uKqS6e8Wy5BPlXoKi9W6regw2B+NGJz49FyeQ=; b=r22Rl4sYyQdImcXvaDPYEJ+fzto4z6NpUV+mjoRVeY1dPGDDzGtvEPmg6yB0oIEzbvjna1 xDC4Xbbu047iBtA3ChOnTgXTErXYCcds1lQFj6A32muyeQjyWEEFQQ+YZTiy7CFMKf8o4V ch0BAFABZrwH5O24LKyRYkRaeb2tAsxz2k8/l8dGzC6+HLg2gT51Cy4WsF2u25VOULyj4/ zKn+ORD1CdhLk0pgtu+AAlV8R/6KbH4xfZzCGQjh8ocomKw/D9Y/eVH4xUfc+XrYb0YSMK PG6qhISe4UTDynGEW+gfEO7/xjQ3anWM7AEYvqZulSSfKmHq+lIyx4fXzvWV8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682530332; a=rsa-sha256; cv=none; b=yxhLDZu2ysanirBlVkx6/NnePhrekGCY1iyZ4kvMo8TEtpmT3SfKHisnqEV7CsK+N4vsgx Xx2uEEMxhrLdFqgiPiJLjhJUZBDeR0TnQFRE5resW+dxPrIZ96YtijGd4vXrqF16cI/uXf L1Y36MDe6WqxD25Lotp/5xw67XBo5iTV3cOv89rSHVnlM8zo/WlGJ75fqeUqEdnlTWmoV+ QQDmiW833ufwutKcrmvuvO/Rsq/W17Uq9gnZgPABnNSbQASE2bbllIGpEPTXX9fCe8sBWC DdpWYqeMhoMmGgJiveoJ6sLOwr5ac0BwlZp08VeMuaRuqXjZGUHBA0DxJZTBCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q65XX0vS7zkSf; Wed, 26 Apr 2023 17:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33QHWCIf016006; Wed, 26 Apr 2023 17:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33QHWCcg016005; Wed, 26 Apr 2023 17:32:12 GMT (envelope-from git) Date: Wed, 26 Apr 2023 17:32:12 GMT Message-Id: <202304261732.33QHWCcg016005@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: 7c0af1af0a8b - stable/13 - uart(4): add Sunrise Point UART controllers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7c0af1af0a8b467b8c61ee9b3aef0e527536deaa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7c0af1af0a8b467b8c61ee9b3aef0e527536deaa commit 7c0af1af0a8b467b8c61ee9b3aef0e527536deaa Author: Kyle Evans AuthorDate: 2023-04-14 14:52:48 +0000 Commit: Kyle Evans CommitDate: 2023-04-26 17:30:20 +0000 uart(4): add Sunrise Point UART controllers Sponsored by: Zenith Electronics LLC Sponsored by: Klara, Inc. (cherry picked from commit d1b6271118188dd25a18f2372ab1d3004335ea3c) --- sys/dev/uart/uart_bus_pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index cf7fbb99b3d5..eaf4fde27236 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -178,6 +178,8 @@ static const struct pci_id pci_ns8250_ids[] = { { 0x8086, 0x8d3d, 0xffff, 0, "Intel Corporation C610/X99 series chipset KT Controller", 0x10 }, { 0x8086, 0x9c3d, 0xffff, 0, "Intel Lynx Point-LP HECI KT", 0x10 }, +{ 0x8086, 0x9d27, 0xffff, 0, "Intel Sunrise Point Controller 0", 0x10, 0, 2 }, +{ 0x8086, 0x9d66, 0xffff, 0, "Intel Sunrise Point Controller 2", 0x10, 0, 2 }, { 0x8086, 0xa13d, 0xffff, 0, "100 Series/C230 Series Chipset Family KT Redirection", 0x10 }, { 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 }, From nobody Thu Apr 27 00:45:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6H8s2ZbRz47n4s; Thu, 27 Apr 2023 00:45: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 4Q6H8s280Mz3qZs; Thu, 27 Apr 2023 00:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682556349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnxkdK3U18qNuQf5/FEdVI+8wuu+3ZgdxmY0Uh05c0k=; b=B39hG68nwu3SnRF1axpYGC8AVzw6d1ZAf2l/UQA6w3LMYA358T0Tkge7CjulyK/jsI+Nfr N0o4mwTNzf26DAka4SwnArPVnJ2KVlFVxfEDXTFQ+2AyHiYfgKoKkDH0UZWqZjvE9I4Grm Z+Y4sqXeUT+Sa32NKC2fSMBY90e1YIVbhZ/xkIWNRJFMIz3wug4NInkCAwRyziVhC9k7En TNaRe9oQJd9ryoHVWuK6StxvIRd3/RIl12PAP9EvR876rO7pm4lTj/pIwrxOr7A5qj5q07 x12B6F/lHZX9ke1iaZe3pU4QdD7vUKpAodnUyqjedU0OxJVzI13i3j3JeOINBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682556349; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QnxkdK3U18qNuQf5/FEdVI+8wuu+3ZgdxmY0Uh05c0k=; b=m8IPLLyuel+q8orelshBKMyOCZKZXQvbKauzzy4w/z//gxPDb2FZuM3Bap3A2k2t121q2p BwXF/yE6voQPPmzAXP+S5VPFs4umFPgxGHienpi33wKbgzCKTYulsg7xB4ymS0Mo3lBHYw EUbDq5USZJSFfMW7EtXvQq3jMMwUmf5OFCR/SxiFuL7uq4hU8VLGFjSumXkSiD+r1yuU5I UFG4x7S7jXEIuz9XE/Ack9uxWTA5MiFj8h5n16K4kAxAl4T2AaFMqYMNdi0DSdq4Xo2zUh 53cFiGVVzsRnEHHWOHzXK9gtuoWEPHSXJFuWGgGSM36bjqgVsF82anpP4vL5+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682556349; a=rsa-sha256; cv=none; b=MSsfNsICnM+PiLyNF92Khc7HJFb+gtK5+ObKGjjQn8vV9lRPWwr/TNko2pku2Y1i3z0Nf1 jDs8rdKFpNdL2OGhBtFGFi0PRm24ysnx5izXSCY7MhQA/A/KLREl7a0R3dUD87QAlGGPa/ qxnuS/sdFHTxZ6LWcT1tNe+4YCTDmbMnuggveh7yLRJtMbMXWQDyewstYipFj6/mb0LSkF e8rLdO9orHQldzHM5XWXZeKO6IZP6hfYZu0pQFtUsqH1f7BQrZkd+QCS2AMuJO2OqZDdFC h5hLUAMtc7bvv2km9MDuH7j2mOFLHsYk/+pKYdr5JLtJmxcpSHPJRhA/wD7yUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6H8s1ClDzwPN; Thu, 27 Apr 2023 00:45:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33R0jnQI025038; Thu, 27 Apr 2023 00:45:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33R0jnUX025037; Thu, 27 Apr 2023 00:45:49 GMT (envelope-from git) Date: Thu, 27 Apr 2023 00:45:49 GMT Message-Id: <202304270045.33R0jnUX025037@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: 8ce363a9b02f - stable/13 - sys/dirent.h: comment update, 'd_off' is offset of next entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8ce363a9b02fd43ea08f5ca2e0f61f770fb4ff1c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8ce363a9b02fd43ea08f5ca2e0f61f770fb4ff1c commit 8ce363a9b02fd43ea08f5ca2e0f61f770fb4ff1c Author: Olivier Certner AuthorDate: 2023-04-23 08:05:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-27 00:45:02 +0000 sys/dirent.h: comment update, 'd_off' is offset of next entry (cherry picked from commit faec42a3ef60d1c5e80da3e9aa3178ad1e0e7701) --- sys/sys/dirent.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/dirent.h b/sys/sys/dirent.h index 5bc6cf49afe7..b3c5e00cd9ad 100644 --- a/sys/sys/dirent.h +++ b/sys/sys/dirent.h @@ -65,7 +65,7 @@ typedef __off_t off_t; struct dirent { ino_t d_fileno; /* file number of entry */ - off_t d_off; /* directory offset of entry */ + off_t d_off; /* directory offset of next entry */ __uint16_t d_reclen; /* length of this record */ __uint8_t d_type; /* file type, see below */ __uint8_t d_pad0; From nobody Thu Apr 27 00:45:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6H8t3ZFlz47nFM; Thu, 27 Apr 2023 00:45: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 4Q6H8t32zPz3qXf; Thu, 27 Apr 2023 00:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682556350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7O+Fm4UGLQH4hZsdsdfhzHr552CPwLycAAYJxWULiX4=; b=ceBJVae6KPQRhpEMgiBdUqevMbge9lDulsywf1dVyCoqvO7sKafx2iyJE8x7FowBlICKFw k6af2epsCb6KFhSrU34m7qu4QoB3lC3VVMmSNi2x/B8Q4Y6NlWL8VhXJeaNpsdRVg+Ymix tF2SPndQngNaUo3of1TNmoBrTsjPuXhxqajFSKh2u0DnxvsOsaMEQaYV3Q9+RyCQsMETkb 6NEM0C952P3Cds0HoVV7/0hCDl0QuHKLcoxtnyPpHSWW6nFc6EAiO/J+x+k4TPnwVVAd/q QoZgik1meWYPJfjXa3je1H1LCAiUpYQTptV1SmMtQHEhohrs02e6MpSNYK1BEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682556350; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7O+Fm4UGLQH4hZsdsdfhzHr552CPwLycAAYJxWULiX4=; b=ZfaZkm2JExhZklskJxs7kJfWBjZLQiKKRBC1m8SICQt+uyAF+wNFuigsCxqoyZig2Dpgnv Y+JRF4WlNeXiMwnyvgKY9KuoMA4rGSdPAjZ7hmb/fDyd6duolWcwIkYLa2F5iaqt6LjJzD LJSZ3/kWDG7z4vl/PA+euv6XUIlXz+Au6VR1PrSz/7OzRubBXgkpXEXgimRalGsMXCgrt5 voTd+LMiM9WdtnaWDaSf0pffr2nUhUbFigeeP8JpIU5Xg3Fg7eJFE6D8E9AjlHf6Ehmtef FbOBG2sI+3xQoct/TLwBv++ovjkWqVSi9+4VTCZcUuReJoYh64xEAWKdjLNRAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682556350; a=rsa-sha256; cv=none; b=cQygOObU96r00orTDUfxSELdtiBPGM6OMR8xkXTtL0iDdmHhKtIpux44uOhbnHrV+nfq89 VtuZTEuXyfw5dPdpBhDQm5IFp5EylPdN8LvyTxkVvCc4qR+dSfXACd2msZ/X9efHLff/Vo MSXvB3jbuQwDGNiStrJ4v0YpjlwVGo41Lmnc7YLhD9BgTg2QcLEp3U1v8ZFGT0YaAKqxSR 7Vi8VC3f+FXqBV9ke6PZTRg2amCRTu69V9xQq9jS7Z1tpFRwO7c2P3xNX33WhhBdlH5pqP jeLnDUeglgcDJQxZJEbTVGBrTQ0mc0l6ub3PzLlP+TcZoxbLUfdni9InqGEHvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6H8t27PSzwV3; Thu, 27 Apr 2023 00:45:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33R0jof9025057; Thu, 27 Apr 2023 00:45:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33R0jouv025056; Thu, 27 Apr 2023 00:45:50 GMT (envelope-from git) Date: Thu, 27 Apr 2023 00:45:50 GMT Message-Id: <202304270045.33R0jouv025056@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: 06e36c8c7717 - stable/13 - posixshmcontrol(1): silently ignore inaccessible segments when listing List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 06e36c8c7717338558aa807db63c80f245bf533b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=06e36c8c7717338558aa807db63c80f245bf533b commit 06e36c8c7717338558aa807db63c80f245bf533b Author: Konstantin Belousov AuthorDate: 2023-04-23 23:30:58 +0000 Commit: Konstantin Belousov CommitDate: 2023-04-27 00:45:02 +0000 posixshmcontrol(1): silently ignore inaccessible segments when listing PR: 271038 (cherry picked from commit 043e24bdb01938c0d5a73a3192e316ce0b96ec1b) --- usr.bin/posixshmcontrol/posixshmcontrol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.bin/posixshmcontrol/posixshmcontrol.c b/usr.bin/posixshmcontrol/posixshmcontrol.c index 3b9d1dc256c3..5bb8aa473502 100644 --- a/usr.bin/posixshmcontrol/posixshmcontrol.c +++ b/usr.bin/posixshmcontrol/posixshmcontrol.c @@ -308,8 +308,10 @@ list_shm(int argc, char **argv) continue; fd = shm_open(kif->kf_path, O_RDONLY, 0); if (fd == -1) { - warn("open %s", kif->kf_path); - ret = 1; + if (errno != EACCES) { + warn("open %s", kif->kf_path); + ret = 1; + } continue; } error = fstat(fd, &st); From nobody Thu Apr 27 16:45:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6hSg1FdDz47Q0F; Thu, 27 Apr 2023 16:45: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 4Q6hSg0qWrz3jls; Thu, 27 Apr 2023 16:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682613955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pe0kCytzjmKa9jEv3dF26WjV/ygrfS1edBv0y0OIfLw=; b=QS/GLsyZq2M4NadCGycs590YUhnVEmgsZl5paYvkZbRSI6TzyRQ+UCG/qxlTAKErSNcdN2 Y8c7blBfKSQsWAjEueECINzGecfzSA9IneIzT1yAIHHQ0fVbo/5B33DHVuUdMdeZOtc6ex jjeNOUgnorik+bEDxlGD7AIwQGib3MX5zjMWpKSJRwqFP8a8PuqZGutKoEaTQBOJg85Bhg zcXQaeFTlcb2rLscgTLe9CWv5B7p2iZKPt0v2di0Dw7aGqypBe6rka+fqZbirzbMVcQD6z 9J4i0bscwR3arbAkNQUcdJpqwYYSsXFmzWiIFG50oH0dtXKoq75t6fzCOi7r6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682613955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pe0kCytzjmKa9jEv3dF26WjV/ygrfS1edBv0y0OIfLw=; b=Bxf/BqMniq9REGvrnPZdaOhclUW35d1MszGQGOjNg0VGNJQbBZ/PaEV5hJaNxAIKj5FlRh cmeIuqgXsCgNOsdw9fzn1ZfYRYQxU6DslHNE4VVhzvSwRfVQ9bueFYwvGztoRD9OlOAG+d mHXEW22HItPISY0nzjadDrRW95dNBH6Y9JqyRUu+BIBY56V+WQXomyGa8qYN5dlbHAJUy4 bgejdyqJYV8sHrbKwhKG2a20A0Ox78FQa2SJzU1yh7ULjdJYKlvQBw5PSee/nMNX2ImnG1 gRPBJ7S/hhDi6GcmOW74plKlb2n409+pDsIc8b8nN26H93YdLkMrlfoQ0f8kVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682613955; a=rsa-sha256; cv=none; b=Z1G6VCHYne8zpjts1KZwlRoLJNLIKf7+I9yeRLOziXx5frAFL7qbQvBmKyvCiizHSNmkWa NfFknbn2H4g0YoxO8U4JzTiakkTdg1JbppvuVueKghMGm/9EDYwMtTvYwroy7ubJcpMGtD Ycds1wQBm1ubakzOvT+RI5CQbBUWi3SwexCiwr3hLmH4ZgoJO/svTLO2iRDG4igkkRCdf3 p5TvHH7zmuYZxGPPSSlfCsQaOaufDzDpUmNhH/UcLWAUxg1WcNx+qsrHDhFqK7e+M2lhi8 P8cOpyasB3l5UNSHhE2YVApN6OvdVMqP1hWW5NB7yssFz9ENG+BTJl2bY+38UQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6hSf70kKzQ3R; Thu, 27 Apr 2023 16:45:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RGjs06013996; Thu, 27 Apr 2023 16:45:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGjsNm013995; Thu, 27 Apr 2023 16:45:54 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:45:54 GMT Message-Id: <202304271645.33RGjsNm013995@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: 170520f88229 - stable/13 - openssh: restore PrintLastLog option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 170520f882297617eaee7665a6813d03243e87a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=170520f882297617eaee7665a6813d03243e87a4 commit 170520f882297617eaee7665a6813d03243e87a4 Author: Ed Maste AuthorDate: 2023-04-20 00:09:13 +0000 Commit: Ed Maste CommitDate: 2023-04-27 16:45:37 +0000 openssh: restore PrintLastLog option Upstream's autoconf sets DISABLE_LASTLOG if lastlog.ll_line does not exist, but PrintLastLog also works with utmpx and other mechanisms. Reported upstream at https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-May/040242.html PR: 209441 Sponsored by: The FreeBSD Foundation (cherry picked from commit 43c6b7a60aff069da7e0ba6c87d3d7a532e812f6) (cherry picked from commit 170511589e4d15a27ee92979691cfc1b26929bb7) --- crypto/openssh/config.h | 2 +- crypto/openssh/configure.ac | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index 5c8728058c99..499184edf269 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -113,7 +113,7 @@ /* #undef DISABLE_FD_PASSING */ /* Define if you don't want to use lastlog */ -#define DISABLE_LASTLOG 1 +/* #undef DISABLE_LASTLOG */ /* Define if you don't want to use your system's login() call */ /* #undef DISABLE_LOGIN */ diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac index c5060c59ddf4..33d037c3f7ac 100644 --- a/crypto/openssh/configure.ac +++ b/crypto/openssh/configure.ac @@ -1037,6 +1037,7 @@ mips-sony-bsd|mips-sony-newsos4) [NetBSD read function is sometimes redirected, breaking atomicio comparisons against it]) ;; *-*-freebsd*) + SKIP_DISABLE_LASTLOG_DEFINE=yes AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)]) AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way]) AC_CHECK_HEADER([net/if_tap.h], , From nobody Thu Apr 27 16:48:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6hWw4JxCz47Q1b; Thu, 27 Apr 2023 16:48: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 4Q6hWw2xvtz3kns; Thu, 27 Apr 2023 16:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfyW//Ez7AaLMTbKvVw/uQYYWsulyioaSFeswrxbBFk=; b=O3m6DE6Gk/AqmZz9UsWNNNUZHBNklZtXN4M8PjxODB++vr3U+ZGAJwcqWsn4U1N3Vlj4QJ u87lvtPwFt35d88Z769Cv1O20EsTesWWb1DyEcz4lCmkYlDMPa91nipEJxkocUPCYr+FDM hvEzzU7l/ey+WFjNnvNhiI96ElBDMFV8lUYaoWR/OJpu9C90pnGzSTwuE/ABuXGkVv2Clz D2Hme/NW9kfyDUJR5+IngGuh9i97U4Nyh2xp8qITNhSnmCjXOrJJ3jq6hNYP54341gYyMQ f42ygpFP3bZUYtJwr0ozs/C8+tW/s4mhGuQB0rVEfB8oa85cKzpQo4yfj/1DFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KfyW//Ez7AaLMTbKvVw/uQYYWsulyioaSFeswrxbBFk=; b=CQ4JGF5jAbqj3H7pfivsirLfS4hx/c2281O1T6UHfwAuwRUcvbMBTPklTX8W4T/nTvuWz8 gCFL2qXjWO19TCNxLSpSXkgV6qjkhVGv8OELD53v39XFqDRfHbPynuwWGBUVvuleuyXOVq iqn7SDfBe7W6NMcoB8ggBxEkCKT5uXKFAHVw2/gBJmqCQvPomn2ZnTJ4Dkao4UXNc5gpmK NQtXDifuzPN7EAedgO8b465UqDt2JFqSMwAPjGBBpncgSFTsxW4xG24jdiET/FWjjSnY5q jBOUb5mH0uiq4X5vIxx4D1lU460pcUWdZYY8JX3NOxWGhZqp+CWJY/2og7TcJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682614124; a=rsa-sha256; cv=none; b=DNBhD1wyN31RRmfOcIc7ArxkWvcPoZmDmcoa4XSDd6Gz7cY48o6Z6Fbol2C4JlvgGmJkDq DtBpJzjCrPYW9TGpiBhLXm9F5CnY7Ue3/CqOe5XfrPpl4+uweo7LL7CzUxrgXKgPePmkVI oOBr8kELMOefkwlImy/NOp6FHhpwinbKBKbUtvwGfBLem01N6RWITlqTIKM7M6RVeGF5nw o5ZefzJHhI96E4WFmId8t0maa6DaGVptHyfQf8HR1lmgrdqepXW+bpveuj30ghusbV0JHK x3CnzVvVEoXMvQQ7dU8e1KCDTU0PBlWvv38loRvppcFmYNdkeGxTn2qC7z7M7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6hWw224GzPwL; Thu, 27 Apr 2023 16:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RGmiiY014612; Thu, 27 Apr 2023 16:48:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGmiC7014611; Thu, 27 Apr 2023 16:48:44 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:48:44 GMT Message-Id: <202304271648.33RGmiC7014611@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: 545163d9bc9c - stable/12 - openssh: restore PrintLastLog option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 545163d9bc9c807cad78577bfe3346efb2d02482 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=545163d9bc9c807cad78577bfe3346efb2d02482 commit 545163d9bc9c807cad78577bfe3346efb2d02482 Author: Ed Maste AuthorDate: 2023-04-20 00:09:13 +0000 Commit: Ed Maste CommitDate: 2023-04-27 16:48:33 +0000 openssh: restore PrintLastLog option Upstream's autoconf sets DISABLE_LASTLOG if lastlog.ll_line does not exist, but PrintLastLog also works with utmpx and other mechanisms. Reported upstream at https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-May/040242.html PR: 209441 Sponsored by: The FreeBSD Foundation (cherry picked from commit 43c6b7a60aff069da7e0ba6c87d3d7a532e812f6) (cherry picked from commit 170511589e4d15a27ee92979691cfc1b26929bb7) (cherry picked from commit 170520f882297617eaee7665a6813d03243e87a4) --- crypto/openssh/config.h | 2 +- crypto/openssh/configure.ac | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h index e267ba122719..c40746f48410 100644 --- a/crypto/openssh/config.h +++ b/crypto/openssh/config.h @@ -113,7 +113,7 @@ /* #undef DISABLE_FD_PASSING */ /* Define if you don't want to use lastlog */ -#define DISABLE_LASTLOG 1 +/* #undef DISABLE_LASTLOG */ /* Define if you don't want to use your system's login() call */ /* #undef DISABLE_LOGIN */ diff --git a/crypto/openssh/configure.ac b/crypto/openssh/configure.ac index 56da82b81756..ef1a3c559ece 100644 --- a/crypto/openssh/configure.ac +++ b/crypto/openssh/configure.ac @@ -1016,6 +1016,7 @@ mips-sony-bsd|mips-sony-newsos4) [NetBSD read function is sometimes redirected, breaking atomicio comparisons against it]) ;; *-*-freebsd*) + SKIP_DISABLE_LASTLOG_DEFINE=yes AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)]) AC_DEFINE([SSH_TUN_FREEBSD], [1], [Open tunnel devices the FreeBSD way]) AC_CHECK_HEADER([net/if_tap.h], , From nobody Thu Apr 27 16:52:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6hch6M4gz47PwS; Thu, 27 Apr 2023 16:52: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 4Q6hch5sNtz3m72; Thu, 27 Apr 2023 16:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sX8eEqdfUIl7hOdF/Owdh4pmtQ+CDJCcQSUKOXA7lL8=; b=xiP/umW2gpz3Wc9EMn2I05lAKWFf7Ow6g0UPHzVUyu1oj5iRGVYelsVxRwWz9NvCpCd81s ncJlMvNu4/W5KlVm/butmiDhYIfHtVlnyewlV+Rq0ybTkJ30EKxzA7zpq32gu5NkyfCleI 1ooqsa2GUUKepQZlUsMfORDLpbJwgHGnH0npmOg3NuPO0UojL2+t8sG0IwBYv8vpaTCGDJ W8Mg+39Qa3sV31/T+fpc2Qyehk8paZN+hwdwYEw3JOI+XSaYlzXYou7cprtd9td+HFvnjA e1xuAWtlEPfAoex/SVQrRTvnBSz24rss5kGTvXYelZrc65kPT5XisO48ukZzmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sX8eEqdfUIl7hOdF/Owdh4pmtQ+CDJCcQSUKOXA7lL8=; b=OHIaBdyhHY+AYDaOiVHA/NC3f52To2wu+UHcosw/jhDpA5VODSpxEVulmN5HOfNRGZhwFO tyfWT6CvFz6X0MpKGRgoEnZtEGey0cv5sLRd/gzYHWmnbDUw3Im+B6CBuPowqdnQm+KyrA cJlhDCRHv9aUAfAVS7HmpbSX1wq/ikSXdnikWZ621np/CR0lsFuw2w7uFy4SYsjwW+qS++ OuPi3AYG4UW5nyv0j9JAucXqB7uJ7VDJMyPnSCmn8YUVaTfvvLqKE2z9fktGZIQI2HMPwl 5KtIGutD5Fd5rajB9MNuNRxfRm6Y1KFmsdp0nLmY/Thi0O1InkOjoHZkfOkcCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682614372; a=rsa-sha256; cv=none; b=heIi9KbJaNG6p/BzSD2+fJRG2M46TLjp2KdPkGr+N0EmW39XRm8aNQ1sn7p63A3nWuXzgI ySsCoJAtfTPjubzE9kFRgKYXtUFWEd2n3P97UbOWohoxJ4PDqsj0uBbZizrDzIUmW75Gwv TuoWapSz0GFWJ4I185sCXKYEX1Xg8jzNzNU2PstlPgdVBcu+ob0ayFdf/1+DrQJQq5Ink3 a+U8fbF2QEGmyr2qCqtN/r5dz2bXtTQ1o+fYekGOw+PZ0eMrRtPLM+J20PaCDAqtBEY8wA Cn2bg5KP/p3LCWWQwTLvUjk2XsH7dZHG3HE+msOlKBQpTjjegbohrUICGTRhaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6hch4xGKzPyn; Thu, 27 Apr 2023 16:52:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RGqq0e030208; Thu, 27 Apr 2023 16:52:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGqqH3030207; Thu, 27 Apr 2023 16:52:52 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:52:52 GMT Message-Id: <202304271652.33RGqqH3030207@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: d74a8305b0ca - stable/13 - makefs: call brelse from bread List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d74a8305b0ca1b12b16b92146e8e40440d4e408e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d74a8305b0ca1b12b16b92146e8e40440d4e408e commit d74a8305b0ca1b12b16b92146e8e40440d4e408e Author: Ed Maste AuthorDate: 2023-03-13 21:00:20 +0000 Commit: Ed Maste CommitDate: 2023-04-27 16:45:37 +0000 makefs: call brelse from bread This matches NetBSD and rationalizes makefs with the kernel API. This reverts commit 370e009188ba90c3290b1479aa06ec98b66e140a. Reviewed by: mckusick Sponsored by: The FreeBSD Foundation Obtained from: NetBSD 0a62dad69f62, 0c4125e1a19f, cb6a5a3575fd Differential Revision: https://reviews.freebsd.org/D39070 (cherry picked from commit e5551216d8e563043248bc7f3cb1c75b2dbd9791) --- usr.sbin/makefs/ffs.c | 1 - usr.sbin/makefs/ffs/buf.c | 25 +++++++++++++++---------- usr.sbin/makefs/msdos/msdosfs_vnops.c | 1 - 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index 448aa08b9d21..1eafa2bd00ef 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -1002,7 +1002,6 @@ ffs_write_file(union dinode *din, uint32_t ino, void *buf, fsinfo_t *fsopts) errno = bwrite(bp); if (errno != 0) goto bad_ffs_write_file; - brelse(bp); if (!isfile) p += chunk; } diff --git a/usr.sbin/makefs/ffs/buf.c b/usr.sbin/makefs/ffs/buf.c index 11b7c4b0f1f8..6caa3fd4fbc6 100644 --- a/usr.sbin/makefs/ffs/buf.c +++ b/usr.sbin/makefs/ffs/buf.c @@ -127,26 +127,31 @@ bwrite(struct buf *bp) { off_t offset; ssize_t rv; + size_t bytes; + int e; fsinfo_t *fs = bp->b_fs; assert (bp != NULL); offset = (off_t)bp->b_blkno * fs->sectorsize + fs->offset; + bytes = (size_t)bp->b_bcount; if (debug & DEBUG_BUF_BWRITE) - printf("%s: blkno %lld offset %lld bcount %ld\n", __func__, - (long long)bp->b_blkno, (long long) offset, - bp->b_bcount); - if (lseek(bp->b_fs->fd, offset, SEEK_SET) == -1) + printf("%s: blkno %lld offset %lld bcount %zu\n", __func__, + (long long)bp->b_blkno, (long long) offset, bytes); + if (lseek(bp->b_fs->fd, offset, SEEK_SET) == -1) { + brelse(bp); return (errno); - rv = write(bp->b_fs->fd, bp->b_data, bp->b_bcount); + } + rv = write(bp->b_fs->fd, bp->b_data, bytes); + e = errno; if (debug & DEBUG_BUF_BWRITE) printf("%s: write %ld (offset %lld) returned %lld\n", __func__, bp->b_bcount, (long long)offset, (long long)rv); - if (rv == bp->b_bcount) + brelse(bp); + if (rv == (ssize_t)bytes) return (0); - else if (rv == -1) /* write error */ - return (errno); - else /* short write ? */ - return (EAGAIN); + if (rv == -1) /* write error */ + return (e); + return (EAGAIN); } void diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index 198efae31a0e..ff470576ee79 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -501,7 +501,6 @@ msdosfs_wfile(const char *path, struct denode *dep, fsnode *node) cpsize = MIN((nsize - offs), blsize - on); memcpy(bp->b_data + on, dat + offs, cpsize); bwrite(bp); - brelse(bp); offs += cpsize; } From nobody Thu Apr 27 16:52:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6hck09ljz47QNx; Thu, 27 Apr 2023 16:52: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 4Q6hcj6pQzz3m1w; Thu, 27 Apr 2023 16:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iYLdbBIqpAhMb68Ieazr+wqWpM65k3oIN9u/GZR9HiA=; b=U2uehXqMIPqwVPVqVgNBepfvbyWyix8TFGpXXmw/Z7yriAIcK7bmHttJ7zZ4w4r4HSjPH1 pbjl17dO/ssT9vu7+p6dUz0DQfwF4RmY4/C+fPSln/zqgLrrRshKruv35vqWCj038LA0ZJ c8osq+AfEOQsdJQyKLQLv5bXDG3Y/z6+tBeDxNuIoHBKzm9o0RXT1St/1gPdySp4P6JgX9 lMNo+sDFCETgUeN/FOnAfpPLeJPCICBGzjH7ZvzJCTbIEdZ32aI502szPyFUkKtKk17M4T zkHFN+9uhIP8Q1sqcLW3gmXYF8s3BStA6I8aAQhord8+kNMdc8JXXCHp84NuGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682614374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iYLdbBIqpAhMb68Ieazr+wqWpM65k3oIN9u/GZR9HiA=; b=qxHQ7xcqJLIzLSBDNcTpLgBwqgufhfHA5FDTavvXES0EY2BeLRdc5v8T7ua9i0DuzWWuuy kfsGhxnY3UVVqYUxcZHKzeSJVOfBOd37lFAkg7Kx/j73Bm3Y2bcVhsU1gJFSWdcM5/qjL5 ObH2HOVTdVqDnPr8s0fSWGg/THLYbRGRs2snDfeGEOcW39ru3eVm5EUXBnkKKLpycZFZdt SQcZC7JcNRORTNxZlKLODnCgBN93n3eE/F5V4CBTBBrJZSXG7YxqlbJFofxS6hAmlBatq+ GwZnjOBVUpr+5psASSa/fhXau1IYKX3A6nYk6ehoupwTTwfFMpkkZnMKKZibfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682614374; a=rsa-sha256; cv=none; b=aclWZgiyG3lI1U2XEd2hFiVc7W30utZTTniwJcoPEjm758Pg2QME0MkV9iAA/OQQwHm/jQ 0MTDoFUzHlYirg+/rBhZF0uy5Do4nsS06x2Z7WzuL9Nt9KazmqId8NreUenmEQOn+YTtJ3 83h9ZJLFr7J7Dc9M7FLrlnSFCKqKtMZFwSHwup3BcbrWjzP6Us519mvhlry3GID/+Os/Zq MUVQRsGojwtEvFKcLSS4XsYzPRtTDqZ3qAQqxytm+36zcxXlwuk1QWOz3qAoKr05/bnDMr JCvzm7RZ0Ez6EvYGjp5qgUZndX4AE2fFIMP+WpD9IoOCDTwgHlMr51XtXiXQ8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6hcj5sW4zQXM; Thu, 27 Apr 2023 16:52:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RGqrTd030227; Thu, 27 Apr 2023 16:52:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RGqrCQ030226; Thu, 27 Apr 2023 16:52:53 GMT (envelope-from git) Date: Thu, 27 Apr 2023 16:52:53 GMT Message-Id: <202304271652.33RGqrCQ030226@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: 0001406ae235 - stable/13 - makefs: set cd9660 Rock Ridge timestamps for . and .. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0001406ae235412745951ecf5832c688ee6079da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0001406ae235412745951ecf5832c688ee6079da commit 0001406ae235412745951ecf5832c688ee6079da Author: Ed Maste AuthorDate: 2023-04-18 13:57:29 +0000 Commit: Ed Maste CommitDate: 2023-04-27 16:45:37 +0000 makefs: set cd9660 Rock Ridge timestamps for . and .. DOT and DOTDOT entries have special handling, and previously only Rock Ridge PX (POSIX attributes) entries were attached. Add TF (timestamp) entries as well. PR: 203531 Reported by: Thomas Schmitt Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39662 (cherry picked from commit dd9059b3e9a1711d54c1d511a2cbb23e6e23f556) --- usr.sbin/makefs/cd9660/iso9660_rrip.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/usr.sbin/makefs/cd9660/iso9660_rrip.c b/usr.sbin/makefs/cd9660/iso9660_rrip.c index 1107688aa21e..e1b8fc993a3a 100644 --- a/usr.sbin/makefs/cd9660/iso9660_rrip.c +++ b/usr.sbin/makefs/cd9660/iso9660_rrip.c @@ -394,6 +394,12 @@ cd9660_rrip_initialize_node(iso9660_disk *diskStructure, cd9660node *node, SUSP_ENTRY_RRIP_PX, "PX", SUSP_LOC_ENTRY); cd9660node_rrip_px(current, parent->node); TAILQ_INSERT_TAIL(&node->head, current, rr_ll); + + /* TF - timestamp */ + current = cd9660node_susp_create_node(SUSP_TYPE_RRIP, + SUSP_ENTRY_RRIP_TF, "TF", SUSP_LOC_ENTRY); + cd9660node_rrip_tf(current, parent->node); + TAILQ_INSERT_TAIL(&node->head, current, rr_ll); } } else if (node->type & CD9660_TYPE_DOTDOT) { if (grandparent != NULL && grandparent->node != NULL && @@ -403,6 +409,12 @@ cd9660_rrip_initialize_node(iso9660_disk *diskStructure, cd9660node *node, SUSP_ENTRY_RRIP_PX, "PX", SUSP_LOC_ENTRY); cd9660node_rrip_px(current, grandparent->node); TAILQ_INSERT_TAIL(&node->head, current, rr_ll); + + /* TF - timestamp */ + current = cd9660node_susp_create_node(SUSP_TYPE_RRIP, + SUSP_ENTRY_RRIP_TF, "TF", SUSP_LOC_ENTRY); + cd9660node_rrip_tf(current, grandparent->node); + TAILQ_INSERT_TAIL(&node->head, current, rr_ll); } /* Handle PL */ if (parent != NULL && parent->rr_real_parent != NULL) { From nobody Thu Apr 27 18:20:07 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6kYM5q0fz47lFr; Thu, 27 Apr 2023 18:20: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 4Q6kYM5C7nz422V; Thu, 27 Apr 2023 18:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18WO3IM/RTZiBC9A44j65Wn/9/xkwH45SIbEzMFEAck=; b=tf/2eWH1LLLWOFu/3YZN0EZfTXmuhty7Q5MKUQfdOYtDfYVTh2EB/ky/25tkOMtR3km/DP 6KvlxUMHDU3bGnZl3Oi4T0OYT+vClo3CbROIJJFTqQO4qfrrMk/2G0Vo6Cl5GfZf4UiEdv Aj0C8mUfsJ2dy3wyeJ2Qlg/Et1AvUIjUJy20Bbu6om1zK0nHm7ZdwEVoJ5uiC8Hqxq5D/H 9nKbYkeixi/5Vevcj/9IO90SFXhdtqa3dCbsffawvM+AjqvjqY7s4bH1UfLpGLSbfD49QF OsnotJQrpwnaYRcXFZ8fh+evGd/iPh9MOKwhd5EFyV/cHxc5ccMAlSFKnpZZGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=18WO3IM/RTZiBC9A44j65Wn/9/xkwH45SIbEzMFEAck=; b=G6ZemyHhxLvpMClAWTfxIkgw8/KeV8N9hAEpn/XM8vZihZx3fk/KCkvM4xApJTTeaytADc LksPF8JBJlYQiBXah4pVQW1823QicoXzDPpo7K5Xg6+dzJhMTU1oGleRvZ6oejrXAPU9r0 DRlhBA8uFHmogUWuo5s2twYI33vvDBVevhKzJve2Rd98Nif7Cuv7ogMgVFLu0+E1BbLyHv efH46E+rYX5tsOCAH8U9zY8KQz7krvhC3O9SlTOH3FN/KaxCovSebNUN8hdDafYrvOvBUa 8krIJhuRzpHu30/hPIZDsWbbYShePjJ/3Sw4INY2UUza33QFXaLiJ4q9PvusuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682619607; a=rsa-sha256; cv=none; b=UvjICFDjDYAWEmSrtNyTvfZBlI7B4cK4xzBcex3Y2gS0MI4XpKjOpfltOvrlZne2zU2lK0 vagY2SJ7lwkp4oOUcYeoFOx6GoulfT0MUuXLgIpsuFMCEU37a0RWXO8rhy+3KaHGTv5YOx ErDxTSnSg4KfHk+CUJq0j3wiW1CEYnMlkHxjeY/J8l45O5qyAoPkTd/mqQoqiCODdZj3IS Ocz3J9bFUbg36rw3M2shDo4MgDTuN4foEuuhraak8aDSMOe9ws/3stXHQK8SaVINd+FPO8 4Q1uiT/X/5ylhiQf4PGQE07udGEq9oZniZcDtgUwmNA3gt8QroSaCAieGITJGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6kYM4FW8zS53; Thu, 27 Apr 2023 18:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RIK7XH067220; Thu, 27 Apr 2023 18:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RIK7RV067216; Thu, 27 Apr 2023 18:20:07 GMT (envelope-from git) Date: Thu, 27 Apr 2023 18:20:07 GMT Message-Id: <202304271820.33RIK7RV067216@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: 68ffc1e6ee00 - stable/13 - release: Remove "All Rights Reserved" from FreeBSD Foundation copyrights List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 68ffc1e6ee00bd2c17c6c3a34bcc72a0edc97e52 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=68ffc1e6ee00bd2c17c6c3a34bcc72a0edc97e52 commit 68ffc1e6ee00bd2c17c6c3a34bcc72a0edc97e52 Author: Ed Maste AuthorDate: 2023-04-17 14:56:59 +0000 Commit: Ed Maste CommitDate: 2023-04-27 17:03:03 +0000 release: Remove "All Rights Reserved" from FreeBSD Foundation copyrights (cherry picked from commit 4654ba28fb8b0a7d74366120cc1967791b46ac3a) --- release/scripts/mk-vmimage.sh | 1 - release/tools/arm.subr | 1 - 2 files changed, 2 deletions(-) diff --git a/release/scripts/mk-vmimage.sh b/release/scripts/mk-vmimage.sh index d5985ceb0d25..38b97a311707 100755 --- a/release/scripts/mk-vmimage.sh +++ b/release/scripts/mk-vmimage.sh @@ -1,7 +1,6 @@ #!/bin/sh #- # Copyright (c) 2014, 2015 The FreeBSD Foundation -# All rights reserved. # # This software was developed by Glen Barber under sponsorship # from the FreeBSD Foundation. diff --git a/release/tools/arm.subr b/release/tools/arm.subr index 5159907d9689..aff4e5a76d5c 100644 --- a/release/tools/arm.subr +++ b/release/tools/arm.subr @@ -1,7 +1,6 @@ #!/bin/sh #- # Copyright (c) 2015-2017 The FreeBSD Foundation -# All rights reserved. # # Portions of this software were developed by Glen Barber # under sponsorship from the FreeBSD Foundation. From nobody Thu Apr 27 18:20:08 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6kYN6WrPz47ldf; Thu, 27 Apr 2023 18:20: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 4Q6kYN5jS6z42Nq; Thu, 27 Apr 2023 18:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPTsFzG+xoJ/YigezQjHQ07qU4g7AT87b0l2XpZF7A8=; b=H3xMHdlBVySEhUl+lNbEG6j1hV9nDXiSuM579y+O69V0Z5Qvc8fiVymw66ABRISN+c6q9c QV6IitjCu6p+stwPOEF7+WLqDyzfFaVJdK9190Bu/xooDZrBFHsjVtpIlnEQ/Wl+7O2QCm DIOsNWgKyC+eat3B9zP1tKBUOzaEgjYulIkhxDYYZbc3w4opgk8CSvoBnDzIqZAJiFapyj 2uf01FKc3uOambhhlcuNV1Zlr+62BFRDnN9aIxVZQLeCaMAoaPAt8sSyXQE0jVVPxQi1MF XxEZVvQsZJvIwgSGByYuPUH9d4Cu7uxjmRuJAtc1PqfSH0eFksT6zpGj2bOa0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPTsFzG+xoJ/YigezQjHQ07qU4g7AT87b0l2XpZF7A8=; b=RTFs1bgkbIXsr2RLqg10oq4hxLCJ/pJDbvbeEfoO8XenhtBHgxcES9/Y5KWrw17K6uwk2o XQZQO/YsOCMo40+ozC9fpggpV6/Zvw2i96veaMZOW+BS8w0XONoMVSJrBEhpKQZubOXbud dFJENA1KF/FR4vGHw10AdtC4YYQkmiz3nhsO9vDFXpOjS6mUHxYKZnl+lR9Ju4/3yRTHul knWJrBJCe4duScXnBnAJlGUE8ShakxOMnLO/qLEAPiftBHJUNX42rjqupMF8pFlKKHK/6O rQs7615a1JndMQ3PMPpxHMyVozSyzHOujrBU23Ff+63OOo3TqHpmbPO9bN8TUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682619608; a=rsa-sha256; cv=none; b=duGVM/x19nwvwv/tV0qSR+8MrpBneeTrLLcx+lYvmR2GJWHPG6Ew+g1stmXU1UUiDajeLF 6iAi6JwBbNBXy94T7uChTUdxB7RoNkSRtnsIHu5o9R4rVMpmNrqLyKeJuKnxHTi9fo/dtq OROVhkxzixMjE3Tf6Y+7KY58y6PK3XcGAQ+HfVJwQVpG+xdZwhpoCzvgb1BBXZrCTcopV8 Id9QwR83zuNAEIx/mHg2V5G9u46QT6HNiY5p9jXY5SeGnHk+dsD/rCv/8pod26Mxu4ncfd A4AeBWuycbEboAQbem/2W73ROhNkryqyDeDCVeArMY5IyVRy9ml+CvrzHoQ8ig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6kYN4jzFzShX; Thu, 27 Apr 2023 18:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RIK86G067480; Thu, 27 Apr 2023 18:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RIK8qn067477; Thu, 27 Apr 2023 18:20:08 GMT (envelope-from git) Date: Thu, 27 Apr 2023 18:20:08 GMT Message-Id: <202304271820.33RIK8qn067477@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: 3b63f0b70671 - stable/13 - llvm: fix some llvm-* tool links when WITH_LLVM_BINUTILS is set List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b63f0b7067129ec7a75b9324acf4ded30d8fc44 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3b63f0b7067129ec7a75b9324acf4ded30d8fc44 commit 3b63f0b7067129ec7a75b9324acf4ded30d8fc44 Author: Ed Maste AuthorDate: 2023-04-21 13:11:45 +0000 Commit: Ed Maste CommitDate: 2023-04-27 17:03:26 +0000 llvm: fix some llvm-* tool links when WITH_LLVM_BINUTILS is set A few Makefiles overrode LINKS and MLINKS when WITH_LLVM_BINUTILS was set, which caused some llvm- prefixed tools to disappear. One such case was llvm-ranlib, which some ports invoke explicitly. Use += when adding to LINKS and MLINKS under WITH_LLVM_BINUTILS. PR: 270955, 270956, 270959 Submitted by: jbeich Reviewed by: arichardson Fixes: 021385aba562 ("Add WITH_LLVM_BINUTILS to install LLVM binuti...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39747 (cherry picked from commit 41df1d60e3237df2106dddf357e3205bf29f85d5) --- usr.bin/clang/llvm-ar/Makefile | 4 ++-- usr.bin/clang/llvm-nm/Makefile | 4 ++-- usr.bin/clang/llvm-size/Makefile | 4 ++-- usr.bin/clang/llvm-symbolizer/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index a6a480bce359..3718248f5de9 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -15,8 +15,8 @@ LIBADD+= z LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/llvm-ranlib .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib -MLINKS= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 +LINKS+= ${BINDIR}/llvm-ar ${BINDIR}/ar ${BINDIR}/llvm-ar ${BINDIR}/ranlib +MLINKS+= llvm-ar.1 ar.1 llvm-ar.1 ranlib.1 .endif .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 0df48744632d..e0c41e4a0254 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -26,8 +26,8 @@ CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} LIBADD+= z .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-nm ${BINDIR}/nm -MLINKS= llvm-nm.1 nm.1 +LINKS+= ${BINDIR}/llvm-nm ${BINDIR}/nm +MLINKS+= llvm-nm.1 nm.1 .endif .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index 20bd5de61192..bce5cf834e0c 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -24,8 +24,8 @@ DPSRCS+= ${TGHDRS} CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-size ${BINDIR}/size -MLINKS= llvm-size.1 size.1 +LINKS+= ${BINDIR}/llvm-size ${BINDIR}/size +MLINKS+= llvm-size.1 size.1 .endif .include "../llvm.prog.mk" diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index c4677169f912..fcaf8facf1b8 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -29,8 +29,8 @@ LIBADD+= z LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/llvm-addr2line .if ${MK_LLVM_BINUTILS} != "no" -LINKS= ${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line -MLINKS= llvm-addr2line.1 addr2line.1 +LINKS+= ${BINDIR}/llvm-symbolizer ${BINDIR}/addr2line +MLINKS+= llvm-addr2line.1 addr2line.1 .endif .include "../llvm.prog.mk" From nobody Thu Apr 27 18:20:09 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6kYP6lq5z47ldg; Thu, 27 Apr 2023 18:20: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 4Q6kYP64CVz42Xx; Thu, 27 Apr 2023 18:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZ9pSobjyrWOx+jePiwp7HaCfjbpxf2SfEmHREPdWdk=; b=O78zpVNcrppax/dulck7wAGLFJvaLmT61aFe7k/R8C2tRFz3YeJrbe6PS141ytB4uSPLkC XSQ0iAXtwJ2Fxp9KPlaUFWztWOLvMXZHDiRS7vK++ZBXnFYIK/zK+6DueNpRxoCggofHC9 xLdHc0vkdB9hHIuiirj8YPDrEHFhU5gxtMvLtIwJm5jiN52QunjRCPqF/HrIeBOl+/4+3c MBOonFdRd0PvydDVQjoDoKE2XJ5AoZG3YZaXdmMZGDPWkc7uR0A2GMdKd70memvUGSYrmC CIKrnaFPRSCw9UKh1xfXGOyk12dhr3Zrsi44LrbLklWOzQhvwT7Up1dh2vF3oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eZ9pSobjyrWOx+jePiwp7HaCfjbpxf2SfEmHREPdWdk=; b=pEJ2gIbnYk1/kP5kLOCjMDt98L4FtqYB23WHjKJ5/vwk6BSp5vjsorAWtmIXZ7jCQdq22w FxyYkDyQgxaDMEKhGVUmtLnPlhl6LbaKVzKw5lntY7V5JCQdQcS06Jg3BiWP722dCxPryl HPXeCUmQfM4CbQu9CHrwbEyBkkYGNlxJwuWPjTZT1j+DROGSC6b1nXEAZFO/Dh/IU1p032 g0K5n8f0Br6NS9qqrqhMOGafQ+HiSNZrKSc/12RdSZWhpAzoFYZohTsTMsybhQeMzbLEGH HVa9pltTPQniOpsPQbbblS1/YD+f9tJV8GKLkho91uTiDtTaY8tkGoox+tZtuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682619609; a=rsa-sha256; cv=none; b=prT0O23jn7c0OeUntH8W7pFCehpt3WWJ6gYzS4vZCYBSX5Cr3+SesdsZxY7fMI6GwcVNR7 PRCgXx8eZQu3F1e7dRC2iqjgYiGHr+0LFzNRxbuXnflOsYRZiMZEL2K0PEjR6Lr7seyz8V kwLWBAAh6FX5smJ4IWkmOoy4Om9h5cG/85GblRidHwO4el6udTzD8xbkNcXRutI76+DU3M THA8781UyyjPOtX/x0/rJritIIrTMUiLcMmmMUCv+Q8nBe6mp5rm9OgS78F2l/g8/gkZ32 rGkuJgOQXHxMb+7WWqlF54eTUzPdWejvU63Y90BTHm1uY49/VvCSW/f+/7ASJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6kYP55Q4zScN; Thu, 27 Apr 2023 18:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RIK9qh068004; Thu, 27 Apr 2023 18:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RIK90e068001; Thu, 27 Apr 2023 18:20:09 GMT (envelope-from git) Date: Thu, 27 Apr 2023 18:20:09 GMT Message-Id: <202304271820.33RIK90e068001@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: 47af8281c55d - stable/13 - memmem: add a note about other systems which have memmem List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 47af8281c55d1bd2bd774555c9ad0af5ef3a806e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=47af8281c55d1bd2bd774555c9ad0af5ef3a806e commit 47af8281c55d1bd2bd774555c9ad0af5ef3a806e Author: Ed Maste AuthorDate: 2023-03-30 01:03:27 +0000 Commit: Ed Maste CommitDate: 2023-04-27 17:04:55 +0000 memmem: add a note about other systems which have memmem memmem started as a GNU extension but is now widely available. Reviewed by: mhorne (slightly earlier version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39337 (cherry picked from commit 30da840c627c80800c06edef346d907d6e5066a6) --- lib/libc/string/memmem.3 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libc/string/memmem.3 b/lib/libc/string/memmem.3 index a2a7c2ece623..5f8b9d792e78 100644 --- a/lib/libc/string/memmem.3 +++ b/lib/libc/string/memmem.3 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 17, 2017 +.Dd March 30, 2023 .Dt MEMMEM 3 .Os .Sh NAME @@ -71,7 +71,8 @@ is returned. .Xr strstr 3 .Sh CONFORMING TO .Fn memmem -is a GNU extension. +started as a GNU extension but is now available in at least +the GNU, musl, bionic, OpenBSD, NetBSD, macOS, and Illumos C runtime libraries. .Sh HISTORY The .Fn memmem From nobody Thu Apr 27 18:20:10 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6kYR2Dt4z47lG1; Thu, 27 Apr 2023 18:20: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 4Q6kYR0G2kz42WY; Thu, 27 Apr 2023 18:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dW7Akudx1rMC+fzE4CPvtdRzyOObZvwu/ydCqravzT8=; b=REWtpgL/KE/C1idKRM5IAAWpv4Ek5j8C5/aS+mHxJipUNKMKKfXcKgNP9YFOQ2ihYcx+kJ yIkHx5ox2eVVdbylGHuPl23H0jlsf0kX3CZzUDMrx/Ggv+8OIYk8NW8zPVUTN5jmGgWrP6 5rCBuvvvISZ5msqJZ5RH64P33kNg/lxuDSO+nrdpLjfWV26Ly53vzpbMvdW5qhHfb6S4Jz 5dIZ6vLrRfDlQ8qbIDOertV6n89fYZNV9zmQVo2jZhdpFRgk1a7DkiumqGa+gzaiI8cVSt d2svLWWg6kg3hj7RjAm9Ee/D7BDRceUTFbSW/QCWmkQAwkdzReRFOqvj0uVifg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dW7Akudx1rMC+fzE4CPvtdRzyOObZvwu/ydCqravzT8=; b=KDxPyPTJnnIZfKF9ukMKP7hfs2PzyM+S0DeGZ9BfdE8smqVBCSlX7JUpXGizAI8SneAewU 9+xCuvluwCidRVGhcnKR+xgc3vohTiAXExqcXI9oDkXvrsBKYYXXxIbcToBVqc8m4F56b/ 4jro9JYsBeiSrEGECbBYayOP5RXLKALMllFzGG0DzpOXahJotD4LcmH2fhmMv9cY76Q6q0 iVYf+3umA1Cj57QN+29UbAV0XgVigy6O3ed3l0QE+HYBqUB69zhJwvLaKOtMQ1Wb+UeGnn 1JLZIvs3Edt4xtfZj71MqkO7Ox0Yhgn5ndNJVjprUFfH4pAq7aUsEC4UhEaEQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682619611; a=rsa-sha256; cv=none; b=UzXYrx4ybVnatDnttpzRTkQbrWec08RRl6YXHMb2RUM1oe+hcmTedJveMyHYU0MB7N65ZC jFf7AyrVBregdORxhQ9u8TLbLHyitmuVgpisnEFs6VwfYiJSEEXFj5WHgDOXfpX0aMzyDU t6Nd6XcT3+K1OwZZGad9WDQqiITu3WJmmaOurOOcwby+uMNZwtSr8FuqdAWz3zQ3YJC4Iw mRxMBH0GMUyysEa8EvnpXvwihQNInafQ+YFBM6UW3dWiNCZZx3f5vGDjLRXzcb6GqCgN9+ 3zXzwp6bgQ4n02ngyfraT37n7c8W5iEL/MDo4Qt/KpbHx4eZbFwK5TRLUKHjLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6kYQ68pdzSNV; Thu, 27 Apr 2023 18:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RIKAH2068674; Thu, 27 Apr 2023 18:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RIKAa8068667; Thu, 27 Apr 2023 18:20:10 GMT (envelope-from git) Date: Thu, 27 Apr 2023 18:20:10 GMT Message-Id: <202304271820.33RIKAa8068667@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: 937d152b3e62 - stable/13 - rtld: reindent and style(9) elf_hash() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 937d152b3e62f936334887759798ebf5fc55e53e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=937d152b3e62f936334887759798ebf5fc55e53e commit 937d152b3e62f936334887759798ebf5fc55e53e Author: Ed Maste AuthorDate: 2023-04-12 15:06:14 +0000 Commit: Ed Maste CommitDate: 2023-04-27 17:05:17 +0000 rtld: reindent and style(9) elf_hash() In preparation for an upcoming change (D39517). Sponsored by: The FreeBSD Foundation (cherry picked from commit 87443cb6c669b51ceaa7f85db63191374477efc1) --- libexec/rtld-elf/rtld.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 30cb4b595b71..49685508d4dc 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1843,17 +1843,17 @@ donelist_check(DoneList *dlp, const Obj_Entry *obj) unsigned long elf_hash(const char *name) { - const unsigned char *p = (const unsigned char *) name; - unsigned long h = 0; - unsigned long g; - - while (*p != '\0') { - h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; - } - return (h); + const unsigned char *p = (const unsigned char *)name; + unsigned long h = 0; + unsigned long g; + + while (*p != '\0') { + h = (h << 4) + *p++; + if ((g = h & 0xf0000000) != 0) + h ^= g >> 24; + h &= ~g; + } + return (h); } /* From nobody Thu Apr 27 18:20:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6kYS1pWgz47lvT; Thu, 27 Apr 2023 18:20: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 4Q6kYS0G06z42c0; Thu, 27 Apr 2023 18:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gC+Yti2TFufnIXTOHwbTtKarcrQtrzWCcpRjq0kxiog=; b=FaOwtCSsoWxmox/uDi6g9L3EuePVBEkQQfCfkkKg8xKBKkHMegi8w52Mp5RE5/GLrUlWQz 5LC7N5UFCzTiitfak0p+GHk47V/o3nx7FRYxm8vpHPbkPxO1bggtG5tWnWP3wLDBM0HFk4 ZDen8A88aQsM+OXy1BfcKPDxxY5YOUdJ1LKKJEJrE9aKzM0bjjVHj0Tno7YasfZSnSyi9M ZvNAIFgfHbuVHt2RmvcDAxbKkmJAjpnc9sjSVyVgbaR39k5KzEQrMowvgzyhfYms2BRztD adaFzxZeGUKWR+zmSr44YmUFTjQHaSzzebs7ltealeR4EOXYgesNU+n41aKXXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gC+Yti2TFufnIXTOHwbTtKarcrQtrzWCcpRjq0kxiog=; b=S2O9a2S7DkBWR0KBzysicKJnY6LpE0KlCy6FRj67WqZZwDpTs37yGoCXk7sulxrEMjINTo xP6Bi1PfohQ64IPuyswZHMxMGBD6RNDY0DDn5tJJ3iFuTVbEVHZd3zhQulGijW9jWV0LUU BbfUqkB8u/AZSeiF+BSX7NbwFuOlV9v+UB9RxPB1tn5Jyo9thzC7HqBbmvsndVoTHmPmCN rgleWL3OMrb0q53yC9ZLlHARGTGZnkqkzdoEQmNQ0rJCCH7orcZ3q570jUOF0FJZOjDYDs KaDf8hexdpIQyphlBSZYEYWvBoNbgaKh0wWI1tyWHZWBINDgwLUYFrwoYl1bgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682619612; a=rsa-sha256; cv=none; b=C7ca2P/lBCHrfGvb4ebCkMvquqR+hQbgkuLTEtxmbZwKbAANH5wcGkGrA+R2+amAlMvc+5 Ccel4DVFETOxnb40i5vV7/+8lq2X1NENOjITZgCoJUKiUU7jacCbsVZP1Cea4OIqWZP5XO TXOztuCxRR/iHatvrqAhnnhIafJDJiz65XVtDlM6whdIWGnl0/Qod/GqAPubUJ9r+RHmD2 AeobCVL2F0tIodf8WXjFM8HstK+UtQuEoP6JIjl5WSTVtbtE/pYE6AvI+dI5zNwp3qRgVT 0Ae8p9JbXEkRFfboWgCc9fkiDDA4IBxz6PJS+shvC5DjCU7SihoTnzTmD5pq6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6kYR6R1BzShY; Thu, 27 Apr 2023 18:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RIKBlD069315; Thu, 27 Apr 2023 18:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RIKBR7069312; Thu, 27 Apr 2023 18:20:11 GMT (envelope-from git) Date: Thu, 27 Apr 2023 18:20:11 GMT Message-Id: <202304271820.33RIKBR7069312@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: 26cc23c84e0e - stable/13 - rtld: fix SysV hash function overflow List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 26cc23c84e0e8bfc6d32b7d802f3cb9598d6ef79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=26cc23c84e0e8bfc6d32b7d802f3cb9598d6ef79 commit 26cc23c84e0e8bfc6d32b7d802f3cb9598d6ef79 Author: Ed Maste AuthorDate: 2023-04-12 15:07:26 +0000 Commit: Ed Maste CommitDate: 2023-04-27 17:05:22 +0000 rtld: fix SysV hash function overflow Quoting from https://maskray.me/blog/2023-04-12-elf-hash-function: The System V Application Binary Interface (generic ABI) specifies the ELF object file format. When producing an output executable or shared object needing a dynamic symbol table (.dynsym), a linker generates a .hash section with type SHT_HASH to hold a symbol hash table. A DT_HASH tag is produced to hold the address of .hash. The function is supposed to return a value no larger than 0x0fffffff. Unfortunately, there is a bug. When unsigned long consists of more than 32 bits, the return value may be larger than UINT32_MAX. For instance, elf_hash((const unsigned char *)"\xff\x0f\x0f\x0f\x0f\x0f\x12") returns 0x100000002, which is clearly unintended, as the function should behave the same way regardless of whether long represents a 32-bit integer or a 64-bit integer. Reviewed by: kib, Fangrui Song Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39517 (cherry picked from commit 29e3a06510823edbb91667d21f530d3ec778116d) --- libexec/rtld-elf/rtld.c | 15 ++++++--------- libexec/rtld-elf/rtld.h | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 49685508d4dc..dc8353ba6628 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -1837,23 +1837,20 @@ donelist_check(DoneList *dlp, const Obj_Entry *obj) } /* - * Hash function for symbol table lookup. Don't even think about changing - * this. It is specified by the System V ABI. + * SysV hash function for symbol table lookup. It is a slightly optimized + * version of the hash specified by the System V ABI. */ -unsigned long +Elf32_Word elf_hash(const char *name) { const unsigned char *p = (const unsigned char *)name; - unsigned long h = 0; - unsigned long g; + Elf32_Word h = 0; while (*p != '\0') { h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; + h ^= (h >> 24) & 0xf0; } - return (h); + return (h & 0x0fffffff); } /* diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h index 52ff8de911e2..e8e997753c6f 100644 --- a/libexec/rtld-elf/rtld.h +++ b/libexec/rtld-elf/rtld.h @@ -385,7 +385,7 @@ void dump_Elf_Rela(Obj_Entry *, const Elf_Rela *, u_long); */ uintptr_t rtld_round_page(uintptr_t); uintptr_t rtld_trunc_page(uintptr_t); -unsigned long elf_hash(const char *); +Elf32_Word elf_hash(const char *); const Elf_Sym *find_symdef(unsigned long, const Obj_Entry *, const Obj_Entry **, int, SymCache *, struct Struct_RtldLockState *); void lockdflt_init(void); From nobody Thu Apr 27 18:20:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6kYT1jbTz47lvX; Thu, 27 Apr 2023 18:20: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 4Q6kYT19sRz42kY; Thu, 27 Apr 2023 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaeLzfmhpnznKz+0NZC4MWtMTLd1cRXX0L3CTXmMLNc=; b=lkGuZ0RmDTefBCcNSw0MOB96pL1i33ZHBNegTPPD073s4et0isMS0nhcRkhvfRGhxCdyYY 32MpN2m0sVWslmiu71YXdnmVSwX2UBZ/xMTDRyC8zOzvDFkjcvNM8NrCEPOSO4EeINBSca oIEBzgR/fuYr5Hu8anWi/IPkb9paobKPywFchZv1+I5olES8DbguOrBCqroZQX+uvmU2sb waEpG2MGE2vYOrfzlnKSvL3sHWdI0VQCX65y9T1naB8faGlsU4UyfH1+qXaRzG7ATEVoJk FHmWZBHraAHOPcdCr1XD3OlY25tUmGrFiK4N3+jVC8uJtD87zair4i7B33f3Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682619613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EaeLzfmhpnznKz+0NZC4MWtMTLd1cRXX0L3CTXmMLNc=; b=wE4FU+DI8hX4Bv6ih7Hv3VZPOJNGD8yZq9NcUd3tqmrVqLsBkVW0jNcn1So8JpSg7/EBOZ Tst6XgcidU13d+hPfSEHOPAPYPKoN2qS/tsrH4az5goirtDnn/3XlxAUJ27mk0WZGB1P6r humw4QEbyow4f1O/HZnH78cNvA0t6Kr/ZwsTd8Y6OxpFDKMSAZm4l7It4v5JPWS+/qmN6T iyry+nfDLQfLwQXXl3jvcJKrZWlTtTNAdspM4PJ2vwrEBiS1JqZDzJ1kaOaSJphyXg70SW Wdlkgy/70yIkxt5ToTlD0e2kA3RFrWiOHWND53fS80ZygJv71ogZgi9nBt/zew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682619613; a=rsa-sha256; cv=none; b=db61DT+c0bvkhbJaG+eV/3XFkj1A+eC06+iV53Rm+zfOOky5aVJXmHoYBPNSd69VVrnuu7 6iqX1LssT6UzAM9AJKbl61KkMnrtcNhlOwykt3dc05cqmtAWDjclm9BhG58DKv+vXOlshD rsBJ40T29RMIGu1NF6Veud85YnOeWL59cdr1BFv/NNG0sjqs1kWdl8j/2jAUFKbtxcgEiw Y6SpIg5n7+bYT/2TKDaKD7x9nG+AfItLyqzsNRh3O/+8Ll26VFjLPhTeP32LFTmHh+wsk1 rEp/xrMMvlRi621U2gLgB13Dq+Ovb+SD2P/l8EckocAAA6WFEVCwIhXUxSsvLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6kYT03SYzSqc; Thu, 27 Apr 2023 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RIKC6L069939; Thu, 27 Apr 2023 18:20:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RIKCqv069930; Thu, 27 Apr 2023 18:20:12 GMT (envelope-from git) Date: Thu, 27 Apr 2023 18:20:12 GMT Message-Id: <202304271820.33RIKCqv069930@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: 9e4ae81971f7 - stable/13 - link_elf: fix SysV hash function overflow List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9e4ae81971f7b85982c73c1b29424149b56f38dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9e4ae81971f7b85982c73c1b29424149b56f38dd commit 9e4ae81971f7b85982c73c1b29424149b56f38dd Author: Ed Maste AuthorDate: 2023-04-12 14:04:27 +0000 Commit: Ed Maste CommitDate: 2023-04-27 17:05:28 +0000 link_elf: fix SysV hash function overflow Quoting from https://maskray.me/blog/2023-04-12-elf-hash-function: The System V Application Binary Interface (generic ABI) specifies the ELF object file format. When producing an output executable or shared object needing a dynamic symbol table (.dynsym), a linker generates a .hash section with type SHT_HASH to hold a symbol hash table. A DT_HASH tag is produced to hold the address of .hash. The function is supposed to return a value no larger than 0x0fffffff. Unfortunately, there is a bug. When unsigned long consists of more than 32 bits, the return value may be larger than UINT32_MAX. For instance, elf_hash((const unsigned char *)"\xff\x0f\x0f\x0f\x0f\x0f\x12") returns 0x100000002, which is clearly unintended, as the function should behave the same way regardless of whether long represents a 32-bit integer or a 64-bit integer. Reviewed by: kib, Fangrui Song Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39517 (cherry picked from commit 2ef2c26f3f132af33f6f12cd7b27d4dbbd7fa435) --- sys/kern/link_elf.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index 245c8697cf79..3c06c8c79108 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -1481,23 +1481,20 @@ relocate_file(elf_file_t ef) } /* - * Hash function for symbol table lookup. Don't even think about changing - * this. It is specified by the System V ABI. + * SysV hash function for symbol table lookup. It is specified by the + * System V ABI. */ -static unsigned long +static Elf32_Word elf_hash(const char *name) { - const unsigned char *p = (const unsigned char *) name; - unsigned long h = 0; - unsigned long g; + const unsigned char *p = (const unsigned char *)name; + Elf32_Word h = 0; while (*p != '\0') { h = (h << 4) + *p++; - if ((g = h & 0xf0000000) != 0) - h ^= g >> 24; - h &= ~g; + h ^= (h >> 24) & 0xf0; } - return (h); + return (h & 0x0fffffff); } static int @@ -1508,7 +1505,7 @@ link_elf_lookup_symbol1(linker_file_t lf, const char *name, c_linker_sym_t *sym, unsigned long symnum; const Elf_Sym* symp; const char *strp; - unsigned long hash; + Elf32_Word hash; /* If we don't have a hash, bail. */ if (ef->buckets == NULL || ef->nbuckets == 0) { From nobody Fri Apr 28 05:52:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q71wS0ck1z481kP; Fri, 28 Apr 2023 05:52: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 4Q71wS09jBz4CYm; Fri, 28 Apr 2023 05:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682661160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpgxVlu8cegnskMmhQ5QgdG0a37Q+5CkN194s83TCP0=; b=xzMQE2VC4PB9/tHZD8HvzZMIKdQCY1k8vEvk6Wy20fLn/eaxw32nm/2gzGJ1LUpFpaBDJs DfHRSKfQQMynG1aOyR89ubBG+p3QHFmkNF2mqOxRl7aLfqaOrxs0zi67la8z4t3yLZkJ77 7H+zrxwlUKSfJ0+w4VtRyzA0QXYl6JZz2p6C+dMVFvKFIATw3vINjE3s0SPRcFirECIhu8 oZJcoD0xic1fVn8OaTjdnagxEMsS9fshLb1sA6ZVYIh1XxPOmaqkeWbtlvxIMFjGqk3BVI 0Et3QNmU9HIGoVN0hb8qNff4QHTxFRKrPAALA/P/Qn1HiktS9QWCkjZRXQeNeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682661160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GpgxVlu8cegnskMmhQ5QgdG0a37Q+5CkN194s83TCP0=; b=l5rw4Q+HSRvhTNY2f5i4JGbEqfS5Akei3eF9ohP2EPChilZbVnbuUlzKlTPMCPJGZpoEzJ mK1ZvYdPObQQIFwoeAKX6M2QC5dFggptTlvk580m5HZd/ISV3yw/rqdChPxzdftBVPLqXr zyKkgjRrDsO3b9KA2uukfT0bDoU1fH2KcfJjLP7vfXuCYh/Vc3r91nzIPg7A/T6XhdoJ5q IvJDt6aJz5BghZ/FrG0EmEB5i8jwWRL2vZcLk+jIsdGEqpt4aqEijTOIMZF4pdBHiGwZ6Y lqMdTeq2gDl/dmYvgN3Ls+IV4RKBHs846SuzHXnCOJkToyr5lEegfgUuwiHREQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682661160; a=rsa-sha256; cv=none; b=r45+l2dRVJGPpde13s8uOiKYqZa3WJ5XVxJ1tMkvLMVJd6xLbDW8+YKNLXEvnvL4z/TDE7 Pi29jdd39OiSFPQP4VHwpEl/nkXtwTS7ZoEEllex6zPBYFmbZtiSECV/4F1fWIjF2D0huW ebVERv6hgPbD4V4d0XQi+OpqUiFs6I/KAUEf4o8HeyeU1jyPjsigkqRwSt1YhGpjZvhRgS aQ6mbFkUgkklZnmI7DR+znqr0K1bvXDqvRPugDtvLyVzPiRbUqpF+FIF+sNpVotoOw4hUT 5nYthWQJmRm0c0N4U/B1Ga+X3hPitzvJW9WGuhXiK2evg/z6GfUtgdlazECDyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q71wR6L7vzp2X; Fri, 28 Apr 2023 05:52:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33S5qdj1019484; Fri, 28 Apr 2023 05:52:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S5qdB9019483; Fri, 28 Apr 2023 05:52:39 GMT (envelope-from git) Date: Fri, 28 Apr 2023 05:52:39 GMT Message-Id: <202304280552.33S5qdB9019483@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: f1c5c9353c0e - stable/13 - ipfw.8: MFC: improve description for interface matching List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f1c5c9353c0ea70fcf058666fbbfa648ad3637c6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=f1c5c9353c0ea70fcf058666fbbfa648ad3637c6 commit f1c5c9353c0ea70fcf058666fbbfa648ad3637c6 Author: Eugene Grosbein AuthorDate: 2023-04-25 11:12:11 +0000 Commit: Eugene Grosbein CommitDate: 2023-04-28 05:52:15 +0000 ipfw.8: MFC: improve description for interface matching The manual describes "if*" form only while kernel uses fnmatch(3) and allows use for more versatile shell-like patterns. Note that explicitly and provide an example. (cherry picked from commit 9f5dc374d0dadb6947a9bd9ff8ff44931e1b6422) --- sbin/ipfw/ipfw.8 | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index 3c5308b29821..40299e70ed27 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,7 +1,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 4, 2022 +.Dd April 25, 2023 .Dt IPFW 8 .Os .Sh NAME @@ -1912,13 +1912,24 @@ However, this option doesn't imply an implicit .Cm check-state in contrast to .Cm keep-state . -.It Cm recv | xmit | via Brq Ar ifX | Ar if Ns Cm * | Ar table Ns Po Ar name Ns Oo , Ns Ar value Oc Pc | Ar ipno | Ar any +.It Cm recv | xmit | via Brq Ar ifX | Ar ifmask | Ar table Ns Po Ar name Ns Oo , Ns Ar value Oc Pc | Ar ipno | Ar any Matches packets received, transmitted or going through, respectively, the interface specified by exact name .Po Ar ifX Pc , -by device name -.Po Ar if* Pc , +by device mask +.Po Ar ifmask Pc , by IP address, or through some interface. +.Pp +Interface +name may be matched against +.Ar ifmask +with +.Xr fnmatch 3 +according to the rules used by the shell (f.e. tun*). +See also the +.Sx EXAMPLES +section. +.Pp Table .Ar name may be used to match interface by its kernel ifindex. @@ -4217,6 +4228,12 @@ of clients, as below: .Dl "ipfw add deny ip from ${badguys} to any" .Dl "... normal policies ..." .Pp +Allow any transit packets coming from single vlan 10 and +going out to vlans 100-1000: +.Pp +.Dl "ipfw add 10 allow out recv vlan10 \e" +.Dl "{ xmit vlan1000 or xmit \*qvlan[1-9]??\*q }" +.Pp The .Cm verrevpath option could be used to do automated anti-spoofing by adding the @@ -4740,6 +4757,7 @@ can be changed in a similar way as for .Sh SEE ALSO .Xr cpp 1 , .Xr m4 1 , +.Xr fnmatch 3 , .Xr altq 4 , .Xr divert 4 , .Xr dummynet 4 , From nobody Fri Apr 28 06:02:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q727x5HJdz48299; Fri, 28 Apr 2023 06:02: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 4Q727x4RPVz4CyM; Fri, 28 Apr 2023 06:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682661757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tX2pm+4OJijv/1BxXjUOG/FxAsubjPMb/IX4RD4p4fg=; b=gaji0ibPxIScYPdyKm8xXCJLqII14UI8+8GbKO1mz6O79r3+Nr4YrKbUjlJxb7TOV7qlXW 7UPi6O/HWxS9PpVIsuK98FT1KYbw5YEOgEZoS24CFInHUzeJju8Em+06rQaUVwzVzT34dv dWGtWMz4Oq7pTLGYXXeTaUXWSzMvgU1bn6eWTZb3emUXACAM69VSYl0ERzCimKKYmUYgGq SM+fip3IajTy81qMB6WEc4i0g8nYmRoaUyan0QiaLKYLSsygqUBXekp8ENPSy6siaOy9tE nE0udSc+OaltAxcmJuoOlcxu1h5LFX9llGwtZ0HnMBqiEhMJN/GGLyB3mK/tDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682661757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tX2pm+4OJijv/1BxXjUOG/FxAsubjPMb/IX4RD4p4fg=; b=RKmDgkMCuLH5z0uDVhNkfUKC/xxNiupPNpBIYa+s1Ml1UcF54cjKWZ6q1K5HOEKqc4VsPD HsPJSpswQ5JQD8ovjSReGTZqSOyj5B2H5HHDryd4cyLKwavGWPpfP/5EvRuJxOG06ASo0t bNyTbsAgy3oVLoNVRS7MMVI2ZZqi6ReA4tioL3OgJvfXThzHXVG3ipBxGbJ/WrZvy6tC15 9Lg5glxKMsmfQFQOmPrZeb6pBig3Mi/xplefZcmDpKoFSsdpTX3KWE2vNK98aQRM3MdBea YlxpDhBRGtmBuGYGH3+KOjlWK4KH5gHQNCseSoGOtJfwuWnR/1HyI/B4HaMvJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682661757; a=rsa-sha256; cv=none; b=IiEAz3O8Hqy1xHuTGGe5hm0DL015k171leTcrGtitUS4gaEzhlIVHw5wzGHArfXEoKoAih p+0GOzYi2A6+zsM1RCtyWh3iIi0RWU1TL2lTTo3rlFODyAHX7BW4Ym7gNryhqAx36EZrmo VIWqTfJukYjfllQl6YIMu4hWgpVemaXzaczqEq/MB0c5JYmPg83hD4rz17iX9iBE1DcIjJ M1Y5Bn22Apo4fAS8VLOmyILKSk/tjXaZUPFEmFYUytkmb46Fo8/OI2ZQJXncT9Sg34XHi5 mNijplRzFex2x3P4/u9SFPoEkczu6h9F5ilFkmG/b3oXr7ZCsAdCuookN2eP9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q727x3VZmzp5c; Fri, 28 Apr 2023 06:02:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33S62b98036931; Fri, 28 Apr 2023 06:02:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33S62b7x036930; Fri, 28 Apr 2023 06:02:37 GMT (envelope-from git) Date: Fri, 28 Apr 2023 06:02:37 GMT Message-Id: <202304280602.33S62b7x036930@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: dffde5aa070b - stable/12 - ipfw.8: MFC: improve description for interface matching List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: dffde5aa070b0a473a06441c50dc8c796436a7fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=dffde5aa070b0a473a06441c50dc8c796436a7fc commit dffde5aa070b0a473a06441c50dc8c796436a7fc Author: Eugene Grosbein AuthorDate: 2023-04-25 11:12:11 +0000 Commit: Eugene Grosbein CommitDate: 2023-04-28 06:02:17 +0000 ipfw.8: MFC: improve description for interface matching The manual describes "if*" form only while kernel uses fnmatch(3) and allows use for more versatile shell-like patterns. Note that explicitly and provide an example. (cherry picked from commit 9f5dc374d0dadb6947a9bd9ff8ff44931e1b6422) --- sbin/ipfw/ipfw.8 | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8 index ba477f379532..512ad5baf90e 100644 --- a/sbin/ipfw/ipfw.8 +++ b/sbin/ipfw/ipfw.8 @@ -1,7 +1,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 14, 2021 +.Dd April 25, 2023 .Dt IPFW 8 .Os .Sh NAME @@ -1896,13 +1896,24 @@ However, this option doesn't imply an implicit .Cm check-state in contrast to .Cm keep-state . -.It Cm recv | xmit | via Brq Ar ifX | Ar if Ns Cm * | Ar table Ns Po Ar name Ns Oo , Ns Ar value Oc Pc | Ar ipno | Ar any +.It Cm recv | xmit | via Brq Ar ifX | Ar ifmask | Ar table Ns Po Ar name Ns Oo , Ns Ar value Oc Pc | Ar ipno | Ar any Matches packets received, transmitted or going through, respectively, the interface specified by exact name .Po Ar ifX Pc , -by device name -.Po Ar if* Pc , +by device mask +.Po Ar ifmask Pc , by IP address, or through some interface. +.Pp +Interface +name may be matched against +.Ar ifmask +with +.Xr fnmatch 3 +according to the rules used by the shell (f.e. tun*). +See also the +.Sx EXAMPLES +section. +.Pp Table .Ar name may be used to match interface by its kernel ifindex. @@ -4185,6 +4196,12 @@ of clients, as below: .Dl "ipfw add deny ip from ${badguys} to any" .Dl "... normal policies ..." .Pp +Allow any transit packets coming from single vlan 10 and +going out to vlans 100-1000: +.Pp +.Dl "ipfw add 10 allow out recv vlan10 \e" +.Dl "{ xmit vlan1000 or xmit \*qvlan[1-9]??\*q }" +.Pp The .Cm verrevpath option could be used to do automated anti-spoofing by adding the @@ -4708,6 +4725,7 @@ can be changed in a similar way as for .Sh SEE ALSO .Xr cpp 1 , .Xr m4 1 , +.Xr fnmatch 3 , .Xr altq 4 , .Xr divert 4 , .Xr dummynet 4 , From nobody Fri Apr 28 10:40:16 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JJ3mJbz48JvH; Fri, 28 Apr 2023 10:40: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 4Q78JJ3FW2z3Glk; Fri, 28 Apr 2023 10:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+jNeHj+54UM04h1f6ZJ07rcCvdbUwRHhRPkK1Vtdu+w=; b=tfPHq+pEsVsTuLBT95aZJtcLD7qDhbvTf5UQ0WkDoMnAO90fSZHZALpyDizCPxkMo68s3l jsL6NIV5pM5OOo9Rmo4F9kx6a3gVCGxzVqT3GiE+q3t95qE1Xu7zSJZQqo2PBB5KPJGZYw VxY43BW0zj5hQZ0KDannpnG99U8rNIskPqmvpKleHdO3LBbq9hn3lYRSqkdWuXxhvWRHg0 tgw/h5svyBvBvYYUS3QFeQVxgesggzyT5M0+xkxcC/HkWPNhb9/86YFdt7JKS8oNTBf7WS eohi/pGIqDz3q4XVeFfe6HlRR5MTcoY7JrsZHS51bgijsQvTsuUhP5ylkr5Tkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678416; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+jNeHj+54UM04h1f6ZJ07rcCvdbUwRHhRPkK1Vtdu+w=; b=HJk4XKPsUMnEB12ldAUIaXGILG8ddLhy4uaKZ9cSng7AwgedgWeO6caUT6D39YB/qvUS+6 kn6Zy0Y4CuVu9+6K0WAajZX/6C7Lrr+ys1RoLb6O4J0tUQmPC5IcoHxmq9iX2TbR6YOJTQ zxhFvcnGnW+cTARsY/bQwGb5m3IJ3ls/EbYS3YLy2V6ctKtzpkylTvhc4cU2wQn/osB7SF NvIONolErG/ywdnODaxGU9rBaXturMLheepV8u+RYpiCqSK+51mdJZbR4jcgZXV+a7tdlU BZWDqRedMH6YnR2QWCSOi+TuKCxCtu0geEahEreR4JRor/h3erpxiAtJk9pq2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678416; a=rsa-sha256; cv=none; b=Ya8Ss7D1mDa1YvIX3/w1Sb1tY0uSZ07LTVaZQMwbt+SjppurXtF+LZAPRlmIdhX8CX4aO6 IEqjLEJ2YXP3avHtMT7a85MGn//hJDgS33LH6HY0rs8o6eWZH3i9fRYKwv/10LfIeEp6y2 zKtwy/tZNwzQRPeaHNWok02rXNpgQ1h0TK6orO/WZ389Y8+5AcPqQ0SKJSQfkPsPPZBZpQ mm7LzqPi4udbQrYR+eHy+S4YcOHaJ1C3FcrBZ5KGsqrJAn+be4fh59N0tRkb1ESkmQ1EMT 9zeheupQhZlwYeQBycSX9N2PXiSKAp8vc5fR8VmvhBsnTrnOIFyg6oUSq4KIrg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JJ2DdvzwHf; Fri, 28 Apr 2023 10:40:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeGgg091752; Fri, 28 Apr 2023 10:40:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeG1c091749; Fri, 28 Apr 2023 10:40:16 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:16 GMT Message-Id: <202304281040.33SAeG1c091749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: d4cae9c5e63e - stable/13 - bhyve: add config option to modify LPC IDs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d4cae9c5e63e110fbdc954f9366bf5c7e567b88a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=d4cae9c5e63e110fbdc954f9366bf5c7e567b88a commit d4cae9c5e63e110fbdc954f9366bf5c7e567b88a Author: Corvin Köhne AuthorDate: 2021-11-23 12:14:41 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:13 +0000 bhyve: add config option to modify LPC IDs The Intel GOP driver checks the LPC IDs to detect the platform it's running on. The GOP driver only works on the platforms it's written for. Maybe other Intel driver have the same behaviour. For that reason, we should use the LPC IDs of the FreeBSD host for GPU passthrough to work properly. We don't know if setting different LPC IDs have any side effect. Therefore, don't use the host LPC IDs by default on Intel system. Give the user the opportunity to modify the LPC IDs. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D28280 (cherry picked from commit f4ceaff56ddaacc151df07d2d205a2d7fcb736a8) bhyve: fix spelling mistake of pcireg option The option is spelled "pcireg" not "pcir". MFC after: 1 week Fixes: f4ceaff56ddaacc151df07d2d205a2d7fcb736a8 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit c98d13fbf9c9b75a49e48789932cd1395c95e7bf) bhyve: scan PCI device functions to find host LPC At least on some AMD devices the host LPC bridge could be located as seperate function of another PCI device. Fixes: f4ceaff56ddaacc151df07d2d205a2d7fcb736a8 MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39310 (cherry picked from commit d3e03d235e3133f79ff9e3879fd4ed61ace38d73) bhyve: do not exit if LPC finds no host selector The host selector is only required when the user likes to use the same LPC device IDs as the physical LPC device. This is an uncommon use case. For that reason, it makes no sense to exit when we don't find the host selector. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39311 (cherry picked from commit 0d29d750b9a7188c435d3701b2183f4df15ac98b) --- usr.sbin/bhyve/bhyve_config.5 | 14 ++++++++++ usr.sbin/bhyve/pci_lpc.c | 61 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 9482d1260e05..26387da0d59e 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -542,6 +542,20 @@ for fwctl and for fwcfg. .It Va pc-testdev Ta bool Ta false Ta Enable the PC debug/test device. +.It Va pcireg.* Ta integer Ta Ta +Values of PCI register. +It also accepts the value +.Ar host +to use the pci id of the host system. +This value is required for the Intel GOP driver to work properly. +.Bl -column "subvendor" "Default" +.It Sy Name Ta Sy Default +.It Va vendor Ta 0x8086 +.It Va device Ta 0x7000 +.It Va revid Ta 0 +.It Va subvendor Ta 0 +.It Va subdevice Ta 0 +.El .El .Ss NVMe Controller Settings Each NVMe controller supports a single storage device. diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c index ad47230c005e..8213f32985ef 100644 --- a/usr.sbin/bhyve/pci_lpc.c +++ b/usr.sbin/bhyve/pci_lpc.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include "pci_emul.h" #include "pci_irq.h" #include "pci_lpc.h" +#include "pci_passthru.h" #include "pctestdev.h" #include "uart_emul.h" @@ -448,10 +449,50 @@ pci_lpc_read(struct pci_devinst *pi __unused, int baridx __unused, #define LPC_DEV 0x7000 #define LPC_VENDOR 0x8086 +#define LPC_REVID 0x00 +#define LPC_SUBVEND_0 0x0000 +#define LPC_SUBDEV_0 0x0000 static int -pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl __unused) +pci_lpc_get_sel(struct pcisel *const sel) { + assert(sel != NULL); + + memset(sel, 0, sizeof(*sel)); + + for (uint8_t slot = 0; slot <= PCI_SLOTMAX; ++slot) { + uint8_t max_func = 0; + + sel->pc_dev = slot; + sel->pc_func = 0; + + if (read_config(sel, PCIR_HDRTYPE, 1) & PCIM_MFDEV) + max_func = PCI_FUNCMAX; + + for (uint8_t func = 0; func <= max_func; ++func) { + sel->pc_func = func; + + if ((read_config(sel, PCIR_CLASS, 1) == PCIC_BRIDGE) && + (read_config(sel, PCIR_SUBCLASS, 1) == + PCIS_BRIDGE_ISA)) { + return (0); + } + } + } + + warnx("%s: Unable to find host selector of LPC bridge.", __func__); + + return (-1); +} + +static int +pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl) +{ + struct pcisel sel = { 0 }; + struct pcisel *selp = NULL; + uint16_t device, subdevice, subvendor, vendor; + uint8_t revid; + /* * Do not allow more than one LPC bridge to be configured. */ @@ -473,11 +514,25 @@ pci_lpc_init(struct pci_devinst *pi, nvlist_t *nvl __unused) if (lpc_init(pi->pi_vmctx) != 0) return (-1); + if (pci_lpc_get_sel(&sel) == 0) + selp = &sel; + + vendor = pci_config_read_reg(selp, nvl, PCIR_VENDOR, 2, LPC_VENDOR); + device = pci_config_read_reg(selp, nvl, PCIR_DEVICE, 2, LPC_DEV); + revid = pci_config_read_reg(selp, nvl, PCIR_REVID, 1, LPC_REVID); + subvendor = pci_config_read_reg(selp, nvl, PCIR_SUBVEND_0, 2, + LPC_SUBVEND_0); + subdevice = pci_config_read_reg(selp, nvl, PCIR_SUBDEV_0, 2, + LPC_SUBDEV_0); + /* initialize config space */ - pci_set_cfgdata16(pi, PCIR_DEVICE, LPC_DEV); - pci_set_cfgdata16(pi, PCIR_VENDOR, LPC_VENDOR); + pci_set_cfgdata16(pi, PCIR_VENDOR, vendor); + pci_set_cfgdata16(pi, PCIR_DEVICE, device); pci_set_cfgdata8(pi, PCIR_CLASS, PCIC_BRIDGE); pci_set_cfgdata8(pi, PCIR_SUBCLASS, PCIS_BRIDGE_ISA); + pci_set_cfgdata8(pi, PCIR_REVID, revid); + pci_set_cfgdata16(pi, PCIR_SUBVEND_0, subvendor); + pci_set_cfgdata16(pi, PCIR_SUBDEV_0, subdevice); lpc_bridge = pi; From nobody Fri Apr 28 10:40:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JK5Gtkz48JxY; Fri, 28 Apr 2023 10:40: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 4Q78JK4N5gz3GRY; Fri, 28 Apr 2023 10:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/Uu4jJ4n3o+QNUbu2mWTzUOTsUV5xls2Jz7VJ1+9S0=; b=H4vA3WwJawKBPfbL2jdGVW8pzZXhBrV/AdJKh6FC+9Vsc9tlK8UmEPvu7rdE7LGZxKwANi lAEQ8CQWDL/G3y0G2n42JfdGwwtfS9kdcfq/73bD5HBvYrS75F2gkAXptmy9q1HDB9B2gg Tn7j/WP176a94thJ7ujyw1PYysziRejpUv1bMJHy5nKuj98qwNSdHngEoHlD98pucVEkdr izHkBq43ASKdUXnk7zy0le1TMXPlB01dOgKLdp7KtL3eT1v4VLFI1m+jtOxfXAHKXor9yg 80oxx1DB9z28SbfkCAnNtbZGMLng//2iX/fc4fCabRsEQT6qS/20i43f5T+WcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W/Uu4jJ4n3o+QNUbu2mWTzUOTsUV5xls2Jz7VJ1+9S0=; b=PZjDMDiXgpOtylE1KV1ZW5itMhVSvrGRUe+kIdYxYGXIB0eTP2K/0u9L2p2lFNwO0e6pRc NAZC+7mIiLhANtpd27L+Tf7UJ8EbEzMqmUKyNirP3GViyNmWvRN2y254mu9AQ6+CnX0MlF CKVgCQtyOIn0mdJV8HjE+bkueCweAsTY1kEj4oTjpjrOraVzrloM6zac8oqlOUtlkTXlg+ 7jfZKPL3S49g902MKfOnRDz2yDLNTFCjZ0DLhW8n4IkSk5Jr1EibciCUqGzos+M95K1dr4 3FfD5U2fq4GD44ezjVcHRj90lThOJPeYXjMMz0dmbcbqMrc/Bp4M8yApEM4rxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678417; a=rsa-sha256; cv=none; b=t9ZjPh4d5Gu3QgQ51xEmoY8DJdWYx9t81B3GcMQjFW5CZHS9hHMi2eshbW/i8rjmkB7IPL RB9EzsPSUmTOrccI+WKnnOkMgFXuDjjSEFJp7ZcrLuBAd/AG7OqXkLhWonDwQ0av0kukVU U259EwksLX6pQ7noTbt5Ys+7bwFfTEv8OtbU4Y3AXN7s2uDdMRvMy9RH18pArI9TbFwDjr nbAmc1NZVknHxOwERqBPCqRZyBo6WB0SQtxHGSZiMGpbC0G6etR7FiH+gFZLRpworq5fsw INgBouOk6QhQS1VRcC3EJxhE0/2gQ7bch2dxP32Zam7fi0nlhEs2ZxJOh6PJwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JK2mF4zx1f; Fri, 28 Apr 2023 10:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeHwX092363; Fri, 28 Apr 2023 10:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeHEE092357; Fri, 28 Apr 2023 10:40:17 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:17 GMT Message-Id: <202304281040.33SAeHEE092357@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 3f7acfe0730c - stable/13 - bhyve: introduce acpi_device_emul struct List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3f7acfe0730cbe6ffa3550adc30ae4eaa1eaa2ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=3f7acfe0730cbe6ffa3550adc30ae4eaa1eaa2ac commit 3f7acfe0730cbe6ffa3550adc30ae4eaa1eaa2ac Author: Corvin Köhne AuthorDate: 2022-07-22 08:00:10 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:32 +0000 bhyve: introduce acpi_device_emul struct It'll be easier to add new properties to the ACPI device emulation if we have a struct which holds all device specific properties. In some future commits the acpi_device_emul struct will be expanded to include some device specific functions to build ACPI tables. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39319 (cherry picked from commit acd0088c44f9ccaff571e041dc56d01fcc47d64b) --- usr.sbin/bhyve/acpi_device.c | 30 +++++++++++------------------- usr.sbin/bhyve/acpi_device.h | 14 +++++++++----- usr.sbin/bhyve/qemu_fwcfg.c | 7 ++++++- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index 047d411deec2..a1155ecb44b6 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -35,24 +35,23 @@ struct acpi_resource_list_entry { * Holds information about an ACPI device. * * @param vm_ctx VM context the ACPI device was created in. - * @param name Name of the ACPI device. - * @param hid Hardware ID of the ACPI device. + * @param emul Device emulation struct. It contains some information like the + name of the ACPI device and some device specific functions. * @param crs Current resources used by the ACPI device. */ struct acpi_device { struct vmctx *vm_ctx; - const char *name; - const char *hid; + const struct acpi_device_emul *emul; SLIST_HEAD(acpi_resource_list, acpi_resource_list_entry) crs; }; int acpi_device_create(struct acpi_device **const new_dev, - struct vmctx *const vm_ctx, const char *const name, const char *const hid) + struct vmctx *const vm_ctx, const struct acpi_device_emul *const emul) { - if (new_dev == NULL || vm_ctx == NULL || name == NULL || hid == NULL) { - return (EINVAL); - } + assert(new_dev != NULL); + assert(vm_ctx != NULL); + assert(emul != NULL); struct acpi_device *const dev = calloc(1, sizeof(*dev)); if (dev == NULL) { @@ -60,13 +59,8 @@ acpi_device_create(struct acpi_device **const new_dev, } dev->vm_ctx = vm_ctx; - dev->name = strdup(name); - dev->hid = strdup(hid); + dev->emul = emul; SLIST_INIT(&dev->crs); - if (dev->name == NULL || dev->hid == NULL) { - acpi_device_destroy(dev); - return (ENOMEM); - } const int error = acpi_tables_add_device(dev); if (error) { @@ -92,9 +86,7 @@ acpi_device_destroy(struct acpi_device *const dev) SLIST_REMOVE_HEAD(&dev->crs, chain); free(res); } - - free(__DECONST(void *, dev->hid)); - free(__DECONST(void *, dev->name)); + free(dev); } @@ -174,9 +166,9 @@ acpi_device_write_dsdt(const struct acpi_device *const dev) dsdt_line(""); dsdt_line(" Scope (\\_SB)"); dsdt_line(" {"); - dsdt_line(" Device (%s)", dev->name); + dsdt_line(" Device (%s)", dev->emul->name); dsdt_line(" {"); - dsdt_line(" Name (_HID, \"%s\")", dev->hid); + dsdt_line(" Name (_HID, \"%s\")", dev->emul->hid); dsdt_line(" Name (_STA, 0x0F)"); dsdt_line(" Name (_CRS, ResourceTemplate ()"); dsdt_line(" {"); diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 49e55c7d4f14..45e36a8ae771 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -16,18 +16,22 @@ struct vmctx; struct acpi_device; +struct acpi_device_emul { + const char *name; + const char *hid; +}; + /** * Creates an ACPI device. * * @param[out] new_dev Returns the newly create ACPI device. * @param[in] vm_ctx VM context the ACPI device is created in. - * @param[in] name Name of the ACPI device. Should always be a NULL - * terminated string. - * @param[in] hid Hardware ID of the ACPI device. Should always be a NULL - * terminated string. + * @param[in] emul Device emulation struct. It contains some information + * like the name of the ACPI device and some device specific + * functions. */ int acpi_device_create(struct acpi_device **new_dev, struct vmctx *vm_ctx, - const char *name, const char *hid); + const struct acpi_device_emul *emul); void acpi_device_destroy(struct acpi_device *dev); int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index a93b37027142..e35d63d09795 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -363,6 +363,11 @@ qemu_fwcfg_add_file(const uint8_t name[QEMU_FWCFG_MAX_NAME], return (0); } +static const struct acpi_device_emul qemu_fwcfg_acpi_device_emul = { + .name = QEMU_FWCFG_ACPI_DEVICE_NAME, + .hid = QEMU_FWCFG_ACPI_HARDWARE_ID, +}; + int qemu_fwcfg_init(struct vmctx *const ctx) { @@ -376,7 +381,7 @@ qemu_fwcfg_init(struct vmctx *const ctx) */ if (strcmp(lpc_fwcfg(), "qemu") == 0) { error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx, - QEMU_FWCFG_ACPI_DEVICE_NAME, QEMU_FWCFG_ACPI_HARDWARE_ID); + &qemu_fwcfg_acpi_device_emul); if (error) { warnx("%s: failed to create ACPI device for QEMU FwCfg", __func__); From nobody Fri Apr 28 10:40:18 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JL563Tz48Jn3; Fri, 28 Apr 2023 10:40: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 4Q78JL4GwJz3Ggd; Fri, 28 Apr 2023 10:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+no0fGEZvhJNqjItTbtMCP5o5BQpQn8wMBlCWeACfA=; b=lXnMQNeh9Vpxf49ZcAjq2aoHzD6FNC1/x3+wghPVkjElNMCHwEb35nkska98StgvLNzxm4 +WIvpYp/eqka4dsqKz6o+AZrbzI58k6694JOh/5HenW4XF9D6g2p4pdJ8G7RKNUarIMfbE jgSfFRBpryNIuZUoClHKlROAEulXHle/T3npTAok+mhvsQnt5jVZ72oaEjjbxbrQi4iZFB QJ/J71BhenSj1RslNeP+b/3WSttvl+nnjPls/PnjdgqGNRiz6b3ighvEuc+G45AZ+NMQ+J 4ZSLyRDJrXVv+GS8+rQ5ugqLBymWDdLtbtAKhXT8gA1F5J9Eel2OJIn5Gma2mQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678418; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1+no0fGEZvhJNqjItTbtMCP5o5BQpQn8wMBlCWeACfA=; b=fZx4LpDxvA8NlwezdqMPmAfAQISf/laNr5XL1xm80CeXy7P+l59rjWbJ7i7NiL6kBzM+QC YnVBhBn6BiJUzdqE4ztfvxSt20Q0xzNmOTGaSWYmPQH/wZs68upD+89/961Y2XeAx+Mhma bo8vmWcfOmR4/HQRLz0FTBlS4BqLnqXOXWDMu/ioqkrzJkDjkQ5EXAXWe5fID0aAUWFmyy l4mpTgCefA+LlBmgo3PCoo71wwDdK/H8eyvJEmwgiffsigULuzW09VMYN4SXAUtD6vibwj mKnsRMmKsV1PNVhRT5nec9OmMJ723j34QVqzlgFvzt8iQncX4BLh2yQ8TQB7CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678418; a=rsa-sha256; cv=none; b=CrlRmWeK48XlgrpzABSYUuly+ZM7R+XWFOgbwxe6JFT6yObFRd2QhAjyj5KnljRGzPrgVw aDRN6R6lX0XJ6J9EpDLd5/5IiY8DJAZFP4bzC/p9ebDNWma4wPNygD3/srTu4Cj/PDU6M1 0KJ7sO9tqzacLRas2oUguVBN7SA633ImvM1FK2Ad4SMptoq9uH0nJ7CjeWX9wDU4Lh8185 I0eOlMULcjEGYplgMDIyfaOiPHPLNA+25NAIE5Dw2BTHpp1UN3EHfaiVMmwM5FEw6jyk+9 Za8Fh0dJQmZaOlYrzgVq9bzxVvHpFn0MZPSiI6/AcA0IvORUaSvNx9HUz2zP0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JL3JVqzwLb; Fri, 28 Apr 2023 10:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeIJh092511; Fri, 28 Apr 2023 10:40:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeI5c092510; Fri, 28 Apr 2023 10:40:18 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:18 GMT Message-Id: <202304281040.33SAeI5c092510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 76f744cf2d08 - stable/13 - bhyve: allow building device specific ACPI tables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 76f744cf2d088a31ba4f9875f3f67d310ba29605 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=76f744cf2d088a31ba4f9875f3f67d310ba29605 commit 76f744cf2d088a31ba4f9875f3f67d310ba29605 Author: Corvin Köhne AuthorDate: 2022-07-22 08:09:01 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:33 +0000 bhyve: allow building device specific ACPI tables Some ACPI devices require a device specific acpi table. E.g. a TPM2 device requires a TPM2 table. Use the acpi_device_emul struct to define such a device specific table. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39320 (cherry picked from commit 0926566f6f9cc1dba0d7b5d7e0b45484dd901b20) --- usr.sbin/bhyve/acpi.c | 7 +++++++ usr.sbin/bhyve/acpi_device.c | 13 +++++++++++++ usr.sbin/bhyve/acpi_device.h | 11 +++++++++++ 3 files changed, 31 insertions(+) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 84a54cc485c5..2346df5fd314 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -810,6 +810,13 @@ acpi_build(struct vmctx *ctx, int ncpu) BASL_EXEC(build_mcfg(ctx)); BASL_EXEC(build_facs(ctx)); BASL_EXEC(build_spcr(ctx)); + + /* Build ACPI device-specific tables such as a TPM2 table. */ + const struct acpi_device_list_entry *entry; + SLIST_FOREACH(entry, &acpi_devices, chain) { + BASL_EXEC(acpi_device_build_table(entry->dev)); + } + BASL_EXEC(build_dsdt(ctx)); BASL_EXEC(basl_finish()); diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index a1155ecb44b6..b183da3055b1 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -135,6 +135,19 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, return (0); } +int +acpi_device_build_table(const struct acpi_device *const dev) +{ + assert(dev != NULL); + assert(dev->emul != NULL); + + if (dev->emul->build_table != NULL) { + return (dev->emul->build_table(dev)); + } + + return (0); +} + static void acpi_device_write_dsdt_crs(const struct acpi_device *const dev) { diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 45e36a8ae771..0306f19f47f0 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -16,9 +16,19 @@ struct vmctx; struct acpi_device; +/** + * Device specific information and emulation. + * + * @param name Used as device name in the DSDT. + * @param hid Used as _HID in the DSDT. + * @param build_table Called to build a device specific ACPI table like the TPM2 + * table. + */ struct acpi_device_emul { const char *name; const char *hid; + + int (*build_table)(const struct acpi_device *dev); }; /** @@ -39,4 +49,5 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, int acpi_device_add_res_fixed_memory32(struct acpi_device *dev, UINT8 write_protected, UINT32 address, UINT32 length); +int acpi_device_build_table(const struct acpi_device *dev); void acpi_device_write_dsdt(const struct acpi_device *dev); From nobody Fri Apr 28 10:40:19 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JM64KLz48Jn6; Fri, 28 Apr 2023 10:40: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 4Q78JM58qWz3Gx3; Fri, 28 Apr 2023 10:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVEbkyueP7AfoE3ouVDYLFEugOfZ3MSWwPQRwinedCw=; b=bgbToXutWQORVDaeouqU6ZBQWoRs93hL7ZEdkXZ2GP+FU9srcsSGtppv1WQ4T3CAVchY0c WlS6MPJ79DZxXV33YuXYisOYukjTJVVsXMMA2VkDNCtdRBwwpiL7y89uRwDCwJCVSbOvB2 Cs0V47K1zzEexEGEIIMZEAjQeUdYhzvk3N1/RSSgFYDS3r57u+fbuXas3I4hB5kvjfn7kY wOT7Y1qU7MmSTIxhl1LeauMzKW1zWi/oKad4S0yi+SnBXuJ3HdKKxAg71LNudKA7WKY3ib dUiPAYJ9aJQ+rG9bWlWdSZq+3hVvVQvLujqP+yTn53tP/6WK65BMWgFxcLnKSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cVEbkyueP7AfoE3ouVDYLFEugOfZ3MSWwPQRwinedCw=; b=d8yYTutNNa+4u+FhPHm4e2286dhMoLwMqz6NfMHAHIshl/NEymScYuodzH85tT+l0kP8UY FpILfEAGPYhuuRpVqSSDRhVIxILwe6NI0Bwah9tyQtVKF+ikcMakVP4OZVz57kN9dPR54s Onsa2Lr1q1oRDkBkqQM7L9zFkby70qu8lRj4qyp1gNAzKXRspH3bI2z7BHDIyJ0pnpt4Zz 5IvVtVZNpYBE32ZjUirhK6q1dwN5ueGbzwpcW+Ed3DPnId/49ptIKJ6lKn2cQU1HIYjiyK sMrFYmDG6/p+4LXyyq6oSzWebta5YYichk188Y8TNBMAPmrSVhGOm05AfBzI+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678419; a=rsa-sha256; cv=none; b=f2HZN++NWqcZ4jYmQ3Dg7KAWoQZbPthjnopJiqNnsrXz86Io+iedQ2p8JVP9bTl2XcmKOf R7RFjHJPeTg6G+/dqkskOYTs7t/uL4qlWmSnrOBkELnQQcR+ZAgrPb0snR+Dt6Gtwq/pSQ 2cZlkiNdX/yAVNvoF2ggV9lHP4CItPdGsyJ38LMEf18Dwv68TxMiBkgekMupmUwnLtNxFP O5bglLUptdPKSVMd4ErQR8S1ZuPn+QbXAoU9u48wkdMg3tjWj9uSwtjFdVH1CNaktk//pV a+4Iu8UWVFr9GvX3MxsE3l8xQ7HB9h/vJGj78fo4cWzZV5oZNMDbO0JzYZ2D9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JM4G2JzwgT; Fri, 28 Apr 2023 10:40:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeJh7092535; Fri, 28 Apr 2023 10:40:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeJ9Q092534; Fri, 28 Apr 2023 10:40:19 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:19 GMT Message-Id: <202304281040.33SAeJ9Q092534@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: fbf9519ab923 - stable/13 - bhyve: check for errors when writing device specific DSDT entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fbf9519ab923313c25ddb766bd0f5d936a3488b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=fbf9519ab923313c25ddb766bd0f5d936a3488b2 commit fbf9519ab923313c25ddb766bd0f5d936a3488b2 Author: Corvin Köhne AuthorDate: 2023-04-05 06:45:22 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:33 +0000 bhyve: check for errors when writing device specific DSDT entries At the moment, this function can't fail. This behaviour will change in the future. In preparation to that, convert the return type to int in order to be able to check for errors. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39422 (cherry picked from commit ab34ea4711b1001c416dc286380e54c118ff0c49) --- usr.sbin/bhyve/acpi.c | 2 +- usr.sbin/bhyve/acpi_device.c | 15 +++++++++------ usr.sbin/bhyve/acpi_device.h | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c index 2346df5fd314..457575e395d8 100644 --- a/usr.sbin/bhyve/acpi.c +++ b/usr.sbin/bhyve/acpi.c @@ -245,7 +245,7 @@ basl_fwrite_dsdt(FILE *fp) const struct acpi_device_list_entry *entry; SLIST_FOREACH(entry, &acpi_devices, chain) { - acpi_device_write_dsdt(entry->dev); + BASL_EXEC(acpi_device_write_dsdt(entry->dev)); } dsdt_line("}"); diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index b183da3055b1..dffb73ba9023 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -17,6 +17,7 @@ #include "acpi.h" #include "acpi_device.h" +#include "basl.h" /** * List entry to enumerate all resources used by an ACPI device. @@ -148,7 +149,7 @@ acpi_device_build_table(const struct acpi_device *const dev) return (0); } -static void +static int acpi_device_write_dsdt_crs(const struct acpi_device *const dev) { const struct acpi_resource_list_entry *res; @@ -167,14 +168,14 @@ acpi_device_write_dsdt_crs(const struct acpi_device *const dev) break; } } + + return (0); } -void +int acpi_device_write_dsdt(const struct acpi_device *const dev) { - if (dev == NULL) { - return; - } + assert(dev != NULL); dsdt_line(""); dsdt_line(" Scope (\\_SB)"); @@ -186,9 +187,11 @@ acpi_device_write_dsdt(const struct acpi_device *const dev) dsdt_line(" Name (_CRS, ResourceTemplate ()"); dsdt_line(" {"); dsdt_indent(4); - acpi_device_write_dsdt_crs(dev); + BASL_EXEC(acpi_device_write_dsdt_crs(dev)); dsdt_unindent(4); dsdt_line(" })"); dsdt_line(" }"); dsdt_line(" }"); + + return (0); } diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 0306f19f47f0..de72ce1e5370 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -50,4 +50,4 @@ int acpi_device_add_res_fixed_memory32(struct acpi_device *dev, UINT8 write_protected, UINT32 address, UINT32 length); int acpi_device_build_table(const struct acpi_device *dev); -void acpi_device_write_dsdt(const struct acpi_device *dev); +int acpi_device_write_dsdt(const struct acpi_device *dev); From nobody Fri Apr 28 10:40:20 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JP0Cwdz48JsL; Fri, 28 Apr 2023 10:40: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 4Q78JN6FRkz3Grp; Fri, 28 Apr 2023 10:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xydxxdSTfhP66M6P5zwELw9uFDiznQTz0G4QFOtknU=; b=S8zM5jL15sL0Rt0p114VjWt6HEWBIT7/hpf6Yobd+ydjRWfkgkmcbmTUoOIfBojjJM7O81 MaESE4KMgOn35OwHUMJ42gqDb57f8w593zCrxC9HfHADEx9wJmS/f+Kt4NFTb8CF5viaOP sKZLrA+nSR6jYb/qi0F+/s91GFlz7Q+qKizmlSSQ/JTUJnipy0vhQCeU80w6Mnt63Yrq0G 0efs9AyrOGbaqTGMLZfyOAKBPIpqhnmivwSd9H8ysJueuahIVP6istvEDPIt/E84eZcZch IRan938xx3NB2t0uWPzPZvRze55Eo1HZE1My61z8Kk96GkCTNm7d60hIQ0WeUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xydxxdSTfhP66M6P5zwELw9uFDiznQTz0G4QFOtknU=; b=cdxCLiOWPJsoDUYFc8fyXMu/ukHv5i14dnGU4afts7O1QCVFIvs3THOb2huG+P7P484l/o s4rYjaaxRIVAOj+EuBYvMgBWZqfOPxfkcLTgCp3KO4G9UUC2jKymy7o9St9s+WobQRdUiA P9fDDa6zQ8CunqFQPTtHS1njL0lhq9gfnkqaEg6cQyWfUSnOMoVzO3o43M2ZQsbbBN7TFA UNpGEMqSJaWt4zwXQ/2+WwPhkPX+cweS97a1fRLx96fpfrE7RKonbGE/kMrl/W+gppIobc 4bhdxnGaOKQr0sb7NLndf2SJMwSlX7jKAiaidaz9DSOy2w+C8CcVRAga9IHwCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678420; a=rsa-sha256; cv=none; b=QoZ3gEfOwp+6qilUd+5eNi17ZjWN/OttoyaO1ROiNWNDncqU+kgySzMuUjFgochDd1KnJz DFfi59MBYxpP4Vxj0DMD47wVQM0qzRr/MVmEE/3m7aF84RiL09jwm4o2E4GbEJRE1XSx7U JxEMQ7QCB1UsIJbqF3iai3xVvBs2NPjAr3Jvg5VmaWq6hxQLBG/b2O448ZLj27OM2QOEhz ZTAS/VkuySP6ZCp2EQfBluy4WJR/PlIXpFo+9kXP2oGKfslRxMgIh4I1u+LWWqR8LLe/c9 09+M1ckzJtB8p7nM7TdQR/geavUoSbvKgkRyuTBnUiqCLICZ44/iNGjf561nyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JN57VHzwgV; Fri, 28 Apr 2023 10:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeKIC092559; Fri, 28 Apr 2023 10:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeKHQ092558; Fri, 28 Apr 2023 10:40:20 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:20 GMT Message-Id: <202304281040.33SAeKHQ092558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 1c7053169d9d - stable/13 - bhyve: allow device specific DSDT entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c7053169d9d35b419b4d9ba6116bca83ecd4a68 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=1c7053169d9d35b419b4d9ba6116bca83ecd4a68 commit 1c7053169d9d35b419b4d9ba6116bca83ecd4a68 Author: Corvin Köhne AuthorDate: 2022-07-22 08:11:14 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:34 +0000 bhyve: allow device specific DSDT entries This feature will be used by future commits to implement a device specific method (_DSM) for TPM devices. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39321 (cherry picked from commit e976464a50aceebf97fb3cc6b94058111fc40de1) --- usr.sbin/bhyve/acpi_device.c | 5 +++++ usr.sbin/bhyve/acpi_device.h | 3 +++ 2 files changed, 8 insertions(+) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index dffb73ba9023..51603e138fba 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -190,6 +190,11 @@ acpi_device_write_dsdt(const struct acpi_device *const dev) BASL_EXEC(acpi_device_write_dsdt_crs(dev)); dsdt_unindent(4); dsdt_line(" })"); + if (dev->emul->write_dsdt != NULL) { + dsdt_indent(3); + BASL_EXEC(dev->emul->write_dsdt(dev)); + dsdt_unindent(3); + } dsdt_line(" }"); dsdt_line(" }"); diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index de72ce1e5370..4d734b422ec5 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -23,12 +23,15 @@ struct acpi_device; * @param hid Used as _HID in the DSDT. * @param build_table Called to build a device specific ACPI table like the TPM2 * table. + * @param write_dsdt Called to append the DSDT with device specific + * information. */ struct acpi_device_emul { const char *name; const char *hid; int (*build_table)(const struct acpi_device *dev); + int (*write_dsdt)(const struct acpi_device *dev); }; /** From nobody Fri Apr 28 10:40:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JQ0GTvz48Jgx; Fri, 28 Apr 2023 10:40: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 4Q78JP6y0vz3H5s; Fri, 28 Apr 2023 10:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXDT36Higimq79f96l860tF1Em+OxppOIgD8EK85kGA=; b=wNRVAIQDb8oG5GNLok9A9a+u1QncUmXt70E9R6XloOwrFdFErlBrAfmGIPEY7qWMEG/a1Y 62yIyyzvSPQkIopCfdYdveYQeT1RndatIuDsBFFYIT4aJROWG/0QmU91ObOqcQdt63fobl KmQ6d3Du1og/u/SFuDtaK0/AvxWkGlgbauCKe68mjlm/OvCujZXEcclj3apTMuoxtHNDYR xmESpb6ccydRb3Ns09PW8BI4V8aTyr8V2Eql/taYQUaa+dbKn6o3Sy26F6kksyEll8nmFT 7/w/EwS8CGKCKhZmNGgqf1Wq5JLpXXgoEpqM2zF3cI7CThgvLm/HxCh1Zr3cDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sXDT36Higimq79f96l860tF1Em+OxppOIgD8EK85kGA=; b=aqLg08Ng4/08t5wFKDl/+ee1Sr+axfmWbmR9VFV3pTfgHphHbNEpXvMDVowIrwft27jLIC Fn2aICxzegFYm4UNTnt9yQPaXZsx9KJ1iDrWPcFgfIO9KKobu4UkvOT1W5XM0c/zrBmOyx OckFSXJBUEPKNjsn5AZR+fnpIykwMDUhev4LBqGthy167dJhGloGLZtxscPSzXAZKUrVMT g90AW0DWjTT9XY1ZrWUTwsBsg+MQExy6IsQd7RE4yOGFaOtDStE32exJo3qwYVFn57w+Nz 8xrB8+xDeYKDzZnjV/4ls90oqibUeN+0QnKj+nkmM2pd4EIZLJqi0q0dZiSeEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678422; a=rsa-sha256; cv=none; b=HRp5lBLRX+YRGkTDajoP8Vao5j5t1+wHrAkDLtnbtZrR+cyoil5lx+WFFs2HrRHzEUp6qI gUIZzr90qjEK+ITaSJvdRNrZpfEQsYM3l11N3DOF72XmFzrDD+ZW7EJdjsutIbwMklnlPX 6MhWXORIS/F/xx2NbLBSctzxg/2P0EIZBa+uJcnwoCDARDT87JyrgkU5LeRiCe6oZtyhoW paolcYpT42a1WuXR67gp0b0TvdKJLwfCJE7PegB11iIQorvvTWAW7t+Pwe2W+L1y1RM11J r+QIPb/jmxVJ+EKCqpFTjTx04L7uMGuXczgZTepkw0s+5yAaVMgYuJ1AvK2hIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JP5rTZzwp7; Fri, 28 Apr 2023 10:40:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeL9l092583; Fri, 28 Apr 2023 10:40:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeLJP092582; Fri, 28 Apr 2023 10:40:21 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:21 GMT Message-Id: <202304281040.33SAeLJP092582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 9c8a0c311a96 - stable/13 - bhyve: save softc of ACPI devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9c8a0c311a961d0a4026ba1d817fcdd3a5e1c929 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=9c8a0c311a961d0a4026ba1d817fcdd3a5e1c929 commit 9c8a0c311a961d0a4026ba1d817fcdd3a5e1c929 Author: Corvin Köhne AuthorDate: 2022-07-22 08:15:28 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:34 +0000 bhyve: save softc of ACPI devices This will be useful for writing device specific ACPI tables or DSDT methods. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39322 (cherry picked from commit 158adced65f844682d26e1e64f247de94212f135) --- usr.sbin/bhyve/acpi_device.c | 13 ++++++++++++- usr.sbin/bhyve/acpi_device.h | 7 +++++-- usr.sbin/bhyve/qemu_fwcfg.c | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/usr.sbin/bhyve/acpi_device.c b/usr.sbin/bhyve/acpi_device.c index 51603e138fba..e37fc50b8c91 100644 --- a/usr.sbin/bhyve/acpi_device.c +++ b/usr.sbin/bhyve/acpi_device.c @@ -36,18 +36,20 @@ struct acpi_resource_list_entry { * Holds information about an ACPI device. * * @param vm_ctx VM context the ACPI device was created in. + * @param softc A pointer to the software context of the ACPI device. * @param emul Device emulation struct. It contains some information like the name of the ACPI device and some device specific functions. * @param crs Current resources used by the ACPI device. */ struct acpi_device { struct vmctx *vm_ctx; + void *softc; const struct acpi_device_emul *emul; SLIST_HEAD(acpi_resource_list, acpi_resource_list_entry) crs; }; int -acpi_device_create(struct acpi_device **const new_dev, +acpi_device_create(struct acpi_device **const new_dev, void *const softc, struct vmctx *const vm_ctx, const struct acpi_device_emul *const emul) { assert(new_dev != NULL); @@ -60,6 +62,7 @@ acpi_device_create(struct acpi_device **const new_dev, } dev->vm_ctx = vm_ctx; + dev->softc = softc; dev->emul = emul; SLIST_INIT(&dev->crs); @@ -136,6 +139,14 @@ acpi_device_add_res_fixed_memory32(struct acpi_device *const dev, return (0); } +void * +acpi_device_get_softc(const struct acpi_device *const dev) +{ + assert(dev != NULL); + + return (dev->softc); +} + int acpi_device_build_table(const struct acpi_device *const dev) { diff --git a/usr.sbin/bhyve/acpi_device.h b/usr.sbin/bhyve/acpi_device.h index 4d734b422ec5..32e299f2da86 100644 --- a/usr.sbin/bhyve/acpi_device.h +++ b/usr.sbin/bhyve/acpi_device.h @@ -38,13 +38,14 @@ struct acpi_device_emul { * Creates an ACPI device. * * @param[out] new_dev Returns the newly create ACPI device. + * @param[in] softc Pointer to the software context of the ACPI device. * @param[in] vm_ctx VM context the ACPI device is created in. * @param[in] emul Device emulation struct. It contains some information * like the name of the ACPI device and some device specific * functions. */ -int acpi_device_create(struct acpi_device **new_dev, struct vmctx *vm_ctx, - const struct acpi_device_emul *emul); +int acpi_device_create(struct acpi_device **new_dev, void *softc, + struct vmctx *vm_ctx, const struct acpi_device_emul *emul); void acpi_device_destroy(struct acpi_device *dev); int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, @@ -52,5 +53,7 @@ int acpi_device_add_res_fixed_ioport(struct acpi_device *dev, UINT16 port, int acpi_device_add_res_fixed_memory32(struct acpi_device *dev, UINT8 write_protected, UINT32 address, UINT32 length); +void *acpi_device_get_softc(const struct acpi_device *dev); + int acpi_device_build_table(const struct acpi_device *dev); int acpi_device_write_dsdt(const struct acpi_device *dev); diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index e35d63d09795..e76ff3620586 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -380,7 +380,7 @@ qemu_fwcfg_init(struct vmctx *const ctx) * tables and register io ports for fwcfg, if it's used. */ if (strcmp(lpc_fwcfg(), "qemu") == 0) { - error = acpi_device_create(&fwcfg_sc.acpi_dev, ctx, + error = acpi_device_create(&fwcfg_sc.acpi_dev, &fwcfg_sc, ctx, &qemu_fwcfg_acpi_device_emul); if (error) { warnx("%s: failed to create ACPI device for QEMU FwCfg", From nobody Fri Apr 28 10:40:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JR0mC6z48JvN; Fri, 28 Apr 2023 10: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 4Q78JR0Dydz3H8d; Fri, 28 Apr 2023 10: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=1682678423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxhPHWpPT5H+dXzS8ELHL2iYaRdFf/kZ9rwrE/Wz+D0=; b=FnFQdk889CVFj3c+jd+KpFrczhpkrDI5tLdwVI2R+nYCP6wyB3pzxmPkkyvxtRezpDFIF+ kV1P/cTk2udPeSZxSJ1CJ22JaJKQJyPKptUjEubBV1SpiJyZCplDqcg7XGbBPELHuvJXuG NkIiaQdfpSwyVOJf9A3LwFp+7rYvSORzZcvoNbgY2IseJnOs940xDAVy2fhcXFMDl02ZNn 8EMACTobMa5rCAN1ul10cGbQpoMg6LAnGlwVoPSB4FnFdK2gixg30uoSTVOW54U9zUJnhV loCGMYaBwlKnyi3waISdhiQ0tE/9SZaDvx/AhBxE1+39teOSKPdg/3eIOD/tSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxhPHWpPT5H+dXzS8ELHL2iYaRdFf/kZ9rwrE/Wz+D0=; b=mp/yI+OnP+/YsepZCRV1lsevSgluRz6QGG0nG+RKSD3JSKFYQUprBy9tyHqZS2xt3Cxlg3 3MocvfnCAupCLsd8bdvBcXma5xuXnQz1djixIiw+5pNWIUb273LpjvvP1jbyoBWp5GRPHJ LstcE86KMVWAxXGXQkbXsjGvQ7jU1AWDb9faqT75FdB61WpBgsEWjbrEQluuDS+DjnX1gN bnuUOyDPiik7fEZYYR0GXfz08ohfNGNRwYz1uH3BNHYvcPXBLAYTRR+WDtKKpgIRE/fWzR nJ7Iudqf1f6fa2grVtIFIyC/J4hyAueTyeJu7hDKso8Yjp0oT5xHXL08mNGrsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678423; a=rsa-sha256; cv=none; b=gQfrcCXfGNZjpdRjxbSx21jacIBSpbl/NvRT+ajhirvmla5B06d5LuHQi9kbxQwsdd7KVk eEUHv7laDydwVGXzIb7tci4kNdp8v5c7DhgSDsAzVJ9zzHflE31R8ukYlsyLGyqiBn9IGJ jpp0hbjju728Ly+KfOGsXc+Fe9BQO+5o+dVktuDSqD9MbgalwvCd1BZc7xJu15Y7H2KARj 06oHJZyENJGeJfTVFynDbvRzIaMd3UebTM4B9E9w15PqSE9TyWrCCXRSjuwb62ZTCDc/6g hYhUUnccxVqyIvyft/vQmpn+EcjgEInJYop/O/qo16/JeBMUognC0y2nNMPANQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JQ6D9Bzwrf; Fri, 28 Apr 2023 10:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeMZv092607; Fri, 28 Apr 2023 10:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeM15092606; Fri, 28 Apr 2023 10:40:22 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:22 GMT Message-Id: <202304281040.33SAeM15092606@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 847adbb116fb - stable/13 - bhyve: define array to protect passthru regs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 847adbb116fbc1de0c44ff57ab3b2a843c5f3c94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=847adbb116fbc1de0c44ff57ab3b2a843c5f3c94 commit 847adbb116fbc1de0c44ff57ab3b2a843c5f3c94 Author: Corvin Köhne AuthorDate: 2021-03-19 12:48:34 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:34 +0000 bhyve: define array to protect passthru regs GPU passthrough requires a special handling of some PCI config register. Therefore, we need a flexible approach for implementing it. Adding an array of handler meets this condition. Start by using the default handler for all accesses to the PCI config space. In upcoming commits, we can start to split the default handler into several handler for each register that requires emulation. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39291 (cherry picked from commit 931bb7bf1c8f90f3303b5291e4868c587f9364e7) --- usr.sbin/bhyve/pci_passthru.c | 57 +++++++++++++++++++++++++++++++++++++------ usr.sbin/bhyve/pci_passthru.h | 9 +++++++ 2 files changed, 58 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index f42bbbda655f..79068ad9b6da 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -93,6 +93,9 @@ struct passthru_softc { int capoff; } psc_msix; struct pcisel psc_sel; + + cfgread_handler psc_pcir_rhandler[PCI_REGMAX + 1]; + cfgwrite_handler psc_pcir_whandler[PCI_REGMAX + 1]; }; static int @@ -643,6 +646,23 @@ done: return (error); } +int +set_pcir_handler(struct passthru_softc *sc, int reg, int len, + cfgread_handler rhandler, cfgwrite_handler whandler) +{ + if (reg > PCI_REGMAX || reg + len > PCI_REGMAX + 1) + return (-1); + + for (int i = reg; i < reg + len; ++i) { + assert(sc->psc_pcir_rhandler[i] == NULL || rhandler == NULL); + assert(sc->psc_pcir_whandler[i] == NULL || whandler == NULL); + sc->psc_pcir_rhandler[i] = rhandler; + sc->psc_pcir_whandler[i] = whandler; + } + + return (0); +} + static int passthru_legacy_config(nvlist_t *nvl, const char *opts) { @@ -902,12 +922,9 @@ msixcap_access(struct passthru_softc *sc, int coff) } static int -passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) +passthru_cfgread_default(struct passthru_softc *sc, + struct pci_devinst *pi __unused, int coff, int bytes, uint32_t *rv) { - struct passthru_softc *sc; - - sc = pi->pi_arg; - /* * PCI BARs and MSI capability is emulated. */ @@ -946,14 +963,25 @@ passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) } static int -passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) +passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) { - int error, msix_table_entries, i; struct passthru_softc *sc; - uint16_t cmd_old; sc = pi->pi_arg; + if (sc->psc_pcir_rhandler[coff] != NULL) + return (sc->psc_pcir_rhandler[coff](sc, pi, coff, bytes, rv)); + + return (passthru_cfgread_default(sc, pi, coff, bytes, rv)); +} + +static int +passthru_cfgwrite_default(struct passthru_softc *sc, struct pci_devinst *pi, + int coff, int bytes, uint32_t val) +{ + int error, msix_table_entries, i; + uint16_t cmd_old; + /* * PCI BARs are emulated */ @@ -1026,6 +1054,19 @@ passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) return (0); } +static int +passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) +{ + struct passthru_softc *sc; + + sc = pi->pi_arg; + + if (sc->psc_pcir_whandler[coff] != NULL) + return (sc->psc_pcir_whandler[coff](sc, pi, coff, bytes, val)); + + return (passthru_cfgwrite_default(sc, pi, coff, bytes, val)); +} + static void passthru_write(struct pci_devinst *pi, int baridx, uint64_t offset, int size, uint64_t value) diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index bdc8dc3cd0e2..f6ce2d4b85ab 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -11,5 +11,14 @@ #include "pci_emul.h" +struct passthru_softc; + +typedef int (*cfgread_handler)(struct passthru_softc *sc, + struct pci_devinst *pi, int coff, int bytes, uint32_t *rv); +typedef int (*cfgwrite_handler)(struct passthru_softc *sc, + struct pci_devinst *pi, int coff, int bytes, uint32_t val); + uint32_t read_config(const struct pcisel *sel, long reg, int width); void write_config(const struct pcisel *sel, long reg, int width, uint32_t data); +int set_pcir_handler(struct passthru_softc *sc, int reg, int len, + cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Fri Apr 28 10:40:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JS2Fh1z48JvQ; Fri, 28 Apr 2023 10:40: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 4Q78JS1Y2Jz3HF7; Fri, 28 Apr 2023 10:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTss0UYWKma8Gaxrt5W8VgWbf1W7v05cjnJYCttJh08=; b=pEPK3o2XhO/9t10ZJT9ttRVemxas16k3KWC5AclPs4ipToL44R5jm6S3Rk2o7M5GTpwBpU uwvh8vPcK8SL19IumL+vc7bxtEfrE0Y3ptkAtHyylQMF9yacov1DwP8Vk+CeiSBKbj+FJH nEPtTjaaI75K27rksiwEJCbks7wGtWIR5uqrtOw7Gog22iRXQ0fmgEcmXKlbqB54udHB/0 lggvBxcvGvsmnr1m1x3z+vyPp1qq09zktcrtRmXb16eUrCgKtNrlKq6YI69/rtt8OVr1Vb 0p2G5NaEJGUi7tcLR33WQBEpb9HJS7Cm2BXRjm7f0BqNHDDz6e3uS5OtWmzPPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FTss0UYWKma8Gaxrt5W8VgWbf1W7v05cjnJYCttJh08=; b=S/L412VOt9vVrMIWXO0yf4rvNtRGvIJG5420Kvi7Uznf6WIyMie6VdxstPHJXq6H/ATQsV xfndfcY3tDYMOSxLl8PR6M6BQtNbmBvmna10rubZhLsWQohUkxPM9kFpE028QpdjPsQj1Z osMwVTBeF8TVDCo3rzOogmcCbWyRy/ziUDtVrrgKakfX8qZNfOxsuHpUTTbOgG2lN9FNQ/ MKRwtABeQwPm7xWcrhXTfZsjeE8UDPTB4dRcPOjfO9zD88s54jkwfxvT2b0V+ike9LBuIl QHWCr0oGBZ5bAesruFRTvjD3vY0Mbu3tXj2LzDfq7uC4YAWFtgov8JGh78831g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678424; a=rsa-sha256; cv=none; b=U0+F1R7AfzXARiEa4GKCZL86FMDR7aXFSDEb3hTCscAo0n90zstGehUYhK4NsIKPzj3tNR V/nvxO8VGklM6dz5u/KdWNbgOlfLDWS3mwNqDbSREgMwzrREf5gDJb7eiLfgBQipQ7OZAc ErMIflsocLziN1QlRig6TW6jEUjJN8xBpERyq8ZyQNHCTfJXkRvHooLi6JKQQHXWFhqIyC 8iC7hOfY020j0TlWBXLfbr0nvYOIs6Voaex/f+ms0/GCt8bbxOmlxlBGvjeaoTdtjZCphP B4mwo/GbCpKmkzYGVJlI/1JwSc4cVWGoBYibL3FJnAZvjZPaqMZ+FwIJqrYW8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JS0Hl0zwLc; Fri, 28 Apr 2023 10:40:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAeNj9092631; Fri, 28 Apr 2023 10:40:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAeNuj092630; Fri, 28 Apr 2023 10:40:23 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:23 GMT Message-Id: <202304281040.33SAeNuj092630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 0ad27bd40b35 - stable/13 - bhyve: add hook for PCI header of passthru devices List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0ad27bd40b351403a6fd0b58eafa98a43407cc83 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=0ad27bd40b351403a6fd0b58eafa98a43407cc83 commit 0ad27bd40b351403a6fd0b58eafa98a43407cc83 Author: Corvin Köhne AuthorDate: 2021-09-07 11:42:25 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:34 +0000 bhyve: add hook for PCI header of passthru devices Most register of the PCI header are either constant values or require emulation anyway. The command and status register are the only exception which require hardware access. So, we're adding an emulation handler for all other register. As this emulation handler will be reused by some future features like GPU passthrough, we directly export it. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D33010 (cherry picked from commit b6e67875a3e5bc706fe37565e464c61fe7833846) --- usr.sbin/bhyve/pci_passthru.c | 71 +++++++++++++++++++++++++------------------ usr.sbin/bhyve/pci_passthru.h | 4 +++ 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 79068ad9b6da..b214021998d2 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -603,6 +603,7 @@ cfginit(struct pci_devinst *pi, int bus, int slot, int func) { int error; struct passthru_softc *sc; + uint8_t intline, intpin; error = 1; sc = pi->pi_arg; @@ -612,6 +613,19 @@ cfginit(struct pci_devinst *pi, int bus, int slot, int func) sc->psc_sel.pc_dev = slot; sc->psc_sel.pc_func = func; + /* + * Copy physical PCI header to virtual config space. INTLINE and INTPIN + * shouldn't be aligned with their physical value and they are already set by + * pci_emul_init(). + */ + intline = pci_get_cfgdata8(pi, PCIR_INTLINE); + intpin = pci_get_cfgdata8(pi, PCIR_INTPIN); + for (int i = 0; i <= PCIR_MAXLAT; i += 4) { + pci_set_cfgdata32(pi, i, read_config(&sc->psc_sel, i, 4)); + } + pci_set_cfgdata8(pi, PCIR_INTLINE, intline); + pci_set_cfgdata8(pi, PCIR_INTPIN, intpin); + if (cfginitmsi(sc) != 0) { warnx("failed to initialize MSI for PCI %d/%d/%d", bus, slot, func); @@ -876,6 +890,15 @@ passthru_init(struct pci_devinst *pi, nvlist_t *nvl) get_config_value_node(nvl, "rom"))) != 0) goto done; + /* Emulate most PCI header register. */ + if ((error = set_pcir_handler(sc, 0, PCIR_MAXLAT + 1, + passthru_cfgread_emulate, passthru_cfgwrite_emulate)) != 0) + goto done; + + /* Allow access to the physical command and status register. */ + if ((error = set_pcir_handler(sc, PCIR_COMMAND, 0x04, NULL, NULL)) != 0) + goto done; + error = 0; /* success */ done: if (error) { @@ -885,16 +908,6 @@ done: return (error); } -static int -bar_access(int coff) -{ - if ((coff >= PCIR_BAR(0) && coff < PCIR_BAR(PCI_BARMAX + 1)) || - coff == PCIR_BIOS) - return (1); - else - return (0); -} - static int msicap_access(struct passthru_softc *sc, int coff) { @@ -926,23 +939,11 @@ passthru_cfgread_default(struct passthru_softc *sc, struct pci_devinst *pi __unused, int coff, int bytes, uint32_t *rv) { /* - * PCI BARs and MSI capability is emulated. + * MSI capability is emulated. */ - if (bar_access(coff) || msicap_access(sc, coff) || - msixcap_access(sc, coff)) + if (msicap_access(sc, coff) || msixcap_access(sc, coff)) return (-1); -#ifdef LEGACY_SUPPORT - /* - * Emulate PCIR_CAP_PTR if this device does not support MSI capability - * natively. - */ - if (sc->psc_msi.emulated) { - if (coff >= PCIR_CAP_PTR && coff < PCIR_CAP_PTR + 4) - return (-1); - } -#endif - /* * Emulate the command register. If a single read reads both the * command and status registers, read the status register from the @@ -962,6 +963,14 @@ passthru_cfgread_default(struct passthru_softc *sc, return (0); } +int +passthru_cfgread_emulate(struct passthru_softc *sc __unused, + struct pci_devinst *pi __unused, int coff __unused, int bytes __unused, + uint32_t *rv __unused) +{ + return (-1); +} + static int passthru_cfgread(struct pci_devinst *pi, int coff, int bytes, uint32_t *rv) { @@ -982,12 +991,6 @@ passthru_cfgwrite_default(struct passthru_softc *sc, struct pci_devinst *pi, int error, msix_table_entries, i; uint16_t cmd_old; - /* - * PCI BARs are emulated - */ - if (bar_access(coff)) - return (-1); - /* * MSI capability is emulated */ @@ -1054,6 +1057,14 @@ passthru_cfgwrite_default(struct passthru_softc *sc, struct pci_devinst *pi, return (0); } +int +passthru_cfgwrite_emulate(struct passthru_softc *sc __unused, + struct pci_devinst *pi __unused, int coff __unused, int bytes __unused, + uint32_t val __unused) +{ + return (-1); +} + static int passthru_cfgwrite(struct pci_devinst *pi, int coff, int bytes, uint32_t val) { diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index f6ce2d4b85ab..e999e84f85f2 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -20,5 +20,9 @@ typedef int (*cfgwrite_handler)(struct passthru_softc *sc, uint32_t read_config(const struct pcisel *sel, long reg, int width); void write_config(const struct pcisel *sel, long reg, int width, uint32_t data); +int passthru_cfgread_emulate(struct passthru_softc *sc, struct pci_devinst *pi, + int coff, int bytes, uint32_t *rv); +int passthru_cfgwrite_emulate(struct passthru_softc *sc, struct pci_devinst *pi, + int coff, int bytes, uint32_t val); int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Fri Apr 28 10:40:25 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q78JT4cNfz48JvS; Fri, 28 Apr 2023 10:40: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 4Q78JT1yLvz3H4b; Fri, 28 Apr 2023 10:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0O2XWjZRhVPlD0y9EomjlJebK517zPqMQW3P1g6eUA=; b=UpjBXAF47HgQZIn3G6QHxgcHUC0/VgKrK7x06qoomutfZqSOYoggBT1BRqhhRMIz0WVkZs lOIzTB+cUC+/VZD2EI9dxBf8piaDcpWsqeIROiK6EldkGKWx41wz/EXc6VYwQSj1yuHv+h NUAXiCxQAp3aeP/hzjShw7fZ6Sa6frpSP17aqMRWag4tTfxvUzWWQDrK4AM5Q+86kQXDPq zGt1UzSgWWMfRFsxSN0U2widykNHlOvWNKgCDsrONhGn1i01D50vC1pnxc2+TIgg56Pce7 FiTyIkZJpF1qmeAQomjInK1NP7brBMINe1kcDbxs3O+h8CI6//KmNFXfMH8BJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682678425; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0O2XWjZRhVPlD0y9EomjlJebK517zPqMQW3P1g6eUA=; b=bicIGz/hkyoS5i6M1BifBDrejyzvMqztHHqBxDkGzEt1NEPIF52r7VK2FFldHinSedlIng nZmvYNcKb7cV9gGFHNZSn/a7xr3gzCqK4uyZSx/NoZJ3RswrXCalPtxKKOdmdPN5eqHJzD 4pHmR4SoSDKZ3ZncU4jJ8B9mIyiXrKu8Ndg0of9712sobCWBwqUkjzPHBvIA+h1pecH5Uk fD7SCkzyZfwga8iG0Raa0MJ3xKuDn5FYjDHmuH3Ku3nyMk/X2Ht1pBNhMC+tZhL6xAwPrd nW1lteoTNqgsoIHx8aNmLEiYuzj4IQeJPiI5E6eCemNG8bHJbLhnpfMfVxvPAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682678425; a=rsa-sha256; cv=none; b=KvIr8JqVp3IYsREWmwjLTJ7qyIUmjHJ5bewoVuGfV1b40SoMvz3ebX0zqBtp+ilevMFjBn QuTpsridjk7xyhPg1p1zB/Q4Y/hwsopX1+8h+rUaDDlc0Q9njSaDsbGC2qYSjUyKWvAaEs SC0DOdCSAMfgmOzg13sD/zM+81upoJJ9paVQUxLrTy4lRP4CLxiuLopOOpHfvMur2P5TLF SrYzLLtSwT1bBSPOfWbiRlBXPYlr6TKe+MCh7yiuQMw6EFMWzPVyOYvqUnC7NNEvHqM2kL 8OKJVFSI3HX7ZgSpNOhw3B5uH8/lQwNg+n2vnxtfueKvfrqc8niLnhEIHk3E6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q78JT145Zzwrg; Fri, 28 Apr 2023 10:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SAePrD092655; Fri, 28 Apr 2023 10:40:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SAePFN092654; Fri, 28 Apr 2023 10:40:25 GMT (envelope-from git) Date: Fri, 28 Apr 2023 10:40:25 GMT Message-Id: <202304281040.33SAePFN092654@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 82622189fe02 - stable/13 - bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82622189fe022281dd9188ff0795303c95b5b0cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=82622189fe022281dd9188ff0795303c95b5b0cf commit 82622189fe022281dd9188ff0795303c95b5b0cf Author: Corvin Köhne AuthorDate: 2022-06-21 08:35:40 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 07:28:34 +0000 bhyve: add QEMU_FWCFG_INDEX_MAX_CPUS item Requested-by: coreboot Reviewed by: MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39315 (cherry picked from commit 305edaa47918a559de46a5d72060644009f1875c) --- usr.sbin/bhyve/qemu_fwcfg.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index e76ff3620586..2c5324dffdaa 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -44,6 +44,7 @@ #define QEMU_FWCFG_INDEX_SIGNATURE 0x00 #define QEMU_FWCFG_INDEX_ID 0x01 #define QEMU_FWCFG_INDEX_NB_CPUS 0x05 +#define QEMU_FWCFG_INDEX_MAX_CPUS 0x0F #define QEMU_FWCFG_INDEX_FILE_DIR 0x19 #define QEMU_FWCFG_FIRST_FILE_INDEX 0x20 @@ -227,6 +228,24 @@ qemu_fwcfg_add_item_id(void) (uint8_t *)fwcfg_id)); } +static int +qemu_fwcfg_add_item_max_cpus(void) +{ + uint16_t *fwcfg_max_cpus = calloc(1, sizeof(uint16_t)); + if (fwcfg_max_cpus == NULL) { + return (ENOMEM); + } + + /* + * We don't support cpu hotplug yet. For that reason, use guest_ncpus instead + * of maxcpus. + */ + *fwcfg_max_cpus = htole16(guest_ncpus); + + return (qemu_fwcfg_add_item(QEMU_FWCFG_ARCHITECTURE_GENERIC, + QEMU_FWCFG_INDEX_MAX_CPUS, sizeof(uint16_t), fwcfg_max_cpus)); +} + static int qemu_fwcfg_add_item_nb_cpus(void) { @@ -431,6 +450,10 @@ qemu_fwcfg_init(struct vmctx *const ctx) warnx("%s: Unable to add nb_cpus item", __func__); goto done; } + if ((error = qemu_fwcfg_add_item_max_cpus()) != 0) { + warnx("%s: Unable to add max_cpus item", __func__); + goto done; + } if ((error = qemu_fwcfg_add_item_file_dir()) != 0) { warnx("%s: Unable to add file_dir item", __func__); goto done; From nobody Fri Apr 28 12:03:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7B8j5X9qz48P05; Fri, 28 Apr 2023 12:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7B8j535Yz3hvh; Fri, 28 Apr 2023 12:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682683429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdf/xExm/6H/Og1bwQxKR7M0HncnA6gwR548UPl0og8=; b=aRIbQxxzRdgN7qGYKsDI5iJcbeL1NQtGDTzDToyazHOIwozBXb1xyQqTnwgYMxlFCzsK8u nY+I4zAWtOiLQZybivikhb14cN+rx+POY8Ei63f1aOJlXjHKxtRTkK47JfpTLWnfKP0APJ hucRKjyXrrEqUNDriuZHLu76fAxWlkmg814rvQL/0uLl9GvIcZxRO/LNkWPmGFJla71EVt 3gaT7toZRPRGOQJW8Eu/jNXzVlfpC0DChLGV0rIMT5y/LkVhGZHJfgxTW48NArsY3J9fY5 BJrwzR7+yTMErfiVPNkX3Qny/ztcmMc79D2XUBPtj1sswCdQFVV/vyoitmjKkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682683429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qdf/xExm/6H/Og1bwQxKR7M0HncnA6gwR548UPl0og8=; b=Ho0qCkNy+w23NwvkXwlsauOz2vWQavxItYiviPLAEgZTJCGzjk3Uyl/UiL7r7Q9PCzbQo4 +xSO2FPtPQEX/YuJD++l+tp4S8EnIoKWHl+EgkKknFlY6DjZegZkNc9esctgsI/cqEMhaP BNWr8NPz52o5NSFgAp6dm/6MBlyu8wMeBE4vsXbZgw9RTn8qI8ip9qAhB8Qiftk4sWv9j+ 5tEPoPL9n5hDDeCGkfIjDgQ+76N+G1WPdOX5sdidgMvim3k+m8pld601vZqJMdmqBlDQmi uDt+KUZiA3hrF/SDmdRjvav7Wz9pjIHmKjYPkw1PH6dEKLVZLWWhbktKWwdXyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682683429; a=rsa-sha256; cv=none; b=HmjKdiYcnX7a75rleyVpQJmpsWho3Dx2rx28FtawaQkUgVks4VhbkvkqS8vGrs2MjLcG1X RUls+nhHtoXz7pHFzIKEiznIanityD2mE4a38LyspIyFxhOS+jlKcscSY3Xf3iyuaTqled y7sep3q+ROmb23/5GY6Q5dntCVBysbfsJ0tZPK2gCYA+vSywzAu+qR5dB9R1iUT+AjtVJZ DMspK2QHbs1zg76Qb20diXvpMs6ZOPcpEbpCHWzv2PXIbX/1Gc8fawfPNcI6VWKyvf9kKr 3bjzrGIu+LKmn94KJkqnF2JgD4kLOBI79oYewy4K4MU3H0VPJSDPnEOAWKQ2xQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7B8j47N8zyvF; Fri, 28 Apr 2023 12:03:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SC3nqM032342; Fri, 28 Apr 2023 12:03:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SC3nKg032341; Fri, 28 Apr 2023 12:03:49 GMT (envelope-from git) Date: Fri, 28 Apr 2023 12:03:49 GMT Message-Id: <202304281203.33SC3nKg032341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b8cca0cdc0c1 - stable/13 - bhyve: remove redundant variable List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b8cca0cdc0c1efe6282028de47ae7f56dc4fa6b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b8cca0cdc0c1efe6282028de47ae7f56dc4fa6b1 commit b8cca0cdc0c1efe6282028de47ae7f56dc4fa6b1 Author: Vitaliy Gusev AuthorDate: 2023-03-01 07:45:46 +0000 Commit: Corvin Köhne CommitDate: 2023-04-28 12:01:23 +0000 bhyve: remove redundant variable Reviewed by: corvink,markj Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D38836 --- usr.sbin/bhyve/bhyverun.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 5c8265571be9..dd30eb4405ef 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1243,7 +1243,7 @@ set_defaults(void) int main(int argc, char *argv[]) { - int c, error, err; + int c, error; int max_vcpus, memflags; struct vmctx *ctx; uint64_t rip; @@ -1444,8 +1444,8 @@ main(int argc, char *argv[]) if (get_config_bool_default("memory.guest_in_core", false)) memflags |= VM_MEM_F_INCORE; vm_set_memflags(ctx, memflags); - err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL); - if (err) { + error = vm_setup_memory(ctx, memsize, VM_MMAP_ALL); + if (error) { fprintf(stderr, "Unable to setup memory (%d)\n", errno); exit(4); } From nobody Sat Apr 29 07:36:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hB43vZZz48cx1; Sat, 29 Apr 2023 07:36: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 4Q7hB43R4fz3GMM; Sat, 29 Apr 2023 07:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=by4fho9CoOHb33sYWbejBhNiDwTeUB5n+PchPM7+IZQ=; b=D/aPyD9ZMRgfgAuyR7/4fHu1aos5lzzM2zMOdV8RbXr3LlNboOmDrpFxwVM+LtXCf0kMJ2 bexKwUrPS4ZziNsW9LzP256SU97jWoRDeoKRrpkViFqsshSQjiIvziWmzvt/OfvnknvNea t3oKXT3ZhPv3UZNL6r99DcLhv8Nc+Z5Ply3YYkSzq9JapG3rt+PogjJ8rzkExBHTrJk5nn 0p1pmgPEBBxVrqLxQBLKR3sJ/9d3YKWZF6QRisLkvNFCBpgz3W2FjHtZmgk4ajxtyBrpQJ blNz2+MERpT0euaDUUdA7u+APHptOl7kI58rI1BgqzKEUS89mEGx66eM2MBLrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=by4fho9CoOHb33sYWbejBhNiDwTeUB5n+PchPM7+IZQ=; b=Nd91oSVnSjxG5TRzAat/h1dthrhLmUZAAAB49QkgFtxDZLMVnpars/ijn1WgK5uG5qBs6t GGD+7pAp/1sDufkxImgR3fAdFXwzjGSFcDPi3j/FwpTq4fNSHIrSm3H2PmiaUUX1TIg/pr sqBCMHpO/Wf33JXdX658g1IrvNO+0iOKT4LKerg98zTZTGBYnARShDPKdnVmhKFcyhksPN v8iTFUvfOyzW7WfHM4WliStvU2eU5iTVc+oIoE6skUnF6lrMSAAHfx03S9qXuUqmP35g6i U3wRDjL2TtBGnLD7Ppl87z/8kXXJVgCtRFb18PYmA3z9jjM709iQWYR1Y7gb8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753804; a=rsa-sha256; cv=none; b=eupl8v2oD35V7oflAu+d/UPgqoYtWgtLlq4grwQhhXu7aIgSAVEREPf6IxuBcek281Pumm Ux2I2Npqu7xVEDqmvXeoVCeMzYla/3k5v7ZzJdE4opho0XK6Uaswf2fxWrmpGMonD7lTp5 /l3gn88QLhqdyEt0dIZvlU7omGiQzySuWgX04QsNh1KVOA7/tyMWNfysYeKIDJgPy45AWa 4uVWByeoNbO+Oc+iJS59u0AaaRLO5QqHx1rdxrU0KzBrDlI/9mPEVcyZDFxR91FSrHoSNf O3KF3rjij//DKt5zzmJlewRZYB+alt0puPN9KjNoEOO/Yu9KAwNidn9VEz64AA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hB42STzzYbC; Sat, 29 Apr 2023 07:36:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7aiPU064088; Sat, 29 Apr 2023 07:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7aiTX064087; Sat, 29 Apr 2023 07:36:44 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:44 GMT Message-Id: <202304290736.33T7aiTX064087@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: 405cd10f3739 - stable/13 - Suppress lld 16 errors about multiply defined symbols in rescue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 405cd10f3739d00e48d9dce1f63bbc54ec3245d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=405cd10f3739d00e48d9dce1f63bbc54ec3245d2 commit 405cd10f3739d00e48d9dce1f63bbc54ec3245d2 Author: Dimitry Andric AuthorDate: 2023-04-17 16:25:30 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:22:43 +0000 Suppress lld 16 errors about multiply defined symbols in rescue lld >= 16 became more strict about multiply defined symbols. Since there are many of those in crunchgen'd programs, turn off the check when linking the rescue binary. MFC after: 1 week (cherry picked from commit 458f4722bf974c7fa7961952fcaee146f5a97708) --- rescue/rescue/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 9830bc5bed5c..ff438f2ed1b6 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -13,6 +13,12 @@ MK_PIE= no NO_SHARED= yes CRUNCH_BUILDOPTS+= MK_PIE=no NO_SHARED=yes +# lld >= 16 became more strict about multiply defined symbols. Since there are +# many of those in crunchgen'd programs, turn off the check. +.if ${LINKER_TYPE} == "lld" && ${LINKER_VERSION} >= 160000 +LDFLAGS+= -Wl,--allow-multiple-definition +.endif + PROG= rescue BINDIR?=/rescue From nobody Sat Apr 29 07:36:45 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hB563chz48cTr; Sat, 29 Apr 2023 07:36: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 4Q7hB54W3qz3GBj; Sat, 29 Apr 2023 07:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Nw7dqAm8Jk5UEdOqDiRuqjD0i1qnc+W+Bn/r2NOpvQ=; b=mJgk4xNemIyHhL4Dur+3OsmwLz4f+7XfpSqb9WneCeGBbxpcjEHOv2LgMjf9ZPV1bVQjTS NXYCiR8vz4nRNCTEhM+/3f309Hrqm+8USYK3lOhAcHO+Q+0A3iE/BAmEEClM/HVkVuxycN Q9Y+8UN8xpwWDsxvmdQK1sx0gt1Hvpseez6Taw41VYyohyfMxATcrYDOrMDteeX/iMhEzR hVgXx6Zhtx8PN3rMWV/BX97tKtXR3Fns9yyZIK0Bs7e1udH34k7oPQ4HeSkpf4FnxsDzcN zArXm80b4qZOkTvn8AmBWghil4ZPg6nTp4ot0xulV8TxM8uLDGFfJ2taRqusxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1Nw7dqAm8Jk5UEdOqDiRuqjD0i1qnc+W+Bn/r2NOpvQ=; b=WhRlkqhJnVqlUfUCYjnV5PEcvr+nETIwivxr6aRZceXUP9idRERpOnbnt5iTonsP96UzSU HPrDkUMoN/9O0EvJE6vlT0RCHvOrKBYumrbKK/7CzKXbAeQS/UXd/IKOuu9VLL1k7PCuKu vpgfKV8yE9RZcn/s90xDf7M2G+j1oUnpYbuKnfOBvAP2A/S1iVWoCy81uxwDe/7W3xRL3e MvhyesWam5jVL16Ew3Dj9IqsMGnAuqCaTih9+2d6CBBcDOAcbezM6mz/MfzfwYlBpNVOVu 0QWAWwLTm9DPGEy+IZB0VapVaghCZclyI1WR2MCz2cMBJu+cdSMP6LgjT8P2/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753805; a=rsa-sha256; cv=none; b=jvgpTOjLb+lOdObtGS+TJo4GzqEOsrwY2Gaw2TtSTu31f5lDBFHGWUq+kx9kiNuiih7SDU sclKAUZtR9uqAmWyTK456t4hGxzI+ylnKVePBnk0Kw6vPTUVsntw+WYLCQNn/ss7HIJMwB 8lEuXnQielgwETJv5L23rryIBc7MjMWJqpbeWap5e1E0AXtbRQO0lhMx2hOryQxw3xhoj+ t2W+ZoX7clri3Fby0M3izecBdbPdDBDL+2uIJ/WSrzekgsoa2OBhMQfymajMKyQLhLQBWU 79uVDL3QcRmp9/qFDhWJv/q+DiNX5Rwjn1GzbZ5TGRje89u7lDvcMZZwcKgwLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hB536d7zYP1; Sat, 29 Apr 2023 07:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7ajVJ064107; Sat, 29 Apr 2023 07:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7ajgK064106; Sat, 29 Apr 2023 07:36:45 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:45 GMT Message-Id: <202304290736.33T7ajgK064106@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: aa6748692085 - stable/13 - Suppress lld 16 errors about undefined symbols in version maps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: aa6748692085d8e5ac7a0640f8da8a31fd357f73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=aa6748692085d8e5ac7a0640f8da8a31fd357f73 commit aa6748692085d8e5ac7a0640f8da8a31fd357f73 Author: Dimitry Andric AuthorDate: 2023-04-17 16:00:20 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:22:55 +0000 Suppress lld 16 errors about undefined symbols in version maps lld >= 16 turned on --no-undefined-version by default, which results in errors whenever symbols are mentioned in version maps, but are not actually defined in the binary. Since we have quite a few instances of symbols that are defined or not, depending on various compile-time settings, suppress this lld check for the time being. MFC after: 1 week (cherry picked from commit 2ba84b4bcdd6012e8cfbf8a0d060a4438623a638) --- share/mk/bsd.lib.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 71c3dab011ef..684a3df108fa 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -256,6 +256,13 @@ SHLIB_NAME_FULL=${SHLIB_NAME} .if !empty(VERSION_MAP) ${SHLIB_NAME_FULL}: ${VERSION_MAP} LDFLAGS+= -Wl,--version-script=${VERSION_MAP} + +# lld >= 16 turned on --no-undefined-version by default, but we have several +# symbols in our version maps that may or may not exist, depending on +# compile-time defines. +.if ${LINKER_TYPE} == "lld" && ${LINKER_VERSION} >= 160000 +LDFLAGS+= -Wl,--undefined-version +.endif .endif .if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) From nobody Sat Apr 29 07:36:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hB65PlXz48ccF; Sat, 29 Apr 2023 07:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7hB64y6Lz3GQ2; Sat, 29 Apr 2023 07:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GcrGJAOhO6bHV4G7bxKGElyk8m/2LuozRiR4XCNX+KQ=; b=SCwyVsFdiI1GzvOJuqUxWkF3V0XcWf8tKr0AfTa4krfOfuV16N+GmlldnuSl9H0lHmBLUJ +x5B9budiUq6tFldLQcBuwtFCc0vi4338lMRNefRbNTjRX0wq3DzUb9djn37btDWfdq93u oBd5gxVb/O6FybBBIgsZh/oY+f8OYtkGus6OjZ3hk4AOEL6QgMAhkr+2y+dKAvegypVz8b 9L1/tBTZT0GfZ+v+poFEJ8TbmBBVyBNwh4D8mzQhZLM3nPlh7j9t1y17VdClrGFXyL0D9N ttpQmF8d+G6tgu0JSosOVhsMEKrbT/VSdql9DA8xTbssF8WFMzfrrhZnBpX35Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GcrGJAOhO6bHV4G7bxKGElyk8m/2LuozRiR4XCNX+KQ=; b=U4R1E+XFPAkOwQA9/tXBcSoSoxaBHfeJvOzWSuDaxh1lVZ8a6qmNegeaRLfGA0Q0oJKGu3 acmwdgO8/wTci0AKRgrN4uhojj/+lTXUSFzfkhr0Wl/qWBfw8mOjE+cdIr8fFINzDHlZ+r 8ADQBNyCXc72kbkhmF+GxLXixupTpyMuu++bPYxbAPBpRI+EB+C57E+ri5lYt1W31wAKC3 /88talfu7ie+icSjvrEkMdnhNILZdsJ/phFfQAlvE9i/yG8E3amQbmoH0uCnA+Zs1nuraR Fbhxtf1aF11pHxZXzGOmYffQNuQEM9I5wgZHUyp5yag+Eb6jvjNAiTIJ/+4JgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753806; a=rsa-sha256; cv=none; b=E2Ed8xdBOQtUAlCIDfZ4PXkAZ0XO/G4x3rP4FZv73cmzvMA7uUsTGeDX1+9Bm6skAefcyB /A0mTFEiVKL/RRvUP+TAQMXuBkeGAAoa/mcToJWFfm1nklZge6lW84aqSOFWWuE++2a+Jv II4VAlENttHHmWLRBPqAgvdgTaim3756iWrAmcYUpix7OVrp9fmLtIC6mlALv2HrWhIixs C1pNL+yewRQtzdf/13SLv1Fnp4XZ6FUjDaPFubehOBqdxqNUsw82WykmfKrC7npQ/F5Pbr UNtleLJ+Jicqah/PAcCrU9wkx8mXSHl8C0LBqwhOb4fNg2skrfztuAG1IHeHYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hB6420LzYc1; Sat, 29 Apr 2023 07:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7akXY064129; Sat, 29 Apr 2023 07:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7akoU064128; Sat, 29 Apr 2023 07:36:46 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:46 GMT Message-Id: <202304290736.33T7akoU064128@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: 3d70637529b3 - stable/13 - Include bsd.linker.mk to get LINKER_TYPE and VERSION in rescue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 3d70637529b37d1134365b053dfa1e7ac474130c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3d70637529b37d1134365b053dfa1e7ac474130c commit 3d70637529b37d1134365b053dfa1e7ac474130c Author: Dimitry Andric AuthorDate: 2023-04-17 17:43:29 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:23:06 +0000 Include bsd.linker.mk to get LINKER_TYPE and VERSION in rescue To be able to use these make variables, you also have to include bsd.linker.mk, apparently. Fixes: 458f4722bf97 MFC after: 1 week (cherry picked from commit 653e8c11f43dc6448b8560eb1f6679de2c47e1ed) --- rescue/rescue/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index ff438f2ed1b6..8196e14130da 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -2,6 +2,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 .include +.include PACKAGE=rescue MAN= From nobody Sat Apr 29 07:36:47 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hB76RdQz48cZT; Sat, 29 Apr 2023 07:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7hB75xrMz3G68; Sat, 29 Apr 2023 07:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyvCF//HtXZvVb4ClYQADX9rD6V0vl16g6IBOEuVGxo=; b=DGYtsUcsK/XZUG5p84LZQC6J8wBjGRnxv8nk+NO32mOZCOdEjogODwjU5/3NlqGKgREJ8r jVRmyFghZLiP1vHgJi/r5Y8dnmVMXhg5QFh80YgWweKCTxBtOBWLgAKhwcuBzFxgY6z2uC ZWnStc3XWfPrsdcEIMFjQGd0Vvj/M0ReFOJEXANK1/hYpG7plNa2aFCKdi1gVK/9qPd8zh ZVinJX/s1Jwr1GTMCg0Cxk3UWh+odN5k5pW83REbz/ESLPTmS6bu8vmIfxGAgcXQ8usqhr ckqtqbIqsqwG0wY9YPKFneGOMfC74P0HEZk60WD18HfOPx9krTM5yew30OSz5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SyvCF//HtXZvVb4ClYQADX9rD6V0vl16g6IBOEuVGxo=; b=e+b3kWM3Meajr/+IHmjht56xC96XSxa/zmnqybo1f9lvnN7apR8FXqPTVywUVMx1wwD9M2 bBJ1BzbsuhObeC9832G+EPsQQb55F+29rJnKZieyLOm8hbxa3HclhztswaHOXy7NG5X9OD 1ducC1kaTzMfz05Jc1dGLWR8PflAfQflqxydcxMWvCLY2SubqyC5cmNzp5VnDmdd2uKCNz UMnDvwGTY2rKVF7kr5zeTAv8g5jwzuJa4QPqEhoVeiTDT6EVWIcgI+ZnPM+PvggKyzI3HA IMEbH3QqLHGONf5gBgyZkAVl2jmt+idMxJCH0ALQsUzk1ZXJSMJD8Sh//Ake0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753807; a=rsa-sha256; cv=none; b=vv3Ic5JqBQr83iIBwJHstgz/a8fdTC4qzK7eD6pakp45LxkYNf0KU6ehA4ekU2Ibob9IVL FQY0S8EmhtdpIwrWA3ZtWC7LkUhal/jvhOrNWjrYmFCszUFOh+zaHBq0O31p4O/NQ91GvR 8iIiDw4GtCVs4HwMKQ/knEeNpm/RqyPUEh8BvMUvnaNqT5EOET+7iTQwBsoP+btKvlmyxm GoSAdUCicXO1EaTuZS4DFSsCgeuV5Z9Dx2al75lghVJ2TBvREMbgRFRtiGNYWVYjT9yNCP ZW4uH4ktBxKVKG/UHu3oit/hP0bqq7yMweykITCZymNyqhNVuKmx07ptsQip+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 4Q7hB74tzTzYbD; Sat, 29 Apr 2023 07:36:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7alFs064148; Sat, 29 Apr 2023 07:36:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7alS0064147; Sat, 29 Apr 2023 07:36:47 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:47 GMT Message-Id: <202304290736.33T7alS0064147@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: beb6b55d5095 - stable/13 - kcsan: add __tsan_mem(cpy|move|set) aliases for clang >= 16 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: beb6b55d509533977988c5823b42e4d6c21abb5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=beb6b55d509533977988c5823b42e4d6c21abb5f commit beb6b55d509533977988c5823b42e4d6c21abb5f Author: Dimitry Andric AuthorDate: 2023-04-23 18:11:34 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:23:13 +0000 kcsan: add __tsan_mem(cpy|move|set) aliases for clang >= 16 Summary: After https://github.com/llvm/llvm-project/commit/b4257d3bf58c ("[tsan] Replace mem intrinsics with calls to interceptors") intrinsic calls to memcpy, memmove or memset will directly call sanitizer interceptors, e.g. __tsan_memcpy, __tsan_memmove or __tsan_memset. Building GENERIC-KCSAN with clang >= 16 would thus result in link errors similar to: ld: error: undefined symbol: __tsan_memcpy >>> referenced by cam_compat.c:150 (/usr/src/sys/cam/cam_compat.c:150) >>> cam_compat.o:(cam_compat_handle_0x17) >>> referenced by cam_compat.c:151 (/usr/src/sys/cam/cam_compat.c:151) >>> cam_compat.o:(cam_compat_handle_0x17) >>> referenced by cam_compat.c:152 (/usr/src/sys/cam/cam_compat.c:152) >>> cam_compat.o:(cam_compat_handle_0x17) >>> referenced 1692 more times Similar to subr_msan.c, add aliases from the existing kcsan_* versions of these functions to __tsan_* names. Reviewed by: markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39772 (cherry picked from commit 42162fb2fe30c0881e7e4d2143ddcfee3e1dd752) --- sys/kern/subr_csan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_csan.c b/sys/kern/subr_csan.c index 3a542207fbfb..d607204b222f 100644 --- a/sys/kern/subr_csan.c +++ b/sys/kern/subr_csan.c @@ -301,6 +301,10 @@ kcsan_memmove(void *dst, const void *src, size_t len) return __builtin_memmove(dst, src, len); } +__strong_reference(kcsan_memcpy, __tsan_memcpy); +__strong_reference(kcsan_memset, __tsan_memset); +__strong_reference(kcsan_memmove, __tsan_memmove); + char * kcsan_strcpy(char *dst, const char *src) { From nobody Sat Apr 29 07:36:48 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hB90pYyz48crN; Sat, 29 Apr 2023 07:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7hB872QJz3GlK; Sat, 29 Apr 2023 07:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G12ER/cyPo50vdZzh1yZGEGPssJZveqrAvNw5JFEIrA=; b=doPplMrs5BDs0y55Kwp8XCmdWB4voKgkAMudB3NUUZQzGLQOK8cIdjt2+zVjp4kaOvTNDq qwC0ilKBhbpVQsn/ir/y36gy9TE+gufxFgaDMY2RNQ1bqVNQ6SwPvVnCFlkUYOl9AK+51m zjf4eJ9j6N8BJSgZVGsk5Wc7AisxV/qKOwA/CMzt3ET2EonLgeC0mkb+6tpCWT4ndAHQEs i8nNEsgKsqiI63TCaxCftWaaLVYAU7+6d+nIC4srBslQ5AaY1rqS8jXXS0NqBnzwA0rJ6D 8wj1u9EWfuPHQq4p4vnwzCTx/eaVhQ17C5mN6MKJ1uQ7evJr8mBiDz30FSu4ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G12ER/cyPo50vdZzh1yZGEGPssJZveqrAvNw5JFEIrA=; b=hjoQ9zCbKno5Ff2qi+LGJRLQ+8MkAETSAylzU+B1QsmSzpmyO+rDrcsQdx3aRWs9yanGcP yeqzk9ihr91whthaz2DwU7jyL5N7rUNtGZmKa4sr7Lv7/Re46irk+3IVL6nNIhd1jesDte DyROtUd5LhSmrL49xCUwzYAm9IW7E3WkgBbAEjlP9LjsX/eKdBQqDJ8nzkx3B+3uMlnN8o +NEQgz6HdrN6CEcvXjt17raBKwkp1IhW3yGtidaLnE+o+I+SDi4RYRUDpi9KB4anz+n9AE JgH++U+TF+9gd1xDTskdorwNtzs35t8UypOMhAD/Ol+rTesBef7nJ1jomupyzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753809; a=rsa-sha256; cv=none; b=tu69kZPRHg6rVtEmx5KNfd6YKNAeUe6D7MuntjpPtRkOVNx/4nudPzBagIEdprWk+D87eb 5hXiLtAX8TKjtFQZCTWQL9I9LXtmYXKACqOLLrm/AEr+Z5JbkxM0HtlPF1OXXJrHO2gewN vhH1x7AsskCIgtkTnYBnvq1/Ck0GnEpzL829xh8fxDh8Z9XHlvE/Fe91vRo7DG9kTSsuXu jCso4j0z4W500x5/K4j6mcOhHdOZA5kmc9m/YhFofQ5DBceGo858E/nDxROxc5FwktDtTV 36vbrSh/yn2KRKGVUjC54b9ogBOjGSw+fWDe3QctQsVd/ttNAIqSNhKRAQZU4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hB85xkgzYP2; Sat, 29 Apr 2023 07:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7amnB064167; Sat, 29 Apr 2023 07:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7ame0064166; Sat, 29 Apr 2023 07:36:48 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:48 GMT Message-Id: <202304290736.33T7ame0064166@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: 286ed9ef4f9f - stable/13 - powerpc: fix a few pmap related functions to return correct types List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 286ed9ef4f9fdd23bddc12ff656af641ecc43a03 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=286ed9ef4f9fdd23bddc12ff656af641ecc43a03 commit 286ed9ef4f9fdd23bddc12ff656af641ecc43a03 Author: Dimitry Andric AuthorDate: 2023-04-23 13:22:44 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:23:20 +0000 powerpc: fix a few pmap related functions to return correct types While experimenting with changing boolean_t to another type, I noticed that several powerpc pmap related functions returned the wrong type: boolean_t instead of int. Fix several declarations and definitions to match the actual pmap function types: pmap_dev_direct_mapped_t and pmap_ts_referenced_t. MFC after: 3 days (cherry picked from commit d142601887524fc595ed0f5e6a69419727222f0a) --- sys/powerpc/aim/mmu_oea.c | 4 ++-- sys/powerpc/aim/mmu_oea64.c | 4 ++-- sys/powerpc/aim/mmu_radix.c | 8 ++++---- sys/powerpc/booke/pmap.c | 2 +- sys/powerpc/powerpc/pmap_dispatch.c | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index e86df137c963..59a742ff9967 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -320,7 +320,7 @@ vm_paddr_t moea_kextract(vm_offset_t); void moea_kenter_attr(vm_offset_t, vm_paddr_t, vm_memattr_t); void moea_kenter(vm_offset_t, vm_paddr_t); void moea_page_set_memattr(vm_page_t m, vm_memattr_t ma); -boolean_t moea_dev_direct_mapped(vm_paddr_t, vm_size_t); +int moea_dev_direct_mapped(vm_paddr_t, vm_size_t); static void moea_sync_icache(pmap_t, vm_offset_t, vm_size_t); void moea_dumpsys_map(vm_paddr_t pa, size_t sz, void **va); void moea_scan_init(void); @@ -2658,7 +2658,7 @@ moea_bat_mapped(int idx, vm_paddr_t pa, vm_size_t size) return (0); } -boolean_t +int moea_dev_direct_mapped(vm_paddr_t pa, vm_size_t size) { int i; diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 156463148f64..84b6cd0c3730 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -426,7 +426,7 @@ vm_paddr_t moea64_kextract(vm_offset_t); void moea64_page_set_memattr(vm_page_t m, vm_memattr_t ma); void moea64_kenter_attr(vm_offset_t, vm_paddr_t, vm_memattr_t ma); void moea64_kenter(vm_offset_t, vm_paddr_t); -boolean_t moea64_dev_direct_mapped(vm_paddr_t, vm_size_t); +int moea64_dev_direct_mapped(vm_paddr_t, vm_size_t); static void moea64_sync_icache(pmap_t, vm_offset_t, vm_size_t); void moea64_dumpsys_map(vm_paddr_t pa, size_t sz, void **va); @@ -3149,7 +3149,7 @@ moea64_clear_bit(vm_page_t m, u_int64_t ptebit) return (count); } -boolean_t +int moea64_dev_direct_mapped(vm_paddr_t pa, vm_size_t size) { struct pvo_entry *pvo, key; diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 9f59d524196f..4210f1faf0a6 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -458,7 +458,7 @@ void mmu_radix_qenter(vm_offset_t, vm_page_t *, int); void mmu_radix_qremove(vm_offset_t, int); vm_offset_t mmu_radix_quick_enter_page(vm_page_t); void mmu_radix_quick_remove_page(vm_offset_t); -boolean_t mmu_radix_ts_referenced(vm_page_t); +int mmu_radix_ts_referenced(vm_page_t); void mmu_radix_release(pmap_t); void mmu_radix_remove(pmap_t, vm_offset_t, vm_offset_t); void mmu_radix_remove_all(vm_page_t); @@ -492,7 +492,7 @@ static void *mmu_radix_mapdev(vm_paddr_t, vm_size_t); static void *mmu_radix_mapdev_attr(vm_paddr_t, vm_size_t, vm_memattr_t); static void mmu_radix_unmapdev(vm_offset_t, vm_size_t); static void mmu_radix_kenter_attr(vm_offset_t, vm_paddr_t, vm_memattr_t ma); -static boolean_t mmu_radix_dev_direct_mapped(vm_paddr_t, vm_size_t); +static int mmu_radix_dev_direct_mapped(vm_paddr_t, vm_size_t); static void mmu_radix_dumpsys_map(vm_paddr_t pa, size_t sz, void **va); static void mmu_radix_scan_init(void); static void mmu_radix_cpu_bootstrap(int ap); @@ -3838,7 +3838,7 @@ mmu_radix_is_referenced(vm_page_t m) * invalidations are performed before the PV list lock is * released. */ -boolean_t +int mmu_radix_ts_referenced(vm_page_t m) { struct md_page *pvh; @@ -6090,7 +6090,7 @@ mmu_radix_decode_kernel_ptr(vm_offset_t addr, return (0); } -static boolean_t +static int mmu_radix_dev_direct_mapped(vm_paddr_t pa, vm_size_t size) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 6c48584096c5..2d16bba90925 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -338,7 +338,7 @@ static vm_paddr_t mmu_booke_kextract(vm_offset_t); static void mmu_booke_kenter(vm_offset_t, vm_paddr_t); static void mmu_booke_kenter_attr(vm_offset_t, vm_paddr_t, vm_memattr_t); static void mmu_booke_kremove(vm_offset_t); -static boolean_t mmu_booke_dev_direct_mapped(vm_paddr_t, vm_size_t); +static int mmu_booke_dev_direct_mapped(vm_paddr_t, vm_size_t); static void mmu_booke_sync_icache(pmap_t, vm_offset_t, vm_size_t); static void mmu_booke_dumpsys_map(vm_paddr_t pa, size_t, diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index 00d4a2074327..1adfc42eefd1 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -150,7 +150,7 @@ DEFINE_PMAP_IFUNC(void, qenter, (vm_offset_t, vm_page_t *, int)); DEFINE_PMAP_IFUNC(void, qremove, (vm_offset_t, int)); DEFINE_PMAP_IFUNC(vm_offset_t, quick_enter_page, (vm_page_t)); DEFINE_PMAP_IFUNC(void, quick_remove_page, (vm_offset_t)); -DEFINE_PMAP_IFUNC(boolean_t, ts_referenced, (vm_page_t)); +DEFINE_PMAP_IFUNC(int, ts_referenced, (vm_page_t)); DEFINE_PMAP_IFUNC(void, release, (pmap_t)); DEFINE_PMAP_IFUNC(void, remove, (pmap_t, vm_offset_t, vm_offset_t)); DEFINE_PMAP_IFUNC(void, remove_all, (vm_page_t)); @@ -179,7 +179,7 @@ DEFINE_PMAP_IFUNC(void, unmapdev, (vm_offset_t, vm_size_t)); DEFINE_PMAP_IFUNC(int, map_user_ptr, (pmap_t, volatile const void *, void **, size_t, size_t *)); DEFINE_PMAP_IFUNC(int, decode_kernel_ptr, (vm_offset_t, int *, vm_offset_t *)); -DEFINE_PMAP_IFUNC(boolean_t, dev_direct_mapped, (vm_paddr_t, vm_size_t)); +DEFINE_PMAP_IFUNC(int, dev_direct_mapped, (vm_paddr_t, vm_size_t)); DEFINE_PMAP_IFUNC(void, sync_icache, (pmap_t, vm_offset_t, vm_size_t)); DEFINE_PMAP_IFUNC(int, change_attr, (vm_offset_t, vm_size_t, vm_memattr_t)); DEFINE_PMAP_IFUNC(void, page_array_startup, (long)); From nobody Sat Apr 29 07:36:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hBB2xQTz48cpH; Sat, 29 Apr 2023 07:36: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 4Q7hBB118dz3GTs; Sat, 29 Apr 2023 07:36:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0WhyIIQR3eT61GRj6kwqFFAlzx4BXdJP1yZbZMTZlgw=; b=RoouyIbsraIToDE/hbCphDI+nX0etUcme/4VonSjHmnRS3rfYLg3mKFzoQ8/LCPnJPG/RU 6dfazZBZOLIlf6l5utr/mv9vYsETZHAvOSKV2mk5Nf3jTIIc/EUF9N0Wf6lMyrNNy8DU7m B64wCAYeOQBUpPYaZ7Z1VRL3bkjQ/M79oAANxaeShs/ySyZJKShXubV717+bcTBJD7qsQV mn6BHbIvy/Pm9Pg9sdHrH6A3b99qTl2a+gXF6/sW2nKiDUcatqr2zwONaIZ20Lt8ubrynx U6sVBR/b8E+kpPqNSHYTSH4BUGwHdA2lDzSVwy0TuPZCD6eW6LL5HinwHtbv9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0WhyIIQR3eT61GRj6kwqFFAlzx4BXdJP1yZbZMTZlgw=; b=i7MISFTEPSBLRDKlDloUXPG5Cwku4TVAcqwKRzynUmw6WaUsbWGJ99io6ZYirDEohXrBQf t5xJHMK9g4K58m4+Dh0L1iMshlF91WmRRUlnjrs2BytzRXGYfL3qtIvOsYVGTJacLMOEeA Nh0JYliHDZjWxXgRlE6drOnKyScqxfJpah3H4iYBv9HzRBknv3MCnHNHufJ2oprkg76fim xizGrR42Y4ARlSsnIi2wCDg4RY0mLOzMkuJIZYIjNd3oRaotxuTeHaML7Ozx+IBWw3l94k bVepflDWBgYmXOzCnHDyp1ze1TJzSOnzo2m9Phr1iicVDWXa1s8QOoEDuoZXzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753810; a=rsa-sha256; cv=none; b=UKPer7e+x7DoMzx+TSTTWYtK3scPwGS8bWjlqt7D8hXTKRii3EGPAyHAzgTTuMA8o4JMd6 FJlP/CBcb+k/341MitAm9qpRvU8qjMicZT+VwLVgfGoDD/aStS6W81AMH2qMkWXEAAdE1D r4la+Q0u5hYf4xS3FwDT+/XxpyUaBSYmWsrkbqdXbDUVV6smy0xxpm5MPwk8yKvNBrtHjr 8d15EcgVvL2eiw7YpEDYZWS5QD5HPXMEQ5aDEpl1/ZtB/4HGA/6rovPvJtadk4m3SGOPpS RMuhTDuhdd+GnAcPw0ObjJ1V1uFN05Ug95LdynhHcjj1nSPJkwAaXJU7E6/gCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hB96wbDzYP3; Sat, 29 Apr 2023 07:36:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7anfY064193; Sat, 29 Apr 2023 07:36:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7anWQ064192; Sat, 29 Apr 2023 07:36:49 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:49 GMT Message-Id: <202304290736.33T7anWQ064192@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: 1150a69dbdf1 - stable/13 - Use bool for one-bit wide bit-fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 1150a69dbdf1d92fb28f7b775cf55aa75d2272f7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=1150a69dbdf1d92fb28f7b775cf55aa75d2272f7 commit 1150a69dbdf1d92fb28f7b775cf55aa75d2272f7 Author: Dimitry Andric AuthorDate: 2023-04-25 17:18:58 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:23:25 +0000 Use bool for one-bit wide bit-fields A signed one-bit wide bit-field can take only the values 0 and -1. Clang 16 introduced a warning that "implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1". Fix the warnings by using C99 bool. Reported by: Clang 16 Reviewed by: emaste, jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39705 (cherry picked from commit bab8274c090942cf96c44bc001307b9bffac9d7e) --- sys/dev/acpica/acpi_pci_link.c | 28 ++++++++++++++-------------- sys/dev/acpica/acpi_pxm.c | 4 ++-- sys/dev/otus/if_otusreg.h | 2 +- sys/dev/puc/puc.c | 2 +- sys/dev/puc/puc_bfe.h | 8 ++++---- sys/dev/quicc/quicc_bfe.h | 4 ++-- sys/dev/scc/scc_bfe.h | 20 ++++++++++---------- sys/dev/uart/uart_bus.h | 20 ++++++++++---------- sys/dev/wpi/if_wpivar.h | 2 +- sys/x86/include/x86_smp.h | 8 ++++---- 10 files changed, 49 insertions(+), 49 deletions(-) diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 441b52ea1cb0..86b80f62c391 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -104,8 +104,8 @@ struct link { int l_num_irqs; int *l_irqs; int l_references; - int l_routed:1; - int l_isa_irq:1; + bool l_routed:1; + bool l_isa_irq:1; ACPI_RESOURCE l_prs_template; }; @@ -355,18 +355,18 @@ link_add_prs(ACPI_RESOURCE *res, void *context) * valid IRQs are ISA IRQs, then mark this link as * routed via an ISA interrupt. */ - link->l_isa_irq = TRUE; + link->l_isa_irq = true; link->l_irqs = malloc(sizeof(int) * link->l_num_irqs, M_PCI_LINK, M_WAITOK | M_ZERO); for (i = 0; i < link->l_num_irqs; i++) { if (is_ext_irq) { link->l_irqs[i] = ext_irqs[i]; if (ext_irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = FALSE; + link->l_isa_irq = false; } else { link->l_irqs[i] = irqs[i]; if (irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = FALSE; + link->l_isa_irq = false; } } @@ -376,7 +376,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) */ if (!req->sc->pl_crs_bad && !link->l_isa_irq && link->l_crs_type == ACPI_RESOURCE_TYPE_IRQ) - req->sc->pl_crs_bad = TRUE; + req->sc->pl_crs_bad = true; break; default: if (req->in_dpf == DPF_IGNORE) @@ -390,7 +390,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) return (AE_OK); } -static int +static bool link_valid_irq(struct link *link, int irq) { int i; @@ -399,12 +399,12 @@ link_valid_irq(struct link *link, int irq) /* Invalid interrupts are never valid. */ if (!PCI_INTERRUPT_VALID(irq)) - return (FALSE); + return (false); /* Any interrupt in the list of possible interrupts is valid. */ for (i = 0; i < link->l_num_irqs; i++) if (link->l_irqs[i] == irq) - return (TRUE); + return (true); /* * For links routed via an ISA interrupt, if the SCI is routed via @@ -412,10 +412,10 @@ link_valid_irq(struct link *link, int irq) */ if (link->l_isa_irq && AcpiGbl_FADT.SciInterrupt == irq && irq < NUM_ISA_INTERRUPTS) - return (TRUE); + return (true); /* If the interrupt wasn't found in the list it is not valid. */ - return (FALSE); + return (false); } static void @@ -493,7 +493,7 @@ acpi_pci_link_attach(device_t dev) sc->pl_links[i].l_irq = PCI_INVALID_IRQ; sc->pl_links[i].l_bios_irq = PCI_INVALID_IRQ; sc->pl_links[i].l_sc = sc; - sc->pl_links[i].l_isa_irq = FALSE; + sc->pl_links[i].l_isa_irq = false; sc->pl_links[i].l_res_index = -1; } @@ -558,7 +558,7 @@ acpi_pci_link_attach(device_t dev) else for (i = 0; i < sc->pl_num_links; i++) if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq)) - sc->pl_links[i].l_routed = TRUE; + sc->pl_links[i].l_routed = true; if (bootverbose) acpi_pci_link_dump(sc, 0, "After Disable"); ACPI_SERIAL_END(pci_link); @@ -904,7 +904,7 @@ acpi_pci_link_route_irqs(device_t dev) */ if (!link->l_routed && PCI_INTERRUPT_VALID(link->l_irq)) { - link->l_routed = TRUE; + link->l_routed = true; acpi_config_intr(dev, resource); pci_link_interrupt_weights[link->l_irq] += link->l_references; diff --git a/sys/dev/acpica/acpi_pxm.c b/sys/dev/acpica/acpi_pxm.c index 808886d744f0..18a21ee6b0f8 100644 --- a/sys/dev/acpica/acpi_pxm.c +++ b/sys/dev/acpica/acpi_pxm.c @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #if MAXMEMDOM > 1 static struct cpu_info { - int enabled:1; - int has_memory:1; + bool enabled:1; + bool has_memory:1; int domain; int id; } *cpus; diff --git a/sys/dev/otus/if_otusreg.h b/sys/dev/otus/if_otusreg.h index 190bf19eb2ae..4bccc85b2168 100644 --- a/sys/dev/otus/if_otusreg.h +++ b/sys/dev/otus/if_otusreg.h @@ -1020,7 +1020,7 @@ struct otus_softc { uint8_t capflags; uint8_t rxmask; uint8_t txmask; - int sc_running:1, + bool sc_running:1, sc_calibrating:1, sc_scanning:1; diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index dd6e9b688705..2ecaaad4e05c 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -60,7 +60,7 @@ struct puc_port { int p_type; int p_rclk; - int p_hasintr:1; + bool p_hasintr:1; serdev_intr_t *p_ihsrc[PUC_ISRCCNT]; void *p_iharg; diff --git a/sys/dev/puc/puc_bfe.h b/sys/dev/puc/puc_bfe.h index 68678d3771e1..692a7f009019 100644 --- a/sys/dev/puc/puc_bfe.h +++ b/sys/dev/puc/puc_bfe.h @@ -65,10 +65,10 @@ struct puc_softc { int sc_nports; struct puc_port *sc_port; - int sc_fastintr:1; - int sc_leaving:1; - int sc_polled:1; - int sc_msi:1; + bool sc_fastintr:1; + bool sc_leaving:1; + bool sc_polled:1; + bool sc_msi:1; int sc_ilr; diff --git a/sys/dev/quicc/quicc_bfe.h b/sys/dev/quicc/quicc_bfe.h index ea791bc277e3..994d9f62ca10 100644 --- a/sys/dev/quicc/quicc_bfe.h +++ b/sys/dev/quicc/quicc_bfe.h @@ -51,8 +51,8 @@ struct quicc_softc { u_int sc_clock; - int sc_fastintr:1; - int sc_polled:1; + bool sc_fastintr:1; + bool sc_polled:1; }; extern devclass_t quicc_devclass; diff --git a/sys/dev/scc/scc_bfe.h b/sys/dev/scc/scc_bfe.h index 1ccd176e5539..303bdfd6d75d 100644 --- a/sys/dev/scc/scc_bfe.h +++ b/sys/dev/scc/scc_bfe.h @@ -72,11 +72,11 @@ struct scc_mode { device_t m_dev; u_int m_mode; - int m_attached:1; - int m_fastintr:1; - int m_hasintr:1; - int m_probed:1; - int m_sysdev:1; + bool m_attached:1; + bool m_fastintr:1; + bool m_hasintr:1; + bool m_probed:1; + bool m_sysdev:1; driver_filter_t *ih; serdev_intr_t *ih_src[SCC_ISRCCNT]; @@ -94,8 +94,8 @@ struct scc_chan { struct scc_mode ch_mode[SCC_NMODES]; u_int ch_nr; - int ch_enabled:1; - int ch_sysdev:1; + bool ch_enabled:1; + bool ch_sysdev:1; uint32_t ch_ipend; uint32_t ch_hwsig; @@ -130,9 +130,9 @@ struct scc_softc { struct scc_chan *sc_chan; - int sc_fastintr:1; - int sc_leaving:1; - int sc_polled:1; + bool sc_fastintr:1; + bool sc_leaving:1; + bool sc_polled:1; uint32_t sc_hwsig; /* Signal state. Used by HW driver. */ }; diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h index 5da3cecccf85..2c1918c580e9 100644 --- a/sys/dev/uart/uart_bus.h +++ b/sys/dev/uart/uart_bus.h @@ -89,16 +89,16 @@ struct uart_softc { int sc_irid; struct callout sc_timer; - int sc_callout:1; /* This UART is opened for callout. */ - int sc_fastintr:1; /* This UART uses fast interrupts. */ - int sc_hwiflow:1; /* This UART has HW input flow ctl. */ - int sc_hwoflow:1; /* This UART has HW output flow ctl. */ - int sc_leaving:1; /* This UART is going away. */ - int sc_opened:1; /* This UART is open for business. */ - int sc_polled:1; /* This UART has no interrupts. */ - int sc_txbusy:1; /* This UART is transmitting. */ - int sc_isquelch:1; /* This UART has input squelched. */ - int sc_testintr:1; /* This UART is under int. testing. */ + bool sc_callout:1; /* This UART is opened for callout. */ + bool sc_fastintr:1; /* This UART uses fast interrupts. */ + bool sc_hwiflow:1; /* This UART has HW input flow ctl. */ + bool sc_hwoflow:1; /* This UART has HW output flow ctl. */ + bool sc_leaving:1; /* This UART is going away. */ + bool sc_opened:1; /* This UART is open for business. */ + bool sc_polled:1; /* This UART has no interrupts. */ + bool sc_txbusy:1; /* This UART is transmitting. */ + bool sc_isquelch:1; /* This UART has input squelched. */ + bool sc_testintr:1; /* This UART is under int. testing. */ struct uart_devinfo *sc_sysdev; /* System device (or NULL). */ diff --git a/sys/dev/wpi/if_wpivar.h b/sys/dev/wpi/if_wpivar.h index 422dc34d65b8..81fdeced248a 100644 --- a/sys/dev/wpi/if_wpivar.h +++ b/sys/dev/wpi/if_wpivar.h @@ -77,7 +77,7 @@ struct wpi_tx_ring { uint8_t cur; uint8_t pending; int16_t queued; - int update:1; + bool update:1; }; struct wpi_rx_data { diff --git a/sys/x86/include/x86_smp.h b/sys/x86/include/x86_smp.h index 2cf0ff97eae0..9d8e1c4ebaec 100644 --- a/sys/x86/include/x86_smp.h +++ b/sys/x86/include/x86_smp.h @@ -56,10 +56,10 @@ extern int nmi_kdb_lock; extern int nmi_is_broadcast; struct cpu_info { - int cpu_present:1; - int cpu_bsp:1; - int cpu_disabled:1; - int cpu_hyperthread:1; + bool cpu_present:1; + bool cpu_bsp:1; + bool cpu_disabled:1; + bool cpu_hyperthread:1; }; extern struct cpu_info *cpu_info; From nobody Sat Apr 29 07:36:51 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hBC5WLjz48crP; Sat, 29 Apr 2023 07:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q7hBC25j8z3Gjb; Sat, 29 Apr 2023 07:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gq0UWsL9cf6N3JYWUWurIlop2jqTlcCVKv+7AzdQQfA=; b=Uv007XzBWgOYzDsHXWEGWNGMKphtow9kqdvdC9/E0SC30Gx0uflpmq/sw/NhVW8LI0J+LN k3KZbWMOWuZ9bTYxUvEKzWeAXFYjpkGkr8v21Z/c5pQwqVrWBQAuLj0mOGGBRGGE3e6z1c ZLlyuIFxI1VyPDmeG0aLVaZ0FdAyOILBjeZyLOQ5PxW9xEhoTcOyEB0BN5YihpTDfyT/mt MM1MIxfIxqWMTxfRRReyHm3c7lfZFkZeMGZwbap90NTZgIkEh4ytjYESzWgFKvJR7NKMVm pQMoUXYklh7I2BzRqXKsavdE2lKsnv9E4uZ6JFrF2f1XHPKkmu44ipBf4UhIjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gq0UWsL9cf6N3JYWUWurIlop2jqTlcCVKv+7AzdQQfA=; b=lHwRdzTjtAhx1ZmHDonIdus326MnuOWwU2FrhUw1hHZXnDaP3N00oTj+vYynbtbJLtdnIM ynezjL6GY8zLEJjndsjitfhvgh4dY7mpOA7yl+m8YrOIwGDEnwj34g0vmAGHnSviPksiCM 8oLt8SUv3GYDmami3AAMh50h4yx+uIv8orf11oD/aZUu5Cr4QVc1RR/KCQOvugwPFkxnop W1dwGKVG8uQEziGZYUiMjlZxLPKoSMhnuKFMykh4aaAiXQmj4eLn0cHITHx6ZVKPVuDEjM 6nyXVDlipLnUxeawwABV+ns3xIwKCaZXDLGhjiZDvLyNUIarHUO4oi5QLT526w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753811; a=rsa-sha256; cv=none; b=xEVXxhqcv09Xx/0/4xsDa0glz643Gr2/Ang+fwBezKTxTw95Kfb5x37oVjytQFKHzMexQu 3/UJh6dqQI2reGf/5HF2uGPVWI9MGQR/92uJU0ZftoPEoCLw5h/WEK/bLOg2WphaRGm9wA VOb/34+hBzcww2KXWdLhebPMD75XDruFNlepm8V0/xj32EaxaNoPI787QV9gHLB08wfcVt h2Rb9IurRAtt+NmKvlMioHCYDljUy6H/9fV6GXQQih3Vs94TVYu8TQan7Bfvbeiq/mQyvL EhaRZiOZxg4hnz6VRixTwHkMSO4miD9PVIYQqkTh0rvK/6YEVpCurSGvqyWScQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hBC0wGwzY8Y; Sat, 29 Apr 2023 07:36:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7apqk064212; Sat, 29 Apr 2023 07:36:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7apMZ064211; Sat, 29 Apr 2023 07:36:51 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:36:51 GMT Message-Id: <202304290736.33T7apMZ064211@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: 99a98c68f441 - stable/13 - al_eth: make function definitions consistent with declarations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 99a98c68f441263f99eb140d846a188512be21e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=99a98c68f441263f99eb140d846a188512be21e6 commit 99a98c68f441263f99eb140d846a188512be21e6 Author: Dimitry Andric AuthorDate: 2023-04-22 11:45:57 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:23:34 +0000 al_eth: make function definitions consistent with declarations The declarations for al_eth_lm_retimer_ds25_signal_detect() and al_eth_lm_retimer_ds25_cdr_lock() say that these functions return 'al_bool', but the definitions actually return 'boolean_t'. Make the definitions match the declarations. Reviewed by: jhb, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39759 (cherry picked from commit 9ea31d78f00d23612f3ab44d83265f8039f487af) --- sys/dev/al_eth/al_init_eth_lm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/al_eth/al_init_eth_lm.c b/sys/dev/al_eth/al_init_eth_lm.c index 12c9b0917ef0..5caea40e3bf7 100644 --- a/sys/dev/al_eth/al_init_eth_lm.c +++ b/sys/dev/al_eth/al_init_eth_lm.c @@ -848,7 +848,7 @@ config_error: return rc; } -static boolean_t al_eth_lm_retimer_ds25_signal_detect(struct al_eth_lm_context *lm_context, +static al_bool al_eth_lm_retimer_ds25_signal_detect(struct al_eth_lm_context *lm_context, uint32_t channel) { int rc = 0; @@ -878,7 +878,7 @@ config_error: return FALSE; } -static boolean_t al_eth_lm_retimer_ds25_cdr_lock(struct al_eth_lm_context *lm_context, +static al_bool al_eth_lm_retimer_ds25_cdr_lock(struct al_eth_lm_context *lm_context, uint32_t channel) { int rc = 0; From nobody Sat Apr 29 07:37:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hC06rRmz48ccS; Sat, 29 Apr 2023 07:37: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 4Q7hC05srTz3J9j; Sat, 29 Apr 2023 07: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=1682753852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uIxszOQOgeupqzBoyMg+zo//LrZ1suc3ntYCrD5/0Ss=; b=eQBiml2AjDJ8j0DFN7HSjrmDfrHKlEfp30+JMcSTuXsWbzM4NYQyE4oO3WGXU3OoqndZqM u131X3U++I8QwPOzU0tUHqppoZoookn2uHfWOp2Z9hcF+PI6u4c1AEOMlbHRAFMEPOMT/p AvCGG7mHMgI8pG7B3TGl1F3p5c4hJyl9dYZEpRI1GeS8XnTtOC9YESXcPmFhahPjHXGkT5 LLftHAxr96VEe0m/4C0smlpWGuUMFHV6WRm0Z8l73GNFPjW3MFfaHN4Yjg5GALioh5ov1u kWSKX7aIwoo9zxVUn4AE3gfRHew2DFHSpEt2UEFmSS2zZwimsTpxDTWl1nqKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753852; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uIxszOQOgeupqzBoyMg+zo//LrZ1suc3ntYCrD5/0Ss=; b=w7903WrZR/8XkJz27uadpBGfZV0cl1oK02hyUJGsKpIBEw3YXjGzPSXrOC7jVQVp3ILdyF UGMNKy0AGVl9Yqttds85EPNrK7ZizPDIuGjSE+fbxs+ne95UUnUH9X9jls7WjqL+fhUOcM NO8a/OddaHGU2720ZFFakkaDs4spS/Aed7ySvVkVELMnWkjNWZUBg7P4AO7Qle30fqvFSt R4rnwoT1BvpBLb6JNljqpO0Kd+oydcQk8zRWD8WhgOuVBEaNXUN0of/UsVUi/DKG53Vqmf Feh7TsnqTd8tMqYMxxXeH8J8zZhpozPbgHPI+EADF78cXdI01Kzo6AejKzJG1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753852; a=rsa-sha256; cv=none; b=knvfAtFBBNgo1UM+eDL5qr8nI7D84BJ4S5Z/JuyoWczN1EykGCw9GibSv0dKaaCRTCsnXy cAfilCuybwgYTppnf/n++el/yHxxJQNtiSO+jZdzlOColudJj2Ph1ZAZYuVEMcHfIdXZ1E 58uSPTPLfbuKJUyMKqCXCG2WWf7sNHVfoSQq15VccQ4boTOAmHRoW/U7mec+1hQACPAmJh nbEY8CdRyHdgYvYqQkHSDLJAA7cFpMD21hVOPVfnRx6mDnzbZamUUg9IjAMCm435kCGpCv SUDb1259aMed13QoKEpCDxAKwBVbQJ6CKznDOkgdzkdKcTO4m2bkuJ2jpXrjWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hC04jkfzYR3; Sat, 29 Apr 2023 07:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7bWFb064481; Sat, 29 Apr 2023 07:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bWUl064480; Sat, 29 Apr 2023 07:37:32 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:32 GMT Message-Id: <202304290737.33T7bWUl064480@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: c14351db0d06 - stable/12 - Suppress lld 16 errors about multiply defined symbols in rescue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: c14351db0d06b67a2cc2b5318f25df07602bbe71 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c14351db0d06b67a2cc2b5318f25df07602bbe71 commit c14351db0d06b67a2cc2b5318f25df07602bbe71 Author: Dimitry Andric AuthorDate: 2023-04-17 16:25:30 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:24:24 +0000 Suppress lld 16 errors about multiply defined symbols in rescue lld >= 16 became more strict about multiply defined symbols. Since there are many of those in crunchgen'd programs, turn off the check when linking the rescue binary. MFC after: 1 week (cherry picked from commit 458f4722bf974c7fa7961952fcaee146f5a97708) --- rescue/rescue/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 8faf4d29877b..4395aca895d1 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -8,6 +8,12 @@ MAN= MK_SSP= no NO_SHARED= yes +# lld >= 16 became more strict about multiply defined symbols. Since there are +# many of those in crunchgen'd programs, turn off the check. +.if ${LINKER_TYPE} == "lld" && ${LINKER_VERSION} >= 160000 +LDFLAGS+= -Wl,--allow-multiple-definition +.endif + PROG= rescue BINDIR?=/rescue From nobody Sat Apr 29 07:37:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hC20Gqxz48cVG; Sat, 29 Apr 2023 07: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 4Q7hC16PbTz3J3N; Sat, 29 Apr 2023 07: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=1682753853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QtW98n5Rx0CbfsCu6rjDmKqk845YW5JWPIyw89SurQ=; b=D+cJw/ZvhsoUZJBRWGVcSykVI0VUgY32+VmcWRJ49R+ZiEMJCidlNzvoeSx0DNX2EpTK/Z Iyc+swlnSAqu/UQpDBUvXI6Kg+/0Q/unDAcqpMhu+frtz8jXYQjGoHbIINeqTC+coQcmkB 6HtEfwrnASTmc1PaAvVpfpVYMlKiFYFEkJbqCO3EmaIUvvzmaffwFnY07Ba5JnB8fQXS25 Yt9uJwVVQbMk5mFDxMM/qzuY613spxr9VLFa2PALRVoDa9DtO31fzdX53H8sL8cWLcIXDp IqgUtbR5jk6XuH2/6hx7V3W03ijbaLGaTxuW4LusRq+A26K7GtL43rzFuj5VQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753853; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2QtW98n5Rx0CbfsCu6rjDmKqk845YW5JWPIyw89SurQ=; b=Onk27OAhjl7jopqIgDrKSPztNslyx4xl9c9gtb9cAEpSMqgAqvizR3lUEgLRtXYWeA/1Uu 1aJrZloxSRY86XnfVkirtXs9qNHnfWL8+j9aWDNZc67h5fCyCFddgAGNN0gl0yeu8Y1vyW FFDy12O3LKU+OTMQMKIf7kNoO2gq1UfeXUn3VMqsKOXecfHwxHFwIMnqrOARj7l0KVE/Cg Q0iDYZypxjYx+dTqfKFRUV1v8GpE8EUzDTAS+/F0wUrIZZkuYmcXqwDSqPMOy38FG+ISsv uZHF7CfcO1z0StH24QGSL91T3qzBBjWlT7u+UqW8otbhX3yhzBJiVUgKStcgMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753853; a=rsa-sha256; cv=none; b=GjPRWWPjcudSQaSWUFmjrSJ9TmQjPymFvi//g9rQIcjg/89d+x66n4AGzqiFlhnxKp/yqR 2KYL/vKAranB4bxi0xWU1XIkcu6kb+o9Va39KskaMabTaQW9eiQYElOoz6FOtLfBXuUHqL KQQoWOOw1BAJtGQalXysy10jViqz1SJNtvEAo7Njh9Gnce97m6wZWqF1LuSvW6gVetVr4J B5cmPNbjvYYQmxFS5HA59m/yBD9d1d2MPFxTKBxpUJ+OiViZn9xY5QH+F0+nGFPTzd7Pru BRpJ/M8eWQzvUuTFoD80pBbWkK/3PU+Ust8aI7y85w+2ibfZ+Mg7XgviMmc2Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hC15N0JzYR4; Sat, 29 Apr 2023 07:37:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7bXXC064500; Sat, 29 Apr 2023 07:37:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bXKq064499; Sat, 29 Apr 2023 07:37:33 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:33 GMT Message-Id: <202304290737.33T7bXKq064499@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: d5ee36dbb272 - stable/12 - Suppress lld 16 errors about undefined symbols in version maps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: d5ee36dbb27222e9b3bd57c5ffc5cff5667c2e2e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ee36dbb27222e9b3bd57c5ffc5cff5667c2e2e commit d5ee36dbb27222e9b3bd57c5ffc5cff5667c2e2e Author: Dimitry Andric AuthorDate: 2023-04-17 16:00:20 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:24:32 +0000 Suppress lld 16 errors about undefined symbols in version maps lld >= 16 turned on --no-undefined-version by default, which results in errors whenever symbols are mentioned in version maps, but are not actually defined in the binary. Since we have quite a few instances of symbols that are defined or not, depending on various compile-time settings, suppress this lld check for the time being. MFC after: 1 week (cherry picked from commit 2ba84b4bcdd6012e8cfbf8a0d060a4438623a638) --- share/mk/bsd.lib.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 69b64200e47f..c472a4add8f6 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -223,6 +223,13 @@ SHLIB_NAME_FULL=${SHLIB_NAME} .if ${MK_SYMVER} == "yes" && !empty(VERSION_MAP) ${SHLIB_NAME_FULL}: ${VERSION_MAP} LDFLAGS+= -Wl,--version-script=${VERSION_MAP} + +# lld >= 16 turned on --no-undefined-version by default, but we have several +# symbols in our version maps that may or may not exist, depending on +# compile-time defines. +.if ${LINKER_TYPE} == "lld" && ${LINKER_VERSION} >= 160000 +LDFLAGS+= -Wl,--undefined-version +.endif .endif .if defined(LIB) && !empty(LIB) || defined(SHLIB_NAME) From nobody Sat Apr 29 07:37:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hC34df0z48d0n; Sat, 29 Apr 2023 07: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 4Q7hC33TsYz3JL5; Sat, 29 Apr 2023 07: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=1682753855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=44jAGlVxEc7GLF6GKwAVfhJv/or5dDBgF99ATPup1Sc=; b=BsEW1o4J1rK+lPCn4hu2nQJrl4Gy13YCSTPCSrIpWzFu/DTp2kymdQKayXLDM2yY+VZhhI Gnzd9CgGt3Ev0Z7Bt21/lTrF6h/PXbF6gjtnX8yAiNCdJIue9u8YYey3GSQK1O8a/NO6e+ Y4urgR0DxQPsNkYB7QH37SEvuoL50nF7XqZTWsJTsNZ/nXoEKFSDfVbK3/DOpkAHpOR/+O oufbCrzTg7rFXJ4WcQm4wlu5xpGkgbGExhtr09QEPesiEJm0hHQbv9SQMHaDScr3iAi9f7 4Ma9JfUO9siuETPNP8QFAFEtGs5MToIrPb41KE9MBOF/6UOFrcTi5vHatRGf0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753855; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=44jAGlVxEc7GLF6GKwAVfhJv/or5dDBgF99ATPup1Sc=; b=HrfIcJGH9IBqDA2llLU3qVQTUC/y+HbDIlDm9iecScP47Wqxw7hW0DJ+CJFSElC6oWWdZp 8fUdW/8ZU9/gEQWb4WLcfRMdm7DeY/b8daeaaZ9pIwR1mVg7HQXhEP2j/4BFKghmZqtmHK VhDYNWOGAfK1B1GufOWubkoEWoqh/Ch8tkTFoPEVLA7JdvoNP+mj1aeKWExwrQU3DdcHeV 0F36q0yWynPhYyn7TDr5+M5q1xswr84/mHbH4ZbZSCfXZNVMIejFv2cRG5LnptQlWH/pMN 3oH6ZQjyHlJBjau7cT+dHb9efzi1O4Cp42GpK8Rk+HmEo1wb0cGhq0q0QM/OKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753855; a=rsa-sha256; cv=none; b=i1JdE44YLTLMbCFuO7Dd0Zte+6YjbTHis9WM2C+H3CDkuelOrCHbslwU/KODAqJWUKaava +01idQ2gucTfKFlul1ohSxhZR7u9U2Sqr1TrG/UNR5mb6Sy/i8n0HXzcfBbcnRTrBkTHwq ws9HJldzackDPW1h9f5eXpU4iBuAaMraGGPEEfqJyY/nynmZiJ5d/5k9hafspy33wqGvQ3 GIe9CYaC5Hoe5DNULYNCJEHP12orwKAgNR3kfXixrLfShEq37TpQpVilbt3OjzTRytzwfU Xk+1+Yt7Bad42gnCrUSllQJmFDChmkMZAgEVcoVwcEnG4b/nVm+ltOmDZ7pRFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hC26pyfzYBG; Sat, 29 Apr 2023 07:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7bYJR064526; Sat, 29 Apr 2023 07:37:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bYb4064525; Sat, 29 Apr 2023 07:37:34 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:34 GMT Message-Id: <202304290737.33T7bYb4064525@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: 4e7487f388cd - stable/12 - Include bsd.linker.mk to get LINKER_TYPE and VERSION in rescue List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 4e7487f388cdb5dfbdd65dd4aad4ae457b7734c7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4e7487f388cdb5dfbdd65dd4aad4ae457b7734c7 commit 4e7487f388cdb5dfbdd65dd4aad4ae457b7734c7 Author: Dimitry Andric AuthorDate: 2023-04-17 17:43:29 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:24:37 +0000 Include bsd.linker.mk to get LINKER_TYPE and VERSION in rescue To be able to use these make variables, you also have to include bsd.linker.mk, apparently. Fixes: 458f4722bf97 MFC after: 1 week (cherry picked from commit 653e8c11f43dc6448b8560eb1f6679de2c47e1ed) --- rescue/rescue/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 4395aca895d1..17f34524f301 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -2,6 +2,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/2/93 .include +.include PACKAGE=rescue MAN= From nobody Sat Apr 29 07:37:35 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hC41vfbz48cZv; Sat, 29 Apr 2023 07: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 4Q7hC41QhSz3JLS; Sat, 29 Apr 2023 07: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=1682753856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ur04p+fQ0D2eg14Ky57MkkrN71uXwl60GWx/m1ffBqI=; b=v6zTtkG9T7xR0/bYy/P5RdXafLqOVyGuTPf69LbyGo66bNPNX06QfrF462SbpN9+z0I2Mu NzL3G/UTJy+McefB1vl+fUbzSxrkwpIOxf/T0vPPJ6QfCwFmy5ICfHC0kv+hQoFNQoe1TF /HS9spQqu30N7gFMadw09CLOiETAI5uvJOAmSDxCuk3z4rmYkU8v+IYQByKURPWW4FGVCy NRbADv39KC5zfuyfuWJFnpCbYSsAPWuiS/4E/mk1lJ7hlCDPocyn9osTDzh63hWqtqA04o B2QEI+/TAEtGgnS5MHyIPsngZY5/pzMitFCPt6BrUvDlmiSo6HP7nTFklR715w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ur04p+fQ0D2eg14Ky57MkkrN71uXwl60GWx/m1ffBqI=; b=doClwqBC4hxa+2BgbygACu210GZ3JfdIO1Po4zVH/wMQ+Bec2b+yGEmjY7OlTQtilWPXin OH0mZbXAmbdC3AcOcwI2S0c5NmozAMtV08jtz1DZMxCwLJ455vOfo+rcdu9l+IFMRvt7Ts JWvm1TaKJQcbZ8Dxhb3psKebDpttFIIpVW848EvLzDQjmu84V9S6OnocJ+6uXpiowSz2Ji DtSEMk2hlhyw8Bzyu+FQ+G+7mSjPdrmnGZt8e+woJAwCKYzSteQ7fJuJPS2N5R7u0LD+hz nikCh1Bd+fzbhLOvriT8mL66nsjYuY8XGUu8GPPY88/oVXWz9YwtAK3r8ns6Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753856; a=rsa-sha256; cv=none; b=O0tn9we7lJl7Pd0np4Ck+G074sdL2MVrSV1jhdn8ijgkrCpV/5SQdpxpxlvKTcTPT/LbjH BNWEtfcUJPXTMELj1KAF02PN/N2k4OyD1Pydj5QXV2VRM/XeCOO4kBUfYiMfeuD6qTZqJT rvkPvBxSBnoYWTqjVI2sDpOEyN15hgYVG9ZZKvTufdk0dzChs3wwt0jEJPgcinHSU8FLVL WpyBc0NVyTXRaFrVCNXB0dv7w+lJzeAw7YzFelXVcWRFP0YU41XymbEXGexqGGy5u/npos 15BaZ/RsQxPvp14k9GLRZJuULGXpBima0p6bWq7UJV5aTJ00V/S5cJeGgRqChg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hC40PdXzYR5; Sat, 29 Apr 2023 07:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7bZTF064550; Sat, 29 Apr 2023 07:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bZHx064549; Sat, 29 Apr 2023 07:37:35 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:35 GMT Message-Id: <202304290737.33T7bZHx064549@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: e9e1f2a88e4b - stable/12 - powerpc: fix a few pmap related functions to return correct types List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: e9e1f2a88e4bc6db9d6ecc3dcf95f29b4187e80e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e9e1f2a88e4bc6db9d6ecc3dcf95f29b4187e80e commit e9e1f2a88e4bc6db9d6ecc3dcf95f29b4187e80e Author: Dimitry Andric AuthorDate: 2023-04-23 13:22:44 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:35:10 +0000 powerpc: fix a few pmap related functions to return correct types While experimenting with changing boolean_t to another type, I noticed that several powerpc pmap related functions returned the wrong type: boolean_t instead of int. Fix several declarations and definitions to match the actual pmap function types: pmap_dev_direct_mapped_t and pmap_ts_referenced_t. MFC after: 3 days (cherry picked from commit d142601887524fc595ed0f5e6a69419727222f0a) --- sys/powerpc/aim/mmu_oea.c | 4 ++-- sys/powerpc/aim/mmu_oea64.c | 4 ++-- sys/powerpc/booke/pmap.c | 2 +- sys/powerpc/powerpc/pmap_dispatch.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index ea74879eba26..45c5af533926 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -314,7 +314,7 @@ vm_paddr_t moea_kextract(mmu_t, vm_offset_t); void moea_kenter_attr(mmu_t, vm_offset_t, vm_paddr_t, vm_memattr_t); void moea_kenter(mmu_t, vm_offset_t, vm_paddr_t); void moea_page_set_memattr(mmu_t mmu, vm_page_t m, vm_memattr_t ma); -boolean_t moea_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); +int moea_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); static void moea_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t); void moea_dumpsys_map(mmu_t mmu, vm_paddr_t pa, size_t sz, void **va); void moea_scan_init(mmu_t mmu); @@ -2613,7 +2613,7 @@ moea_bat_mapped(int idx, vm_paddr_t pa, vm_size_t size) return (0); } -boolean_t +int moea_dev_direct_mapped(mmu_t mmu, vm_paddr_t pa, vm_size_t size) { int i; diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index e19cac8f314f..0a54e400c941 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -278,7 +278,7 @@ vm_paddr_t moea64_kextract(mmu_t, vm_offset_t); void moea64_page_set_memattr(mmu_t, vm_page_t m, vm_memattr_t ma); void moea64_kenter_attr(mmu_t, vm_offset_t, vm_paddr_t, vm_memattr_t ma); void moea64_kenter(mmu_t, vm_offset_t, vm_paddr_t); -boolean_t moea64_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); +int moea64_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); static void moea64_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t); void moea64_dumpsys_map(mmu_t mmu, vm_paddr_t pa, size_t sz, void **va); @@ -2722,7 +2722,7 @@ moea64_clear_bit(mmu_t mmu, vm_page_t m, u_int64_t ptebit) return (count); } -boolean_t +int moea64_dev_direct_mapped(mmu_t mmu, vm_paddr_t pa, vm_size_t size) { struct pvo_entry *pvo, key; diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index f73c0207027e..79e774b33bf4 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -375,7 +375,7 @@ static vm_paddr_t mmu_booke_kextract(mmu_t, vm_offset_t); static void mmu_booke_kenter(mmu_t, vm_offset_t, vm_paddr_t); static void mmu_booke_kenter_attr(mmu_t, vm_offset_t, vm_paddr_t, vm_memattr_t); static void mmu_booke_kremove(mmu_t, vm_offset_t); -static boolean_t mmu_booke_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); +static int mmu_booke_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t); static void mmu_booke_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t); static void mmu_booke_dumpsys_map(mmu_t, vm_paddr_t pa, size_t, diff --git a/sys/powerpc/powerpc/pmap_dispatch.c b/sys/powerpc/powerpc/pmap_dispatch.c index 3cfa741d2ddb..424162a50444 100644 --- a/sys/powerpc/powerpc/pmap_dispatch.c +++ b/sys/powerpc/powerpc/pmap_dispatch.c @@ -528,7 +528,7 @@ pmap_decode_kernel_ptr(vm_offset_t addr, int *is_user, vm_offset_t *decoded) return (MMU_DECODE_KERNEL_PTR(mmu_obj, addr, is_user, decoded)); } -boolean_t +int pmap_dev_direct_mapped(vm_paddr_t pa, vm_size_t size) { From nobody Sat Apr 29 07:37:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hC55l76z48cv5; Sat, 29 Apr 2023 07:37: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 4Q7hC52YYLz3JNm; Sat, 29 Apr 2023 07:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbSQ1T+8BZdY2VZtg0xDE+/1h6ogF/tj/YmmwNFeyhk=; b=MijvTM1Mt1Y+gFD8vlqw0ssSveQO2LuWtzYzddoVHEFmopzVoG7bUYyQh/Dcx72JTZZfbW nQKkmEgSuxK7X8GbklWCSrUPGxfftf+iOqw7/7hJ+vZzHXAb9ZKCCZ96F8remlaY+/wNkM mAYqkT2ofhubwLzglxwJh1Cz7sbdkw6ltu0tuB4mUTKDC3kCzDkHGazDNbw1UOL7BrB8oi u/GiiFFWVW1xgMJrCH8OCS+EBga7pyULHchGmbMGLI3R23OWOGJwKXaV4/T7CyDlRLSVVd crUaFyEvCiF7116MP13T/alJuWdKEdJ1brgf1MfjH5troXD9I8Lx1CeNUyOf2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753857; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VbSQ1T+8BZdY2VZtg0xDE+/1h6ogF/tj/YmmwNFeyhk=; b=c4maRcgG9muouYkM8FbKBjiM1kqvjkvWeCJeT7uDso6T6fwM4bGauJxCxUcETMLeoYDioh GVwbZTnlu1OBtZ7mrkblhlogD1lumJwrl5BxH8iySIeKXeQ3oGVgNXlJuCPe07aZRjL8iX F9FThZPiqsuoBJtld0H9wOCU2YwfZiXD0zFlaIrZG0ZTDzRaxkwdkkjgmUoI+SpfVeAkDC pxUpz6uZYNlkEmJPYl6KVUtS1Rbf5MfkDXidAbkL3vul5crYkyc5arRbfYn8BfamMx1+/x jFNYYr1t6/bwPrm7nIRtnIzKOuPttAZWg/ubZv0NP8fOrGG075VOnIHLuqGnAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753857; a=rsa-sha256; cv=none; b=fuPZj7Th9Pg9s6yXQsD3hAD+ege4f7WRBg1sZD90NFZ7EXJ8EygxIp2GcY0oOyy/602J6j z9BgNOV4XgjeRDo+TFdMmK/iwVCG2KvfjPqaBHM9oDhb/lwSgvlOPb0bFkMWcB35QSbL22 5NwLNd+BnD15jeNv9bWJReh8tD6IRBugWt/fJKsbf8xgEiASo7sKByVWxBQvND+T9k9M0A EpHfb8cQdNmU6VMNIaJtcuuxk5uKbs4lpK/HlprNmZr+BHaSrI4H5rpTvMNey0+cuqS0hT hohX4dbhmOu9htUfmXnQ8hcAOWv0R7+NfRPK+cqZ80pqQXJVNByE3iSGHuevuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hC511gwzYBH; Sat, 29 Apr 2023 07:37:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7bblp064571; Sat, 29 Apr 2023 07:37:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bb8V064570; Sat, 29 Apr 2023 07:37:37 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:37 GMT Message-Id: <202304290737.33T7bb8V064570@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: 821e1767aa38 - stable/12 - Use bool for one-bit wide bit-fields List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 821e1767aa382faa1e78c16072b75bd323be405e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=821e1767aa382faa1e78c16072b75bd323be405e commit 821e1767aa382faa1e78c16072b75bd323be405e Author: Dimitry Andric AuthorDate: 2023-04-25 17:18:58 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:35:33 +0000 Use bool for one-bit wide bit-fields A signed one-bit wide bit-field can take only the values 0 and -1. Clang 16 introduced a warning that "implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1". Fix the warnings by using C99 bool. Reported by: Clang 16 Reviewed by: emaste, jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39705 (cherry picked from commit bab8274c090942cf96c44bc001307b9bffac9d7e) --- sys/dev/acpica/acpi_pci_link.c | 28 ++++++++++++++-------------- sys/dev/acpica/acpi_pxm.c | 4 ++-- sys/dev/otus/if_otusreg.h | 2 +- sys/dev/puc/puc.c | 2 +- sys/dev/puc/puc_bfe.h | 8 ++++---- sys/dev/quicc/quicc_bfe.h | 4 ++-- sys/dev/scc/scc_bfe.h | 20 ++++++++++---------- sys/dev/uart/uart_bus.h | 20 ++++++++++---------- sys/dev/wpi/if_wpivar.h | 2 +- sys/x86/include/x86_smp.h | 8 ++++---- 10 files changed, 49 insertions(+), 49 deletions(-) diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c index 79802e7716b2..04fb494eabfe 100644 --- a/sys/dev/acpica/acpi_pci_link.c +++ b/sys/dev/acpica/acpi_pci_link.c @@ -104,8 +104,8 @@ struct link { int l_num_irqs; int *l_irqs; int l_references; - int l_routed:1; - int l_isa_irq:1; + bool l_routed:1; + bool l_isa_irq:1; ACPI_RESOURCE l_prs_template; }; @@ -352,18 +352,18 @@ link_add_prs(ACPI_RESOURCE *res, void *context) * valid IRQs are ISA IRQs, then mark this link as * routed via an ISA interrupt. */ - link->l_isa_irq = TRUE; + link->l_isa_irq = true; link->l_irqs = malloc(sizeof(int) * link->l_num_irqs, M_PCI_LINK, M_WAITOK | M_ZERO); for (i = 0; i < link->l_num_irqs; i++) { if (is_ext_irq) { link->l_irqs[i] = ext_irqs[i]; if (ext_irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = FALSE; + link->l_isa_irq = false; } else { link->l_irqs[i] = irqs[i]; if (irqs[i] >= NUM_ISA_INTERRUPTS) - link->l_isa_irq = FALSE; + link->l_isa_irq = false; } } @@ -373,7 +373,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) */ if (!req->sc->pl_crs_bad && !link->l_isa_irq && link->l_crs_type == ACPI_RESOURCE_TYPE_IRQ) - req->sc->pl_crs_bad = TRUE; + req->sc->pl_crs_bad = true; break; default: if (req->in_dpf == DPF_IGNORE) @@ -387,7 +387,7 @@ link_add_prs(ACPI_RESOURCE *res, void *context) return (AE_OK); } -static int +static bool link_valid_irq(struct link *link, int irq) { int i; @@ -396,12 +396,12 @@ link_valid_irq(struct link *link, int irq) /* Invalid interrupts are never valid. */ if (!PCI_INTERRUPT_VALID(irq)) - return (FALSE); + return (false); /* Any interrupt in the list of possible interrupts is valid. */ for (i = 0; i < link->l_num_irqs; i++) if (link->l_irqs[i] == irq) - return (TRUE); + return (true); /* * For links routed via an ISA interrupt, if the SCI is routed via @@ -409,10 +409,10 @@ link_valid_irq(struct link *link, int irq) */ if (link->l_isa_irq && AcpiGbl_FADT.SciInterrupt == irq && irq < NUM_ISA_INTERRUPTS) - return (TRUE); + return (true); /* If the interrupt wasn't found in the list it is not valid. */ - return (FALSE); + return (false); } static void @@ -490,7 +490,7 @@ acpi_pci_link_attach(device_t dev) sc->pl_links[i].l_irq = PCI_INVALID_IRQ; sc->pl_links[i].l_bios_irq = PCI_INVALID_IRQ; sc->pl_links[i].l_sc = sc; - sc->pl_links[i].l_isa_irq = FALSE; + sc->pl_links[i].l_isa_irq = false; sc->pl_links[i].l_res_index = -1; } @@ -555,7 +555,7 @@ acpi_pci_link_attach(device_t dev) else for (i = 0; i < sc->pl_num_links; i++) if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq)) - sc->pl_links[i].l_routed = TRUE; + sc->pl_links[i].l_routed = true; if (bootverbose) acpi_pci_link_dump(sc, 0, "After Disable"); ACPI_SERIAL_END(pci_link); @@ -904,7 +904,7 @@ acpi_pci_link_route_irqs(device_t dev) */ if (!link->l_routed && PCI_INTERRUPT_VALID(link->l_irq)) { - link->l_routed = TRUE; + link->l_routed = true; acpi_config_intr(dev, resource); pci_link_interrupt_weights[link->l_irq] += link->l_references; diff --git a/sys/dev/acpica/acpi_pxm.c b/sys/dev/acpica/acpi_pxm.c index 808886d744f0..18a21ee6b0f8 100644 --- a/sys/dev/acpica/acpi_pxm.c +++ b/sys/dev/acpica/acpi_pxm.c @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #if MAXMEMDOM > 1 static struct cpu_info { - int enabled:1; - int has_memory:1; + bool enabled:1; + bool has_memory:1; int domain; int id; } *cpus; diff --git a/sys/dev/otus/if_otusreg.h b/sys/dev/otus/if_otusreg.h index 190bf19eb2ae..4bccc85b2168 100644 --- a/sys/dev/otus/if_otusreg.h +++ b/sys/dev/otus/if_otusreg.h @@ -1020,7 +1020,7 @@ struct otus_softc { uint8_t capflags; uint8_t rxmask; uint8_t txmask; - int sc_running:1, + bool sc_running:1, sc_calibrating:1, sc_scanning:1; diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c index f45493145be9..109411f020b1 100644 --- a/sys/dev/puc/puc.c +++ b/sys/dev/puc/puc.c @@ -60,7 +60,7 @@ struct puc_port { int p_type; int p_rclk; - int p_hasintr:1; + bool p_hasintr:1; serdev_intr_t *p_ihsrc[PUC_ISRCCNT]; void *p_iharg; diff --git a/sys/dev/puc/puc_bfe.h b/sys/dev/puc/puc_bfe.h index 68678d3771e1..692a7f009019 100644 --- a/sys/dev/puc/puc_bfe.h +++ b/sys/dev/puc/puc_bfe.h @@ -65,10 +65,10 @@ struct puc_softc { int sc_nports; struct puc_port *sc_port; - int sc_fastintr:1; - int sc_leaving:1; - int sc_polled:1; - int sc_msi:1; + bool sc_fastintr:1; + bool sc_leaving:1; + bool sc_polled:1; + bool sc_msi:1; int sc_ilr; diff --git a/sys/dev/quicc/quicc_bfe.h b/sys/dev/quicc/quicc_bfe.h index ea791bc277e3..994d9f62ca10 100644 --- a/sys/dev/quicc/quicc_bfe.h +++ b/sys/dev/quicc/quicc_bfe.h @@ -51,8 +51,8 @@ struct quicc_softc { u_int sc_clock; - int sc_fastintr:1; - int sc_polled:1; + bool sc_fastintr:1; + bool sc_polled:1; }; extern devclass_t quicc_devclass; diff --git a/sys/dev/scc/scc_bfe.h b/sys/dev/scc/scc_bfe.h index d6ddd6775a3c..0ee508caaa12 100644 --- a/sys/dev/scc/scc_bfe.h +++ b/sys/dev/scc/scc_bfe.h @@ -72,11 +72,11 @@ struct scc_mode { device_t m_dev; u_int m_mode; - int m_attached:1; - int m_fastintr:1; - int m_hasintr:1; - int m_probed:1; - int m_sysdev:1; + bool m_attached:1; + bool m_fastintr:1; + bool m_hasintr:1; + bool m_probed:1; + bool m_sysdev:1; driver_filter_t *ih; serdev_intr_t *ih_src[SCC_ISRCCNT]; @@ -94,8 +94,8 @@ struct scc_chan { struct scc_mode ch_mode[SCC_NMODES]; u_int ch_nr; - int ch_enabled:1; - int ch_sysdev:1; + bool ch_enabled:1; + bool ch_sysdev:1; uint32_t ch_ipend; uint32_t ch_hwsig; @@ -130,9 +130,9 @@ struct scc_softc { struct scc_chan *sc_chan; - int sc_fastintr:1; - int sc_leaving:1; - int sc_polled:1; + bool sc_fastintr:1; + bool sc_leaving:1; + bool sc_polled:1; uint32_t sc_hwsig; /* Signal state. Used by HW driver. */ }; diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h index 5da3cecccf85..2c1918c580e9 100644 --- a/sys/dev/uart/uart_bus.h +++ b/sys/dev/uart/uart_bus.h @@ -89,16 +89,16 @@ struct uart_softc { int sc_irid; struct callout sc_timer; - int sc_callout:1; /* This UART is opened for callout. */ - int sc_fastintr:1; /* This UART uses fast interrupts. */ - int sc_hwiflow:1; /* This UART has HW input flow ctl. */ - int sc_hwoflow:1; /* This UART has HW output flow ctl. */ - int sc_leaving:1; /* This UART is going away. */ - int sc_opened:1; /* This UART is open for business. */ - int sc_polled:1; /* This UART has no interrupts. */ - int sc_txbusy:1; /* This UART is transmitting. */ - int sc_isquelch:1; /* This UART has input squelched. */ - int sc_testintr:1; /* This UART is under int. testing. */ + bool sc_callout:1; /* This UART is opened for callout. */ + bool sc_fastintr:1; /* This UART uses fast interrupts. */ + bool sc_hwiflow:1; /* This UART has HW input flow ctl. */ + bool sc_hwoflow:1; /* This UART has HW output flow ctl. */ + bool sc_leaving:1; /* This UART is going away. */ + bool sc_opened:1; /* This UART is open for business. */ + bool sc_polled:1; /* This UART has no interrupts. */ + bool sc_txbusy:1; /* This UART is transmitting. */ + bool sc_isquelch:1; /* This UART has input squelched. */ + bool sc_testintr:1; /* This UART is under int. testing. */ struct uart_devinfo *sc_sysdev; /* System device (or NULL). */ diff --git a/sys/dev/wpi/if_wpivar.h b/sys/dev/wpi/if_wpivar.h index 422dc34d65b8..81fdeced248a 100644 --- a/sys/dev/wpi/if_wpivar.h +++ b/sys/dev/wpi/if_wpivar.h @@ -77,7 +77,7 @@ struct wpi_tx_ring { uint8_t cur; uint8_t pending; int16_t queued; - int update:1; + bool update:1; }; struct wpi_rx_data { diff --git a/sys/x86/include/x86_smp.h b/sys/x86/include/x86_smp.h index 9bb05d9038ab..d02c73594d6d 100644 --- a/sys/x86/include/x86_smp.h +++ b/sys/x86/include/x86_smp.h @@ -54,10 +54,10 @@ extern int nmi_kdb_lock; extern int nmi_is_broadcast; struct cpu_info { - int cpu_present:1; - int cpu_bsp:1; - int cpu_disabled:1; - int cpu_hyperthread:1; + bool cpu_present:1; + bool cpu_bsp:1; + bool cpu_disabled:1; + bool cpu_hyperthread:1; }; extern struct cpu_info *cpu_info; From nobody Sat Apr 29 07:37:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7hC63vwgz48d33; Sat, 29 Apr 2023 07: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 4Q7hC63Fpdz3JPb; Sat, 29 Apr 2023 07: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=1682753858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPFarQzLqsFX29Q9hrKXD1RkWJRuQBMekZw9GBPgxKI=; b=KwSh6NtLRSddwXhNuyB7D2LDMUiVltrLvX/SnodVCawgYi8pgqKs2cB1JP+9XD3SU8K75V 93I5xmHkjNWFFzzZuEDcpmSVgJ0XnmDek/7qpoRxmfLPCOT+iqPkPB97NW6VQo00QZPUZm qXVoCEuK6SB8BaFIwlvEXioCIc4r9OvxOc/2XYfs66v9nLrRC/KFkm+33hB4MyUFxFyGXt 4RkBdCYDp24Ya6CxzI7UsOzI72I/6YAu6KcGlVs6+BntUGOHFO8APkg88Pizvxz/ysjL+p EtgkiXUQ2RmIZduS034IUf3yCSUlZ9v57IapOKfLUzWlV5iO3CRjcXDgOBP80A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682753858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KPFarQzLqsFX29Q9hrKXD1RkWJRuQBMekZw9GBPgxKI=; b=QnYi4U0oMgioxDs1+zpFw8g7hB8rU87tW7jqYV+tYuarMPeNyNrw86n4sQyGjUXZXM2V1N e6UarPSeEwr8SNmGqKBaaFkGr9UT5BB/QHfhwcFF+PrNu7Bw9M+JeKerhKeP/dxmG+tr3X 0ztJSnKZ1y/osDYox2BB/H6kenycDaxpf/bs/rI/sOTSGDQK7wRmMtmhSAwEFVEAKPNgw5 0bVx7icGcugMZnDPivPvy+CthmOcR5nviikj3UNVSGdhcbwQoJJ9f6+6aYQQKX7+Te9/Wc Msmf5MsQasTqDkt8EpkZ8zvtQn6fIzjeTP0YVsiBhKtHO4UvO6+0HzRyjVi1aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682753858; a=rsa-sha256; cv=none; b=lRp1zKwPTJhn3sF3J95OImYiA218L9Q9CNGr+5RulJHm+pV9miXyKDz1/UVotWW2TJz4L+ bzzj3xeOU/2G5aE5/76gZZJi7vEGSAq4URH5BVeQlyQofg8VOpzYXKzrQSHln3kSZwOB3R pWCJu9S/G1fJM+S2t4ZgedPGlDvoy7OYrLwjQPAeyr+RlkXDBiO/vCt0J0POxDaDh51W+t vGZlLXAo4/GhDaWoIhthoHIw7wQe6zTb4AuFvI+YnUA3xeT/Yft665dOBU3I76LgD1w/0d /D6Le3vTgu8To1jQASNWZL0Xw62xb1cKE0nJe1nNBwt4Wtftj7HRtSPA95tfsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7hC62FvnzYbF; Sat, 29 Apr 2023 07:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33T7bc5p064592; Sat, 29 Apr 2023 07:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33T7bcvu064591; Sat, 29 Apr 2023 07:37:38 GMT (envelope-from git) Date: Sat, 29 Apr 2023 07:37:38 GMT Message-Id: <202304290737.33T7bcvu064591@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: aee90183065e - stable/12 - al_eth: make function definitions consistent with declarations List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: aee90183065e0e99d9a705b2800e9267dbb6c885 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=aee90183065e0e99d9a705b2800e9267dbb6c885 commit aee90183065e0e99d9a705b2800e9267dbb6c885 Author: Dimitry Andric AuthorDate: 2023-04-22 11:45:57 +0000 Commit: Dimitry Andric CommitDate: 2023-04-29 07:35:40 +0000 al_eth: make function definitions consistent with declarations The declarations for al_eth_lm_retimer_ds25_signal_detect() and al_eth_lm_retimer_ds25_cdr_lock() say that these functions return 'al_bool', but the definitions actually return 'boolean_t'. Make the definitions match the declarations. Reviewed by: jhb, emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39759 (cherry picked from commit 9ea31d78f00d23612f3ab44d83265f8039f487af) --- sys/dev/al_eth/al_init_eth_lm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/al_eth/al_init_eth_lm.c b/sys/dev/al_eth/al_init_eth_lm.c index 96da4bb34d96..7f2553651e3e 100644 --- a/sys/dev/al_eth/al_init_eth_lm.c +++ b/sys/dev/al_eth/al_init_eth_lm.c @@ -849,7 +849,7 @@ config_error: return rc; } -static boolean_t al_eth_lm_retimer_ds25_signal_detect(struct al_eth_lm_context *lm_context, +static al_bool al_eth_lm_retimer_ds25_signal_detect(struct al_eth_lm_context *lm_context, uint32_t channel) { int rc = 0; @@ -879,7 +879,7 @@ config_error: return FALSE; } -static boolean_t al_eth_lm_retimer_ds25_cdr_lock(struct al_eth_lm_context *lm_context, +static al_bool al_eth_lm_retimer_ds25_cdr_lock(struct al_eth_lm_context *lm_context, uint32_t channel) { int rc = 0; From nobody Sat Apr 29 17:36:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7xVK4x7Fz48337; Sat, 29 Apr 2023 17:36:41 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (turbocat.net [88.99.82.50]) (using TLSv1.3 with cipher TLS_AES_256_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 4Q7xVJ5Fcrz3CTB; Sat, 29 Apr 2023 17:36:40 +0000 (UTC) (envelope-from hps@selasky.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of hps@selasky.org designates 88.99.82.50 as permitted sender) smtp.mailfrom=hps@selasky.org; dmarc=none Received: from [10.36.2.154] (unknown [46.212.121.255]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 468D4260DAB; Sat, 29 Apr 2023 19:36:39 +0200 (CEST) Content-Type: multipart/mixed; boundary="------------FjPEi1r80DdSRA60J4gSGdW3" Message-ID: <44b1072c-c4ac-ad2f-1475-4904312ef860@selasky.org> Date: Sat, 29 Apr 2023 19:36:38 +0200 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Content-Language: en-US To: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , dev-commits-src-branches@freebsd.org From: Hans Petter Selasky Subject: stable/13 - planned merge from main - USB and mlx5 related X-Spamd-Result: default: False [-3.15 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.995]; NEURAL_HAM_MEDIUM(-0.96)[-0.956]; R_SPF_ALLOW(-0.20)[+a:mail.turbocat.net:c]; MIME_BASE64_TEXT(0.10)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain]; ASN(0.00)[asn:24940, ipnet:88.99.0.0/16, country:DE]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-branches@freebsd.org]; ARC_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DMARC_NA(0.00)[selasky.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; HAS_ATTACHMENT(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Rspamd-Queue-Id: 4Q7xVJ5Fcrz3CTB X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N This is a multi-part message in MIME format. --------------FjPEi1r80DdSRA60J4gSGdW3 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi, Heads up: I'm planning to 38 patches from main to stable/13 around 08:00 CEST 30th of April 2023. If there is any breakage I plan to be available from 12:30 CEST and on to catch that. Hopefully everything will be smooth, but just in case. I'm currently doing a universe build for stable/13 . See attachment. If you see anything which shouldn't be there let me know by tomorrow! Thank you! --HPS --------------FjPEi1r80DdSRA60J4gSGdW3 Content-Type: text/plain; charset=UTF-8; name="patches.txt" Content-Disposition: attachment; filename="patches.txt" Content-Transfer-Encoding: base64 Y29tbWl0IDVkZjNiOTYyZmI3ZTc0ODBmM2Y2NjZhYmI1OTkzOWUxZmI0YWUwYjcKQXV0aG9y OiBFbGxpb3R0IE1pdGNoZWxsIDxlaGVtK2ZyZWVic2RAbTVwLmNvbT4KRGF0ZTogICBXZWQg SnVuIDIyIDE3OjUzOjQ3IDIwMjIgLTA3MDAKCiAgICBtbHg0OiBwdXJnZSBFT0wgcmVsZWFz ZSBjb21wYXRpYmlsaXR5CiAgICAKICAgIFJlbW92ZSBGcmVlQlNEIDEwIHN1cHBvcnQgY29k ZS4KICAgIAogICAgUmV2aWV3ZWQgYnk6IGltcAogICAgUHVsbCBSZXF1ZXN0OiBodHRwczov L2dpdGh1Yi5jb20vZnJlZWJzZC9mcmVlYnNkLXNyYy9wdWxsLzYwMwogICAgRGlmZmVyZW50 aWFsIFJldmlzaW9uOiBodHRwczovL3Jldmlld3MuZnJlZWJzZC5vcmcvRDM1NTYwCiAgICAK ICAgIChjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IDAyNmJhYmQ0MjdlNjUxMWU1MzQ3ODgx NGNlMGFhMWNjM2Y3YTk5ODgpCgpjb21taXQgNjZjM2RjZjhhZWM3NDQ2MjZjMDY1ZDQ2ZTA2 OTQ5MGY1NWNiYjlmMApBdXRob3I6IEhhbnMgUGV0dGVyIFNlbGFza3kgPGhzZWxhc2t5QEZy ZWVCU0Qub3JnPgpEYXRlOiAgIFdlZCBBcHIgMTkgMTI6MjI6MTEgMjAyMyArMDIwMAoKICAg IGxpYmM6IEFkZCBtaXNzaW5nIG9iamVjdCBzaXplIGNoZWNrIHRvIHFzb3J0X3MoMykKICAg IAogICAgV2hlbiBzb3J0aW5nLCBib3RoIHRoZSBDMTEgc3RhbmRhcmQgKElTTy9JRUMgOTg5 OToyMDExLCBLLjMuNi4zLjIpIGFuZAogICAgdGhlIElTTy9JRUMgSlRDMSBTQzIyIFdHMTQg TjExNzIgc3RhbmRhcmQsIGRvZXMgbm90IGRlZmluZSBvYmplY3RzIG9mCiAgICB6ZXJvIHNp emUgYXMgdW5kZWZpbmVkIGJlaGF2aW91ci4gSG93ZXZlciBNaWNyb3NvZnQncyBjcHAtZG9j cyBkb2VzLgogICAgCiAgICBBZGQgcHJvcGVyIGNoZWNrcyBmb3IgdGhpcy4gRm91bmQgd2hp bGUgd29ya2luZyBvbiBic29ydCgzKS4KICAgIAogICAgUmV2aWV3ZWQgYnk6ICAgIGtpYkAg YW5kIGVtYXN0ZUAKICAgIFNwb25zb3JlZCBieTogICBOVklESUEgTmV0d29ya2luZwogICAg RGlmZmVyZW50aWFsIFJldmlzaW9uOiAgaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3JnL0Qz OTY4NwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCAyN2JiMGQzMzdjMGQ4 MmExYTRmMzEwMzE1ODQwMjM2ZWIyMzk5NjNjKQoKY29tbWl0IDk5NzE4NDQ2NGI1NDIzMmJj ZTQyY2ZlYTJhMzcyOGJiMGE5ZDUyOGQKQXV0aG9yOiBIYW5zIFBldHRlciBTZWxhc2t5IDxo c2VsYXNreUBGcmVlQlNELm9yZz4KRGF0ZTogICBXZWQgQXByIDE5IDEyOjE4OjU2IDIwMjMg KzAyMDAKCiAgICBsaWJjOiBTb3J0aW5nIGlzIG5vdCBuZWVkZWQgd2hlbiB0aGVyZSBhcmUg bGVzcyB0aGFuIHR3byBlbGVtZW50cwogICAgCiAgICBJZiB0aGVyZSBhcmUgbGVzcyB0aGFu IHR3byBlbGVtZW50cyBhdm9pZCBleGVjdXRpbmcgdGhlIGZpcnN0CiAgICBzb3J0aW5nIGxv b3AuIE5vIGZ1bmN0aW9uYWwgY2hhbmdlIGludGVuZGVkLgogICAgCiAgICBSZXZpZXdlZCBi eTogICAga2liQAogICAgU3BvbnNvcmVkIGJ5OiAgIE5WSURJQSBOZXR3b3JraW5nCiAgICBE aWZmZXJlbnRpYWwgUmV2aXNpb246ICBodHRwczovL3Jldmlld3MuZnJlZWJzZC5vcmcvRDM5 NjkxCiAgICAKICAgIChjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IGVjYjJjZTNhNTFlOWIw OWE1N2NkNDIyNjJmYzc5OGFlMDg5YzA3NTgpCgpjb21taXQgY2MxNjlhNzNmMTdkZmY5MWIw YzZjM2Y2MjQxMjJjMWY3NWNmZGY1ZgpBdXRob3I6IEhhbnMgUGV0dGVyIFNlbGFza3kgPGhz ZWxhc2t5QEZyZWVCU0Qub3JnPgpEYXRlOiAgIFR1ZSBBcHIgMTggMTM6NDA6MjIgMjAyMyAr MDIwMAoKICAgIG1seDU6IFJlbW92ZSB1bnVzZWQgZGVidWdmcyBub2RlIHBvaW50ZXJzLgog ICAgCiAgICBObyBmdW5jdGlvbmFsIGNoYW5nZSBpbnRlbmRlZC4KICAgIAogICAgU3BvbnNv cmVkIGJ5OiAgIE5WSURJQSBOZXR3b3JraW5nCiAgICAKICAgIChjaGVycnkgcGlja2VkIGZy b20gY29tbWl0IDgwYjRlZjZkMTA1NDRkMzBiNmNmZWRkY2ExMmFlMjhkODE4MTYyMDEpCgpj b21taXQgNWY4NjZmZTRiOWVkMmQ0MzlkZTFkYzAxMTZmYTZjNGFlNzhkMTkyZQpBdXRob3I6 IEhhbnMgUGV0dGVyIFNlbGFza3kgPGhzZWxhc2t5QEZyZWVCU0Qub3JnPgpEYXRlOiAgIFR1 ZSBBcHIgMTggMTM6MjI6NDEgMjAyMyArMDIwMAoKICAgIG1seDU6IERvbid0IGdpdmUgemVy byBudW1iZXIgb2YgcGFnZXMgdG8gdGhlIGZpcm13YXJlLgogICAgCiAgICBDYW4gaGFwcGVu IHdoZW4gdXNpbmcgdmlydHVhbCBtbHg1X2NvcmU8Tj4gZnVuY3Rpb25zLCBWRnMuCiAgICAK ICAgIFNwb25zb3JlZCBieTogICBOVklESUEgTmV0d29ya2luZwogICAgCiAgICAoY2hlcnJ5 IHBpY2tlZCBmcm9tIGNvbW1pdCA5NWJmNzBhNGJmNzk4MjA5MWJiNTkyMDBiYzJkYjJjYjVj ZDg0MGQ3KQoKY29tbWl0IDA5ZGI3YTk5ODk0YjU4NGIzNjBlOTQ2NDA2ZjY1ZDIyY2VjNGMx YjQKQXV0aG9yOiBIYW5zIFBldHRlciBTZWxhc2t5IDxoc2VsYXNreUBGcmVlQlNELm9yZz4K RGF0ZTogICBUdWUgQXByIDE4IDEzOjIxOjI4IDIwMjMgKzAyMDAKCiAgICBtbHg1OiBJbXBs ZW1lbnQgbWx4NV9jb3JlX21vZGlmeV9jcV9ieV9tYXNrKCkuCiAgICAKICAgIEltcGxlbWVu dCBvbmUgQ1EgbW9kaWZ5IGZ1bmN0aW9uIHN1cHBvcnRpbmcgYWxsIGZpcm13YXJlIHZlcnNp b25zLAogICAgaW5zdGVhZCBvZiBoYXZpbmcgbW9yZSB2YXJpYW50cyBvZiBDUSBtb2RpZnku CiAgICAKICAgIFNwb25zb3JlZCBieTogICBOVklESUEgTmV0d29ya2luZwogICAgCiAgICAo Y2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCAyNzNiZmFjMDhmZjgzODc4NmM4YjQ4YmM3ZDNk NzE4MGI1ZjZhM2JlKQoKY29tbWl0IDU4NjhhMDgxOTE2ODY5YzM5ODFhZDJhYTYxMThlNDcy MWViZmNkMWEKQXV0aG9yOiBIYW5zIFBldHRlciBTZWxhc2t5IDxoc2VsYXNreUBGcmVlQlNE Lm9yZz4KRGF0ZTogICBUdWUgQXByIDE4IDEzOjExOjAyIDIwMjMgKzAyMDAKCiAgICBtbHg1 OiBNYWtlIE1MWDVfQ09NUF9FUV9TSVpFIHR1bmFibGUuCiAgICAKICAgIFdoZW4gdXNpbmcg aGFyZHdhcmUgcGFjaW5nLCB0aGlzIHZhbHVlIGNhbiBiZSBpbmNyZWFzZWQsIGJlY2F1c2Ug bW9yZSBTUSdzCiAgICBtZWFucyBtb3JlIEVRIGV2ZW50cyBhc3dlbGwuIE1ha2UgaXQgdHVu YWJsZSwgaHcubWx4NS5jb21wX2VxX3NpemUgLgogICAgCiAgICBTcG9uc29yZWQgYnk6ICAg TlZJRElBIE5ldHdvcmtpbmcKICAgIAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQg M2JiM2U0NzY4ZmY4NTRiODhiYTBhN2QxMjllZGFkNDlmMTVkN2NlMykKCmNvbW1pdCA4YzVh ZTAyODc2ZGZjMjkyYzIwYTlkOWJlMWIxZjc2YTA5ZTliN2IyCkF1dGhvcjogSGFucyBQZXR0 ZXIgU2VsYXNreSA8aHNlbGFza3lARnJlZUJTRC5vcmc+CkRhdGU6ICAgVHVlIEFwciAxOCAx MzoxNzozOCAyMDIzICswMjAwCgogICAgbWx4NTogRml4IGR1cGxpY2F0ZSBmcmVlIG9mIGRl ZmF1bHQgZmxvdyBydWxlIGluIGVycm9yIGNhc2UuCiAgICAKICAgIFNwb25zb3JlZCBieTog ICBOVklESUEgTmV0d29ya2luZwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1p dCAyZjdlOWE4YTIxMzY3MzkzYjYxM2YwZjE1MGQ0OTAwOWZhNzRkZDVjKQoKY29tbWl0IDgz ZGE3YTIyMzg0OThhODk3NjNjMzY5ZGZjZmViYzNkZjVjOTcxYmMKQXV0aG9yOiBIYW5zIFBl dHRlciBTZWxhc2t5IDxoc2VsYXNreUBGcmVlQlNELm9yZz4KRGF0ZTogICBUdWUgQXByIDE4 IDEzOjE2OjE2IDIwMjMgKzAyMDAKCiAgICBtbHg1OiBNYWtlIG1seDVfZGVsX2Zsb3dfcnVs ZSgpIE5VTEwgc2FmZS4KICAgIAogICAgVGhpcyBjaGFuZ2UgZmFjdG9ycyBvdXQgcmVwZWF0 ZWQgTlVMTCBjaGVja3MuCiAgICAKICAgIE5vIGZ1bmN0aW9uYWwgY2hhbmdlIGludGVuZGVk LgogICAgCiAgICBTcG9uc29yZWQgYnk6ICAgTlZJRElBIE5ldHdvcmtpbmcKICAgIAogICAg KGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgYjBiODdkOTE1MTQ1NmU3MWZkNmExNDczNmUx MzJkNjcxMTRkYjRhYSkKCmNvbW1pdCBkZmRiZDJmNjZhZDA2MzUzYjk4ZjFkNTMxYzA3ODRi OTViNWZjZGIxCkF1dGhvcjogSGFucyBQZXR0ZXIgU2VsYXNreSA8aHNlbGFza3lARnJlZUJT RC5vcmc+CkRhdGU6ICAgVHVlIEFwciAxOCAxMzo0MjoxNyAyMDIzICswMjAwCgogICAgbWx4 NWVuKDQpOiBEb24ndCB3YWl0IGZvciByZWNlaXZlIHF1ZXVlIHRvIGZpbGwgdXAgd2l0aCBt YnVmcyBkdXJpbmcgb3BlbiBjaGFubmVscy4KICAgIAogICAgRmFpbHVyZSB0byBnZXQgbWJ1 ZnMgbWF5IGJlIHRyYW5zaWVudC4KICAgIERvbid0IHBlcm1hbmVudGx5IGZhaWwgdG8gb3Bl biB0aGUgY2hhbm5lbHMgZHVlIHRvIGxhY2sgb2YgbWJ1ZnMuCiAgICBUaGlzIGFsc28gbWFr ZXMgbW9kaWZ5aW5nIGNoYW5uZWwgcGFyYW1ldGVycyBmYXN0ZXIuCiAgICAKICAgIFNwb25z b3JlZCBieTogICBOVklESUEgTmV0d29ya2luZwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBm cm9tIGNvbW1pdCAxOTQzYzQwY2Q2NTViNzI1OWI5YjIxODQ5ZjMyODM2MmM5N2EyNjU3KQoK Y29tbWl0IGI0MmVmYjk4OWI2ZjZkNWNhMmFmNjRiODcxYjUxNTk1ZjRlN2NiYmMKQXV0aG9y OiBIYW5zIFBldHRlciBTZWxhc2t5IDxoc2VsYXNreUBGcmVlQlNELm9yZz4KRGF0ZTogICBU dWUgQXByIDE4IDEzOjEyOjMyIDIwMjMgKzAyMDAKCiAgICBtbHg1ZW4oNCk6IEV4cGxhaW4g d2h5IENRRSB6aXBwaW5nIGlzIG9mZi4KICAgIAogICAgU3BvbnNvcmVkIGJ5OiAgIE5WSURJ QSBOZXR3b3JraW5nCiAgICAKICAgIChjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IDZiZDRi YjliZGJhZGI3NmM1NTAyYzc5NzJkZjlmNTI1YjkwOWUyZjUpCgpjb21taXQgOTFlZDQwN2Mw MTk5ODAyNDA0MGI3Y2UxYjM4MTc3NWIzMDQ2ODU5NwpBdXRob3I6IEhhbnMgUGV0dGVyIFNl bGFza3kgPGhzZWxhc2t5QEZyZWVCU0Qub3JnPgpEYXRlOiAgIFR1ZSBBcHIgMTggMTM6Mzg6 NTkgMjAyMyArMDIwMAoKICAgIG1seDU6IEltcGxlbWVudCBkaWFnb3N0aWMgY291bnRlcnMg YXMgc3lzY3RsKDgpIG5vZGVzLgogICAgCiAgICBTcG9uc29yZWQgYnk6ICAgTlZJRElBIE5l dHdvcmtpbmcKICAgIAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgYWE3YmJkYWJk ZTg5MDY3NmQ1NGEyMmVlZWMzYWY5Yjc2ODFkMTliNykKCmNvbW1pdCA2OWVjNmQ1ZjUzOGRl NWU2NWE1MGU0NDA2NjY4MDQ0ZjBiMWQxZWUzCkF1dGhvcjogSGFucyBQZXR0ZXIgU2VsYXNr eSA8aHNlbGFza3lARnJlZUJTRC5vcmc+CkRhdGU6ICAgVHVlIEp1bCA2IDEyOjI5OjU3IDIw MjEgKzAyMDAKCiAgICBJbXBsZW1lbnQgYW4gQVBJIGZvciBzZW5kaW5nIGEgemVyby1sZW5n dGgtcGFja2V0LiBUaGUgcHVycG9zZSBvZiBzdWNoIGEKICAgIFVTQiBwYWNrZXQgaXMgdG8g dG9nZ2xlIHRoZSBiaW5hcnkgcGFja2V0IGNvdW50ZXIgZm9yIFVTQiAxLjAvMi4wIHByb3Rv Y29scywKICAgIHdpdGhvdXQgc2VuZGluZyBhbnkgZGF0YSwgc28gdGhhdCB0aGUgZmlyc3Qg cGFja2V0IHNlbnQgYWZ0ZXIgb3BlbmluZwogICAgYSBVU0IgQlVMSyBlbmRwb2ludCBkb2Vz bid0IGdldCBsb3N0LiBUaGlzIGlzIGZvciBkZXZpY2VzIG5vdCBzdXBwb3J0aW5nCiAgICB0 aGUgVVNCIHN0YW5kYXJkIGRlZmluZWQgY2xlYXItc3RhbGwgaGFuZGxpbmcuCiAgICAKICAg IFRlc3RlZCBieTogICAgICBqbWcKICAgIFNwb25zb3JlZCBieTogICBOVklESUEgTmV0d29y a2luZwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCBmODNmNWQ1ODM5NGRi NTc1NzZiYmVkNmRjNzUzMTk5N2NhYmViMTAyKQogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBj b21taXQgZWM5N2U5Y2ExZmE1NDNhNGE4MDNlODQ3MDY1NjRkNDFjZDQ5MjA2NSkKCmNvbW1p dCA5NDk4NzE3ZjM0YTY4MmZiMTFkNDdkN2M0M2FiNGI2ZjRiODVlYjEyCkF1dGhvcjogV2Fy bmVyIExvc2ggPGltcEBGcmVlQlNELm9yZz4KRGF0ZTogICBUaHUgTWFyIDExIDA4OjIzOjMy IDIwMjEgLTA3MDAKCiAgICB1c2I6IHRpbnkgZm9ybWF0dGluZyBuaXQKICAgIAogICAgRm9y bWF0IDMwMCBiYXVkIGxpa2UgYWxsIHRoZSBvdGhlcnMgaGVyZS4gTm8gZnVuY3Rpb25hbCBj aGFuZ2UuCiAgICAKICAgIChjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IDE2NDVhNGFlNjQ1 ZmE5YjllMzU3MWI3NTEyY2FhOTJlNzNiMjA2MzUpCgpjb21taXQgZmJkMTBjYjdhOTZmNTlh ZjViM2UwZWRlODg5NTM0NzU1YmMxZGRkZApBdXRob3I6IEhhbnMgUGV0dGVyIFNlbGFza3kg PGhzZWxhc2t5QEZyZWVCU0Qub3JnPgpEYXRlOiAgIFNhdCBBcHIgMiAwMjoyNzo0OCAyMDIy ICswMjAwCgogICAgdWxwdCg0KTogQWRkIHN1cHBvcnQgZm9yIEVwc29uIFRNLVUyMjBCLgog ICAgCiAgICBTdWJtaXR0ZWQgYnk6ICAgICAgICAgICBBcmNoaW1lZGVzIEdhdmlvbGEgPGFy Y2hpbWVkZXMuZ2F2aW9sYUBnbWFpbC5jb20+CiAgICBTcG9uc29yZWQgYnk6ICAgICAgICAg ICBOVklESUEgTmV0d29ya2luZwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1p dCA4ODE2MmY3YWJkNjEyMDZjOTg0MzJmMmMwZGU4NjlhNTliZTEzODU0KQoKY29tbWl0IDQ5 Yjk0NjNmNjQ5MjhjZGJiMmIzYjU1MjVmYTBiZTQ4OTE4OWQyNjMKQXV0aG9yOiBIYW5zIFBl dHRlciBTZWxhc2t5IDxoc2VsYXNreUBGcmVlQlNELm9yZz4KRGF0ZTogICBXZWQgQXVnIDE4 IDExOjQxOjQ5IDIwMjEgKzAyMDAKCiAgICBNYWtlIHN1cmUgdGhlIHVmdGRpKDQpIGRyaXZl ciBkb2Vzbid0IHN0YXJ0IGEgVVNCIHRyYW5zZmVyIHdoZW4gYmVpbmcgY2FuY2VsbGVkLgog ICAgCiAgICBTcG9uc29yZWQgYnk6ICAgTlZJRElBIE5ldHdvcmtpbmcKICAgIAogICAgKGNo ZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgOGE0NmYwMjFjMjQwOGM4MjM3NWExZjUxMjdlZmI3 YWM2Yjc4NTk2ZSkKCmNvbW1pdCA4YzE1ODJjNmI1ZGMwMTI4YTE0MWYzM2YzZDk2MWFjYmZm NGM5NmNlCkF1dGhvcjogVmxhZGltaXIgS29uZHJhdHlldiA8d3VsZkBGcmVlQlNELm9yZz4K RGF0ZTogICBUdWUgRmViIDkgMDA6MjY6NDIgMjAyMSArMDMwMAoKICAgIHdzcDogQWRkIHN5 c2N0bCB0dW5hYmxlIGZvciBaLUF4aXMgaW52ZXJzaW9uCiAgICAKICAgIFRoaXMgYWRkcyBh IG5ldyBzeXNjdGwgdG8gV2VsbHNwcmluZyBUb3VjaHBhZCBkcml2ZXIgZm9yIGNvbnRyb2xs aW5nCiAgICBaLUF4aXMgKDItZmluZ2VyIHZlcnRpY2FsIHNjcm9sbCkgZGlyZWN0aW9uICJo dy51c2Iud3NwLnpfaW52ZXJ0Ii4KICAgIAogICAgU3VibWl0dGVkIGJ5OiAgIEphbWVzIFdy aWdodCA8amFtZXMud3JpZ2h0X0FUX2RpZ2l0YWwtY2hhb3NfRE9UX2NvbT4KICAgIFJldmll d2VkIGJ5OiAgICB3dWxmCiAgICBQUjogICAgICAgICAgICAgMjUzMzIxCiAgICBEaWZmZXJl bnRpYWwgcmV2aXNpb246ICBodHRwczovL3Jldmlld3MuZnJlZWJzZC5vcmcvRDI4NTIxCiAg ICAKICAgIChjaGVycnkgcGlja2VkIGZyb20gY29tbWl0IGQ4YzZkNGM3MzIxZDRjOTY5MjE2 YmRhOGY3OTJiNDVlZDAwYWZkNjQpCgpjb21taXQgMzVlYmExZWFjOTc5MjUwMGVlMDA0YWI2 MjBlNjc2ZWZiNDk1MTIwMApBdXRob3I6IEplc3NpY2EgQ2xhcmtlIDxqcnRjMjdARnJlZUJT RC5vcmc+CkRhdGU6ICAgU3VuIE9jdCAyNCAxOTo0ODo0NiAyMDIxICswMTAwCgogICAgeGhj aTogUmV3b3JrIDY0LWJ5dGUgY29udGV4dCBzdXBwb3J0IHRvIGF2b2lkIHBvaW50ZXIgYWJ1 c2UKICAgIAogICAgQ3VycmVudGx5LCB0byBzdXBwb3J0IDY0LWJ5dGUgY29udGV4dHMsIHho Y2lfY3R4X1tnc11ldF9sZSgzMnw2NCkgdGFrZSBhCiAgICBwb2ludGVyIHRvIHRoZSBmaWVs ZCB3aXRoaW4gYSAzMi1ieXRlIGNvbnRleHQgYW5kLCBpZiA2NC1ieXRlIGNvbnRleHRzCiAg ICBhcmUgaW4gdXNlLCBjb21wdXRlIHdoZXJlIHRoZSA2NC1ieXRlIGNvbnRleHQgZmllbGQg aXMgYW5kIHVzZSB0aGF0CiAgICBpbnN0ZWFkIGJ5IGRlcml2aW5nIGEgcG9pbnRlciBmcm9t IHRoZSAzMi1ieXRlIGZpZWxkIHBvaW50ZXIuIFRoaXMgaXMKICAgIGRvbmUgYnkgZXhwbG9p dGluZyBhIGNvbWJpbmF0aW9uIG9mIDY0LWJ5dGUgY29udGV4dHMgYmVpbmcgdGhlIHNhbWUK ICAgIGxheW91dCBhcyB0aGVpciAzMi1ieXRlIGNvdW50ZXJwYXJ0cywganVzdCB3aXRoIDMy IGJ5dGVzIG9mIHBhZGRpbmcgYXQKICAgIHRoZSBlbmQsIGFuZCB0aGF0IGFsbCBpbmRpdmlk dWFsIGNvbnRleHRzIGFyZSBlaXRoZXIgaW4gYSBkZXZpY2UKICAgIGNvbnRleHQgb3IgYW4g aW5wdXQgY29udGV4dCB3aGljaCBpdHNlbGYgaXMgcGFnZS1hbGlnbmVkLiBCeSBtYXNraW5n IG91dAogICAgdGhlIGxvdyA0IGJpdHMgKHdoaWNoIGlzIHRoZSBvZmZzZXQgb2YgdGhlIGZp ZWxkIHdpdGhpbiB0aGUgMzItYnl0ZQogICAgY29udHh0KSBvZiB0aGUgb2Zmc2V0IHdpdGhp biB0aGUgcGFnZSwgdGhlIG9mZnNldCBvZiB0aGUgaW52aWRpZHVhbAogICAgY29udGV4dCB3 aXRoaW4gdGhlIGNvbnRhaW5pbmcgZGV2aWNlL2lucHV0IGNvbnRleHQgY2FuIGJlIGRldGVy bWluZWQsCiAgICB3aGljaCBpcyBpdHNlbGYgMzIgdGltZXMgdGhlIG51bWJlciBvZiBwcmVj ZWRpbmcgY29udGV4dHMuIFRodXMsIGFkZGluZwogICAgdGhpcyB2YWx1ZSB0byB0aGUgcG9p bnRlciBhZ2FpbiBnZXRzIDY0IHRpbWVzIHRoZSBudW1iZXIgb2YgcHJlY2VkaW5nCiAgICBj b250ZXh0cyBwbHVzIHRoZSBmaWVsZCBvZmZzZXQsIHdoaWNoIGdpdmVzIHRoZSBvZmZzZXQg b2YgdGhlIDY0LWJ5dGUKICAgIGNvbnRleHQgcGx1cyB0aGUgZmllbGQgb2Zmc2V0LCB3aGlj aCBpcyB0aGUgYWRkcmVzcyBvZiB0aGUgZmllbGQgaW4gdGhlCiAgICA2NC1ieXRlIGNvbnRl eHQuCiAgICAKICAgIEhvd2V2ZXIsIHRoaXMgaW52b2x2ZXMgYSBmYWlyIGFtb3VudCBvZiBs eWluZyB0byB0aGUgY29tcGlsZXIgd2hlbgogICAgY29uc3RydWN0aW5nIHRoZXNlIGludGVy bWVkaWF0ZSBwb2ludGVycywgYW5kIGlzIHJhdGhlciBkaWZmaWN1bHQgdG8KICAgIHJlYXNv biBhYm91dC4gSW4gcGFydGljdWxhciwgdGhpcyBpcyBwcm9ibGVtYXRpYyBmb3IgQ0hFUkks IHdoZXJlIHdlCiAgICBjb21waWxlIHRoZSBrZXJuZWwgd2l0aCBzdWJvYmplY3QgYm91bmRz IGVuYWJsZWQ7IHRoYXQgaXMsIHVubGVzcwogICAgYW5ub3RhdGVkIHRvIG9wdCBvdXQgKGUu Zy4gZm9yIEMgc3RydWN0IGluaGVyaXRhbmNlIHJlYXNvbnMgd2hlcmUgeW91CiAgICBuZWVk IHRvIGJlIGFibGUgdG8gZG93bmNhc3QsIG9yIGNvbnRhaW5lcm9mIGlkaW9tcyksIGEgcG9p bnRlciB0byBhCiAgICBtZW1iZXIgb2YgYSBzdHJ1Y3QgaXMgYSBjYXBhYmlsaXR5IHdob3Nl IGJvdW5kcyBvbmx5IGNvdmVyIHRoYXQgZmllbGQsCiAgICBhbmQgYW55IGF0dGVtcHQgdG8g ZGVyZWZlcmVuY2Ugb3V0c2lkZSB0aG9zZSBib3VuZHMgd2lsbCBmYXVsdCwKICAgIHByb3Rl Y3RpbmcgYWdhaW5zdCBpbnRyYS1vYmplY3QgYnVmZmVyIG92ZXJmbG93cy4gVGh1cyB0aGUg cG9pbnRlciBnaXZlbgogICAgdG8geGhjaV9jdHhfW2dzXWV0X2xlKDMyfDY0KSBpcyBhIGNh cGFiaWxpdHkgd2hvc2UgYm91bmRzIG9ubHkgY292ZXIgdGhlCiAgICBmaWVsZCBpbiB0aGUg MzItYnl0ZSBjb250ZXh0LCBhbmQgY29tcHV0aW5nIHRoZSBwb2ludGVyIHRvIHRoZSA2NC1i eXRlCiAgICBjb250ZXh0IGZpZWxkIHRha2VzIHRoZSBhZGRyZXNzIG91dCBvZiBib3VuZHMs IHJlc3VsdGluZyBpbiBhIGZhdWx0IHdoZW4KICAgIGxhdGVyIGRlcmVmZXJlbmNlZC4KICAg IAogICAgVGhpcyBjYW4gYmUgY2xlYW5lZCB1cCBieSB1c2luZyBhIGRpZmZlcmVudCBhYnN0 cmFjdGlvbi4gSW5zdGVhZCBvZgogICAgZG9pbmcgdGhlIDMyLWJ5dGUgdG8gNjQtYnl0ZSBj b252ZXJzaW9uIG9uIGFjY2VzcyB0byB0aGUgZmllbGQsIHdlIGNhbgogICAgZG8gdGhlIGNv bnZlcnNpb24gd2hlbiBnZXR0aW5nIGEgcG9pbnRlciB0byB0aGUgY29udGV4dCBpdHNlbGYs IGFuZAogICAgZGVmaW5lIHByb3BlciA2NC1ieXRlIHZlcnNpb25zIG9mIGNvbnRleHRzIGlu IG9yZGVyIHRvIGxldCB0aGUgY29tcGlsZXIKICAgIGRvIGFsbCB0aGUgbmVjZXNzYXJ5IGFy aXRobWV0aWMgcmF0aGVyIHRoYW4gZG8gaXQgbWFudWFsbHkgb3Vyc2VsdmVzLgogICAgVGhp cyBwcm92aWRlcyBhIGNsZWFuZXIgaW1wbGVtZW50YXRpb24sIHdvcmtzIGZvciBDSEVSSSBh bmQgbWF5IGV2ZW4gYmUKICAgIHNsaWdodGx5IG1vcmUgcGVyZm9ybWFudCBhcyBpdCBhdm9p ZHMgdGhlIG5lZWQgdG8gbWVzcyB3aXRoIG1hc2tpbmcKICAgIHBvaW50ZXJzICh3aGljaCBj YW5ub3QgaW4gdGhlIGdlbmVyYWwgY2FzZSBiZSBvcHRpbWlzZWQgYnkgY29tcGlsZXJzIHRv CiAgICBiZSByZXVzZWQgYWNyb3NzIGFjY2Vzc2VzIHRvIGRpZmZlcmVudCBmaWVsZHMgd2l0 aGluIHRoZSBzYW1lIGNvbnRleHQsCiAgICBzaW5jZSBpdCBkb2VzIG5vdCBrbm93IHRoYXQg dGhlIGNvbnRleHRzIGFyZSBvdmVyLWFsaWduZWQgY29tcGFyZWQgd2l0aAogICAgdGhlIEMg QUJJIHJlcXVpcmVtZW50cykuCiAgICAKICAgIFJldmlld2VkIGJ5OiAgICBoc2VsYXNreQog ICAgRGlmZmVyZW50aWFsIFJldmlzaW9uOiAgaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3Jn L0QzMjU1NAogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCAyOTg2M2QxZWZm ZTIwZGEzY2M3NWFlMTBiZDUyZDk2ZWRhZmU5ZTU5KQoKY29tbWl0IDViNTA3OTE2NTg1MmRl MGYwZWEwYzU0N2I0NDczYzU1YzJlMTJjMjIKQXV0aG9yOiBCam9lcm4gQS4gWmVlYiA8YnpA RnJlZUJTRC5vcmc+CkRhdGU6ICAgRnJpIE9jdCAxIDEzOjM3OjAxIDIwMjEgKzAwMDAKCiAg ICBVU0I6IGFkanVzdCB0aGUgR2VuZXJpYyBYSENJIEFDUEkgcHJvYmUgcmV0dXJuIHZhbHVl CiAgICAKICAgIENoYW5nZSB0aGUgcHJvYmUgcmV0dXJuIHZhbHVlIGZyb20gQlVTX1BST0JF X0RFRkFVTFQgdG8gQlVTX1BST0JFX0dFTkVSSUMKICAgIGdpdmVuIHRoaXMgaXMgdGhlICJn ZW5lcmljIiBhdHRhY2ggbWV0aG9kLiAgVGhpcyBhbGxvd3MgaW5kaXZpZHVhbAogICAgZHJp dmVycyB1c2luZyBYSENJIGdlbmVyaWMgYnV0IG5lZWRpbmcgdGhlaXIgb3duIGludGlhbGlz YXRpb24gdG8KICAgIGdhaW4gcHJpb3JpdHkgZm9yIGF0dGFjaGluZyBvdmVyIHRoZSBnZW5l cmljIGltcGxlbWVudGF0aW9uLgogICAgCiAgICBSZXZpZXdlZCBieTogICAgaHNlbGFza3kK ICAgIERpZmZlcmVudGlhbCBSZXZpc2lvbjogaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3Jn L0QzMjI1NwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCA3NmYzYjhjYjY0 MDUzNmRlMmMzNzBjYzJiZDYwMzgyYmJjMzVjZjVkKQoKY29tbWl0IDBjNDQzZGQyZmJmZmY0 OTI4NzFiN2Y1MzA5ZjM3NjJmYjYyYmM4ZTYKQXV0aG9yOiBTw7hyZW4gU2NobWlkdCA8c29z QEZyZWVCU0Qub3JnPgpEYXRlOiAgIFR1ZSBEZWMgMjAgMDg6NTM6NTggMjAyMiArMDAwMAoK ICAgIEdldCBjbG9ja3MgZm9yIFJvY2tjaGlwIFJLMzU2OC4KICAgIAogICAgKGNoZXJyeSBw aWNrZWQgZnJvbSBjb21taXQgMWQ4YzA3YjdhYjdiYzEyM2VjNjJlOTcxNzZiZWZmZWY0MDUy ZWJhOCkKCmNvbW1pdCAwYjQxZGFjOWE5NTFhZTlkODI3YzQ5NmY0Y2Q2YmQ5OWIxYTQ4NzIx CkF1dGhvcjogVmFsIFBhY2tldHQgPHZhbEBwYWNrZXR0LmNvb2w+CkRhdGU6ICAgVHVlIEFw ciAyNSAxMjoyMDo1MyAyMDIzICswMzAwCgogICAgYmNtNTk3NCg0KTogYWRkIE1hZ2ljIFRy YWNrcGFkIDIgKFVTQiBvbmx5KSBzdXBwb3J0CiAgICAKICAgIFRoZSBNVDIgdXNlcyBhIGNv bXBhY3QgcmVwb3J0IGZvcm1hdCwgYnV0IG90aGVyd2lzZSBpcyBzaW1pbGFyIGluIG1hbnkK ICAgIHdheXMgdG8gdGhlIGludGVybmFsIHRyYWNrcGFkcywgaXQgZXZlbiB1c2VzIHRoZSBz YW1lIG1vZGUgc3dpdGNoaW5nCiAgICBjb21tYW5kcy4KICAgIAogICAgUmV2aWV3ZWQgYnk6 ICAgIHd1bGYKICAgIERpZmZlcmVudGlhbCByZXZpc2lvbjogIGh0dHBzOi8vcmV2aWV3cy5m cmVlYnNkLm9yZy9EMzQ0MzcKICAgIAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQg ZWY4Mzk3YzI4ZTk4MWUwMTE1ZDQzNWFhYmNmNTdjZWU3ZWE1ZjVlZSkKCmNvbW1pdCA1NDZm Mzk0ZGJmYzFmNTIwNDZhY2NmM2Q5Y2QwMDQ0MmZjZGQ4Y2UwCkF1dGhvcjogSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+CkRhdGU6ICAgTW9uIEFwciAxMCAxMDozNTo0OCAyMDIz IC0wNzAwCgogICAgaWZfbW9zOiBSZW1vdmUgc2V0IGJ1dCB1bnVzZWQgdmFyaWFibGUuCiAg ICAKICAgIFJldmlld2VkIGJ5OiAgICBoc2VsYXNreQogICAgUmVwb3J0ZWQgYnk6ICAgIEdD QwogICAgRGlmZmVyZW50aWFsIFJldmlzaW9uOiAgaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qu b3JnL0QzOTM1NgogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCA1MzI4ZWZi M2QwYTU0ZGYyMDc3OWQ4MjMxOWMzZWViZDQ5YWEyOTkzKQoKY29tbWl0IDk3YWQyNjNhMWE5 NDNjMmU5NmE4NTI3YzIyNjk2NzI1YzhlNmZlMzUKQXV0aG9yOiBIYW5zIFBldHRlciBTZWxh c2t5IDxoc2VsYXNreUBGcmVlQlNELm9yZz4KRGF0ZTogICBGcmkgTWFyIDMxIDE5OjE0OjE4 IDIwMjMgKzAyMDAKCiAgICB1c2IoNCk6IFNlcGFyYXRlIHRoZSBmYXN0IHBhdGggYW5kIHRo ZSBzbG93IHBhdGggdG8gYXZvaWQgcmFjZXMgYW5kIHVzZS1hZnRlci1mcmVlIGZvciB0aGUg VVNCIEZTIGludGVyZmFjZS4KICAgIAogICAgQmFkIGJlaGF2aW5nIHVzZXItc3BhY2UgVVNC IGFwcGxpY2F0b2lucyBtYXkgY3Jhc2ggdGhlIGtlcm5lbCBieSBpc3N1aW5nCiAgICBVU0Ig RlMgcmVsYXRlZCBpb2N0bCgyKSdzIG91dCBvZiB0aGVpciBleHBlY3RlZCBvcmRlci4gQnkg ZGVmYXVsdAogICAgdGhlIFVTQiBGUyBpb2N0bCgyKSBpbnRlcmZhY2UgaXMgb25seSBhdmFp bGFibGUgdG8gdGhlCiAgICBhZG1pbmlzdHJhdG9yLCByb290LCBhbmQgZHJpdmVyIGFwcGxp Y2F0aW9ucyBsaWtlIHdlYmNhbWQoOCkgbmVlZHMKICAgIHRvIGJlIGhpamFja2VkIGluIG9y ZGVyIGZvciB0aGlzIHRvIGhhcHBlbi4KICAgIAogICAgVGhlIGlzc3VlIGlzIHRoZSBmYXN0 LXBhdGggY29kZSBkb2VzIG5vdCBhbHdheXMgc2VlIHVwZGF0ZXMgbWFkZQogICAgYnkgdGhl IHNsb3ctcGF0aCBjb2RlLCBhbmQgbWF5IHRoZW4gd29yayBvbiBmcmVlZCBtZW1vcnkuCiAg ICAKICAgIFRoaXMgaXMgZWFzaWx5IGZpeGVkIGJ5IHVzaW5nIGFuIEVQT0NIKDkpIHR5cGUg b2Ygc3luY2hyb25pemF0aW9uCiAgICBtZWNoYW5pc20uIEEgU1goOSkgbG9jayB3aWxsIGJl IHVzZWQgYXMgYSBzdWJzdGl0dXRlIGZvciBFUE9DSCg5KSwKICAgIGR1ZSB0byB0aGUgbmVl ZCBmb3Igc2xlZXBhYmlsaXR5LiBJbiBhZGRpdGlvbiBtb3N0IGNhbGxzIGdvaW5nIGludG8K ICAgIHRoZSBmYXN0LXBhdGggb3JpZ2luYXRlIGZyb20gYSBzaW5nbGUgdXNlci1zcGFjZSBw cm9jZXNzIGFuZCB0aGUKICAgIG5lZWQgZm9yIG11bHRpLXRocmVhZCBwZXJmb3JtYW5jZSBp cyBub3QgcHJlc2VudC4KICAgIAogICAgRGlmZmVyZW50aWFsIFJldmlzaW9uOiAgaHR0cHM6 Ly9yZXZpZXdzLmZyZWVic2Qub3JnL0QzOTM3MwogICAgUmV2aWV3ZWQgYnk6ICAgIG1hcmtq QAogICAgUmVwb3J0ZWQgYnk6ICAgIEMgVHVydCA8ZWN0dXJ0QGdtYWlsLmNvbT4KICAgIGFk bWJ1Z3M6ICAgICAgICA5OTQKICAgIFNwb25zb3JlZCBieTogICBOVklESUEgTmV0d29ya2lu ZwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCA5YjA3N2Q3MmJjYzMxM2Jh ZWEyYjkyODNhZmM3ZjU2ODczOWVhYWRjKQoKY29tbWl0IDFkM2U4MzYxMTY0MmI3NTU4Njg3 NjYzY2RkZDAzYzUwYzJhYzZjMmEKQXV0aG9yOiBIYW5zIFBldHRlciBTZWxhc2t5IDxoc2Vs YXNreUBGcmVlQlNELm9yZz4KRGF0ZTogICBUdWUgQXByIDQgMTc6MTU6MzggMjAyMyArMDIw MAoKICAgIHVzYig0KTogQ29kZSByZWZhY3RvcmluZyBhcyBhIHByZS1zdGVwIGZvciBhZGRp bmcgbWlzc2luZyBzeW5jaHJvbml6YXRpb24gbWVjaGFuaXNtLgogICAgCiAgICBNb3ZlIGNv ZGUgaW4gc3dpdGNoIGNhc2VzIGludG8gb3duIGZ1bmN0aW9ucyB0byBtYWtlIGxhdGVyIGNo YW5nZXMgZWFzaWVyIHRvIHRyYWNrLgogICAgCiAgICBObyBmdW5jdGlvbmFsIGNoYW5nZSwg ZXhjZXB0IGZvciByZW1vdmluZyBhIHN1cGVyZmx1b3VzIGJyZWFrIHN0YXRlbWVudCB3aGVu CiAgICByYW5nZSBjaGVja2luZyBVU0JfRlNfTUFYX0ZSQU1FUywgaW4gdGhlIFVTQl9GU19P UEVOIGNhc2UuCiAgICBJdCBzaG91bGQgbm90IGhhdmUgYmVlbiB0aGVyZSBhdCBhbGwuCiAg ICAKICAgIFN1Z2dlc3RlZCBieTogICBlbWFzdGVACiAgICBTcG9uc29yZWQgYnk6ICAgTlZJ RElBIE5ldHdvcmtpbmcKICAgIAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgMDNh MmU0MzJkNWNjMmVlZGI5MzA0ZmFlYTJiMTkwNTFjODRjYWVjZikKCmNvbW1pdCBjNGE1NjMx MmIyMGJjYzM3NzA0Mzk1ZTEwMGYzYzY5ZmEwYWQ0ZTZmCkF1dGhvcjogSm9lcmcgV3Vuc2No IDxqb2VyZ0BGcmVlQlNELm9yZz4KRGF0ZTogICBXZWQgTWFyIDggMjA6NTk6MjkgMjAyMyAr MDEwMAoKICAgIHVzYjogZHdjMzogYWRkIDxzeXMvbXV0ZXguaD4KICAgIAogICAgQ29tbWl0 IDVlNTRiYjFlYTllOTAgYWRkZWQgVVNCX0JVU19MT0NLL1VTQl9CVVNfVU5MT0NLLiBUaGV5 LCBpbgogICAgY29uc2VxdWVuY2UsIHJlcXVpcmUgbXV0ZXhlcyBzbyA8c3lzL211dGV4Lmg+ IGlzIG5lZWRlZC4KICAgIAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgMTc1YTU4 NGU1MDFlMTljOTBmZDIyNDFjNTA1ZDE3OTdkZTYwM2E1YykKCmNvbW1pdCBjZGQ4YWJlMjQy Zjg2ZGM4ZmY3YWYxOWExNjM2YTkyYzljMTliNzhmCkF1dGhvcjogS3lsZSBFdmFucyA8a2V2 YW5zQEZyZWVCU0Qub3JnPgpEYXRlOiAgIE1vbiBGZWIgMjcgMTk6NTk6NDMgMjAyMyAtMDYw MAoKICAgIHVzYjogZHdjMzogaW1wbGVtZW50IGh3LnVzYi54aGNpLnVzZV9wb2xsaW5nCiAg ICAKICAgIFBvbGxpbmcgaXMgY3VycmVudGx5IG9ubHkgaW1wbGVtZW50ZWQgaW4gdGhlIHho Y2kgcGNpIGF0dGFjaG1lbnQuCiAgICBBZGRpbmcgaXQgdG8gZHdjMyBkb2Vzbid0IG1ha2Ug aXQgbXVjaCB1Z2xpZXIsIGFuZCBzdXBwb3J0aW5nIGl0IGNhbiBiZQogICAgdXNlZnVsIGZv ciBjb25maXJtaW5nIHRoYXQgaGFyZHdhcmUncyBvdGhlcndpc2UgZnVuY3Rpb25hbCB3aGVu CiAgICBpbnRlcnJ1cHRzIGFyZSBhcHBhcmVudGx5IG5vdCBmaXJpbmcuCiAgICAKICAgIFJl dmlld2VkIGJ5OiAgICBtYW51CiAgICBEaWZmZXJlbnRpYWwgUmV2aXNpb246ICBodHRwczov L3Jldmlld3MuZnJlZWJzZC5vcmcvRDM4ODE2CiAgICAKICAgIChjaGVycnkgcGlja2VkIGZy b20gY29tbWl0IDVlNTRiYjFlYTllOTA0MDc1MjI1ZGM5NjY0MWMyZWRlM2ZjMzI3M2MpCgpj b21taXQgZDE2MDFiNzY3YzEzMDI2YThlYTllZDg0ZDE1Y2JlZDE0N2NhYjk3YQpBdXRob3I6 IEVsbGlvdHQgTWl0Y2hlbGwgPGVoZW0rZnJlZWJzZEBtNXAuY29tPgpEYXRlOiAgIFdlZCBK dW4gMjIgMTc6NTM6NDcgMjAyMiAtMDcwMAoKICAgIHdtdDogcHVyZ2UgRU9MIHJlbGVhc2Ug Y29tcGF0aWJpbGl0eQogICAgCiAgICBSZW1vdmUgRnJlZUJTRCAxMSBzdXBwb3J0CiAgICAK ICAgIFJldmlld2VkIGJ5OiBpbXAKICAgIFB1bGwgUmVxdWVzdDogaHR0cHM6Ly9naXRodWIu Y29tL2ZyZWVic2QvZnJlZWJzZC1zcmMvcHVsbC82MDMKICAgIERpZmZlcmVudGlhbCBSZXZp c2lvbjogaHR0cHM6Ly9yZXZpZXdzLmZyZWVic2Qub3JnL0QzNTU2MAogICAgCiAgICAoY2hl cnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCA1ZmExODMzNTE0NTk5OTZjZmI4NmY4NjIxZGUxYTBl MWJmOTg1ZDY3KQoKY29tbWl0IGYwMmQzYTM5YWNkNTAwMWFjYTcwMzViZjRhODcwZjliNDg2 NmI0YWUKQXV0aG9yOiBFbGxpb3R0IE1pdGNoZWxsIDxlaGVtK2ZyZWVic2RAbTVwLmNvbT4K RGF0ZTogICBXZWQgSnVuIDIyIDE3OjUzOjQ3IDIwMjIgLTA3MDAKCiAgICB1c2I6IHB1cmdl IEVPTCByZWxlYXNlIGNvbXBhdGliaWxpdHkKICAgIAogICAgUmVtb3ZlIGNvbmRpdGlvbnNh bHMgZm9yIEZyZWVCU0QgNiwgNywgOCBhbmQgOSBjb21wYXRpYmlsaXR5LgogICAgCiAgICBS ZXZpZXdlZCBieTogaW1wCiAgICBQdWxsIFJlcXVlc3Q6IGh0dHBzOi8vZ2l0aHViLmNvbS9m cmVlYnNkL2ZyZWVic2Qtc3JjL3B1bGwvNjAzCiAgICBEaWZmZXJlbnRpYWwgUmV2aXNpb246 IGh0dHBzOi8vcmV2aWV3cy5mcmVlYnNkLm9yZy9EMzU1NjAKICAgIAogICAgKGNoZXJyeSBw aWNrZWQgZnJvbSBjb21taXQgMzM2ZmJiMjNkZWY3YTZiM2RjNDRjZTVjNzZiYmMwN2E3MDFj MGE2OSkKCmNvbW1pdCAxZDhlYTIzODQzOGY1ZGE1NmM4MjVjOGFiNDcxZWY4YmJhNzdiODVj CkF1dGhvcjogQ2hlbmcsIEh1aW1pbmcgPEh1aW1pbmcuQ2hlbmdAZGVsbHRlYW0uY29tPgpE YXRlOiAgIFRodSBEZWMgMTUgMjM6MzA6MTEgMjAyMiArMDEwMAoKICAgIHhoY2koNCk6IE1h a2Ugc3VyZSBhbGxvY2F0ZWQgYmFuZHdpZHRoIGlzIGZyZWVkIGluIGhhcmR3YXJlIGJ5IHVu Y29uZmlndXJpbmcgZW5kcG9pbnQuCiAgICAKICAgIFNwb25zb3JlZCBieTogICBOVklESUEg TmV0d29ya2luZwogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCA4Njg1ZDdi NWNiNzU5YjRmNjg4ZGVhOTNkYmUxYzM4ZjllODMzZTRlKQoKY29tbWl0IDkyZWFhZDhkMTQy NjRhMDkwOWE2YzUwODQ1MDE4OTVjMDUxYmUzMzQKQXV0aG9yOiBIYW5zIFBldHRlciBTZWxh c2t5IDxoc2VsYXNreUBGcmVlQlNELm9yZz4KRGF0ZTogICBUaHUgRGVjIDE1IDIzOjMyOjQ3 IDIwMjIgKzAxMDAKCiAgICB1c2IoNCk6IENhbGwgb3B0aW9uYWwgZW5kcG9pbnRfdW5pbml0 KCkgd2hlbiBjaGFuZ2luZyBjb25maWd1cmF0aW9uIG9yIGFsdGVybmF0ZSBzZXR0aW5nLgog ICAgCiAgICBTcG9uc29yZWQgYnk6ICAgTlZJRElBIE5ldHdvcmtpbmcKICAgIAogICAgKGNo ZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgZTQ2MTFkMjYyNjVmYjllM2JkMmEzNDVjZjQ3NzY4 NjNmNDlhMjU4NykKCmNvbW1pdCBkYjMzMTkzZTg2MDQyMzM5ZDliNTA1ZWQzZDM2OGFmYzk1 YWE5ZWY5CkF1dGhvcjogUG91bC1IZW5uaW5nIEthbXAgPHBoa0BGcmVlQlNELm9yZz4KRGF0 ZTogICBTdW4gQXVnIDI4IDE3OjIxOjM4IDIwMjIgKzAwMDAKCiAgICBVU0IgaWQgb2YgeWV0 IGFub3RoZXIgTGVub3ZvIFVTQi1DIGV0aGVybmV0IGRvbmdsZS4KICAgIAogICAgKGNoZXJy eSBwaWNrZWQgZnJvbSBjb21taXQgMzE5MzdmN2U4NDNkYThiZTY4NTU1N2Q1MTNmYzFhZjU4 MDc5ZWRhMykKCmNvbW1pdCA4ZmZkMDA2YjM4ODE4NGRjZjY3MGEzNDRmMGVmM2E2NzNkMmEy MzQxCkF1dGhvcjogSGFucyBQZXR0ZXIgU2VsYXNreSA8aHNlbGFza3lARnJlZUJTRC5vcmc+ CkRhdGU6ICAgU2F0IEFwciAzMCAxMToyMTo1NCAyMDIyICswMjAwCgogICAgdWF0aCg0KTog Rml4IGluY29ycmVjdCBieXRlLXN3YXBwaW5nIGFuZCBhIGJ1ZmZlciBsZW5ndGggY2hlY2su CiAgICAKICAgIFBSOiAgICAgICAgICAgICAgICAgICAgIDI2MzYzOAogICAgUmVwb3J0ZWQg Ynk6ICAgICAgICAgICAgSmVmZiBHaWJib25zIDxqZ2liYm9uc0Bwcm90b2dhdGUuY29tPgog ICAgU3BvbnNvcmVkIGJ5OiAgICAgICAgICAgTlZJRElBIE5ldHdvcmtpbmcKICAgIAogICAg KGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgNmViNmFlZWY3ZTY3MGJkZGM5Y2Q1MmFhZjMy NzY1YTllYTg1ZWVlMykKCmNvbW1pdCBkNmQxYTM4ODAxM2JiZjc3NTNhYjFjMTlhNDc5MGJl ZDgyMjM1NmExCkF1dGhvcjogS29ybmVsIER1bGViYSA8bWluZGFsQHNlbWloYWxmLmNvbT4K RGF0ZTogICBUdWUgQXByIDI2IDE0OjA3OjIxIDIwMjIgKzAyMDAKCiAgICB1c2I6IFJlc3Bl Y3QgTk9fSU5RVUlSWSBxdWlyayBkdXJpbmcgZGV2aWNlIGVudW1lcmF0aW9uCiAgICAKICAg IEJvdGggdXNiX2lmYWNlX2lzX2Nkcm9tIGFuZCB1c2JfbXNjX2F1dG9fcXVpcmsgZnVuY3Rp b25zIHVzZSBTQ1NJIElOUVVJUlkKICAgIGNvbW1hbmQgdG8gcHJvYmUgdmFyaW91cyBwcm9w ZXJ0aWVzIG9mIHVzYiBtYXNzIHN0b3JhZ2UgZGV2aWNlcy4KICAgIFRoZSBwcm9ibGVtIGhl cmUgaXMgdGhhdCBzb21lIHZlcnkgYnJva2VuIGRldmljZXMgZG9uJ3QgbGlrZSB0aGlzIGNv bW1hbmQuCiAgICBDaGVjayBpZiBVUV9NU0NfTk9fSU5RVUlSWSBxdWlyayBpcyBzZXQgYW5k IHNraXAgY2Ryb20gYW5kIHF1aXJrCiAgICBhdXRvZGV0ZWN0aW9uIGluIHRoYXQgY2FzZS4K ICAgIAogICAgU3BvbnNvcmVkIGJ5OiBTdG9ybXNoaWVsZAogICAgT2J0YWluZWQgZnJvbTog U2VtaWhhbGYKICAgIFJldmlld2VkIGJ5OiBocHMsIHdtYQogICAgRGlmZmVyZW50aWFsIFJl dmlzaW9uOiBodHRwczovL3Jldmlld3MuZnJlZWJzZC5vcmcvRDM1MDc1CiAgICAKICAgIChj aGVycnkgcGlja2VkIGZyb20gY29tbWl0IDNlZTk0Mzg2OGM3NGNlOTE3ODIwZmU5ZGRiY2Zl YWIzMzg3MDRkOTApCgpjb21taXQgYjI3NDk1OGQyNmFiMzgzMGFkOTA5NjM5MDE1YzQ1ZTUy YzdhMWQ5YwpBdXRob3I6IEpvaG4gQmFsZHdpbiA8amhiQEZyZWVCU0Qub3JnPgpEYXRlOiAg IE1vbiBBcHIgMTggMTI6Mjc6NDggMjAyMiAtMDcwMAoKICAgIHVoaWRfc25lczogUmVtb3Zl IFVTQl9TVF9UUkFOU0ZFUlJFRCBoYW5kbGluZyBmb3IgdGhlIHN0YXR1cyByZXF1ZXN0Lgog ICAgCiAgICBUaGUgcmVzdWx0IG9mIHRoZSByZXF1ZXN0IGNvbXB1dGVkIGluIG5ld19zdGF0 dXMgd2FzIG5ldmVyIHJldHVybmVkIHRvCiAgICB0aGUgY2FsbGVyIGxlYXZpbmcgbmV3X3N0 YXR1cyBhcyBhIHNldC1idXQtdW51c2VkIHZhcmlhYmxlLiAgUmVtb3ZpbmcKICAgIG5ld19z dGF0dXMgbGVhdmVzIHNjLT5wcmV2aW91c19zdGF0dXMgYXMgYSB3cml0ZS1vbmx5IHZhcmlh YmxlLgogICAgUmVtb3Zpbmcgc2MtPnByZXZpb3VzX3N0YXR1cyBsZWF2ZXMgY3VycmVudF9z dGF0dXMgYXMgYSB3cml0ZS1vbmx5CiAgICB2YXJpYWJsZSwgc28gaXQgY29sbGFwc2VzIGRv d24gdG8gcmVtb3ZpbmcgdGhlIGVudGlyZQogICAgVVNCX1NUX1RSQU5TRkVSUkVEIGNhc2Uu CiAgICAKICAgIEFyZ3VhYmx5LCBhbGwgb2YgdGhlIHN1cHBvcnQgZm9yIFVISURfU05FU19T VEFUVVNfRFRfUkQgc2hvdWxkIGJlCiAgICByZW1vdmVkIGFzIGl0IGRvZXNuJ3QgcmV0dXJu IGFueXRoaW5nIHRvIHRoZSBjYWxsZXIuICBJZiB0aGUgcmVxdWVzdAogICAgc2hvdWxkIGJl IGZpeGVkIGluc3RlYWQgdGhlbiB0aGlzIGNvbW1pdCBzaG91bGQgYmUgcmV2ZXJ0ZWQgYW5k CiAgICBuZXdfc3RhdHVzIHNob3VsZCBiZSByZXR1cm5lZCB0byB3aG9ldmVyIHN1Ym1pdHRl ZCB0aGUgcmVxdWVzdC4KICAgIAogICAgRGlmZmVyZW50aWFsIFJldmlzaW9uOiAgaHR0cHM6 Ly9yZXZpZXdzLmZyZWVic2Qub3JnL0QzNDg0MAogICAgCiAgICAoY2hlcnJ5IHBpY2tlZCBm cm9tIGNvbW1pdCA1NDBhYzMzOGQ1NTc1MTMxZDEzNGQyYzAzM2YzMWI1ZDZkNTc2YzY4KQoK Y29tbWl0IGJlNzc2ZTA1MTg2OGMxNGU5NTdhNmVmODNkMGM0MTFhZjgxZDE3OTgKQXV0aG9y OiBCcm9va3MgRGF2aXMgPGJyb29rc0BGcmVlQlNELm9yZz4KRGF0ZTogICBGcmkgRGVjIDE3 IDIxOjI4OjE0IDIwMjEgKzAwMDAKCiAgICBsaWJ1c2I6IHJlbW92ZSB1c2Ugb2YgQ09NUEFU XzMyQklUCiAgICAKICAgIFRoaXMgY29kZXBhdGggdXNlZCB1aW50NjRfdCdzIGluIHBsYWNl IG9mIHBvaW50ZXJzIGluIHN0cnVjdHMgYW5kCiAgICBhcnJheXMgdG8gYWxsb3cgMzItYml0 IGNvZGUgdG8gdXNlIDY0LWJpdCB2ZXJzaW9uIG9mIGlvY3Rscy4gIE5vdwogICAgdGhhdCB3 ZSBzdXBwb3J0IDMyLWJpdCBjb21wYXQgbmF0aXZlbHkgdGhpcyBpcyBubyBsb25nZXIgbmVl ZGVkLgogICAgCiAgICBSZXZpZXdlZCBieTogICAgaHNlbGFza3ksIGpydGMyNyAocHJpb3Ig dmVyc2lvbikKICAgIAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgODAxMGY0YWQy MWI2MTIwZTkyOWJkYTRlZWQyNzY5NmU2MzUxNDY3NykKCmNvbW1pdCBmNzI0OTc4ZDc4NGQ5 ZDc0NGUyMWRiYjhmMDZlZDdjNDdmMDA1YjU4CkF1dGhvcjogQnJvb2tzIERhdmlzIDxicm9v a3NARnJlZUJTRC5vcmc+CkRhdGU6ICAgRnJpIERlYyAxNyAyMToyODoxNCAyMDIxICswMDAw CgogICAgdXNiOiByZW1vdmUgQ09NUEFUXzMyQklUIGlmZGVmcwogICAgCiAgICBOb3cgdGhh dCB3ZSBoYXZlIHByb3BlciAzMi1iaXQgY29tcGF0IHN1cHBvcnQsIHJlbW92ZSBDT01QQVRf MzJCSVQKICAgIGlmZGVmcyB0byBhbGxvdyAzMi1iaXQgY29kZSB0byB1c2UgdGhlIDY0LWJp dCBsYXlvdXQgb2YgVVNCIGlvY3RsCiAgICBzdHJ1Y3RzIGFuZCBzdHJ1Y3QgdXNiX2ZzX2Vu ZHBvaW50LgogICAgCiAgICBUaGlzIGluY2x1ZGVzIHRoZSByZW1vdmFsIG9mIHJlZHVuZGFu dCBhbGlnbm1lbnQgZGlyZWN0aXZlcyB0aGF0IGhhZAogICAgbm8gZWZmZWN0IGluIHByYWN0 aWNlLgogICAgCiAgICBSZXZpZXdlZCBieTogICAgaHNlbGFza3ksIGpydGMyNyAocHJpb3Ig dmVyc2lvbikKICAgIAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgZWE5NzJmZWVh MmQyNTg5ZWUxMzE3YTE5ZWVhZGEwNTk4MzMyZGVmYSkKCmNvbW1pdCAwNTNhZmUxZmQzNTg0 YTc5ZDRmYzVmNGMzM2ZiZmExNzNiZWVkZjQwCkF1dGhvcjogQnJvb2tzIERhdmlzIDxicm9v a3NARnJlZUJTRC5vcmc+CkRhdGU6ICAgRnJpIERlYyAxNyAyMToyODoxNCAyMDIxICswMDAw CgogICAgdXNiOiBhZGQgMzItYml0IGNvbXBhdCBmb3IgRklGT3MKICAgIAogICAgVW5saWtl IG1vc3QgMzItYml0IGNvbXBhdGFiaWxpdHkgY29kZSwgdGhpcyBpc24ndCBqdXN0IGEgc2lt cGxlIHRodW5rCiAgICBpbiB0aGUgaW9jdGwgY29kZS4gIEFuIGlvY3RsIChVU0JfRlNfSU5J VCkgaXMgdXNlZCB0byBpbnN0YWxsIGEKICAgIHBvaW50ZXIgdG8gYW4gYXJyYXkgb2YgdXNi X2ZzX2VuZHBvaW50IHN0cnVjdHMgd2hpY2ggYXJlIHRoZW4gdXNlZAogICAgYnkgdGhlIHVn ZW4gZmlmbyBjb2RlLiAgVGhlc2Ugc3RydWN0IGNvbnRhaW5zIGFuIGFycmF5IG9mIHBvaW50 ZXJzCiAgICB3aGljaCByZXF1aXJlcyB0cmFuc2xhdGlvbi4gIFdlIGNoYW5nZSB0aGUgaW50 ZXJmYWNlcyBhcm91bmQKICAgIHN0cnVjdCB1c2JfZnNfZW5kcG9pbnQgYXMgZm9sbG93czoK ICAgICAtIFdlIHN0b3JlIHRoZSBzaXplIG9mIHN0cnVjdCB1c2JfZnNfZW5kcG9pbnQgaW4g c3RydWN0IHVzYl9maWZvCiAgICAgICBpbiB0aGUgVVNCX0ZTX0lOSVQgaGFuZGxlciBzbyB3 ZSBrbm93IHRoZSBBQkkgb2YgdGhlIHVzZXJzcGFjZQogICAgICAgYXJyYXkuCiAgICAgLSBB UElzIHRvIG1hbmlwdWxhdGUgdXNlcnNwYWNlIHN0cnVjdCB1c2JfZnNfZW5kcG9pbnQgb2Jq ZWN0cyBub3cKICAgICAgIHRha2UgYSBzdHJ1Y3QgdXNiX2ZpZm8gYW5kIGFuIGluZGV4IHJh dGhlciB0aGFuIGEgcG9pbnRlciB0bwogICAgICAgdGhlIG9iamVjdC4gIFRoaXMgYWxsb3dz IG1vc3QgY29kZSB0byByZW1haW4gb2JsaXZpb3VzIHRvIHRoZQogICAgICAgZGlmZmVyZW50 IHN0cnVjdCB1c2JfZnNfZW5kcG9pbnQgc2l6ZXMuCiAgICAgLSBBZGQgdWdlbl9mc19jb3B5 aW4oKSB3aGljaCBjb3BpZXMgdGhlIHN0cnVjdCB1c2JfZnNfZW5kcG9pbnQKICAgICAgIGZy b20gdXNlcnNwYWNlLCB0aHVua2luZyBpdCB0byB0aGUgbmF0aXZlIHNpemUgaWYgcmVxdWly ZWQuCiAgICAgLSBVc2VzIG9mIHN0cnVjdCB1c2JfZnNfZW5kcG9pbnQncyBwcEJ1ZmZlciBt ZW1iZXIgYXJlIG5vdwogICAgICAgdmlhIHVnZW5fZnNfZ2V0YnVmZmVyKCkgd2hpY2ggcHJv ZHVjZXMgYSBuYXRpdmUgcG9pbnRlci4KICAgICAtIFVwZGF0ZXMgdG8gdXNlcnNwYWNlIGFy ZSBub3cgaGFuZGxlZCBieSB1Z2VuX2ZzX3VwZGF0ZSgpLgogICAgCiAgICBGb3IgY2xhcml0 eSwgc2luZ2xlLCBmaXhlZC1zaXplZCBtZW1iZXJzIG5vdyBhcmUgYWNjZXNzZWQgd2l0aAog ICAgZnVld29yZC9zdXdvcmQgcmF0aGVyIHRoYW4gY29weWluL2NvcHlvdXQuCiAgICAKICAg IFJldmlld2VkIGJ5OiAgICBoc2VsYXNreSwganJ0YzI3IChwcmlvciB2ZXJzaW9uKQogICAg CiAgICAoY2hlcnJ5IHBpY2tlZCBmcm9tIGNvbW1pdCAwZWM1OTBkMjRlNDE1ZGQzNmUzODY0 ODYzMGEwYjk2MzQxMmFkODdlKQogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgOGI2 MDQxOWI3OThhZTkwNDk5ODhjNTI5ZTZhZjNmMzEzYTVjY2U1NSkKCmNvbW1pdCA1MTg2MWU1 ODIwNTIxM2E1ZmE1ODVhMGNjOTE3MTNiNWZhNzVmMWNkCkF1dGhvcjogSGFucyBQZXR0ZXIg U2VsYXNreSA8aHNlbGFza3lARnJlZUJTRC5vcmc+CkRhdGU6ICAgVGh1IEphbiAyNiAxMzo1 Njo1MSAyMDIzICswMTAwCgogICAgbGlidXNiKDMpOiBJbXBsZW1lbnQgbGlidXNiX2luaXRf Y29udGV4dCgpIGFuZCB0aGUgbmVlZGVkIHN0cnVjdHVyZXMgYW5kIGRlZmluaXRpb25zLgog ICAgCiAgICBEaWZmZXJlbnRpYWwgUmV2aXNpb246ICBodHRwczovL3Jldmlld3MuZnJlZWJz ZC5vcmcvRDM4MjEyCiAgICBTcG9uc29yZWQgYnk6ICAgTlZJRElBIE5ldHdvcmtpbmcKICAg IAogICAgKGNoZXJyeSBwaWNrZWQgZnJvbSBjb21taXQgNGM2YmNmZmQwNGY5ZDBiNmNiNTdh ZjBmZmNjOWJlMzA5OGZlOTUwYykK --------------FjPEi1r80DdSRA60J4gSGdW3-- From nobody Sat Apr 29 18:01:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7y3Q4Wghz484VT; Sat, 29 Apr 2023 18:01: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 4Q7y3Q4NLLz3GYd; Sat, 29 Apr 2023 18:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++FEwzJ4SIpaEihc3GXFN51XG3t7gdwfpKL67sejt84=; b=s0gZliGpSLDB+iT2quW7ucvOS3iyxffeU+TBwqSeIyJ6yYjFqGhX8/iMpqSj/cplLovsf6 x5SsB59apZztitd4DrtVG1JRoqhvL0O1ii8SfhgvsTfW+nAG33ntLTYa7yjrGtHD5NkEWI 3GNipX//nhx03ZVS++a50GNqNUwC2JsWE8X17jppCbY6RCFg+EbxFz/gmkWmizGkX9xJC7 9JZgJvEr+dW3msff+z9sn53RFJrEzbU4EtjO+hnF6gTqyhc4iDgeYednmdeNhP6esmWPQH MyAJztv2M1JbcsBnSlg5k49hjxLcvUux5+GBaAYzhiJ666rxil90mVEgj0l1lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++FEwzJ4SIpaEihc3GXFN51XG3t7gdwfpKL67sejt84=; b=rQIhRhkAPWylHK6CYaMtQp4vMC69FMXcMQldXw+fPYSMIEjgGahdEG76ZyDU/ErT8oDXzd GZGwXf54Jrh421DIkM7ka1NxbwMwvLp+y+2kCmFwGxBFkOefIOWED1NqmuyobYWIfdTgLL o80e8MvNPw1+iFIja3lBL+J3G72MA5BG343YfNePVBKXB603zppOdTAya4LJAy0pupGK2l y3cR8b89HwQ95m3Rts+ncHDLBa0oKBHyS/EmGik7tr5Ap1qNmkPpRjn6HVP0Qy1H5h1CL6 +llToT6SxpFmbAXclFGz7Is7SKFQolYjI7Hz0+SW3NChK8bkMg9dKTfF9vY0ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682791314; a=rsa-sha256; cv=none; b=COea7+lgEUVM8fksToNh389yaVLkGVhGp/4EUct9KuBqXbF2gzDxBLJ0u30+Tn1MWMvk0/ wkwm2GOkqzWixWx+56Do81SBYqGroSpZ89QFW+wZlzN5OlKt25uw9YnEEJADctYE9bF9Ap NDX+FcCpfnWaQhJMTE90P3TbBhSZn+0BNhwdIXKAR8qy270XLWi5niS/HC1u8D1PwC/WpP uvinpitjVRMsbKXoVAkm/R/bMmyArrRWtRLwxNH3qfAID0tfABYbYe/4grMixP3editjP4 6GmKAyWbaGkUo9goe5Kb3/egOeayFDfrR435x2Cp+mMGP78ZtI06NyMnCSH4Zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7y3Q3TD2zrvT; Sat, 29 Apr 2023 18:01:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33TI1srq001504; Sat, 29 Apr 2023 18:01:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TI1sUW001503; Sat, 29 Apr 2023 18:01:54 GMT (envelope-from git) Date: Sat, 29 Apr 2023 18:01:54 GMT Message-Id: <202304291801.33TI1sUW001503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 427b3d970ad9 - stable/13 - Improvement in UFS/FFS directory placement when doing mkdir(2). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 427b3d970ad9f255e5c72e98f6d8eb62baf8dcea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=427b3d970ad9f255e5c72e98f6d8eb62baf8dcea commit 427b3d970ad9f255e5c72e98f6d8eb62baf8dcea Author: Kirk McKusick AuthorDate: 2023-03-30 04:09:39 +0000 Commit: Kirk McKusick CommitDate: 2023-04-29 18:01:47 +0000 Improvement in UFS/FFS directory placement when doing mkdir(2). Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39246 (cherry picked from commit fe5e6e2cc5d6f2e4121eccdb3a8ceba646aef2c9) --- sbin/fsck_ffs/dir.c | 107 +++++++++++++++++++++++++++++++++++++++++++--- sbin/fsck_ffs/fsck.h | 4 +- sbin/fsck_ffs/inode.c | 1 + sbin/fsck_ffs/pass1.c | 11 ++--- sbin/fsck_ffs/pass2.c | 13 ++++-- sbin/fsck_ffs/pass3.c | 4 +- sbin/fsdb/fsdb.c | 2 +- sbin/newfs/mkfs.c | 10 +++-- sys/ufs/ffs/ffs_alloc.c | 73 +++++++++++++++++++------------ sys/ufs/ffs/ffs_softdep.c | 26 ++++++----- sys/ufs/ufs/dinode.h | 10 ++++- sys/ufs/ufs/ufs_vnops.c | 5 +++ 12 files changed, 204 insertions(+), 62 deletions(-) diff --git a/sbin/fsck_ffs/dir.c b/sbin/fsck_ffs/dir.c index 64e477c66ed8..cc5305c390a4 100644 --- a/sbin/fsck_ffs/dir.c +++ b/sbin/fsck_ffs/dir.c @@ -88,12 +88,97 @@ propagate(void) if (inoinfo(inp->i_parent)->ino_state == DFOUND && INO_IS_DUNFOUND(inp->i_number)) { inoinfo(inp->i_number)->ino_state = DFOUND; + check_dirdepth(inp); change++; } } } while (change > 0); } +/* + * Check that the recorded depth of the directory is correct. + */ +void +check_dirdepth(struct inoinfo *inp) +{ + struct inoinfo *parentinp; + struct inode ip; + union dinode *dp; + int saveresolved; + static int updateasked, dirdepthupdate; + + if ((parentinp = getinoinfo(inp->i_parent)) == NULL) { + pfatal("check_dirdepth: UNKNOWN PARENT DIR"); + return; + } + /* + * If depth is correct, nothing to do. + */ + if (parentinp->i_depth + 1 == inp->i_depth) + return; + /* + * Only the root inode should have depth of 0, so if any other + * directory has a depth of 0 then this is an old filesystem + * that has not been tracking directory depth. Ask just once + * whether it should start tracking directory depth. + */ + if (inp->i_depth == 0 && updateasked == 0) { + updateasked = 1; + if (preen) { + pwarn("UPDATING FILESYSTEM TO TRACK DIRECTORY DEPTH"); + dirdepthupdate = 1; + } else { + /* + * The file system can be marked clean even if + * a directory does not have the right depth. + * Hence, resolved should not be cleared when + * the filesystem does not update directory depths. + */ + saveresolved = resolved; + dirdepthupdate = + reply("UPDATE FILESYSTEM TO TRACK DIRECTORY DEPTH"); + resolved = saveresolved; + } + } + /* + * If we are not converting, nothing more to do. + */ + if (inp->i_depth == 0 && dirdepthupdate == 0) + return; + /* + * Individual directory at wrong depth. Report it and correct if + * in preen mode or ask if in interactive mode. Note that if a + * directory is renamed to a new location that is at a different + * level in the tree, its depth will be recalculated, but none of + * the directories that it contains will be updated. Thus it is + * not unexpected to find directories with incorrect depths. No + * operational harm will come from this though new directory + * placement in the subtree may not be as optimal until the depths + * of the affected directories are corrected. + * + * To avoid much spurious output on otherwise clean filesystems + * we only generate detailed output when the debug flag is given. + */ + ginode(inp->i_number, &ip); + dp = ip.i_dp; + if (inp->i_depth != 0 && debug) { + pwarn("DIRECTORY"); + prtinode(&ip); + printf(" DEPTH %d SHOULD BE %d", inp->i_depth, + parentinp->i_depth + 1); + if (preen == 0 && reply("ADJUST") == 0) { + irelse(&ip); + return; + } + if (preen) + printf(" (ADJUSTED)\n"); + } + inp->i_depth = parentinp->i_depth + 1; + DIP_SET(dp, di_dirdepth, inp->i_depth); + inodirty(&ip); + irelse(&ip); +} + /* * Scan each entry in a directory block. */ @@ -471,7 +556,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) { struct inode ip; union dinode *dp; - int lostdir; + int lostdir, depth; ino_t oldlfdir; struct inoinfo *inp; struct inodesc idesc; @@ -546,7 +631,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) irelse(&ip); return (0); } - if ((changeino(UFS_ROOTINO, lfname, lfdir) & ALTERED) == 0) { + if ((changeino(UFS_ROOTINO, lfname, lfdir, 1) & ALTERED) == 0) { pfatal("SORRY. CANNOT CREATE lost+found DIRECTORY\n\n"); irelse(&ip); return (0); @@ -575,7 +660,8 @@ linkup(ino_t orphan, ino_t parentdir, char *name) } inoinfo(orphan)->ino_linkcnt--; if (lostdir) { - if ((changeino(orphan, "..", lfdir) & ALTERED) == 0 && + depth = DIP(dp, di_dirdepth) + 1; + if ((changeino(orphan, "..", lfdir, depth) & ALTERED) == 0 && parentdir != (ino_t)-1) (void)makeentry(orphan, lfdir, ".."); DIP_SET(dp, di_nlink, DIP(dp, di_nlink) + 1); @@ -607,7 +693,7 @@ linkup(ino_t orphan, ino_t parentdir, char *name) * fix an entry in a directory. */ int -changeino(ino_t dir, const char *name, ino_t newnum) +changeino(ino_t dir, const char *name, ino_t newnum, int depth) { struct inodesc idesc; struct inode ip; @@ -621,7 +707,10 @@ changeino(ino_t dir, const char *name, ino_t newnum) idesc.id_name = strdup(name); idesc.id_parent = newnum; /* new value for name */ ginode(dir, &ip); - error = ckinode(ip.i_dp, &idesc); + if (((error = ckinode(ip.i_dp, &idesc)) & ALTERED) && newnum != 0) { + DIP_SET(ip.i_dp, di_dirdepth, depth); + getinoinfo(dir)->i_depth = depth; + } free(idesc.id_name); irelse(&ip); return (error); @@ -815,8 +904,8 @@ allocdir(ino_t parent, ino_t request, int mode) struct inode ip; union dinode *dp; struct bufarea *bp; - struct inoinfo *inp; struct dirtemplate *dirp; + struct inoinfo *inp, *parentinp; ino = allocino(request, IFDIR|mode); if (ino == 0) @@ -859,6 +948,12 @@ allocdir(ino_t parent, ino_t request, int mode) inp->i_parent = parent; inp->i_dotdot = parent; inp->i_flags |= INFO_NEW; + if ((parentinp = getinoinfo(inp->i_parent)) == NULL) { + pfatal("allocdir: UNKNOWN PARENT DIR"); + } else { + inp->i_depth = parentinp->i_depth + 1; + DIP_SET(dp, di_dirdepth, inp->i_depth); + } inoinfo(ino)->ino_type = DT_DIR; inoinfo(ino)->ino_state = inoinfo(parent)->ino_state; if (inoinfo(ino)->ino_state == DSTATE) { diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 94ec59004b86..5ce5ca9e29a5 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -309,6 +309,7 @@ struct inoinfo { ino_t i_parent; /* inode number of parent */ ino_t i_dotdot; /* inode number of `..' */ size_t i_isize; /* size of inode */ + u_int i_depth; /* depth of directory from root */ u_int i_flags; /* flags, see below */ u_int i_numblks; /* size of block array in bytes */ ufs2_daddr_t i_blks[1]; /* actually longer */ @@ -463,9 +464,10 @@ void catch(int); void catchquit(int); void cgdirty(struct bufarea *); struct bufarea *cglookup(int cg); -int changeino(ino_t dir, const char *name, ino_t newnum); +int changeino(ino_t dir, const char *name, ino_t newnum, int depth); void check_blkcnt(struct inode *ip); int check_cgmagic(int cg, struct bufarea *cgbp, int requestrebuild); +void check_dirdepth(struct inoinfo *inp); int chkrange(ufs2_daddr_t blk, int cnt); void ckfini(int markclean); int ckinode(union dinode *dp, struct inodesc *); diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 947e5e0cbc08..a46fea0607a0 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -1135,6 +1135,7 @@ cacheino(union dinode *dp, ino_t inumber) inp->i_dotdot = (ino_t)0; inp->i_number = inumber; inp->i_isize = DIP(dp, di_size); + inp->i_depth = DIP(dp, di_dirdepth); inp->i_numblks = blks; for (i = 0; i < MIN(blks, UFS_NDADDR); i++) inp->i_blks[i] = DIP(dp, di_db[i]); diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index 5f1ad8ecb686..afe9f7f2b789 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -388,14 +388,15 @@ checkinode(ino_t inumber, struct inodesc *idesc, int rebuildcg) n_files++; inoinfo(inumber)->ino_linkcnt = DIP(dp, di_nlink); if (mode == IFDIR) { - if (DIP(dp, di_size) == 0) + if (DIP(dp, di_size) == 0) { inoinfo(inumber)->ino_state = DCLEAR; - else if (DIP(dp, di_nlink) <= 0) + } else if (DIP(dp, di_nlink) <= 0) { inoinfo(inumber)->ino_state = DZLINK; - else + } else { inoinfo(inumber)->ino_state = DSTATE; - cacheino(dp, inumber); - countdirs++; + cacheino(dp, inumber); + countdirs++; + } } else if (DIP(dp, di_nlink) <= 0) inoinfo(inumber)->ino_state = FZLINK; else diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index abe14549e6f4..8200209cc03e 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -210,8 +210,10 @@ pass2(void) if (inp->i_parent == 0 || inp->i_isize == 0) continue; if (inoinfo(inp->i_parent)->ino_state == DFOUND && - INO_IS_DUNFOUND(inp->i_number)) + INO_IS_DUNFOUND(inp->i_number)) { inoinfo(inp->i_number)->ino_state = DFOUND; + check_dirdepth(inp); + } if (inp->i_dotdot == inp->i_parent || inp->i_dotdot == (ino_t)-1) continue; @@ -271,7 +273,8 @@ pass2(void) inoinfo(inp->i_dotdot)->ino_linkcnt++; inoinfo(inp->i_parent)->ino_linkcnt--; inp->i_dotdot = inp->i_parent; - (void)changeino(inp->i_number, "..", inp->i_parent); + (void)changeino(inp->i_number, "..", inp->i_parent, + getinoinfo(inp->i_parent)->i_depth + 1); } /* * Mark all the directories that can be found from the root. @@ -548,10 +551,12 @@ again: case DFOUND: inp = getinoinfo(dirp->d_ino); if (idesc->id_entryno > 2) { - if (inp->i_parent == 0) + if (inp->i_parent == 0) { inp->i_parent = idesc->id_number; - else if ((n = fix_extraneous(inp, idesc)) == 1) + check_dirdepth(inp); + } else if ((n = fix_extraneous(inp, idesc))) { break; + } } /* FALLTHROUGH */ diff --git a/sbin/fsck_ffs/pass3.c b/sbin/fsck_ffs/pass3.c index 22cb0393905b..b9d24f18371b 100644 --- a/sbin/fsck_ffs/pass3.c +++ b/sbin/fsck_ffs/pass3.c @@ -74,7 +74,7 @@ pass3(void) if (inp->i_number == UFS_ROOTINO || (inp->i_parent != 0 && !S_IS_DUNFOUND(state))) continue; - if (state == DCLEAR) + if (state == DCLEAR || state == DZLINK) continue; /* * If we are running with soft updates and we come @@ -102,6 +102,7 @@ pass3(void) inoinfo(lfdir)->ino_linkcnt--; } inoinfo(orphan)->ino_state = DFOUND; + check_dirdepth(inp); propagate(); continue; } @@ -127,6 +128,7 @@ pass3(void) } irelse(&ip); inoinfo(orphan)->ino_state = DFOUND; + check_dirdepth(inp); propagate(); } } diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index c935f88952b4..4d66194bf86d 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -781,7 +781,7 @@ CMDFUNCSTART(rm) if (!checkactivedir()) return 1; - rval = changeino(curinum, argv[1], 0); + rval = changeino(curinum, argv[1], 0, 0); if (rval & ALTERED) { printf("Name `%s' removed\n", argv[1]); return 0; diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index 6fc6a2475075..3d19fc88fd79 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -912,8 +912,9 @@ fsinit(time_t utime) alloc(sblock.fs_fsize, node.dp1.di_mode); node.dp1.di_blocks = btodb(fragroundup(&sblock, node.dp1.di_size)); - wtfs(fsbtodb(&sblock, node.dp1.di_db[0]), - sblock.fs_fsize, iobuf); + node.dp1.di_dirdepth = 1; + wtfs(fsbtodb(&sblock, node.dp1.di_db[0]), + sblock.fs_fsize, iobuf); iput(&node, UFS_ROOTINO + 1); } } else { @@ -948,8 +949,9 @@ fsinit(time_t utime) alloc(sblock.fs_fsize, node.dp2.di_mode); node.dp2.di_blocks = btodb(fragroundup(&sblock, node.dp2.di_size)); - wtfs(fsbtodb(&sblock, node.dp2.di_db[0]), - sblock.fs_fsize, iobuf); + node.dp2.di_dirdepth = 1; + wtfs(fsbtodb(&sblock, node.dp2.di_db[0]), + sblock.fs_fsize, iobuf); iput(&node, UFS_ROOTINO + 1); } } diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c index 4b0c7b108cb6..6d37afcfadf6 100644 --- a/sys/ufs/ffs/ffs_alloc.c +++ b/sys/ufs/ffs/ffs_alloc.c @@ -1179,6 +1179,8 @@ retry: } ip->i_flags = 0; DIP_SET(ip, i_flags, 0); + if ((mode & IFMT) == IFDIR) + DIP_SET(ip, i_dirdepth, DIP(pip, i_dirdepth) + 1); /* * Set up a new generation number for this inode. */ @@ -1238,10 +1240,10 @@ static ino_t ffs_dirpref(struct inode *pip) { struct fs *fs; - int cg, prefcg, dirsize, cgsize; + int cg, prefcg, curcg, dirsize, cgsize; + int depth, range, start, end, numdirs, power, numerator, denominator; u_int avgifree, avgbfree, avgndir, curdirsize; u_int minifree, minbfree, maxndir; - u_int mincg, minndir; u_int maxcontigdirs; mtx_assert(UFS_MTX(ITOUMP(pip)), MA_OWNED); @@ -1252,35 +1254,53 @@ ffs_dirpref(struct inode *pip) avgndir = fs->fs_cstotal.cs_ndir / fs->fs_ncg; /* - * Force allocation in another cg if creating a first level dir. - */ - ASSERT_VOP_LOCKED(ITOV(pip), "ffs_dirpref"); - if (ITOV(pip)->v_vflag & VV_ROOT) { - prefcg = arc4random() % fs->fs_ncg; - mincg = prefcg; - minndir = fs->fs_ipg; - for (cg = prefcg; cg < fs->fs_ncg; cg++) - if (fs->fs_cs(fs, cg).cs_ndir < minndir && - fs->fs_cs(fs, cg).cs_nifree >= avgifree && - fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { - mincg = cg; - minndir = fs->fs_cs(fs, cg).cs_ndir; - } - for (cg = 0; cg < prefcg; cg++) - if (fs->fs_cs(fs, cg).cs_ndir < minndir && - fs->fs_cs(fs, cg).cs_nifree >= avgifree && - fs->fs_cs(fs, cg).cs_nbfree >= avgbfree) { - mincg = cg; - minndir = fs->fs_cs(fs, cg).cs_ndir; - } - return ((ino_t)(fs->fs_ipg * mincg)); - } + * Select a preferred cylinder group to place a new directory. + * If we are near the root of the filesystem we aim to spread + * them out as much as possible. As we descend deeper from the + * root we cluster them closer together around their parent as + * we expect them to be more closely interactive. Higher-level + * directories like usr/src/sys and usr/src/bin should be + * separated while the directories in these areas are more + * likely to be accessed together so should be closer. + * + * We pick a range of cylinder groups around the cylinder group + * of the directory in which we are being created. The size of + * the range for our search is based on our depth from the root + * of our filesystem. We then probe that range based on how many + * directories are already present. The first new directory is at + * 1/2 (middle) of the range; the second is in the first 1/4 of the + * range, then at 3/4, 1/8, 3/8, 5/8, 7/8, 1/16, 3/16, 5/16, etc. + */ + depth = DIP(pip, i_dirdepth); + range = fs->fs_ncg / (1 << depth); + curcg = ino_to_cg(fs, pip->i_number); + start = curcg - (range / 2); + if (start < 0) + start += fs->fs_ncg; + end = curcg + (range / 2); + if (end >= fs->fs_ncg) + end -= fs->fs_ncg; + numdirs = pip->i_effnlink - 1; + power = fls(numdirs); + numerator = (numdirs & ~(1 << (power - 1))) * 2 + 1; + denominator = 1 << power; + prefcg = (curcg - (range / 2) + (range * numerator / denominator)); + if (prefcg < 0) + prefcg += fs->fs_ncg; + if (prefcg >= fs->fs_ncg) + prefcg -= fs->fs_ncg; + /* + * If this filesystem is not tracking directory depths, + * revert to the old algorithm. + */ + if (depth == 0 && pip->i_number != UFS_ROOTINO) + prefcg = curcg; /* * Count various limits which used for * optimal allocation of a directory inode. */ - maxndir = min(avgndir + fs->fs_ipg / 16, fs->fs_ipg); + maxndir = min(avgndir + (1 << depth), fs->fs_ipg); minifree = avgifree - avgifree / 4; if (minifree < 1) minifree = 1; @@ -1324,7 +1344,6 @@ ffs_dirpref(struct inode *pip) * in new cylinder groups so finds every possible block after * one pass over the filesystem. */ - prefcg = ino_to_cg(fs, pip->i_number); for (cg = prefcg; cg < fs->fs_ncg; cg++) if (fs->fs_cs(fs, cg).cs_ndir < maxndir && fs->fs_cs(fs, cg).cs_nifree >= minifree && diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index d784d8d0fd1a..ff72dad97250 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -12485,17 +12485,6 @@ softdep_update_inodeblock( KASSERT(MOUNTEDSOFTDEP(mp) != 0, ("softdep_update_inodeblock called on non-softdep filesystem")); fs = ump->um_fs; - /* - * Preserve the freelink that is on disk. clear_unlinked_inodedep() - * does not have access to the in-core ip so must write directly into - * the inode block buffer when setting freelink. - */ - if (fs->fs_magic == FS_UFS1_MAGIC) - DIP_SET(ip, i_freelink, ((struct ufs1_dinode *)bp->b_data + - ino_to_fsbo(fs, ip->i_number))->di_freelink); - else - DIP_SET(ip, i_freelink, ((struct ufs2_dinode *)bp->b_data + - ino_to_fsbo(fs, ip->i_number))->di_freelink); /* * If the effective link count is not equal to the actual link * count, then we must track the difference in an inodedep while @@ -12511,6 +12500,21 @@ again: panic("softdep_update_inodeblock: bad link count"); return; } + /* + * Preserve the freelink that is on disk. clear_unlinked_inodedep() + * does not have access to the in-core ip so must write directly into + * the inode block buffer when setting freelink. + */ + if ((inodedep->id_state & UNLINKED) != 0) { + if (fs->fs_magic == FS_UFS1_MAGIC) + DIP_SET(ip, i_freelink, + ((struct ufs1_dinode *)bp->b_data + + ino_to_fsbo(fs, ip->i_number))->di_freelink); + else + DIP_SET(ip, i_freelink, + ((struct ufs2_dinode *)bp->b_data + + ino_to_fsbo(fs, ip->i_number))->di_freelink); + } KASSERT(ip->i_nlink >= inodedep->id_nlinkdelta, ("softdep_update_inodeblock inconsistent ip %p i_nlink %d " "inodedep %p id_nlinkdelta %jd", diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index 840a4cc7d40f..e4a424abe2e6 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -156,7 +156,10 @@ struct ufs2_dinode { [(UFS_NDADDR + UFS_NIADDR) * sizeof(ufs2_daddr_t)]; }; u_int64_t di_modrev; /* 232: i_modrev for NFSv4 */ - uint32_t di_freelink; /* 240: SUJ: Next unlinked inode. */ + union { + uint32_t di_freelink; /* 240: SUJ: Next unlinked inode. */ + uint32_t di_dirdepth; /* 240: IFDIR: depth from root dir */ + }; uint32_t di_ckhash; /* 244: if CK_INODE, its check-hash */ uint32_t di_spare[2]; /* 248: Reserved; currently unused */ }; @@ -179,7 +182,10 @@ struct ufs2_dinode { struct ufs1_dinode { u_int16_t di_mode; /* 0: IFMT, permissions; see below. */ int16_t di_nlink; /* 2: File link count. */ - uint32_t di_freelink; /* 4: SUJ: Next unlinked inode. */ + union { + uint32_t di_freelink; /* 4: SUJ: Next unlinked inode. */ + uint32_t di_dirdepth; /* 4: IFDIR: depth from root dir */ + }; u_int64_t di_size; /* 8: File byte count. */ int32_t di_atime; /* 16: Last access time. */ int32_t di_atimensec; /* 20: Last access time. */ diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 1ebb3597b925..985641b02378 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -1723,6 +1723,10 @@ relock: * and ".." set to point to the new parent. */ if (doingdirectory && newparent) { + /* + * Set the directory depth based on its new parent. + */ + DIP_SET(fip, i_dirdepth, DIP(tdp, i_dirdepth) + 1); /* * If tip exists we simply use its link, otherwise we must * add a new one. @@ -2136,6 +2140,7 @@ ufs_mkdir( ip->i_effnlink = 2; ip->i_nlink = 2; DIP_SET(ip, i_nlink, 2); + DIP_SET(ip, i_dirdepth, DIP(dp,i_dirdepth) + 1); if (cnp->cn_flags & ISWHITEOUT) { ip->i_flags |= UF_OPAQUE; From nobody Sat Apr 29 18:08:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7yBV6kjXz483lQ; Sat, 29 Apr 2023 18:08: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 4Q7yBV6DDRz3H6X; Sat, 29 Apr 2023 18:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUh0jZTzgSzUPaCXvi0NIbOtgmT9YlM/i7WZXt3QtGk=; b=IGcD25ZEh6gZb0+pj8UX+/PeFTsgG9+u9N1owrk5HSp80+bHrM77a6TOtBgEgtOU3yudD2 tNBRBe6NZhs0a3VvsPggIsA2Zg+1AUG7u9q3NP3UQlsbxegQIxEg/E/k+0aDY6lhmtEVIg e6sUerLti2aouAm58ngowcK9Ry35xtDlSWKKwudSoSF44g/YT5pbYipn5cGl8MTTTdnd6j V5OcaBpqsur35VtXgZDUPy4/HoWMx1sI3wC+zFvfGOU34/sJINVDZSpe79rxyvAIUJeFyU iDodvoivAE1bMIYu1UfK0tKdGl8oIEPzQdwWBVTjLSlTB2npydPnOWiA3PIbCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUh0jZTzgSzUPaCXvi0NIbOtgmT9YlM/i7WZXt3QtGk=; b=W1RVbGTabOtumnapWMUsX6iGxsmD8j5CVFB9FVJcwySegjrk+UabcKS8NHAjc+rqZ8B1Zf 8l0IAaUs1fSe9/Ovhl+kNQzqfG0ovDyWMI4Giky6JuhHnwHKfK3GYcxapAdAd1rQMcHuC7 NuXi65DqKFFi+RcypyZsGpuvG1Y2UsjDcsvO6a9XQMyTV/o2BmTuNAdhS2uRrZnOQF43Od Epjd8KV9JHvVaaVdHxH+Emug652F78+9KwqNBfAbJQ7ek9RzefVKLI+5drvJDKT/W4E+5v tyr4mYl6OwhMlRso+Vv0VQPEHHeoisW+Zl7fCSJnWcxWSeNwLQwlQDeRBFdE6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682791682; a=rsa-sha256; cv=none; b=GnPQ3TbOYJoAbLJOTwYFivFNlzam0uDxg4PZZtj3y0v1bhjA8rSwVP6rh8g61cnXHZhkib 5KR+l/Si5qNVGqi42eyXcq4vRqi0fXcuVZ/FHcnyN7SbGV0xc/6cZzCWZBtB262GyJaRx8 kJvcBjClWxsvxvjYoIqi2RQYB8YrCAzYLnvvzrxLrzCdDHqyQViWapfa6gCpZ2MWoQWYhB DXCIc8mMtVOF8lR4qjX/mFCc3Tzc8LGOVrJQUyz584gZUMS2RowBXJwId9p91FlhqJ18Le dJ+KBA6XYjQPmGMS+QWgbqbE0EY1urYSiE0I4hC7OJ/hmOxDW8zakoi2Qn7IFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7yBV5GNszrxx; Sat, 29 Apr 2023 18:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33TI82K9003237; Sat, 29 Apr 2023 18:08:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TI82JA003236; Sat, 29 Apr 2023 18:08:02 GMT (envelope-from git) Date: Sat, 29 Apr 2023 18:08:02 GMT Message-Id: <202304291808.33TI82JA003236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 146ba7a1d60c - stable/13 - Add `chdb' command to fsdb(8) to set direct block numbers. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 146ba7a1d60c7ab8959d41ccfdd2543cc5d18b34 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=146ba7a1d60c7ab8959d41ccfdd2543cc5d18b34 commit 146ba7a1d60c7ab8959d41ccfdd2543cc5d18b34 Author: Kirk McKusick AuthorDate: 2023-04-18 05:42:32 +0000 Commit: Kirk McKusick CommitDate: 2023-04-29 18:04:53 +0000 Add `chdb' command to fsdb(8) to set direct block numbers. (cherry picked from commit 7636973c68f15419a71bc8e4253b2fbae3258025) --- sbin/fsdb/fsdb.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c index 4d66194bf86d..f907ea160a16 100644 --- a/sbin/fsdb/fsdb.c +++ b/sbin/fsdb/fsdb.c @@ -161,6 +161,7 @@ CMDFUNC(chatime); /* Change atime */ CMDFUNC(chinum); /* Change inode # of dirent */ CMDFUNC(chname); /* Change dirname of dirent */ CMDFUNC(chsize); /* Change size */ +CMDFUNC(chdb); /* Change direct block pointer */ struct cmdtable cmds[] = { { "help", "Print out help", 1, 1, FL_RO, helpfn }, @@ -195,6 +196,7 @@ struct cmdtable cmds[] = { { "mtime", "Change mtime of current inode to MTIME", 2, 2, FL_WR, chmtime }, { "ctime", "Change ctime of current inode to CTIME", 2, 2, FL_WR, chctime }, { "atime", "Change atime of current inode to ATIME", 2, 2, FL_WR, chatime }, + { "chdb", "Change db pointer N of current inode to BLKNO", 3, 3, FL_WR, chdb }, { "quit", "Exit", 1, 1, FL_RO, quit }, { "q", "Exit", 1, 1, FL_RO, quit }, { "exit", "Exit", 1, 1, FL_RO, quit }, @@ -1046,6 +1048,36 @@ CMDFUNCSTART(chsize) return rval; } +CMDFUNC(chdb) +{ + unsigned int idx; + daddr_t bno; + char *cp; + + if (!checkactive()) + return 1; + + idx = strtoull(argv[1], &cp, 0); + if (cp == argv[1] || *cp != '\0') { + warnx("bad pointer idx `%s'", argv[1]); + return 1; + } + bno = strtoll(argv[2], &cp, 0); + if (cp == argv[2] || *cp != '\0') { + warnx("bad block number `%s'", argv[2]); + return 1; + } + if (idx >= UFS_NDADDR) { + warnx("pointer index %d is out of range", idx); + return 1; + } + + DIP_SET(curinode, di_db[idx], bno); + inodirty(&curip); + printactive(0); + return 0; +} + CMDFUNCSTART(linkcount) { int rval = 1; From nobody Sat Apr 29 18:11:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7yFy4D27z484Xf; Sat, 29 Apr 2023 18:11: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 4Q7yFy3XjBz3HXJ; Sat, 29 Apr 2023 18:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onifTwhC1zRluxUt573QI+HxHM2yUnJCSHLvbYjYlok=; b=RicWbCXukJQW1C3ROXor69M8jFc6V2S4qdJaWHY2lLqrUXrqfk53E+wLvs+8Gj6v6x3vvl 8igSNm5VRNtSdXkYCxv+CGIpEblKD1AU0GRLTTMMQBv8S+mNFoPSVRKYHXPSkEQJWk/TNg 1hdVX2M9j0PkV0FBu4ZhiS4JbI409gp/nR2i0qFQU0NMYy9HCdMb9y35t4mSPFYcb357aU XacFBrCYzfPxv554bn+cfUedrCqDfAhjnMba3oTcYt/PF89MlnzRJDOpKLhKzeZyS6Fr2j U3w56UaYEbONkNi7eD+HhQo9GpSG5cWoVQgqQm0GhxC4mp319G0uB7/W22EXbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682791862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onifTwhC1zRluxUt573QI+HxHM2yUnJCSHLvbYjYlok=; b=t289pfI7H5B7+je+JDd9gL2efj7UAr2apuBi9mHqJ+4Mo1VWhe5XboAW7a2SaoMuf8J24R mLniUO8swZ+W6MHzGDFsBTPM/N+ENe2M/mmeXz8S9sO7RJrZ1I2e9bAnOAA0m/gbiDer53 2L5QRi5XoF9WI3nBRCEXXEvwYeYglCLXrlSpg0Z17Vk2EBge9mt+Z9UDnAkm4XDcE/yrCA 4EwfxQp800JkKeoOTbsu4rHfPM6brmoFWzQjIW40vSKxZxUJwsU1yzAOIpW1U1w+v98dnr jnQ1Yz4KK01DArGh09ITaVbPCWh+5zN2rbom2hEMi1KcoMvSnoRHqCwVCKMu0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682791862; a=rsa-sha256; cv=none; b=nVenGzRr29NAwdg5vMU61pEAhf7L1ZiagdDUIF+dLvByBymVAngETIVJqY7JxSS/fwvt3e 16DeRiPLAYatdFZZk2MVuSvqWs5251rHz2V0RIZi+GmWLNWqax6Py4r4m0y+53jMd6AKon RImkQZWuh//7Sf5lSw74jqy56wCoQbcH1ZmSnv7vkVtcJnJ6aj0QRw3IBfTUjrHv8l3cNM y+hpifZJ4yw3W/1WCtAGmhoIGCvyx63PXqr2/ms9FXysCOpF32UDXcymOkFm0tAJJth9fQ ex4SVv9mKV7OwLSlahHJ0LVrYR6rjvYHhX9PJJq5bqLNb28Cs30+1TolVAvt6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7yFy2W6wzrY5; Sat, 29 Apr 2023 18:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33TIB2bh016455; Sat, 29 Apr 2023 18:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TIB2mV016454; Sat, 29 Apr 2023 18:11:02 GMT (envelope-from git) Date: Sat, 29 Apr 2023 18:11:02 GMT Message-Id: <202304291811.33TIB2mV016454@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: b180a0773bef - stable/13 - Bug fixes for fsck_ffs(8). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b180a0773bef95880e06b0ee4a1635ab6c077175 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=b180a0773bef95880e06b0ee4a1635ab6c077175 commit b180a0773bef95880e06b0ee4a1635ab6c077175 Author: Kirk McKusick AuthorDate: 2023-04-18 06:03:30 +0000 Commit: Kirk McKusick CommitDate: 2023-04-29 18:09:01 +0000 Bug fixes for fsck_ffs(8). Sponsored by: Netflix (cherry picked from commit 18746531a881356ed24b6ef2fdc9e50707642163) --- sbin/fsck_ffs/fsutil.c | 4 +++- sbin/fsck_ffs/inode.c | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 44b3e50da012..8f5b09cfe610 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -319,8 +319,10 @@ getdatablk(ufs2_daddr_t blkno, long size, int type) * Skip check for inodes because chkrange() considers * metadata areas invalid to write data. */ - if (type != BT_INODES && chkrange(blkno, size / sblock.fs_fsize)) + if (type != BT_INODES && chkrange(blkno, size / sblock.fs_fsize)) { + failedbuf.b_refcnt++; return (&failedbuf); + } bhdp = &bufhashhd[HASH(blkno)]; LIST_FOREACH(bp, bhdp, b_hash) if (bp->b_bno == fsbtodb(&sblock, blkno)) { diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index a46fea0607a0..37b0f9ebc1b1 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -747,6 +747,7 @@ snapremove(ino_t inum) bzero(&snaplist[i - 1], sizeof(struct inode)); snapcnt--; } + memset(&idesc, 0, sizeof(struct inodesc)); idesc.id_type = SNAP; idesc.id_func = snapclean; idesc.id_number = inum; @@ -767,14 +768,15 @@ snapclean(struct inodesc *idesc) if (blkno == 0) return (KEEPON); - bp = idesc->id_bp; dp = idesc->id_dp; if (blkno == BLK_NOCOPY || blkno == BLK_SNAP) { - if (idesc->id_lbn < UFS_NDADDR) + if (idesc->id_lbn < UFS_NDADDR) { DIP_SET(dp, di_db[idesc->id_lbn], 0); - else + } else { + bp = idesc->id_bp; IBLK_SET(bp, bp->b_index, 0); - dirty(bp); + dirty(bp); + } } return (KEEPON); } From nobody Sat Apr 29 18:16:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7yMx15q8z4857B; Sat, 29 Apr 2023 18:16: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 4Q7yMx0T2Dz3JGL; Sat, 29 Apr 2023 18:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682792173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2rZESSbtSe6q1EAPyF3TPNb1FOxulznI6EoTY5sH0w=; b=UmOS/g61TMJMQ2bIIqfqDHPqKcY+VCUPanpbWdsum0osDjbU+IErgK+V57MJLvo2Fagh/9 kUsdnJm6EArniCK5EOjxHfeB+ohj+J49soCZkghnWwHDDL8Wiwlb6a2p5KOrnhgT58VZ0C lZF7ayA5ONJSYxQ9e2MO1KODsVH8rP6mDKIH8NqPrWXW5MeQHI2lub7LMzxPrWdTc6wlBL VaDtbcabvMzNvuViXQ1tGIYmbQcd3X4g+3+gN2GxEH7WO0L79SADxSrv4VqDO2L+dNtVma rxtFMQ72ZNqcinQ9XcMLEFwRhGiYyJKm4qFKP2zkiCd97tbvkCF0bLk30voaIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682792173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g2rZESSbtSe6q1EAPyF3TPNb1FOxulznI6EoTY5sH0w=; b=sYgFP/hbTIquh+yrIXUEWokjo9S00j0kkG2LOoEfiDZIdpVZXYAdljrs2PDaTpTjgexTZp rf0IgeTV9mlQ1w5M3wW4ST57Yvxkqy/jzvNadAqLJTwSe8MGwmBA7gJUfvgilKlni2BciW jtBLVauCAyIQslN8jIS2OTWY4Cs4KHqyXc9fdDKx7iWgQ9gH6/ao+vHnPwq4PKUa5/QYuD Dg3YecLm/6MF99++5f3W91AagBG8M0ojpspIHhc2QwwUZHbO4FTBfLbRVfD0nwl6ha2Y1A wxPxdybynP/QPvYfevTFW0raZOEXkuMyBFG5W1Rq4w7jyYrHjJ6SWJhzUI/I1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682792173; a=rsa-sha256; cv=none; b=V/Aa6TtS2WIGI3stD0wEQZv7vyJE7aEywS9Or3zULLd38LruMpU9tPUaUhx3TNNYGYxNP0 d7MtUHd7pCZNo3XVw1rgGP2wIv1CfjSnWc1/4N7wA+/TFpsjxSCxY98hj/W2R3KgpsFuQr UbYSj9p0JPbeYPqBMEDK+1fButOT0yCH2MfpMR4WX4CjpXXswqnufHvCgjkb8Rwjp3TJ/k s3GIajFXKZPyTGgrurPsmWTZs/uL5kRK2RR1aeKhOd0IWxuXk69BboZgBfb9zPllFQHRlj +q067KNjcnM/5bHSuYJLjwcYHVNRYjxT2A3Q0TbsSAxASG6aX4wZkuZnMj9zJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q7yMw6Ptdzrkg; Sat, 29 Apr 2023 18:16:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33TIGCN8019061; Sat, 29 Apr 2023 18:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TIGCgZ019060; Sat, 29 Apr 2023 18:16:12 GMT (envelope-from git) Date: Sat, 29 Apr 2023 18:16:12 GMT Message-Id: <202304291816.33TIGCgZ019060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 0c6c748f7827 - stable/13 - Skip Pass 5 in fsck_ffs(8) when corrupt cylinder groups remain unfixed. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0c6c748f7827b2e9c86a61193a9147a26df1ce33 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=0c6c748f7827b2e9c86a61193a9147a26df1ce33 commit 0c6c748f7827b2e9c86a61193a9147a26df1ce33 Author: Kirk McKusick AuthorDate: 2023-04-18 23:10:49 +0000 Commit: Kirk McKusick CommitDate: 2023-04-29 18:12:12 +0000 Skip Pass 5 in fsck_ffs(8) when corrupt cylinder groups remain unfixed. Sponsored by: FreeBSD Foundation (cherry picked from commit da86e7a20dc4a4b17e8d9e7630ed9b675cf71702) --- sbin/fsck_ffs/fsck.h | 3 ++- sbin/fsck_ffs/fsutil.c | 8 ++++++-- sbin/fsck_ffs/globs.c | 2 ++ sbin/fsck_ffs/inode.c | 4 ++-- sbin/fsck_ffs/main.c | 9 +++++++-- sbin/fsck_ffs/pass1.c | 30 +++++++++++++++++------------- 6 files changed, 36 insertions(+), 20 deletions(-) diff --git a/sbin/fsck_ffs/fsck.h b/sbin/fsck_ffs/fsck.h index 5ce5ca9e29a5..12a06e69b5fc 100644 --- a/sbin/fsck_ffs/fsck.h +++ b/sbin/fsck_ffs/fsck.h @@ -346,6 +346,7 @@ extern off_t bflag; /* location of alternate super block */ extern int bkgrdflag; /* use a snapshot to run on an active system */ extern char *blockmap; /* ptr to primary blk allocation map */ extern char *cdevname; /* name of device being checked */ +extern int cgheader_corrupt; /* one or more CG headers are corrupt */ extern char ckclean; /* only do work if not cleanly unmounted */ extern int ckhashadd; /* check hashes to be added */ extern char *copybuf; /* buffer to copy snapshot blocks */ @@ -494,7 +495,7 @@ int ftypeok(union dinode *dp); void getblk(struct bufarea *bp, ufs2_daddr_t blk, long size); struct bufarea *getdatablk(ufs2_daddr_t blkno, long size, int type); struct inoinfo *getinoinfo(ino_t inumber); -union dinode *getnextinode(ino_t inumber, int rebuildcg); +union dinode *getnextinode(ino_t inumber, int rebuiltcg); void getpathname(char *namebuf, ino_t curdir, ino_t ino); void ginode(ino_t, struct inode *); void gjournal_check(const char *filesys); diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 8f5b09cfe610..974dba4be79b 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -987,6 +987,10 @@ blzero(int fd, ufs2_daddr_t blk, long size) /* * Verify cylinder group's magic number and other parameters. If the * test fails, offer an option to rebuild the whole cylinder group. + * + * Return 1 if the cylinder group is good or if repair is requested + * and is completed successfully. Return 0 if it is bad or if a repair + * has been requested but is not completed successfully. */ #undef CHK #define CHK(lhs, op, rhs, fmt) \ @@ -1079,7 +1083,7 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) if (!reply("REBUILD CYLINDER GROUP")) { printf("YOU WILL NEED TO RERUN FSCK.\n"); rerun = 1; - return (1); + return (0); } /* * Zero out the cylinder group and then initialize critical fields. @@ -1122,7 +1126,7 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) } cgp->cg_ckhash = calculate_crc32c(~0L, (void *)cgp, sblock.fs_cgsize); cgdirty(cgbp); - return (0); + return (1); } /* diff --git a/sbin/fsck_ffs/globs.c b/sbin/fsck_ffs/globs.c index 09dbcc6694a2..92e77b61f9d4 100644 --- a/sbin/fsck_ffs/globs.c +++ b/sbin/fsck_ffs/globs.c @@ -111,6 +111,7 @@ ino_t lfdir; /* lost & found directory inode number */ const char *lfname; /* lost & found directory name */ int lfmode; /* lost & found directory creation mode */ ufs2_daddr_t n_blks; /* number of blocks in use */ +int cgheader_corrupt; /* one or more CG headers are corrupt */ ino_t n_files; /* number of files in use */ volatile sig_atomic_t got_siginfo; /* received a SIGINFO */ volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */ @@ -166,6 +167,7 @@ fsckinit(void) lfmode = 0700; n_blks = 0; n_files = 0; + cgheader_corrupt = 0; got_siginfo = 0; got_sigalarm = 0; bzero(&zino.dp1, sizeof(struct ufs1_dinode)); diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 37b0f9ebc1b1..2d563f617a56 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -510,7 +510,7 @@ static ino_t nextinum, lastvalidinum; static long readcount, readpercg, fullcnt, inobufsize, partialcnt, partialsize; union dinode * -getnextinode(ino_t inumber, int rebuildcg) +getnextinode(ino_t inumber, int rebuiltcg) { int j; long size; @@ -569,7 +569,7 @@ getnextinode(ino_t inumber, int rebuildcg) dirty(&inobuf); } } - if (rebuildcg && (char *)dp == inobuf.b_un.b_buf) { + if (rebuiltcg && (char *)dp == inobuf.b_un.b_buf) { /* * Try to determine if we have reached the end of the * allocated inodes. diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c index 74329bdb9483..e559f6cb4ea6 100644 --- a/sbin/fsck_ffs/main.c +++ b/sbin/fsck_ffs/main.c @@ -490,8 +490,13 @@ checkfilesys(char *filesys) if (preen == 0) printf("** Phase 5 - Check Cyl groups\n"); snapflush(std_checkblkavail); - pass5(); - IOstats("Pass5"); + if (cgheader_corrupt) { + printf("PHASE 5 SKIPPED DUE TO CORRUPT CYLINDER GROUP " + "HEADER(S)\n"); + } else { + pass5(); + IOstats("Pass5"); + } /* * print out summary statistics diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c index afe9f7f2b789..55233e0bc4f4 100644 --- a/sbin/fsck_ffs/pass1.c +++ b/sbin/fsck_ffs/pass1.c @@ -56,7 +56,7 @@ static ufs2_daddr_t badblk; static ufs2_daddr_t dupblk; static ino_t lastino; /* last inode in use */ -static int checkinode(ino_t inumber, struct inodesc *, int rebuildcg); +static int checkinode(ino_t inumber, struct inodesc *, int rebuiltcg); void pass1(void) @@ -68,7 +68,7 @@ pass1(void) ino_t inumber, inosused, mininos; ufs2_daddr_t i, cgd; u_int8_t *cp; - int c, rebuildcg; + int c, rebuiltcg; badblk = dupblk = lastino = 0; @@ -99,10 +99,14 @@ pass1(void) inumber = c * sblock.fs_ipg; cgbp = cglookup(c); cgp = cgbp->b_un.b_cg; - rebuildcg = 0; - if (!check_cgmagic(c, cgbp, 1)) - rebuildcg = 1; - if (!rebuildcg && sblock.fs_magic == FS_UFS2_MAGIC) { + rebuiltcg = 0; + if (!check_cgmagic(c, cgbp, 0)) { + if (!check_cgmagic(c, cgbp, 1)) + cgheader_corrupt = 1; + else + rebuiltcg = 1; + } + if (!rebuiltcg && sblock.fs_magic == FS_UFS2_MAGIC) { inosused = cgp->cg_initediblk; if (inosused > sblock.fs_ipg) { pfatal("Too many initialized inodes (%ju > %d) " @@ -132,7 +136,7 @@ pass1(void) * to find the inodes that are really in use, and then * read only those inodes in from disk. */ - if ((preen || inoopt) && usedsoftdep && !rebuildcg) { + if ((preen || inoopt) && usedsoftdep && !rebuiltcg) { cp = &cg_inosused(cgp)[(inosused - 1) / CHAR_BIT]; for ( ; inosused != 0; cp--) { if (*cp == 0) { @@ -169,7 +173,7 @@ pass1(void) setinodebuf(c, inosused); for (i = 0; i < inosused; i++, inumber++) { if (inumber < UFS_ROOTINO) { - (void)getnextinode(inumber, rebuildcg); + (void)getnextinode(inumber, rebuiltcg); continue; } /* @@ -178,7 +182,7 @@ pass1(void) * We always keep trying until we get to the minimum * valid number for this cylinder group. */ - if (checkinode(inumber, &idesc, rebuildcg) == 0 && + if (checkinode(inumber, &idesc, rebuiltcg) == 0 && i > cgp->cg_initediblk) break; } @@ -189,7 +193,7 @@ pass1(void) * fewer in use. */ mininos = roundup(inosused + INOPB(&sblock), INOPB(&sblock)); - if (inoopt && !preen && !rebuildcg && + if (inoopt && !preen && !rebuiltcg && sblock.fs_magic == FS_UFS2_MAGIC && cgp->cg_initediblk > 2 * INOPB(&sblock) && mininos < cgp->cg_initediblk) { @@ -209,7 +213,7 @@ pass1(void) inosused = 0; else inosused = lastino - (c * sblock.fs_ipg); - if (rebuildcg && inosused > cgp->cg_initediblk && + if (rebuiltcg && inosused > cgp->cg_initediblk && sblock.fs_magic == FS_UFS2_MAGIC) { cgp->cg_initediblk = roundup(inosused, INOPB(&sblock)); pwarn("CYLINDER GROUP %d: FOUND %d VALID INODES\n", c, @@ -242,7 +246,7 @@ pass1(void) } static int -checkinode(ino_t inumber, struct inodesc *idesc, int rebuildcg) +checkinode(ino_t inumber, struct inodesc *idesc, int rebuiltcg) { struct inode ip; union dinode *dp; @@ -252,7 +256,7 @@ checkinode(ino_t inumber, struct inodesc *idesc, int rebuildcg) intmax_t size, fixsize; int j, ret, offset; - if ((dp = getnextinode(inumber, rebuildcg)) == NULL) { + if ((dp = getnextinode(inumber, rebuiltcg)) == NULL) { pfatal("INVALID INODE"); goto unknown; } From nobody Sat Apr 29 18:33:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7ymN3ZHGz4863G; Sat, 29 Apr 2023 18:33:56 +0000 (UTC) (envelope-from jah@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 4Q7ymN3Kd8z3LkF; Sat, 29 Apr 2023 18:33:56 +0000 (UTC) (envelope-from jah@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682793236; 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=d/KfFjpN1WFj1/ITr9bwhhs38WQFlsKar7Bpj/T5bag=; b=sFlA/XqNNkbM0yssKH/1bVX7JaYfUKsgzQKNW6xAyxc+79svkR923z+vzVkc3hg/8WZQ63 ysPgtLuxLmzPcqB641u5kUzETKClnBQMSV0y8ca3o92oFYx/4wHi2kGGZ5gjCddHjlVExC pNjKerDngKphWMpNFs+tEUVj+7xeS3WUoSCUqvy0wR57xCOPOFKFGpSmAzwiVwbd1qNI9c g0cHoxsS0+FCEYhNWyHhsn/GRpDPMMtKwkpUm1qSpEo8p3TeWFspb6dT23fEZrJyAqJFh/ zM61QWV1fh2ARSvfpWYDShit6EjeZihQXOoVp4JoXMMnM96gKQdohn1CufZMNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682793236; 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=d/KfFjpN1WFj1/ITr9bwhhs38WQFlsKar7Bpj/T5bag=; b=OCy/DJaB8aNHZx01g0+OUDwSukFW193hhcYFaTr7/TMOpCi9UnH60n/oDdndTKiaktte1N 1VsBXQCXrkCGaEb3Vqyek7r3clFNrsmjfLMRuKtGxcZofFuJ9407wNl/daHxh5l5ieMR2o uzBK3SByueJfVnsevOp0t2aJHt2uB5Bgi0AckH4Q637UnBZkZcC26gtczfdNwmdgUfOOTh VLo51pEhZExuwtx3LdoYX4khu18x0Be3raMNMYxzSpy45XsJa19QR4wOb1qlRO4jbm8+di ooOn5+qZSjKLv8fWEFO8TyhNghE+vARmUciY0Of4WWR2NROUTrLMJjLUiR7TYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682793236; a=rsa-sha256; cv=none; b=bpgdgfBwCcBixjwHy2U1Ri5XongWGzqHZb8xGe/Fya2NVstY/YX08BKmi750dPrNBRY4E5 aFB3OugWR7/hix9eLZfg0VZhF+U2fHhomi4LOO42dq63GmgAHu/ooqRnhK0AmE1SUAYgy+ TnM0PmaFyM2/+4aODekpggUCH3/Eofg5sEzywR4P+Vt3muHnhDKZAQ8DotGby4incd0KAG ol3HExmhjc1D+IsAkZlhYbpfh+YWciLPoElNt43ih9PIwifC7hHF4WGxima5CUtcMr666B l6cjDFdisT68SYcp7feYJu+ksgZb5efCyuHrKyPrljAncAuSNgOiZztizlaJ5A== Received: from corona (047-232-115-243.res.spectrum.com [47.232.115.243]) (using TLSv1.3 with cipher TLS_AES_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: jah) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Q7ymM6m3JzvTS; Sat, 29 Apr 2023 18:33:55 +0000 (UTC) (envelope-from jah@freebsd.org) Date: Sat, 29 Apr 2023 13:33:53 -0500 From: "Jason A. Harmening" To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 060699e91369 - stable/13 - Merge llvm-project release/15.x llvmorg-15.0.7-0-g8dfdcc7b7bf6 Message-ID: References: <202304092135.339LZMeJ081640@gitrepo.freebsd.org> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202304092135.339LZMeJ081640@gitrepo.freebsd.org> X-ThisMailContainsUnwantedMimeParts: N On Sun, Apr 09, 2023 at 09:35:22PM +0000, Dimitry Andric wrote: > The branch stable/13 has been updated by dim: > > URL: https://cgit.FreeBSD.org/src/commit/?id=060699e9136975d51d3f726b9785bdbac9a62ba6 > > commit 060699e9136975d51d3f726b9785bdbac9a62ba6 > Author: Dimitry Andric > AuthorDate: 2023-01-14 16:33:24 +0000 > Commit: Dimitry Andric > CommitDate: 2023-04-09 14:54:52 +0000 > > Merge llvm-project release/15.x llvmorg-15.0.7-0-g8dfdcc7b7bf6 > > This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and > openmp to llvmorg-15.0.7-0-g8dfdcc7b7bf6. > > PR: 265425 > MFC after: 2 weeks This MFC of llvm15 appears to have completely broken the Intel IOMMU driver on my stable/13 machine. After this series of commits, any downstream DMA seems to produce an IOMMU translation fault, which renders the machine completely unusable: no nvme boot disk, no usb keyboard, etc. The faults I see look something like this: DMAR4: ahci0: pci0:17:5 sid 8d fault acc 0 adt 0x0 reason 0x3 addr 26000 It's a bit surprising to see a toolchain upgrade produce breakage like this, but that's what git bisect clearly tells me. I wonder if some of the IOMMU control structures might be defined as C bitfields and the new compiler is emitting them differently? Also, was any breakage like this observed when -current was upgraded to llvm15 several months ago? More generally, this is the second time in as many months I've had to deal with IOMMU breakage on -stable. I can't imagine I'm the only person who sees value in running with DMA remapping enabled; do we need a dedicated DMAR-enabled machine in the cluster to smoke-test changes like this? More generally, should we avoid MFCing high-risk changes like this? > > (cherry picked from commit 50d7464c3fe687c0a3d4dea6b96a5437779a3ef6) > --- > ObsoleteFiles.inc | 4 +- > contrib/llvm-project/libcxx/include/__config | 2 +- > contrib/llvm-project/libcxx/include/vector | 119 ++-- > .../llvm/lib/CodeGen/PrologEpilogInserter.cpp | 8 +- > .../llvm-project/llvm/lib/CodeGen/RegAllocFast.cpp | 3 + > .../llvm/lib/CodeGen/TypePromotion.cpp | 8 +- > etc/mtree/BSD.debug.dist | 2 +- > etc/mtree/BSD.usr.dist | 2 +- > lib/clang/headers/Makefile | 2 +- > lib/clang/include/VCSVersion.inc | 6 +- > lib/clang/include/clang/Basic/Version.inc | 6 +- > lib/clang/include/clang/Config/config.h | 2 +- > lib/clang/include/lld/Common/Version.inc | 2 +- > lib/clang/include/lldb/Version/Version.inc | 6 +- > lib/clang/include/llvm/Config/config.h | 4 +- > lib/clang/include/llvm/Config/llvm-config.h | 4 +- > lib/clang/include/llvm/Support/VCSRevision.h | 2 +- > lib/libclang_rt/compiler-rt-vars.mk | 2 +- > tools/build/mk/OptionalObsoleteFiles.inc | 644 ++++++++++----------- > 19 files changed, 440 insertions(+), 388 deletions(-) > > diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc > index 6f3d0f297515..39c3e57f93b1 100644 > --- a/ObsoleteFiles.inc > +++ b/ObsoleteFiles.inc > @@ -52,7 +52,7 @@ > # xargs -n1 | sort | uniq -d; > # done > > -# 20230410: new clang import which bumps version from 14.0.5 to 15.0.6 > +# 20230410: new clang import which bumps version from 14.0.5 to 15.0.7 > OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/algorithm > OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/complex > OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/new > @@ -363,7 +363,7 @@ OLD_FILES+=usr/lib/clang/14.0.5/share/msan_ignorelist.txt > OLD_DIRS+=usr/lib/clang/14.0.5/share > OLD_DIRS+=usr/lib/clang/14.0.5 > > -# 20230410: new libc++ import which bumps version from 14.0.5 to 15.0.6 > +# 20230410: new libc++ import which bumps version from 14.0.5 to 15.0.7 > OLD_FILES+=usr/include/c++/v1/__functional_base > OLD_FILES+=usr/include/c++/v1/__libcpp_version > OLD_FILES+=usr/include/c++/v1/__nullptr > diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config > index 5f62b974170f..c97cbae96fba 100644 > --- a/contrib/llvm-project/libcxx/include/__config > +++ b/contrib/llvm-project/libcxx/include/__config > @@ -36,7 +36,7 @@ > > #ifdef __cplusplus > > -# define _LIBCPP_VERSION 15006 > +# define _LIBCPP_VERSION 15007 > > # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y > # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) > diff --git a/contrib/llvm-project/libcxx/include/vector b/contrib/llvm-project/libcxx/include/vector > index 252a0f051ff5..63759407ce94 100644 > --- a/contrib/llvm-project/libcxx/include/vector > +++ b/contrib/llvm-project/libcxx/include/vector > @@ -297,6 +297,7 @@ erase_if(vector& c, Predicate pred); // C++20 > #include <__utility/forward.h> > #include <__utility/move.h> > #include <__utility/swap.h> > +#include <__utility/transaction.h> > #include > #include > #include > @@ -425,18 +426,27 @@ public: > value_type, > typename iterator_traits<_ForwardIterator>::reference>::value>::type* = 0); > > - _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_INLINE_VISIBILITY > - ~vector() > - { > - __annotate_delete(); > - std::__debug_db_erase_c(this); > +private: > + class __destroy_vector { > + public: > + _LIBCPP_CONSTEXPR __destroy_vector(vector& __vec) : __vec_(__vec) {} > > - if (this->__begin_ != nullptr) > - { > - __clear(); > - __alloc_traits::deallocate(__alloc(), this->__begin_, capacity()); > + _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI void operator()() { > + __vec_.__annotate_delete(); > + std::__debug_db_erase_c(std::addressof(__vec_)); > + > + if (__vec_.__begin_ != nullptr) { > + __vec_.__clear(); > + __alloc_traits::deallocate(__vec_.__alloc(), __vec_.__begin_, __vec_.capacity()); > + } > } > - } > + > + private: > + vector& __vec_; > + }; > + > +public: > + _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI ~vector() { __destroy_vector(*this)(); } > > _LIBCPP_CONSTEXPR_AFTER_CXX17 vector(const vector& __x); > _LIBCPP_CONSTEXPR_AFTER_CXX17 vector(const vector& __x, const __type_identity_t& __a); > @@ -1075,12 +1085,14 @@ template > _LIBCPP_CONSTEXPR_AFTER_CXX17 > vector<_Tp, _Allocator>::vector(size_type __n) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__n); > } > + __guard.__complete(); > } > > #if _LIBCPP_STD_VER > 11 > @@ -1089,12 +1101,14 @@ _LIBCPP_CONSTEXPR_AFTER_CXX17 > vector<_Tp, _Allocator>::vector(size_type __n, const allocator_type& __a) > : __end_cap_(nullptr, __a) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__n); > } > + __guard.__complete(); > } > #endif > > @@ -1102,12 +1116,14 @@ template > _LIBCPP_CONSTEXPR_AFTER_CXX17 > vector<_Tp, _Allocator>::vector(size_type __n, const value_type& __x) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__n, __x); > } > + __guard.__complete(); > } > > template > @@ -1120,9 +1136,11 @@ vector<_Tp, _Allocator>::vector(_InputIterator __first, > typename iterator_traits<_InputIterator>::reference>::value, > _InputIterator>::type __last) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > for (; __first != __last; ++__first) > emplace_back(*__first); > + __guard.__complete(); > } > > template > @@ -1135,9 +1153,11 @@ vector<_Tp, _Allocator>::vector(_InputIterator __first, _InputIterator __last, c > typename iterator_traits<_InputIterator>::reference>::value>::type*) > : __end_cap_(nullptr, __a) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > for (; __first != __last; ++__first) > emplace_back(*__first); > + __guard.__complete(); > } > > template > @@ -1150,13 +1170,15 @@ vector<_Tp, _Allocator>::vector(_ForwardIterator __first, > typename iterator_traits<_ForwardIterator>::reference>::value, > _ForwardIterator>::type __last) > { > - _VSTD::__debug_db_insert_c(this); > - size_type __n = static_cast(_VSTD::distance(__first, __last)); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > + size_type __n = static_cast(std::distance(__first, __last)); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__first, __last, __n); > } > + __guard.__complete(); > } > > template > @@ -1169,13 +1191,15 @@ vector<_Tp, _Allocator>::vector(_ForwardIterator __first, _ForwardIterator __las > typename iterator_traits<_ForwardIterator>::reference>::value>::type*) > : __end_cap_(nullptr, __a) > { > - _VSTD::__debug_db_insert_c(this); > - size_type __n = static_cast(_VSTD::distance(__first, __last)); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > + size_type __n = static_cast(std::distance(__first, __last)); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__first, __last, __n); > } > + __guard.__complete(); > } > > template > @@ -1183,13 +1207,15 @@ _LIBCPP_CONSTEXPR_AFTER_CXX17 > vector<_Tp, _Allocator>::vector(const vector& __x) > : __end_cap_(nullptr, __alloc_traits::select_on_container_copy_construction(__x.__alloc())) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > size_type __n = __x.size(); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__x.__begin_, __x.__end_, __n); > } > + __guard.__complete(); > } > > template > @@ -1197,13 +1223,15 @@ _LIBCPP_CONSTEXPR_AFTER_CXX17 > vector<_Tp, _Allocator>::vector(const vector& __x, const __type_identity_t& __a) > : __end_cap_(nullptr, __a) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > size_type __n = __x.size(); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__x.__begin_, __x.__end_, __n); > } > + __guard.__complete(); > } > > template > @@ -1243,7 +1271,9 @@ vector<_Tp, _Allocator>::vector(vector&& __x, const __type_identity_t else > { > typedef move_iterator _Ip; > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > assign(_Ip(__x.begin()), _Ip(__x.end())); > + __guard.__complete(); > } > } > > @@ -1254,12 +1284,14 @@ _LIBCPP_CONSTEXPR_AFTER_CXX17 > inline _LIBCPP_INLINE_VISIBILITY > vector<_Tp, _Allocator>::vector(initializer_list __il) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > if (__il.size() > 0) > { > __vallocate(__il.size()); > __construct_at_end(__il.begin(), __il.end(), __il.size()); > } > + __guard.__complete(); > } > > template > @@ -1268,12 +1300,14 @@ inline _LIBCPP_INLINE_VISIBILITY > vector<_Tp, _Allocator>::vector(initializer_list __il, const allocator_type& __a) > : __end_cap_(nullptr, __a) > { > - _VSTD::__debug_db_insert_c(this); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + std::__debug_db_insert_c(this); > if (__il.size() > 0) > { > __vallocate(__il.size()); > __construct_at_end(__il.begin(), __il.end(), __il.size()); > } > + __guard.__complete(); > } > > #endif // _LIBCPP_CXX03_LANG > @@ -2111,8 +2145,26 @@ public: > #else > _NOEXCEPT; > #endif > - _LIBCPP_CONSTEXPR_AFTER_CXX17 ~vector(); > - _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(size_type __n); > + > +private: > + class __destroy_vector { > + public: > + _LIBCPP_CONSTEXPR __destroy_vector(vector& __vec) : __vec_(__vec) {} > + > + _LIBCPP_CONSTEXPR_AFTER_CXX17 _LIBCPP_HIDE_FROM_ABI void operator()() { > + if (__vec_.__begin_ != nullptr) > + __storage_traits::deallocate(__vec_.__alloc(), __vec_.__begin_, __vec_.__cap()); > + std::__debug_db_invalidate_all(this); > + } > + > + private: > + vector& __vec_; > + }; > + > +public: > + _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 ~vector() { __destroy_vector(*this)(); } > + > + _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(size_type __n); > #if _LIBCPP_STD_VER > 11 > _LIBCPP_CONSTEXPR_AFTER_CXX17 explicit vector(size_type __n, const allocator_type& __a); > #endif > @@ -2647,12 +2699,14 @@ vector::vector(_ForwardIterator __first, _ForwardIterator __la > __size_(0), > __cap_alloc_(0, __default_init_tag()) > { > - size_type __n = static_cast(_VSTD::distance(__first, __last)); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + size_type __n = static_cast(std::distance(__first, __last)); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__first, __last); > } > + __guard.__complete(); > } > > template > @@ -2664,12 +2718,14 @@ vector::vector(_ForwardIterator __first, _ForwardIterator __la > __size_(0), > __cap_alloc_(0, static_cast<__storage_allocator>(__a)) > { > - size_type __n = static_cast(_VSTD::distance(__first, __last)); > + auto __guard = std::__make_transaction(__destroy_vector(*this)); > + size_type __n = static_cast(std::distance(__first, __last)); > if (__n > 0) > { > __vallocate(__n); > __construct_at_end(__first, __last); > } > + __guard.__complete(); > } > > #ifndef _LIBCPP_CXX03_LANG > @@ -2706,15 +2762,6 @@ vector::vector(initializer_list __il, const alloca > > #endif // _LIBCPP_CXX03_LANG > > -template > -_LIBCPP_CONSTEXPR_AFTER_CXX17 > -vector::~vector() > -{ > - if (__begin_ != nullptr) > - __storage_traits::deallocate(__alloc(), __begin_, __cap()); > - std::__debug_db_invalidate_all(this); > -} > - > template > _LIBCPP_CONSTEXPR_AFTER_CXX17 > vector::vector(const vector& __v) > diff --git a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp > index 85d051cfdbe7..a8d40edd88d3 100644 > --- a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp > +++ b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp > @@ -1237,7 +1237,13 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) { > if (!MO.isReg()) > continue; > > - for (MCPhysReg SReg : TRI.sub_and_superregs_inclusive(MO.getReg())) > + MCRegister Reg = MO.getReg(); > + > + // This picks up sibling registers (e.q. %al -> %ah). > + for (MCRegUnitIterator Unit(Reg, &TRI); Unit.isValid(); ++Unit) > + RegsToZero.reset(*Unit); > + > + for (MCPhysReg SReg : TRI.sub_and_superregs_inclusive(Reg)) > RegsToZero.reset(SReg); > } > } > diff --git a/contrib/llvm-project/llvm/lib/CodeGen/RegAllocFast.cpp b/contrib/llvm-project/llvm/lib/CodeGen/RegAllocFast.cpp > index 9e4e26f1392e..cb552f212fbb 100644 > --- a/contrib/llvm-project/llvm/lib/CodeGen/RegAllocFast.cpp > +++ b/contrib/llvm-project/llvm/lib/CodeGen/RegAllocFast.cpp > @@ -443,6 +443,9 @@ void RegAllocFast::spill(MachineBasicBlock::iterator Before, Register VirtReg, > SpilledOperandsMap[MO->getParent()].push_back(MO); > for (auto MISpilledOperands : SpilledOperandsMap) { > MachineInstr &DBG = *MISpilledOperands.first; > + // We don't have enough support for tracking operands of DBG_VALUE_LISTs. > + if (DBG.isDebugValueList()) > + continue; > MachineInstr *NewDV = buildDbgValueForSpill( > *MBB, Before, *MISpilledOperands.first, FI, MISpilledOperands.second); > assert(NewDV->getParent() == MBB && "dangling parent pointer"); > diff --git a/contrib/llvm-project/llvm/lib/CodeGen/TypePromotion.cpp b/contrib/llvm-project/llvm/lib/CodeGen/TypePromotion.cpp > index a63118067139..36e3c1245f1c 100644 > --- a/contrib/llvm-project/llvm/lib/CodeGen/TypePromotion.cpp > +++ b/contrib/llvm-project/llvm/lib/CodeGen/TypePromotion.cpp > @@ -570,7 +570,6 @@ void IRPromoter::Cleanup() { > LLVM_DEBUG(dbgs() << "IR Promotion: Cleanup..\n"); > // Some zexts will now have become redundant, along with their trunc > // operands, so remove them. > - // Some zexts need to be replaced with truncate if src bitwidth is larger. > for (auto *V : Visited) { > if (!isa(V)) > continue; > @@ -585,11 +584,6 @@ void IRPromoter::Cleanup() { > << "\n"); > ReplaceAllUsersOfWith(ZExt, Src); > continue; > - } else if (ZExt->getSrcTy()->getScalarSizeInBits() > PromotedWidth) { > - IRBuilder<> Builder{ZExt}; > - Value *Trunc = Builder.CreateTrunc(Src, ZExt->getDestTy()); > - ReplaceAllUsersOfWith(ZExt, Trunc); > - continue; > } > > // We've inserted a trunc for a zext sink, but we already know that the > @@ -626,6 +620,8 @@ void IRPromoter::ConvertTruncs() { > ConstantInt *Mask = > ConstantInt::get(SrcTy, APInt::getMaxValue(NumBits).getZExtValue()); > Value *Masked = Builder.CreateAnd(Trunc->getOperand(0), Mask); > + if (SrcTy != ExtTy) > + Masked = Builder.CreateTrunc(Masked, ExtTy); > > if (auto *I = dyn_cast(Masked)) > NewInsts.insert(I); > diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist > index a73aca740a10..1d9c926432dd 100644 > --- a/etc/mtree/BSD.debug.dist > +++ b/etc/mtree/BSD.debug.dist > @@ -31,7 +31,7 @@ > .. > lib > clang > - 15.0.6 > + 15.0.7 > lib > freebsd > .. > diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist > index 9416a70eafcd..dcb5cde47e94 100644 > --- a/etc/mtree/BSD.usr.dist > +++ b/etc/mtree/BSD.usr.dist > @@ -35,7 +35,7 @@ > .. > lib > clang > - 15.0.6 > + 15.0.7 > include > cuda_wrappers > .. > diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile > index 822d934cbede..4e5a08e9fed2 100644 > --- a/lib/clang/headers/Makefile > +++ b/lib/clang/headers/Makefile > @@ -5,7 +5,7 @@ > .PATH: ${CLANG_SRCS}/lib/Headers > > INCSGROUPS= INCS CUDA HLSL OMP PPC > -INCSDIR= ${LIBDIR}/clang/15.0.6/include > +INCSDIR= ${LIBDIR}/clang/15.0.7/include > CUDADIR= ${INCSDIR}/cuda_wrappers > HLSLDIR= ${INCSDIR}/hlsl > OMPDIR= ${INCSDIR}/openmp_wrappers > diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc > index df4289259487..e71c8f63b229 100644 > --- a/lib/clang/include/VCSVersion.inc > +++ b/lib/clang/include/VCSVersion.inc > @@ -1,10 +1,10 @@ > // $FreeBSD$ > > -#define LLVM_REVISION "llvmorg-15.0.6-0-g088f33605d8a" > +#define LLVM_REVISION "llvmorg-15.0.7-0-g8dfdcc7b7bf6" > #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" > > -#define CLANG_REVISION "llvmorg-15.0.6-0-g088f33605d8a" > +#define CLANG_REVISION "llvmorg-15.0.7-0-g8dfdcc7b7bf6" > #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" > > -#define LLDB_REVISION "llvmorg-15.0.6-0-g088f33605d8a" > +#define LLDB_REVISION "llvmorg-15.0.7-0-g8dfdcc7b7bf6" > #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" > diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc > index d28210f87bed..ed380b8a0e72 100644 > --- a/lib/clang/include/clang/Basic/Version.inc > +++ b/lib/clang/include/clang/Basic/Version.inc > @@ -1,9 +1,9 @@ > /* $FreeBSD$ */ > > -#define CLANG_VERSION 15.0.6 > -#define CLANG_VERSION_STRING "15.0.6" > +#define CLANG_VERSION 15.0.7 > +#define CLANG_VERSION_STRING "15.0.7" > #define CLANG_VERSION_MAJOR 15 > #define CLANG_VERSION_MINOR 0 > -#define CLANG_VERSION_PATCHLEVEL 6 > +#define CLANG_VERSION_PATCHLEVEL 7 > > #define CLANG_VENDOR "FreeBSD " > diff --git a/lib/clang/include/clang/Config/config.h b/lib/clang/include/clang/Config/config.h > index 18a0e28d7f3f..485f33a3fad0 100644 > --- a/lib/clang/include/clang/Config/config.h > +++ b/lib/clang/include/clang/Config/config.h > @@ -80,7 +80,7 @@ > #define CLANG_HAVE_RLIMITS 1 > > /* The LLVM product name and version */ > -#define BACKEND_PACKAGE_STRING "LLVM 15.0.6" > +#define BACKEND_PACKAGE_STRING "LLVM 15.0.7" > > /* Linker version detected at compile time. */ > /* #undef HOST_LINK_VERSION */ > diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc > index edb3421ae064..c7af7cd79d0d 100644 > --- a/lib/clang/include/lld/Common/Version.inc > +++ b/lib/clang/include/lld/Common/Version.inc > @@ -1,4 +1,4 @@ > // Local identifier in __FreeBSD_version style > #define LLD_FREEBSD_VERSION 1400005 > > -#define LLD_VERSION_STRING "15.0.6 (FreeBSD llvmorg-15.0.6-0-g088f33605d8a-" __XSTRING(LLD_FREEBSD_VERSION) ")" > +#define LLD_VERSION_STRING "15.0.7 (FreeBSD llvmorg-15.0.7-0-g8dfdcc7b7bf6-" __XSTRING(LLD_FREEBSD_VERSION) ")" > diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc > index 7dcfad4a7d30..13c0abd835a2 100644 > --- a/lib/clang/include/lldb/Version/Version.inc > +++ b/lib/clang/include/lldb/Version/Version.inc > @@ -1,6 +1,6 @@ > -#define LLDB_VERSION 15.0.6 > -#define LLDB_VERSION_STRING "15.0.6" > +#define LLDB_VERSION 15.0.7 > +#define LLDB_VERSION_STRING "15.0.7" > #define LLDB_VERSION_MAJOR 15 > #define LLDB_VERSION_MINOR 0 > -#define LLDB_VERSION_PATCH 6 > +#define LLDB_VERSION_PATCH 7 > /* #undef LLDB_FULL_VERSION_STRING */ > diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h > index 22dfdef58573..75e12c89863a 100644 > --- a/lib/clang/include/llvm/Config/config.h > +++ b/lib/clang/include/llvm/Config/config.h > @@ -353,10 +353,10 @@ > #define PACKAGE_NAME "LLVM" > > /* Define to the full name and version of this package. */ > -#define PACKAGE_STRING "LLVM 15.0.6" > +#define PACKAGE_STRING "LLVM 15.0.7" > > /* Define to the version of this package. */ > -#define PACKAGE_VERSION "15.0.6" > +#define PACKAGE_VERSION "15.0.7" > > /* Define to the vendor of this package. */ > /* #undef PACKAGE_VENDOR */ > diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h > index fa14fe523bd1..ab9f4d711628 100644 > --- a/lib/clang/include/llvm/Config/llvm-config.h > +++ b/lib/clang/include/llvm/Config/llvm-config.h > @@ -74,10 +74,10 @@ > #define LLVM_VERSION_MINOR 0 > > /* Patch version of the LLVM API */ > -#define LLVM_VERSION_PATCH 6 > +#define LLVM_VERSION_PATCH 7 > > /* LLVM version string */ > -#define LLVM_VERSION_STRING "15.0.6" > +#define LLVM_VERSION_STRING "15.0.7" > > /* Whether LLVM records statistics for use with GetStatistics(), > * PrintStatistics() or PrintStatisticsJSON() > diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h > index b58f85d44f73..ecccb84d835f 100644 > --- a/lib/clang/include/llvm/Support/VCSRevision.h > +++ b/lib/clang/include/llvm/Support/VCSRevision.h > @@ -1,3 +1,3 @@ > /* $FreeBSD$ */ > -#define LLVM_REVISION "llvmorg-15.0.6-0-g088f33605d8a" > +#define LLVM_REVISION "llvmorg-15.0.7-0-g8dfdcc7b7bf6" > #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" > diff --git a/lib/libclang_rt/compiler-rt-vars.mk b/lib/libclang_rt/compiler-rt-vars.mk > index 687a280af8d6..3b0cfa853e7a 100644 > --- a/lib/libclang_rt/compiler-rt-vars.mk > +++ b/lib/libclang_rt/compiler-rt-vars.mk > @@ -1,4 +1,4 @@ > -CLANG_SUBDIR=clang/15.0.6 > +CLANG_SUBDIR=clang/15.0.7 > CLANGDIR= /usr/lib/${CLANG_SUBDIR} > SANITIZER_LIBDIR= ${CLANGDIR}/lib/freebsd > SANITIZER_SHAREDIR= ${CLANGDIR}/share > diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc > index d8812f65b840..21440e6e9560 100644 > --- a/tools/build/mk/OptionalObsoleteFiles.inc > +++ b/tools/build/mk/OptionalObsoleteFiles.inc > @@ -1191,328 +1191,328 @@ OLD_FILES+=usr/share/man/man1/objdump.1.gz > OLD_FILES+=usr/bin/clang > OLD_FILES+=usr/bin/clang++ > OLD_FILES+=usr/bin/clang-cpp > -OLD_FILES+=usr/lib/clang/15.0.6/include/cuda_wrappers/algorithm > -OLD_FILES+=usr/lib/clang/15.0.6/include/cuda_wrappers/complex > -OLD_FILES+=usr/lib/clang/15.0.6/include/cuda_wrappers/new > -OLD_DIRS+=usr/lib/clang/15.0.6/include/cuda_wrappers > -OLD_FILES+=usr/lib/clang/15.0.6/include/fuzzer/FuzzedDataProvider.h > -OLD_DIRS+=usr/lib/clang/15.0.6/include/fuzzer > -OLD_FILES+=usr/lib/clang/15.0.6/include/hlsl/hlsl_basic_types.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/hlsl/hlsl_intrinsics.h > -OLD_DIRS+=usr/lib/clang/15.0.6/include/hlsl > -OLD_FILES+=usr/lib/clang/15.0.6/include/openmp_wrappers/__clang_openmp_device_functions.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/openmp_wrappers/cmath > -OLD_FILES+=usr/lib/clang/15.0.6/include/openmp_wrappers/complex > -OLD_FILES+=usr/lib/clang/15.0.6/include/openmp_wrappers/complex.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/openmp_wrappers/complex_cmath.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/openmp_wrappers/math.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/openmp_wrappers/new > -OLD_DIRS+=usr/lib/clang/15.0.6/include/openmp_wrappers > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/bmi2intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/bmiintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/emmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/immintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/mm_malloc.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/mmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/pmmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/smmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/tmmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/x86gprintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/x86intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ppc_wrappers/xmmintrin.h > -OLD_DIRS+=usr/lib/clang/15.0.6/include/ppc_wrappers > -OLD_FILES+=usr/lib/clang/15.0.6/include/profile/InstrProfData.inc > -OLD_FILES+=usr/lib/clang/15.0.6/include/profile/MemProfData.inc > -OLD_DIRS+=usr/lib/clang/15.0.6/include/profile > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/allocator_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/asan_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/common_interface_defs.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/coverage_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/dfsan_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/hwasan_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/linux_syscall_hooks.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/lsan_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/memprof_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/msan_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/netbsd_syscall_hooks.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/scudo_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/tsan_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/tsan_interface_atomic.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sanitizer/ubsan_interface.h > -OLD_DIRS+=usr/lib/clang/15.0.6/include/sanitizer > -OLD_FILES+=usr/lib/clang/15.0.6/include/xray/xray_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xray/xray_log_interface.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xray/xray_records.h > -OLD_DIRS+=usr/lib/clang/15.0.6/include/xray > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_builtin_vars.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_cmath.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_complex_builtins.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_device_functions.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_intrinsics.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_libdevice_declares.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_math.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_math_forward_declares.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_runtime_wrapper.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_cuda_texture_intrinsics.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_hip_cmath.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_hip_libdevice_declares.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_hip_math.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__clang_hip_runtime_wrapper.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__stddef_max_align_t.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__wmmintrin_aes.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/__wmmintrin_pclmul.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/adxintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/altivec.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ammintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/amxintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm64intr.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_acle.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_bf16.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_cde.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_cmse.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_fp16.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_mve.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_neon.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_neon_sve_bridge.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/arm_sve.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/armintr.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx2intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512bf16intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512bitalgintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512bwintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512cdintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512dqintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512erintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512fintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512fp16intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512ifmaintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512ifmavlintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512pfintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vbmi2intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vbmiintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vbmivlintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlbf16intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlbitalgintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlbwintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlcdintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vldqintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlfp16intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlvbmi2intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlvnniintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vlvp2intersectintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vnniintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vp2intersectintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vpopcntdqintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avx512vpopcntdqvlintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avxintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/avxvnniintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/bmi2intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/bmiintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/builtins.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/cet.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/cetintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/cldemoteintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/clflushoptintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/clwbintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/clzerointrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/cpuid.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/crc32intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/emmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/enqcmdintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/f16cintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/float.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/fma4intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/fmaintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/fxsrintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/gfniintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/hexagon_circ_brev_intrinsics.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/hexagon_protos.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/hexagon_types.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/hlsl.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/hresetintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/htmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/htmxlintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/hvx_hexagon_protos.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ia32intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/immintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/inttypes.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/invpcidintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/iso646.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/keylockerintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/limits.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/lwpintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/lzcntintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/mm3dnow.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/mm_malloc.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/mmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/module.modulemap > -OLD_FILES+=usr/lib/clang/15.0.6/include/movdirintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/msa.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/mwaitxintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/nmmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/omp-tools.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/omp.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ompt.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/opencl-c-base.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/opencl-c.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/pconfigintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/pkuintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/pmmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/popcntintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/prfchwintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/ptwriteintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/rdpruintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/rdseedintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/riscv_vector.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/rtmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/s390intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/serializeintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/sgxintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/shaintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/smmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/stdalign.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/stdarg.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/stdatomic.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/stdbool.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/stddef.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/stdint.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/stdnoreturn.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/tbmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/tgmath.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/tmmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/tsxldtrkintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/uintrintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/unwind.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/vadefs.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/vaesintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/varargs.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/vecintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/velintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/velintrin_approx.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/velintrin_gen.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/vpclmulqdqintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/waitpkgintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/wasm_simd128.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/wbnoinvdintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/wmmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/x86gprintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/x86intrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xmmintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xopintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xsavecintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xsaveintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xsaveoptintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xsavesintrin.h > -OLD_FILES+=usr/lib/clang/15.0.6/include/xtestintrin.h > -OLD_DIRS+=usr/lib/clang/15.0.6/include > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-aarch64.so > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-arm.so > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-armhf.so > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-i386.so > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-preinit-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-preinit-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-preinit-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-preinit-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-preinit-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan-x86_64.so > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan_cxx-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan_cxx-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan_cxx-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan_cxx-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan_cxx-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan_static-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.asan_static-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi_diag-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi_diag-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi_diag-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi_diag-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.cfi_diag-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.dd-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.dd-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.fuzzer-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.fuzzer-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.msan-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.msan-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.msan_cxx-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.msan_cxx-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-powerpc.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-powerpc64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-powerpc64le.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.profile-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.safestack-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.safestack-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.safestack-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats_client-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats_client-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats_client-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats_client-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.stats_client-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.tsan-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.tsan-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_minimal-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_minimal-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-basic-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-basic-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-basic-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-basic-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-fdr-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-fdr-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-fdr-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-fdr-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-profiling-aarch64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-profiling-arm.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-profiling-armhf.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-profiling-x86_64.a > -OLD_FILES+=usr/lib/clang/15.0.6/lib/freebsd/libclang_rt.xray-x86_64.a > -OLD_DIRS+=usr/lib/clang/15.0.6/lib/freebsd > -OLD_DIRS+=usr/lib/clang/15.0.6/lib > -OLD_FILES+=usr/lib/clang/15.0.6/share/asan_ignorelist.txt > -OLD_FILES+=usr/lib/clang/15.0.6/share/cfi_ignorelist.txt > -OLD_FILES+=usr/lib/clang/15.0.6/share/msan_ignorelist.txt > -OLD_DIRS+=usr/lib/clang/15.0.6/share > -OLD_DIRS+=usr/lib/clang/15.0.6 > +OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/algorithm > +OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/complex > +OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/new > +OLD_DIRS+=usr/lib/clang/15.0.7/include/cuda_wrappers > +OLD_FILES+=usr/lib/clang/15.0.7/include/fuzzer/FuzzedDataProvider.h > +OLD_DIRS+=usr/lib/clang/15.0.7/include/fuzzer > +OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_basic_types.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_intrinsics.h > +OLD_DIRS+=usr/lib/clang/15.0.7/include/hlsl > +OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/__clang_openmp_device_functions.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/cmath > +OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex > +OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex_cmath.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/math.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/new > +OLD_DIRS+=usr/lib/clang/15.0.7/include/openmp_wrappers > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmi2intrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmiintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/emmintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/immintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mm_malloc.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mmintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/pmmintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/smmintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/tmmintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86gprintrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86intrin.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/xmmintrin.h > +OLD_DIRS+=usr/lib/clang/15.0.7/include/ppc_wrappers > +OLD_FILES+=usr/lib/clang/15.0.7/include/profile/InstrProfData.inc > +OLD_FILES+=usr/lib/clang/15.0.7/include/profile/MemProfData.inc > +OLD_DIRS+=usr/lib/clang/15.0.7/include/profile > +OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/allocator_interface.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/asan_interface.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/common_interface_defs.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/coverage_interface.h > +OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/dfsan_interface.h > *** 287 LINES SKIPPED *** From nobody Sat Apr 29 18:49:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7z6k4KWgz486YW; Sat, 29 Apr 2023 18:49:50 +0000 (UTC) (envelope-from dim@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 4Q7z6k3XpTz3MD4; Sat, 29 Apr 2023 18:49:50 +0000 (UTC) (envelope-from dim@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682794190; 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=TqHO9CxKT8y/vXageY768331LJPXD85X1fhg+BXvJng=; b=ykhNFCBnLLa8OHR18+pmyUPis2GU4oJk24Q9clg5kiPW7GvhYQT1XPlpjLKjIIogzgKEv+ FoCqVdM/WATTUNu8zgjg0DcXbnh5UqT6BdjZI33Syhw/KZLQ2aujI1UZYfQay9iwUzhpCp /BXgAkm2/JCxPYSdAzqu1sTVBePndeBSPapm9cp4eiRFCyMbkJ6cURlgYkYQFL3ThijbuH ZCBWizgotaU6sgVH+LgYyDBUSpk4VTJony/B2RgaUWT5ACOOZRxW5BtikL1mt+FjIH/rJU 9yLGmf9GSP8RQGoDvwb/n5nVtrAcssWAcN1I3FZVEmnHFVWGUbn/iFC0/4Z0cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682794190; 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=TqHO9CxKT8y/vXageY768331LJPXD85X1fhg+BXvJng=; b=yr8ke5qEZCc05oa7w8GAnw+9W4vC2RlyV9dzI5Ld+vVHhSPMBOvUfWTKyJrOUz6VwNkSor L11Qprn3KosYcF329iv+5eqoDDPWsbXOMA/osOnm2stm1wrJYbjc9Cyi9qKVCrWUGWPo6X djWlkKZgOgnWR5jXsyzHVS62TtfN3xcpNywqSl7cOotZC/7Q/XcV1L90WNhbjcC7uptaiK WqUQdeVcmbGbwt+WFzQ5Y9d6eIqFhiw6m7+II+FCdT6MEYs/hn8gy0a4cJKVV8WZeJw9lr 23WlTB5UV9+BUrTJQJMU7yfyt6aDL/GkLecZGE63YPOpF3uv074WXXi7C9/vqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682794190; a=rsa-sha256; cv=none; b=PFvYZUYzouLXCuAdOXjzRG3KqAhHkv/I2Ihwq3MFz7UmvV52jIjR+nkEK6okZPWnALUBoo JiGGjqYrDGb1U0xfOTwzAlJWzFtm7QcEmDcmTr2K7cuhcRYU/PjBcLEzvU2YmV2pHr7AUS E/Oz5rj34RDwzO/IvLb0e1FVSXj+sDdOkAqW2IJxq/RmNxDe/pSiEP4UaUOS4gpO/C6tjV v6WcG6w4z7z6aYNbKWMegAPSxmxpyMLWaTVoFtVa3oj/K5T+wKztWaJagDnd1MuHL//h0h vrkqNy2eFi+sKV3Gzd6MHZzfLcD5BzR5EYvBdW8i2DjOyzIPOLdwUlNt1cGZ5w== Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Q7z6k1gJRzvn4; Sat, 29 Apr 2023 18:49:50 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (longrow.home.andric.com [192.168.0.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 78CC96C619; Sat, 29 Apr 2023 20:49:47 +0200 (CEST) Content-Type: multipart/signed; boundary="Apple-Mail=_0A7B0216-61FD-41C1-8D04-7A255634871E"; protocol="application/pgp-signature"; micalg=pgp-sha1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.500.231\)) Subject: Re: git: 060699e91369 - stable/13 - Merge llvm-project release/15.x llvmorg-15.0.7-0-g8dfdcc7b7bf6 From: Dimitry Andric In-Reply-To: Date: Sat, 29 Apr 2023 20:49:28 +0200 Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Message-Id: <76DD2CB9-986B-4349-8F46-3B7BF63EB315@FreeBSD.org> References: <202304092135.339LZMeJ081640@gitrepo.freebsd.org> To: "Jason A. Harmening" X-Mailer: Apple Mail (2.3731.500.231) X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail=_0A7B0216-61FD-41C1-8D04-7A255634871E Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 29 Apr 2023, at 20:33, Jason A. Harmening wrote: >=20 > On Sun, Apr 09, 2023 at 09:35:22PM +0000, Dimitry Andric wrote: >> The branch stable/13 has been updated by dim: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D060699e9136975d51d3f726b9785bdba= c9a62ba6 >>=20 >> commit 060699e9136975d51d3f726b9785bdbac9a62ba6 >> Author: Dimitry Andric >> AuthorDate: 2023-01-14 16:33:24 +0000 >> Commit: Dimitry Andric >> CommitDate: 2023-04-09 14:54:52 +0000 >>=20 >> Merge llvm-project release/15.x llvmorg-15.0.7-0-g8dfdcc7b7bf6 >>=20 >> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, = lldb and >> openmp to llvmorg-15.0.7-0-g8dfdcc7b7bf6. >>=20 >> PR: 265425 >> MFC after: 2 weeks >=20 > This MFC of llvm15 appears to have completely broken the Intel IOMMU > driver on my stable/13 machine. After this series of commits, any > downstream DMA seems to produce an IOMMU translation fault, which > renders the machine completely unusable: no nvme boot disk, no usb > keyboard, etc. >=20 > The faults I see look something like this: >=20 > DMAR4: ahci0: pci0:17:5 sid 8d fault acc 0 adt 0x0 reason 0x3 addr = 26000 >=20 > It's a bit surprising to see a toolchain upgrade produce breakage like > this, but that's what git bisect clearly tells me. I wonder if some = of > the IOMMU control structures might be defined as C bitfields and the = new > compiler is emitting them differently? Also, was any breakage like = this > observed when -current was upgraded to llvm15 several months ago? I haven't heard anything about such breakage, no. > More generally, this is the second time in as many months I've had to > deal with IOMMU breakage on -stable. I can't imagine I'm the only > person who sees value in running with DMA remapping enabled; do we = need > a dedicated DMAR-enabled machine in the cluster to smoke-test changes > like this? More generally, should we avoid MFCing high-risk changes > like this? Since there were very few bug reports, it was not deemed high risk. In any case, it would be good to get the bottom of what is causing the problem, so is there any way you can isolate which code seems to be going "bad"? For example, if this problem affects code in sys/dev/iommu, is there some way you can compile that part with -O1, or with an older version of clang (from ports), to see if the problem goes away? -Dimitry --Apple-Mail=_0A7B0216-61FD-41C1-8D04-7A255634871E Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCZE1muAAKCRCwXqMKLiCW oy00AKCwpvrYumXL236UwYfGxhdFE9qgigCg4vgGpZCot6DuSFY4kKfXLnnt22U= =Yq+u -----END PGP SIGNATURE----- --Apple-Mail=_0A7B0216-61FD-41C1-8D04-7A255634871E-- From nobody Sat Apr 29 19:27:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q7zyd1WQTz489JD; Sat, 29 Apr 2023 19:27:53 +0000 (UTC) (envelope-from jah@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 4Q7zyd14LMz3QZD; Sat, 29 Apr 2023 19:27:53 +0000 (UTC) (envelope-from jah@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682796473; 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=X2zKEPELg+0AqjoxalmfTECiiw5mxhXdyi1Z0BsYgwE=; b=pu5GTH4ZdHwqk2wgbH65vBvAj86JSnUR+kPg/g63aQflqbTLH4syMQ5fFJAMv2EJIif+e5 KrycnoL6cdBaWg5hf2khBDAyCxtOfifY2O2gJ4PK+pRVf87NNwOFpKmTV9Trgy81rvE+nS ql6HVsjx8nUna1S5YCSNocvShykMS48GL890+YIMXPBaIACvwX9zBZV4TGMCDNDKLZ4DCK rFmh3G+0/zZs7xlSjtumcF7ZjGRGOniiDH9lW5+Qghl2rJWjcLUXS3MMd3HaoCdTJSYSWF lzA6sSxHc0Fj/um9CDdEBvQcZCSv38o4j/VrAQ5OUujjxd2GaVd6D7uLjOH9kg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682796473; 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=X2zKEPELg+0AqjoxalmfTECiiw5mxhXdyi1Z0BsYgwE=; b=W+WN389Secwl8Pfcvi5tfPm0AgrxHPpM3GRbWaDqdDbT4j0cbjVxvf4fPQZVCFvenB7QDO QYsg1hIaY6B+U8LuRV2v9bQLjTTOfhNOOxuKE/sLJB7xxhztmNMvm48Juw/MZ1P+WqGyHA 48hRgZKkiflz77Zq/njC1Ye/VjZvI3KTuOTWVAAX7EXp3ymskOBbugPnCML843/nMehbOX nWWi715KZMMT5fE/IDvmN2zawGee115ypREtgikdnxX/FF+UgbHFYA7Cytzt/YCAsKfMqt M22Pq6NY9tTdc5g6NFL2Pu1EHh0FJOY0YeH58GYgQPfqpkCc329Q8VptDJkb6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682796473; a=rsa-sha256; cv=none; b=gscXbGJlLBYOLSYuWARCj7gObNkrPono0MoTSfA1cvFbfId0pTEVaP8eLrito+M9fl8TD2 AobfXvCL612c6rjxri8nbfzle5GyNTuoEQSNFWmFyfX0u4oqYUYQnMk9X8mOXWIzPub869 mi8JfiuvfR3HGoeakAGwl1nM3+BAJhvkpwOrHh2b/YeBQUY/n7yOcPH5/c1bEz1W//pzcI g98Boxjg+p0w8fsQI20/tH0uF7en4nGerHFBJXKIi9tIyt0CkpWHDRWuaNKVg2nlVu9P9y ikDmFvU1W06Hp4r40pUt36QpcWdUpvYH57Rl4mWdE5W+lMB/wumGBAbfPlK3vQ== Received: from corona (047-232-115-243.res.spectrum.com [47.232.115.243]) (using TLSv1.3 with cipher TLS_AES_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: jah) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Q7zyc4vPjzvW1; Sat, 29 Apr 2023 19:27:52 +0000 (UTC) (envelope-from jah@freebsd.org) Date: Sat, 29 Apr 2023 14:27:50 -0500 From: "Jason A. Harmening" To: Dimitry Andric Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 060699e91369 - stable/13 - Merge llvm-project release/15.x llvmorg-15.0.7-0-g8dfdcc7b7bf6 Message-ID: References: <202304092135.339LZMeJ081640@gitrepo.freebsd.org> <76DD2CB9-986B-4349-8F46-3B7BF63EB315@FreeBSD.org> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <76DD2CB9-986B-4349-8F46-3B7BF63EB315@FreeBSD.org> X-ThisMailContainsUnwantedMimeParts: N On Sat, Apr 29, 2023 at 08:49:28PM +0200, Dimitry Andric wrote: > On 29 Apr 2023, at 20:33, Jason A. Harmening wrote: > > > > On Sun, Apr 09, 2023 at 09:35:22PM +0000, Dimitry Andric wrote: > >> The branch stable/13 has been updated by dim: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=060699e9136975d51d3f726b9785bdbac9a62ba6 > >> > >> commit 060699e9136975d51d3f726b9785bdbac9a62ba6 > >> Author: Dimitry Andric > >> AuthorDate: 2023-01-14 16:33:24 +0000 > >> Commit: Dimitry Andric > >> CommitDate: 2023-04-09 14:54:52 +0000 > >> > >> Merge llvm-project release/15.x llvmorg-15.0.7-0-g8dfdcc7b7bf6 > >> > >> This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and > >> openmp to llvmorg-15.0.7-0-g8dfdcc7b7bf6. > >> > >> PR: 265425 > >> MFC after: 2 weeks > > > > This MFC of llvm15 appears to have completely broken the Intel IOMMU > > driver on my stable/13 machine. After this series of commits, any > > downstream DMA seems to produce an IOMMU translation fault, which > > renders the machine completely unusable: no nvme boot disk, no usb > > keyboard, etc. > > > > The faults I see look something like this: > > > > DMAR4: ahci0: pci0:17:5 sid 8d fault acc 0 adt 0x0 reason 0x3 addr 26000 > > > > It's a bit surprising to see a toolchain upgrade produce breakage like > > this, but that's what git bisect clearly tells me. I wonder if some of > > the IOMMU control structures might be defined as C bitfields and the new > > compiler is emitting them differently? Also, was any breakage like this > > observed when -current was upgraded to llvm15 several months ago? > > I haven't heard anything about such breakage, no. > > > > More generally, this is the second time in as many months I've had to > > deal with IOMMU breakage on -stable. I can't imagine I'm the only > > person who sees value in running with DMA remapping enabled; do we need > > a dedicated DMAR-enabled machine in the cluster to smoke-test changes > > like this? More generally, should we avoid MFCing high-risk changes > > like this? > > Since there were very few bug reports, it was not deemed high risk. > > In any case, it would be good to get the bottom of what is causing the > problem, so is there any way you can isolate which code seems to be > going "bad"? > > For example, if this problem affects code in sys/dev/iommu, is there > some way you can compile that part with -O1, or with an older version > of clang (from ports), to see if the problem goes away? I did try removing all custom make.conf settings (previously I just had CPUTYPE?=icelake-server), but that didn't change the behavior. Before I try further build tweaks, I'd like to ask if the IOMMU fault report can provide guidance here? AFAICT all the faults I'm getting show "reason 0x3". If I'm reading the VT-d spec correctly, FR=0x3 indicates an invalid context entry, in other words there's something the hardware doesn't like in the way the address width or pagetable base is configured for the PCIe requestor. > > -Dimitry >