From nobody Mon Mar 4 00:27:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tp0025j5dz5CdKS; Mon, 4 Mar 2024 00:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tp0024xWWz4gXr; Mon, 4 Mar 2024 00:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709512066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7RnyaE8Cameu374/OR5Kzh3f1odKBQpx4x+0rSVRuVY=; b=oUZzBGojIOEgpUmnlXQzmaZKHnYtEH6XdIn3xqJwcq6o4Ptd11zfuZ41h5l5+IdkTaqz2I KchFu0NxnN3QTOPawzsC/CNkwLzugwfNV47ZdQK57Qp1xlAClB69vO87fcXty5UqNv/mUC yN5XflQpqK1d2Vqx7YB8ZRk6u5Zc0dLziq5Voi+Ll4fh/WLiKWXuGj/OuCnGz9fGE2Alkn 55gDakD61E2LWwVZuVBmMwdw/KLdIAXG4F5Sw/I0Hy0dyJxlcHAxVvr/If6f+qYZXld0xv fNmuUE3M+tH2EHwXG7q3jz6PA30h2L6oWSCVLZVexu8Bgs1g/mSDDItq/C3wcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709512066; a=rsa-sha256; cv=none; b=JvknYKjGF/mvj6URjV6nsgbXChzqrvjCeTllLHseo2uD1MAXYn78RPTyVN1vIvi65V7F+e YAb5ZMsJhrNnszusR9HDxeqPNBjtzoQ50+F6QFx/R4PqbE0RqVhMMv2IFSkWc0dL30CaSU HseulhUSNCm3/R5fC9871IQ16fjMslJHYpG2lMnJvPrnyOrI+TmM42Fi+suvhAg8JBiREK eicmPaJRZ+MWG20h2eouExk15haup+82Laupn91nlgWROYIMFvBZuIcCweHzQnVUTEn5mw jB44xavz28PDaXRHoq8zjwlk7VxC3aqCWcWT27kgWjAXe2SPGxgYqH8jc3VH+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709512066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7RnyaE8Cameu374/OR5Kzh3f1odKBQpx4x+0rSVRuVY=; b=NGXnZBojdjSD2W0smplfgiK2kxfCYUDrd01wAYaECZy2T5Byxo272rYA+9rIGBG3rS0cWA 6zMa01SBMakm7vz88tWjneXQ27Js5AhlP5yTCaNnD7GzlkhlDBJNHEfBbC763vZ36RClQM a857789EyJDP3zBIzMOND3ZLzRbLGlpT4qTxadNRfqPvNZsR0JdlUd962b9nt4DuSgtEsg RrNrXAXNGEOBb1suSrMjm2SDvaqoNy1sD0z/3QA19jChz8AOx9hVuIZjXR9VXONn7NhI6B kowJGYoK4mxHK5//FXgl7+6a299l5mRozOEBMzt70Kdy2ypeUPR0bLdKyjmq0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tp0022w7dz10xQ; Mon, 4 Mar 2024 00:27:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4240RkLQ042678; Mon, 4 Mar 2024 00:27:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4240RkA1042675; Mon, 4 Mar 2024 00:27:46 GMT (envelope-from git) Date: Mon, 4 Mar 2024 00:27:46 GMT Message-Id: <202403040027.4240RkA1042675@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: 7f387adb6996 - stable/14 - ipsec esp: avoid dereferencing freed secasindex List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7f387adb6996c8fe93a280b97048d41bfd0daa1f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7f387adb6996c8fe93a280b97048d41bfd0daa1f commit 7f387adb6996c8fe93a280b97048d41bfd0daa1f Author: Konstantin Belousov AuthorDate: 2024-02-25 10:30:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-04 00:27:17 +0000 ipsec esp: avoid dereferencing freed secasindex (cherry picked from commit 1a56620b7958cac2b9048589cb730c46958ab539) --- sys/netipsec/xform_esp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 16f7b24375fa..7ad6085db87f 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -508,6 +508,13 @@ esp_input_cb(struct cryptop *crp) xd = crp->crp_opaque; CURVNET_SET(xd->vnet); sav = xd->sav; + if (sav->state >= SADB_SASTATE_DEAD) { + /* saidx is freed */ + DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); + ESPSTAT_INC(esps_notdb); + error = ESRCH; + goto bad; + } skip = xd->skip; protoff = xd->protoff; cryptoid = xd->cryptoid; From nobody Mon Mar 4 00:28:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tp00b5nXbz5Cd9v; Mon, 4 Mar 2024 00:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tp00b3dGsz4gjb; Mon, 4 Mar 2024 00:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709512095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9w0YSJ0ZM+I49zQIjq9C+cvDTWdyHuLbhlEj3TluG4=; b=PcL5UF9B+Rmdqqx7kc0ySDXRVX70oifz6S322fj304hQ3O3U9337UCIBqOeIiL+ITXmjsy 6ETadWbgn/nqqEA0g9XXVSukQjOZmjqzKf4GpG1+GHqE3ofnDWfO/11OAKr5sY7OCiOmUk PW0tpFgFmP30pgGQLOZXQV/Fg09/Vi7/bX0fP+yGz2RadPA30sIzyUCQD1W90mbb5s1Ujc 5HEIWT1OqQqB0o/8L5HfJpfHNYK5ZnboQxkLwTZgPCt+QmJfTCqXEu1zU/LE/RiPSohYwk S8zYHKgR2yJBCH6T9a27XQZtCRPUzp6gQJPMlwb7yPeDWru/1GDKreWn3vU9Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709512095; a=rsa-sha256; cv=none; b=rl/8q35w7sSHDK+kvZLOMtYUALrltIuvWTcas0ivNUnS+p9c7VcIvm6uY+61HNh5kwHQ2Y lK9aGe+RTIBBd1Tj26UD2UnKoeLa57Ib+vYhGQB+coAc2utM5apIhefCGKzopUvTnDVRkN 0paZ45SFxpoKkbxd+n7xxQsAImp2lATeG6QMmPY28oOlXfXPdHiu+CwxWA02YwINNUbMCo A27hvUhlhxQj11zHuM65uVl3qpFsIGU+ce5eFS/aD4E2s3cjDt3nE0jcCDs10dA3n8BQaW Uc2GV9SZkuorIlO9pqeq8ozLvgOslR1D0TStxS7suC3FoJ/Xg40zB7OC1mjNOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709512095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h9w0YSJ0ZM+I49zQIjq9C+cvDTWdyHuLbhlEj3TluG4=; b=mK3/g/60E3K0AZ6e3liLDb3ZCZThrrOtUENg7p+NlD7qUOGmnlOx0rIbyVnAM1t+eKdLb8 rQMjEfvkfb0GjyMplDG+N7MSXuJ5QcSh7LR4NYVecXHJRPNZpDz1ubjy192MjMJC4zMQmQ 5LWBBK0sJDmTvrLMsG/waBTyNL1t8gGt9s3ualHJZnFoCU7Eu9Ht0Qy3jELR/n3Hjes7Yo wWZpCw2PgqddzKI3CdnVQPRzNynaSFXCzOWuJ9kym5zzZAaPxN4XYZv/xdsHetinMGyrj6 9hieX2UUnq0vT5ikWhFGMGiGED2Qje5jkFYbIOXVC4xXeGVGPN5UiNqk2AXW9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tp00b2ZxXz103Y; Mon, 4 Mar 2024 00:28:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4240SFVM042898; Mon, 4 Mar 2024 00:28:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4240SFjc042895; Mon, 4 Mar 2024 00:28:15 GMT (envelope-from git) Date: Mon, 4 Mar 2024 00:28:15 GMT Message-Id: <202403040028.4240SFjc042895@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: bf58a77ae125 - stable/13 - ipsec esp: avoid dereferencing freed secasindex List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf58a77ae125f4e5fd4a2c9bea42ee44340d3736 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bf58a77ae125f4e5fd4a2c9bea42ee44340d3736 commit bf58a77ae125f4e5fd4a2c9bea42ee44340d3736 Author: Konstantin Belousov AuthorDate: 2024-02-25 10:30:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-04 00:27:56 +0000 ipsec esp: avoid dereferencing freed secasindex (cherry picked from commit 1a56620b7958cac2b9048589cb730c46958ab539) --- sys/netipsec/xform_esp.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c index 37a5c5f4fd8b..a0efea0e5323 100644 --- a/sys/netipsec/xform_esp.c +++ b/sys/netipsec/xform_esp.c @@ -500,6 +500,13 @@ esp_input_cb(struct cryptop *crp) xd = crp->crp_opaque; CURVNET_SET(xd->vnet); sav = xd->sav; + if (sav->state >= SADB_SASTATE_DEAD) { + /* saidx is freed */ + DPRINTF(("%s: dead SA %p spi %#x\n", __func__, sav, sav->spi)); + ESPSTAT_INC(esps_notdb); + error = ESRCH; + goto bad; + } skip = xd->skip; protoff = xd->protoff; cryptoid = xd->cryptoid; From nobody Mon Mar 4 00:39:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tp0FG5Pcnz5CfBQ; Mon, 4 Mar 2024 00:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tp0FG4vMZz4kVQ; Mon, 4 Mar 2024 00:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709512754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nt/6Ja8ug5SCcY9r122eWwEUwbKTV/9ZvYR9LQiWTrw=; b=tN8yA/EH+He6X1K65iYfOo0DA5NJGYs+5ldgrF524/YWm0kHuE86zWqAGbQtKDKRs0yGE9 d2mm/4Tfolf8x7zsCQtk/LMXpskDMhjbJrfrjkvK5tDAsTvqdKNLq0cXb64C5Cr9ZL1tOp x9AvmZiJBXQIrkyLxPrFWeM/t17JdwqsBhvZ025cWFAtfGViDHn7uTKHnbyr1b59GDDQ+V MA/1+tZZbCr/t+APnwM2Jt3S97SBNBSUWLZKByE1gA7DhoNWYtSQ1sMGDFgmPY/AG6VPmU rGqQ74Gyt6+x/LUrpHptvPfDLx7u0QhT5YB1ab2WoW3GVrbeilwivZWB5ie/ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709512754; a=rsa-sha256; cv=none; b=CcRKsm/16xv+EeiZk2ezyCH+d23c0FiFVWLZSVM88sAyvyfbirFT3j/FNuegXX4R+l7rYR xmPtgqvsaEo4AvQ3AgbKxZ3qOQ7jVaG7tg62qXa5VENd4paxoRa0yz53nyWfCWD2RrSXrD zIVt1ju1xBkAHURxckRQlrdCPGkqNfu8opWayFCEdwOMGkP9YespOuuVZ8vCDYbqFwuGyT n8U3Sc639DTcsSDeppEvyQuyGOxbjE5e90iip5P1gcIf+7CZxxQFbAWIJW+ZlRIoC9NcLy LCD6mBPOJrK1d0NTrEwJwrTxSbJb5mvSSjd6WsKHpqbFVvIiQFegPeRw0GZ31A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709512754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nt/6Ja8ug5SCcY9r122eWwEUwbKTV/9ZvYR9LQiWTrw=; b=gQEddxAxYwyyZvcKDGXDLa+Uwl1jNgD3n2URo0sYsbXlfrthLxPk5Ed9H77XuWI2loaYjt ZViLS3pOCs6HbziRrEFlnlRUpe6LUMlrQNZqdP/Y4a57KkQWpf1GplV4iLP/qUPT7fyiqV Yq9bTSV2ofjCEObdifdCdG/hNUPm2GleVQuPQGkhjH/TMt9b6AlXDEgcMRaiTYIIqzQ7Kv 28rT2L2RUr1Y/Dhd0W2RBaEYdlzOAS5kRRxZ/nrUy9RXLwIMdxLJEEEfRmpH+vEqnRmsL/ KbctlNM01AXBJ5UP/Zjm2GX+Ih4pcHyXGQ5JStTS1ud+T9i8vDREDy5Mo5rmVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tp0FG4FnHz119d; Mon, 4 Mar 2024 00:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4240dE8U059795; Mon, 4 Mar 2024 00:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4240dEx4059792; Mon, 4 Mar 2024 00:39:14 GMT (envelope-from git) Date: Mon, 4 Mar 2024 00:39:14 GMT Message-Id: <202403040039.4240dEx4059792@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: ebe18cb1a545 - stable/14 - snd_uaudio(4): Fix sample rate selection after 42fdcd9fd917. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ebe18cb1a545f41ce071f20494869c775d9255bf Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=ebe18cb1a545f41ce071f20494869c775d9255bf commit ebe18cb1a545f41ce071f20494869c775d9255bf Author: Florian Walpen AuthorDate: 2024-02-26 23:27:47 +0000 Commit: Christos Margiolis CommitDate: 2024-03-04 00:38:58 +0000 snd_uaudio(4): Fix sample rate selection after 42fdcd9fd917. The sample rate selection of snd_uaudio(4) at runtime was implicitly relying on a specific order in the device config list. In case a default was set through the hw.usb.uaudio.default_rate sysctl tunable, commit 42fdcd9fd917 removed a duplicate sample rate entry from that list, which inadvertently broke sample rate selection at runtime. Implement sample rate selection in a way that works for any order in the device config list. Reported by: Lexi Winter MFC after: 1 week Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D44051 (cherry picked from commit a9341f0f0ae01b4d249dbf3bacfa420152c46aef) --- sys/dev/sound/usb/uaudio.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/usb/uaudio.c b/sys/dev/sound/usb/uaudio.c index 26d95bf3ee9f..5d7396c527e0 100644 --- a/sys/dev/sound/usb/uaudio.c +++ b/sys/dev/sound/usb/uaudio.c @@ -2768,20 +2768,19 @@ int uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed) { struct uaudio_softc *sc; - uint8_t x; + uint8_t x, y; sc = ch->priv_sc; - for (x = 0; x < ch->num_alt; x++) { - if (ch->usb_alt[x].sample_rate < speed) { - /* sample rate is too low */ - break; - } + for (x = 0, y = 1; y < ch->num_alt; y++) { + /* prefer sample rate closer to and greater than requested */ + if ((ch->usb_alt[x].sample_rate < speed && + ch->usb_alt[x].sample_rate < ch->usb_alt[y].sample_rate) || + (speed <= ch->usb_alt[y].sample_rate && + ch->usb_alt[y].sample_rate < ch->usb_alt[x].sample_rate)) + x = y; } - if (x != 0) - x--; - usb_proc_explore_lock(sc->sc_udev); ch->set_alt = x; usb_proc_explore_unlock(sc->sc_udev); From nobody Mon Mar 4 01:00:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tp0k54lYqz5Ch0q; Mon, 4 Mar 2024 01:00: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 4Tp0k54Fj5z4lym; Mon, 4 Mar 2024 01:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709514045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGv+4td9GALXjYLDjQ7+H9GqtlcLrzucVlW/hCp2y5s=; b=ksG8RY7GI/64gxKeoEhfqiPXCWN+ro59Cm5YcXzN7ND7vjtu4kwHPggngZv7+W8hGclkUV e0jFalcDRpFfulW2kzOOQXXpjGo/HiEAMqG2gP9EUWXfzenrknJPeWjAT9MTGyJjMMWFso xgnYD33dQisG6ty7D0MpbO9PCQ30Oej85Hts6m1N+lS2S4dhqOeqWG6kct9znySYx6Acr3 jq99mhOWYh/xGU17VOBeZpTmSzJZ2vhr1B5tkJuQQNaYCyudyCEaXCAN9F4cnhmm0NpahH ekVGJ3J4Gup6a7hYJKnjhKYUsQK3Zj0miwt1C26D8ul9WlShsNIW2Tzzt1A09A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709514045; a=rsa-sha256; cv=none; b=Etyv8IrvOhJ8WRdvq0JJaa+E0yhETnVJAnREWMZMYheFuRUWVWtn6tWyV1lgr5nlz/ie4p Ax1PjzOudzaw/NQR1TMnguY7Pv5OlTeSfwmlqiJLFiwVssYQosj+uklNhpqCZXOvXY/xKw DrdcDbPvliUTJY+FZkSE6kIvX/5y4EQWdGwXzLPXhqCTWkDZya/psGxoItfaCuJ/3EHK88 mG/5E+ozgM/vkxZdWz2nW10Jvt+6hvtS9qsA/lTbyQvrlvm/95Sk2YXbdI4uRC/4WlLmz1 wRyQwUCiQOGPt5khOZl50FdCL8X6I01VSNUGON+cMKyg8NYtdcUSXbvvHZ3NeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709514045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vGv+4td9GALXjYLDjQ7+H9GqtlcLrzucVlW/hCp2y5s=; b=FGpI0foEczHvCP4vfERY9pOS9Dne58cCHml8zMgt1fMKQSVRBvB1l8PVcepw3RjCpctNLX J/lKbhBMgPHgR3aDMq9oztqQQW+WekqmTgcUaQXXZwQ6Ooi4ZCtCdPSTiM4rGN9PwxIpk5 5n5iVZTIHHT1eyuvowG7vODWxDZmZxOFSmI9aCkRG8gaS17regfbJ5X8h0xHPl5rlxyxL+ y2+WxLuRelRPP5dQowcoLd77l2bwKP/bLUlWFANkMd+Iwp6P+rLWC8/2Ke6rFbVYJ8SwYf Grg3tCMbEXi1rtK5jMG6ljttd48dppbNE7roQONlJVBpC52yJw1KOeaOkpIvHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tp0k53qNFz11KJ; Mon, 4 Mar 2024 01:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42410jcx004169; Mon, 4 Mar 2024 01:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42410jsE004166; Mon, 4 Mar 2024 01:00:45 GMT (envelope-from git) Date: Mon, 4 Mar 2024 01:00:45 GMT Message-Id: <202403040100.42410jsE004166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 80ac36c3a2a8 - main - posix_spawnattr_setflags(3): validate argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80ac36c3a2a87a19790eba487466bf70d55f566e Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=80ac36c3a2a87a19790eba487466bf70d55f566e commit 80ac36c3a2a87a19790eba487466bf70d55f566e Author: Konstantin Belousov AuthorDate: 2024-03-03 13:19:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-04 01:00:38 +0000 posix_spawnattr_setflags(3): validate argument Reviewed by: emaste, kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44195 --- lib/libc/gen/posix_spawn.c | 4 ++++ lib/libc/gen/posix_spawnattr_getflags.3 | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index a067d1f68ea5..41e059cf437b 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -629,6 +629,10 @@ posix_spawnattr_getsigmask(const posix_spawnattr_t * __restrict sa, int posix_spawnattr_setflags(posix_spawnattr_t *sa, short flags) { + if ((flags & ~(POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP | + POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER | + POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK)) != 0) + return (EINVAL); (*sa)->sa_flags = flags; return (0); } diff --git a/lib/libc/gen/posix_spawnattr_getflags.3 b/lib/libc/gen/posix_spawnattr_getflags.3 index 9a468cbb8b0f..18cf6683e935 100644 --- a/lib/libc/gen/posix_spawnattr_getflags.3 +++ b/lib/libc/gen/posix_spawnattr_getflags.3 @@ -83,9 +83,12 @@ The default value of this attribute is as if no flags were set. .Sh RETURN VALUES The .Fn posix_spawnattr_getflags -and +function returns zero. +The .Fn posix_spawnattr_setflags -functions return zero. +function returns zero on success, and +.Er EINVAL +on failure due to invalid flag specified. .Sh SEE ALSO .Xr posix_spawn 3 , .Xr posix_spawnattr_destroy 3 , From nobody Mon Mar 4 01:00:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tp0k65wn6z5Ch0s; Mon, 4 Mar 2024 01:00: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 4Tp0k65VKmz4lfX; Mon, 4 Mar 2024 01:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709514046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqKGMfbbR063a5g8m9kiTNAmyqFi74jsr0/fGHns0nc=; b=UoS7r1CJxG7VOEIVsa4OgLwAZ+BNtPh2VEXl0W6QTz9+ATUa89in6XSzo1Bpr18xnsCxkg zx35jD0dKmAH7AbpdXVQWHs7HzJO4O3NKrtMhDpLxZR8KUn7Db7KHRL7vL7oa8QcUnCZ6J jNKPMEeuLgkfmLDkVwqZHb9cCRBmb/YMdVK0Lwgw4sioDbZs9lB88a1rQA1RETLRewdVcw mHjleKAyBzyKIJPVnQYLs+NN/MCxhTTWjGO+tXzQWwSftAWzRPyumY92McZWFtr1MYZ0kQ Ariutq6872oZHYBp5QBNCIQtuZ5pjamB6+hlhTAm8fjC4jgEvpXAZEER9C60Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709514046; a=rsa-sha256; cv=none; b=FBZcQvytP9ybj9XuUuWZ/li7qY/PuZ868q+zGszsBXz+24dvhaEva2PRgOUiZ6B2b7hz2x +pvaLfzj0pUY+BK93eJ94vjL3xz+g37pd0mVgw3p3OoX7x8eKcJk27VTNNvUnYbx2h0bA/ /2XNIUNt7bhjOK3kiQbfEbH3cyEr846LfY226p91Q6Z136litlKMQ1wd/O7iJpeKcmYzb9 dKZWa6Cww2fR5zIwxn6iREXYk868f+i3Qry4tzn3am8Wr612ROZHbU6O4zwbfG6oHTgalx kTL0Z0AE6SQ9IG6nWakj90+SYIPuzQh/xu7fYclvoC3g267VyN8gDcwjJIv+QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709514046; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NqKGMfbbR063a5g8m9kiTNAmyqFi74jsr0/fGHns0nc=; b=SeVay1dUqMnRyhOADX72/x3R0guke8gzGV7wxEEpUyiucLqCDCAQF2bdniaZ8PZFypPupk lCFU9rLQGQxmK7zZefpkM37Oi/gm8jZ6biRRwk4/cH44lujG6wMo1+iWe8i089ipxc6/gW 4oXHHb2zDLS9Vg12kJ2b89865pTNfhSm56JwCci2ASmeUVgkvndVEvaeRHJpr47MdFP+CU Tflw6SWlE8ekqYqEuCFPdc9gwWX9/CehxMsBVXt9FepFskpG6wUA3ck64aqyI0ExGDw+Mv oWn+750AA55S+reE+BKap2E0KRKiutNDmfQfVWmtwDxQT4l4NOsKx1p6J1IObw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tp0k655ldz11KK; Mon, 4 Mar 2024 01:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42410kbo004206; Mon, 4 Mar 2024 01:00:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42410kWZ004203; Mon, 4 Mar 2024 01:00:46 GMT (envelope-from git) Date: Mon, 4 Mar 2024 01:00:46 GMT Message-Id: <202403040100.42410kWZ004203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 822042fdfca7 - main - posix_spawn(3): add POSIX_SPAWN_DISABLE_ASLR_NP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 822042fdfca79faada89e67110b01dd9ecc05996 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=822042fdfca79faada89e67110b01dd9ecc05996 commit 822042fdfca79faada89e67110b01dd9ecc05996 Author: Konstantin Belousov AuthorDate: 2024-03-03 13:30:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-04 01:00:38 +0000 posix_spawn(3): add POSIX_SPAWN_DISABLE_ASLR_NP similar to Apple _POSIX_SPAWN_DISABLE_ASLR Reviewed by: emaste, kevans Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44195 --- include/spawn.h | 1 + lib/libc/gen/posix_spawn.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/include/spawn.h b/include/spawn.h index 9643fcda5c13..a93315930954 100644 --- a/include/spawn.h +++ b/include/spawn.h @@ -59,6 +59,7 @@ typedef struct __posix_spawn_file_actions *posix_spawn_file_actions_t; #define POSIX_SPAWN_SETSCHEDULER 0x08 #define POSIX_SPAWN_SETSIGDEF 0x10 #define POSIX_SPAWN_SETSIGMASK 0x20 +#define POSIX_SPAWN_DISABLE_ASLR_NP 0x40 __BEGIN_DECLS /* diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index 41e059cf437b..4726416f1d02 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -28,6 +28,7 @@ #include "namespace.h" #include +#include #include #include @@ -91,7 +92,7 @@ static int process_spawnattr(const posix_spawnattr_t sa) { struct sigaction sigact = { .sa_flags = 0, .sa_handler = SIG_DFL }; - int i; + int aslr, i; /* * POSIX doesn't really describe in which order everything @@ -139,6 +140,13 @@ process_spawnattr(const posix_spawnattr_t sa) } } + /* Disable ASLR. */ + if ((sa->sa_flags & POSIX_SPAWN_DISABLE_ASLR_NP) != 0) { + aslr = PROC_ASLR_FORCE_DISABLE; + if (procctl(P_PID, 0, PROC_ASLR_CTL, &aslr) != 0) + return (errno); + } + return (0); } @@ -631,7 +639,8 @@ posix_spawnattr_setflags(posix_spawnattr_t *sa, short flags) { if ((flags & ~(POSIX_SPAWN_RESETIDS | POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSCHEDPARAM | POSIX_SPAWN_SETSCHEDULER | - POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK)) != 0) + POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK | + POSIX_SPAWN_DISABLE_ASLR_NP)) != 0) return (EINVAL); (*sa)->sa_flags = flags; return (0); From nobody Mon Mar 4 01:00:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tp0k84rQYz5Ch3V; Mon, 4 Mar 2024 01:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tp0k82GQ5z4ltL; Mon, 4 Mar 2024 01:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709514048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vah6gSgKTudtOLCvrukw08yUXS/yr3B+c0KPcV1Bys=; b=I/ktrX6uuGWjDGZKARFADqLoNvKuVzijz/iwR00Oz6tjUfg3MbknyH2XzkOAXqaE+yPoIh hZYQmfatYnAWtUI7A6Rm4IzAC6cx2VwzUH5ASDmZPHjlj1I8cKUY+wDDT1i5tY3vbDevjb cK36M+AzGH0gUhNffJUtjgSS/MpGcgAW1Au1T1c4SdvXNiksJBubtzr0wx/ij0H2gvgrY7 S3g/aJGKc0ckg4Y6VfC2Z7fnSJemTF8jk7+z8iX/IRT5UK3C1otXlDsCFfo3LcrJwdVRne ycALdcn4+MRwQ3Pa4i119VFXN4L26Zo4JsbvBXyZ5EZOiW2/QeXj1nmzcUFneg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709514048; a=rsa-sha256; cv=none; b=V+NfZUy9lHZU6kDziHuRkg+OKOUlK+vM0P+Ny1LaHz+uDj/OF0LcpELiQTNnOjeQt1Outm 2/RdLHRknhTIdm/IifVtl4gGk5mtBVrE8/uRip1IT5sE8t+EhjVxwERn8XA5BZOJOMxHJL yIWlzF/tMNuOAHmPW/OcdE7c9C6TrIpLT2N4nfFZJI/rUmye2tTJ+LpQtKEkd9lOsIv2hL U0sAt535bsAaGJ2mhRCX89e8g8KIwWWhdVE/tLZBNWALCcidlHtwl8591TIVo/GpoE3tta F2i2sv+B1mp4oRAzTZjXFiOX4UEUeL0kgiPVq+jJrsDvl3WWphDMdQLH2arXUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709514048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3vah6gSgKTudtOLCvrukw08yUXS/yr3B+c0KPcV1Bys=; b=gTk5hQW2poip7zzf8xrmdgXEsbXGxCIN/iDrWNo9vP88Iu1ZcUbaEpP4iUSwxKDBkLyLCM T5NRexu7Gpgc0hw4RLUTbu/s6q/hyNvWadU0L267/PDP7fctSVpgblQcoO0EWnmin2sudq lVXtruDaGfXU2D7klIc1tqmqYYApiBH+nMQhLmJPmZ9/p36REHoyUsuMiIkCLv9eYR/0Si 8lojA0KFl5eLTNg80DlGRiuPg+HYFF588EblI1h1BZxCrnjY0YjGcbiiPnNt3vTs3cSX/o tte6ytHeTZ5ow008pLtWk5L7IYi2lEfhsisM9QyUWV+4RbxqBcgLaOmwIoBtmQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tp0k764k2z11Sl; Mon, 4 Mar 2024 01:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42410lYj004242; Mon, 4 Mar 2024 01:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42410lco004239; Mon, 4 Mar 2024 01:00:47 GMT (envelope-from git) Date: Mon, 4 Mar 2024 01:00:47 GMT Message-Id: <202403040100.42410lco004239@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: a725a7a24de5 - main - posix_spawn(3): document POSIX_SPAWN_DISABLE_ASLR_NP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a725a7a24de585e996f21e190b5af41261ebc774 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a725a7a24de585e996f21e190b5af41261ebc774 commit a725a7a24de585e996f21e190b5af41261ebc774 Author: Konstantin Belousov AuthorDate: 2024-03-03 22:19:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-04 01:00:39 +0000 posix_spawn(3): document POSIX_SPAWN_DISABLE_ASLR_NP Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libc/gen/posix_spawn.3 | 12 +++++++++++- lib/libc/gen/posix_spawnattr_getflags.3 | 3 ++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3 index a9ff7b2b21da..55559ae7222b 100644 --- a/lib/libc/gen/posix_spawn.3 +++ b/lib/libc/gen/posix_spawn.3 @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd November 28, 2021 +.Dd March 4, 2024 .Dt POSIX_SPAWN 3 .Os .Sh NAME @@ -297,6 +297,15 @@ and the signals being indicated in the spawn-sigdefault attribute of the object referenced by .Fa attrp . .Pp +The Address Space Layout Randomization for the newly spawned process +can be disabled by specifying the +.Dv POSIX_SPAWN_DISABLE_ASLR_NP +flag in the spawn-flags attribute. +This setting is inherited by future children of the child as well. +See +.Xr procctl 2 +for more details. +.Pp If the value of the .Fa attrp pointer is NULL, then the default values are used. @@ -432,6 +441,7 @@ action. .Xr execve 2 , .Xr fcntl 2 , .Xr open 2 , +.Xr procctl 2 , .Xr sched_setparam 2 , .Xr sched_setscheduler 2 , .Xr setpgid 2 , diff --git a/lib/libc/gen/posix_spawnattr_getflags.3 b/lib/libc/gen/posix_spawnattr_getflags.3 index 18cf6683e935..308bbb386d76 100644 --- a/lib/libc/gen/posix_spawnattr_getflags.3 +++ b/lib/libc/gen/posix_spawnattr_getflags.3 @@ -32,7 +32,7 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.Dd March 24, 2008 +.Dd March 4, 2024 .Dt POSIX_SPAWNATTR_GETFLAGS 3 .Os .Sh NAME @@ -75,6 +75,7 @@ It is the bitwise-inclusive OR of zero or more of the following flags .It Dv POSIX_SPAWN_SETSIGMASK .It Dv POSIX_SPAWN_SETSCHEDPARAM .It Dv POSIX_SPAWN_SETSCHEDULER +.It Dv POSIX_SPAWN_DISABLE_ASLR_NP .El .Pp These flags are defined in From nobody Mon Mar 4 09:34:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpD791szQz5CGjl; Mon, 4 Mar 2024 09:34:45 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpD791GWVz4gQm; Mon, 4 Mar 2024 09:34:45 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709544885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1VmJ93tKepwo5uten5CzuCdzhHnjVz3RM1lS8/b4yQE=; b=Y2aqF20Xo0KtKkVo7greg5N8eIWYOwY6Yz3McFFrqynuCQWHqXVeqpKvH4gltBVWHwmK3x nLtNPUvi9SlTa05h3GLUlPc8pUiLiemi+dWdSrGVzCrUn7DFTAATWPn1tAYzD8Nc9AzHYP BoAFcZqlGIlv2Wlwdt1Y+ck7QLon6vQSwGbRDCFQ5vvc40bXWzsv4pySgAFQtQ8Q8Ohj0b NyTyh3xTRT5zboVCFSNdDblVmO4n626EPCoI6Klz6Ncd8RROmd+xiceC6cnTlNMSsAO5/v tHP/Yq02ZjQ5It+n7+fY9CrEWwiP+u8CpS55Btq7Z50Fi9qYL90cOFT5iVpXjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709544885; a=rsa-sha256; cv=none; b=OWThFnRkltgI0S+SCSkc5Z9rA6fj8tSmu0Wm+sN+FjBa6EOJSctML5Ab0WyU7uHQm2bcab MzFuKdeEKZM0A+xLG2sb0RIcAs7DpCoIzSyK06TZWYoE80JT5kW57UQep96dKDk987/V8q UI/YCDDXDh1D7Eat0nVEL/S9YoK4Vou+MCOIHbc7CkWPSf24emBbQerlugolUd78sFDMgg GN8p5LKvZIYBWAIg15Bv8F05OyBvjBW+Xd6fWERmGSoe/+VPnT8qi7XAWTRdEm8DA7B49g GDhHl/Hl0yB6GQAx+snEuOW5nTZT8cuKuO3WZt8448tdvbFeOhN25naU7CoVnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709544885; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1VmJ93tKepwo5uten5CzuCdzhHnjVz3RM1lS8/b4yQE=; b=ZbSurmcevqBrPnUu21CIkp4XOEzuuJpzKK3rm9cOgy8v4f4e11xalxtAPFvQ8190vEwA6L WnpLmRpu3XLPznxDNcFjuReB0tYC9fx+shqkRnD4kdWlr6yLbkC29gmwhE0tEFK7vwZcPl SM313q6hPBk/uxkcLkcp7PLipFGmvOtnaCn1up9lC+eG2m5GV3j0bbTlxwtgkRt2QOY7Aa dO7bm5OplglCrEH0M/Y/Zav8ivV2tl70USWKtxQ6xyXaE9BFLqS8yhBSe5IP9g2lEBNzt8 Pa4wAzJ3WxcJZtv7lkB5IWnRdBbmhss2tXw7e9cS/ScGm1ZGH3qfHrUhf8zvZA== Received: from ltc.des.dev (163.23.65.37.rev.sfr.net [37.65.23.163]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TpD7908CKzJ51; Mon, 4 Mar 2024 09:34:44 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id CEF961086B1; Mon, 4 Mar 2024 10:34:42 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gordon Bergling Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: Re: git: 38a5635de99f - stable/14 - md5.1: Fix an example In-Reply-To: <202403031749.423HnX7f068039@gitrepo.freebsd.org> (Gordon Bergling's message of "Sun, 3 Mar 2024 17:49:33 GMT") References: <202403031749.423HnX7f068039@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Mon, 04 Mar 2024 10:34:42 +0100 Message-ID: <86o7buxrv1.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gordon Bergling writes: > The branch stable/14 has been updated by gbe: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D38a5635de99f3a3ab5f6ec07d2= 896ee7ffdb8826 so did you just decide to ignore the review feedback? DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Mar 4 14:34:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpLn55XGwz5CjMV; Mon, 4 Mar 2024 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpLn54myLz40lY; Mon, 4 Mar 2024 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709562873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7niOba8woMAYcad+kG9mEPHCM91T6+EG8coUSZvpNpM=; b=NppHKzb/rBSG6CXXmQYkWOJ+LFNZKhQeOigNDugOu89Od34PqaPOGlKA0B0f7wLg0/KIXp UGAibJQohXp2OR4WX3T38JUS9iag7OVhiWNIhedCSaa2DqnqZjIpSp9NuedQ+OMFD0KOZV AjHBsCQojPuXHpjRGXkWfxdyS06EVIFYqo6/HxQUqoOJgZqxlMJ1u6Godxk5KoNA+3FIka CzlnpG0sTHjweNrU30Xr5+oPFiMhLERoyuRBUVekODfq3Aik2zLUZ7wkD5aN8+Yfnop5eN bt9EnQwAasYpuqBdYq82/0OSoKVsO7qc+qkrNFcmWx0U/Ln4ssb7eaxrKcDWOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709562873; a=rsa-sha256; cv=none; b=SaZMKsIQ+D5/YNOAzWkejLiiDYFJZLvdXIJeLb1kndcIX4crfaZZMp5DPwWvseqjISc//K 55BAtfmebO3ckalPBtY0GOi+bTTqHOfxNQaevHXhW7MUMfU9R+QrA3DkAjq6fSnxtMH2G3 dyHs36+yjocr137ILRUjG6huRB1EMxwrU0bTha7VSS7FbSqkOdMdnPAbX968vEId8Hm3rU lqWEEU0V8BEf5EFLVSzwDuGJkCsgTCoS0Irok2QTo8OUAHV+KwRjAulm0NA4J8OtTyvz8o EzTtRpjIGZvF1PjoD9lvYkv04h23aMJKMGFypMNvEkRTu9GwLjFZitFVMloZDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709562873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7niOba8woMAYcad+kG9mEPHCM91T6+EG8coUSZvpNpM=; b=T9WAYEAY1V0eRPieW0vUfrELn1OnYe8GRR0DehVTdyp0HBJ6kRbxOQwac5+x2IS8nHhSTt 3BJ32aiV8XyvMA7rgHfO2e20beOWxvd9Y5VSXiM/xtL2RpYEYFlM24sgmjYSsmLRCKQE71 gOfq1E225AbJbCaMEPZWpY1KqW+NJjGAU/0aQKg/OM9/YXh79FaBNS3Bb6aovC3N28eSk6 kKX+RbSy/GXU6ynQNEO3Bo0/XbRPqukOguMZw0mLi1THCff+7NosSKRmIFitWhYMKb4b6P qhjgOn+3DnyWv4BwQZnBeUTouwrztr5cyckBUX+AFW5O5vG/lFRHQCZrbpyvlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpLn54FtGzPxn; Mon, 4 Mar 2024 14:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424EYXbq074676; Mon, 4 Mar 2024 14:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424EYXcR074673; Mon, 4 Mar 2024 14:34:33 GMT (envelope-from git) Date: Mon, 4 Mar 2024 14:34:33 GMT Message-Id: <202403041434.424EYXcR074673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d3befb534b9c - main - LinuxKPI: Queue skbuffs at tail in __skb_queue_tail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3befb534b9c8cd80f1b8d75ce6451e3f62b8ba9 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d3befb534b9c8cd80f1b8d75ce6451e3f62b8ba9 commit d3befb534b9c8cd80f1b8d75ce6451e3f62b8ba9 Author: Tom Coldrick AuthorDate: 2024-03-02 19:22:55 +0000 Commit: Ed Maste CommitDate: 2024-03-04 14:33:12 +0000 LinuxKPI: Queue skbuffs at tail in __skb_queue_tail Correct skb_queue_tail to queue the buffer at the tail of the skbuff. The skbuff is a circular doubly-linked list, and we call with a pointer to the head of the list. Thus queueing before the head gives us a queueing at the tail. As a motivating factor, the current behaviour (queueing at the head) was causing frequent kernel panics from my RTL8822BE wireless card, which uses the rtw88 driver. Interrupts can cause buffers to be added to the rtwdev c2h_queue while the queue is being drained in rtw_c2h_work. Queueing at the head would leave the nascent entry in the linked list pointing to the old, now freed, memory for the buffer being processed. When rtw_c2h_work is next called, we try reading this and so panic. Reviewed by: emaste, bz MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44192 --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index f8ce212e7853..02190a29e241 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -567,7 +567,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { SKB_TRACE2(q, new); - __skb_queue_after(q, (struct sk_buff *)q, new); + __skb_queue_before(q, (struct sk_buff *)q, new); } static inline void From nobody Mon Mar 4 16:41:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpPbh3Jf8z5CvSQ; Mon, 4 Mar 2024 16:41: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 4TpPbh2pJVz4KS4; Mon, 4 Mar 2024 16:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709570496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4I7xfRiv9RLYD8giaOj7/ZYOhTBcMu5jQ8lHSKRGPp0=; b=mGzl9hAnCFrSs3SBjRk1YtRa2onalyIo4De8EL5BkHMRsSRUNfCJX9ZhRa4XwgjKmc1g0l vi+dDROfu1A9y0Wxpvy88MmwD+LTBHTD4ZrYaQxIGw0VhRLMbr3rK8scsoY+BbR48i4X6Z adafATQ/EayymkB1yTByzOfNEr12JZGxKdhvQEtLJDxY3rTncsGqT8Jgi7Q9QI4NzlyorN +a3YavOBvnfWNfeSUy1RvTOOvh+KxR+ts+OGX905UXOJ+YAV6wVq+Yv+xZvTYV2E4eA1Kg cqSM6pn5PZxz7+uLaHxtjs+X/cjNnSv05bxxaWYP3X25LVwF6kdBfb6Z6lAtpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709570496; a=rsa-sha256; cv=none; b=Vl4frCk5vJnYszld46IYs415yAvBo85GceqNqzc7B8fKRtSqXfSBhfRx4sD5OoqdKh0I/W J1bZjaAXSaGG47XQcXvHqHilZ5xsFvJuKPc3XhBxkRb3XBkITFZayxSiByvQNmmWWiieLq kWK4tq4n69YjRknGFraNqHoyTOYrn1B9xB2wA4lN3H/lqcAHMBdMNZ4lMoX47EHG/c3yLP 5YjJUjUyN4+IpeZw/SYZJZQ2Q6edN3ByXc+NlnT5FKTiTSjYzYXYBpSa3dHGYXBAcx0fPK SwoXjoLLhsxnPBcZetWODkbf0504dDl5qmupcCM6sbm7X0GcWHUdvCYNRk/WeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709570496; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4I7xfRiv9RLYD8giaOj7/ZYOhTBcMu5jQ8lHSKRGPp0=; b=ckWhDC0LEXEiIZsRBoxx8rVKCBRRKxi/gkN67uslhHmBG/o0oA1VCTQK8ePFqV5Yu8Wghc ZxR1j6RerOg2Z5d7XatAli7oHlelaMOZOnWTLXKDLJqcrAxR3aRSAhwI2vnE1HDS67MdCv BFQ2GpzFfbi9aDImSWjwMitcZ+0JNleDZhgEn0cjEscnTQYYMLr2WjM2K/ujEPAPr/3GCV fq9MjSaP4ahS3vp3Ql0xJIIQ87qE38S4eeWMokUVZrwNOqukGIgPDDgsW2xEEVOINLBuTu JL8IZyAPsBsiS1Cqq2TdPJhJEXhK7rly6LHbBedTc3jmFic51SjN2aRrPhvuZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpPbh2N0tzTrm; Mon, 4 Mar 2024 16:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424GfagS093138; Mon, 4 Mar 2024 16:41:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424GfavG093135; Mon, 4 Mar 2024 16:41:36 GMT (envelope-from git) Date: Mon, 4 Mar 2024 16:41:36 GMT Message-Id: <202403041641.424GfavG093135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 84ed86380aeb - main - hostapd: Work around lack of MLME support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 84ed86380aeb566ffd8b957ba99c36ad345413ef Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=84ed86380aeb566ffd8b957ba99c36ad345413ef commit 84ed86380aeb566ffd8b957ba99c36ad345413ef Author: Cy Schubert AuthorDate: 2024-02-27 03:34:09 +0000 Commit: Cy Schubert CommitDate: 2024-03-04 16:40:58 +0000 hostapd: Work around lack of MLME support hostap MLME uses Linux data structures and definitions not available in FreeBSD. The ability for hostapd to select the frequency (channel) depends Linux MLME, though strictly it's not required. Work around the Linux MLME requirement to configure device frequency. The detailed description is: hostapd will only set the channel (frequency) when Linux MLME is configured. Enabling NEED_AP_MLME will result in numerous build errors due do Linux data structures and definitions not available under FreeBSD. The code to set the frequency from the selected channel is only within the NEED_AP_MLME code path because without MLME, hostapd_get_hw_features() is an inline that always returns -1 whereas with MLME hostapd_get_hw_features() will obtain hardware features from the kernel. Until such time we simply set the frequency as configured. PR: 276375 MFC after: 1 month --- contrib/wpa/src/ap/hostapd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/contrib/wpa/src/ap/hostapd.c b/contrib/wpa/src/ap/hostapd.c index 4b88641a2dde..a5cabc01f163 100644 --- a/contrib/wpa/src/ap/hostapd.c +++ b/contrib/wpa/src/ap/hostapd.c @@ -1698,6 +1698,20 @@ static int setup_interface2(struct hostapd_iface *iface) { iface->wait_channel_update = 0; +#ifdef __FreeBSD + /* XXX hostapd_get_hw_features() is an inline that always returns -1 + * because MLME will not build under FreeBSD due to its use of + * Linux definitions. Normally FreeBSD would uncondionally execute the + * "Not all drivers support..." block. Instead we #ifdef out the entire + * block of code instead of maintaining the fallacy that + * hostapd_get_hw_features() returns anything meaninful. + * + * Ideally WANT_AP_MLME should be taught about FreeBSD data structures + * and defintions. Instead we do this to enable channel selection in + * hostapd.conf. + */ + iface->freq = iface->conf->channel; +#else if (hostapd_get_hw_features(iface)) { /* Not all drivers support this yet, so continue without hw * feature data. */ @@ -1744,6 +1758,7 @@ static int setup_interface2(struct hostapd_iface *iface) if (iface->conf->ieee80211h) wpa_printf(MSG_DEBUG, "DFS support is enabled"); } +#endif return hostapd_setup_interface_complete(iface, 0); fail: From nobody Mon Mar 4 18:45:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpSM76SVqz5D5S1; Mon, 4 Mar 2024 18: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 4TpSM74mnpz4bL0; Mon, 4 Mar 2024 18: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=1709577955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hKzwIzjurCBgC8EIApcBewWGVnNNFsq1dizPMpwLxY=; b=ecjM2fII6GDwh9Z7Tqn1XT0PD/Tcfxj5ZWvVjAterrBtjpNQ5Zo7UJlng6R7w/BZ+CVPIn c1aDRYwqTgMGikN9PEWAD6PTOU5vgEL3Fxsaf2FyHS+GR9t6cKafmDWxuC9wPgou3KucIZ GWUlkcXbGQ53tNzTigHVY+ARdajbc3qdblxQgDVqhEaBJunPPa3diVPZN9mMgB1nwN0eNc tnHO/vofP3aHM+OXPLf5XkAoPLn9u6KUAAdttQ3yT1Wvdj2Nb7Znx1qjcYKfmNiE8ixKvy zDNdXM0pugnKcB+QfWkZmZ42Rl19Il8yyzs9+bIUcIsQakG+LZ2dTlnS1hk5QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709577955; a=rsa-sha256; cv=none; b=juBbwNM/dhCEoYm88ZqGZlXToeRhdnaQUAwrrKCCfEYYsps/NU3R35H3XjQ5R0BOsArFnp LCQ9sDr3+5JIb/F6eGZFGxug+be9mo9CJjy6dnSRKaHBczUYDAzDF4CpSX1sJRyGMp4Nk+ le7kllt7sjglXnakOV6zgahVBoxXFKK8qOvUqnEv7/9h49yNwSVceuUGmxP7DepeXDJ64C +Ygfe8qy+rTUb2EiR+B5IcFnIWZYJthqtnRCqrIoxjBUAfpWOtsR1qOig7jCh79UG3DL8K bn5Cd0buYjkCUhrYlSeolheowL+YmczZpGT+Qru93FDFvWikcFzsVqXK5rA8EQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709577955; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7hKzwIzjurCBgC8EIApcBewWGVnNNFsq1dizPMpwLxY=; b=ZWRH2+yoQPV+z0xwo2stS1wCL0/DVXPkxCTEm6E7mGAQHSdZyuch/l+3uQqZzNYZmunoxB KQ7NFbudunve1BMdALrN3Kcj/DFnpKVyUXx7TFttOZ8zlqYO6oGHfvWLqCQzQydGTZJ+Jz r+VYjfCqFlgbzgAO4r1tswOCIMf6ss/wcxlKGrcdxYMDvRvH45FSV0jKqXUdSc/NxQL/qu Vq0G2ImZO0BwrxRaZc7+z3KY4GWGen3ZmOH8hQbWe6iqIaX0TG4uVXj//uQ41UmwM90962 yTGountvejptcmGoo17hcKkjq0fexhyOi9n5p4NqUDJirRCftH0cxZK4tiibKQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpSM74FldzYlr; Mon, 4 Mar 2024 18:45:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424Ijter096896; Mon, 4 Mar 2024 18:45:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424IjtKo096893; Mon, 4 Mar 2024 18:45:55 GMT (envelope-from git) Date: Mon, 4 Mar 2024 18:45:55 GMT Message-Id: <202403041845.424IjtKo096893@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: da48ddbf7c38 - main - riscv: catch up with EARLY_PRINTF changes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da48ddbf7c38d481d01cf3a9752764bf826cb15e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=da48ddbf7c38d481d01cf3a9752764bf826cb15e commit da48ddbf7c38d481d01cf3a9752764bf826cb15e Author: Mitchell Horne AuthorDate: 2024-03-04 18:45:17 +0000 Commit: Mitchell Horne CommitDate: 2024-03-04 18:45:17 +0000 riscv: catch up with EARLY_PRINTF changes On this platform early console access is possible via SBI. Follow recent changes to EARLY_PRINTF option and give it a named constant. Update the commented option in GENERIC so that it compiles. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44100 --- sys/riscv/conf/GENERIC | 2 +- sys/riscv/riscv/riscv_console.c | 2 +- sys/sys/systm.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 74ca1a94fc87..ca71f7423cfa 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -165,7 +165,7 @@ options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence -# options EARLY_PRINTF +# options EARLY_PRINTF=sbi options VERBOSE_SYSINIT=0 # Support debug.verbose_sysinit, off by default # Kernel dump features. diff --git a/sys/riscv/riscv/riscv_console.c b/sys/riscv/riscv/riscv_console.c index d6c4ce4540cb..e582b3385384 100644 --- a/sys/riscv/riscv/riscv_console.c +++ b/sys/riscv/riscv/riscv_console.c @@ -110,7 +110,7 @@ riscv_putc(int c) sbi_console_putchar(c); } -#ifdef EARLY_PRINTF +#if CHECK_EARLY_PRINTF(sbi) early_putc_t *early_putc = riscv_putc; #endif diff --git a/sys/sys/systm.h b/sys/sys/systm.h index f72f82c100dc..17a1c814cf75 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -215,6 +215,7 @@ extern early_putc_t *early_putc; #define early_printf_ns8250 3 #define early_printf_pl011 4 #define early_printf_snps 5 +#define early_printf_sbi 6 #else #define CHECK_EARLY_PRINTF(x) 0 #endif From nobody Mon Mar 4 18:51:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpSTs5PGlz5D5tS; Mon, 4 Mar 2024 18:51: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 4TpSTs4r0Hz4bnJ; Mon, 4 Mar 2024 18:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/YkbO/LkohPs9H/9uGzasKKoC73HQJlvKzZMHB7fm8=; b=i7JAbeK0zqDRMpac2baFxoECYBQ2TNgc0HKRDiaZcVTBynvCPCRV1SCoLjROHu41enseRS Z/sp3TnONEnSvcUWwOilXMgrmEgG2JaUDIQIEagqdSUDEXJexVVPEaoBMxbPvmS+gQOCPz rLhufBR0ZoymXcyduMJN95AiZv1Ms6/NKU0/OjptLbIcOHrkyVPnQsRkEd3/jBFLb0knAB A1+hOIVK2Nf1JYfkuPj7GV3vZC6mvBk1D+0CYZ8/1GqJF63TmE/BjSAK+X850uYGAFoT03 bAU+/TCtNRglpDQZsUZKmolLCrHZDdEGEyysHKvDfxjbTGHf38Rvd1Vhwmpm5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709578305; a=rsa-sha256; cv=none; b=bC6oM/YGkKfPp2U99Vt9R+wzr2tnmbzcwsqTauC3jgJ3QruRhIrVY9zVUoShiEtRHp3hRk 09BSmWZIb3m8eqh4jX5l5Q8UBGY1Z3jdBlpNiHEuvrLGJ8lgZ05qb+yiBSdub5mnsSVpZb Dmh5pmFO5HZQ0PSuDtRM7y9ulztwqRKDW0EcrnfCXMrsw2fWjcqINfCwFXWhu1ettG7w1w FpNvaHnXTT7SNHCxAr+VKaWjHRP9u9mbsrKkUzPWBSFGYZxNZ2sn8u6ePtoXR9K71lofAT ZHvJQrKIBnOPSizYaYCl5rNe5FP3LJdop3ayn146jvysGZxUq81HFfDL7jdtXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/YkbO/LkohPs9H/9uGzasKKoC73HQJlvKzZMHB7fm8=; b=DerfejhZbX7WWvDcGtzX1hlLcevIzJhpYWCZI/AxMAy384SKPIzXKDmz9W0rUzhIPhpbte ln2i8i7ltWSLdx46xN1+aGxer+4CH9Do5Ixytn9Cw8sllCX2AWhMGiukjjithzbmDmL2qB QZsFDdUXouS7OmOvnPMrFVmDxRdFDSxvAIO9f0m7+0V52GLhrtsM9zTtICHaoMLS250fK/ 9z8SgbcSfSdneWISJn0LciMt2zDjCCiI6BHPR7KQq9sfYBhBrUf6xI6ny+rEObtuQmMaTT QfND6ZKIeZjtVYNwfIXIoYwo1ad57PpMGW6MOU63+tYphzYyt+Zik+/eDVeyNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpSTs4Qv0zYmJ; Mon, 4 Mar 2024 18:51:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424Ipjmr009577; Mon, 4 Mar 2024 18:51:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424Ipj0g009574; Mon, 4 Mar 2024 18:51:45 GMT (envelope-from git) Date: Mon, 4 Mar 2024 18:51:45 GMT Message-Id: <202403041851.424Ipj0g009574@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: d0bb255d1fcb - stable/14 - VFS: update VOP_FSYNC() debug check to reflect actual locking policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d0bb255d1fcbf4baff4cc43df684deb2ecd2f96d Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=d0bb255d1fcbf4baff4cc43df684deb2ecd2f96d commit d0bb255d1fcbf4baff4cc43df684deb2ecd2f96d Author: Jason A. Harmening AuthorDate: 2023-12-26 02:02:25 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-04 18:30:27 +0000 VFS: update VOP_FSYNC() debug check to reflect actual locking policy Shared vs. exclusive locking is determined not by MNT_EXTENDED_SHARED but by MNT_SHARED_WRITES (although there are several places that ignore this and simply always use an exclusive lock). Also add a comment on the possible difference between VOP_GETWRITEMOUNT(vp) and vp->v_mount on this path. Found by local testing of unionfs atop ZFS with DEBUG_VFS_LOCKS. Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D43816 (cherry picked from commit 9530182e371dee382b76d8594f65633a304b396f) --- sys/kern/vfs_subr.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index b9e92b5b9812..d1c17dca37d4 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5845,7 +5845,22 @@ vop_fsync_debugprepost(struct vnode *vp, const char *name) { if (vp->v_type == VCHR) ; - else if (MNT_EXTENDED_SHARED(vp->v_mount)) + /* + * The shared vs. exclusive locking policy for fsync() + * is actually determined by vp's write mount as indicated + * by VOP_GETWRITEMOUNT(), which for stacked filesystems + * may not be the same as vp->v_mount. However, if the + * underlying filesystem which really handles the fsync() + * supports shared locking, the stacked filesystem must also + * be prepared for its VOP_FSYNC() operation to be called + * with only a shared lock. On the other hand, if the + * stacked filesystem claims support for shared write + * locking but the underlying filesystem does not, and the + * caller incorrectly uses a shared lock, this condition + * should still be caught when the stacked filesystem + * invokes VOP_FSYNC() on the underlying filesystem. + */ + else if (MNT_SHARED_WRITES(vp->v_mount)) ASSERT_VOP_LOCKED(vp, name); else ASSERT_VOP_ELOCKED(vp, name); From nobody Mon Mar 4 18:51:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpSTt6p89z5D6Nr; Mon, 4 Mar 2024 18:51: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 4TpSTt5llkz4bnK; Mon, 4 Mar 2024 18:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ky7Mux0irIVr5Zh2CSNT2SAs6Gedn/gMBdkEZXKmf18=; b=VnG4GkvOTqQx1lW6ISTwXGXgVSnkx/4v2PVFGtjWP/xXYGLrbbxI5wox3AOv+IiHrrt+QE E3I1nMGyj3Em0jS/0lPU2r+bsN3zrKoC0JdMkSu+bzc1+M0pkkligMRUYLYEEsXlOqWbjV njJaPPTHTioBnAcayoy+K3GvUYUW2LuSArBn6SWmTM8DuqLxYxwsb4lUg9Jal0qW5km9vl Vs4M0ahG6zEYrHSS3fvJh+UzLQUeRjO2e275n93Lb3zStwsnoofM2ZURHvhVNvqkiktqz4 2X+2i6JH/gXfUkNxCNNpZJH9Rb0+Ns8JCnyRQ+LPAkR9z6JUJxRMMW9N3bsAWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709578306; a=rsa-sha256; cv=none; b=yp6sr1XfrjOukZ9SVc3mV/MFclWjYKi2VQAg+4WVCMoGnBPru9FM8ME70BGQOXq7stPiUx FfPoqO6JQ5Jqg9suQMqKwKBg7a7PWkRY14biYvndxoD4p7hJnyv7cEaQ3l7sP3CCVLm3VA nle9PqoJPTBa/8fc36KicBNpOvqKhOvPrDG4IJtZmJXAdi6M0PY0ZAJz7M2xgrxZ2HOeiq DKj0EM3DnlHog0VtGue0vJQXAMc9oh1nUMs8R9dHNCgTi+BEUusPsoKk8PWuTdzYS7LlVI cvQNqeJywE74LdoSBaN5L00c7LxCodAcCrLa3jB3nlbG/kQ8NfAcS7a4tsAyEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ky7Mux0irIVr5Zh2CSNT2SAs6Gedn/gMBdkEZXKmf18=; b=yW7wFGVMrbsFXBzsZ3Zqm0pbuPEkJziKUIzv6f9qpWK1+O0YrlUVDv+kf5rwzbedVeG+eS g9U1owtM519+qU9IAyQDe22CRo4Hw55LrWqLPY5eKHxyXqACMFYpJvfLjTlPWDEHaKDNf0 YFxe/PTGj/xdI4+xUNIP9VQvRi3ykieMUj2/9I1aO/kPJ7jf45PjMipUFiak1ZG8Xk+p1I k/S9+Y9f0Y4GvEXNj9SUIRyCvtmMwBxMxfHApZuO+lNdkUPd/PmnqIiRMl3U87i1OakW08 6AudCmxUT5hF7WFoD5Z9xE35PplW7sPLT8a4xnnCGPd+TTSYWg4zZk5byq+yQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpSTt5N4kzYk1; Mon, 4 Mar 2024 18:51:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424IpkCf009634; Mon, 4 Mar 2024 18:51:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424IpkxK009631; Mon, 4 Mar 2024 18:51:46 GMT (envelope-from git) Date: Mon, 4 Mar 2024 18:51:46 GMT Message-Id: <202403041851.424IpkxK009631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: c18e6a5a5c63 - stable/14 - unionfs: work around underlying FS failing to respect cn_namelen List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c18e6a5a5c63d85d664d60dc3bf0232ea21bf8d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=c18e6a5a5c63d85d664d60dc3bf0232ea21bf8d2 commit c18e6a5a5c63d85d664d60dc3bf0232ea21bf8d2 Author: Jason A. Harmening AuthorDate: 2023-12-24 04:48:19 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-04 18:31:25 +0000 unionfs: work around underlying FS failing to respect cn_namelen unionfs_mkshadowdir() may be invoked on a non-leaf pathname component during lookup, in which case the NUL terminator of the pathname buffer will be well beyond the end of the current component. cn_namelen in this case will still (correctly) indicate the length of only the current component, but ZFS in particular does not currently respect cn_namelen, leading to the creation on inacessible files with slashes in their names. Work around this behavior by temporarily NUL- terminating the current pathname component for the call to VOP_MKDIR(). https://github.com/openzfs/zfs/issues/15705 has been filed to track a proper upstream fix for the issue at hand. PR: 275871 Reported by: Karlo Miličević Tested by: Karlo Miličević Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D43818 (cherry picked from commit a2ddbe019d51b35f9da2cb5ddca8c69f0ee422da) --- sys/fs/unionfs/union_subr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index c841136e42d5..469ba0775e7c 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -918,7 +918,24 @@ unionfs_mkshadowdir(struct unionfs_mount *ump, struct vnode *udvp, goto unionfs_mkshadowdir_abort; unionfs_create_uppervattr_core(ump, &lva, &va, td); + /* + * Temporarily NUL-terminate the current pathname component. + * This function may be called during lookup operations in which + * the current pathname component is not the leaf, meaning that + * the NUL terminator is some distance beyond the end of the current + * component. This *should* be fine, as cn_namelen will still + * correctly indicate the length of only the current component, + * but ZFS in particular does not respect cn_namelen in its VOP_MKDIR + * implementation + * Note that this assumes nd.ni_cnd.cn_pnbuf was allocated by + * something like a local namei() operation and the temporary + * NUL-termination will not have an effect on other threads. + */ + char *pathend = &nd.ni_cnd.cn_nameptr[nd.ni_cnd.cn_namelen]; + char pathterm = *pathend; + *pathend = '\0'; error = VOP_MKDIR(udvp, &uvp, &nd.ni_cnd, &va); + *pathend = pathterm; if (!error) { unionfs_node_update(unp, uvp, td); From nobody Mon Mar 4 18:51:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpSTw0ldQz5D6CR; Mon, 4 Mar 2024 18:51:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpSTv6VSHz4bxn; Mon, 4 Mar 2024 18:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bEk9AZZ9CBjWByyAsU1mEt1h3cKjGZbLgr4dycRnWNI=; b=x2AHRyfeJw8sHupYHRnqQIjhMkz+nHTS2PwtLw4U+pnuKwdWht1oU16Ry3UUcq0BbsgymC Zduu7LGF45GHxHSmdATGEkVqxg99v06/BdKcy/IU9lGTZHA2g/C4Ds99QG6UfRaxULyROF 6OBg7mZRNbILOyPQXWz8mNpDkf6be8Spa5D1egHmsdIqcE9T+eQe0dS+P7VVfiF3fuYHgR 3SO6zmL0hVq8Y49J3XamuAp3ifrofo6QHBktHLRmkmtM07Udh7oUuBp6VYF+BkNx+mvYcE ZexaQUMgnCvs2yDWDkiwMnW/eMFCfqxRt4w3FWrWJbi6t59ZS/uKYjOFeSTifw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709578307; a=rsa-sha256; cv=none; b=myOlPLOONkRC5K47eTPPnuE+l+Pf2nuvXlIaCclCSmBUvdZj+QXgRrESRtxGkjG5YAfb4T a3hc6a9wGuDBuD/l3xsyyBhLP0pRiHQxvOET7yLAdJWuf4eQIIzMdq/WrK145olzl0Xziv GmWkNCE91PmVcYM25fI/ITwx2F5d+cR53oaCkybN7nqwAaZc280kCV6fWpdPJec6yKt0Z6 5pBPcQ70cfKiPBSL4zkbJhh7AoBJWH+Jg8Z96EWUL6UMGngiCTnMlFVR54g8a7SIpsuqHr GQ+Qk4UR3bB9LjTyHoRNbrpZUbW7iRPIHkt9BSH8hBJQlOgFmQpaoqYYvudgKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bEk9AZZ9CBjWByyAsU1mEt1h3cKjGZbLgr4dycRnWNI=; b=o0mCAhXiX2lUdVzUGMjz5Rk2kCc1HCxbjQeNIfvIVFOEVuES5go/6q0sRAEgNfp8zko4Ml y5FDmhRIMh3/1YNFqEv1HrJRZkF8mtpZivf7PCDxRu74ULFEW3HUf3BadWTxT8ww5leXsR 58PuDNZkSAK0VrfcrGIO8u8Pf8lybryqfs3d7DRb75AoZOD2J6WiRhvPv3YykNXmdop+EH cmlo+GIry6TUxoy5cxZiiZUUSOjJrX2h1TKPGALO/TGT05oHNLLmjFIW9uBgVaOCoc0D3z CdzcwV8JHC91oDiK3tlZNdeCUKinY2tBgKfheD0m80InpSEvfS9hGyR7RPkj/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 4TpSTv66jRzYvv; Mon, 4 Mar 2024 18:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424IplUb009691; Mon, 4 Mar 2024 18:51:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424IplFj009688; Mon, 4 Mar 2024 18:51:47 GMT (envelope-from git) Date: Mon, 4 Mar 2024 18:51:47 GMT Message-Id: <202403041851.424IplFj009688@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 9c530578757b - stable/14 - unionfs: upgrade the vnode lock during fsync() if necessary List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9c530578757b9e39eeae8e1e03a14652faa7f458 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=9c530578757b9e39eeae8e1e03a14652faa7f458 commit 9c530578757b9e39eeae8e1e03a14652faa7f458 Author: Jason A. Harmening AuthorDate: 2023-12-24 04:42:28 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-04 18:31:44 +0000 unionfs: upgrade the vnode lock during fsync() if necessary If the underlying upper FS supports shared locking for write ops, as is the case with ZFS, VOP_FSYNC() may only be called with the vnode lock held shared. In this case, temporarily upgrade the lock for those unionfs maintenance operations which require exclusive locking. While here, make unionfs inherit the upper FS' support for shared write locking. Since the upper FS is the target of VOP_GETWRITEMOUNT() this is what will dictate the locking behavior of any unionfs caller that uses vn_start_write() + vn_lktype_write(), so unionfs must be prepared for the caller to only hold a shared vnode lock in these cases. Found in local testing of unionfs atop ZFS with DEBUG_VFS_LOCKS. Reviewed by: kib, olce Differential Revision: https://reviews.freebsd.org/D43817 (cherry picked from commit 2656fc29be8b0fc1cd9e64ed52aa0a61fe87744c) --- sys/fs/unionfs/union_vfsops.c | 3 ++- sys/fs/unionfs/union_vnops.c | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index c6d459622670..c717b048c6ab 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -351,7 +351,8 @@ unionfs_domount(struct mount *mp) if ((lowermp->mnt_flag & MNT_LOCAL) != 0 && (uppermp->mnt_flag & MNT_LOCAL) != 0) mp->mnt_flag |= MNT_LOCAL; - mp->mnt_kern_flag |= MNTK_NOMSYNC | MNTK_UNIONFS; + mp->mnt_kern_flag |= MNTK_NOMSYNC | MNTK_UNIONFS | + (ump->um_uppermp->mnt_kern_flag & MNTK_SHARED_WRITES); MNT_IUNLOCK(mp); /* diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index ab277c685e41..ba20bef199e6 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -1000,14 +1000,22 @@ unionfs_fsync(struct vop_fsync_args *ap) struct unionfs_node *unp; struct unionfs_node_status *unsp; struct vnode *ovp; + enum unionfs_lkupgrade lkstatus; KASSERT_UNIONFS_VNODE(ap->a_vp); unp = VTOUNIONFS(ap->a_vp); + lkstatus = unionfs_upgrade_lock(ap->a_vp); + if (lkstatus == UNIONFS_LKUPGRADE_DOOMED) { + unionfs_downgrade_lock(ap->a_vp, lkstatus); + return (ENOENT); + } unionfs_get_node_status(unp, ap->a_td, &unsp); ovp = (unsp->uns_upper_opencnt ? unp->un_uppervp : unp->un_lowervp); unionfs_tryrem_node_status(unp, unsp); + unionfs_downgrade_lock(ap->a_vp, lkstatus); + if (ovp == NULLVP) return (EBADF); From nobody Mon Mar 4 18:51:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpSTx4fkzz5D6CV; Mon, 4 Mar 2024 18:51: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 4TpSTx0ttMz4bfK; Mon, 4 Mar 2024 18:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+JQiVziDgGR5VDLOk2ksLQZxO8EIVfTWpqnakA/6s5s=; b=WP3lyToUnQuS8V83Ja2yek5duoyv6F+XzNMSFwAwccZjo9Lj9zcO3VE1oXQ3//5q/E6Cg6 lXGnNZj/w8ZhOv8K4ZCBI4nzkmdDvnziYRwLZcn51Y6yuKhVVm0erlclxH/9fvRGKtLcgf 96xQ8LuKcx4IjA2J/HjFPhgpfEuUjbeeXjd3a+dBpbZwaEXduIRQK8fKRUDbkkpsWo5WP5 1Asd1wWNHaHgDes9TtMpa2RqApbBEYC9wbiCy0CYsxwFck7eXBxrHRUa81PQsFGZAAJRG6 4n6tqne2WSrZR4fs2Jk01z5hPwCetI6eeiXmrsaeYyL7oZ94VfnfhWEsVI1H/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709578309; a=rsa-sha256; cv=none; b=nDIliSL3wkXbKrNdnB0SU2TVJqD+P3+5ricRtbL9hK0Qp8inRh7s3HXJVel2R2EmeQm3nw ax64LZRYSoe0QU+Z/4AcnPL8RwNkofFlXHeaeIANswrcJP1w+vg8+Ftr6n+6gy7FwFVCoX fuhtgq9zLfEi1Yi+dAurHKXjfs7DQoS7h+U3QDBQL4lSJVMBIQcHCWmsN4tVX9f8FCilJs pZbYISzl6LBsi4s1petEHFBtgnmkxJLWZ5Npy6QZ1VbRY95D7Hm1gmdjLdpQLDr4UJH4DX m4ji/c+H5/JqUxbOKs6V5j0hQKJ2mg7Z5IlTdN3L8RQUf2yhnDAujnCtTM7a8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709578309; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+JQiVziDgGR5VDLOk2ksLQZxO8EIVfTWpqnakA/6s5s=; b=tg7KD+8aFh2SIF1TbbUmWU2lWSOgj2iCmyIDLYpXbrsrBxzDprnqHeMZCO2SElN620Z6NE ssdh+P5UrdTkdAQfHFNJmVXuo+TtSk9opmi+QWltLxv6obKWQ3AkN6LLGtHhGUYj/vrvFV 2auzFTPzlFhKqwJcQEvr20z6jJiy5oDHv8zYX6mKV3SqO99LnU3jIDS/fKwYgDIOVYN3Sv 2Hse3dgQE8Y5W0JWkCnDbTzKtHQFeI6caee2cqX0yFurvmcQeVy9GT9e/4kMHtbj2rVC3t 7FP14Eniq45hWuop0LFu8bInxPikenuhOYWT4+YBr+yWUIh56FXNfkWPWTiPLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpSTx0L94zYJ7; Mon, 4 Mar 2024 18:51:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424IpmkU009736; Mon, 4 Mar 2024 18:51:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424IpmRp009733; Mon, 4 Mar 2024 18:51:48 GMT (envelope-from git) Date: Mon, 4 Mar 2024 18:51:48 GMT Message-Id: <202403041851.424IpmRp009733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Jason A. Harmening" Subject: git: 5e806288f0c7 - stable/14 - unionfs: cache upper/lower mount objects List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5e806288f0c702e3f35efcf4972a97f0cf7b5676 Auto-Submitted: auto-generated The branch stable/14 has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=5e806288f0c702e3f35efcf4972a97f0cf7b5676 commit 5e806288f0c702e3f35efcf4972a97f0cf7b5676 Author: Jason A. Harmening AuthorDate: 2023-12-22 20:13:35 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-04 18:31:49 +0000 unionfs: cache upper/lower mount objects Store the upper/lower FS mount objects in unionfs per-mount data and use these instead of the v_mount field of the upper/lower root vnodes. As described in the referenced PR, it is unsafe to access this field on the unionfs unmount path as ZFS rollback may have obliterated the v_mount field of the upper or lower root vnode. Use these stored objects to slightly simplify other code that needs access to the upper/lower mount objects as well. PR: 275870 Reported by: Karlo Miličević Tested by: Karlo Miličević Reviewed by: kib (prior version), olce Differential Revision: https://reviews.freebsd.org/D43815 (cherry picked from commit cc3ec9f7597882d36ee487fd436d1b90bed0ebfd) --- sys/fs/unionfs/union.h | 2 ++ sys/fs/unionfs/union_vfsops.c | 37 ++++++++++++++++++++----------------- sys/fs/unionfs/union_vnops.c | 4 ++-- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h index cbbb00a68c8a..6c7db47ff209 100644 --- a/sys/fs/unionfs/union.h +++ b/sys/fs/unionfs/union.h @@ -53,6 +53,8 @@ typedef enum _unionfs_whitemode { } unionfs_whitemode; struct unionfs_mount { + struct mount *um_lowermp; /* MNT_REFed lower mount object */ + struct mount *um_uppermp; /* MNT_REFed upper mount object */ struct vnode *um_lowervp; /* VREFed once */ struct vnode *um_uppervp; /* VREFed once */ struct vnode *um_rootvp; /* ROOT vnode */ diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index c717b048c6ab..4dff07eccaba 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -73,7 +73,6 @@ static struct vfsops unionfs_vfsops; static int unionfs_domount(struct mount *mp) { - struct mount *lowermp, *uppermp; struct vnode *lowerrootvp; struct vnode *upperrootvp; struct unionfs_mount *ump; @@ -305,18 +304,18 @@ unionfs_domount(struct mount *mp) * reused until that happens. We assume the caller holds a reference * to lowerrootvp as it is the mount's covered vnode. */ - lowermp = vfs_register_upper_from_vp(ump->um_lowervp, mp, + ump->um_lowermp = vfs_register_upper_from_vp(ump->um_lowervp, mp, &ump->um_lower_link); - uppermp = vfs_register_upper_from_vp(ump->um_uppervp, mp, + ump->um_uppermp = vfs_register_upper_from_vp(ump->um_uppervp, mp, &ump->um_upper_link); vrele(upperrootvp); - if (lowermp == NULL || uppermp == NULL) { - if (lowermp != NULL) - vfs_unregister_upper(lowermp, &ump->um_lower_link); - if (uppermp != NULL) - vfs_unregister_upper(uppermp, &ump->um_upper_link); + if (ump->um_lowermp == NULL || ump->um_uppermp == NULL) { + if (ump->um_lowermp != NULL) + vfs_unregister_upper(ump->um_lowermp, &ump->um_lower_link); + if (ump->um_uppermp != NULL) + vfs_unregister_upper(ump->um_uppermp, &ump->um_upper_link); vflush(mp, 1, FORCECLOSE, curthread); free(ump, M_UNIONFSMNT); mp->mnt_data = NULL; @@ -348,8 +347,8 @@ unionfs_domount(struct mount *mp) } MNT_ILOCK(mp); - if ((lowermp->mnt_flag & MNT_LOCAL) != 0 && - (uppermp->mnt_flag & MNT_LOCAL) != 0) + if ((ump->um_lowermp->mnt_flag & MNT_LOCAL) != 0 && + (ump->um_uppermp->mnt_flag & MNT_LOCAL) != 0) mp->mnt_flag |= MNT_LOCAL; mp->mnt_kern_flag |= MNTK_NOMSYNC | MNTK_UNIONFS | (ump->um_uppermp->mnt_kern_flag & MNTK_SHARED_WRITES); @@ -403,8 +402,8 @@ unionfs_unmount(struct mount *mp, int mntflags) vn_lock(mp->mnt_vnodecovered, LK_EXCLUSIVE | LK_RETRY | LK_CANRECURSE); mp->mnt_vnodecovered->v_vflag &= ~VV_CROSSLOCK; VOP_UNLOCK(mp->mnt_vnodecovered); - vfs_unregister_upper(ump->um_lowervp->v_mount, &ump->um_lower_link); - vfs_unregister_upper(ump->um_uppervp->v_mount, &ump->um_upper_link); + vfs_unregister_upper(ump->um_lowermp, &ump->um_lower_link); + vfs_unregister_upper(ump->um_uppermp, &ump->um_upper_link); free(ump, M_UNIONFSMNT); mp->mnt_data = NULL; @@ -442,7 +441,11 @@ unionfs_quotactl(struct mount *mp, int cmd, uid_t uid, void *arg, bool unbusy; ump = MOUNTTOUNIONFSMOUNT(mp); - uppermp = atomic_load_ptr(&ump->um_uppervp->v_mount); + /* + * Issue a volatile load of um_uppermp here, as the mount may be + * torn down after we call vfs_unbusy(). + */ + uppermp = atomic_load_ptr(&ump->um_uppermp); KASSERT(*mp_busy == true, ("upper mount not busy")); /* * See comment in sys_quotactl() for an explanation of why the @@ -482,7 +485,7 @@ unionfs_statfs(struct mount *mp, struct statfs *sbp) mstat = malloc(sizeof(struct statfs), M_STATFS, M_WAITOK | M_ZERO); - error = VFS_STATFS(ump->um_lowervp->v_mount, mstat); + error = VFS_STATFS(ump->um_lowermp, mstat); if (error) { free(mstat, M_STATFS); return (error); @@ -494,7 +497,7 @@ unionfs_statfs(struct mount *mp, struct statfs *sbp) lbsize = mstat->f_bsize; - error = VFS_STATFS(ump->um_uppervp->v_mount, mstat); + error = VFS_STATFS(ump->um_uppermp, mstat); if (error) { free(mstat, M_STATFS); return (error); @@ -561,10 +564,10 @@ unionfs_extattrctl(struct mount *mp, int cmd, struct vnode *filename_vp, unp = VTOUNIONFS(filename_vp); if (unp->un_uppervp != NULLVP) { - return (VFS_EXTATTRCTL(ump->um_uppervp->v_mount, cmd, + return (VFS_EXTATTRCTL(ump->um_uppermp, cmd, unp->un_uppervp, namespace, attrname)); } else { - return (VFS_EXTATTRCTL(ump->um_lowervp->v_mount, cmd, + return (VFS_EXTATTRCTL(ump->um_lowermp, cmd, unp->un_lowervp, namespace, attrname)); } } diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index ba20bef199e6..31d30ffb8971 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -766,7 +766,7 @@ unionfs_access(struct vop_access_args *ap) if (lvp != NULLVP) { if (accmode & VWRITE) { - if (ump->um_uppervp->v_mount->mnt_flag & MNT_RDONLY) { + if ((ump->um_uppermp->mnt_flag & MNT_RDONLY) != 0) { switch (ap->a_vp->v_type) { case VREG: case VDIR: @@ -837,7 +837,7 @@ unionfs_getattr(struct vop_getattr_args *ap) error = VOP_GETATTR(lvp, ap->a_vap, ap->a_cred); - if (error == 0 && !(ump->um_uppervp->v_mount->mnt_flag & MNT_RDONLY)) { + if (error == 0 && (ump->um_uppermp->mnt_flag & MNT_RDONLY) == 0) { /* correct the attr toward shadow file/dir. */ if (ap->a_vp->v_type == VREG || ap->a_vp->v_type == VDIR) { unionfs_create_uppervattr_core(ump, ap->a_vap, &va, td); From nobody Mon Mar 4 19:08:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpSsR5qZ6z5D72X; Mon, 4 Mar 2024 19:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpSsR5K0Rz4dsL; Mon, 4 Mar 2024 19:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709579323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rb4m9Ov7DO64J7obiizmF0g+m1w/jBauJ+B+vEhL6DM=; b=F4jfY5cr5wrqwUJw7X+5IBUW/TLXv9/0gZg9AyheJGyBRKxwiv2MKssyWoZt1wPRLrIj1j +HGuYy6Js/NMt6y4Vxk3ipzQ62xGWFFzqdG/E9YiCritVeOPA9J31SBMiACfZu1Nf4LX2R i2tKiWM3AjpIjVVh77jvwALSIRXlfzblYsLlntxWy7fd011Dov9KrRWx4BLA/pc0HqtpbK +SRRANXULdtnr97mUKy/Uaw+3DeLBgUw6R9173+ZH2xrRSBuhn4pbjWW1FOa3hUcD6y1Nx qoyBPz3klG+C1mqJJlB73+DCiRcc3dZ5/Jku95J69FFsmK+C5TRcNBeZ+DMy4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709579323; a=rsa-sha256; cv=none; b=G+K0jt5VK0NGE/5xgTnpFVFzHTtq3qCtUhEKas0OXQ0MRFt/mCJ2euxyg06G8xsb75UIEd 1RECu133fKDgawzkknHOrUGabvVT4sy0ddaB02WUwqwPcWr6rF2DKvgPXJeJ9xAPqzFjYd MjG2iYKu5cmnQ9r0hmznbaXk6nkoWkD3pHbKKFSgRd6+jemctVRnsIrT/n+oe+YwIkE5nE 05on/UU2+xTquFM4V3z+0vaHDr9DhnkSepb0BXIBO7Imwev6rvECS6upHLhI4mfAu8bHD/ DbY1tEvFYxr/8+YNYzpgeiIkqlog2w4hgr+90EXxKFvpVNjItvhJrOkeLJYb4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709579323; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rb4m9Ov7DO64J7obiizmF0g+m1w/jBauJ+B+vEhL6DM=; b=aCgnc+ekN5eNfkvBZotWmivlISjaMATkno/CCJkawTYg13meX2G45e6rYzgnTAq2MJDFml DLgPpdK4jg/l4UtAeDUVwec7bQbw0XPgKqPEqCIp05RVIiQtFo3ma/J0c7RpBW2Nspy6xk Q0hNOLtPpQwOMILNlY+P+orQljqomxDh/JcHcnPvKNpLH5hdv9/YRAexPDRV3udAnbPqx0 aQ9kBHrM6ocn/vOPQHP7ypmiJV9k3fAA0YHquXpTLSKwzPwC0g+5bnvSdP72w2B3GWZjAS Lz/ZG7+Bj0u55ms/wm+EikA16cqhs/K2YlhXr8gj0MpY7l3ilOigZ+YKKKB6aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpSsR4pPyzZN5; Mon, 4 Mar 2024 19:08:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424J8hWN032692; Mon, 4 Mar 2024 19:08:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424J8hm7032689; Mon, 4 Mar 2024 19:08:43 GMT (envelope-from git) Date: Mon, 4 Mar 2024 19:08:43 GMT Message-Id: <202403041908.424J8hm7032689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hartmut Brandt Subject: git: 83550d02fea6 - main - Add a missing space in a warning. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: harti X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83550d02fea69b1cd1b15c325be944e5de08fd53 Auto-Submitted: auto-generated The branch main has been updated by harti: URL: https://cgit.FreeBSD.org/src/commit/?id=83550d02fea69b1cd1b15c325be944e5de08fd53 commit 83550d02fea69b1cd1b15c325be944e5de08fd53 Author: Hartmut Brandt AuthorDate: 2024-03-04 17:58:05 +0000 Commit: Hartmut Brandt CommitDate: 2024-03-04 19:08:25 +0000 Add a missing space in a warning. --- usr.sbin/jail/jail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c index 9f8267dc1bde..df0a32321794 100644 --- a/usr.sbin/jail/jail.c +++ b/usr.sbin/jail/jail.c @@ -400,7 +400,7 @@ main(int argc, char **argv) continue; } if (j->intparams[IP_ALLOW_DYING] && !dying_warned) { - warnx("%s", "the 'allow.dying' parameter and '-d' flag" + warnx("%s", "the 'allow.dying' parameter and '-d' flag " "are deprecated and have no effect."); dying_warned = 1; } From nobody Mon Mar 4 19:55:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpTvK2vjSz5DBXx; Mon, 4 Mar 2024 19:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpTvK1RGtz4j8C; Mon, 4 Mar 2024 19:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709582125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFGS9H+FSXc0x7TKuxwTtRoN1H4kM9QmhXEcCm0LBHs=; b=ZCpAesgNWsKSjNUYuzyW3MXbtfeOveQmpr229LAwR1Pupjg4xFrR116o/RMV4oZya4Nf9U 0StejFZ+qFy1JzNrFBTgG2CxWM8aotFpue14QW8+BX6xDn/2LAvMaV0Djc3yonEw/nipby LeLlVXc0LHvgCSmoK9dlsmYhEfm1G7oFQsRiMke4oYXwhA2RCyx/fC3VM6dKfQwxcl+MGN z0u2P0JxyntUEsfmc0ycJwt5nyk5WA1bGQ+Adx+Cd8qpjSLshgvLWoWFJ7nsUTbmz+N+nw H5+3wpNr3dQMXQAzfUW+EyzohNobcdSK/kSyvF6SJYY+qbMhgZWGJQruTXkb0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709582125; a=rsa-sha256; cv=none; b=JeTfzk6+tk49NS5qUgEsEYCrqyxj/asELo9oaAYtB9lIgqcuSFytWYRfscbI3KGg0es+uK DtUO10g6YNhik90afGXZck5PfknsKPpGn9vjB9C3KEpgMf3qHSBqRV4XiWQD8klWiifNf9 v0EWFxEsO1jDrR8rWu1om0sviTjYD3sI2rjZFEtoMdrE2D9+1X4XdXLKowOMCLqfncOzOH pWEkhISVz7uu4mrx3tuc1daZI6SL0pXizqavHp3LI92o+YXB3J+I4tSc7s5O9QHN9raN2y 5HrD/Sz10CvZBpRnF9Mc4MtQjfyuKGfqKZDW1pLbkpmTa4JoDzQdy+ONZDOkHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709582125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oFGS9H+FSXc0x7TKuxwTtRoN1H4kM9QmhXEcCm0LBHs=; b=pZAb67TJglhYDao/4nM/pXabFqi4wizOeyIhfZpbyGi/mV2OCfx61dA8MgQbiGL/QMDtsD E81gjqj+Brc98pu0FWuWddAO+1i9596OJNRVNS14u7MMUmBVxApsXdBxglZV1XtbDIiCqb lXjJJ0nf6jzkBYkaUtke2gKrtebwHJJE+1lFJeNy2b1OlBcvBBh83J//BL8JUDsgCxk/2A CyOSS6ikG9UshEGsQdtYP5T/18P8ArYfzn4teO151bxTh6FtwNm/Ykp4W8+Pp26n3B0gnP 4P0rqAQKgeTHCFKNyJ2UEpuhNZrlWsTBBdgVd/t4qr3aOxPyUfwmBjalth8Ogg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpTvK0WBtzbFx; Mon, 4 Mar 2024 19:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424JtOJm015224; Mon, 4 Mar 2024 19:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424JtOps015221; Mon, 4 Mar 2024 19:55:24 GMT (envelope-from git) Date: Mon, 4 Mar 2024 19:55:24 GMT Message-Id: <202403041955.424JtOps015221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 327ada0b0ec0 - main - imgact_elf: Add const to the header_supported callback arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 327ada0b0ec0044cea016f7e8333a5a3754eb8af Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=327ada0b0ec0044cea016f7e8333a5a3754eb8af commit 327ada0b0ec0044cea016f7e8333a5a3754eb8af Author: Alex Richardson AuthorDate: 2024-03-04 19:52:21 +0000 Commit: John Baldwin CommitDate: 2024-03-04 19:52:21 +0000 imgact_elf: Add const to the header_supported callback arguments This callback shouldn't be modifying any of the arguments. Reviewed by: imp, kib, emaste, jhb Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D44193 --- sys/amd64/amd64/elf_machdep.c | 4 ++-- sys/arm/arm/elf_machdep.c | 8 ++++---- sys/arm64/arm64/elf32_machdep.c | 8 ++++---- sys/powerpc/powerpc/elf64_machdep.c | 16 ++++++++-------- sys/sys/imgact_elf.h | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c index a66faf3d347e..0e6c8d310dfd 100644 --- a/sys/amd64/amd64/elf_machdep.c +++ b/sys/amd64/amd64/elf_machdep.c @@ -165,8 +165,8 @@ amd64_lower_shared_page(struct sysentvec *sv) } static bool -freebsd_brand_info_la57_img_compat(struct image_params *imgp, - int32_t *osrel __unused, uint32_t *fctl0) +freebsd_brand_info_la57_img_compat(const struct image_params *imgp, + const int32_t *osrel __unused, const uint32_t *fctl0) { if ((imgp->proc->p_md.md_flags & P_MD_LA57) != 0) return (true); diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c index 7c91dfe3babc..e1003b71543a 100644 --- a/sys/arm/arm/elf_machdep.c +++ b/sys/arm/arm/elf_machdep.c @@ -54,8 +54,8 @@ #include "opt_global.h" /* for OPT_KDTRACE_HOOKS */ #include "opt_stack.h" /* for OPT_STACK */ -static bool elf32_arm_abi_supported(struct image_params *, int32_t *, - uint32_t *); +static bool elf32_arm_abi_supported(const struct image_params *, + const int32_t *, const uint32_t *); u_long elf_hwcap; u_long elf_hwcap2; @@ -121,8 +121,8 @@ SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, &freebsd_brand_info); static bool -elf32_arm_abi_supported(struct image_params *imgp, int32_t *osrel __unused, - uint32_t *fctl0 __unused) +elf32_arm_abi_supported(const struct image_params *imgp, + const int32_t *osrel __unused, const uint32_t *fctl0 __unused) { const Elf_Ehdr *hdr = (const Elf_Ehdr *)imgp->image_header; diff --git a/sys/arm64/arm64/elf32_machdep.c b/sys/arm64/arm64/elf32_machdep.c index de0ee9607ad1..fd2a2690b7a1 100644 --- a/sys/arm64/arm64/elf32_machdep.c +++ b/sys/arm64/arm64/elf32_machdep.c @@ -76,8 +76,8 @@ static void freebsd32_setregs(struct thread *td, struct image_params *imgp, u_long stack); static void freebsd32_set_syscall_retval(struct thread *, int); -static bool elf32_arm_abi_supported(struct image_params *, int32_t *, - uint32_t *); +static bool elf32_arm_abi_supported(const struct image_params *, + const int32_t *, const uint32_t *); static void elf32_fixlimit(struct rlimit *rl, int which); extern void freebsd32_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); @@ -167,8 +167,8 @@ register_elf32_brand(void *arg) SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, register_elf32_brand, NULL); static bool -elf32_arm_abi_supported(struct image_params *imgp, int32_t *osrel __unused, - uint32_t *fctl0 __unused) +elf32_arm_abi_supported(const struct image_params *imgp, + const int32_t *osrel __unused, const uint32_t *fctl0 __unused) { const Elf32_Ehdr *hdr; diff --git a/sys/powerpc/powerpc/elf64_machdep.c b/sys/powerpc/powerpc/elf64_machdep.c index 6edfd965b7ec..b780a2ed82fc 100644 --- a/sys/powerpc/powerpc/elf64_machdep.c +++ b/sys/powerpc/powerpc/elf64_machdep.c @@ -145,10 +145,10 @@ struct sysentvec elf64_freebsd_sysvec_v2 = { .sv_regset_end = SET_LIMIT(__elfN(regset)), }; -static bool ppc64_elfv1_header_match(struct image_params *params, - int32_t *, uint32_t *); -static bool ppc64_elfv2_header_match(struct image_params *params, - int32_t *, uint32_t *); +static bool ppc64_elfv1_header_match(const struct image_params *params, + const int32_t *, const uint32_t *); +static bool ppc64_elfv2_header_match(const struct image_params *params, + const int32_t *, const uint32_t *); static Elf64_Brandinfo freebsd_brand_info_elfv1 = { .brand = ELFOSABI_FREEBSD, @@ -221,8 +221,8 @@ ppc64_init_sysvecs(void *arg) SYSINIT(elf64_sysvec, SI_SUB_EXEC, SI_ORDER_ANY, ppc64_init_sysvecs, NULL); static bool -ppc64_elfv1_header_match(struct image_params *params, int32_t *osrel __unused, - uint32_t *fctl0 __unused) +ppc64_elfv1_header_match(const struct image_params *params, + const int32_t *osrel __unused, const uint32_t *fctl0 __unused) { const Elf64_Ehdr *hdr = (const Elf64_Ehdr *)params->image_header; int abi = (hdr->e_flags & 3); @@ -231,8 +231,8 @@ ppc64_elfv1_header_match(struct image_params *params, int32_t *osrel __unused, } static bool -ppc64_elfv2_header_match(struct image_params *params, int32_t *osrel __unused, - uint32_t *fctl0 __unused) +ppc64_elfv2_header_match(const struct image_params *params, + const int32_t *osrel __unused, const uint32_t *fctl0 __unused) { const Elf64_Ehdr *hdr = (const Elf64_Ehdr *)params->image_header; int abi = (hdr->e_flags & 3); diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index 51e149476a28..3ddb438e14fc 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -86,8 +86,8 @@ typedef struct { const char *interp_newpath; int flags; Elf_Brandnote *brand_note; - bool (*header_supported)(struct image_params *, - int32_t *, uint32_t *); + bool (*header_supported)(const struct image_params *, + const int32_t *, const uint32_t *); /* High 8 bits of flags is private to the ABI */ #define BI_CAN_EXEC_DYN 0x0001 #define BI_BRAND_NOTE 0x0002 /* May have note.ABI-tag section. */ From nobody Mon Mar 4 20:31:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpVjH3jZGz5DFGs; Mon, 4 Mar 2024 20:31: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 4TpVjH2npJz4pJL; Mon, 4 Mar 2024 20:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709584307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6BaREWb4/9wuBcE02SB5qIezUrMMnxMyNNJQ+QXlZrg=; b=f1GVFPx/Ow4toq0165aK554pC3Ob3gf2MW3dUaXSZZOGNHhreBE+IDJEvtreoYmZpqs4RG OGVKF+GNDjzCZUJBW3QxD+CL81Tel3gyNTUp014CzxMISWUfbaQyam8DRKFig0zoRwdh2u ohegccGE3RCNPVoE6KSh6j+GcNEQMIMyWnOZq5pkr+XX423QMV1bLjl04diBea76DyScBS pwM+3K3IgFShs1UUGeJjSubZVJMUePWW8RVy8TYtNAFCs9CpyKHsE8sbDAyaMJNN10/ucF eXxL1PsrUdpWK7p02xpGwuaNHyQJWmoIUKvlipFXk1XBqQbJhZLTCXUrzmW2FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709584307; a=rsa-sha256; cv=none; b=i4nok8nopv3gDlKvaTu6F2nOIFThCMs4AW8AwFIndoi9pH7j8trcW0ajQ77aySRMTSu63Z j5TvbLKWUBULPW7VN4gPF/AhHJvOtcqw0WG0oMlbGIebLZNM0gE5UU6vadlqezCLZCwaSi EZFjhJcW8j4amql1Y4z8taiWcE9PmiOudyhsOfgggFoB46kILaYL0BmgOqscD2HXj0Eqem 9mORMSOoH5FdaVQt79a9m0WurQb0NJp7xO2jiE84hhoSONtgorpJ9KdNR3tCFHD6D8mW/i /xoxfDVrpQFIfmKSjCXhLokS6RAQi/S4GGeKIsQZFzaIi6YJnK9UvdpfQbeeQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709584307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6BaREWb4/9wuBcE02SB5qIezUrMMnxMyNNJQ+QXlZrg=; b=v4xWSHtAYn3jcX2KFQ3I/25vjBBTpetlqjxUmR/Ybm8R10XFqlhy3V6i1iUqe01tpqSumX tWItHNc8ZobcQD5rk2X8RtCz+J+DPMyMIuhSJIeTf9PpUs+MEkq66yx4h1BDaRggvgZNvu uaQr/DkkLDTYpqu3LjvX0RdjfWUDzxhSTLwwpc4hvqxfwLai3CTeL2odptrYpFCiGQW0Zh 5j9EyIYvTeM58F3pBOylJiCENBtukBGXaBipP798UJzWFNXeawjlRE+9YyapM7tIqhqlsG iqfDfmSIzkxlhRtEdNLIHVOemyqL7mbm65cwOdWv4A56rqX7xU9NXhpVDIoWKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpVjH2PZ9zcFH; Mon, 4 Mar 2024 20:31:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 424KVlap077898; Mon, 4 Mar 2024 20:31:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 424KVlPm077895; Mon, 4 Mar 2024 20:31:47 GMT (envelope-from git) Date: Mon, 4 Mar 2024 20:31:47 GMT Message-Id: <202403042031.424KVlPm077895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: a39b3aa463f3 - main - Merge commit f800c1f3b207 from llvm-project (by Arthur Eubanks): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a39b3aa463f3474fabb3aedb5aecf943b54b4357 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a39b3aa463f3474fabb3aedb5aecf943b54b4357 commit a39b3aa463f3474fabb3aedb5aecf943b54b4357 Author: Dimitry Andric AuthorDate: 2024-03-04 20:30:54 +0000 Commit: Dimitry Andric CommitDate: 2024-03-04 20:31:04 +0000 Merge commit f800c1f3b207 from llvm-project (by Arthur Eubanks): [PEI] Don't zero out noreg operands A tail call may have $noreg operands. Fixes a crash. Reviewed By: xgupta Differential Revision: https://reviews.llvm.org/D156485 This should fix an assertion failure building qemu, specifically those parts using -fzero-call-used-regs. Reported by: Daniel Berrangé PR: 277474 MFC after: 3 days --- contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp index e323aaaeefaf..49047719fdaa 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp @@ -1285,6 +1285,8 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) { continue; MCRegister Reg = MO.getReg(); + if (!Reg) + continue; // This picks up sibling registers (e.q. %al -> %ah). for (MCRegUnit Unit : TRI.regunits(Reg)) @@ -1308,8 +1310,11 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) { if (!MO.isReg()) continue; - for (const MCPhysReg &Reg : - TRI.sub_and_superregs_inclusive(MO.getReg())) + MCRegister Reg = MO.getReg(); + if (!Reg) + continue; + + for (const MCPhysReg Reg : TRI.sub_and_superregs_inclusive(Reg)) RegsToZero.reset(Reg); } } From nobody Tue Mar 5 00:09:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpbXG0wbRz5DYLd; Tue, 5 Mar 2024 00:09: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 4TpbXG0CkXz4Hm5; Tue, 5 Mar 2024 00:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709597358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOb0ZWQasm8oaZrFVu1QQgE/OoRsC8xDwTZxT3XzHtU=; b=Drj8RqOhrxk/c4ctTqJFjdBisk0AVFyM/6C7qKPlzU96XONt5Ia4kYEDOxuAOeNB+GZXGs sqquKOskCuczwiN5H5JzG6jq2HSu4I6JaqOZdiIOAaF3U6/Bn1K0ZeqW/QdvjARGb19rJo 6cG7f42D9BYzLo1j0iW8YXd7NT6/U5dJE9QT+zJPLBvH2RmDVoVfk0EqMH3TCPGO93T064 N3tFkfqWjzRlSPEuI8KSBrb5S5NjytHFUS478splIv5zy83w6BBrtK/OTR8CtFSs5Mvczl bVHCSEP8oR05c33spBsBFfZ9LS847U9ZlxgkkGYommYse7bR6OsRZUZPz8ktCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709597358; a=rsa-sha256; cv=none; b=x9aj7WOyn9XYsuqdB5DWRTEV/OgEM5df79VWmDsN23sASwwyjU4edc/HfBqYpI40qVceE5 MtYV40awa8VlBW1M8ZbszzzBVIYIWd3tWbgFxupuvjpk68wF3vYoM5R9uEgsAXKMs29H5p X1xTTE+huutSVWjmBWGQ/bDXZTbBu5Iqu6WMHQBrDVnhzSGq/qvvqWrBr4wP9ScG8TjP39 1rMaS+SInZBNYZ37jIXmC3RjtXZQjCtwvimwceupjtOdaZLdLYC7617fSeaywtWwADPyB1 HLhltILcnNdvmJbcBgtx948yr567qyevzdS2go91TEu5GmSCq6scNmCufbmWXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709597358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOb0ZWQasm8oaZrFVu1QQgE/OoRsC8xDwTZxT3XzHtU=; b=SeVpvi3HNzykypSC2wuP4n+tSffSD2o39dUlk0XRQqiOipItP0CQjRwXXFmeu2U+JcysJh smG1UH5GlKpTQjgVcrNxFGEjX/F/vqFBoSyFTeA4wdGCEtK4R+NMGJtL+4iSGXRmMwD1Z9 /kI4snGGjvnQZJHUmcpl/DEH2EQbe9TCX2DxHcPgFUgyxUiox4zldstQNV2mtdtuFh4w5d Bw03ejrGcZIE9ErugXDuSYMH/E5gs3OWvUuYw7OXsOWOhIKhXeBypD2NkBMUmTZDANNuVN uUfMy+NPHp7QYC+Z4SfmoZ1ltw9kQWcG9i60mb2iP0ZTeWEOjk3r/prv6TCwOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpbXF6wX3zjCw; Tue, 5 Mar 2024 00:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42509HNC038496; Tue, 5 Mar 2024 00:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42509HBL038493; Tue, 5 Mar 2024 00:09:17 GMT (envelope-from git) Date: Tue, 5 Mar 2024 00:09:17 GMT Message-Id: <202403050009.42509HBL038493@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: fdfb8e783c3e - stable/14 - Eliminate unnecessary UFS1 integrity checks. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fdfb8e783c3e8606d1294f9772fbd1496994b581 Auto-Submitted: auto-generated The branch stable/14 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=fdfb8e783c3e8606d1294f9772fbd1496994b581 commit fdfb8e783c3e8606d1294f9772fbd1496994b581 Author: Kirk McKusick AuthorDate: 2024-02-20 00:16:07 +0000 Commit: Kirk McKusick CommitDate: 2024-03-05 00:09:10 +0000 Eliminate unnecessary UFS1 integrity checks. The UFS1 integrity checks added in FreeBSD 14 were too aggressive for UFS1 filesystems created in FreeBSD 4 and 9 systems. This patch removes those tests which can be done safely since they are not relevant to the current implementation of UFS1. This is a follow-on report to bug report 264450 (comments 21-28). Reported by: slb@sonnet.com Tested by: slb@sonnet.com PR: 264450 (cherry picked from commit b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0) --- sbin/fsck_ffs/fsutil.c | 2 -- sys/ufs/ffs/ffs_subr.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 2583e324e94c..fde1b467bcd3 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -1024,7 +1024,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) CHK(cgp->cg_ndblk, >, sblock.fs_fpg, "%jd"); if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); - CHK(cgp->cg_old_ncyl, >, sblock.fs_old_cpg, "%jd"); } else if (sblock.fs_magic == FS_UFS2_MAGIC) { CHK(cgp->cg_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_initediblk, >, sblock.fs_ipg, "%jd"); @@ -1041,7 +1040,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) } else if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_niblk, !=, 0, "%jd"); CHK(cgp->cg_initediblk, !=, 0, "%jd"); - CHK(cgp->cg_old_ncyl, !=, sblock.fs_old_cpg, "%jd"); CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_old_btotoff, !=, start, "%jd"); CHK(cgp->cg_old_boff, !=, cgp->cg_old_btotoff + diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 5870416820fa..fc43b4c06e7f 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -398,7 +398,6 @@ validate_sblock(struct fs *fs, int flags) } else if (fs->fs_magic == FS_UFS1_MAGIC) { FCHK(fs->fs_sblockloc, <, 0, %jd); FCHK(fs->fs_sblockloc, >, SBLOCK_UFS1, %jd); - FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd); } FCHK(fs->fs_frag, <, 1, %jd); FCHK(fs->fs_frag, >, MAXFRAG, %jd); @@ -475,16 +474,13 @@ validate_sblock(struct fs *fs, int flags) WCHK(fs->fs_old_rotdelay, !=, 0, %jd); WCHK(fs->fs_old_rps, !=, 60, %jd); WCHK(fs->fs_old_nspf, !=, fs->fs_fsize / sectorsize, %jd); - FCHK(fs->fs_old_cpg, !=, 1, %jd); WCHK(fs->fs_old_interleave, !=, 1, %jd); WCHK(fs->fs_old_trackskew, !=, 0, %jd); WCHK(fs->fs_old_cpc, !=, 0, %jd); WCHK(fs->fs_old_postblformat, !=, 1, %jd); FCHK(fs->fs_old_nrpos, !=, 1, %jd); - WCHK(fs->fs_old_spc, !=, fs->fs_fpg * fs->fs_old_nspf, %jd); WCHK(fs->fs_old_nsect, !=, fs->fs_old_spc, %jd); WCHK(fs->fs_old_npsect, !=, fs->fs_old_spc, %jd); - FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd); } else { /* Bad magic number, so assume not a superblock */ return (ENOENT); From nobody Tue Mar 5 00:19:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpblY24cQz5DYtc; Tue, 5 Mar 2024 00:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpblY1H6Mz4KQS; Tue, 5 Mar 2024 00:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709597945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tTyrZXnmp7tAOz/aLeuJi7dDLrweOMghUpeuXhwo5n8=; b=lCXXj6Rf9JG1ytDogWCo+58xpG9lHF7SLKPfhvf8DxL6mbkhK6TAMSBZGXZxuDwtfkhbXr X1abyhaooxZ8FveDhJAi/NH4L70CkfLl+320O91H4DY6J3+3WhZSXEIpuzlxiyekPFs1OT 0PtoXVCM3AYyZ997AByoyxVbgm9svTjBWcH+xN6zgd2FbcgxzXI8b6kHmrlhO+M3gs9SiA lJBvmgb/HXHBPfdDFzBUEVZwzaKLSsao5UVs4bMJXQn49eutzi+PRf1wJsdPawdTOx84dH 0/W+/6HhPXYlD67jxBa6ggcZ2JMMMMNyGxEBSfuXVBIv4P9bOlAaLBEfa2fRRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709597945; a=rsa-sha256; cv=none; b=ojwyrStGlzkVSope7Bta8XziX6+p0mqI3ElWHPAXvsVn+080uE8ZKE9iesu8PDt+GCN5s/ PsX/dI7PAE2gtwmsmXypioYA7htzXDrq2OWhRyUxtKseadiB0za9A7SySn3LQlc0E8bOWs pqVYJqK3GX3T6CjES5oOpJ68zdmkh5AW9f5bnQRO+bS4BwEaXLbwdWpDjEgJZRXlXf3Gxr gB7OQhmdXud7PO3AtrUB7VUB7ave25UnvCiubG0fMgYTl4QZJbiuRrxfjynbyZUzFbJETZ 8lvlrvOKMQmuME7vSWsEssTCWP9aPm1SGEfrm5Q3EV3+2UFiZQbzgfNEBRiwwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709597945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tTyrZXnmp7tAOz/aLeuJi7dDLrweOMghUpeuXhwo5n8=; b=H0ohYcJ9YOTFBHGbOHkUC+fmR4mZxJ3xj8ImUUPw9inkZWK9uJZBPZHCcZB0x8JA5NQRLe m8p+psvpDQq5IYZmO7ybNNcQ0Xv3nmJEXE6Ht55EocWj6VnwwuG0wDNYmLgvdSBBy6j1Lt YscWfwbR/lNvmCOA/wOPpKcpbp16ct9/xWCH3ZzqLhbdhxLomf2XIOnQKNaQhfG5NKOj5j /0R35o9OZ3uoZAbGTI0zGpWtKEmTV2/Oh3NUQSx0XYH6/zmIAGtKFTQ1giOYkKz4lBfofr B+lUGLsMlnn+NArtiIBdJGf7a2W0pT7gIl6Lm36He+jF548UAXPhYmp5zbQXFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpblY0ZqLzjT6; Tue, 5 Mar 2024 00:19:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4250J4aA054917; Tue, 5 Mar 2024 00:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4250J4t5054914; Tue, 5 Mar 2024 00:19:04 GMT (envelope-from git) Date: Tue, 5 Mar 2024 00:19:04 GMT Message-Id: <202403050019.4250J4t5054914@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: 8c6964b779ce - stable/13 - Eliminate unnecessary UFS1 integrity checks. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8c6964b779cecbcf42475c896e5c61df192b80b9 Auto-Submitted: auto-generated The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=8c6964b779cecbcf42475c896e5c61df192b80b9 commit 8c6964b779cecbcf42475c896e5c61df192b80b9 Author: Kirk McKusick AuthorDate: 2024-02-20 00:16:07 +0000 Commit: Kirk McKusick CommitDate: 2024-03-05 00:18:58 +0000 Eliminate unnecessary UFS1 integrity checks. The UFS1 integrity checks added in FreeBSD 14 were too aggressive for UFS1 filesystems created in FreeBSD 4 and 9 systems. This patch removes those tests which can be done safely since they are not relevant to the current implementation of UFS1. This is a follow-on report to bug report 264450 (comments 21-28). Reported by: slb@sonnet.com Tested by: slb@sonnet.com PR: 264450 (cherry picked from commit b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0) --- sbin/fsck_ffs/fsutil.c | 2 -- sys/ufs/ffs/ffs_subr.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 14196fa8356a..5252fc8d0917 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -1023,7 +1023,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) CHK(cgp->cg_ndblk, >, sblock.fs_fpg, "%jd"); if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); - CHK(cgp->cg_old_ncyl, >, sblock.fs_old_cpg, "%jd"); } else if (sblock.fs_magic == FS_UFS2_MAGIC) { CHK(cgp->cg_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_initediblk, >, sblock.fs_ipg, "%jd"); @@ -1040,7 +1039,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) } else if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_niblk, !=, 0, "%jd"); CHK(cgp->cg_initediblk, !=, 0, "%jd"); - CHK(cgp->cg_old_ncyl, !=, sblock.fs_old_cpg, "%jd"); CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_old_btotoff, !=, start, "%jd"); CHK(cgp->cg_old_boff, !=, cgp->cg_old_btotoff + diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 29349f69fb96..ad9128f06266 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -398,10 +398,8 @@ validate_sblock(struct fs *fs, int isaltsblk) CHK(fs->fs_old_cpc, !=, 0, %jd); CHK(fs->fs_old_postblformat, !=, 1, %jd); CHK(fs->fs_old_nrpos, !=, 1, %jd); - CHK(fs->fs_old_spc, !=, fs->fs_fpg * fs->fs_old_nspf, %jd); CHK(fs->fs_old_nsect, !=, fs->fs_old_spc, %jd); CHK(fs->fs_old_npsect, !=, fs->fs_old_spc, %jd); - CHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd); } else { /* Bad magic number, so assume not a superblock */ return (ENOENT); From nobody Tue Mar 5 01:02:22 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpcjW0T84z5DdVx; Tue, 5 Mar 2024 01:02: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 4TpcjW02Yzz4QJn; Tue, 5 Mar 2024 01:02:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709600543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZiDt36vvrati6hfXQ46BBmtp3jqrktfoa5Hcl85S9k=; b=STMUkr0D95aNSQTN188l0X3EWPMkvT7yJ4HLpnzYDFiU8/ErfVdJb9pC0ksn4UuJEzV0SO MWR0fiWtIqYsXmXl06KOdcXRFsMn3Wn8DckDvAGuuTowAezIqCbz3EsvcvZB7K6pw83AAp wdxpvvmGrxzT2maYHawwmpJkRxetH59y4BTw9AKNUyy9dJIkqHR/GQueqkXQrtMSQWXwh+ yiTJC0eHjR8LOM6J2a4gjSmFe6oTJMVMpKX1jtfSQkfvhtH8bz2cCuCAZdGcYFr26InlCx gxFpsTjAVKKbe9KFVj1Y6SWvl1YEO1vGR0cgXkddPC2HxB3Bs8kdXK3vyVwPXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709600543; a=rsa-sha256; cv=none; b=su2sMne9xmDqdhg1gBrp/CsJJZWssLwqx3ZIpE3p+qADNv9yvSXKfxPnUIG2bahWYR4fbN BmfAQPQQKjImitB4u83BCSt/z6OFjHg1V5nJDffTP9OuXjfHZrfkdZOOgvPmo9sCcgaSGu JYRzgt7Rm4HsQhIsQrgg29rCbNZ+jvh/6Oq6H92Fa7tk8NDTMtKVORqPqIGejGBAuGT52r 4A0W4cbbTfjYYeFbz4Aga+U+c1j5gVkzu+3J1ORCmkYyMcaOKd01T/s3wENnuyuDqG73aY 0N/mFaxJY39JiXnGIxWhvU5KwvRAMJWhng5rTTSyO6mkA2iqodx5sFAFhYThrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709600543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZiDt36vvrati6hfXQ46BBmtp3jqrktfoa5Hcl85S9k=; b=iKJgmn8vZHyWSfgzxci+7CFzeP/TJ3zHrjYtoPzdUx2yeqyRPOz+3S5WXHS0AAVHjIKJYS QvVkeLtKB0/Be0aW8P3AiAyyLbncDw31V4YO5lsyusE1XY6Cpv9bnsoqXT3caYSoMAcgH4 zhesZ+k8tM7jFj0629ldoZHrftJY4PAMS39ViwZPRTfhsl3+8EBIH2pIhiAE2F3UvLWnbn tqeBCVYkm1RKJDKhsrJQAVLk0IKvt1WtOaswncM5HY2u1AdYq/wiQRthF2PBEnrxOQnZm8 qlc2HbVRqeshLUAzllcCHNpRp7u1Dp5T39zHmGcu3PFpvVhlX6mms9zZUPOpZA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpcjV6mPzzl9M; Tue, 5 Mar 2024 01:02:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42512Mlp039617; Tue, 5 Mar 2024 01:02:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42512MSi039614; Tue, 5 Mar 2024 01:02:22 GMT (envelope-from git) Date: Tue, 5 Mar 2024 01:02:22 GMT Message-Id: <202403050102.42512MSi039614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ec911a4f105d - main - libc/locale: don't expose nonexistant __collate_load_error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec911a4f105d3ce3065ff54fc70662f06fc52e57 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ec911a4f105d3ce3065ff54fc70662f06fc52e57 commit ec911a4f105d3ce3065ff54fc70662f06fc52e57 Author: Brooks Davis AuthorDate: 2024-03-05 01:00:50 +0000 Commit: Brooks Davis CommitDate: 2024-03-05 01:00:50 +0000 libc/locale: don't expose nonexistant __collate_load_error The private symbol __collate_load_error was removed in 2015 in commit 2a6abeebef96. While it had previously been accidently removed in 2011 (commit 3c87aa1d3dc1a) and restored in 2012 (commit bb4317bf3c99) I think it's time to write it off after four major releases without it. Fixes: 2a6abeebef96 The collate functions within libc have... Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44182 --- lib/libc/locale/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/locale/Symbol.map b/lib/libc/locale/Symbol.map index a38771e9c3fc..dc9bb56d7870 100644 --- a/lib/libc/locale/Symbol.map +++ b/lib/libc/locale/Symbol.map @@ -208,6 +208,5 @@ FBSD_1.3 { FBSDprivate_1.0 { _PathLocale; __detect_path_locale; - __collate_load_error; __collate_range_cmp; }; From nobody Tue Mar 5 01:02:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpcjX45NWz5DdHN; Tue, 5 Mar 2024 01:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpcjX10Fmz4QJr; Tue, 5 Mar 2024 01:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709600544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RpTPT/AL6wipM532JRWHlUKQIpJ1ECSNrDEOnZ8rGg=; b=j8CboKjMo4KnO8T/pMcKtsT1UMbsHpGG2PBtxFSTUGWYW8lyL2ni75ZrwAwWkgTj9vcAkN pP5FpPUsKx6kbtP7g63Q4MbdGXggGN7HO3/HFxvqGyy8UOSCWdPhWRga1Hk1pImlmWH1eN EPMuVcWQY0V2EzJbO88/IjKtajLDt8/MwCkMnptTa3G4fN+hIrxsHcWe3YtyX3AH/sVpbp fZeR2qbLR/Wh6NkmURD9kDwfr0DIZE7Nd4tcJXAdAHVh4cVwJasKQ3hDOkfeNUDjtV/MLk H7np76STuEKV7OFj7Y1UFiFqtbLmxV1vW8XC6AJCEqpFR8ch4f6vtv7bO7YysA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709600544; a=rsa-sha256; cv=none; b=q/a9Ngkd0BEuhbA8E+qxd/NU0E2QiTK3cWitzdxpJveyw1f08Vgs6QS1KSHfAjHA7FmF5W zZcxt/pEYQvb2h51ocFtoVGw3bc8j0srpDvwaxpLFYyqNLZeE/KHlG5i0xK3CBFaNvf0zD CBWAJkz2XMKYuPFTTMeU95wf3Q9/cGWameRxB0yZ77B8bvT15665YJ4BwedkbWVm8Qq7Zy iXpRvqu5XpMYgQT5aMqKE9bisfkMVILvX/VJyhEoF4y1LvOkSlH8IFSsaYIc4WkXEHu6Z0 E1gq/OapHuVztA3b3w4SlRrfG+U7fxxMrciOIQzeRVrwrxuRYc70QmRB1DfWAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709600544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/RpTPT/AL6wipM532JRWHlUKQIpJ1ECSNrDEOnZ8rGg=; b=wDsMYA7wVPlQacSc1a57k9A8QFo7MSYdX5WoR2LkthwCBebVtPcc2k99EIVddxiOrK6Okz 7LG/gsmrfZeMTMA06E1+yl9l2/6O7s0K/DyjcLt8I01fX6rEH5uSRfwRDjq5Oz1hFCtk2N MGuocfNihNCZ09F2HXViyax3HtZknsWIBl9/yqjFwh8LQiRwVLutR9nCZ+FuxAR2lN7VEj u2tJ/GjwxwHNnyvtUowxrg1Jg7CZ2n/12rOaTGTg9asc5Z4tDHZakmuoTPzkvOpirBE7v3 d2KaUwbLl7MTOcA7BBagYeZthZCnFFLhl5coc9HNOZdu0koKxfW6aIj9oWOD9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpcjX0Zcyzl4W; Tue, 5 Mar 2024 01:02:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42512NoT039660; Tue, 5 Mar 2024 01:02:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42512NhY039657; Tue, 5 Mar 2024 01:02:23 GMT (envelope-from git) Date: Tue, 5 Mar 2024 01:02:23 GMT Message-Id: <202403050102.42512NhY039657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7e8e73fed53c - main - libc: actually build bsearch_b List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e8e73fed53c22da15348c2b673d9c4e4268979a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7e8e73fed53c22da15348c2b673d9c4e4268979a commit 7e8e73fed53c22da15348c2b673d9c4e4268979a Author: Brooks Davis AuthorDate: 2024-03-05 01:01:56 +0000 Commit: Brooks Davis CommitDate: 2024-03-05 01:01:56 +0000 libc: actually build bsearch_b Fixes: 46cdc14062f7 Add support for some block functions ... Reviewed by: theraven Differential Revision: https://reviews.freebsd.org/D44189 --- lib/libc/stdlib/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index a8e78d787939..5e273d5d5a21 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -3,7 +3,7 @@ .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib ${LIBC_SRCTOP}/stdlib MISRCS+=C99_Exit.c a64l.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ - bsearch.c \ + bsearch.c bsearch_b.c \ cxa_thread_atexit.c cxa_thread_atexit_impl.c \ div.c exit.c getenv.c getopt.c getopt_long.c \ getsubopt.c hcreate.c hcreate_r.c hdestroy_r.c heapsort.c heapsort_b.c \ From nobody Tue Mar 5 01:57:20 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpdx10KSYz5Djhb; Tue, 5 Mar 2024 01:57:25 +0000 (UTC) (envelope-from gbe@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 4Tpdx04rMKz4Xpt; Tue, 5 Mar 2024 01:57:24 +0000 (UTC) (envelope-from gbe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709603844; 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=rFSm2iK5BSiauUSUd6woqovCywhBYkD3Cr5M8gv7INI=; b=l+bk4gohbhk/IwF1NrQt7KyTWA+/O/115ML0e4AKNRKdmgGwywJbcD87QjlqSDcvaIMVY7 RyMkvoC6sV6wSLMXlUQ+uyQj2YJwsct9DalGNoIXZ1X8MGDjUHU+y4Ufd/6TI+SB5cshzv DNdMy4BqMp711d47+jicg6kFXyMEuXXr5S9OftNroMCjoSzo7ROuAe+MHIGVyYoe/V/fWU muh3OFcGdVisjoI3kUrI2xsE1ub8PhK1NY4VBWOcxWfj8C1qxCP69nd3joXXtxjnfKS1C+ 41FJIHbdL2xBKCpv0VkL/925m7pXPSrhENqJZ7YrVNUEZRFGXISnI5qiJifuZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709603844; a=rsa-sha256; cv=none; b=bdLebbWc3HJ6J9WVT2ZkXmT61Ikfx4iGalclsyF8ivnyTSkta+XY7YuYsr7Wnriq3ccWJY qjRTVEckDr/XJST2yyxaWaHZd6LB2q6cKM4zmW9/SHOEHS7QF9Uf12Pp8yCr5G6hBsmQGN E/tOnlxlFjZDxi4Qp1NNjg2ugL+liUPHZKbn5NbKEAj/6LIJDGAcRxOlTrUMglRdYM4/q0 zZHNbEVOddim3PxaoL4xr331mWbhYTzs9/Ukyo9T1TZ/5HthAk9Klz02+BGrgPUP4iMeLu O755MfmLGi7+VgAA5nj4SOqJTH0F0DYh6tTR+PIsJBzJyR7NRJJVHYe1ZlaXqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709603844; 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=rFSm2iK5BSiauUSUd6woqovCywhBYkD3Cr5M8gv7INI=; b=Ypzoo5qRnRX25Ps6NjjpzMAaERECukVDZX3YURfan1Nye4/Bi/RvOUbtdoUjyJQLu5fmSB /vWiu+9HH+5vDvdo6HA5iV/dnl11MMNUgs4YRyAbKgWAamQhtyF9apNHqmuSTGs4TcHU0p I1TQv3Po9z47ubWQLU4dab99th7cXMKFrU8gTx2Hm035dJbBdj5eAAER6KivYTePaE4n5R LHfGlwG3usjJIVniJcjX9TOTkRGLYhyT4j2kaCUUHcrifdg6AUYwuCqwoIuhaWGjIgx9/Y sCKyFXX7ZIYV5GSTQDLrpNeCNzAUoWnNQiE+DIbFfWx9O9DnUmNC6QbWEGTmnQ== Received: from localhost (p200300cb87078205909da48076c54947.dip0.t-ipconnect.de [IPv6:2003:cb:8707:8205:909d:a480:76c5:4947]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Tpdx01VM6zd6P; Tue, 5 Mar 2024 01:57:24 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Tue, 5 Mar 2024 02:57:20 +0100 From: Gordon Bergling To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 38a5635de99f - stable/14 - md5.1: Fix an example Message-ID: References: <202403031749.423HnX7f068039@gitrepo.freebsd.org> <86o7buxrv1.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="IIWUJDFN2f977XmE" Content-Disposition: inline In-Reply-To: <86o7buxrv1.fsf@ltc.des.dev> X-Url: X-Operating-System: FreeBSD 14.0-RELEASE-p5 amd64 X-Host-Uptime: 2:54AM up 15 days, 9:34, 4 users, load averages: 1.84, 0.93, 0.47 --IIWUJDFN2f977XmE Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi des, On Mon, Mar 04, 2024 at 10:34:42AM +0100, Dag-Erling Sm=F8rgrav wrote: > Gordon Bergling writes: > > The branch stable/14 has been updated by gbe: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D38a5635de99f3a3ab5f6ec07= d2896ee7ffdb8826 >=20 > so did you just decide to ignore the review feedback? no, off course not. I just was afk over the weekend, but I have seen your c= omment and will update the example accordingly. --Gordon --IIWUJDFN2f977XmE Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEYbWI0KY5X7yH/Fy4OQX2V8rP09wFAmXme/4ACgkQOQX2V8rP 09zpywgAnWHpo5Qqu3smvPhZFzmwvjnpiqj4TVT/1MqUW8DL7QW5j7Gwr6KpV2GO zl2JiJ//w7XjBCVGd+GqjYkMGZJeF32ddeIqscl+/qCrmGX70J8mquM93ITlD/J9 sb+aeKzqaST6amyqc6gWiaIXUkfVZxDr2jpQl4p+L1/t1nvTXmRWzKIMQjlME1Uz W19BGrUM+L6Zp/yB2wMr03HeNnmHCCIiQZrXbZZmf+t4jsGSJEUsSE3qyTqYqpGy nxK1Ab8zyDNFxKV2jaXh0nAOFdXvmaaidcXYXYnOYyszaE7DiX5j5yKyU3Y+dVfV wfz7QdQd82cfav+6xG/siN2SwttmfA== =PHJb -----END PGP SIGNATURE----- --IIWUJDFN2f977XmE-- From nobody Tue Mar 5 02:04:25 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpf560jNxz5DjhC; Tue, 5 Mar 2024 02:04:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tpf555pg8z4YYR; Tue, 5 Mar 2024 02:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709604265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Za4urrFD1b3KL9euy9fxFehGi55rSDwekEi6ioFzX7k=; b=M0N278GcRYZUpXXj4L0GmaeLnkIdmwVkkI1VN56P/DPDt0IJllVzCry5c+CFuGut0RaSfi qaJXwAQ9KzprzA3zmLkeWFmqQMR+mVzlz6NH37j1ExXY4/+0Vkl+FL/s4SxwoYf3i6oKct q1KIqbvvuuyjTs9LCchy1a9wMHda0WBRerkFCMMmk50aNVxfZ7qHckDD7sJfGm/NxV7Lj4 UJu7wkjpYvYR6FrTznXkWI25Wj+8odJjf3SvFU7IZA7QHIzjy0w0H2sG7elWG52BOXsOlw DQvjP90V+NR3HMFYQzP4nm900SuUyBkfuBFIqylvHzTG33qfqswFv0JbFEdBxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709604265; a=rsa-sha256; cv=none; b=jK8Sg2oYYdKuZ8yYoqFc7JONxPNhEZHa+P9ETnCk7pyacci3z/2CF0kyZEdSldNz1yaB4P e0fiZPx2WyADUkJhRPWcBJyYkwo+GE8VMZcNbdN1etVK73ROXKgwtpD7fSqYwioi2d4RUa zpKKavJY+81Ak2yjz6KoeNfkHVYgzgDbGlhumH7VS8jS3JEqULSLLmObD7CUTwkJog9GFI LOTs5TVT1awojGYXHBJ5QzPjCXJn8U7ldooxGDZjursPk1ktzd9aqqWLkPE5m2t3rgLoV3 G+tTj/TbFIiWO+VOaHbzX51i1YBpmanptmPMgL2Lo3eFiwiIXfYxGSFhBLArbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709604265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Za4urrFD1b3KL9euy9fxFehGi55rSDwekEi6ioFzX7k=; b=vYaqXdh1twdnhIIP4sA1nxem96KQqI7pZEuo5C+0pvC7kFxEqfIyX6IzyUIhMUdDafV1cC qTy3vIR4Npsz0Cd619Fe6der5f25z4ISE2Qyayf0TLGyQ1gZq8mlpkf9a2fWouIfUubSwL +RuX+JD36kGEpCg3Tyo3FZ4bgVZvj4lpANWq14BgGp4f/U30Y2I5mQthkIwPtZ1VaY1dN3 6biLutzh9xc3brQHJGLX1rssB601F2crKi4IKrRws8hclV+8ECk8kCYtspue3Hv3j2bQXX CjyxzGwjE9O/d1Fyw9FcJlKtkbegz0slQDCrKanumCeCZqJFC+TSHssNwLH2fA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tpf553txzzmyv; Tue, 5 Mar 2024 02:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42524PLo040086; Tue, 5 Mar 2024 02:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42524PcR040083; Tue, 5 Mar 2024 02:04:25 GMT (envelope-from git) Date: Tue, 5 Mar 2024 02:04:25 GMT Message-Id: <202403050204.42524PcR040083@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 7701b9935543 - main - tcp_rack.4: Remove a mentioned paper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 7701b993554321f305ef662a26238f375c4d2dba Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7701b993554321f305ef662a26238f375c4d2dba commit 7701b993554321f305ef662a26238f375c4d2dba Author: Gordon Bergling AuthorDate: 2024-03-05 02:03:50 +0000 Commit: Gordon Bergling CommitDate: 2024-03-05 02:03:50 +0000 tcp_rack.4: Remove a mentioned paper The paper "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" has nothing to do with our TCP RACK implementation, so remove it. Reported by: tuexen MFC after: 3 days --- share/man/man4/tcp_rack.4 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index 566834f4283b..2ebffca08e26 100644 --- a/share/man/man4/tcp_rack.4 +++ b/share/man/man4/tcp_rack.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 25, 2024 +.Dd March 5, 2024 .Dt TCP_RACK 4 .Os .Sh NAME @@ -130,13 +130,6 @@ What method should we use for rate sampling 0=high, 1=low .%O "RFC 8985" .%D "February 2021" .Re -.Rs -.%A "Ahmed M. Abdelmoniem" -.%A "Brahim Bensaou" -.%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" -.%O "https://arxiv.org/pdf/2102.07477.pdf" -.%D "February 2021" -.Re .Sh HISTORY The .Nm From nobody Tue Mar 5 04:53:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpjrN6hXYz5Bmxp; Tue, 5 Mar 2024 04:53: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 4TpjrN4ZTFz4qpB; Tue, 5 Mar 2024 04:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnmD/Xp++7XZZqdHdOLp31V/JFnhdNBnW8eg+3BB9Ko=; b=RdyFCkbZjNMT1XoEZKxKIEzTrn6nSSBStXOnPTo2Q2iDr6CCSsKrVz6mVQ9m8Atjb3iV4E 2Nc8S6dWvJuF4WRXKnBhcSQNbV0Ba4XTqOPwuZ+F0WswXmTQ9uRSCIYncmTnLwOF77tOxW LUC0jSmuH1BHUX6PKVZFLj3QYeVVhEgF9/VIVTMRsoaRWr6DKWiP53vVPUnKK9UedDoWWG +XboE53X+OCJvEHD85qWZlLXGsU7phcY8zsw5QN5X1tF1fXopD+vOlmraB3hcm7v2FMVzu 0uqJQx3qJWST2IlORu3gTragWOaQAl0fEhbPeNES66A+DloRgir8fk6NpP0zEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709614420; a=rsa-sha256; cv=none; b=jtCAeqGXOVvylVMu6YdlCpZemtRL5OR3risS/VP5cNwraJNU/aTnRtNR+pgqxOj+ZJIXVN BEfeYRTL7lYaOXHs4AyWM27CdmZ1zlYjDl9PqbVbKpM/ZjL9Y5oy3ghpF5FPhUDTBWBI8+ 0iLFxD/U/JkNqO0mm8Haxg4PXxiiw5TynLG9fVP7VVc3EbxniksTgHOoqf1IdcVjIAofr6 4vKc7+12jI+CA0McXbQZuo4PVstApE/RO3LiT3D2g2nmw/ZBpAp/ceUyf9wEHkErb56LHx Jg/VAsWzW1y5felMVpLP/nbz0hba571lfYZyv8YhugEYF7v94tUUlyUAJ7mqsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mnmD/Xp++7XZZqdHdOLp31V/JFnhdNBnW8eg+3BB9Ko=; b=TRD32L+tEXfP+RnGaJckkcTNMhTwfLk0t3hFB0M6tZUPJtx/hvO6ExRfUjXsKRTtQ2C4ez QCW8BBCuKVMmH2b83W24YrO0LRxjoP6JiuUFLqc9uNQc6yCFNJYg+iA0avnb6ENvW6Z+FS v8Vi90kJZnD6gyLiO2BcM+Ijuqiz2ZPQ0b0yGl7y35X3CltSiXIHm6l58saVbYRGnZmYcV R42CVHeA2TqbC66mYPz/tu3BY8Msk8AcZ3v2d5Eb2kNV3F4d5/AwrGbitEWq3R+VABD/R6 A4YY+O+l4DDNC6X0Lc4vQC9DLZG5pJZ2llhWlwkzst9CU9CSozfmqv50tNjNHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpjrN48qpzrwV; Tue, 5 Mar 2024 04:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4254re64027258; Tue, 5 Mar 2024 04:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4254re3i027255; Tue, 5 Mar 2024 04:53:40 GMT (envelope-from git) Date: Tue, 5 Mar 2024 04:53:40 GMT Message-Id: <202403050453.4254re3i027255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 169641f7dd9f - main - imgact_elf: Add const to a few struct image_params pointers List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 169641f7dd9f0fc23a158716b5ad81e5d5056661 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=169641f7dd9f0fc23a158716b5ad81e5d5056661 commit 169641f7dd9f0fc23a158716b5ad81e5d5056661 Author: Alex Richardson AuthorDate: 2024-03-05 04:51:49 +0000 Commit: John Baldwin CommitDate: 2024-03-05 04:51:49 +0000 imgact_elf: Add const to a few struct image_params pointers This makes it more obvious which functions modify fields in this struct. Reviewed by: imp, kib Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D44214 --- sys/kern/imgact_elf.c | 21 +++++++++++---------- sys/sys/imgact_elf.h | 6 +++--- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 8f85a4f5e18a..3863f0a2fdae 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -88,8 +88,9 @@ static Elf_Brandinfo *__elfN(get_brandinfo)(struct image_params *imgp, const char *interp, int32_t *osrel, uint32_t *fctl0); static int __elfN(load_file)(struct proc *p, const char *file, u_long *addr, u_long *entry); -static int __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, - caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot); +static int __elfN(load_section)(const struct image_params *imgp, + vm_ooffset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, + vm_prot_t prot); static int __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp); static bool __elfN(freebsd_trans_osrel)(const Elf_Note *note, int32_t *osrel); @@ -545,9 +546,9 @@ __elfN(map_partial)(vm_map_t map, vm_object_t object, vm_ooffset_t offset, } static int -__elfN(map_insert)(struct image_params *imgp, vm_map_t map, vm_object_t object, - vm_ooffset_t offset, vm_offset_t start, vm_offset_t end, vm_prot_t prot, - int cow) +__elfN(map_insert)(const struct image_params *imgp, vm_map_t map, + vm_object_t object, vm_ooffset_t offset, vm_offset_t start, vm_offset_t end, + vm_prot_t prot, int cow) { struct sf_buf *sf; vm_offset_t off; @@ -616,9 +617,9 @@ __elfN(map_insert)(struct image_params *imgp, vm_map_t map, vm_object_t object, return (KERN_SUCCESS); } -static int -__elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, - caddr_t vmaddr, size_t memsz, size_t filsz, vm_prot_t prot) +static int __elfN(load_section)(const struct image_params *imgp, + vm_ooffset_t offset, caddr_t vmaddr, size_t memsz, size_t filsz, + vm_prot_t prot) { struct sf_buf *sf; size_t map_len; @@ -721,7 +722,7 @@ __elfN(load_section)(struct image_params *imgp, vm_ooffset_t offset, } static int -__elfN(load_sections)(struct image_params *imgp, const Elf_Ehdr *hdr, +__elfN(load_sections)(const struct image_params *imgp, const Elf_Ehdr *hdr, const Elf_Phdr *phdr, u_long rbase, u_long *base_addrp) { vm_prot_t prot; @@ -2711,7 +2712,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) #define MAX_NOTES_LOOP 4096 bool -__elfN(parse_notes)(struct image_params *imgp, Elf_Note *checknote, +__elfN(parse_notes)(const struct image_params *imgp, Elf_Note *checknote, const char *note_vendor, const Elf_Phdr *pnote, bool (*cb)(const Elf_Note *, void *, bool *), void *cb_arg) { diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index 3ddb438e14fc..92995d2f2dc3 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -123,9 +123,9 @@ void __elfN(prepare_notes)(struct thread *, struct note_info_list *, void __elfN(size_segments)(struct thread *, struct sseg_closure *, int); size_t __elfN(register_note)(struct thread *, struct note_info_list *, int, outfunc_t, void *); -bool __elfN(parse_notes)(struct image_params *, Elf_Note *, const char *, - const Elf_Phdr *, bool (*)(const Elf_Note *, void *, bool *), - void *); +bool __elfN(parse_notes)(const struct image_params *, Elf_Note *, + const char *, const Elf_Phdr *, + bool (*)(const Elf_Note *, void *, bool *), void *); /* Machine specific function to dump per-thread information. */ void __elfN(dump_thread)(struct thread *, void *, size_t *); From nobody Tue Mar 5 04:53:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpjrP6F4Mz5BmmW; Tue, 5 Mar 2024 04:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpjrP5bP1z4qlM; Tue, 5 Mar 2024 04:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcfwsKhpiCylxJb+meHdx90mPHA8pgwjo7XEUYKcROY=; b=JU+ukO0qopRSkqC6y5P3dELNBUT5brjEXVZEivGNnrzRC+qMn8f1gAeg8vIbwvY37YjWAb IbxKHfp5W8GwROWE4ETKXShXRbb0K0vBTe0izPA4mqi93fxyZQrmO/y2VaEnnfNm2Jk6+y ZLgDiYovzxbQu9aCNlF7MI1nOeRoq/F0s4vPE5DklIyZcxQ5HdTDrfFTW0Ojiryd0uK4hz E9nYqBWGLdLRQQIednGxHm+ZQQ/zCRKL1dwrL3zLYHqEyqX1fNBHnWoOZsI0e53aPKftgb SieMWFFog30AwJvGOJecJD5yxMCYSS13dK2i2YYFqnGOpWsND9FFSWBIHiYywA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709614421; a=rsa-sha256; cv=none; b=ncDD7aqqut1MOQzMAtr9FIU2bTE+HSInJ7+8sVTutIyEYWV1l3DXJvQoTp6PvZTo74o6Bp ReV6Sx44tLxPGOpfr+mhODPvJCKpksSVJfYFXKz3t/2MrfkorcKPIuiI7zxtxG1QtyQZ4c dtIh1sALaZP7/EudBkw+yIAqDClHe30fqQv3jR/yPZm7Y56Q3WgH2/EYEmT/bxM4KBQuVn UOZs4D77xGAxjvBG4u2ZqP1FIF2x+FzjOtJambeonLiaexdOiajWHO6fZ09/ng6raCsI6t htCeO5+Fctb2eoSMfcqMPZxkBE7ZvfhcO8dOlJNhgBJCOtvlrK2rkHq2CLXkWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614421; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CcfwsKhpiCylxJb+meHdx90mPHA8pgwjo7XEUYKcROY=; b=JD69sQhm1ff7VEs9Tx+Zu3N2vMfYJ8d+VGohcUdZLW8D3kpgFZtIlqRuDVF1p1rtmV5uyd xG87zhGfN3x4Ay8H+pwQtMq7B0G6IDkrByyA2cXSqycNI/kSHGhQYuPBADDUAIM9Akgoti X+5Cy09RfmgGzqTR17+GoiqC9s6po5wBU2zER/7TxMBc339d5TWFkLp5lT0hp9UVPVhO4N UjG/EOIj2Ue5P+zk5gG5zwBLwg7Z2nvOiBzkImppDlFMKPOzfgczd0ntrX6e8IdmEQdU0+ 1I9Ofhw1juyyqyJJnWamfic4KPclFmrCshnLAXPHPbYrkGMV6o8uUCTCZQHrUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpjrP5BcHzrwW; Tue, 5 Mar 2024 04:53:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4254rfKc027319; Tue, 5 Mar 2024 04:53:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4254rfxV027317; Tue, 5 Mar 2024 04:53:41 GMT (envelope-from git) Date: Tue, 5 Mar 2024 04:53:41 GMT Message-Id: <202403050453.4254rfxV027317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 364d1b2f8c0a - main - imgact_elf: Add const to the checknote parameter to __elfN(parse_notes) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 364d1b2f8c0a7f4caaa7f3d184f4cfece8f22108 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=364d1b2f8c0a7f4caaa7f3d184f4cfece8f22108 commit 364d1b2f8c0a7f4caaa7f3d184f4cfece8f22108 Author: John Baldwin AuthorDate: 2024-03-05 04:52:21 +0000 Commit: John Baldwin CommitDate: 2024-03-05 04:52:21 +0000 imgact_elf: Add const to the checknote parameter to __elfN(parse_notes) Reviewed by: imp, kib Sponsored by: University of Cambridge, Google, Inc. Differential Revision: https://reviews.freebsd.org/D44215 --- sys/kern/imgact_elf.c | 2 +- sys/sys/imgact_elf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 3863f0a2fdae..4cee366ed747 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -2712,7 +2712,7 @@ __elfN(note_procstat_auxv)(void *arg, struct sbuf *sb, size_t *sizep) #define MAX_NOTES_LOOP 4096 bool -__elfN(parse_notes)(const struct image_params *imgp, Elf_Note *checknote, +__elfN(parse_notes)(const struct image_params *imgp, const Elf_Note *checknote, const char *note_vendor, const Elf_Phdr *pnote, bool (*cb)(const Elf_Note *, void *, bool *), void *cb_arg) { diff --git a/sys/sys/imgact_elf.h b/sys/sys/imgact_elf.h index 92995d2f2dc3..c9444e5aec41 100644 --- a/sys/sys/imgact_elf.h +++ b/sys/sys/imgact_elf.h @@ -123,7 +123,7 @@ void __elfN(prepare_notes)(struct thread *, struct note_info_list *, void __elfN(size_segments)(struct thread *, struct sseg_closure *, int); size_t __elfN(register_note)(struct thread *, struct note_info_list *, int, outfunc_t, void *); -bool __elfN(parse_notes)(const struct image_params *, Elf_Note *, +bool __elfN(parse_notes)(const struct image_params *, const Elf_Note *, const char *, const Elf_Phdr *, bool (*)(const Elf_Note *, void *, bool *), void *); From nobody Tue Mar 5 04:53:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpjrR0qCfz5Bmxt; Tue, 5 Mar 2024 04:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpjrQ6vgNz4qqv; Tue, 5 Mar 2024 04:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kq9Wu3Hyk5afsaC3y1bMVd6XVa2hlxcAS7TB7TnJJBI=; b=jC/gLH6/X2T11DAG35XJBB+8nEo7FgUFm+HhqptMTF4+TnlrPzv5UeXulDg8LmLLx//5eG PXhydY9iHTuiJhKNe5xYm4W563hH6/K41RLUPz+0lTjgMHxcVlDfHONVmwnu4moCGz3Ee3 ZQ0dsDTgyMCVZqjD1NFgck2FJ0vZEex2gD6DdBvy8P9KSi99VuZUlrQEX8yMiSSPAc6MBT 0Ld8+MhQcEqYKSTBoQ0MQ76JhtAK5pFhpFwqdYRDuPBfnUgKP8Q+/uP7Imgpo5P7DE6h7m uUGoKkK4X1O8WseVPV/scrCYL2lxZEK7GGkqRwtquxoeQJxgFbvINTIZkex6RQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709614423; a=rsa-sha256; cv=none; b=OEbaRNNhBTF0EkjKNZI0jiIbpFSVhA1vOA07Cs96KI9OqnB7PTZpxaW0alH9viopizzj+B nB42a4HDtr4ZQeJxVpHgzUnpwmRQuNxdOqxu4HRdCh31hneDuUOI9l955KiP8TXkolsdxl 9eYerCn/2b5nFB0voy9cHRXE0L93N1n2EbiAI1XygwJIRxAotrYk9rhC4gy4Nzx8c5/V1L 4f73q1czETm4xtx1zRZKZuqBfjLMnB1bxvNGyHNFPqTMIJHE0vsPo+c7kX5BNcGwiXn1V9 sjQmUPpu4xAeAPGj62jkvTKdFtpnaAFTHu0VZQkpehlaeoTlfkSJzUNfzBDgbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kq9Wu3Hyk5afsaC3y1bMVd6XVa2hlxcAS7TB7TnJJBI=; b=fakhV/vXcVAjw3aKF3utsKNY638KRSwH1V4A4NijprQkypGE2VRK8+4YRFqJXnwMEEtyZ1 vB25aRkxcyfnQ23cOxNgl9MSmBVK0jkUvqC5v9XleGRP/Lg9778MIDpBQ2mSjavWrbSNc3 sWKBaVee6xz9sMQC3qtTqd2cZlkExrFkVjCPT4wtZbkPB7CLgNH+a6kvh7s+x5NuwWAhtE hBDBQ23ekwBvfZ7YXERBFkXa9h6rtDnF2H0cZB1EB9L1hVYxTrZwdoPrNYyw2SQqomGJNQ VtgWGmNuLLxxt2rfjMa14i5bTv7pRpWOrknQD36tXE/4qr0VSniiBSELS2Cynw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpjrQ6Dj8zsHZ; Tue, 5 Mar 2024 04:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4254rgpp027371; Tue, 5 Mar 2024 04:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4254rgKY027368; Tue, 5 Mar 2024 04:53:42 GMT (envelope-from git) Date: Tue, 5 Mar 2024 04:53:42 GMT Message-Id: <202403050453.4254rgKY027368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 332dbd3a2f08 - main - pci_host_generic: Pass a valid end address in generic_pcie_translate_resource List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 332dbd3a2f08a887014a425d2532af93503588ce Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=332dbd3a2f08a887014a425d2532af93503588ce commit 332dbd3a2f08a887014a425d2532af93503588ce Author: John Baldwin AuthorDate: 2024-03-05 04:52:54 +0000 Commit: John Baldwin CommitDate: 2024-03-05 04:52:54 +0000 pci_host_generic: Pass a valid end address in generic_pcie_translate_resource The generic_pcie_containing_range helper added in commit d79b6b8ec267 assumed that the passed in (start, end) range used to locate the containing mapping range was a valid address range (with end >= start). The previous version of generic_pcie_translate_resource_common only used the start address to locate a mapping range, so the end address of 0 did not matter, but an end of 0 now causes the first range to match and an incorrect translation for resources using a later range. PR: 277211 Reported by: dch, tuexen Reviewed by: tuexen Fixes: d79b6b8ec267 pci_host_generic: Don't rewrite resource start address for translation Differential Revision: https://reviews.freebsd.org/D44205 --- sys/dev/pci/pci_host_generic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 67b329b58685..0f85e23eb028 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -538,7 +538,7 @@ generic_pcie_translate_resource(device_t bus, int type, rman_res_t newend; /* unused */ return (generic_pcie_translate_resource_common( - bus, type, start, 0, newstart, &newend)); + bus, type, start, start, newstart, &newend)); } struct resource * From nobody Tue Mar 5 04:53:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpjrS2YcKz5Bn3n; Tue, 5 Mar 2024 04:53: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 4TpjrS0NrGz4qlj; Tue, 5 Mar 2024 04:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Hxxm2zoIUTHW0ipDkrUpScpFC8n4e9uv4ZW6qdYFnI=; b=dRF4AHz6HgpsDtZ0dqx+Cx1I8nnooaL3ctb/av6bvSQ+7s+nuZGxIAhk+jpjidMuMLBqXT vKdeq+WRBvDUi94/ey+yXAo8elquO5A547zfI6BCKXZlsNMUTYV6/CV4qYoSLWA2QtpTmE Vax2hqqdV53HtJeYdq9d1kUhtW30DYombKrAG+LajJqA4wbudfgbVK2D2dySW8a4RykifM vxFSKqIncXoyU8CYBTmgjV7a7ppP83XejKS4dt3+EPzqS7kNK3cAsyNGLxomq4ZniW1xrR 5zZG4i9CMDYVMvaKi++V3RWQuVxCeor3Aq4o3xr0zRsSNRtNH1qLx1ON3DigRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709614424; a=rsa-sha256; cv=none; b=Xw64FRAauM3JxfOrszM3o99JOnRT1kqnns+8WcUZhOZpiELUHWDM22rAZDt977os1oVb32 7OOBvqtTYlkl8g45FLN6q6T0apI6HrrxRS1Qr/nQxa4peTsIKUkZ6z7T2q7+LSibSqijHu 24Z16Zn6QUafRMxSpmRxaJuo+owrkDqfDHtJwTzM16fqQ9G1UFGY5Re19p4tvuPjqWD1A7 8YWhUF3x0iKyQn4F+1bWlRHWhJph2w+uhAXcIHCzJb8/Zh1tdjlI9f/C7kK9pTbFLvU9b7 7KKHi+/GGiyiT7UKWTSh3ln48vkLN4viMpday9+opQyqqwXYG21OBN/ISD3eWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709614424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Hxxm2zoIUTHW0ipDkrUpScpFC8n4e9uv4ZW6qdYFnI=; b=IsvH6Q5S9oN+1Ow8KzMaKBmay7VH43RwZ3mDV2JbgKPS3lyDHqpB01oNmV8CHS6wAYpSda 2wh7u78B9ZH1AHDyMzDS/iggprxS3v+9ZWB/NPlECVuu5aln0vw02xFrw4eFYmMcKTWBUk r1ems3yDUbVD5K9S7uDSBXjcn3C3O1GvKAokismazngvcE4bccxnGJTIwJqF60PSi01UCA FhrynvbNHoWvmL1gL5dvyTOEiETjSQoVH6aRdOFN1Qwunrrlyzkd3Vm9wedbd0Ia16nzIB trCUOUZ1ULTqfU+S9545K6Q0lW+P+EJe3IQJguP5ovQn437pmv13+8iJm6yb8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpjrR73qPzs5R; Tue, 5 Mar 2024 04:53:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4254rhKl027407; Tue, 5 Mar 2024 04:53:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4254rhm7027404; Tue, 5 Mar 2024 04:53:43 GMT (envelope-from git) Date: Tue, 5 Mar 2024 04:53:43 GMT Message-Id: <202403050453.4254rhm7027404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 291079d0ebdd - main - pci_host_generic: Simplify generic_pcie_translate_resource List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 291079d0ebdd078840ccb27aaa5d286e03e2e7e6 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=291079d0ebdd078840ccb27aaa5d286e03e2e7e6 commit 291079d0ebdd078840ccb27aaa5d286e03e2e7e6 Author: John Baldwin AuthorDate: 2024-03-05 04:53:21 +0000 Commit: John Baldwin CommitDate: 2024-03-05 04:53:21 +0000 pci_host_generic: Simplify generic_pcie_translate_resource Inline generic_pcie_translate_resource_common into its sole caller. No functional change. Reviewed by: tuexen Differential Revision: https://reviews.freebsd.org/D44206 --- sys/dev/pci/pci_host_generic.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c index 0f85e23eb028..da49edcf91f5 100644 --- a/sys/dev/pci/pci_host_generic.c +++ b/sys/dev/pci/pci_host_generic.c @@ -504,8 +504,8 @@ generic_pcie_containing_range(device_t dev, int type, rman_res_t start, } static int -generic_pcie_translate_resource_common(device_t dev, int type, rman_res_t start, - rman_res_t end, rman_res_t *new_start, rman_res_t *new_end) +generic_pcie_translate_resource(device_t dev, int type, rman_res_t start, + rman_res_t *new_start) { struct pcie_range *range; @@ -513,34 +513,20 @@ generic_pcie_translate_resource_common(device_t dev, int type, rman_res_t start, switch (type) { case SYS_RES_IOPORT: case SYS_RES_MEMORY: - range = generic_pcie_containing_range(dev, type, start, end); + range = generic_pcie_containing_range(dev, type, start, start); if (range == NULL) return (ENOENT); - if (range != NULL) { - *new_start = start - range->pci_base + range->phys_base; - *new_end = end - range->pci_base + range->phys_base; - } + *new_start = start - range->pci_base + range->phys_base; break; default: /* No translation for non-memory types */ *new_start = start; - *new_end = end; break; } return (0); } -static int -generic_pcie_translate_resource(device_t bus, int type, - rman_res_t start, rman_res_t *newstart) -{ - rman_res_t newend; /* unused */ - - return (generic_pcie_translate_resource_common( - bus, type, start, start, newstart, &newend)); -} - struct resource * pci_host_generic_core_alloc_resource(device_t dev, device_t child, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) From nobody Tue Mar 5 05:44:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpkyk3llgz5BrxK; Tue, 5 Mar 2024 05:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tpkyk3C38z3xhW; Tue, 5 Mar 2024 05:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsNtFyWDG0y/0aTWIiA9+NLG1eO5GRtHHRAf1Zz7wyk=; b=gPutup9ujWcl97Org+GdC9l4Sn4qa/2h1PrhIZ6B8kaAvtt++VejwrLNKWHWEzHHdw/LVu m68W0FMWLDDPLhvgKuTqPnGQUvezwYlhIRM/PWgy+72DHw1aFQGSN3txkJW1qGjTIzWw9/ 30jLCGYQ4FPNYzrlNEArEhurJt4ft1v4SoacoRV9WM99M2ooFxshMFnoJQtF1r3NeFPtH5 wgxZICk25YBGCoBXTtxv3292APafrqwZPn+sU5XQF3KZx12Q0StOGZ4il2uKcypjFOiGeF /US8Od6gS4Z28EwvzJVCIFyegoMSL3oKIeg6enOpev93HMBKgI4MU9i8htIXyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709617454; a=rsa-sha256; cv=none; b=o/XOezHWnpTigj6xwbDLDeunDqeEsQg5OWuQ7uaoItbWPuTucLhb+0wfhC+05yTXj80Lqg 0gHxhsdCCcgzolcg7BDDgGl3RpKEMIQnwaPsk67aHzB2uar7vv1bafHb+ZBruEOcaFpREH TXozd6mmbvhzps+JzLXi/69sgNXPfXhFbfEfYRoa0BoqsrtavazAQhSFs7z53S6vkNUAzi JLHj7KMW0h0aEpQJcfmWL/dj69+cU1ZggUp84vQW+mk7wIP3wPooCy8hqRzXLDBTqn3jJB sQsZC+bzxrIhNgwZDWU+qwssygcNWl7n6obhQYQBIkmYJjYPFqPymuWK4AmoCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xsNtFyWDG0y/0aTWIiA9+NLG1eO5GRtHHRAf1Zz7wyk=; b=IYj+W3qbWQ3eomVodc2WZbHDJhdLEE8GyfJStGD5IDyAnuqPls/I/vnAprtffX7PPzJ6xD pzm5KzIZ4szYYhlYCFWeT3IkDZ253xWSy2E7EixgI66i8dS4vvNHgWitdS8KlbOAFk6BqK 9fCgJYlo3YcxjFMm/D6tZzbQTtwByuvePvaFADh931yKclrR3ByvERct+7D6MQc7rBxoZZ c9lq/csnUkMn4joK/SeNnB3bOs3N0Az6ncFyaKKXb5T4qqX+qyhrHbCgCkmTaIESNA5KPU cuw+TFNxN1ByFU1UaSKKeEu9sVYh2SVtzDByv5PAImFNHt7rvbv90eRgBo51dg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tpkyk2py7ztKC; Tue, 5 Mar 2024 05:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4255iErx011363; Tue, 5 Mar 2024 05:44:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4255iEBv011360; Tue, 5 Mar 2024 05:44:14 GMT (envelope-from git) Date: Tue, 5 Mar 2024 05:44:14 GMT Message-Id: <202403050544.4255iEBv011360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: b5d2165b9046 - main - kern: poll: tap out the pollfd array on successful return List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5d2165b9046572c9361a8e8b09323a6001ac586 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b5d2165b9046572c9361a8e8b09323a6001ac586 commit b5d2165b9046572c9361a8e8b09323a6001ac586 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-05 05:44:08 +0000 kern: poll: tap out the pollfd array on successful return We do this in kern_poll() to include freebsd32 but exclude the linux compat layer. The ABI should be the same, but the POLL constants are probably different or should be assumed so. Reviewed by: bapt, jhb Differential Revision: https://reviews.freebsd.org/D44158 --- sys/kern/sys_generic.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 9c0cb4e739e0..f6190c3fb05f 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1606,6 +1606,11 @@ kern_poll(struct thread *td, struct pollfd *ufds, u_int nfds, error = kern_poll_kfds(td, kfds, nfds, tsp, set); if (error == 0) error = pollout(td, kfds, ufds, nfds); +#ifdef KTRACE + if (error == 0 && KTRPOINT(td, KTR_STRUCT_ARRAY)) + ktrstructarray("pollfd", UIO_USERSPACE, ufds, nfds, + sizeof(*ufds)); +#endif out: if (nfds > nitems(stackfds)) From nobody Tue Mar 5 05:44:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpkyl516sz5Bs0S; Tue, 5 Mar 2024 05:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tpkyl44z2z3xtM; Tue, 5 Mar 2024 05:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nq7I0Yi6CBLB5wBjOxCAu6pL98bD9gWXpOULk2g+HkI=; b=lxfKTC1Z7HHN3j0hRdMiZbuF9gTiHGjDvJ39tS6D0ac1pZzpi+DWYoIeHYZrvgqvJEn9v8 aXRp0riiorIzm+hK/a0RTaxw6pqTjGaJ7MjWzyC/ll0WlUBhQSvbfhciKs2d5NMu+rz/Fa 4Ji/BFYmQxBsidRqKZVyeFqaJWjYmInW7cIBJH3gC3XgfkwvB7+yplFa4uX78l27+7RORm IulQo5SES0fkIrO+NrBlAm276q6wglKQQwB3m5/BQpa2E0HNKK5KG8fmd5nxC/1JLyAe0q dMQOp3mQJWtD3f/r5f/kWu3YXk2/WTnuxcvkx1Fi6WA1Sm3Q53KLY75DKYXh2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709617455; a=rsa-sha256; cv=none; b=ZFUFmx3009FmqxBYBubPF3uIKpnm/yOelXkV1BXA5ouLnxBLzeB0E6zzuvWpOiFyWkXA3W AKj7hD0OPMKRdMvmx0ZdR5DuXngMsuscM/W55BvEoM8nOcMzjAQ5rQmZ/1DhhRYHMfjLz5 1wSVVAAg/Cl2cepWCjUPpjBFXAEl7B9Cmvdcn1MT6nEnRVqQMN9wdBIcrHsp5p2qkZ8zyU atBDLO6V4XWIfklhS1fm9yeXyhy327eHAS4fDU5BSV03kbRyWG1kGoenxFIgepWmqAb7jq Mm3JpC95KRrJL926kJ4jRZ7YcAFtQz2IrnetH2UuY7N1OhWe7nFLISDq3nTvCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617455; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nq7I0Yi6CBLB5wBjOxCAu6pL98bD9gWXpOULk2g+HkI=; b=FpMQiG2Mvwvgz0hO16H0TYRYG4usqGMsBjBbcKQqJ7fpL8kwrTSWrYHrs0ZQdDfUG5JXjo KD96su5NtyiD1W4m/X4i9SsBJ8so2ex+6wLfEFR7azw/7WtPz+4Ivbya4Kp3+TxY1S0ewH 1o8izdl+pU+qmFZY2YWSenzmLSts+I5MWIvIgNPhcCt7mxsRMACHQqb8o/sVsdch7Eho1C tIdb1NZAwT2bNpOlfP0328x795ar7KeVrsUSfAFD3dh9vNUal9/hoS0qcjC+fYqypW0G0v psWctpFUvyirWx3wMZKbVAAMZnmVLI731sU+eqTWmZleKkRcIxKgoOnW3gEMtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tpkyl3htKzsn7; Tue, 5 Mar 2024 05:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4255iFDS011412; Tue, 5 Mar 2024 05:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4255iFB0011409; Tue, 5 Mar 2024 05:44:15 GMT (envelope-from git) Date: Tue, 5 Mar 2024 05:44:15 GMT Message-Id: <202403050544.4255iFB0011409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: bd23e71f91ce - main - libsysdecode: add a decoder for pollfd events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd23e71f91ceec5dfdffc28bbd0020849fdd20b4 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=bd23e71f91ceec5dfdffc28bbd0020849fdd20b4 commit bd23e71f91ceec5dfdffc28bbd0020849fdd20b4 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-05 05:44:09 +0000 libsysdecode: add a decoder for pollfd events We'll use this in another change to read pollfd arrays coming from a successful poll(2) operation. Reviewed by: bapt, jhb Differential Revision: https://reviews.freebsd.org/D44159 --- lib/libsysdecode/Makefile | 1 + lib/libsysdecode/flags.c | 8 ++++++++ lib/libsysdecode/mktables | 1 + lib/libsysdecode/sysdecode.h | 1 + lib/libsysdecode/sysdecode_mask.3 | 12 +++++++++++- 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index e1d6c7e02ff0..504701ee99a2 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -93,6 +93,7 @@ MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \ sysdecode_mask.3 sysdecode_msync_flags.3 \ sysdecode_mask.3 sysdecode_open_flags.3 \ sysdecode_mask.3 sysdecode_pipe2_flags.3 \ + sysdecode_mask.3 sysdecode_pollfd_events.3 \ sysdecode_mask.3 sysdecode_reboot_howto.3 \ sysdecode_mask.3 sysdecode_rfork_flags.3 \ sysdecode_mask.3 sysdecode_semget_flags.3 \ diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c index 33c778c391ee..32829d35dbe0 100644 --- a/lib/libsysdecode/flags.c +++ b/lib/libsysdecode/flags.c @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -565,6 +566,13 @@ sysdecode_pipe2_flags(FILE *fp, int flags, int *rem) return (print_mask_0(fp, pipe2flags, flags, rem)); } +bool +sysdecode_pollfd_events(FILE *fp, int flags, int *rem) +{ + + return (print_mask_int(fp, pollfdevents, flags, rem)); +} + const char * sysdecode_prio_which(int which) { diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index bf0dc34511d3..beb18e97f898 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -114,6 +114,7 @@ gen_table "mountflags" "MNT_[A-Z]+[[:space:]]+0x[0-9]+" "sys/ gen_table "msyncflags" "MS_[A-Z]+[[:space:]]+0x[0-9]+" "sys/mman.h" gen_table "nfssvcflags" "NFSSVC_[A-Z0-9]+[[:space:]]+0x[0-9]+" "nfs/nfssvc.h" gen_table "pathconfname" "_PC_[A-Z4_]+[[:space:]]+[0-9]+" "sys/unistd.h" +gen_table "pollfdevents" "POLL[A-Z]+[[:space:]]+" "sys/poll.h" gen_table "prio" "PRIO_[A-Z]+[[:space:]]+[0-9]" "sys/resource.h" gen_table "procctlcmd" "PROC_[A-Z_]+[[:space:]]+[0-9]" "sys/procctl.h" "PROC_TRACE_CTL_" gen_table "ptraceop" "PT_[[:alnum:]_]+[[:space:]]+[0-9]+" "sys/ptrace.h" diff --git a/lib/libsysdecode/sysdecode.h b/lib/libsysdecode/sysdecode.h index 4c091bb14343..8dc0bbea6f0d 100644 --- a/lib/libsysdecode/sysdecode.h +++ b/lib/libsysdecode/sysdecode.h @@ -83,6 +83,7 @@ const char *sysdecode_nfssvc_flags(int _flags); bool sysdecode_open_flags(FILE *_fp, int _flags, int *_rem); const char *sysdecode_pathconf_name(int _name); bool sysdecode_pipe2_flags(FILE *_fp, int _flags, int *_rem); +bool sysdecode_pollfd_events(FILE *fp, int flags, int *rem); const char *sysdecode_prio_which(int _which); const char *sysdecode_procctl_cmd(int _cmd); const char *sysdecode_ptrace_request(int _request); diff --git a/lib/libsysdecode/sysdecode_mask.3 b/lib/libsysdecode/sysdecode_mask.3 index 171a086a5079..efcab331fe29 100644 --- a/lib/libsysdecode/sysdecode_mask.3 +++ b/lib/libsysdecode/sysdecode_mask.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 3, 2022 +.Dd February 29, 2024 .Dt sysdecode_mask 3 .Os .Sh NAME @@ -43,6 +43,7 @@ .Nm sysdecode_msync_flags , .Nm sysdecode_open_flags , .Nm sysdecode_pipe2_flags , +.Nm sysdecode_pollfd_events , .Nm sysdecode_reboot_howto , .Nm sysdecode_rfork_flags , .Nm sysdecode_semget_flags , @@ -96,6 +97,8 @@ .Ft bool .Fn sysdecode_pipe2_flags "FILE *fp" "int flags" "int *rem" .Ft bool +.Fn sysdecode_pollfd_events "FILE *fp" "int flags" "int *rem" +.Ft bool .Fn sysdecode_reboot_howto "FILE *fp" "int howto" "int *rem" .Ft bool .Fn sysdecode_rfork_flags "FILE *fp" "int flags" "int *rem" @@ -191,6 +194,13 @@ and .Dv F_SETFL .Xr fcntl 2 commands. +.It Fn sysdecode_pollfd_events +The +.Fa events +and +.Fa revents +members of a +.Vt struct pollfd . .It Fn sysdecode_sctp_nxt_flags The .Fa nxt_flags From nobody Tue Mar 5 05:44:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpkyn27MWz5Brxx; Tue, 5 Mar 2024 05:44: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 4Tpkym5KGvz3xfl; Tue, 5 Mar 2024 05:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BltF+ZdLhUe8jbAveRpskgbnVmYwsBLg60Y7ijg5/IQ=; b=QoPh/gUGxI8S7KcMQTtIeTs+tfo2kKniJmBpJ8StsvkIXniqKfXfbRwPT8EU/+lGUoso09 8vcGpWrMn1HLVrAU4yL/cK9qzAy2Qw+zSs4uE+ZcEeGc3qPYCq4uyOZkwz4zdoo8BtRFg6 6bcIwitBngToVYLqXhKY1/LbsZVY4N0Wdc30IVCPBfvT+PoIU1dbeCxsyps/1bGaS3nFNT jgcthn29pmL6BqeTsR7nxCCqG4BbGt4Y9wgiDxIZfTjsTDkZpQMetD90a9bLW44AZSDIOb Uuk+hWEUMWp56BHgVtYCuVNElpvguLSYXQl+yS1GguOtMsz0NEGeZ53lPaf9gA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709617456; a=rsa-sha256; cv=none; b=dI4DlRfrVyQq+cw4I3P/5eRKZ8LGba2nqtmIrfyvbUNspJjWUGEoh4muYcGVwXW5ZNUomb IM8pUIYSeGpPzU93WNFg24/4b8sngSFMSV/CNURM3VBgQftbxQM6UUKZTNhuLnqOsm9WDB W4VgGayXK7K9PL0fghU1iR6HibHZudTaHr3p0W/DIz1F7wdy7WaycDRC0pPilTXMbb6bLH sSNnGMw5mcqfMEZQk2iKVvKlqeUOfBsiBdGn9ouRxDaAsmG94R8EAdPgB5LRrItJXRbd5X 6QbI1+Sbdg0Ny/36D31HpTbxMB3sdUppSuoWXe21iZazD+hhrEGC793APKT31g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BltF+ZdLhUe8jbAveRpskgbnVmYwsBLg60Y7ijg5/IQ=; b=nd8bs2t88v8IV6T2x6c7GpXCRJirpQSrRo71coSLR0roLdRv/Rpq2ad7EwYDPAjX4+0aJf EIomapNfJ7AuT2sVdBA79v12rMXA3bcR0SrMNHZSdEIqHteUVbJ0DAMxl/eHf4bvInXZ2Z d7ABXxLWKE2AJvJrHto+rWx2EDnIK/IulQCgtqvk4NeBFsxMndGP0HMvxP1kjKJztsoliY nZLMglnQKIB/vEfPtzGa+s9ddGqh7Be13Y2eS4f6Id38p0/OaHfs8S5ZE7EYZcl0bKxDpo 2JBv2OiQE8B42yBXB9cZoLcDvFotKOPT8t4Rq0yYYACRWVkZhHMwTtWC/TLKmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tpkym4SgqztV6; Tue, 5 Mar 2024 05:44:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4255iGK2011463; Tue, 5 Mar 2024 05:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4255iGcN011460; Tue, 5 Mar 2024 05:44:16 GMT (envelope-from git) Date: Tue, 5 Mar 2024 05:44:16 GMT Message-Id: <202403050544.4255iGcN011460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 02c57f7b4877 - main - kdump: decode pollfd struct arrays coming from poll(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02c57f7b48772c5ec4e3a0a3405273b387b9bb08 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=02c57f7b48772c5ec4e3a0a3405273b387b9bb08 commit 02c57f7b48772c5ec4e3a0a3405273b387b9bb08 Author: Kyle Evans AuthorDate: 2024-03-05 04:14:06 +0000 Commit: Kyle Evans CommitDate: 2024-03-05 05:44:09 +0000 kdump: decode pollfd struct arrays coming from poll(2) We'll handle these just as we do kevents, one per line with subsequent lines indented sufficiently to distinguish them from the upcoming return value. Sample, with indentation stripped and revents changed to '...' in the first one to keep the line length down: CALL poll(0x820610560,0x3,0) STRU struct pollfd[] = { { fd=0, events=0x1, revents=0x11<...> { fd=1, events=0x4, revents=0x4} { fd=-1, events=0x4, revents=0} } RET poll 2 Reviewed by: bapt, jhb Differential Revision: https://reviews.freebsd.org/D44160 --- usr.bin/kdump/kdump.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c index 0253fdc9e87b..f5bb4dcfea42 100644 --- a/usr.bin/kdump/kdump.c +++ b/usr.bin/kdump/kdump.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -110,6 +111,7 @@ void ktrcapfail(struct ktr_cap_fail *); void ktrfault(struct ktr_fault *); void ktrfaultend(struct ktr_faultend *); void ktrkevent(struct kevent *); +void ktrpollfd(struct pollfd *); void ktrstructarray(struct ktr_struct_array *, size_t); void ktrbitset(char *, struct bitset *, size_t); void ktrsyscall_freebsd(struct ktr_syscall *ktr, register_t **resip, @@ -2209,10 +2211,23 @@ ktrkevent(struct kevent *kev) printf(", data=%#jx, udata=%p }", (uintmax_t)kev->data, kev->udata); } +void +ktrpollfd(struct pollfd *pfd) +{ + + printf("{ fd=%d", pfd->fd); + printf(", events="); + print_mask_arg0(sysdecode_pollfd_events, pfd->events); + printf(", revents="); + print_mask_arg0(sysdecode_pollfd_events, pfd->revents); + printf("}"); +} + void ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) { struct kevent kev; + struct pollfd pfd; char *name, *data; size_t namelen, datalen; int i; @@ -2294,6 +2309,11 @@ ktrstructarray(struct ktr_struct_array *ksa, size_t buflen) kev.udata = (void *)(uintptr_t)kev32.udata; ktrkevent(&kev); #endif + } else if (strcmp(name, "pollfd") == 0) { + if (ksa->struct_size != sizeof(pfd)) + goto bad_size; + memcpy(&pfd, data, sizeof(pfd)); + ktrpollfd(&pfd); } else { printf(" }\n"); return; From nobody Tue Mar 5 05:44:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpkyp3N82z5BsK4; Tue, 5 Mar 2024 05:44: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 4Tpkyp0J4Sz3xg0; Tue, 5 Mar 2024 05:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UQ/jEIZ/2Qn0OjQz86pr/lrFyV4wgIEyT7KPKT4aag=; b=imCKpMIDLHZVK3UrqHU8/K9iEnFloCkqCbPYdxsSNFy8d2pYaJX8RqkXwB9wMsFtiBpkQX pTaFmpVEAN2bzemtAnd16JNz72NdlGqKeWgVdsyV7AhI7abO4/T7AOMVztI++605g+ASpu c43WMcmDzxLG/nlccQmgomt7AnTxu1pMhul5D8k22dgRvm/hNrJt79FrIjQP8ATZTT9gJd QcVX4JShEiN+LI6GFHfGvFcOKcfi41XUQgDbbRuotvdrnW8RMzKVB1iaXOJqyfXg8uHB7D JAw7to7elYHc4AjWuhYXhWwZWskW6Qh79CbuJEzAuCSq+7qh+dHpmS2XOEH0vQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709617458; a=rsa-sha256; cv=none; b=VAGnTNSVUwjblOdS8NthHmWIxOQXUzkjT9za0H2c5xRG4JulNtuUeK53ixF2FiEa4e021D mwfZb14PUDByL9PPaeqfU40o+v8Hbvyz9MVD1x8E5B8H9rRrLQ56iLPRL2YtfUrl5whaEX kcibDmxNn+SZLDBVy7WDI/hlzOKb2s7IP/088F90Ymuab80SD3mCjhBp2F/Un1CAiZx26H EHbyWKch8d8TLuDs3KbtJUTGYthvU39edehqezqwTTktit6D4C0HNhHfO8ZUEQIb430D8K ZCYeoTaLfKuLF14z6l5lJVLSRT3E+AUd9jQF6tudMy8CYzVOcbBdLZcFN/+aaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8UQ/jEIZ/2Qn0OjQz86pr/lrFyV4wgIEyT7KPKT4aag=; b=Dk3sb79KkqR2OlDc4o5y0sRGamePxLRXMUcIJQuY10yzh/qBZspzl5AAej1oCA3mERCUTh xaoRp47CCsm1nQwtUDo6VGKioyIkS2rkeWs2X/Qi1mfWFRr/ewDVFLf7OhvWoCFVo5+TQ2 PtrT8XwsnL78aK2wGcfyNZAoT54mu/KNXjegmR6/z0I2oOx3bRNHvl+vnMhxTZrh41IqNc 4WWQRLAdgXQ8LIxUCy72vmuIvlmSgFp/INo52NTeCAf8R03dzY1j/3IOJAg73giaY5SKW+ 2Wypb+/GUqYPZa0TfaT4mBwseeUcIU+ni/bx+aAVzg/DqbbZERKNUPQcUzBaRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tpkyn5SZnztT9; Tue, 5 Mar 2024 05:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4255iHnY011517; Tue, 5 Mar 2024 05:44:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4255iHCP011514; Tue, 5 Mar 2024 05:44:17 GMT (envelope-from git) Date: Tue, 5 Mar 2024 05:44:17 GMT Message-Id: <202403050544.4255iHCP011514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 47ad4f2d45e4 - main - ktrace: log genio events on failed write List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47ad4f2d45e406c6316909bc12bc760b2fdd6afb Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=47ad4f2d45e406c6316909bc12bc760b2fdd6afb commit 47ad4f2d45e406c6316909bc12bc760b2fdd6afb Author: Kyle Evans AuthorDate: 2024-03-05 04:14:07 +0000 Commit: Kyle Evans CommitDate: 2024-03-05 05:44:09 +0000 ktrace: log genio events on failed write Visibility into the contents of the buffer when a write(2) has failed can be immensely useful in debugging IPC issues -- pushing this to discuss the idea, or maybe an alternative where we can set a flag like KTRFAC_ERRIO to enable it. When a genio event is potentially raised after an error, currently we'll just free the uio and return. However, such data can be useful when debugging communication between processes to, e.g., understand what the remote side should have grabbed before closing a pipe. Tap out the entire buffer on failure rather than simply discarding it. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D43799 --- sys/kern/kern_ktrace.c | 2 +- sys/kern/sys_generic.c | 3 ++- sys/kern/uipc_syscalls.c | 3 ++- sys/netinet/sctp_syscalls.c | 6 ++++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 877a25ffa4cd..6ace3ea52c64 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -767,7 +767,7 @@ ktrgenio(int fd, enum uio_rw rw, struct uio *uio, int error) int datalen; char *buf; - if (error) { + if (error != 0 && (rw == UIO_READ || error == EFAULT)) { freeuio(uio); return; } diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index f6190c3fb05f..b926f98892a5 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -577,7 +577,8 @@ dofilewrite(struct thread *td, int fd, struct file *fp, struct uio *auio, cnt -= auio->uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = cnt; + if (error == 0) + ktruio->uio_resid = cnt; ktrgenio(fd, UIO_WRITE, ktruio, error); } #endif diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index dce0ab9b53d4..b2d03d932b99 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -772,7 +772,8 @@ kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(s, UIO_WRITE, ktruio, error); } #endif diff --git a/sys/netinet/sctp_syscalls.c b/sys/netinet/sctp_syscalls.c index a5e4fa8f9603..d67e260b6f99 100644 --- a/sys/netinet/sctp_syscalls.c +++ b/sys/netinet/sctp_syscalls.c @@ -290,7 +290,8 @@ sys_sctp_generic_sendmsg(struct thread *td, struct sctp_generic_sendmsg_args *ua td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(uap->sd, UIO_WRITE, ktruio, error); } #endif /* KTRACE */ @@ -404,7 +405,8 @@ sys_sctp_generic_sendmsg_iov(struct thread *td, struct sctp_generic_sendmsg_iov_ td->td_retval[0] = len - auio.uio_resid; #ifdef KTRACE if (ktruio != NULL) { - ktruio->uio_resid = td->td_retval[0]; + if (error == 0) + ktruio->uio_resid = td->td_retval[0]; ktrgenio(uap->sd, UIO_WRITE, ktruio, error); } #endif /* KTRACE */ From nobody Tue Mar 5 05:52:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpl8F3yZcz5Bt1Z; Tue, 5 Mar 2024 05:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tpl8F3Vxbz41N5; Tue, 5 Mar 2024 05:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4XlHaidSn4g+RwlVeqktq48tgzX506ye4oS/dpWr3c=; b=FCeaG4N5TF+3hevY9TaZTxSXrUgNstFk0+9WcXVoqt9uKS55i7r/ZGBUN1jXm+bD65bzuF dYlmoEeJ5suy55IktVGbAG8PAiIPO1Kg8Yon0Rh8Sa7NwP+lYFY40wjei6V0/wvHrx9tzb pk1UCBbTFwzJ2k6qII0VkX2hUQH/KUwrgWPkZ995EAWOa1L+VopoPhAxqKdTpg86n5aPmj G3cJqxxQSU00twzfwmmRVUJVfYfmTvhXS639YxEA4gOVfdvFsCz9AAnViDX2b7Vl+x0SMv pWDxy4c2PFyM9uD9IiDK4cr8R0/GUgZ2hBVFPPLDtiGelSixfXef1raaoqVw/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709617949; a=rsa-sha256; cv=none; b=ob3Jw4C+8O353N3GwVt/OqLj5YUcMAJrYW1+eLEvnkhemEHU7mD4XibowmqTySwpsUbQcd GJgp/I9nyjl//XdFh5BU9W8dKl87V65pGlbqZ5cMfgWYIf3P+3qdtzZnHCyHYPES8B7lrI 6U4CGCI97x9BW+atbHiR3pL9EkN+K6dl249y2ZY83gn5Oj9amGJpI9yqXLJv3LjqXmEaRB vGcZNEqEJB+nFmNtjGkwLWEyIsK/g9Zitsq19dWb7DpBc9/ovr5uwGtt+8Lv5IsBrp74SV 3T2ffcUJwePRNITO7mn1dphvN1zxEP2XwEV+NI2ViDaeKpoB5m90jailhah8Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709617949; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F4XlHaidSn4g+RwlVeqktq48tgzX506ye4oS/dpWr3c=; b=cZKtKy3vWc7MBfCRXXYOte3hWB+orxfG3qEQ/N94CjDUeQ/5SlwNzttHn+ezWxFpLfY4P1 QYses1p4pbz22CpnUVuwYk4cxmG9GLaGkJ9qNJBOW7YafgzHdGWkdxn9CBQO6aVfdVv3kb j0Sq4HSK9mrB+eS+fNYggTzNaixCkx1V2UIoTG6GrYxXIXVSaehlRt2/ZzmO0dSlMLCwRS qM/rxP6rw5N7KikQXtLRTsAcdpO7jsFJVn1b3qOJoj9OiK6gtlcS3KJrAWDpq+/sdZbJTN S0cK9/eicm07ZVriml15DNt8NfMAelcDpVLg6LbVA8bZyRO5GUZZ4L0IKKszLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tpl8F36kFztqS; Tue, 5 Mar 2024 05:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4255qTlQ028433; Tue, 5 Mar 2024 05:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4255qTve028430; Tue, 5 Mar 2024 05:52:29 GMT (envelope-from git) Date: Tue, 5 Mar 2024 05:52:29 GMT Message-Id: <202403050552.4255qTve028430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e6dccf00500d - main - .github: Switch to v4 of actions/checkout List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6dccf00500d7e9e2311b372e28897df7c0421dd Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e6dccf00500d7e9e2311b372e28897df7c0421dd commit e6dccf00500d7e9e2311b372e28897df7c0421dd Author: John Baldwin AuthorDate: 2024-03-05 05:52:09 +0000 Commit: John Baldwin CommitDate: 2024-03-05 05:52:09 +0000 .github: Switch to v4 of actions/checkout GitHub is emitting a warning that v3 is deprecated due to using Node.js 16. --- .github/workflows/cross-bootstrap-tools.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross-bootstrap-tools.yml b/.github/workflows/cross-bootstrap-tools.yml index d2dcf2aaa6f3..327bdadc6a9b 100644 --- a/.github/workflows/cross-bootstrap-tools.yml +++ b/.github/workflows/cross-bootstrap-tools.yml @@ -38,7 +38,7 @@ jobs: - target_arch: aarch64 target: arm64 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: install packages (Ubuntu) if: runner.os == 'Linux' run: | From nobody Tue Mar 5 07:10:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tpmt32mLHz5C1fj; Tue, 5 Mar 2024 07:10: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 4Tpmt32DG9z462R; Tue, 5 Mar 2024 07:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709622619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kk28UE17xrWYxvFNfZLi+ppUt5WyQUEzEzcGo0lfLDo=; b=hHnXZdan0juxgQmMIh9H5/DPf3HGgwsLABJAFTZ1chU4xvLdxvrJyD9H6iWr+5+b86GXi4 QSiiI9RCMfqRnvlch/Dm1VnOJe+2+TcA/CQf0Sg2Sp7x+rHQVGlCiA+2xai1PnPnReHd6H rzYaXY/2pzQ7vW2nxnLNNJ+YHsKgOG5kT9EcGbpqkgwwDZt6hUS5kpgXjSOUU7hG1G9rU1 /OanDrY1Fu4W2sRm4nBbxPvp3+vu1cXLxza7bkkVRFnz572gSJIRugwEl5KWjWwzFDiEyz Q6pEkdBD7llJBjQicZSWRBVWO+bHFTjPiPQplU3KMvu/oH/MzX5B/IziNYwFyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709622619; a=rsa-sha256; cv=none; b=IbSm57kLem8DZ9WnwiBs9fLCWKOcbvmqN90ui+lgE+xsyGHoR4ARlQNOkeQ2qUGIeJZuoG C1FBWCXb5Fk+NBZAxhNCjnbqircWtxzntllUHPQIPOKmYoSUBvt0S1ZzZ7fGXqfazzveMY wwETFbOcOPF0UXHLDamt8FAXLyiIUMj+hVO9vMPIWPGq2+6e091E406s/5WCufe7T9Ykgp R9zn+d5VH9I3YI2MRhUwDrdECVxXg7lkr2jckjvSGYuIgrhipfy0/UJDkvlHz9vSwxbnXs n+Z9QVbnGVfFMyIRQV+trkE5STN1buzJj7x/zlDPdZzfx1eZALgN2Lgce/kYKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709622619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Kk28UE17xrWYxvFNfZLi+ppUt5WyQUEzEzcGo0lfLDo=; b=R7dL909QFJwHVMHUEIPa0DzPmNH/WGt+RnA1IyjhRzD3W9zy4rGHSlt1ChoFDWCEwdwYxo UJ3wlezgjf3b9CWWqRuXa010FhB2llacgDdi7MhLN7Pa2ic0aizc3WRHedWW8IDqpGqcg7 J3dakHnspG6QHGrJDLop3yirHO95QUaLa3bZfGoezbcv1937cU/JMFuWgzm914KgKRGYZV BMz4LKqSAowMxIrn7wa5WcMuo40bT+/f/Hb+jgsi6x+10d2RjP88C0JsfFPu7fsuGOYj/v ERMMIwCqmPAN4xmLXQPNMRZ8nJaCTphDgLjZQHx5YGfThCLMVqvf2Ej1uIqJeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tpmt31nDBzwK0; Tue, 5 Mar 2024 07:10:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4257AJq8056846; Tue, 5 Mar 2024 07:10:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4257AJUk056845; Tue, 5 Mar 2024 07:10:19 GMT (envelope-from git) Date: Tue, 5 Mar 2024 07:10:19 GMT Message-Id: <202403050710.4257AJUk056845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 406cf112e148 - Create tag release/13.3.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/tags/release/13.3.0 X-Git-Reftype: annotated tag X-Git-Commit: 406cf112e148de9eba1cd749e4054a52e4e15d77 Auto-Submitted: auto-generated The annotated tag release/13.3.0 has been created by cperciva: URL: https://cgit.FreeBSD.org/src/tag/?h=release/13.3.0 tag release/13.3.0 Tagger: Colin Percival TaggerDate: 2024-03-05 07:09:10 +0000 Tag 13.3-RELEASE from 80d2b634ddf0b459910b54a04bc09f5cbc7185a7 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEglY7hNBiDtwN+4ZBOJfy4i5lrT8FAmXmxRYACgkQOJfy4i5l rT+DEw/8CZTiHjeGJ8b7UXR/D/tAgtmNlt8afTKowOmMbOyh5oHA3A8qqt3UR6oz n0hcRM5PHKxZ9AkEv2ABUetzNuV4NLlrJ+ApesF28KVbr/CTKYm+z3oHxGNONHJ7 WpS23mYK8fZ3JYL+h1eUkqZjqSieQsQuX5VkxhrAjN5zRkv6R7oyJ3HC7Iow44+a ENJdCgTGKkeqdfZykMxDP6xmnjzmuyWEo3UkXUW7jD7/q71YevP8Ospx8AVYnmor d/n+psY4Rg2bRNLBAI6/e8BWU6rHagH5UbCVlfkZI+uCPuPZd3ELO7v1Jru6x+lL JM3xTPZrPxTOa7eNXnK0AW/DmjeFS89asRvN9lpDFJz3OvP3d05SBs9NWd634lPv gW3nsJDVbqyfYiUGhpjyVxDMKGmm3BFxdYH6i5mFP7Q0BWBUcWb6V3XeKSNXRf1M 9uVnM66dyIsJmopj/+wKPrsnLuw8Pj/Je0azoew9Q9+i7KUN2xpgLzpuG9jvOdVs OC2IW125aD0rjZWifQJAuzMVvP8205YbY5Zx1qbt9XYG7ek9G5yoqn46jeuwsCw9 erUjsa9cfwGgaCa1+yfd9q+MFIdaQJ4qokoBnb0EspoyqS0kE81evg9d4D1Dtu+S 7APmaTY0BUVpaoXJilHEhYpkZcyD9DQipmZknHNpmdPdpb1n+oY= =VeDl -----END PGP SIGNATURE----- commit 80d2b634ddf0b459910b54a04bc09f5cbc7185a7 Author: Colin Percival AuthorDate: 2024-03-01 19:00:16 +0000 Commit: Colin Percival CommitDate: 2024-03-01 19:00:16 +0000 Update in preparation for 13.3-RELEASE - Bump BRANCH to RELEASE - Add the anticipated RELEASE announcement date - Set a static __FreeBSD_version Approved by: re (implicit) Sponsored by: https://www.patreon.com/cperciva From nobody Tue Mar 5 10:49:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpslL6NCFz5CPbW; Tue, 5 Mar 2024 10:49:50 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TpslL3h91z4b4K; Tue, 5 Mar 2024 10:49:50 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709635790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tECsyxrAsR8ADEAzhFPB0VnilNHVq69PYdcKnM+HtN0=; b=wbk6mfsOe5GV1dyGqHZdEwRgFClYMoRXiAIytkUEvE/BVQzWZhDT9U5Zcq870WyK4GXsHt Nym+P+mdV1UKJxXnTZ4m0TfA53YkUu8q0x3fosyT8hN0rCWXNEKsjVsWBhqNWFgIPryezx 6FFuvnki2lODsZPSK+L8HjdzFKKw+JoVLxO1HOg3SetEZvbkc8cuPVdNOjtzwl0nD4CuKH iLCxM+riDW602HyPobUEqPA/8Bgk4EmiNjXe6KMCM7n1PImlurzVI8Ivi3Qx5hCMwLf+dd T+Uob5L0H4l1/XF+xNXZnBJLNKA6EqOYltR+ysnbrpR2zWPVKlZNASVDooJxVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709635790; a=rsa-sha256; cv=none; b=MJz2JvLwwWJS4EB8twttcuKDsm/HygRtIjApz0nxGg1hz9J6CLrH8F/0XQCQpzAwAWXD0v REx0L+TE5wBFBV6C3EZqnT6fBG6VWSmGUPjDp3foXJj9a/9Ft8KbDlzFuxnVV6P7N1IsdI 8jWgYoY0s6KMzgE/JLjzawxb0Ch8674xVgjv2RwVCCTLp7srvpdBqz9d5YGdZU6tgsBeZ9 oLVYY2b+k2ayYXwlRIH5u0EpRpWiHho2nT+sH1s1h/WP4fRI7ltvYIKcdXfnUMGw2QLkHS Wdd7wzJ+/fR9U3akfApcm2z4K8V/tqDbuztAf4C4lNNZqrAzO5mhuV3BhKj/Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709635790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tECsyxrAsR8ADEAzhFPB0VnilNHVq69PYdcKnM+HtN0=; b=UA+T2nBsEs5i+s+h/mVkhw3cOtN2RYTb4Uk4Mrel7mr4nydqzpaRX71azIjAKrPVr8NHGY WZ0znHJS6939sLLaXRoVXG6xqb4XTadUZ08JwOnWfT9NiibnrVmOQzks1jbfP8A/ggHtuN PjsGp0tATiaAz05igXuYmBFifuz8dkeai70t+0qOmoRcHxzb7kUVLznJTdzo+7K8Og0fHy mfIghCv3Im8PPpF1IoqrPEOXtzXuviXN242hW4fDmiUfc487FzCCqMkXaowKXDbYVh/X4n S6y6rbgdW9kKJEvNQxxZRC9S9DSdJPw4wPbRrL1Uzt0MMUSBTdM5p0ZqitRTjg== Received: from ltc.des.dev (163.23.65.37.rev.sfr.net [37.65.23.163]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TpslL2Z1qz12s8; Tue, 5 Mar 2024 10:49:50 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 48CDE10855C; Tue, 5 Mar 2024 11:49:48 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gordon Bergling Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 38a5635de99f - stable/14 - md5.1: Fix an example In-Reply-To: (Gordon Bergling's message of "Tue, 5 Mar 2024 02:57:20 +0100") References: <202403031749.423HnX7f068039@gitrepo.freebsd.org> <86o7buxrv1.fsf@ltc.des.dev> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Tue, 05 Mar 2024 11:49:48 +0100 Message-ID: <867cihx8ab.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gordon Bergling writes: > Dag-Erling Sm=C3=B8rgrav writes: > > so did you just decide to ignore the review feedback? > no, off course not. I just was afk over the weekend, but I have seen > your comment and will update the example accordingly. and yet you somehow managed to MFC the patch _after_ I told you it was incorrect. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Tue Mar 5 11:22:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TptTY2tkXz5CSJH; Tue, 5 Mar 2024 11:22:57 +0000 (UTC) (envelope-from gbe@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 4TptTY22LWz4d2f; Tue, 5 Mar 2024 11:22:57 +0000 (UTC) (envelope-from gbe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709637777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tT7eBr6WlmEwA6MVog3igAWf6osrTV24MorMfZQ0Puo=; b=jCWcZV4L862H8oLXVrvUYD22ZOfwLnTRX2zQyZ/4PBqzxxA2Xzqf87E25/RihnUD3i+Zmj 9IKDthfzQ5D+wtbN49pQzRTmMwL/shKKRFmbpXrvNcd06l+eCzm3ZtlJS2WLNYvL4xl/qd dLx008mobZekERNyEMwO0393qriOoouoqFmq03EmII4Z5VCFfxp28GwIXxmFlXT060K/sp IkHNZZM7VNZC/xbVI+cRIOIyJ9cvNqUd5k5mXP7P7S7t14UyRIhvWTdg9AjKEa45/IWJHg nkkF1qWXq3v+uwL96nasbUnDMnNYcwWGJJOd0sToSFkceIX+5adgn8yAqaC4og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709637777; a=rsa-sha256; cv=none; b=dV+Ayo5HKXkAgXbDAtWbOQazsP1c1eplcwoNezqYHRAWrXi+/kXktdxczSkZw200c24nWJ Ud982pL8GDuF4FA+tMnsyLCFM+WF0YFMnyWIFopL2TAr52jEtooFTMS4ngiJ0gWAr7ZaRg VBVNUYit5sz6tfg0cUF+DiFQ09AJd7BsNvwGN4ROmg1Heq0NSeHJPYpLoId+HKeOoUO0w8 twzKX0YhJmLqcvs+F9OUBYz7zTxeJEQtfUIwV4P2BWIXlc4IzMvABrj3S9QeggttUFuY2D amm1JzzaK2+qRU4dN5PJzWM1YilTJitNQ9vwHq5zxRxD//YojdUfoENvDO/KDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709637777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tT7eBr6WlmEwA6MVog3igAWf6osrTV24MorMfZQ0Puo=; b=c2mI9t03PM3+/HB3CTMHiUdc5YsDyGIIrRQL6qx+9v9a/NR/JUJuFZR0bV8ROU+7q0+jgA aWe6gGa5DozQhfY0hNoSRMdbKpy7xT+HF0dipTvFAvWgMzIOSpl9GnwiRN4eUfqko00ix6 3SZnCho+X123/l5eXqe3lLfZF1Of4GbW3YLw/t/vdNb0Cb68t0l5xhrk67X1EiAZNUEU1C 4A3IT2B5GSYxCvrQEKwj9tyzVfsY2sjU30NQm+3JQUyKbzZ5gk0cs5YYsNRf2lHLjtPMkS vVsBYKAmeoGlfE1XFTSm1/u2JHMaffiu90C6QfIQRC8baoocCzE9NJcMew6rsQ== Received: from localhost (p200300cb87078205909da48076c54947.dip0.t-ipconnect.de [IPv6:2003:cb:8707:8205:909d:a480:76c5:4947]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gbe) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TptTX6F8Sz14DW; Tue, 5 Mar 2024 11:22:56 +0000 (UTC) (envelope-from gbe@freebsd.org) Date: Tue, 5 Mar 2024 12:22:55 +0100 From: Gordon Bergling To: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 38a5635de99f - stable/14 - md5.1: Fix an example Message-ID: References: <202403031749.423HnX7f068039@gitrepo.freebsd.org> <86o7buxrv1.fsf@ltc.des.dev> <867cihx8ab.fsf@ltc.des.dev> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <867cihx8ab.fsf@ltc.des.dev> X-Url: X-Operating-System: FreeBSD 14.0-RELEASE-p5 amd64 X-Host-Uptime: 12:21PM up 15 days, 19:01, 4 users, load averages: 0.29, 0.18, 0.16 On Tue, Mar 05, 2024 at 11:49:48AM +0100, Dag-Erling Smrgrav wrote: > Gordon Bergling writes: > > Dag-Erling Smrgrav writes: > > > so did you just decide to ignore the review feedback? > > no, off course not. I just was afk over the weekend, but I have seen > > your comment and will update the example accordingly. > > and yet you somehow managed to MFC the patch _after_ I told you it was > incorrect. That just slipped through, due to many MFC reminder mails. I'll do a revert in a minute. --Gordon From nobody Tue Mar 5 13:38:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TpxVD5g73z5Chjf; Tue, 5 Mar 2024 13:38: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 4TpxVD57jrz4pln; Tue, 5 Mar 2024 13:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709645924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2+7qq7XkQSm8mMSXZI92O7rwaW0LM8ccXoiWLgxbAAY=; b=wGAX1DQMnCdX3JJeU6MyJ9Af3zCBCvLWGLiuclzqb9VUufzYWPHHGJsxpY1iR2ZA9QosBq 4SdK6nfz9uox90v94RzTWCjNLL++KJis+NH4Okc41f5SneAeJIN3M64nhZRHJ15n4j+NNG cJrbfmo10SF31aM64kKPa4EvZg7PZu6g1hDNZK0X47ezSz8s/8F32QP2ZJf69H0WAWyBaG Pb268KOQAaPakPuaTQFi3zHx+nuk1YgHMUkb3AkzP+AhklzOwqVgpBVWGPcnquhl2kPbPD CR2yAMzBcpMPBZjGEeQOBxBmxVuki9bFW2TMCY9e8JwL4Uds7rFXt51JlPkQSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709645924; a=rsa-sha256; cv=none; b=qaDq8FdnRlGvaAwVVVoAxr7vkVrC6XxxlPO4dkz6qj2U0Td0MWnF0TQzkCt474uWt9Jvz3 /nB2/NcAqMWG2q2r5lQ8yO/uuqsWVFVoNTUng2MSMUCRme8ZdnWwaYtHH0M8tGhpM1sSQm 3kxUNb/Sn/LmxhZTpiWWbYksqKDAvmuI5jJlWmDIus3YMVE308TrJW21uvUvoDzICy3dvt 0rXIHFekJeFsFjSmKWhGoT+leCZh+VziZNQdIxe8xrHVL1cpkpJ9W1VzdD9ktoFecIzX0l tB6/a2wFS/eBi7y7Qq1DK0DtobRoj3soXuFbpXArZ+J24USVop7vKqLdq1zyrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709645924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2+7qq7XkQSm8mMSXZI92O7rwaW0LM8ccXoiWLgxbAAY=; b=LF/5VLCA/+t8SqOMAMABlTr9IqWDRVmg/AE6nCWyx3qViGB0eBPcdtUrrhkceHk6b3OyAu DQOBSdmjuhI8m663Pr5OUsxs7VoZMo1Z3lGyLfbNztzoLMZn4ViJ8aXC4AFugi4zW2akUg Pkz6/FSwQu9nesRV3E0NeA24W/78AlaiNNNdSe5B5IhZPrQ/YlLxOAxz9oJHd7zLpvD9i2 wa1GibrWeggmv3YOV9d18h2/OF7E6rkwFyI+M3mxjCHmSXnvJeJCNMMRINh4En3BIiXP8w /xRCAgDRW1frjaE1tybThjmPu1TQM6VaSkA/a2bygMnJxNRJHBzwMIblyBzlDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TpxVD4cDDz16mS; Tue, 5 Mar 2024 13:38:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 425DciQ7004831; Tue, 5 Mar 2024 13:38:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 425Dci2v004828; Tue, 5 Mar 2024 13:38:44 GMT (envelope-from git) Date: Tue, 5 Mar 2024 13:38:44 GMT Message-Id: <202403051338.425Dci2v004828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: 885590b4f1ad - main - bsd-family-tree: add FreeBSD 13.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 885590b4f1ad218995df0fc127601e0f59bcc57f Auto-Submitted: auto-generated The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/src/commit/?id=885590b4f1ad218995df0fc127601e0f59bcc57f commit 885590b4f1ad218995df0fc127601e0f59bcc57f Author: Sergey A. Osokin AuthorDate: 2024-03-05 13:38:09 +0000 Commit: Sergey A. Osokin CommitDate: 2024-03-05 13:38:09 +0000 bsd-family-tree: add FreeBSD 13.3 MFC after: 3 days --- share/misc/bsd-family-tree | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index d50d69fceffb..06cb803f709c 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -446,11 +446,16 @@ FreeBSD 5.2 | | | | | | | | OpenBSD 7.3 | | FreeBSD | | | | | 13.2 | | | | - | macOS | | | - | 14 | | | - | | | OpenBSD 7.4 | - *--FreeBSD | | | | - | 14.0 | | | | + | | | | | | + | `------. | | | | + | | macOS | | | + | | 14 | | | + | | | | OpenBSD 7.4 | + *--FreeBSD | | | | | + | 14.0 | | | | | + | | | | | | + | FreeBSD | | | | + | 13.3 | | | | | | | | | FreeBSD 15 -current | NetBSD -current OpenBSD -current DragonFly -current | | | | | @@ -880,6 +885,7 @@ FreeBSD 13.2 2023-04-11 [FBD] macOS 14 2023-09-26 [APL] OpenBSD 7.4 2023-10-16 [OBD] FreeBSD 14.0 2023-11-20 [FBD] +FreeBSD 13.3 2024-03-05 [FBD] Bibliography ------------------------ From nobody Tue Mar 5 17:29:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tq2c50FpMz5D52f; Tue, 5 Mar 2024 17:29: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 4Tq2c46pgNz4P9v; Tue, 5 Mar 2024 17:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709659749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N81vBvcRKlqoqXGhWRCrhWIvRas/i4JJYWR15YUr7Nk=; b=p6/5822h/0If3WxZWcI+ZTzLswOuIl/Fm9dY+bFUNQASKt774SVwF1K8EMZbO/B+nCIT+6 nZY4o0fo0tvNdgzViyOeNj3cBmWvJr4/xDssOk1nMmq4nvunrUSLE9oP/6CXpig9uA9sKS msF9kczMv76HG6rfbbws8DgJBlxYPFVq8wWZ4Vp4OWStQkBmt71LEvmDOLRe3GBTRNOUYx GGxQdZ6PYXBQSSuVUxyYx5QpzgQ/ckkDdUPgfV99UMipMLP/Z9YQAHOUfZH6s+9gC2A6vo uHQ0GLaQMmkHMVi9dVBI+Xy9Ss2KVuogWxHX1bsy/qcs8KQ1SuK23Zt5ePZ6cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709659749; a=rsa-sha256; cv=none; b=T/AF6XFceIaELrmnGbP45sDTTQ/LxNoOsgfg6XvHRDHk9GLfTei5kLQaCYhcmMP+zsqHhE SsTtA9UK+bqro+qcXclDhxirmX0mf1sDm7SAVOPQdzkunpUAUWaXmIMM+xxFwYiTHNavkS Ql3e3tKziB/fE93vlcnnuucA2XAnL2zI3UK43fqtXRxz+lt8Jra4sID56zVi7nBevKzru6 YOlRGHXmqwQC2VTtiqOlg9oDpY/f4J6YBo8g3pOXK+W4bwHGmTqLzSrvXG12rilg0cr/dB Rgu4hgdHbt/74+kZRRAlRrpFJotVD+0khaeomj8Xy4IPx2DgF3TTngcZoY+tkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709659749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N81vBvcRKlqoqXGhWRCrhWIvRas/i4JJYWR15YUr7Nk=; b=YRJRjLNh68tRvGdjoX8vUvzSwnYwtyyEb9a36+i/DKIozWWJSPG5pJ+Hziscq0cpEFKc9i stkJWotFutjltN0dLGOjWvx4kqLQoq5JPgQLtuzR68BJTU436ubGqMXZ/KERETAUm2Yxff rznqDEMZBWsBAqZlyfZcOwYXhkBrG7gobr7DUlPK7JjoJt99Hp+AXbrsRYAdusIcMrMJdt PyK+q8mOd0Bnaf02gLh+vYL/dmiTbZ29O/03BxUJ+vfcaz0Xc/79oABOXlIC7qhYYOLbk3 eF+SQ9yXWzFS8ig4Pl1H5/CCvFKmkPoxwc+TkVX9Nuqw7dIZhrGzMXKDugAJvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tq2c46PwYzFk5; Tue, 5 Mar 2024 17:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 425HT8RH093299; Tue, 5 Mar 2024 17:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 425HT8iu093296; Tue, 5 Mar 2024 17:29:08 GMT (envelope-from git) Date: Tue, 5 Mar 2024 17:29:08 GMT Message-Id: <202403051729.425HT8iu093296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: e333110d1de7 - main - diskinfo(8): introduce new option -l List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e333110d1de748e50051d1305b5438d1bc54eeb4 Auto-Submitted: auto-generated The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=e333110d1de748e50051d1305b5438d1bc54eeb4 commit e333110d1de748e50051d1305b5438d1bc54eeb4 Author: Eugene Grosbein AuthorDate: 2024-03-05 17:23:41 +0000 Commit: Eugene Grosbein CommitDate: 2024-03-05 17:29:04 +0000 diskinfo(8): introduce new option -l In modes -p or -s, add an option -l to start each line with a device name separated with a tab. Update the manual page. Add an example to list names with corresponding serial numbers: diskinfo -ls /dev/da? MFC after: 2 weeks --- usr.sbin/diskinfo/diskinfo.8 | 23 ++++++++++++++++++++--- usr.sbin/diskinfo/diskinfo.c | 15 ++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/usr.sbin/diskinfo/diskinfo.8 b/usr.sbin/diskinfo/diskinfo.8 index 72fd1df4eb08..970bafd4f8e5 100644 --- a/usr.sbin/diskinfo/diskinfo.8 +++ b/usr.sbin/diskinfo/diskinfo.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 4, 2017 +.Dd March 5, 2024 .Dt DISKINFO 8 .Os .Sh NAME @@ -38,10 +38,12 @@ .Op Fl citSvw .Ar disk ... .Nm -.Op Fl p +.Op Fl l +.Fl p .Ar disk ... .Nm -.Op Fl s +.Op Fl l +.Fl s .Ar disk ... .Sh DESCRIPTION The @@ -57,6 +59,13 @@ Print fields one per line with a descriptive comment. Perform a simple measurement of the I/O read command overhead. .It Fl i Perform a simple IOPS benchmark. +.It Fl l +In case of +.Fl p +or +.Fl s +modes prepend each line of an output with a device name using a tab +character as a separator. .It Fl p Return the physical path of the disk. This is a string that identifies the physical path to the disk in the @@ -80,6 +89,14 @@ with the following fields: device name, sectorsize, media size in bytes, media size in sectors, stripe size, stripe offset, firmware cylinders, firmware heads, and firmware sectors. The last three fields are only present if the information is available. +.Sh EXAMPLES +List first ten (at most) +.Xr da 4 +devices with corresponding serial numbers: +.Pp +.Dl diskinfo -ls /dev/da? +.Sh SEE ALSO +.Xr da 4 .Sh HISTORY The .Nm diff --git a/usr.sbin/diskinfo/diskinfo.c b/usr.sbin/diskinfo/diskinfo.c index 4cc4517a1f26..f091d0ccfbea 100644 --- a/usr.sbin/diskinfo/diskinfo.c +++ b/usr.sbin/diskinfo/diskinfo.c @@ -58,11 +58,14 @@ static void usage(void) { - fprintf(stderr, "usage: diskinfo [-cipsStvw] disk ...\n"); + fprintf(stderr, "usage: diskinfo [-ciStvw] disk ...\n" + " diskinfo [-l] -p disk ...\n" + " diskinfo [-l] -s disk ...\n" + ); exit (1); } -static int opt_c, opt_i, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; +static int opt_c, opt_i, opt_l, opt_p, opt_s, opt_S, opt_t, opt_v, opt_w; static bool candelete(int fd); static void speeddisk(int fd, off_t mediasize, u_int sectorsize); @@ -88,7 +91,7 @@ main(int argc, char **argv) u_int sectorsize, fwsectors, fwheads, zoned = 0, isreg; uint32_t zone_mode; - while ((ch = getopt(argc, argv, "cipsStvw")) != -1) { + while ((ch = getopt(argc, argv, "cilpsStvw")) != -1) { switch (ch) { case 'c': opt_c = 1; @@ -98,6 +101,9 @@ main(int argc, char **argv) opt_i = 1; opt_v = 1; break; + case 'l': + opt_l = 1; + break; case 'p': opt_p = 1; break; @@ -169,6 +175,9 @@ main(int argc, char **argv) goto out; } } else { + if (opt_l && (opt_p || opt_s)) { + printf("%s\t", argv[i]); + } if (opt_p) { if (ioctl(fd, DIOCGPHYSPATH, physpath) == 0) { printf("%s\n", physpath); From nobody Tue Mar 5 19:29:24 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tq5Gs1HYFz5DGhq; Tue, 5 Mar 2024 19:29: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 4Tq5Gr5DKqz4bWf; Tue, 5 Mar 2024 19:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709666964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sgvZ51mMJdv2tBl5tvvy8fmmsYwq0WsLvruegxWMMIE=; b=KdIbP1jHYBYPqiGKWLyfDqvqyAPN3OwZB7zYIlPPCPcHABLRsVBX846K1vAuML8sjNcCP7 HIBBYGGb9ZITNdpRCkevGeVglD46kxC529ItThmdyW9buJUBphXoeMUOB/s06S1K6TD/d4 6xuyGyHLo3JPz7koIYAn6E7qIlOX2845W1lu4NgZVK9vhNjson0tH/kiuLCBqwfnZbPxk0 CcDGfvoZxUBUO3dZP8/fZuBZaAlyz1bEs9BVb149r53MCAEhiCEdiBTAhgiHiD0gPGwyQo HxoTkPwyjq+RCXE1LPCDCtsw1XGKBGQhaJlb6t3MfE2ZTa8nl9r7lVZJaEDuLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709666964; a=rsa-sha256; cv=none; b=m3rKCBJ3cbmCFQ3IH1Vot5NNtdlMhGUZbotk+XPXnXBKhGRvGUvMWFh2BrAzoMpOgxsLHM xaKXxzS9ctYg4O9sJHuMYOwrC56Wd/Dj9PD6Yz3VqAb/xmKyJv/MuJ4XAqTpT++XZ7idrQ XqY6X1YBi87oRNmjVDLb/NcOrCDtdNY8FeqYsBVMGNfpKgL1IF3vSfwIAx6oG1ZTYzCNgY dvqIpdKSAZJefyYdgQMxk4rmofWWhYO2fmlDxKaIS2Rr9nMPrke544uTj99R1AjLilm8Z2 IybIotgEtZVHa7dGniGdAwArnpjq3O3G6F2MJ0DBKARUUXRm2Ev9aFHfv/YU5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709666964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sgvZ51mMJdv2tBl5tvvy8fmmsYwq0WsLvruegxWMMIE=; b=GnR+zO8QYrzcyD6H+1TSQYAAkDuUCti2UCjXTXh9myhXSiDwEahZUnLA9bw6gkS76Ows4t n4IXQ3Ru7Z1ixFZ4myPUDEDnEdPOGIK6XtNaRmEqmcLUxuV3Ok7a1U9JSQJtzP+r09IWZJ VpQ++P+HvyB/CVO6MYTktMsMVxemVpFyo7+PbwUsu6zptgX92DBWA1Bo9JqEaetm5w3ggM D+Uz8j38vQzIHWGzTGhm0BXDq90NdP1tNTPXYmz3HfpvNlR6BMa966EUBPBEVGYHT6W4O6 1UIPS18jiXikq8V5BO91JiNJGsCmZdyH+vP0l4hzgSubfF+LVt+MMbctKJs/5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tq5Gr4pd0zJfT; Tue, 5 Mar 2024 19:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 425JTOWo095115; Tue, 5 Mar 2024 19:29:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 425JTOvm095112; Tue, 5 Mar 2024 19:29:24 GMT (envelope-from git) Date: Tue, 5 Mar 2024 19:29:24 GMT Message-Id: <202403051929.425JTOvm095112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 89f4f91dbfdc - main - zfsd: Use vdev prop values for fault/degrade thresholds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89f4f91dbfdcabe65bc7476bc5f13dfb837870fe Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=89f4f91dbfdcabe65bc7476bc5f13dfb837870fe commit 89f4f91dbfdcabe65bc7476bc5f13dfb837870fe Author: Alan Somers AuthorDate: 2024-03-05 17:55:55 +0000 Commit: Alan Somers CommitDate: 2024-03-05 19:11:53 +0000 zfsd: Use vdev prop values for fault/degrade thresholds ZED uses vdev props for setting disk fault/degrade thresholds, this patch enables zfsd to use the same vdev props for these same tasks. OpenZFS on Linux is using vdev props for ZED disk fault/degrade thresholds. Originally the thresholds supported were for io and checksum events and recently this was updated to process slow io events as well, see https://github.com/openzfs/zfs/commit/cbe882298e4ddc3917dfaf239eca475fe06d62d4 This patch enables us to use the same vdev props in zfsd as ZED uses. After this patch is merged both OSs will use the same vdev props to set retirement thresholds. It's probably important to note that the threshold defaults are different between OS. I've kept the existing defaults inside zfsd and DID NOT match them to what ZED does. Differential Revision: https://reviews.freebsd.org/D44043 MFC after: 2 weeks Relnotes: yes Reviewed by: asomers, allanjude Sponsored by: Axcient Submitted by: Alek Pinchuk --- cddl/usr.sbin/zfsd/case_file.cc | 98 ++++++++++++++++++++++++++++++++--------- cddl/usr.sbin/zfsd/case_file.h | 22 +++++---- cddl/usr.sbin/zfsd/zfsd.8 | 58 ++++++++++++++++++------ 3 files changed, 135 insertions(+), 43 deletions(-) diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc index 39f89fbbf7c8..f9fd84da7277 100644 --- a/cddl/usr.sbin/zfsd/case_file.cc +++ b/cddl/usr.sbin/zfsd/case_file.cc @@ -53,6 +53,7 @@ #include #include +#include #include #include @@ -91,7 +92,6 @@ using DevdCtl::ParseException; CaseFileList CaseFile::s_activeCases; const string CaseFile::s_caseFilePath = "/var/db/zfsd/cases"; -const timeval CaseFile::s_removeGracePeriod = { 60 /*sec*/, 0 /*usec*/}; //- CaseFile Static Public Methods --------------------------------------------- CaseFile * @@ -255,6 +255,7 @@ CaseFile::RefreshVdevState() m_vdevState = vd.State(); m_vdevPhysPath = vd.PhysicalPath(); + m_vdevName = vd.Name(casePool, false); return (true); } @@ -610,15 +611,55 @@ CaseFile::ActivateSpare() { return (Replace(vdev_type, devPath, /*isspare*/true)); } +/* Does the argument event refer to a checksum error? */ +static bool +IsChecksumEvent(const Event* const event) +{ + return ("ereport.fs.zfs.checksum" == event->Value("type")); +} + +/* Does the argument event refer to an IO error? */ +static bool +IsIOEvent(const Event* const event) +{ + return ("ereport.fs.zfs.io" == event->Value("type")); +} + +/* Does the argument event refer to an IO delay? */ +static bool +IsDelayEvent(const Event* const event) +{ + return ("ereport.fs.zfs.delay" == event->Value("type")); +} + void CaseFile::RegisterCallout(const Event &event) { timeval now, countdown, elapsed, timestamp, zero, remaining; + /** + * The time ZFSD waits before promoting a tentative event + * into a permanent event. + */ + int sec = -1; + if (IsChecksumEvent(&event)) + sec = CaseFile::GetVdevProp(VDEV_PROP_CHECKSUM_T); + else if (IsIOEvent(&event)) + sec = CaseFile::GetVdevProp(VDEV_PROP_IO_T); + else if (IsDelayEvent(&event)) + sec = CaseFile::GetVdevProp(VDEV_PROP_SLOW_IO_T); + + if (sec == -1) + sec = 60; /* default */ + + timeval removeGracePeriod = { + sec, /*sec*/ + 0 /*usec*/ + }; gettimeofday(&now, 0); timestamp = event.GetTimestamp(); timersub(&now, ×tamp, &elapsed); - timersub(&s_removeGracePeriod, &elapsed, &countdown); + timersub(&removeGracePeriod, &elapsed, &countdown); /* * If countdown is <= zero, Reset the timer to the * smallest positive time value instead @@ -827,6 +868,10 @@ CaseFile::CaseFile(const Vdev &vdev) guidString << m_poolGUID; m_poolGUIDString = guidString.str(); + ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); + zpool_handle_t *zhp(zpl.empty() ? NULL : zpl.front()); + m_vdevName = vdev.Name(zhp, false); + s_activeCases.push_back(this); syslog(LOG_INFO, "Creating new CaseFile:\n"); @@ -1158,43 +1203,54 @@ CaseFile::Replace(const char* vdev_type, const char* path, bool isspare) { return (retval); } -/* Does the argument event refer to a checksum error? */ -static bool -IsChecksumEvent(const Event* const event) +/* Lookup the vdev prop. Used for checksum, IO, or slow IO props */ +int +CaseFile::GetVdevProp(vdev_prop_t vdev_prop) const { - return ("ereport.fs.zfs.checksum" == event->Value("type")); -} + char val[ZFS_MAXPROPLEN]; + zprop_source_t srctype; + DevdCtl::Guid poolGUID = PoolGUID(); + ZpoolList zpl(ZpoolList::ZpoolByGUID, &poolGUID); + zpool_handle_t *zhp(zpl.empty() ? NULL : zpl.front()); -/* Does the argument event refer to an IO error? */ -static bool -IsIOEvent(const Event* const event) -{ - return ("ereport.fs.zfs.io" == event->Value("type")); -} + char *prop_str = (char *) vdev_prop_to_name(vdev_prop); + if (zhp == NULL || zpool_get_vdev_prop(zhp, m_vdevName.c_str(), + vdev_prop, prop_str, val, sizeof (val), &srctype, B_FALSE) != 0) + return (-1); -/* Does the argument event refer to an IO delay? */ -static bool -IsDelayEvent(const Event* const event) -{ - return ("ereport.fs.zfs.delay" == event->Value("type")); + /* we'll get "-" from libzfs for a prop that is not set */ + if (zfs_isnumber(val) == B_FALSE) + return (-1); + + return (atoi(val)); } bool CaseFile::ShouldDegrade() const { + int checksum_n = GetVdevProp(VDEV_PROP_CHECKSUM_N); + if (checksum_n == -1) + checksum_n = DEFAULT_ZFS_DEGRADE_IO_COUNT; return (std::count_if(m_events.begin(), m_events.end(), - IsChecksumEvent) > ZFS_DEGRADE_IO_COUNT); + IsChecksumEvent) > checksum_n); } bool CaseFile::ShouldFault() const { bool should_fault_for_io, should_fault_for_delay; + int io_n = GetVdevProp(VDEV_PROP_IO_N); + int slow_io_n = GetVdevProp(VDEV_PROP_SLOW_IO_N); + + if (io_n == -1) + io_n = DEFAULT_ZFS_DEGRADE_IO_COUNT; + if (slow_io_n == -1) + slow_io_n = DEFAULT_ZFS_FAULT_SLOW_IO_COUNT; should_fault_for_io = std::count_if(m_events.begin(), m_events.end(), - IsIOEvent) > ZFS_DEGRADE_IO_COUNT; + IsIOEvent) > io_n; should_fault_for_delay = std::count_if(m_events.begin(), m_events.end(), - IsDelayEvent) > ZFS_FAULT_DELAY_COUNT; + IsDelayEvent) > slow_io_n; return (should_fault_for_io || should_fault_for_delay); } diff --git a/cddl/usr.sbin/zfsd/case_file.h b/cddl/usr.sbin/zfsd/case_file.h index 9566b1586ef5..199918c4fead 100644 --- a/cddl/usr.sbin/zfsd/case_file.h +++ b/cddl/usr.sbin/zfsd/case_file.h @@ -235,18 +235,27 @@ public: */ int IsSpare(); + /** + * \brief Get case vdev's specified property + */ + int GetVdevProp(vdev_prop_t) const; + protected: enum { + /* + * Use these defaults if we can't get the corresponding vdev + * prop or if the prop is not set + */ /** * The number of soft errors on a vdev required * to transition a vdev from healthy to degraded - * status. + * status */ - ZFS_DEGRADE_IO_COUNT = 50, + DEFAULT_ZFS_DEGRADE_IO_COUNT = 50, /** * The number of delay errors on a vdev required to fault it */ - ZFS_FAULT_DELAY_COUNT = 8, + DEFAULT_ZFS_FAULT_SLOW_IO_COUNT = 8, }; static CalloutFunc_t OnGracePeriodEnded; @@ -379,12 +388,6 @@ protected: */ static const string s_caseFilePath; - /** - * \brief The time ZFSD waits before promoting a tentative event - * into a permanent event. - */ - static const timeval s_removeGracePeriod; - /** * \brief A list of soft error events counted against the health of * a vdev. @@ -404,6 +407,7 @@ protected: string m_poolGUIDString; string m_vdevGUIDString; string m_vdevPhysPath; + string m_vdevName; int m_is_spare; /** diff --git a/cddl/usr.sbin/zfsd/zfsd.8 b/cddl/usr.sbin/zfsd/zfsd.8 index 75a3333e6f9e..d6b0e1d4bd22 100644 --- a/cddl/usr.sbin/zfsd/zfsd.8 +++ b/cddl/usr.sbin/zfsd/zfsd.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2020 +.Dd February 20, 2024 .Dt ZFSD 8 .Os .Sh NAME @@ -55,7 +55,7 @@ directly. Instead, they control its behavior indirectly through zpool configuration. There are two ways to influence .Nm : -assigning hotspares and setting pool properties. +assigning hot spares and setting pool properties. Currently, only the .Em autoreplace property has any effect. @@ -69,7 +69,7 @@ will attempt to resolve the following types of fault: .It device removal When a leaf vdev disappears, .Nm -will activate any available hotspare. +will activate any available hot spare. .It device arrival When a new GEOM device appears, .Nm @@ -77,40 +77,71 @@ will attempt to read its ZFS label, if any. If it matches a previously removed vdev on an active pool, .Nm will online it. -Once resilvering completes, any active hotspare will detach automatically. +Once resilvering completes, any active hot spare will detach automatically. .Pp If the new device has no ZFS label but its physical path matches the physical path of a previously removed vdev on an active pool, and that pool has the autoreplace property set, then .Nm will replace the missing vdev with the newly arrived device. -Once resilvering completes, any active hotspare will detach automatically. +Once resilvering completes, any active hot spare will detach automatically. .It vdev degrade or fault events If a vdev becomes degraded or faulted, .Nm -will activate any available hotspare. +will activate any available hot spare. .It I/O errors -If a leaf vdev generates more than 50 I/O errors in a 60 second period, then +By default, if a leaf vdev generates more than 50 I/O errors in a 60 second +period, then +.Nm +will mark that vdev as +.Em FAULTED . +ZFS will no longer issue any I/Os to it. +.Nm +will activate a hot spare if one is available. The defaults can be changed by +setting the +.Em io_n +and/or +.Em io_t +vdev properties. See +.Xr vdevprops 7 +for details. +.It I/O delays +By default, if a leaf vdev generates more than delayed 8 I/O events in a 60 +second period, then .Nm will mark that vdev as .Em FAULTED . ZFS will no longer issue any I/Os to it. .Nm -will activate a hotspare if one is available. +will activate a hot spare if one is available. The defaults can be changed by +setting the +.Em slow_io_n +and/or +.Em slow_io_t +vdev properties. See +.Xr vdevprops 7 +for details. .It Checksum errors -If a leaf vdev generates more than 50 checksum errors in a 60 second -period, then +By default, if a leaf vdev generates more than 50 checksum errors in a 60 +second period, then .Nm will mark that vdev as .Em DEGRADED . -ZFS will still use it, but zfsd will activate a spare anyway. +ZFS will still use it, but zfsd will also activate a hot spare if one is +available. The defaults can be changed by setting the +.Em checksum_n +and/or +.Em checksum_t +vdev properties. See +.Xr vdevprops 7 +for details. .It Spare addition -If the system administrator adds a hotspare to a pool that is already degraded, +If the system administrator adds a hot spare to a pool that is already degraded, .Nm will activate the spare. .It Resilver complete .Nm -will detach any hotspare once a permanent replacement finishes resilvering. +will detach any hot spare once a permanent replacement finishes resilvering. .It Physical path change If the physical path of an existing disk changes, .Nm @@ -134,6 +165,7 @@ then reads them back in when next it starts up. .El .Sh SEE ALSO .Xr devctl 4 , +.Xr vdevprops 7 , .Xr zpool 8 .Sh HISTORY .Nm From nobody Wed Mar 6 07:43:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqPZS1pN0z5C0r1; Wed, 6 Mar 2024 07:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqPZS16Qtz4gmK; Wed, 6 Mar 2024 07:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qDt2rDvyzIRW5W+76wlbYCaV0hx5YWGGssq/IfMTVc=; b=d1hlTwUkl64sXfHT5COpSbPHKjEEDsFfU+UKJu2ZdKKGaIA/0/QGRzlRfBSbBh8ARXfHfE hIeTrVnO3Dn31ZJ9j0JGy7wWmVwpxwnOLi96gzFNoicMmkDBuYockjWEdALoe5fj3pFEUX 5AEl2w1BL/jVuFfZh4XmX9gl2PT/e0Vb3JE0H8bMumpWrnLDN7fJsMwjwpUs4q80myFXgW muHYE1G32cdhIg+sUpcz/YYRDyH5khlV9BZfQb5eGs3bs8m5V5j/va57UEZj7Nqemgzjs8 Ahd1bSb58HcSjrjk4w9DK0hQytRuKt3ofRTQoH+n3g6Q+XDSrjVFYJQ19ttvIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709711040; a=rsa-sha256; cv=none; b=V9a5Tsz/pG/iDyu9z0cV9wkxjq98OtqVZo6UrcIhyuMgceJLHUd6Ree3WeOGcXvpsmbLHJ z8xxW1mEvIJpeU9gfDyZgjq18wbz8AcKowwvqjbgmbl1VuQD0W2zrGm/urz9hirydYJGBs PsJYYhWZJkk5Cw0Ob4LINFMilUX3KyBLKgdVTYYFFb0ZRUypgBAw7jBctTfum/aS73YcsR gFfbYk8bzkP6YQTZAemhEJKdNjftK48tMeV9dC3uyer7LEazPr3O7RTZi1dZ9AZlrAN/Bw CqNtOiZiGecSVDJZzOX62sMsqHhnYQy7MftQaTky6jwwk9xxaM5YobtdgdnHQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711040; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8qDt2rDvyzIRW5W+76wlbYCaV0hx5YWGGssq/IfMTVc=; b=BswLofMB2IpbJ/KB0sdxru3Zmi18d/5TR39FVusKxuXwtHj8SFPuslLH/nvmsf6JdrshDz URWjWMPZjU0wgaejjgg0p1PJtvExuM7IfwpCGKPelYAO0VphFfrNo8MpHWuTH3m1MRwtlH Z1Hr23xGBaOjV/GK5dD1rXdNYCrq/LPoq/woZEcFk6uFuKo+o3dZirG0kIA6gXlJIwq+Vy Fe56lPHMY92ERPslWs8/WME/RRVePUxw70hlkuil8mNK9QlFUCBmAvE0yy7sIZ2ixNyIGK 8vU7ymAgcnZWitCoCyDVBzFXBdx4kcwtZt1i+gnEjEPv6o3rwEa3uFE/3sYaFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqPZS0dbhzh5R; Wed, 6 Mar 2024 07:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4267hxZQ042447; Wed, 6 Mar 2024 07:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4267hxsx042444; Wed, 6 Mar 2024 07:43:59 GMT (envelope-from git) Date: Wed, 6 Mar 2024 07:43:59 GMT Message-Id: <202403060743.4267hxsx042444@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: f3a53319f6d2 - stable/14 - sys/mount.h: align values of MNTK_XXX flags List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f3a53319f6d290cbccc74274983ee7597064e700 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f3a53319f6d290cbccc74274983ee7597064e700 commit f3a53319f6d290cbccc74274983ee7597064e700 Author: Konstantin Belousov AuthorDate: 2024-03-03 05:14:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:43:38 +0000 sys/mount.h: align values of MNTK_XXX flags (cherry picked from commit 2496fb72cf37bb9aa0cbd108ded06324ea52bd11) --- sys/sys/mount.h | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 9c36657f69f7..7a85d94cb4f2 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -481,37 +481,39 @@ struct mntoptnames { * the filesystem to cancel operations that might otherwise deadlock * with the unmount attempt (used by NFS). */ -#define MNTK_UNMOUNTF 0x00000001 /* forced unmount in progress */ -#define MNTK_ASYNC 0x00000002 /* filtered async flag */ -#define MNTK_SOFTDEP 0x00000004 /* async disabled by softdep */ -#define MNTK_NOMSYNC 0x00000008 /* don't do msync */ -#define MNTK_DRAINING 0x00000010 /* lock draining is happening */ -#define MNTK_REFEXPIRE 0x00000020 /* refcount expiring is happening */ +#define MNTK_UNMOUNTF 0x00000001 /* forced unmount in progress */ +#define MNTK_ASYNC 0x00000002 /* filtered async flag */ +#define MNTK_SOFTDEP 0x00000004 /* async disabled by softdep */ +#define MNTK_NOMSYNC 0x00000008 /* don't do msync */ +#define MNTK_DRAINING 0x00000010 /* lock draining is happening */ +#define MNTK_REFEXPIRE 0x00000020 /* refcount expiring is happening */ #define MNTK_EXTENDED_SHARED 0x00000040 /* Allow shared locking for more ops */ #define MNTK_SHARED_WRITES 0x00000080 /* Allow shared locking for writes */ -#define MNTK_NO_IOPF 0x00000100 /* Disallow page faults during reads - and writes. Filesystem shall properly - handle i/o state on EFAULT. */ +#define MNTK_NO_IOPF 0x00000100 /* Disallow page faults during reads + and writes. Filesystem shall + properly handle i/o state on + EFAULT. */ #define MNTK_RECURSE 0x00000200 /* pending recursive unmount */ #define MNTK_UPPER_WAITER 0x00000400 /* waiting to drain MNTK_UPPER_PENDING */ /* UNUSED 0x00000800 */ -#define MNTK_UNLOCKED_INSMNTQUE 0x00001000 /* fs does not lock the vnode for insmntque */ +#define MNTK_UNLOCKED_INSMNTQUE 0x00001000 /* fs does not lock the vnode for + insmntque */ #define MNTK_UNMAPPED_BUFS 0x00002000 #define MNTK_USES_BCACHE 0x00004000 /* FS uses the buffer cache. */ /* UNUSED 0x00008000 */ #define MNTK_VMSETSIZE_BUG 0x00010000 -#define MNTK_UNIONFS 0x00020000 /* A hack for F_ISUNIONSTACK */ -#define MNTK_FPLOOKUP 0x00040000 /* fast path lookup is supported */ +#define MNTK_UNIONFS 0x00020000 /* A hack for F_ISUNIONSTACK */ +#define MNTK_FPLOOKUP 0x00040000 /* fast path lookup is supported */ #define MNTK_SUSPEND_ALL 0x00080000 /* Suspended by all-fs suspension */ #define MNTK_TASKQUEUE_WAITER 0x00100000 /* Waiting on unmount taskqueue */ /* UNUSED 0x00200000 */ /* UNUSED 0x00400000 */ -#define MNTK_NOASYNC 0x00800000 /* disable async */ -#define MNTK_UNMOUNT 0x01000000 /* unmount in progress */ -#define MNTK_MWAIT 0x02000000 /* waiting for unmount to finish */ -#define MNTK_SUSPEND 0x08000000 /* request write suspension */ -#define MNTK_SUSPEND2 0x04000000 /* block secondary writes */ -#define MNTK_SUSPENDED 0x10000000 /* write operations are suspended */ +#define MNTK_NOASYNC 0x00800000 /* disable async */ +#define MNTK_UNMOUNT 0x01000000 /* unmount in progress */ +#define MNTK_MWAIT 0x02000000 /* waiting for unmount to finish */ +#define MNTK_SUSPEND 0x08000000 /* request write suspension */ +#define MNTK_SUSPEND2 0x04000000 /* block secondary writes */ +#define MNTK_SUSPENDED 0x10000000 /* write operations are suspended */ #define MNTK_NULL_NOCACHE 0x20000000 /* auto disable cache for nullfs mounts over this fs */ #define MNTK_LOOKUP_SHARED 0x40000000 /* FS supports shared lock lookups */ From nobody Wed Mar 6 07:50:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqPkG3NYfz5C1XT; Wed, 6 Mar 2024 07:50: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 4TqPkG2vD7z4hlG; Wed, 6 Mar 2024 07:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BhCETrMUHG+HZrKmNfzDmXKqaQgv12lFoii6EvdjizE=; b=eTFyJDrg+sHGjCFIBGJ1G8YcuA71a7YyZRzvegTE6KSX2udu1MnoTF1sXzBNLDbeMcws+Q 6NUFg8xwxwcv9NzGzSXH+45Kirb1OGYyw8jqPJIS7V/eBlyeAY9So3GbSIcxtZbDGnL9WL BNUs72NzHZvVrta0dUVOy3tAUftOqNMyhHPU0XnONQ+SEgPMljtclE+42YfJkxjDu4UwYC pDITa3ofDM4pcTGoBTMU+HILuVj+9c50NHsk/AYtYtN4S45o2aJl+RPbjM0M3P/9CiSImH 2eDTFIYEnMrpQ7rucCg2xv/XiYOpfJ0NrVJZX+GSecq2naTaCripQ2S4pfsk8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709711446; a=rsa-sha256; cv=none; b=tqP7mL3zjrv9SpmzV31XTZG3GEz0us8bLf9xKMHxPzG7R7Ihi2yDElBHVngodKFEeAmEs3 vg9T5HedelWZ2bdG3NcF7j2Ua9bvcAIaVDxYFb40xzv81qEcpeLzhs2BhJWGz0peFkkG8a fg9gHODK04bvQ5fEbIM4A9kvSxTTox6OMyJHth1Ly+rY9x1SbdFHal92oSAx760W9kzrHu F/LX9neI7s+DcZZDwM0wbrr0NxtwjlJnpYhO9EZoYT2Yx8wuOrNrYWmV0Wvd1597xw/dA7 moHe/M030RLWSxm3Slwb9OUs68wBqICNT5JUZDgdJsUutQ+DnMyZsUQIeZmT5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BhCETrMUHG+HZrKmNfzDmXKqaQgv12lFoii6EvdjizE=; b=DbLMB/FFocBjGtnWTQJ+ROF9JbNliC3jiT2K3g251hsDbEQO3INUeFX/LY1o2igVi7vQ2U 6oP3eOs2dbWM6F91NiEn7T+bQt5mHrodUopVrHDOY/ZhnSDNDr5FM1v0LT5LuHn/kf/9aC beWT50xzqzX5wrtgqsSFOsOtwQma3fu/2H6XVlwk5bowH0xFfkJfcDcSMe/AII81vv3xAJ sAY1PafMn2yQFsiwgHkZUaBxUZR6BaA8zMBiXgCWA2WHIw1nB4ItuXvuUD6/knCi+xkkPd VT1g3ujPpNDHza89JA6x8SgwZlhmS8zrhASkJtFiFF+IxiOyxQWbDIcdxeaY5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqPkG2SfDzhSV; Wed, 6 Mar 2024 07:50:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4267okFs054348; Wed, 6 Mar 2024 07:50:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4267okfN054345; Wed, 6 Mar 2024 07:50:46 GMT (envelope-from git) Date: Wed, 6 Mar 2024 07:50:46 GMT Message-Id: <202403060750.4267okfN054345@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ebaf907114aa - main - posix_spawn.c: fix typo in comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebaf907114aa6bda49be4204185072571396bb0d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ebaf907114aa6bda49be4204185072571396bb0d commit ebaf907114aa6bda49be4204185072571396bb0d Author: Konstantin Belousov AuthorDate: 2024-03-06 06:19:16 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:25:02 +0000 posix_spawn.c: fix typo in comment Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libc/gen/posix_spawn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index 4726416f1d02..d405517ba68d 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -329,7 +329,7 @@ do_posix_spawn(pid_t *pid, const char *path, #ifdef _RFORK_THREAD_STACK_SIZE /* * x86 stores the return address on the stack, so rfork(2) cannot work - * as-is because the child would clobber the return address om the + * as-is because the child would clobber the return address of the * parent. Because of this, we must use rfork_thread instead while * almost every other arch stores the return address in a register. */ From nobody Wed Mar 6 07:50:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqPkH66Mdz5C1XX; Wed, 6 Mar 2024 07:50: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 4TqPkH3cLWz4hWq; Wed, 6 Mar 2024 07:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxkEeKMq+DPv+T9IE42N7YrqsNECkpIF1Lx6Qg2lnJA=; b=dTZittuGVsXT5PPrjZGpNjj6y7euocpGHeZ+z/WuigC/RNN6VgZ7UggpHvQD7RPrUq64rG EhWjmED2B+OLGKHMfi24uy4nbdKl+owEiuOmZc9B1TI8m+FVswEtQ5OtYgTazKzJN2n4eq WeWzFs+uRD2KoYo7jkImPOhxvd4DPVt5PLHT5GBQ/mYcoXONg1o1Mj34wWOxTMG3xwtcj4 FNGuGobgdtod+UhIDcRAus4a0IGlJg89RW10JKvMM0LV/9tS6hO+Qcx+Loi5jTFXtgCSoJ bDCyydXE29kjie9fUwhfcmp7SUIgHd6U4QFCtiPzDJrPjLEcEMYiBD444UDQog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709711447; a=rsa-sha256; cv=none; b=S5Gebk9dg+IGfigj00mWgppYjrlcXiFjrMJT6S1IEH5rZ3iKsCpROl3z2gTw4l4Q2V+Hna eXgSZlV0jceMHQORLd3l+uNjrwGk7gofo6sBAeXMz1EWQ90gU70PqNoofi/8VOePeLotXb wNZPApoHU/JAOI45VHsgyJKRBvLId3JKC2Px7hoP9SXnPqWWTMlLmpSdTNweS+apjvw5Vu vnOBU3sO89pvkr4Ww0BUYXOEySL8DaiyZPQSXzPXJr9WH7azO++EWK/o2QDTeX1QrXqrvv c+BwpqZMBHdSveWhyFk+koyNp07ov4/eI9DR5LJvxPtZwNfzsyvtexMJTyd8/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RxkEeKMq+DPv+T9IE42N7YrqsNECkpIF1Lx6Qg2lnJA=; b=gtkSOdndTbo75AfCCy+ibe9kHMTlxL4Eu+kllgzU9GoUCQ3PeaXyVi2ChyeqGol+2SKUe8 V9Y6kJUds6btn9oH2knTH1n+aDnLFhA9+NQIsa9IGvwJ4dr1RllbN8zz/sf/oRFkp/VHpY +buWjrgrwiU6EyR0jmFNT/6mzDS3LBCVZEXXXYH5VMy9YORlxL6tkFEq2TQHofr5dUKouO neK/KxY8dzqt+1WDRY3A2emCufhY1G7z7/0Y4W8M1GBKanhmFLux3iMue3urCdPCXCNDpx qmzs5yBmiqPOa4kXzDPz+fuhIe42srpM4NSbzSPRoXPKq5xZqqvQmvy6DJam8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqPkH3CmGzhSW; Wed, 6 Mar 2024 07:50:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4267ol1C054390; Wed, 6 Mar 2024 07:50:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4267ol6h054387; Wed, 6 Mar 2024 07:50:47 GMT (envelope-from git) Date: Wed, 6 Mar 2024 07:50:47 GMT Message-Id: <202403060750.4267ol6h054387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: f8bbbce45819 - main - libthr: remove explicit sys/cdefs.h includes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8bbbce458194ff4312c610d32a64ff4a3a71d45 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f8bbbce458194ff4312c610d32a64ff4a3a71d45 commit f8bbbce458194ff4312c610d32a64ff4a3a71d45 Author: Konstantin Belousov AuthorDate: 2024-03-06 07:06:35 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:25:13 +0000 libthr: remove explicit sys/cdefs.h includes Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libthr/Makefile | 5 ----- lib/libthr/thread/thr_affinity.c | 1 - lib/libthr/thread/thr_attr.c | 1 - lib/libthr/thread/thr_autoinit.c | 1 - lib/libthr/thread/thr_barrier.c | 1 - lib/libthr/thread/thr_barrierattr.c | 1 - lib/libthr/thread/thr_cancel.c | 1 - lib/libthr/thread/thr_clean.c | 1 - lib/libthr/thread/thr_concurrency.c | 1 - lib/libthr/thread/thr_cond.c | 1 - lib/libthr/thread/thr_condattr.c | 1 - lib/libthr/thread/thr_create.c | 1 - lib/libthr/thread/thr_detach.c | 1 - lib/libthr/thread/thr_equal.c | 1 - lib/libthr/thread/thr_event.c | 1 - lib/libthr/thread/thr_exit.c | 1 - lib/libthr/thread/thr_fork.c | 1 - lib/libthr/thread/thr_getcpuclockid.c | 1 - lib/libthr/thread/thr_getprio.c | 1 - lib/libthr/thread/thr_getschedparam.c | 1 - lib/libthr/thread/thr_getthreadid_np.c | 1 - lib/libthr/thread/thr_info.c | 1 - lib/libthr/thread/thr_init.c | 1 - lib/libthr/thread/thr_join.c | 1 - lib/libthr/thread/thr_kill.c | 1 - lib/libthr/thread/thr_main_np.c | 1 - lib/libthr/thread/thr_multi_np.c | 1 - lib/libthr/thread/thr_mutex.c | 1 - lib/libthr/thread/thr_mutexattr.c | 1 - lib/libthr/thread/thr_once.c | 1 - lib/libthr/thread/thr_printf.c | 1 - lib/libthr/thread/thr_private.h | 1 - lib/libthr/thread/thr_pspinlock.c | 1 - lib/libthr/thread/thr_resume_np.c | 1 - lib/libthr/thread/thr_rtld.c | 2 -- lib/libthr/thread/thr_rwlock.c | 1 - lib/libthr/thread/thr_rwlockattr.c | 1 - lib/libthr/thread/thr_self.c | 1 - lib/libthr/thread/thr_sem.c | 1 - lib/libthr/thread/thr_setprio.c | 1 - lib/libthr/thread/thr_setschedparam.c | 1 - lib/libthr/thread/thr_sig.c | 1 - lib/libthr/thread/thr_single_np.c | 1 - lib/libthr/thread/thr_sleepq.c | 1 - lib/libthr/thread/thr_spec.c | 1 - lib/libthr/thread/thr_suspend_np.c | 1 - lib/libthr/thread/thr_switch_np.c | 1 - lib/libthr/thread/thr_syscalls.c | 1 - lib/libthr/thread/thr_umtx.c | 1 - lib/libthr/thread/thr_yield.c | 1 - 50 files changed, 55 deletions(-) diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 46b547e8da85..a5bf5da44170 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -1,8 +1,3 @@ -# -# All library objects contain FreeBSD revision strings by default; they may be -# excluded as a space-saving measure. To produce a library that does -# not contain these strings, add -DSTRIP_FBSDID (see ) to CFLAGS -# below. PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/libthr/thread/thr_affinity.c b/lib/libthr/thread/thr_affinity.c index 89f654ebffc2..78c89e146a79 100644 --- a/lib/libthr/thread/thr_affinity.c +++ b/lib/libthr/thread/thr_affinity.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_attr.c b/lib/libthr/thread/thr_attr.c index 3c03225c33cb..1d0bc8cb7b91 100644 --- a/lib/libthr/thread/thr_attr.c +++ b/lib/libthr/thread/thr_attr.c @@ -93,7 +93,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_autoinit.c b/lib/libthr/thread/thr_autoinit.c index f18f53517e06..b0b4e601eff7 100644 --- a/lib/libthr/thread/thr_autoinit.c +++ b/lib/libthr/thread/thr_autoinit.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include #include "thr_private.h" diff --git a/lib/libthr/thread/thr_barrier.c b/lib/libthr/thread/thr_barrier.c index 8f5936409c05..13dec864e2f6 100644 --- a/lib/libthr/thread/thr_barrier.c +++ b/lib/libthr/thread/thr_barrier.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_barrierattr.c b/lib/libthr/thread/thr_barrierattr.c index 7af7e40f9159..6e5de86973f2 100644 --- a/lib/libthr/thread/thr_barrierattr.c +++ b/lib/libthr/thread/thr_barrierattr.c @@ -28,7 +28,6 @@ * DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_cancel.c b/lib/libthr/thread/thr_cancel.c index 86632e41449b..b1b95e54b46f 100644 --- a/lib/libthr/thread/thr_cancel.c +++ b/lib/libthr/thread/thr_cancel.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include "un-namespace.h" diff --git a/lib/libthr/thread/thr_clean.c b/lib/libthr/thread/thr_clean.c index ba699f0376d8..43fd570fd1df 100644 --- a/lib/libthr/thread/thr_clean.c +++ b/lib/libthr/thread/thr_clean.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_concurrency.c b/lib/libthr/thread/thr_concurrency.c index cc0d1075b92d..64c605f7d058 100644 --- a/lib/libthr/thread/thr_concurrency.c +++ b/lib/libthr/thread/thr_concurrency.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_cond.c b/lib/libthr/thread/thr_cond.c index bec7933537b3..c1cbd546350e 100644 --- a/lib/libthr/thread/thr_cond.c +++ b/lib/libthr/thread/thr_cond.c @@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_condattr.c b/lib/libthr/thread/thr_condattr.c index c5f675f0023d..0dc3e52bab5e 100644 --- a/lib/libthr/thread/thr_condattr.c +++ b/lib/libthr/thread/thr_condattr.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_create.c b/lib/libthr/thread/thr_create.c index 4b9f45ac49de..4de9bd84ca5b 100644 --- a/lib/libthr/thread/thr_create.c +++ b/lib/libthr/thread/thr_create.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_detach.c b/lib/libthr/thread/thr_detach.c index 214d5e76262e..c7a60bb26129 100644 --- a/lib/libthr/thread/thr_detach.c +++ b/lib/libthr/thread/thr_detach.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_equal.c b/lib/libthr/thread/thr_equal.c index 2a4cc9f6d049..e5b2ab881138 100644 --- a/lib/libthr/thread/thr_equal.c +++ b/lib/libthr/thread/thr_equal.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include "un-namespace.h" diff --git a/lib/libthr/thread/thr_event.c b/lib/libthr/thread/thr_event.c index afe0b307423c..f0b1805894fb 100644 --- a/lib/libthr/thread/thr_event.c +++ b/lib/libthr/thread/thr_event.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "thr_private.h" void diff --git a/lib/libthr/thread/thr_exit.c b/lib/libthr/thread/thr_exit.c index 001b30f6671a..5a9dcf99fa21 100644 --- a/lib/libthr/thread/thr_exit.c +++ b/lib/libthr/thread/thr_exit.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #ifdef _PTHREAD_FORCED_UNWIND diff --git a/lib/libthr/thread/thr_fork.c b/lib/libthr/thread/thr_fork.c index fc7d77180e8b..614841cc314f 100644 --- a/lib/libthr/thread/thr_fork.c +++ b/lib/libthr/thread/thr_fork.c @@ -57,7 +57,6 @@ * */ -#include #include #include "namespace.h" #include diff --git a/lib/libthr/thread/thr_getcpuclockid.c b/lib/libthr/thread/thr_getcpuclockid.c index 0281fc626882..dee3a2a9447a 100644 --- a/lib/libthr/thread/thr_getcpuclockid.c +++ b/lib/libthr/thread/thr_getcpuclockid.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_getprio.c b/lib/libthr/thread/thr_getprio.c index 5ab147af212c..d338287342ac 100644 --- a/lib/libthr/thread/thr_getprio.c +++ b/lib/libthr/thread/thr_getprio.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_getschedparam.c b/lib/libthr/thread/thr_getschedparam.c index 557bcc834950..3abe9be6937b 100644 --- a/lib/libthr/thread/thr_getschedparam.c +++ b/lib/libthr/thread/thr_getschedparam.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_getthreadid_np.c b/lib/libthr/thread/thr_getthreadid_np.c index 1fe927435b02..ade332519dfb 100644 --- a/lib/libthr/thread/thr_getthreadid_np.c +++ b/lib/libthr/thread/thr_getthreadid_np.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_info.c b/lib/libthr/thread/thr_info.c index 41ab7f0bcf0c..f6bf81203f9c 100644 --- a/lib/libthr/thread/thr_info.c +++ b/lib/libthr/thread/thr_info.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index b59678c3f6c3..007cf5be81c9 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -33,7 +33,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_join.c b/lib/libthr/thread/thr_join.c index 4b48249489f6..53f28daa258d 100644 --- a/lib/libthr/thread/thr_join.c +++ b/lib/libthr/thread/thr_join.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_kill.c b/lib/libthr/thread/thr_kill.c index dd7beddd5c33..5fb40b3bc496 100644 --- a/lib/libthr/thread/thr_kill.c +++ b/lib/libthr/thread/thr_kill.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_main_np.c b/lib/libthr/thread/thr_main_np.c index 9dd8b1820acd..1d34dc21b84c 100644 --- a/lib/libthr/thread/thr_main_np.c +++ b/lib/libthr/thread/thr_main_np.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_multi_np.c b/lib/libthr/thread/thr_multi_np.c index cbd3f31fddf0..bac58ca85dca 100644 --- a/lib/libthr/thread/thr_multi_np.c +++ b/lib/libthr/thread/thr_multi_np.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_mutex.c b/lib/libthr/thread/thr_mutex.c index 5dd624a269e4..ca8971cc720a 100644 --- a/lib/libthr/thread/thr_mutex.c +++ b/lib/libthr/thread/thr_mutex.c @@ -38,7 +38,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_mutexattr.c b/lib/libthr/thread/thr_mutexattr.c index 6d38f164df52..d78aad518ee8 100644 --- a/lib/libthr/thread/thr_mutexattr.c +++ b/lib/libthr/thread/thr_mutexattr.c @@ -59,7 +59,6 @@ * */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_once.c b/lib/libthr/thread/thr_once.c index 065781907771..89b76ee58c1e 100644 --- a/lib/libthr/thread/thr_once.c +++ b/lib/libthr/thread/thr_once.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include "un-namespace.h" diff --git a/lib/libthr/thread/thr_printf.c b/lib/libthr/thread/thr_printf.c index 5304cc00c5c8..e1edffe5acb2 100644 --- a/lib/libthr/thread/thr_printf.c +++ b/lib/libthr/thread/thr_printf.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h index 3fc4d02c611e..e590fb0c1e7a 100644 --- a/lib/libthr/thread/thr_private.h +++ b/lib/libthr/thread/thr_private.h @@ -37,7 +37,6 @@ */ #include #include -#include #include #include #include diff --git a/lib/libthr/thread/thr_pspinlock.c b/lib/libthr/thread/thr_pspinlock.c index 37f14d22909d..4820490ab6af 100644 --- a/lib/libthr/thread/thr_pspinlock.c +++ b/lib/libthr/thread/thr_pspinlock.c @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_resume_np.c b/lib/libthr/thread/thr_resume_np.c index 6dac28ab1f4b..1e69bfa7358b 100644 --- a/lib/libthr/thread/thr_resume_np.c +++ b/lib/libthr/thread/thr_resume_np.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_rtld.c b/lib/libthr/thread/thr_rtld.c index 767b4735e1fa..54560a2f7df2 100644 --- a/lib/libthr/thread/thr_rtld.c +++ b/lib/libthr/thread/thr_rtld.c @@ -26,11 +26,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* * A lockless rwlock for rtld. */ -#include #include #include #include diff --git a/lib/libthr/thread/thr_rwlock.c b/lib/libthr/thread/thr_rwlock.c index f8d5fa4f673f..b482dc8b732a 100644 --- a/lib/libthr/thread/thr_rwlock.c +++ b/lib/libthr/thread/thr_rwlock.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/lib/libthr/thread/thr_rwlockattr.c b/lib/libthr/thread/thr_rwlockattr.c index 068ad7d3acbf..34bbbb20e611 100644 --- a/lib/libthr/thread/thr_rwlockattr.c +++ b/lib/libthr/thread/thr_rwlockattr.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_self.c b/lib/libthr/thread/thr_self.c index f5b1ce8fdb98..cbdadb13ccc4 100644 --- a/lib/libthr/thread/thr_self.c +++ b/lib/libthr/thread/thr_self.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include "un-namespace.h" diff --git a/lib/libthr/thread/thr_sem.c b/lib/libthr/thread/thr_sem.c index c7b5ac009a8c..76180604c183 100644 --- a/lib/libthr/thread/thr_sem.c +++ b/lib/libthr/thread/thr_sem.c @@ -30,7 +30,6 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_setprio.c b/lib/libthr/thread/thr_setprio.c index 6ee60ffeb205..fddf664457bd 100644 --- a/lib/libthr/thread/thr_setprio.c +++ b/lib/libthr/thread/thr_setprio.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include "un-namespace.h" diff --git a/lib/libthr/thread/thr_setschedparam.c b/lib/libthr/thread/thr_setschedparam.c index e3e4174c753b..49ec2ae7a7fd 100644 --- a/lib/libthr/thread/thr_setschedparam.c +++ b/lib/libthr/thread/thr_setschedparam.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c index e082f0601be1..ad291d106001 100644 --- a/lib/libthr/thread/thr_sig.c +++ b/lib/libthr/thread/thr_sig.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_single_np.c b/lib/libthr/thread/thr_single_np.c index e772fb5d3bb7..3aa7adba954d 100644 --- a/lib/libthr/thread/thr_single_np.c +++ b/lib/libthr/thread/thr_single_np.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_sleepq.c b/lib/libthr/thread/thr_sleepq.c index b3feef8c9381..d7de9ab4e25a 100644 --- a/lib/libthr/thread/thr_sleepq.c +++ b/lib/libthr/thread/thr_sleepq.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include "thr_private.h" diff --git a/lib/libthr/thread/thr_spec.c b/lib/libthr/thread/thr_spec.c index ee58bb37f6f7..44a124785085 100644 --- a/lib/libthr/thread/thr_spec.c +++ b/lib/libthr/thread/thr_spec.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_suspend_np.c b/lib/libthr/thread/thr_suspend_np.c index b594ea562480..b272c7b2a169 100644 --- a/lib/libthr/thread/thr_suspend_np.c +++ b/lib/libthr/thread/thr_suspend_np.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_switch_np.c b/lib/libthr/thread/thr_switch_np.c index cbf959f161e3..80cd34c15650 100644 --- a/lib/libthr/thread/thr_switch_np.c +++ b/lib/libthr/thread/thr_switch_np.c @@ -32,7 +32,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_syscalls.c b/lib/libthr/thread/thr_syscalls.c index 31b686c1d064..c931f2cc310e 100644 --- a/lib/libthr/thread/thr_syscalls.c +++ b/lib/libthr/thread/thr_syscalls.c @@ -65,7 +65,6 @@ * */ -#include #include "namespace.h" #include #include diff --git a/lib/libthr/thread/thr_umtx.c b/lib/libthr/thread/thr_umtx.c index c6a032c773db..bbc68d0e30c6 100644 --- a/lib/libthr/thread/thr_umtx.c +++ b/lib/libthr/thread/thr_umtx.c @@ -26,7 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "thr_private.h" #include "thr_umtx.h" diff --git a/lib/libthr/thread/thr_yield.c b/lib/libthr/thread/thr_yield.c index b391e69cabc1..057fc789de02 100644 --- a/lib/libthr/thread/thr_yield.c +++ b/lib/libthr/thread/thr_yield.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include "namespace.h" #include #include From nobody Wed Mar 6 07:50:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqPkJ6JV1z5C1K9; Wed, 6 Mar 2024 07:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqPkJ4kw1z4hfm; Wed, 6 Mar 2024 07:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDkqyFKrLOaYCTs5H3/YAly7qBAEVVtReDFlYzPU5NM=; b=YKwkIG7CwsbEyBpXspT5D4GMD+5FIAYPhAFyH4VaOBPkBjHPpcICKrj9ZDNz1W0xG8SQW3 jmlqqLCxTRIW+DOKAJ72xujvQNbkwKGin5cfOtcJIGnehDWnyzI4K3OTGz4QB2KlFsFKrJ C5fMDbNAGvOSzE2AsTeGia1SWXsqhYWY0iJnilbahYDFi0hHnklYAV3DdYG3jWVqWfGrFM YK5RBdlmjCess5eHJjdYsYItwPkmw5aIW+Z/p1ECPEXujIP0YLnLRhwBiblLdExtQpcBog YolDgKy1jUnjEaDCH3FcJjn4zbe96Xe5z54Hg18H5XFL+wn/WDJtLROHXBu9ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709711448; a=rsa-sha256; cv=none; b=caWvJKgCk9hFtAdSGipg1nmR+XLxDFsCGsQOgNEvG3iwEghvNNaL1BFWYvpm3A5Nf5uQDB ZSXoxZbE7NE504AxIporjbU5FK9BseQxc5IdC/spAtqDkGg4s1+NPSdUOesJXGLleaq+Gb sA6HH+39ZYwHSm77f6SOnQyH2a3Zfq2iBJ9/YaEz634hMtsfwDuSDHIuYJl2T8zTGBA6Xf W+aIFcqtk1CpIXbeDDfmd8FsVFydbUoCkOk5Yrnl7K9ATQdqKIneAAnEdfgvOLMibM7VKk gYMWMIiKgDRJro++R2G0H1MumwSJ97Nvocx0OiQ+z9kjQryedpkYSTB4Rl8v2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709711448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDkqyFKrLOaYCTs5H3/YAly7qBAEVVtReDFlYzPU5NM=; b=S0SiVXNbNu0SU3wydf2CqcmuWhq+IYkVCjCf1rpcddVoT6uJN8Ehf+Zy5dxbpHk+yC3E0s llzOZXllt30cKYME0lHZuJt6rfoO77k2K7TkGe06QETbYFOdIUDEhhVtZoyN2wRpooxie6 9k95+TFmNiPg3ze7gsZSNgnD6c6w5e2XjS2XgxbLCWkj79hvpDqxzNCVjzMFTJG7aL0eNm P+2jUXY9lNy27E2Pv8GaLNYfDHQmZ8PoKZlfRmBhLXqng1+dfL7R5asukD6z/7c45/WIxy XTNqZulKTgBUfwwDxmSHHTA8mswECgH1k6zeBNlZrfcwu1tCrKJ7efqxF7DvLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqPkJ4Hf8zh5X; Wed, 6 Mar 2024 07:50:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4267omM4054447; Wed, 6 Mar 2024 07:50:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4267omhK054444; Wed, 6 Mar 2024 07:50:48 GMT (envelope-from git) Date: Wed, 6 Mar 2024 07:50:48 GMT Message-Id: <202403060750.4267omhK054444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2ce23b1f7672 - main - libc posix_spawn(): explain why rtld can be used after fork List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ce23b1f76721e44646fc98ba4e24a113a6d5972 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce23b1f76721e44646fc98ba4e24a113a6d5972 commit 2ce23b1f76721e44646fc98ba4e24a113a6d5972 Author: Konstantin Belousov AuthorDate: 2024-03-06 07:24:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:25:14 +0000 libc posix_spawn(): explain why rtld can be used after fork Sponsored by: The FreeBSD Foundation MFC after: 1 week --- lib/libc/gen/posix_spawn.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c index d405517ba68d..ee2ce05ff317 100644 --- a/lib/libc/gen/posix_spawn.c +++ b/lib/libc/gen/posix_spawn.c @@ -325,6 +325,11 @@ do_posix_spawn(pid_t *pid, const char *path, * ideal vfork(2) if we get an EINVAL from rfork -- this should only * happen with newer libc on older kernel that doesn't accept * RFSPAWN. + * + * Combination of vfork() (or its equivalent rfork() form) and + * a special property of the libthr rtld locks ensure that + * rtld is operational in the child. In particular, libthr + * rtld locks do not store owner' tid into the lock word. */ #ifdef _RFORK_THREAD_STACK_SIZE /* From nobody Wed Mar 6 08:33:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqQgc5DZXz5C5GQ; Wed, 6 Mar 2024 08:33: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 4TqQgc4cNPz4mjY; Wed, 6 Mar 2024 08:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709714012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kToyZnByS889oBMW41Q0cR8BDBJCkpXXWMLuyNQwlIs=; b=hVZDShPemuZGd9MKa89KfMRYr1uApvZNOraZgUhQlArjkGyPauIWXZLnTOqdXi2ZKCUOmc zZ3mykEq+Yzx2nsOBsqxoq5G5/dXHpmt6PIYOQYMtNzXH/X8njEu80VgmovB000Yv+K0Ny oABfd3jyj/kzTtDnUkepZ8/m2D0V7/5WVFoDvAua/HAk5WDq3W0VxAFw92axUq+4CC1qui 4aM1lVxH2aBtZUOY8ESH7mfjCni7j17A5M9wmd2VD6f4UtBVMR33ZbJBU/rwYgnL3z0QHQ xOrwgad3kUzsLqzvIml16kzT8PXKpZmKFYZ/Yz2wki/rGRFQfj0S+ayAe+iV/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709714012; a=rsa-sha256; cv=none; b=hDLRh7icA6N/2nGMDUSIEcZg/6ZOlmVc/Z9lvBVXIz37BEN1ERKdJvFVoBpFq+8WXQv5pI hGXG7+JN+T4dr2Cu64BdzuJzwPx2OT11ava28BBYKzGYH6U3xL4AxFXw3xLIUgGVa3UtCa wLp9M8995yJ1QdO75KbHrbXfoQvcdQ4Ujp5j8za+jPV5BLXkw1Pyw7h7JK6idU1llGx9IU CTbTGf/ONUqUTvBoZgThcOxGjdU/rJHq88aVKzrRaOLEFMOSzouhHvL5ufljJ9SkP1L0YU JzRI1O+d4cDhyE8cjNhcfv/H623EPo2EGYHBebSOfLv8BtgRe7Rgr2jFuvjwQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709714012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kToyZnByS889oBMW41Q0cR8BDBJCkpXXWMLuyNQwlIs=; b=cw8mE5M8muhRYUtDN6OB+jrqQ7HF1ZJOoJLLv3SC/JEhcKvBBIDXav+Jdy1jXb016k3OAp xt6O9X2q0F5gmx9Zig/2jPoZSbdj7uyf9FDkI2dLgWEdv2XohHqV6AFNtZ+WHPyx7lod0f ZibnQyYqdeFwk4gUNtBJmd6l9IzjVAWjPwAqr9jeOcc4k5SFjGb82u2DtyimFRfVuMl4TI 6+HpTKaY7MhWpD2DJEzM86qzyteLXiPx1emVu2iB8FWtelUXcwFlUzn9/Fzj8ZzDDQpPz0 D9XFXgRWyI1D68D2932/zzd51UwKcBRR6g5kP1E7lNZS/e7JjEqh3qtskqXJ0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqQgc4DFkzjGL; Wed, 6 Mar 2024 08:33:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4268XWsx027919; Wed, 6 Mar 2024 08:33:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4268XWZn027916; Wed, 6 Mar 2024 08:33:32 GMT (envelope-from git) Date: Wed, 6 Mar 2024 08:33:32 GMT Message-Id: <202403060833.4268XWZn027916@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: 1975c745e3ac - stable/14 - Revert "md5.1: Fix an example" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 1975c745e3ac9b623f0ccc58b343328262c691b9 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=1975c745e3ac9b623f0ccc58b343328262c691b9 commit 1975c745e3ac9b623f0ccc58b343328262c691b9 Author: Gordon Bergling AuthorDate: 2024-03-06 08:33:19 +0000 Commit: Gordon Bergling CommitDate: 2024-03-06 08:33:19 +0000 Revert "md5.1: Fix an example" This reverts commit 38a5635de99f3a3ab5f6ec07d2896ee7ffdb8826. --- sbin/md5/md5.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1 index 88b795da74b1..0a8dc46f3b1f 100644 --- a/sbin/md5/md5.1 +++ b/sbin/md5/md5.1 @@ -1,4 +1,4 @@ -.Dd February 28, 2024 +.Dd February 13, 2024 .Dt MD5 1 .Os .Sh NAME @@ -367,7 +367,7 @@ for .Pa /boot/loader.conf in the example above. .Bd -literal -offset indent -$ md5sum -c digest /boot/loader.conf +$ md5 -c digest /boot/loader.conf /boot/loader.conf: OK .Ed .Pp From nobody Wed Mar 6 08:34:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqQhw3qJfz5C5Ry; Wed, 6 Mar 2024 08:34: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 4TqQhw3L8Fz4mrP; Wed, 6 Mar 2024 08:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709714080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0DdqHubnh9uGUW5oE2XdiHh31/cgxg1dPOw0kgqX5o=; b=ilyfVMAxSz2xAan1rwJObm2AZiH0ONFHcagSh0yfPFBpfOd9FcHgMs0vsHuMc2u3S0RNnA gPvjMYUqaw6R01oMeMl0v3KUw0yGMEQRKURS7QloJc4Bv3EhTNnw0H8m+smfxN5A/53vzH BspjZEkhcj+9g8OytwTP+8m9neIjpGo2AAxSrXQWrcSBpqboDhBOkpQLKDFgfzGFtKNEwe 2fHZIT6rARYe98/LZRaCXVAUdyz83bV7GYhbCXIvQi0sKX6gcctXGef+cgtegz00V/WdfC LDqtQEPIHPbYtDUS/ULwb9l75jwelbvEYr8VKTIH3NYa7PvH8bF55IsMHElM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709714080; a=rsa-sha256; cv=none; b=qiBU0xOUUPkIM7CZ2elza1pfwg9O3+u7wKrVuMwHNvQxjQR5/Fx4gSxwbVuLah2HI5+pJa aNExdZ81TTr2Apmt/ZPixSQR/uDBXYm6UJB3xNpKbqcB6K1xhdafuG10kHslugOsYjDH+0 S023vWDjHKWsaF+kjB0ZkRn89q1Amy0U37rDJjlW4LUkTAqqzsMVnL5A+27sbIJagSHo2g ggHGRnt26fSvQJZoYb07h+vrr5rICXU8RPyFattYbNeDoDCFAloVk9lhC2087P9Goe4f7p k6/CLhdIhB2HLv6TtkA5F8rPGDmnaSuNMLn2GsTA9RVooDuQUFBWYHQBhcaPlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709714080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0DdqHubnh9uGUW5oE2XdiHh31/cgxg1dPOw0kgqX5o=; b=cEokA4izbO7fBEiDFbRyVF3S267xrFKigEBD/19+IGbqkgecOoqRXHfG9SOfi4DtUXQKox OmrYmYZRK7RtsRlyO17sxepsczDtbQYmNZXiiZiiyAGwscoVdJumtYictA1z34SH2mbDTr AR/wXWxmWa1txBzCQLvHP2AOlqIMCWemf98kqrZ6Y9j7tIw2P/JzRKAoONyjXjlWI5ofiS GUimP4QLJVT2qxcPx8x0NQVIiXH75P+9z8gKFt3sWhzcJ+8M68hPcg55lEM5H/cUeJHpZW 3ROM1HE3mFjcwFsBPC5GiT30LuygoSeYVyNP110XsgyAlUNvX9xkhY7makpz+w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqQhw2xwJzjcf; Wed, 6 Mar 2024 08:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4268YePc028205; Wed, 6 Mar 2024 08:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4268YeUM028202; Wed, 6 Mar 2024 08:34:40 GMT (envelope-from git) Date: Wed, 6 Mar 2024 08:34:40 GMT Message-Id: <202403060834.4268YeUM028202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a44658281abe - main - Revert "md5.1: Fix an example" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a44658281abe1e609a1e13a241fe5ea74a110e7d Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a44658281abe1e609a1e13a241fe5ea74a110e7d commit a44658281abe1e609a1e13a241fe5ea74a110e7d Author: Gordon Bergling AuthorDate: 2024-03-06 08:34:30 +0000 Commit: Gordon Bergling CommitDate: 2024-03-06 08:34:30 +0000 Revert "md5.1: Fix an example" This reverts commit 865baeaf1abeb14327ad6a4a1f8ce722e242ff73. --- sbin/md5/md5.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1 index 88b795da74b1..0a8dc46f3b1f 100644 --- a/sbin/md5/md5.1 +++ b/sbin/md5/md5.1 @@ -1,4 +1,4 @@ -.Dd February 28, 2024 +.Dd February 13, 2024 .Dt MD5 1 .Os .Sh NAME @@ -367,7 +367,7 @@ for .Pa /boot/loader.conf in the example above. .Bd -literal -offset indent -$ md5sum -c digest /boot/loader.conf +$ md5 -c digest /boot/loader.conf /boot/loader.conf: OK .Ed .Pp From nobody Wed Mar 6 09:44:04 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqSF06325z5CCgJ for ; Wed, 6 Mar 2024 09:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqSF04Rfjz4tYW; Wed, 6 Mar 2024 09:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709718244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b0RigiBlm5e3KtxftnEh2GvWnzaX+f5siJj7Tzl3bG8=; b=q4k9/GS66y5Ng0biVcZQSpxhVqaX83WY1sxo02r8usUumDrgpqr+4AQGlcXkALJlG93FtT Uy2aDPz8wQDtaD/9MhB5/M0BL/0nIyBD1O7qMMZIObD6f6Ro92NyaZEsGDTNRrVAew944y XhJ80kvwGLmnC53iGoTatkkJsbr1TAuypgOkp1HRchGCeQsFPBdceL1t43JS5KWTBx8joD IAyS7mowAkfXmQSHaZUEUHRaR2wm881XvEJhBzrv9t1VuVkVBHQpXdfNZxmj776+neu543 SHUWhHGKRJEyhwd586PnkMBLdczbFcUT79/01zTsk1FVa9+yCSYW3QdODhdG+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709718244; a=rsa-sha256; cv=none; b=irVL3rzH470kudyfMDjSVPsrQeDnXU7BxaPx+92Qyyf3ZIeCPlzlhAdyRLLFmJnfG/JxDB mcOeXWGy7r5RGeCVso2LsTPdHs5FkExBcNXg31fcHOgepFoFsCK9TR5sFfmJ/HwlkkgCk/ xgo6g7euZQj9g4DupVAWOF7kwTxyJ9E6+7UlFHqaTwCOS1H7IbFwIThc9i4eiBj2eNruLm z2FrkM8nCYOrTgURx8rIhJo8/TTtjO5FiRw6SXzWNxhmVDKf+w7hIOkVqRZf9HA1VDdrI1 Gn7KsWK+4qGojIaD6gbVGe8Du641yA7HOZcHjn31SKkEuH3x0LozwjBL2+iYSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709718244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b0RigiBlm5e3KtxftnEh2GvWnzaX+f5siJj7Tzl3bG8=; b=qXWaB/PtTeOrhmHZMQ0TZZWmkyRTXQ3IocUXdKi6JZ8bVeh0v9M1JAE+ie4MbejpHMwn6+ spzzt4Twl2fEpylwpFKjo6TaroDJ/WP/lD/enu605s5MZS7TJBVX/cejQC5Ph5qiqkMOsF 4P30rszFcgCxpmz4+XLmNFJ46tTKe5yxsf8RfChdbb/iCsj8O99aytVAAMmnI8lQFtL5xT +TT5pijN5Oo1k9OgLQ4KC4HITzNBh2MlVzMzC/t9HeI3Md2G7Rk36iSztBw6z6l3J1sH62 H/lnDsJPmjgGYPP5Y9m1uIFyXlyKNPIbPAXinmIeDk0uzdBrxC8Ee1UYEzXN9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqSF0440hzl10; Wed, 6 Mar 2024 09:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4269i4xt046615; Wed, 6 Mar 2024 09:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4269i41c046614; Wed, 6 Mar 2024 09:44:04 GMT (envelope-from git) Date: Wed, 6 Mar 2024 09:44:04 GMT Message-Id: <202403060944.4269i41c046614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Martin Matuska Subject: git: e0bd8118d04b..8f2f6cd2ac68 - vendor/openzfs/master - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/vendor/openzfs/master X-Git-Reftype: branch X-Git-Commit: 8f2f6cd2ac688916adb2caf979daf95365ccb48f X-Git-Oldrev: e0bd8118d04b55b7adf3d9ba256ad4bb53e66512 X-Git-Newrev: 8f2f6cd2ac688916adb2caf979daf95365ccb48f Auto-Submitted: auto-generated The branch vendor/openzfs/master has been updated by mm: URL: https://cgit.FreeBSD.org/src/log/?id=e0bd8118d04b..8f2f6cd2ac68 d3bafe455457 ddt: modernise assertions 86e91c030c05 ddt: move entry compression into ddt_zap 5c4cc21fd4e0 ddt_zap: standardise temp buffer allocations 0cb1ef60ae26 ddt: compare keys, not entries 59738541537a ddt: lift dedup stats out to separate file 909006049f97 ddt: remove DDE_GET_NDVAS macro 8e414fcdf40b ddt: split internal DDT API into separate header c8f694fe39ea ddt: typedef ddt_type and ddt_class 3bad70040a7b ddt: remove struct names and forward declarations 5ee0f9c64946 ddt: ensure ddt objects exist before trying to get stats from them 9029278dde70 ddt: rework ops interface in terms of keys and values 2cffddd405e0 ddt: remove ddt_node 406562c56318 ddt: simplify entry load and flags d9619546889d ddt: only create tables for dedup-capable checksums 5720b00632c1 ddt: document the theory and the key data structures d6a3d3f12a64 ZTS: Skip cross-fs bclone tests if FreeBSD < 14.0 af4da5ccf28e Check for minimum partition size 5600dff0ef56 Fixed parameter passing error when calling zfs_acl_chmod c00c085bfb18 config: use -Wno-format-truncation globally 8f2f6cd2ac68 ddt: reduce DDT_NAMELEN From nobody Wed Mar 6 12:17:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqWfL6fHmz5CTLP; Wed, 6 Mar 2024 12:17: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 4TqWfL66rrz4G3P; Wed, 6 Mar 2024 12:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709727466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p9IrzvdHsNhO+hCu1GNyC9MaUru9L9He0re9fiBmqbg=; b=jSuUDEUmxFf5XF9Ii34Fq8dQcmxsM49ges3mvfyKqg5CWV9Y8/VQXPbu/YO/WG3nGE/xiG WVaZuO4/BuJQbW7WaPMve0D1CKJbUxXzOrUsGYJS9nEnjlUJNSdSa/MN2/Jwb0a2G5otjE y6CggS/m3EpVSEV1LbXIc+esDsGWJE//VViaqGB6LlToPkjdnZ9V0F5jQ4Yfan8xtms9lu d9hISXUhbBvqQF7srPlP2TMiJKi19vdu32G7ZJ2XUiA17SHngI/mGBBzRGgFuslc1xtgR7 Iu4VNIj0NEPh0JNXWwflppOjk8e4owFs8Q2eGJNBXSHWhUxtlJa6PQy4qUavWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709727466; a=rsa-sha256; cv=none; b=F6PHFOvMWSp1X1VwTOfWUJ70X+MBnfShkaoZCg+/wJDeesQg84jlIqY9EbBjHgR5etH1Lj Alh4yO+Tsxns3kIqcwjWxgl4oy1QIsAaIF57jpsnnnCWs/5qImvJrQKkY0l7+ps/seWan9 2LaNGXmPEJIPWPvjkyDNCo8OMbZW6+corLWF0365MnA35bG0qI4KQQhvvttkf6Q/PSN2Vd OSN2J1u6IXOvQJ15Q3DEh8r++9PXpjkk/8bLqEuWFd4Js5zb1ReQpiO4D4jzEgIVzSOj+V f+5zLr3IJwJRHVrqx7b/mO4hW6jnG8Ef92yVyMNX6luLIgBv424TFVKX7SOWbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709727466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p9IrzvdHsNhO+hCu1GNyC9MaUru9L9He0re9fiBmqbg=; b=d/YT9JpUDpUJ6s6oX9sFt891z690C/66PaS8pjbEhR/hiaypgBB1SUAquFt98t6i7j69yi QnFcI8f6Yc3LIs0/2nnIc1QVCDVtJrTWKpyI+SU+Ia8lxtA4Qjn5aYjJSlKGoYK9n2fVTr R6Q22MA271/WdClDcyfNaBR3T9oIFXK13SBtrlohh8DW6MiSGUk8rPEmkNBgwmTU2dzdGP 2MJfEwa9DA1a/TtzfU9f3wErOGoi2g061kqGTCp9ZMpqLTbO1DpYUm4FuYCBAgBmPjosU2 CMRvg/sfKrsFmck04TSckeXuoUCt0Y75bnBcOWt86sMJUX9PRRSyJ/yETU9Y9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqWfL5k8nzpwL; Wed, 6 Mar 2024 12:17:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426CHko1002175; Wed, 6 Mar 2024 12:17:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426CHksf002172; Wed, 6 Mar 2024 12:17:46 GMT (envelope-from git) Date: Wed, 6 Mar 2024 12:17:46 GMT Message-Id: <202403061217.426CHksf002172@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: e436cb79666d - main - if_bnxt: Correcting the firmware package version parsing logic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e436cb79666db3c8bb167d47ca9803c36013e32c Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=e436cb79666db3c8bb167d47ca9803c36013e32c commit e436cb79666db3c8bb167d47ca9803c36013e32c Author: Sumit Saxena AuthorDate: 2024-02-23 08:20:26 +0000 Commit: Sumit Saxena CommitDate: 2024-03-06 12:17:29 +0000 if_bnxt: Correcting the firmware package version parsing logic The firmware package version currently appears as "Unknown" through the sysctl interface. The parsing logic for extracting the firmware package version from the package log has been modified to ensure compatibility with all controllers. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42950 --- sys/dev/bnxt/bnxt_sysctl.c | 58 +++++++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/sys/dev/bnxt/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_sysctl.c index 943e3019f579..971754029afd 100644 --- a/sys/dev/bnxt/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_sysctl.c @@ -28,6 +28,7 @@ #include #include +#include #include "bnxt.h" #include "bnxt_hwrm.h" @@ -719,6 +720,39 @@ static char *bnxt_chip_type[] = { }; #define MAX_CHIP_TYPE 3 +static char *bnxt_parse_pkglog(int desired_field, uint8_t *data, size_t datalen) +{ + char *retval = NULL; + char *p; + char *value; + int field = 0; + + if (datalen < 1) + return NULL; + /* null-terminate the log data (removing last '\n'): */ + data[datalen - 1] = 0; + for (p = data; *p != 0; p++) { + field = 0; + retval = NULL; + while (*p != 0 && *p != '\n') { + value = p; + while (*p != 0 && *p != '\t' && *p != '\n') + p++; + if (field == desired_field) + retval = value; + if (*p != '\t') + break; + *p = 0; + field++; + p++; + } + if (*p == 0) + break; + *p = 0; + } + return retval; +} + static int bnxt_package_ver_sysctl(SYSCTL_HANDLER_ARGS) { @@ -726,11 +760,9 @@ bnxt_package_ver_sysctl(SYSCTL_HANDLER_ARGS) struct iflib_dma_info dma_data; char *pkglog = NULL; char *p; - char *next; char unk[] = ""; char *buf = unk; int rc; - int field; uint16_t ordinal = BNX_DIR_ORDINAL_FIRST; uint16_t index; uint32_t data_len; @@ -748,27 +780,11 @@ bnxt_package_ver_sysctl(SYSCTL_HANDLER_ARGS) &dma_data); if (rc == 0) { pkglog = dma_data.idi_vaddr; - /* NULL terminate (removes last \n) */ - pkglog[data_len-1] = 0; - - /* Set p = start of last line */ - p = strrchr(pkglog, '\n'); - if (p == NULL) - p = pkglog; - - /* Now find the correct tab delimited field */ - for (field = 0, next = p, - p = strsep(&next, "\t"); - field < - BNX_PKG_LOG_FIELD_IDX_PKG_VERSION && p; - p = strsep(&next, "\t")) { - field++; - } - if (field == BNX_PKG_LOG_FIELD_IDX_PKG_VERSION) + p = bnxt_parse_pkglog(BNX_PKG_LOG_FIELD_IDX_PKG_VERSION, pkglog, data_len); + if (p && *p != 0 && isdigit(*p)) buf = p; } - } - else + } else dma_data.idi_vaddr = NULL; } From nobody Wed Mar 6 15:50:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqcNH2TmFz5Cq3M; Wed, 6 Mar 2024 15:50: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 4TqcNH1xYzz4bVZ; Wed, 6 Mar 2024 15:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709740255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/BboaF0MV1kamccgVXq0l81Ax88xQ/I5n+nJOm6ul0=; b=OUWcYBw1WPwGqAAu4cI3MewLiZJWnQBLOaHzNmKsiUxbTjPBGqAh+XaikmRgtwuucxiucw 3MVzLp+aRgJp086xoZeZD8dASygHfJSItadGI+rUAapDjxmcSgeZt8MwbtFAyOlDAABnxQ vXsOupdQDo9XF7vXtWJVeFa79kOfnB+pvPs5OfVpJYRY6iHZVd0zcnIy6E14d/6EvOmmzN 5YfhuyNxKL66mMt0O+EbHYzaCZOmNhYPIf+oTcYYdhkTjXB8VTN3EbTiuDfXsUUnP+hbx7 IE7nN2AvpYlUyfDYWvg96hBer2YwRzhyIukTv+LeyRtgkDd/MZPAkHPeucEH8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709740255; a=rsa-sha256; cv=none; b=nqQq6epBlyVaSWsfwY6SZP5ZNKt986oiqdvheZvVRR7dUt4iH6bxXV1DemyvBsNQCVGkFJ 45EjvgCcesqdZCityWC3K8ZaUaBdTcSVday6AhFEFgWGaawsBEOA8o3Mu5in66yHYIyPg3 gPxiEjBuuiaBEe5nLo2Ao9yniiTpjXAsB0cfue/wYWHhCnwDeLsaOBwT39mEtVgYA9YAnv idr3+hp2uEqSg+GxElXDJHSp2t/NzsAMeCyK2BsTECzRv+Mi6ywK8vTRTu3mzNhDhG8TBv oEO9vXqlkeewu5Gf1WyDVO6T8XEZFQamHA58x6/Zb9GnLmxr/SI45lqjeNXOJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709740255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/BboaF0MV1kamccgVXq0l81Ax88xQ/I5n+nJOm6ul0=; b=ypF+8/bfBxHroC8y7PHBFXR8vKkO25S+RQ+f2fqdCEpVaYl9uDj/I9QKeMZWTjxIwVvB1I QioPzDgNsa6LUS0+2kh0pn0BjC0VlezbCaq5omE4vsJ2hIjdpwbhC9SDEdRHpNTG7t9vgn P+8+tL9PjBW0kfl3fT4c7ZrSy2yq1i0GAEM1fvOI0sZ+WgH5mPO7zEqRMkNwxJ1pU9vK6f WCe60zrKAZmRWjMHWlT6zLb/PHHOyL4xoZGcZHBI8+FgR/9uWlAGBY55qT/sZdxH+lfth+ L8A+hMAal7GmE/kLIJap0JJFO8olUrkCVFAgMQnzq9VxvSrifwz6VAD8ojEkKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqcNH1XtgzwDP; Wed, 6 Mar 2024 15:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426FotlC069224; Wed, 6 Mar 2024 15:50:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426Fotgt069221; Wed, 6 Mar 2024 15:50:55 GMT (envelope-from git) Date: Wed, 6 Mar 2024 15:50:55 GMT Message-Id: <202403061550.426Fotgt069221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: d0168b32bc67 - main - vmm.4: Add verbiage about need to load module from loader.conf List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0168b32bc67033414e43f07eff2a4e850652c29 Auto-Submitted: auto-generated The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=d0168b32bc67033414e43f07eff2a4e850652c29 commit d0168b32bc67033414e43f07eff2a4e850652c29 Author: Michael Galassi AuthorDate: 2024-03-06 14:49:21 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2024-03-06 15:50:24 +0000 vmm.4: Add verbiage about need to load module from loader.conf PR: 277530 MFC after: 1 week Co-authored-by: Mateusz Piotrowski <0mp@FreeBSD.org> --- share/man/man4/vmm.4 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vmm.4 b/share/man/man4/vmm.4 index cb3276a7d8f1..dfd7ad26fb98 100644 --- a/share/man/man4/vmm.4 +++ b/share/man/man4/vmm.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 12, 2023 +.Dd March 6, 2024 .Dt VMM 4 .Os .Sh NAME @@ -70,6 +70,19 @@ See the .Sx EXAMPLES section below for sample usage. .Pp +Note that +.Nm vmm +must be given first the right of refusal to all +.Xr pci 4 +devices it may need to claim. +As a result, the +.Nm vmm +kernel module almost certainly needs to be loaded from +.Xr loader.conf 5 +rather than by adding it to +.Va kld_list in +.Xr rc.conf 5 . +.Pp A large number of PCI device entries may require a string longer than the 128-character limit of .Xr loader.conf 5 From nobody Wed Mar 6 16:24:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqd7134c5z5Csfk; Wed, 6 Mar 2024 16:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqd710kDTz4fRD; Wed, 6 Mar 2024 16:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jx2cRIAM/D8oGCHYC/4W1kKU1QlvjOrMBnsOrNXGn7c=; b=My9ek0hNi3MFsAG3aCf83A86C/0W/O3eBYJvk08YpH9XNL6grOuJRjtXdKJ2zCLMVmIbNo 26xjLeOFTlddmFp6O2x3lENKEJpKYKCpaHksex6UIdJ6awNytcDJUpnVyFcMPAkuDDZB53 DEaWynXZsLb01iS9zujyTSgSv+J3DknA/BBUA0CXT8nVKO8lL7U4gnFXlTfIqxA+cvRbLg qy6zXvUXPNILBqneOI7y/QK0En6gg4RQHGo01m31dXBn/YroOtq5booO7UyBxzhDzyfLse 0rpglDMXs81DNkd7JGGCcYJVtpRz4Lvh4PGk8KF/Z7Pdt5AK1Zr3NGcuR4hYGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709742269; a=rsa-sha256; cv=none; b=nHE+/s++EgUxVcg/kFCQNwWWb+/si3U+PCpAp9m2eXHKa3clK0D39ktYWs6ac6+y6LvL3e wWiXDTmIS685METKUHJWDOTRWhMnRGBposUEHsLq7pO3Ihf/gKGWjIHj23AyPnldmWFqFn ULVbXBI/mtv1TcGWPn5q1teTyneEFOq1wDo3Mk3YlO2csQYyc7agOGYT6Kskw4U84v/h+O XFkXI0stQvG2jhyG1/Ek7iCQKCi5f9OkhdjpoP9FVtDy3BGEl1fJq5cbgBZmifVZgO4LnA aWwTpltVccimAamNWvPA9YGLoyVq6hmV7N99Z7n5XfRKy+4cwZtnpCXFJbiDgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jx2cRIAM/D8oGCHYC/4W1kKU1QlvjOrMBnsOrNXGn7c=; b=mnw2aGasFSYVsmUa07iW5OeNORllUVmPEvHyUlKqUwqaPbrSJsFUAUTj2Cq88jtSweuimV b3ObPjg0V6LWAYD1XC1CvWwlSXgoVCpESWDs0fFlNHz1L4QebePV9o6DGgYjre13Yvwz6Z rw4vgWN9eVkCpFawq2iXY0HeRPNPZtPLqCh6pMA3gqMDCx0I8JT+ZQjnWLlQvqr2MoPdCl flgd7Kf7zPNB3hdcEjDdBKS7Nwv2fmprP/YfMxvRwwX+XuNw/Rm4kUFKIfe25HYfZhk17g YeWnU0iuzSQtKHPzf2opNYRYwr2dq1XHn+NU0NBAXJzuKNGEs+I5BzkmVqGqgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqd710KPXzxh5; Wed, 6 Mar 2024 16:24:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426GOS1V025016; Wed, 6 Mar 2024 16:24:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426GOSkX025013; Wed, 6 Mar 2024 16:24:28 GMT (envelope-from git) Date: Wed, 6 Mar 2024 16:24:28 GMT Message-Id: <202403061624.426GOSkX025013@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 38b3683592d4 - main - tarfs: Fix two input validation issues. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38b3683592d4c20a74f52a6e8e29368e6fa61858 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=38b3683592d4c20a74f52a6e8e29368e6fa61858 commit 38b3683592d4c20a74f52a6e8e29368e6fa61858 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-06 16:13:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-06 16:13:42 +0000 tarfs: Fix two input validation issues. * Reject hard or soft links with an empty target path. Currently, a debugging kernel will hit an assertion in tarfs_lookup_path() while a non-debugging kernel will happily create a link to the mount root. * Use a temporary variable to store the result of the link target path, and copy it to tnp->other only once we have found it to be valid. Otherwise we error out after creating a reference to the target but before incrementing the target's reference count, which results in a use-after-free situation in the cleanup code. * Correctly return ENOENT from tarfs_lookup_path() if the requested path was not found and create_dirs is false. Luckily, existing callers did not rely solely on the return value. MFC after: 3 days PR: 277360 Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D44161 --- sys/fs/tarfs/tarfs_vfsops.c | 37 +++++++---- tests/sys/fs/tarfs/Makefile | 2 +- tests/sys/fs/tarfs/tarfs_test.sh | 68 ++++++++++++++++++++- tests/sys/fs/tarfs/tarsum.c | 128 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 221 insertions(+), 14 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index 4489b41699ec..e45503373793 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 Juniper Networks, Inc. - * Copyright (c) 2022-2023 Klara, Inc. + * Copyright (c) 2022-2024 Klara, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -379,8 +379,10 @@ tarfs_lookup_path(struct tarfs_mount *tmp, char *name, size_t namelen, tnp = tarfs_lookup_node(parent, NULL, &cn); if (tnp == NULL) { do_lookup = false; - if (!create_dirs) + if (!create_dirs) { + error = ENOENT; break; + } } } name += cn.cn_namelen; @@ -451,7 +453,7 @@ tarfs_alloc_one(struct tarfs_mount *tmp, off_t *blknump) int64_t num; int endmarker = 0; char *namep, *sep; - struct tarfs_node *parent, *tnp; + struct tarfs_node *parent, *tnp, *other; size_t namelen = 0, linklen = 0, realsize = 0, sz; ssize_t res; dev_t rdev; @@ -732,28 +734,39 @@ again: link = hdrp->linkname; linklen = strnlen(link, sizeof(hdrp->linkname)); } - error = tarfs_alloc_node(tmp, namep, sep - namep, VREG, - 0, 0, 0, 0, 0, 0, 0, NULL, 0, parent, &tnp); - if (error != 0) { + if (linklen == 0) { + TARFS_DPF(ALLOC, "%s: %.*s: link without target\n", + __func__, (int)namelen, name); + error = EINVAL; goto bad; } error = tarfs_lookup_path(tmp, link, linklen, NULL, - NULL, NULL, &tnp->other, false); - if (tnp->other == NULL || - tnp->other->type != VREG || - tnp->other->other != NULL) { - TARFS_DPF(ALLOC, "%s: %.*s: dead hard link to %.*s\n", + NULL, NULL, &other, false); + if (error != 0 || other == NULL || + other->type != VREG || other->other != NULL) { + TARFS_DPF(ALLOC, "%s: %.*s: invalid link to %.*s\n", __func__, (int)namelen, name, (int)linklen, link); error = EINVAL; goto bad; } - tnp->other->nlink++; + error = tarfs_alloc_node(tmp, namep, sep - namep, VREG, + 0, 0, 0, 0, 0, 0, 0, NULL, 0, parent, &tnp); + if (error == 0) { + tnp->other = other; + tnp->other->nlink++; + } break; case TAR_TYPE_SYMLINK: if (link == NULL) { link = hdrp->linkname; linklen = strnlen(link, sizeof(hdrp->linkname)); } + if (linklen == 0) { + TARFS_DPF(ALLOC, "%s: %.*s: link without target\n", + __func__, (int)namelen, name); + error = EINVAL; + goto bad; + } error = tarfs_alloc_node(tmp, namep, sep - namep, VLNK, 0, linklen, mtime, uid, gid, mode, flags, link, 0, parent, &tnp); diff --git a/tests/sys/fs/tarfs/Makefile b/tests/sys/fs/tarfs/Makefile index b16c6544d33f..72355a08a158 100644 --- a/tests/sys/fs/tarfs/Makefile +++ b/tests/sys/fs/tarfs/Makefile @@ -3,7 +3,7 @@ PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/fs/tarfs BINDIR= ${TESTSDIR} -PROGS+= mktar +PROGS+= mktar tarsum ATF_TESTS_SH+= tarfs_test diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 15354aac501a..6f45062c18d9 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -2,7 +2,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2023 Klara, Inc. +# Copyright (c) 2023-2024 Klara, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -43,6 +43,10 @@ mktar() { "$(atf_get_srcdir)"/mktar ${TARFS_USE_GNU_TAR+-g} "$@" } +tarsum() { + "$(atf_get_srcdir)"/tarsum +} + atf_test_case tarfs_basic cleanup tarfs_basic_head() { atf_set "descr" "Basic function test" @@ -225,6 +229,65 @@ tarfs_notdir_file_gnu_cleanup() { tarfs_notdir_file_cleanup } +atf_test_case tarfs_emptylink cleanup +tarfs_emptylink_head() { + atf_set "descr" "Regression test for PR 277360: empty link target" + atf_set "require.user" "root" +} +tarfs_emptylink_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" + mkdir "${mnt}" + touch z + ln -f z hard + ln -fs z soft + tar -cf - z hard soft | dd bs=512 skip=1 | tr z '\0' | \ + tarsum >> tarfs_emptylink.tar + atf_check -s not-exit:0 -e match:"Invalid" \ + mount -rt tarfs tarfs_emptylink.tar "${mnt}" +} +tarfs_emptylink_cleanup() { + umount "${mnt}" || true +} + +atf_test_case tarfs_linktodir cleanup +tarfs_linktodir_head() { + atf_set "descr" "Regression test for PR 277360: link to directory" + atf_set "require.user" "root" +} +tarfs_linktodir_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" + mkdir "${mnt}" + mkdir d + tar -cf - d | dd bs=512 count=1 > tarfs_linktodir.tar + rmdir d + touch d + ln -f d link + tar -cf - d link | dd bs=512 skip=1 >> tarfs_linktodir.tar + atf_check -s not-exit:0 -e match:"Invalid" \ + mount -rt tarfs tarfs_linktodir.tar "${mnt}" +} +tarfs_linktodir_cleanup() { + umount "${mnt}" || true +} + +atf_test_case tarfs_linktononexistent cleanup +tarfs_linktononexistent_head() { + atf_set "descr" "Regression test for PR 277360: link to nonexistent target" + atf_set "require.user" "root" +} +tarfs_linktononexistent_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" + mkdir "${mnt}" + touch f + ln -f f link + tar -cf - f link | dd bs=512 skip=1 >> tarfs_linktononexistent.tar + atf_check -s not-exit:0 -e match:"Invalid" \ + mount -rt tarfs tarfs_linktononexistent.tar "${mnt}" +} +tarfs_linktononexistent_cleanup() { + umount "${mnt}" || true +} + atf_init_test_cases() { atf_add_test_case tarfs_basic atf_add_test_case tarfs_basic_gnu @@ -236,4 +299,7 @@ atf_init_test_cases() { atf_add_test_case tarfs_notdir_dotdot_gnu atf_add_test_case tarfs_notdir_file atf_add_test_case tarfs_notdir_file_gnu + atf_add_test_case tarfs_emptylink + atf_add_test_case tarfs_linktodir + atf_add_test_case tarfs_linktononexistent } diff --git a/tests/sys/fs/tarfs/tarsum.c b/tests/sys/fs/tarfs/tarsum.c new file mode 100644 index 000000000000..73ead2230a5e --- /dev/null +++ b/tests/sys/fs/tarfs/tarsum.c @@ -0,0 +1,128 @@ +/*- + * Copyright (c) 2024 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This program reads a tarball from stdin, recalculates the checksums of + * all ustar records within it, and writes the result to stdout. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static bool opt_v; + +static int +verbose(const char *fmt, ...) +{ + va_list ap; + int ret; + + if (!opt_v) + return (0); + va_start(ap, fmt); + ret = vfprintf(stderr, fmt, ap); + va_end(ap); + return (ret); +} + +static void +tarsum(FILE *in, const char *ifn, FILE *out, const char *ofn) +{ + union { + uint8_t bytes[512]; + struct { + uint8_t prelude[148]; + char checksum[8]; + uint8_t interlude[101]; + char magic[6]; + char version[2]; + char postlude[]; + }; + } ustar; + unsigned long sum; + off_t offset = 0; + ssize_t ret; + size_t i; + + for (;;) { + if ((ret = fread(&ustar, 1, sizeof(ustar), in)) < 0) + err(1, "%s", ifn); + else if (ret == 0) + break; + else if ((size_t)ret < sizeof(ustar)) + errx(1, "%s: Short read", ifn); + if (strcmp(ustar.magic, "ustar") == 0 && + ustar.version[0] == '0' && ustar.version[1] == '0') { + verbose("header found at offset %#lx\n", offset); + verbose("current checksum %.*s\n", + (int)sizeof(ustar.checksum), ustar.checksum); + memset(ustar.checksum, ' ', sizeof(ustar.checksum)); + for (sum = i = 0; i < sizeof(ustar); i++) + sum += ustar.bytes[i]; + verbose("calculated checksum %#lo\n", sum); + sprintf(ustar.checksum, "%#lo", sum); + } + if ((ret = fwrite(&ustar, 1, sizeof(ustar), out)) < 0) + err(1, "%s", ofn); + else if ((size_t)ret < sizeof(ustar)) + errx(1, "%s: Short write", ofn); + offset += sizeof(ustar); + } + verbose("%lu bytes processed\n", offset); +} + +static void +usage(void) +{ + fprintf(stderr, "usage: tarsum [-v] [-o output] [input]\n"); + exit(1); +} + +int +main(int argc, char *argv[]) +{ + const char *ifn, *ofn = NULL; + FILE *in, *out; + int opt; + + while ((opt = getopt(argc, argv, "o:v")) != -1) { + switch (opt) { + case 'o': + ofn = optarg; + break; + case 'v': + opt_v = true; + break; + default: + usage(); + } + } + argc -= optind; + argv += optind; + if (argc == 0 || strcmp(*argv, "-") == 0) { + ifn = "stdin"; + in = stdin; + } else if (argc == 1) { + ifn = *argv; + if ((in = fopen(ifn, "rb")) == NULL) + err(1, "%s", ifn); + } else { + usage(); + } + if (ofn == NULL || strcmp(ofn, "-") == 0) { + ofn = "stdout"; + out = stdout; + } else { + if ((out = fopen(ofn, "wb")) == NULL) + err(1, "%s", ofn); + } + tarsum(in, ifn, out, ofn); + return (0); +} From nobody Wed Mar 6 16:24:30 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqd722qRZz5Csd3; Wed, 6 Mar 2024 16:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqd72208Rz4fWG; Wed, 6 Mar 2024 16:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcRFJfkHpc9eFzn2459OTlv2kv0Kf8teT3QXc/xbbzw=; b=xhLSxcpf9jPEevOXEgIQwfRzv718fySqW2HvKyuZ9NVyA2T2O3rgojjmfCiGo4pI6i7G5s aeLsyiwoX9HlrZ0Rqj4U6Q/J9CrFJckLkFL3tqMLf/EmIkoQKkG/QW+v3/0ZcBbmlT5DTl 4c3EMNFShJjs8v4xyMdYdpvOR8SFyBD2Ud6hSwuQyZKWzkA6D8MTfReLbsPcgJnHAv36d+ +UYZny44PkhZYAO88KbMJG5EeE8kfbl3NHlBJpW6y89TMrk1UiKgb3LlB+803dCMumULz8 GKTRobeDMWynIQtJU4NSYB+EHV/6dJsrvXhYnqd/eHtaqRfZnMfbWMPYFJ9EmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709742270; a=rsa-sha256; cv=none; b=Ps+yMtSLP+YCYvSeCAisxCp8TkziU94HiYzERbIY0OibAcQvY5i42KYWPEJotlq9V+6+i+ zglwiwkMr7ogBlY1V7bvfqlep6pYNQn8L8FFhed1f/1bmLt6mI2zWGvsNmpNA0olkSi/Zv +9ldqnHv2A3pU5uREMBJ232k94NE9QUS4TgYIyVj2/UrQE2DeV9rZzD8YDAzSMZVeoBn0s FYQTDkiEBHCXh6SNqQhryqIclGREwQ05yRptvbjWbsCQf8uuwRdTB2iLCi99/F8nfDzRuD j2V5YqzoWPUz6rAM4xMOvXTJhXrLN5kyZ88jHI3SOrzhABIIG6XV4Td5yGkdJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcRFJfkHpc9eFzn2459OTlv2kv0Kf8teT3QXc/xbbzw=; b=d/lLEbhaWEseTAnFs9QIlNHJRoEbFDUl89DSG8RZrrru5SCGkJ02F2tw5eucBCLYn1WtCd BeJ/bLEp0ThhzK+I2K5PPiSsAQHayTBkD3/qamDEW1jfq31yzeztV7BY+4/0JpKdQiDUH1 4oAZG1EvUSZmlU8P8BStzySV3XHdAqNEAzuxAFhZBZKRrVEjg2LizEZ1l7I8wsL1pIfeIP cU+fTDHyQnsV5XpCmZXUmPs7lMJfn69njfQcAranFZNdSmPYzqowv+RddPLuuJFnyUt5AZ nozpgkz+ZMBOXCzD4fPF8eC8KDNgIo5YD58gW6OWtdtujK0O6r0enXrdzIt1FA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqd721J4ZzxY5; Wed, 6 Mar 2024 16:24:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426GOUUU025068; Wed, 6 Mar 2024 16:24:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426GOUX9025065; Wed, 6 Mar 2024 16:24:30 GMT (envelope-from git) Date: Wed, 6 Mar 2024 16:24:30 GMT Message-Id: <202403061624.426GOUX9025065@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 8427d94ce056 - main - tarfs: Improve validation of numeric fields. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8427d94ce05682abb6c75e2a27c8c497962c0dc5 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=8427d94ce05682abb6c75e2a27c8c497962c0dc5 commit 8427d94ce05682abb6c75e2a27c8c497962c0dc5 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-06 16:13:51 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-06 16:13:51 +0000 tarfs: Improve validation of numeric fields. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: sjg, allanjude Differential Revision: https://reviews.freebsd.org/D44166 --- sys/fs/tarfs/tarfs_vfsops.c | 143 ++++++++++++++++++++++++-------------------- 1 file changed, 77 insertions(+), 66 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index e45503373793..df8ad240d032 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -113,58 +113,46 @@ static const char *tarfs_opts[] = { }; /* - * Reads a len-width signed octal number from strp. Returns the value. - * XXX Does not report errors. + * Reads a len-width signed octal number from strp. Returns 0 on success + * and non-zero on error. */ -static int64_t -tarfs_str2octal(const char *strp, size_t len) +static int +tarfs_str2octal(const char *strp, size_t len, int64_t *num) { int64_t val; size_t idx; int sign; - /* - * Skip leading spaces or tabs. - * XXX why? POSIX requires numeric fields to be 0-padded. - */ - for (idx = 0; idx < len; idx++) - if (strp[idx] != ' ' && strp[idx] != '\t') - break; - - if (idx == len) - return (0); - + idx = 0; if (strp[idx] == '-') { sign = -1; idx++; - } else + } else { sign = 1; + } val = 0; - for (; idx < len; idx++) { + for (; idx < len && strp[idx] != '\0' && strp[idx] != ' '; idx++) { if (strp[idx] < '0' || strp[idx] > '7') - break; + return (EINVAL); val <<= 3; - val += (strp[idx] - '0'); - - /* Truncate on overflow */ - if (val > INT64_MAX / 8) { - val = INT64_MAX; - break; - } + val += strp[idx] - '0'; + if (val > INT64_MAX / 8) + return (ERANGE); } - return (sign > 0) ? val : -val; + *num = val * sign; + return (0); } /* * Reads a len-byte extended numeric value from strp. The first byte has * bit 7 set to indicate the format; the remaining 7 bits + the (len - 1) * bytes that follow form a big-endian signed two's complement binary - * number. Returns the value. XXX Does not report errors. + * number. Returns 0 on success and non-zero on error; */ -static int64_t -tarfs_str2base256(const char *strp, size_t len) +static int +tarfs_str2base256(const char *strp, size_t len, int64_t *num) { int64_t val; size_t idx; @@ -183,37 +171,27 @@ tarfs_str2base256(const char *strp, size_t len) for (idx = 1; idx < len; idx++) { val <<= 8; val |= (0xff & (int64_t)strp[idx]); - - /* Truncate on overflow and underflow */ - if (val > INT64_MAX / 256) { - val = INT64_MAX; - break; - } else if (val < INT64_MAX / 256) { - val = INT64_MIN; - break; - } + if (val > INT64_MAX / 256 || val < INT64_MIN / 256) + return (ERANGE); } - return (val); + *num = val; + return (0); } /* * Read a len-byte numeric field from strp. If bit 7 of the first byte it * set, assume an extended numeric value (signed two's complement); * otherwise, assume a signed octal value. - * - * XXX practically no error checking or handling */ -static int64_t -tarfs_str2int64(const char *strp, size_t len) +static int +tarfs_str2int64(const char *strp, size_t len, int64_t *num) { - if (len < 1) - return (0); - + return (EINVAL); if ((strp[0] & 0x80) != 0) - return (tarfs_str2base256(strp, len)); - return (tarfs_str2octal(strp, len)); + return (tarfs_str2base256(strp, len, num)); + return (tarfs_str2octal(strp, len, num)); } /* @@ -521,42 +499,47 @@ again: } /* get standard attributes */ - num = tarfs_str2int64(hdrp->mode, sizeof(hdrp->mode)); - if (num < 0 || num > (S_IFMT|ALLPERMS)) { + if (tarfs_str2int64(hdrp->mode, sizeof(hdrp->mode), &num) != 0 || + num < 0 || num > (S_IFMT|ALLPERMS)) { TARFS_DPF(ALLOC, "%s: invalid file mode at %zu\n", __func__, TARFS_BLOCKSIZE * (blknum - 1)); mode = S_IRUSR; } else { mode = num & ALLPERMS; } - num = tarfs_str2int64(hdrp->uid, sizeof(hdrp->uid)); - if (num < 0 || num > UID_MAX) { - TARFS_DPF(ALLOC, "%s: UID out of range at %zu\n", + if (tarfs_str2int64(hdrp->uid, sizeof(hdrp->uid), &num) != 0 || + num < 0 || num > UID_MAX) { + TARFS_DPF(ALLOC, "%s: invalid UID at %zu\n", __func__, TARFS_BLOCKSIZE * (blknum - 1)); uid = tmp->root->uid; mode &= ~S_ISUID; } else { uid = num; } - num = tarfs_str2int64(hdrp->gid, sizeof(hdrp->gid)); - if (num < 0 || num > GID_MAX) { - TARFS_DPF(ALLOC, "%s: GID out of range at %zu\n", + if (tarfs_str2int64(hdrp->gid, sizeof(hdrp->gid), &num) != 0 || + num < 0 || num > GID_MAX) { + TARFS_DPF(ALLOC, "%s: invalid GID at %zu\n", __func__, TARFS_BLOCKSIZE * (blknum - 1)); gid = tmp->root->gid; mode &= ~S_ISGID; } else { gid = num; } - num = tarfs_str2int64(hdrp->size, sizeof(hdrp->size)); - if (num < 0) { - TARFS_DPF(ALLOC, "%s: negative size at %zu\n", + if (tarfs_str2int64(hdrp->size, sizeof(hdrp->size), &num) != 0 || + num < 0) { + TARFS_DPF(ALLOC, "%s: invalid size at %zu\n", + __func__, TARFS_BLOCKSIZE * (blknum - 1)); + error = EINVAL; + goto bad; + } + sz = num; + if (tarfs_str2int64(hdrp->mtime, sizeof(hdrp->mtime), &num) != 0) { + TARFS_DPF(ALLOC, "%s: invalid modification time at %zu\n", __func__, TARFS_BLOCKSIZE * (blknum - 1)); error = EINVAL; goto bad; - } else { - sz = num; } - mtime = tarfs_str2int64(hdrp->mtime, sizeof(hdrp->mtime)); + mtime = num; rdev = NODEV; TARFS_DPF(ALLOC, "%s: [%c] %zu @%jd %o %d:%d\n", __func__, hdrp->typeflag[0], sz, (intmax_t)mtime, mode, uid, gid); @@ -772,16 +755,44 @@ again: parent, &tnp); break; case TAR_TYPE_BLOCK: - major = tarfs_str2int64(hdrp->major, sizeof(hdrp->major)); - minor = tarfs_str2int64(hdrp->minor, sizeof(hdrp->minor)); + if (tarfs_str2int64(hdrp->major, sizeof(hdrp->major), &num) != 0 || + num < 0 || num > INT_MAX) { + TARFS_DPF(ALLOC, "%s: %.*s: invalid device major\n", + __func__, (int)namelen, name); + error = EINVAL; + goto bad; + } + major = num; + if (tarfs_str2int64(hdrp->minor, sizeof(hdrp->minor), &num) != 0 || + num < 0 || num > INT_MAX) { + TARFS_DPF(ALLOC, "%s: %.*s: invalid device minor\n", + __func__, (int)namelen, name); + error = EINVAL; + goto bad; + } + minor = num; rdev = makedev(major, minor); error = tarfs_alloc_node(tmp, namep, sep - namep, VBLK, 0, 0, mtime, uid, gid, mode, flags, NULL, rdev, parent, &tnp); break; case TAR_TYPE_CHAR: - major = tarfs_str2int64(hdrp->major, sizeof(hdrp->major)); - minor = tarfs_str2int64(hdrp->minor, sizeof(hdrp->minor)); + if (tarfs_str2int64(hdrp->major, sizeof(hdrp->major), &num) != 0 || + num < 0 || num > INT_MAX) { + TARFS_DPF(ALLOC, "%s: %.*s: invalid device major\n", + __func__, (int)namelen, name); + error = EINVAL; + goto bad; + } + major = num; + if (tarfs_str2int64(hdrp->minor, sizeof(hdrp->minor), &num) != 0 || + num < 0 || num > INT_MAX) { + TARFS_DPF(ALLOC, "%s: %.*s: invalid device minor\n", + __func__, (int)namelen, name); + error = EINVAL; + goto bad; + } + minor = num; rdev = makedev(major, minor); error = tarfs_alloc_node(tmp, namep, sep - namep, VCHR, 0, 0, mtime, uid, gid, mode, flags, NULL, rdev, From nobody Wed Mar 6 16:24:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqd735WBDz5Csd6; Wed, 6 Mar 2024 16:24: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 4Tqd732MqMz4fGQ; Wed, 6 Mar 2024 16:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWY9JqOxzydnxiwKFTgAU+6KQOtawRzny0ppUDzX0R0=; b=Qdoy073SLHVuKSyQAgU+DWUgCIX84dJiKC+hiBde1VX8sexQPY+N9O4VWteB7ee8HknJeT 01sVNCOD7XMVSNJBuvPKkmtU091IP4QsZvUDMUyCIYUhBCJturmgEcMejH2IMGI/ughZuL 5pJPjNk/Qlr67EDpjYJSUcjLdKwR0GgFEXnGKmmhrJCKkNOBnOYQ+3ovGOElDV/6nGeN3L U14W3n/xeON3XTxv6fjQOc36KZuO3WO07IiQy4sbWQ+mfO9aHQ+wp46dWOPk7nAmmo9uLZ FlZE4SvHBtSxKzH+3fz43GdLdWimPJOL6mCgUwUySPbFmdhjgZ5I2oqUWFb68A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709742271; a=rsa-sha256; cv=none; b=f+BJ4Rf17QOS1YM0wTRu13t7OcfC381f/WtYXD5uHwUuB4Ykpu2SjZycg6a1zQuJGZM025 Pkl/j0xphLR2ZUVnT7tJN3JIyYwkWzBUb/6MNNB5KSqlkLIKfuWcPaEIPRDQK9m1SWs1wc KxJfzriygyaQu2q5FbKBIgX4vnA1Kwnd/jvbLQBosJXHjROxNjXB0Ksh7738GvGSdHll1Y QhjbvXoKSN8niEYxf55JIz2itYvY/CR/e5tcZnnsDpfFRw/rVa+xgkNJW3FeTmTXP4bY72 iay8f5VF4tKS7NujgDZEVJHvPTDLQ1ry/0M0KOyV1vce9UJc3Rb1W1PzlCRYfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWY9JqOxzydnxiwKFTgAU+6KQOtawRzny0ppUDzX0R0=; b=fgqiFrnEFNoQ1b6mhccMTOIJrYzx87pRARgdpslPXqT0FZ7SBUJYTbYNRjPvcDdrQV+6Cw 4s6c2oAHiawMPBE335L7G0eEbA/R/NQ0EwItjfwMna8gvOodYipeJC9KcR1G9OdTzrEVW8 VXZyZVnTzW2PHZSuzIC2MrhMSW1/YlkwYXperbq9tHURtok8/QVelbCV4l7qDMMO8rWESj rHcbhuNGqFD/ZHf64zX4ekgxAPExBijUBvgNL+7EglEPb17c8Zx40DSd7dxAAVNGbHpRrr LlIS6G+ts3aOaKXD0KpiiqKihnWHBKOSeXc4ocCKQLWVJ4o7YdfHpc9Ro2JqMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqd731yKtzx0h; Wed, 6 Mar 2024 16:24:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426GOVHt025116; Wed, 6 Mar 2024 16:24:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426GOV5v025113; Wed, 6 Mar 2024 16:24:31 GMT (envelope-from git) Date: Wed, 6 Mar 2024 16:24:31 GMT Message-Id: <202403061624.426GOV5v025113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c291b7914e1d - main - tarfs: Avoid overflow in exthdr calculation. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c291b7914e1db9469cc820abcb1f5dde7a6f7f28 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c291b7914e1db9469cc820abcb1f5dde7a6f7f28 commit c291b7914e1db9469cc820abcb1f5dde7a6f7f28 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-06 16:13:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-06 16:13:54 +0000 tarfs: Avoid overflow in exthdr calculation. MFC after: 3 days PR: 277420 Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44202 --- sys/fs/tarfs/tarfs_vfsops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index df8ad240d032..05014bf10373 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -583,7 +583,8 @@ again: error = EINVAL; goto bad; } - if (line + len > exthdr + sz) { + if ((uintptr_t)line + len < (uintptr_t)line || + line + len > exthdr + sz) { TARFS_DPF(ALLOC, "%s: exthdr overflow\n", __func__); error = EINVAL; From nobody Wed Mar 6 16:24:32 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqd745gFTz5Csfr; Wed, 6 Mar 2024 16:24: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 4Tqd7439Dnz4fc5; Wed, 6 Mar 2024 16:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2EZ6Px7Nj5CHdNwEl2G93s018USB+QKcmcZ2gG7HCo=; b=CxLfhrlc6gydzoN6L9u4r4/KOEtLAgiBsFcMZZmQ/X2FTdTEP2X5B2jvFkTmhFrfObJCeB TnqeVs7BIQqTb6GXo4Rr/PpFci0COEc7NSEyBb2VWDVRDPMxsSAdKLY8B3O0gwe8Grl+CJ k3gTZ7ZVeNoz5k8qQ3c5SUgqlrfev2uDL8GnqcWwCoAlXZDhv2D5xVDeicDGiFs2aQowmV kIk7bb6qOf633dekVGzY1vj3ixx8o+0ws6nPluOEtHgi18IWMm3+AxmOpPazhFelFnOxT3 Nsyy4gBb1MrUQhmGjFeoux61I5td/4arSmAeb3Z6ReX3c6ShQj6b/NgC0TERZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709742272; a=rsa-sha256; cv=none; b=RvULO7qmPgaZN6beQ3VEExtQBSHIg7fOhVXR9nKYLafXBdcSBWv4b75LT1Bm7Io5QaolEY iFkInRFkBxv5F8GoAmxpViqPlHZ4sqHFr9GCDZ8H8LmCm5jBvVoAdujFnvl5jdxOhgQPQw a2w64VhW80daXzOuHg/INkNsY6BmRe2u85wLx1qia51cp/xtBidxjW7shN1HVmqXhcx2em DHj2Ad38rSd5ok+Q3OrI1IexPgiYzXr1qgPy3aSMjxM+uDY6pCPI5sXikOi4Y3M30GZlGu tuNd7pHy6kpl2YJR0bUiaFilZZ3eIkHiASWNPjRUa2DjH7po22gxGeFhCODv1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2EZ6Px7Nj5CHdNwEl2G93s018USB+QKcmcZ2gG7HCo=; b=wOEmIAEqQJsNkP0j6AAQR9FuKOb2jBCEx9YyLxEQ3521hkkgHbmbJmGIpGwKFQBVC45Eg+ hxsKBvWAKZffKxqkbXMMzAb+2CKD+i3RuWZtEK1sgSYfUUfbU97Om0bnYr6jlx5UJnLb+Z 1JhaMZ/j8Awa329kemVc95XD6Yin1y8UInbWn9B/KF7XYz+8tDHf6Jk03SyFxSB/tY2CyG P3f0XQi7gwfZziUIvWW2XDVxTz/U52guQ66MZAMIMIC5aj7cz8mpBnnJdkIgdcH/Jv8+xA Ze/twTBS6v2aNdfeMGkz+zZag9UxtUzfTHAyQn4zBKwT81No0xHbKl4WI8755A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqd742nh1zxdj; Wed, 6 Mar 2024 16:24:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426GOWTI025167; Wed, 6 Mar 2024 16:24:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426GOWi7025164; Wed, 6 Mar 2024 16:24:32 GMT (envelope-from git) Date: Wed, 6 Mar 2024 16:24:32 GMT Message-Id: <202403061624.426GOWi7025164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e212f0c0666e - main - tarfs: Remove unnecessary hack and obsolete comment. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e212f0c0666e7d3a24dce03b8c88920d14b80e47 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e212f0c0666e7d3a24dce03b8c88920d14b80e47 commit e212f0c0666e7d3a24dce03b8c88920d14b80e47 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-06 16:13:57 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-06 16:13:57 +0000 tarfs: Remove unnecessary hack and obsolete comment. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44203 --- sys/fs/tarfs/tarfs_vfsops.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index 05014bf10373..33cc019028e6 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -881,16 +881,8 @@ tarfs_alloc_mount(struct mount *mp, struct vnode *vp, tmp->vfs = mp; tmp->mtime = mtime; - /* - * XXX The decompression layer passes everything through the - * buffer cache, and the buffer cache wants to know our blocksize, - * but mnt_stat normally isn't populated until after we return, so - * we have to cheat a bit. - */ + /* Initialize I/O layer */ tmp->iosize = 1U << tarfs_ioshift; - mp->mnt_stat.f_iosize = tmp->iosize; - - /* Initialize decompression layer */ error = tarfs_io_init(tmp); if (error != 0) goto bad; From nobody Wed Mar 6 16:24:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqd75674rz5Csr1; Wed, 6 Mar 2024 16:24: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 4Tqd753tLRz4fWs; Wed, 6 Mar 2024 16:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wd9eYdDG50dDf+b8UuzgrHYH/SsqyTm6AocQDpmmAH4=; b=VG8PfnccEPhnLv/mqK666nyxWIYlBVvdyaeaCV5ZMzInopFXT7yKsxInoQrAGMg0jTnHLs HCfKRRtgrwivZ5x0WxWlJldm4JSMu3enH1YGGN0HQ4yl9LsjXjHVaXiBk/677HqLZ9svEc kHq85Sz8ZjgDPCv0PDMzCCxZ6K2UxhaF9hzJhO4p1IfMtEo1kRv40KhWlkRwDDNkxttKoH AL2/jjgxTPrIq7BVJ6zJc+hqib0TRCnzra3npBCX4et9Ax/Q8uZBhMJ6RUm7VE/qPuMCSX MRpewSExolXZEmMwFjByHaOOLURg8vQ40BgS16VROthGmgGpn/l5CAQjx0gbhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709742273; a=rsa-sha256; cv=none; b=iQx0No3kIsISnLx24I3KfxTa2/IYihOgrd+dzfgmJkLjrgX1yviyBDLEw2cYru+0VFSYkD spaGxuEOO+0FkdKIlmznMdZZfjDY45VkJvBIV27koZYTnm8CLs/BXPR5j3WPmfAN6cA+7p A2RMhpjgRg1nFyaXfVLpIKzZyIHyFjGn/4Op4BI+/xH0mzmkKw73+ClF2hQSkMbRVdu/Jm EsvfejKptl+VOhMUH8e5bGFO/8eoxnuQs+xNfq2EJk1ON4uuPHkqM1DJpX1BZ+aNe4KLEu cZpXSSXe27x3/ULP7oFajLCaYcVhIFvQm01/ne40DHNSHJdufP6xvVjg5CDnjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Wd9eYdDG50dDf+b8UuzgrHYH/SsqyTm6AocQDpmmAH4=; b=A7+fLfZpzIs0j8RrK61ycFJvaGqK5rGTlmkpY7pUqeyBYLpGmVh6OAIohfvA1qFcOFaMtk ExjBCEHnW14fvfoihH22CNewgPDMpwQ68c/z/D/atu6i3Pzz0xxDuVxwLz70y/0N7sgfBl NPkGaxXFTqv75XYzoqEFNDy6vSaLr4pmsXyr8nE8Kx7BVe6tzuzNs1TIvL3hbOQBsPz528 WneS2kyP4oWhM3AmJaj3wntg8bMi3kqanC3A/aJMoCaNGPskEjGPO+AyPIkI41N8wuEDxh EAgZiw8zbfz7j+Ey0e+CkodcgBrs5rXkQGb56XXi0UYFXaj4KWw9EFIAKmVsxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqd753SmjzxY6; Wed, 6 Mar 2024 16:24:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426GOXtH025210; Wed, 6 Mar 2024 16:24:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426GOXC7025207; Wed, 6 Mar 2024 16:24:33 GMT (envelope-from git) Date: Wed, 6 Mar 2024 16:24:33 GMT Message-Id: <202403061624.426GOXC7025207@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0118b0c8e58a - main - tarfs: Fix checksum calculation. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0118b0c8e58a438a931a5ce1bf8d7ae6208cc61b Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0118b0c8e58a438a931a5ce1bf8d7ae6208cc61b commit 0118b0c8e58a438a931a5ce1bf8d7ae6208cc61b Author: Dag-Erling Smørgrav AuthorDate: 2024-03-06 16:14:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-06 16:14:01 +0000 tarfs: Fix checksum calculation. The checksum code assumed that struct ustar_header filled an entire block and calculcated the checksum based on the size of the structure. The header is in fact only 500 bytes long while the checksum covers the entire block (“logical record” in POSIX terms). Add padding and an assertion, and clean up the checksum code. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44226 --- sys/fs/tarfs/tarfs_vfsops.c | 31 ++++++++++++++++++++----------- tests/sys/fs/tarfs/tarfs_test.sh | 22 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 11 deletions(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index 33cc019028e6..ce896c5841c0 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -56,7 +56,7 @@ #include #include -CTASSERT(ZERO_REGION_SIZE > TARFS_BLOCKSIZE); +CTASSERT(ZERO_REGION_SIZE >= TARFS_BLOCKSIZE); struct ustar_header { char name[100]; /* File name */ @@ -75,8 +75,11 @@ struct ustar_header { char major[8]; /* Device major number */ char minor[8]; /* Device minor number */ char prefix[155]; /* Path prefix */ + char _pad[12]; }; +CTASSERT(sizeof(struct ustar_header) == TARFS_BLOCKSIZE); + #define TAR_EOF ((off_t)-1) #define TAR_TYPE_FILE '0' @@ -202,22 +205,27 @@ static boolean_t tarfs_checksum(struct ustar_header *hdrp) { const unsigned char *ptr; - int64_t checksum, hdrsum; - size_t idx; + unsigned long checksum, hdrsum; - hdrsum = tarfs_str2int64(hdrp->checksum, sizeof(hdrp->checksum)); - TARFS_DPF(CHECKSUM, "%s: header checksum %lx\n", __func__, hdrsum); + if (tarfs_str2int64(hdrp->checksum, sizeof(hdrp->checksum), &hdrsum) != 0) { + TARFS_DPF(CHECKSUM, "%s: invalid header checksum \"%.*s\"\n", + __func__, (int)sizeof(hdrp->checksum), hdrp->checksum); + return (false); + } + TARFS_DPF(CHECKSUM, "%s: header checksum \"%.*s\" = %#lo\n", __func__, + (int)sizeof(hdrp->checksum), hdrp->checksum, hdrsum); checksum = 0; for (ptr = (const unsigned char *)hdrp; ptr < (const unsigned char *)hdrp->checksum; ptr++) checksum += *ptr; - for (idx = 0; idx < sizeof(hdrp->checksum); idx++) + for (; + ptr < (const unsigned char *)hdrp->typeflag; ptr++) checksum += 0x20; - for (ptr = (const unsigned char *)hdrp->typeflag; + for (; ptr < (const unsigned char *)(hdrp + 1); ptr++) checksum += *ptr; - TARFS_DPF(CHECKSUM, "%s: calc unsigned checksum %lx\n", __func__, + TARFS_DPF(CHECKSUM, "%s: calc unsigned checksum %#lo\n", __func__, checksum); if (hdrsum == checksum) return (true); @@ -230,12 +238,13 @@ tarfs_checksum(struct ustar_header *hdrp) for (ptr = (const unsigned char *)hdrp; ptr < (const unsigned char *)&hdrp->checksum; ptr++) checksum += *((const signed char *)ptr); - for (idx = 0; idx < sizeof(hdrp->checksum); idx++) + for (; + ptr < (const unsigned char *)&hdrp->typeflag; ptr++) checksum += 0x20; - for (ptr = (const unsigned char *)&hdrp->typeflag; + for (; ptr < (const unsigned char *)(hdrp + 1); ptr++) checksum += *((const signed char *)ptr); - TARFS_DPF(CHECKSUM, "%s: calc signed checksum %lx\n", __func__, + TARFS_DPF(CHECKSUM, "%s: calc signed checksum %#lo\n", __func__, checksum); if (hdrsum == checksum) return (true); diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 6f45062c18d9..46aefd832d5d 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -285,6 +285,27 @@ tarfs_linktononexistent_body() { mount -rt tarfs tarfs_linktononexistent.tar "${mnt}" } tarfs_linktononexistent_cleanup() { + tarfs_cleanup +} + +atf_test_case tarfs_checksum cleanup +tarfs_checksum_head() { + atf_set "descr" "Verify that the checksum covers header padding" + atf_set "require.user" "root" +} +tarfs_checksum_body() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" + mkdir "${mnt}" + touch f + tar -cf tarfs_checksum.tar f + truncate -s 500 tarfs_checksum.tar + printf "\1\1\1\1\1\1\1\1\1\1\1\1" >> tarfs_checksum.tar + dd if=/dev/zero bs=512 count=2 >> tarfs_checksum.tar + hexdump -C tarfs_checksum.tar + atf_check -s not-exit:0 -e match:"Invalid" \ + mount -rt tarfs tarfs_checksum.tar "${mnt}" +} +tarfs_checksum_cleanup() { umount "${mnt}" || true } @@ -302,4 +323,5 @@ atf_init_test_cases() { atf_add_test_case tarfs_emptylink atf_add_test_case tarfs_linktodir atf_add_test_case tarfs_linktononexistent + atf_add_test_case tarfs_checksum } From nobody Wed Mar 6 16:24:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqd770N7Mz5Csl9; Wed, 6 Mar 2024 16:24: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 4Tqd765GX8z4ffj; Wed, 6 Mar 2024 16:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OVJqexMRmqW65B5E9tHdnJexQMu5AuNQbjVMQOib7J0=; b=i/EtTRBHmD4mCFnmM2lSWov4CT3yyo4ZEcavtYZYNgPBvm8NRePpO2aXWlygmiHv16wU0j 7XWW/+MWzwJctvib5eKm99owM2j1VOfjCdIXDwblZNubpcXx5PApHP6CwnpAE6AQtxYjd5 DGQ/ii9eyHjYtURcE0odOSYqpRUBL+gBk675CqZ2VLCBdtBK+v5ltj18bCMfYm23l1uleJ EZhMQaDLuVlIiFLMFv9OctAXYrSwICVKQRctE2CGeDY2kdYrYveIURORRCpEPYLvWyM6QT f3hUUpVKqTB7luDNBsgtd6oIHGEiGc5X7GBmvXWeUIF+FCYBIkZIWZwOdbKi3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709742274; a=rsa-sha256; cv=none; b=dTayFlo6F0Yb9MpIYozXA6WXxm+D4xsVgwM3LQ8ZqL52l2ajIzCt1xLaminUJ0/bV+Iwx9 I05BTvMzzcHy8cQQLLsE96TTa9BBfpxxBHobzAYDmPX0cxms15eEbquaSfhp6Y5gY2E2l2 3x8POGwi6NVsTwdhaNDAfpJB3hfsdNdddYN8I8YJVrEWIxHZyAe7K4e87GNPGK3FcmPlAB eUKpxyDwvJf0T8W5U17RfXzX801/sJ1he9JkcRJ2nzk+AUgzIxh/nL9rWUmFgiywUx+IyQ skW14X0aZtjTrlIEgXLvIqfPEn7uggxzkZjoKyw1Po+D3LhETW+BTIvgnnLfdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709742274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OVJqexMRmqW65B5E9tHdnJexQMu5AuNQbjVMQOib7J0=; b=LrdI3XcV5tEE/FuYFyWvsdXQXApJCAs+7Xc16/nnLa3fuNHGevfQrMGgOxPZNK2AiT96HD /OHNjd+Dez6SpDMGHC9l36Ywjd1Kgq18KHUIZAJUNzD8qoAa35HrITSSwaJ7aLBbCyN4Mj Zu/yxXD9wzx3Bxc3Nscz5hF1kIGm/kNxDN4fDlwG//xZH71InVSEhslnCq8D+YRCoz3DWx AfA7KucS5ujsFCTl1kHDiTqiajyxKO/9pwvcX28AShnMLgFtMqcpkbN/KD79zCyNUXABDB nROOXug+jpRl1nwrbl8xgH3wroMI6hBsjZiyrFw0T+/GhyiH0vX6vgw1bmqnAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqd764m8hzxbG; Wed, 6 Mar 2024 16:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426GOYds025262; Wed, 6 Mar 2024 16:24:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426GOYOC025259; Wed, 6 Mar 2024 16:24:34 GMT (envelope-from git) Date: Wed, 6 Mar 2024 16:24:34 GMT Message-Id: <202403061624.426GOYOC025259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 32b8aac6f9b7 - main - tarfs: Factor out common test code. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32b8aac6f9b77a1c4326083472d634e5de427547 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=32b8aac6f9b77a1c4326083472d634e5de427547 commit 32b8aac6f9b77a1c4326083472d634e5de427547 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-06 16:14:05 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-06 16:14:05 +0000 tarfs: Factor out common test code. MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D44227 --- tests/sys/fs/tarfs/tarfs_test.sh | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/tests/sys/fs/tarfs/tarfs_test.sh b/tests/sys/fs/tarfs/tarfs_test.sh index 46aefd832d5d..2a5dfc434201 100644 --- a/tests/sys/fs/tarfs/tarfs_test.sh +++ b/tests/sys/fs/tarfs/tarfs_test.sh @@ -47,15 +47,23 @@ tarsum() { "$(atf_get_srcdir)"/tarsum } +tarfs_setup() { + kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" + mkdir "${mnt}" +} + +tarfs_cleanup() { + umount -f "${mnt}" 2>/dev/null || true +} + atf_test_case tarfs_basic cleanup tarfs_basic_head() { atf_set "descr" "Basic function test" atf_set "require.user" "root" } tarfs_basic_body() { + tarfs_setup local tarball="${PWD}/tarfs_test.tar.zst" - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" mktar "${tarball}" atf_check mount -rt tarfs "${tarball}" "${mnt}" atf_check -o match:"^${tarball} on ${mnt} \(tarfs," mount @@ -72,7 +80,7 @@ tarfs_basic_body() { atf_check -o inline:"3,40755\n" stat -f%l,%p "${mnt}" } tarfs_basic_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_test_case tarfs_basic_gnu cleanup @@ -95,8 +103,7 @@ tarfs_notdir_device_head() { atf_set "require.user" "root" } tarfs_notdir_device_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup atf_check mknod d b 0xdead 0xbeef tar -cf tarfs_notdir.tar d rm d @@ -107,7 +114,7 @@ tarfs_notdir_device_body() { mount -rt tarfs tarfs_notdir.tar "${mnt}" } tarfs_notdir_device_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_test_case tarfs_notdir_device_gnu cleanup @@ -130,8 +137,7 @@ tarfs_notdir_dot_head() { atf_set "require.user" "root" } tarfs_notdir_dot_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup echo "hello" >d tar -cf tarfs_notdir.tar d rm d @@ -142,7 +148,7 @@ tarfs_notdir_dot_body() { mount -rt tarfs tarfs_notdir.tar "${mnt}" } tarfs_notdir_dot_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_test_case tarfs_notdir_dot_gnu cleanup @@ -165,8 +171,7 @@ tarfs_notdir_dotdot_head() { atf_set "require.user" "root" } tarfs_notdir_dotdot_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup echo "hello" >d tar -cf tarfs_notdir.tar d rm d @@ -177,7 +182,7 @@ tarfs_notdir_dotdot_body() { mount -rt tarfs tarfs_notdir.tar "${mnt}" } tarfs_notdir_dotdot_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_test_case tarfs_notdir_dotdot_gnu cleanup @@ -200,8 +205,7 @@ tarfs_notdir_file_head() { atf_set "require.user" "root" } tarfs_notdir_file_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup echo "hello" >d tar -cf tarfs_notdir.tar d rm d @@ -212,7 +216,7 @@ tarfs_notdir_file_body() { mount -rt tarfs tarfs_notdir.tar "${mnt}" } tarfs_notdir_file_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_test_case tarfs_notdir_file_gnu cleanup @@ -235,8 +239,7 @@ tarfs_emptylink_head() { atf_set "require.user" "root" } tarfs_emptylink_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup touch z ln -f z hard ln -fs z soft @@ -246,7 +249,7 @@ tarfs_emptylink_body() { mount -rt tarfs tarfs_emptylink.tar "${mnt}" } tarfs_emptylink_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_test_case tarfs_linktodir cleanup @@ -255,8 +258,7 @@ tarfs_linktodir_head() { atf_set "require.user" "root" } tarfs_linktodir_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup mkdir d tar -cf - d | dd bs=512 count=1 > tarfs_linktodir.tar rmdir d @@ -267,7 +269,7 @@ tarfs_linktodir_body() { mount -rt tarfs tarfs_linktodir.tar "${mnt}" } tarfs_linktodir_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_test_case tarfs_linktononexistent cleanup @@ -276,8 +278,7 @@ tarfs_linktononexistent_head() { atf_set "require.user" "root" } tarfs_linktononexistent_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup touch f ln -f f link tar -cf - f link | dd bs=512 skip=1 >> tarfs_linktononexistent.tar @@ -294,8 +295,7 @@ tarfs_checksum_head() { atf_set "require.user" "root" } tarfs_checksum_body() { - kldload -n tarfs || atf_skip "This test requires tarfs and could not load it" - mkdir "${mnt}" + tarfs_setup touch f tar -cf tarfs_checksum.tar f truncate -s 500 tarfs_checksum.tar @@ -306,7 +306,7 @@ tarfs_checksum_body() { mount -rt tarfs tarfs_checksum.tar "${mnt}" } tarfs_checksum_cleanup() { - umount "${mnt}" || true + tarfs_cleanup } atf_init_test_cases() { From nobody Wed Mar 6 17:13:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqfCq01vlz5Cxpk; Wed, 6 Mar 2024 17:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqfCp6ScSz4mqr; Wed, 6 Mar 2024 17:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709745222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbrnzV8zO0KLDroJRP5sVGz3rZAdsct717m0Xnz5lbE=; b=u3E8m+cpDMC4bDryB4F127CTXAVD1sGAktDeryC2I6cZvngssu9Bi+PoZHTFZw4SiVv06G /hpblQzQV9TysOVNeDjthPU+XrWVHRNMFyk3LacTxRIJeyHMFvr/AuHxTgqEn+YP6zjX+Y 1iwiN2C1kkQTkFTPnjTAaRBCPJltHS4ls7vDK131i3jjSB2rEAriDqeNwU6RjdaSFem1ed ZFWaeQzu1p3jgv/p6KsjlBPXrriVqkkIgY9VZ0PLhbG6AT/+kmpIeuJK4vSmiGnenR4ZES qCgMvwSXSD8SAwW/HitEk2s/dtOfFrAlcr9e0nym+g1vojOp3xtcJYVusX1vew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709745222; a=rsa-sha256; cv=none; b=rPfdsmePNPWNmL0M5I1Vxx/3i1RUEO+rfNVckU8a2B9Bfvf4OGhWlpbbir3Jw3MvIahrf7 zRd7nins0xHjZx72JA/AjcUre9cohTQOKpxw73acHd3jSmAULKNZ7JxQZ1b/4BroYAe4s0 NqCEkY4lrTQvohGkRDJUE72so/8L6CSAQhzE/KmVIo3uKST72uCjCsv2pSXqmT44VuDRS2 8mHJVvHJPea1EiXBCfYFSp8feCkckhgNx4jsA3U30dS9n2M5/K/YrBIGkHYer3L++IOWwq g1zqLlzhk4sH6J7Un0bUIsCKLh+zn03QdMr4n6mJ1SACiDKHCQtGGBDxyXsy7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709745222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JbrnzV8zO0KLDroJRP5sVGz3rZAdsct717m0Xnz5lbE=; b=MIC8cD8UJsjHo1UVU/4hphLdyvijfpeRLAhjSMsB837Chlvg3Cx3myfyINmyJxo8S3v3LB 55N452hSIEQt8LSrM9Au2s0ODpj/QwfbPtGlK+wwWHjD52KMdFXQExAcN3j8UsR0JwETBw pVWubFF/hnkM9Nw5THFr/8ivA6z8PiQ7nKp223YXlBy3KIcWNQPDB6filxhmRQjpQ5sPdC SDHXEQLl3uDP6aL2b0aw6UNsCEmH2B3DIGSMYwCTlRzY8tuYOYywH340QHj5HQwp98n8Qw ILDT1CEOTPNbwzVt9oIQLF0FKO6qotIiL6BYxVKUy8mbga7nd27oJM3T3M43bQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqfCp647Qzykf; Wed, 6 Mar 2024 17:13:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426HDgus009801; Wed, 6 Mar 2024 17:13:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426HDg2D009798; Wed, 6 Mar 2024 17:13:42 GMT (envelope-from git) Date: Wed, 6 Mar 2024 17:13:42 GMT Message-Id: <202403061713.426HDg2D009798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: cf742faa39a5 - main - timerfd_create: accept CLOCK_UPTIME/CLOCK_BOOTTIME List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf742faa39a58a9b43b671c66097e6880459d4ae Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=cf742faa39a58a9b43b671c66097e6880459d4ae commit cf742faa39a58a9b43b671c66097e6880459d4ae Author: Baptiste Daroussin AuthorDate: 2024-03-06 14:11:32 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-06 17:13:33 +0000 timerfd_create: accept CLOCK_UPTIME/CLOCK_BOOTTIME This is a common use case when using timerfd_create to actually use it with CLOCK_BOOTTIME on linux which is CLOCK_UPTIME for us. Note that currently on freebsd CLOCK_BOOTTIME is CLOCK_UPTIME, but the semantic is supposed to be different, this has to be fixed later. Tested with the fnott notification software Reviewed by: des, imp Differential Revision: https://reviews.freebsd.org/D44253 --- sys/kern/sys_timerfd.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 30c3709e59a6..f74fb87bea75 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -26,6 +26,7 @@ * SUCH DAMAGE. */ +#include #include #include #include @@ -432,8 +433,18 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) AUDIT_ARG_VALUE(clockid); AUDIT_ARG_FFLAGS(flags); - if (clockid != CLOCK_REALTIME && clockid != CLOCK_MONOTONIC) + switch (clockid) { + case CLOCK_REALTIME: + /* FALLTHROUGH */ + case CLOCK_MONOTONIC: + /* FALLTHROUGH */ + case CLOCK_UPTIME: + /* FALLTHROUGH */ + case CLOCK_BOOTTIME: + break; + default: return (EINVAL); + } if ((flags & ~(TFD_CLOEXEC | TFD_NONBLOCK)) != 0) return (EINVAL); From nobody Wed Mar 6 17:29:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqfYz2cSnz5CyrD; Wed, 6 Mar 2024 17:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqfYz1Gxtz4pCd; Wed, 6 Mar 2024 17:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709746167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ze1TXtGjF8IGbNuP+awaCBssbRHeyb9ZzYceYWr/y5o=; b=U7YfYzVPu77dqki4SrT1c8vqNFDeh3gaoM7ymTbJ0ZsdsejqB+1am0lR3e9pD6KRs8ycdB 8+ZNkaXdyn+f25j7Y+/0NZrN3qBkwpQknxdKHVtnYcES8wtSLABujK9/5P8hbSLJ32AYwU 603maNNJpIL1RgHnhI5TiEGRdbrutVB+N9IY7ZNUtftEzBA8tuAjeLdUriE2WQts7Mlcd/ IfHsGvETuVBiEHa020mPe5Ubf5a9bMtkb+9OeUa414+AheChzvEaCdeo97IHGBYon0Cx40 qXy0AeLY0B2h4flKb1JDeLsA/GkzDN5Tq4jpdEt+6JhcW6Z5LpNdJL3wQIqAKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709746167; a=rsa-sha256; cv=none; b=vJXFJr0ytHhItoMVxPFY9FY4AM8f5aJ+JVSIG6aEZyDx/JrZncXfV0u5bLZ2qL8xuKZHOI cYn5C3rQFbpj+7lodvfaKnSq+UILxRY6ACtd1earFFRXhx30PRJ5VDJ9EYA6RdDejtSIQ0 6OA+9LBLeONTZksHT8q+wsqEKlQYWUN2vQ+FNpx9FMq2K3g9OPFQoCZt+dgUobWMyTtiJe iRjcYPt27xXuvKqMERD3BZ+CgQ3rzRT7zV+ApSMQ5aJi+fGMDkScvhAv0gLq90e/q6Z26S op96vU/zoAxuzWKuekge8ScwA4PSQALYO+cVugMqlZDb44klmeuVLrvlZyFkpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709746167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ze1TXtGjF8IGbNuP+awaCBssbRHeyb9ZzYceYWr/y5o=; b=n0l8hpa6aIXiQCN13QxsEpwI3A9JKS8wSL8vpzaMNwrDddXcsP4Lhdr1jSvjaHCrcNh08e ZZjw14STnFl+eGaegaBUiN4lDxZI/dyXnhdwXzL8Pda9oAsBrcKpgHnWJXea/1+BQcO0+/ K5xZ1NIUtHgJaHZsFx3mkdOq6OulBmea+8apq9FMl6wHiYDRCngNkyeXtfsG97+YUSvAuq NwmxUWWNOut8dO0yRWjJcgPofvGaFjiezDfOfH+YjV6TFD/afAnUcm/HKI96Hlk+SxT4BE XGDDRk7C9S4P3mk/LfTnZF984mGyCuSYp6y88xd8OvP9rgnfXlnnCRSMed/Ekg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqfYz0tFtzynx; Wed, 6 Mar 2024 17:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426HTRDC027494; Wed, 6 Mar 2024 17:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426HTRUH027491; Wed, 6 Mar 2024 17:29:27 GMT (envelope-from git) Date: Wed, 6 Mar 2024 17:29:27 GMT Message-Id: <202403061729.426HTRUH027491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0ecf0b26a750 - main - timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ecf0b26a750582b804e238e6446db55188d7fdc Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0ecf0b26a750582b804e238e6446db55188d7fdc commit 0ecf0b26a750582b804e238e6446db55188d7fdc Author: Baptiste Daroussin AuthorDate: 2024-03-06 17:28:02 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-06 17:28:02 +0000 timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae Remove the include that crept in by accident Clang complains about CLOCK_BOOTTIME being the same for now as CLOCK_UPTIME, so remove CLOCK_BOOTTIME and leave a comment for what to do when CLOCK_BOOTTIME will be different for real. --- sys/kern/sys_timerfd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index f74fb87bea75..8ac5b845f7ac 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -439,8 +438,10 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) case CLOCK_MONOTONIC: /* FALLTHROUGH */ case CLOCK_UPTIME: - /* FALLTHROUGH */ - case CLOCK_BOOTTIME: + /* + * CLOCK_BOOTTIME should be added once different from + * CLOCK_UPTIME + */ break; default: return (EINVAL); From nobody Wed Mar 6 19:46:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqjbv2LLXz5DBmW; Wed, 6 Mar 2024 19:46: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 4Tqjbv1kXbz49jP; Wed, 6 Mar 2024 19:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709754379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+2wTOcLfIie3MnBenfJzhIDkMYVMOC9/5zB5gHdexs=; b=IMK5z/eGGydvM6q3ujtRCmEvymyPei83mpsU6WLrhdPY0WMBq1BEba9ibByh3pnAgTDEmJ 29qbHLPuC3OwQWLemP+Ar5Ey078XyYb9G2/lCRTkVFhlDjcNH1D4dyY67Agr0H9SRG+399 sturgCqX/cuNGh0jsU3rd7s0z6v97r3O0UPOy0BkfdPiYuMmp2Pe6XNn9bE1zhmKQWIRha ht3GAEFi4+mSitrfylKEDko95YW9xIzV6BFmHMUAnZ1glzFWXWMdhV5gUjT3uEVGGzT7oS JjkUWTZ9TOePf3q1F5YZAJrligWjo1bQIqpvWGepSsT4LpMqVY95qVtbB9u3KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709754379; a=rsa-sha256; cv=none; b=VWQL7LoEjht6jvA+FDwzfb9bztszmPvLdGQtLIeqxYwAzgrdDBum+7IH0wge8EbAQ312Tg 0IfStuceFBDzWOV1lItra5NHxKz6DJpL/BmddLxUfpH9sYGsL1Y5ViceEOIai7Jowx4ITs OkMJixOFtUMi1aTPVEuxrPs8eCCYxrNZYl22dZmNC2xuQNpe/Olgzty2kAfizTI75DF0JK +m4WV7pe+TzJwYrVKWPnPaY5AM7G/GccHzQWljz4HrAr1wNJxqQJgtQgTg0/8EdYOC9RMd E6Dr0oDhHnxB8o/K3kPQJFiaocyAO/X+ZicYVac0f06AHudDRO/ndL/3ny4zkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709754379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+2wTOcLfIie3MnBenfJzhIDkMYVMOC9/5zB5gHdexs=; b=rij1c4ZfdLzghCuM16JwlsAtP7qzM0cXWu7ZwCzE1tmKI4r2wUR5rWsMK3hmqKSYYJvQz/ IVQlmhG5WfKAEjdUMfw9/6BcihjgQTD/K/7KFDSKZAk0ydC3/2JHvajpn0g2ICRQeibmcH A+2EQg5QwR/RqzKRS0Pv3hesgXd1pD6qSugcTeaaBkp5qNrwjqrZhDKHotwRmtjb1uy6lg no1PzS6HG5aneqagr7/w6v+eCjdTTE7vg6T3lrpny1lJrvutoUcUF05LoQkXvKdVoZUtHr 5/UTqO8c9pKTVIv5Hw4N3Af6x9SQE+i62alJBRVStgkpXq1x55Xftn/vkH/oBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqjbv1CFwz13Zy; Wed, 6 Mar 2024 19:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426JkJQJ063595; Wed, 6 Mar 2024 19:46:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426JkJDN063592; Wed, 6 Mar 2024 19:46:19 GMT (envelope-from git) Date: Wed, 6 Mar 2024 19:46:19 GMT Message-Id: <202403061946.426JkJDN063592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8c94ed992702 - main - bsearch_b: fix compilation with gcc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c94ed99270292262073b7bd103a29de69b5ae38 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8c94ed99270292262073b7bd103a29de69b5ae38 commit 8c94ed99270292262073b7bd103a29de69b5ae38 Author: Brooks Davis AuthorDate: 2024-03-06 19:45:40 +0000 Commit: Brooks Davis CommitDate: 2024-03-06 19:46:12 +0000 bsearch_b: fix compilation with gcc Reported by: rscheff Differential Revision: https://reviews.freebsd.org/D44256 --- lib/libc/stdlib/bsearch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c index 055becf1c85b..96c728e1c997 100644 --- a/lib/libc/stdlib/bsearch.c +++ b/lib/libc/stdlib/bsearch.c @@ -35,6 +35,7 @@ #ifdef I_AM_BSEARCH_B #include "block_abi.h" #define COMPAR(x,y) CALL_BLOCK(compar, x, y) +typedef DECLARE_BLOCK(int, compar_block, const void *, const void *); #else #define COMPAR(x,y) compar(x, y) #endif @@ -58,7 +59,7 @@ #ifdef I_AM_BSEARCH_B void * bsearch_b(const void *key, const void *base0, size_t nmemb, size_t size, - DECLARE_BLOCK(int, compar, const void *, const void *)) + compar_block compar) #else void * bsearch(const void *key, const void *base0, size_t nmemb, size_t size, From nobody Thu Mar 7 00:34:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqr0z6YD3z5Djpc; Thu, 7 Mar 2024 00:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqr0z5pjdz4l0l; Thu, 7 Mar 2024 00:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBCWZShjWDbrvZrzink8jMhtbsZJJL9+vhwZYw+ohCg=; b=Skzn/2vOgrjzF6hXsCtenUlI19ir6XhpaDUXyI12L1enyujZ5b2XB8gRWh4Y/KYhkxo6LA HRTj90xVYmuISpMJ5XA95dq05Rje+06J/NBmQxuBlt3ZveWQw+QkdJcMlfllde6UIpzCmM 18A1YSLJwm4AYeSqx3bjEZCGC+800UStKM2Mp7JG2u52QB+8aIUBh3knqgXT8GoP+YKMY9 JGQ2w0QHHuW06tBmEtcWWJo5QeAzA6yvrLOd/tPk9Es7GIajyFT4Yl/KheMwFK9/cDUxs4 O/IGhqB47sbcTqp6He6IHIgRMLd7J+w/wSy8IAQhKN0KqZ9DvFgV4wZ/ylSu1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709771699; a=rsa-sha256; cv=none; b=qC4A1p3LjYccJKWWdElhui69toO1dSV7q4ZVnL1eC65W3AyhY0rG5awWQI1rNSUHKO32Nt n95RDoVgoOaiO7138PqZx8a5421udymv7rQ8r3hNYD2MLmwkQPPmnybx9sp8sM7IUvqo0Y 0FI+VnT5LPAVpWIPjjs6oBflt9dAE/yL2yyOBuHMBlX/qsQRywP/YAlDODsa+UfgIJz3k/ PMj+pQkEGwrGCLcjR0sxkjf2FXPCAJjTMBMyFXnJq3qerpaoQHZY44SYZut8Nm9Eo1ydZe ivnRql0gE53l/E9V0NLR72f9/VxukanyIRQ0Iq6J32JK1Qy0cQeKB5vstSZkag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771699; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XBCWZShjWDbrvZrzink8jMhtbsZJJL9+vhwZYw+ohCg=; b=oXaS9YTQMJhVzS6RQNpSK8PNkqKsjPXR12y64xMuVPJxieOdG2s7bqn+sGO4Te1N+6N1GF hxETGzDJdUPhw5yz91+4Tj+W0N9zz2p2ilu0ZtIrurZIyqAx2gK4OElb+yFh5hmre81sjY Qsq+rzdT/K1pWNQAqvvi0ciFGpXj6UmZEQgQ+dDgVgSb2s5+BwSCsSE0yBoqWgSe/oGgn9 CH7PGbi/fFR/b6ppiORRx5YXiOhP00FkC+1ANtVHu33+H4ERVYtOND+BJ7lO3zW1qqvvtr 1aWCMHmup1VIn3J1CXx8WQuQtQnLYh952of4bhQQkeTIuOntBElw0R+uJLJKdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqr0z5P7Rz1BQr; Thu, 7 Mar 2024 00:34:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4270YxEq055160; Thu, 7 Mar 2024 00:34:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4270YxYo055157; Thu, 7 Mar 2024 00:34:59 GMT (envelope-from git) Date: Thu, 7 Mar 2024 00:34:59 GMT Message-Id: <202403070034.4270YxYo055157@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: 5a98473132e6 - stable/14 - rtld: unconditionally generate map file during build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5a98473132e61babb8885dc3c3feda2766d02ddd Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5a98473132e61babb8885dc3c3feda2766d02ddd commit 5a98473132e61babb8885dc3c3feda2766d02ddd Author: Konstantin Belousov AuthorDate: 2024-02-28 00:04:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-07 00:34:34 +0000 rtld: unconditionally generate map file during build (cherry picked from commit 799940154c70597a46627deb4d0b98e174b27b98) --- libexec/rtld-elf/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index fe7e39a6b788..cc40b839024f 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -73,6 +73,12 @@ SYMBOL_MAPS+= ${RTLD_ELF_DIR}/${RTLD_ARCH}/Symbol.map .sinclude "${RTLD_ELF_DIR}/${RTLD_ARCH}/Makefile.inc" RTLD_ENTRY?= .rtld_start +# Always produce the map file so that may be inspected to confirm +# undesired code is not linked from libsys/libc. +MAPFILE= ld-elf.so.1.map +LDFLAGS+= -Wl,-Map=${MAPFILE} -Wl,--cref +CLEANFILES+= ${MAPFILE} + # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: From nobody Thu Mar 7 00:35:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqr111G3vz5DjmV; Thu, 7 Mar 2024 00:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqr106tLRz4l36; Thu, 7 Mar 2024 00:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEPi8eq2kJ//ppzVg56m5lBVbfsr0oul4jKdtRD38M8=; b=XJMoPH0jurS0kC7QUEwztPrpH5uNFzz9jh0QAGuqtEKKonG6c5T39QC6IqPSOv8DPi91KJ h92d/wGnZpAmmPQ0Bfd+bczVILFtnuRIoVn4EdBsV0uTzS0z2NWCJP0+2dRKH4qUCf68s4 VimMljKSlClK4Y0+L0A3JXB6Y7PBZJ6829PH2fyFSP/Zwqza+halNdrkBWLx9yY1EAouJi pmNcSDZvqMtaUfVbWf5SyR8tnCKw28/n4AUp7Aae1cb36pt0ISdu3T0BS+t1PTU5/KmPIG YRSLqikdq7ADr89JYrtoWRqhvwJcWP/DhtDNvUNZ0VC8ZQzYY+hIMy9lFQzvag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709771701; a=rsa-sha256; cv=none; b=HGWCDx5ut0bOEb0Wwt0T8QNeFme5/dV1CLLF+E/ZKQ6PhHuSDeoIcrXBb4kUvAK6yzaYbV m03TpRwW8oUE0L9l+dlEKHKl1iIL8+mQyHhGddCnARuHR0rtZTjjTEoVC5oPv4cL5SwDBn rMJwz8rleVhZBVmmMMulZc63wJeBKoIaj5q1teaLbk/fIhNPMy9NIXDoL4aOBM14A7gylK DoulpsiyYHTND2IjX/U4oGssafk8tiN44Bz/PiHrjLal5gAfxT5hrxvszo723exv2VWk5Y 8KIXHxU0y9zpw5gUoZ88+u5lfA7kBcjhfmk+C6rv2z6x36JAzZwDHpSab2eM2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEPi8eq2kJ//ppzVg56m5lBVbfsr0oul4jKdtRD38M8=; b=wvG7LRFKq3+n32kIlXdKb+L8i83LXY6LnamPxX6In4GKqwvGDbwkTkv+/xwx1co/itFRDB apbTtJBn0uYmRb2IM041b1kwL6AmxalwevyjHmMLyZhnhl/G5YvtVqaB85ZNBA83vFrexJ /XjMjBzBTyUiQ8XRsVxlBJ9jkJLWlEBDYH7pDCP5qFiBcCrg6o2Gwy7exPwk2r6BLPZh3d +CBDhPHTAemglMdoC8pokKGIPQW9yKQCXIlegEuq5we/wNWnWqd7WgcQ/aVQHzTX0xYUAi qY0uCJrtOYmGvUKEhbkh6zeSJp/2O6isMuDkXM26RwB/BUgUAR52YC+0tHrIWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqr106V2Hz1B7s; Thu, 7 Mar 2024 00:35:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4270Z0fn055246; Thu, 7 Mar 2024 00:35:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4270Z0VL055243; Thu, 7 Mar 2024 00:35:00 GMT (envelope-from git) Date: Thu, 7 Mar 2024 00:35:00 GMT Message-Id: <202403070035.4270Z0VL055243@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: 3cce838c60fc - stable/14 - rtld: use generated map file to check for some leaks from libc into rtld List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3cce838c60fcda9aacf249d1172bff7f78c4bf3b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3cce838c60fcda9aacf249d1172bff7f78c4bf3b commit 3cce838c60fcda9aacf249d1172bff7f78c4bf3b Author: Konstantin Belousov AuthorDate: 2024-02-28 23:40:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-07 00:34:34 +0000 rtld: use generated map file to check for some leaks from libc into rtld (cherry picked from commit 5db5c6c87a75f8b1871f021726fc4697253ae5cf) --- libexec/rtld-elf/Makefile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index cc40b839024f..37c3840538d5 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -79,6 +79,25 @@ MAPFILE= ld-elf.so.1.map LDFLAGS+= -Wl,-Map=${MAPFILE} -Wl,--cref CLEANFILES+= ${MAPFILE} +afterbuild: + @if grep __libsys_interposing ${MAPFILE} >/dev/null ; then \ + echo "libsys_interposing leaked" 1>&2 ; \ + exit 1 ; \ + fi + @if grep __libc_interposing ${MAPFILE} >/dev/null ; then \ + echo "libc_interposing leaked" 1>&2 ; \ + exit 1 ; \ + fi + @if grep xlocale ${MAPFILE} >/dev/null ; then \ + echo "xlocale leaked" 1>&2 ; \ + exit 1 ; \ + fi + @if grep fprintf ${MAPFILE} >/dev/null ; then \ + echo "stdio leaked" 1>&2 ; \ + exit 1 ; \ + fi + + # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: From nobody Thu Mar 7 00:35:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqr1d4Hqmz5DjxN; Thu, 7 Mar 2024 00:35: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 4Tqr1d3pxLz4lPP; Thu, 7 Mar 2024 00:35:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPhDddUIvuPihwcz7dVr6hJ0lgGgqONMZV1loM2JVUU=; b=K457g2dHeEoLMw4Djr4JIJ6px7d7SAP2dVl/Y30mUnHnFRhUUEt8vPWxVqwygh2q5vMo6q Bo+xLQp6twBG+vVtvCUVrechjWsyeVx4Tt5QqDtcjVFaOid6YfuopIabg9W3qYeehZfTFo PESZucz3vZVQ9Acu38QQnH4lboG2LafnnbGjTK7uTjPMu4F5d/OXMKafyPxjvCJd4WCxOK ucCVjEW4pBEyZY82qws5ivm8d5mIkda9ai8sAuhYWiRnD8FDbR5tx4QT3eLx8nEoIuiAc6 PvcK3hBU0NfeNoJ6JvC55HMWliPu6DNRsm4u+OBfDwW+MRX5UfYGEG2KS0KeSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709771733; a=rsa-sha256; cv=none; b=HP62vLA2kUUzwe086dmLcUbE7s6LgtjN2JW6BtnT9eEantfRb4awVf/zMdAmtYU4VACJq0 g0JOAYl6YgJqGeu8BkXzLN/hlCUZyxbke+gcXLMIa/NezO+/HBSqPXRadnc/VGKUm6xTc1 kChazHWVsLB81a1qo2SGKEUto0IDSDy/GZIDRo++aQ9WcuBlq8qVYCDnGM80W+6lK2Azj7 yZ/pJNNcU2iF2+jpOawAEoJM+HsrcUk6myHxgJ6CK7V7rhN6j2dXIS9JZ+IAle54tmsa4u Pgd+x8+HmayNU/pjHIfY+A+5VLOctL8kzyy+kBkdO+4N0FI71Qj9tX9D2aYOTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sPhDddUIvuPihwcz7dVr6hJ0lgGgqONMZV1loM2JVUU=; b=OSOHZFjIXYltsaoib3G8hUeKI0m64yooJE5N7tAfu/sXJ857jOiNq4hbYqANspflITVxgA hQPIKQ3aQMphxIYwyTBkCYCwTig7+rJ7sZgoUFFIeRy4LnJOG6kAeU84CtsnTczL36l5D1 VvmwE4JDDeLbgDG5Qi9P/3JganuoanhEQPz/lbbMaz1wX/WFkSPCSLVAlhgggf/eejvY/t GexIZ31atr35IDhSJsHUCMTO4+lqp4iHVZHEDxUNTkPEt1z+KJy3sYNNFemVZ+kpCtFw/5 R628ryVH6AgS5b/vV+NvvKEMzNwc+MIDagx+50QkLVVAPBrDsj/USM8VY/rnTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqr1d3QMYz1C49; Thu, 7 Mar 2024 00:35:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4270ZXAB055462; Thu, 7 Mar 2024 00:35:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4270ZXjk055459; Thu, 7 Mar 2024 00:35:33 GMT (envelope-from git) Date: Thu, 7 Mar 2024 00:35:33 GMT Message-Id: <202403070035.4270ZXjk055459@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: fd5a82ecd2a6 - stable/13 - rtld: unconditionally generate map file during build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: fd5a82ecd2a6f51dde00459854f92066b23c3be4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fd5a82ecd2a6f51dde00459854f92066b23c3be4 commit fd5a82ecd2a6f51dde00459854f92066b23c3be4 Author: Konstantin Belousov AuthorDate: 2024-02-28 00:04:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:42:42 +0000 rtld: unconditionally generate map file during build (cherry picked from commit 799940154c70597a46627deb4d0b98e174b27b98) --- libexec/rtld-elf/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index b95adf82fe9b..def8bb513b3b 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -69,6 +69,12 @@ SYMBOL_MAPS+= ${RTLD_ELF_DIR}/${RTLD_ARCH}/Symbol.map .sinclude "${RTLD_ELF_DIR}/${RTLD_ARCH}/Makefile.inc" RTLD_ENTRY?= .rtld_start +# Always produce the map file so that may be inspected to confirm +# undesired code is not linked from libsys/libc. +MAPFILE= ld-elf.so.1.map +LDFLAGS+= -Wl,-Map=${MAPFILE} -Wl,--cref +CLEANFILES+= ${MAPFILE} + # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: From nobody Thu Mar 7 00:35:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqr1f5ffjz5DjxQ; Thu, 7 Mar 2024 00:35: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 4Tqr1f4vjTz4lK7; Thu, 7 Mar 2024 00:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPnzlWJUA2TIBkXfoXloJuFTM/cxJSBMDnajsSywThM=; b=KmHre6rGskGwQasULNlNRgeXPjfrgsWTLtJrMao4SUQTCC0RsfNnQOVZQyJVnI9xSXhiFI BRd0gUw26pWj1QT5SetLshcdc2aR2WqB5b0jE4mQYfzOgCLLOybMMJl07LngzHNMeseVgd 3Lz/cIhNG3PzHn7CN5hg3LaatWxPT2W/vv2tTdK7fKd/QuGaJpnd7Xps/65hTmZbkEIWPK un/fsSKXmP3ObEeWFwQhf+3D3UXla6VdL2t1Qn7t3nNOBG/3alB3mA4v2c83LTHKCQEOF8 NcLRQdmY1xgZdLfKvcH5Hn2SwNipPvRIRJ+5jkzNnTZbO9eTG6tiRqBKGz1gYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709771734; a=rsa-sha256; cv=none; b=h4Lh96AmOmy+QlLtJe8vwoqnrgunsBN6uAc11DjxW6VP3dY0cuKXK5ZOFn2Os/737zYLOi wld9IVYrOrZ9tPOm4PljYUpYjvEWRkFCuqClHLTqHZ/SYaex4TCHEHgdtdRD7ECp4ZdEYZ 5I3aoFBRz7nqhcABFEhV2py7qA7X14pumqNpHDYtL29ViOWap5ySzA4QeL2ryx+EselmKs PS6rPleoJw/3klAKik6NCjiWw1HHzugkXM179AT1FEGmgTWMd6uQroizGLefS2m7ubZ7FB Bj+aSzbgAuOC95lXbIJjuIe4tZBYDcf9884hXcRfsF6+gSFTMM8FL65uhYBJkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709771734; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bPnzlWJUA2TIBkXfoXloJuFTM/cxJSBMDnajsSywThM=; b=D/mJwdD7Nf5AXX2jT6gaEC6+jzRONwSI+cUcvkIwEtXY0tICc18dRCLSes2W8pY0PKqNda TQsS0i2ECbXOAGe2/3RB5z5AOnzqgB231LOYHfR3Z8KFsC0ehcpXBKTPha8F+ML+pYoFXp sv3++MIBLu/0tJ3qjN7vGPJtV3YzSotgF0yyImCogOVQPyIJDMopyQTIa5qscXoTsGG7HS XHhM8AfgBhUp6o6zM9fv7WPPiZ3BApSFrYpXv5a0oiBcPlGbY6SeH+2K8FiIa+zotZVeHO qArVzOYvnclX4COb+Pk3TprVSLEZ4r0bTo0hV0/CzudGhcRihJVR7j+fVWS64g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqr1f4W4xz1C6m; Thu, 7 Mar 2024 00:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4270ZYQx055532; Thu, 7 Mar 2024 00:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4270ZY8N055529; Thu, 7 Mar 2024 00:35:34 GMT (envelope-from git) Date: Thu, 7 Mar 2024 00:35:34 GMT Message-Id: <202403070035.4270ZY8N055529@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: 8b84d2da9aac - stable/13 - rtld: use generated map file to check for some leaks from libc into rtld List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8b84d2da9aac3a79be02570f2bc1ed301f03ce8e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8b84d2da9aac3a79be02570f2bc1ed301f03ce8e commit 8b84d2da9aac3a79be02570f2bc1ed301f03ce8e Author: Konstantin Belousov AuthorDate: 2024-02-28 23:40:41 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-06 07:42:42 +0000 rtld: use generated map file to check for some leaks from libc into rtld (cherry picked from commit 5db5c6c87a75f8b1871f021726fc4697253ae5cf) --- libexec/rtld-elf/Makefile | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index def8bb513b3b..4735ad774aa1 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -75,6 +75,25 @@ MAPFILE= ld-elf.so.1.map LDFLAGS+= -Wl,-Map=${MAPFILE} -Wl,--cref CLEANFILES+= ${MAPFILE} +afterbuild: + @if grep __libsys_interposing ${MAPFILE} >/dev/null ; then \ + echo "libsys_interposing leaked" 1>&2 ; \ + exit 1 ; \ + fi + @if grep __libc_interposing ${MAPFILE} >/dev/null ; then \ + echo "libc_interposing leaked" 1>&2 ; \ + exit 1 ; \ + fi + @if grep xlocale ${MAPFILE} >/dev/null ; then \ + echo "xlocale leaked" 1>&2 ; \ + exit 1 ; \ + fi + @if grep fprintf ${MAPFILE} >/dev/null ; then \ + echo "stdio leaked" 1>&2 ; \ + exit 1 ; \ + fi + + # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: From nobody Thu Mar 7 01:06:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqrjY4Bd0z5CHdy; Thu, 7 Mar 2024 01:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqrjY3f3Cz4n8h; Thu, 7 Mar 2024 01:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q39XuUDgp4m1ZcJnnEQHe+VDfxbT2xGsD/dxGd5etPg=; b=wBerQzz5dK+RYWIsCpqazRnljLik/JgMfeCcIuuZ0lvWWElFO/fsAEF027wMa2ydN+1HnW 5jr1Md2RmYkDHrYnmvSKUNyTFvqLxVwsOjan071pPVB0+3MJTMfgfys8ePgGAoX+UnCdxj atISSMKpz3ABDlpz6eK73jW96UkgtPyFgPQaWhmjIYN1Sy1Qa6IKVtEoeKuacP3mfkoMGs 6mtOy+YksS9dycrf9u5Ihbp8Vp1H9+kTcR/ywn47WkTImF8UCnRJOklHg7IABHlsMwtcsT 3tZD5JssukWLRM8UUQbXow/03DnJGg5UJFjEvQPiQO5sILTfsnrca48s/LvolA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773601; a=rsa-sha256; cv=none; b=t3LG5+qzTgHyFRAOwP+CfYOYHyqEaoFfGh7LckbAMw3B1qI2syqvfQx//trqAhd7ezuJG8 fOZd0HMebKG7SzrnOzUc1a02in6OHy0g3g3USbz9V2jfDRSG4/v7+91y3yqrH4ofcfY9dT Cht8xagykeiZx39mLkIsPazauO48KIjqQnR8ntMDTQsW+JlSZkzkQ9CHwknXrHZR6/7qpu zBPwj0wzlhy4cHh+Qap+qDl8ZSWoPM10hEF4cgX5gMmRFyReyUZP0uclMilE+p7LoFq33i zdL/3HqITHiZrFH5DdtQHWxTK5olfUdQFOqnIQ7Z8hNzBV2fNW0VmXe9IMebAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q39XuUDgp4m1ZcJnnEQHe+VDfxbT2xGsD/dxGd5etPg=; b=QGwBHZenYKo2s1jhk3GJlp9AbywGNESptY1oLGodOGPJ9nrBI1pKhSrlJg1HyHH/jxxu0l sI/fr5/CbyU5aRjg7Yt/DuC2+yE1/qmqloLd502JV30lmuYS6OvDMORM+0PVFCW3rLzZzN 42QmRP8d7SK5nLFkxXReNKsfjwEePwAJ4JNpHK/yg214Vm216o2nfk3st2r8zrgsaz9Qn3 gh59SEIzXw7BH0Bt66QMnEM+pAuQ29K7ckq+Cwagds3N/9sQEky+/x1NAw4QM++rcp/EDs Icu0Ymadm7OyaW+OqLFieU4FQXAWcgL/H7Bnlr+CfRs6EfLqi8rGpkCJyDQt3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqrjY3Ffwz1Cs9; Thu, 7 Mar 2024 01:06:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716fYM006280; Thu, 7 Mar 2024 01:06:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716fP5006277; Thu, 7 Mar 2024 01:06:41 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:41 GMT Message-Id: <202403070106.42716fP5006277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 023fa553bf00 - main - liblzma: don't export lzma_lz_decoder_uncompressed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 023fa553bf0000837738ce3ba118921ee24e3792 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=023fa553bf0000837738ce3ba118921ee24e3792 commit 023fa553bf0000837738ce3ba118921ee24e3792 Author: Brooks Davis AuthorDate: 2024-03-07 00:54:22 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:54:22 +0000 liblzma: don't export lzma_lz_decoder_uncompressed It was removed in the 5.4.0 import. Reviewed by: delphij Differential Revision: https://reviews.freebsd.org/D44247 --- lib/liblzma/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/liblzma/Symbol.map b/lib/liblzma/Symbol.map index 3b58bc759e75..938b6191b4f4 100644 --- a/lib/liblzma/Symbol.map +++ b/lib/liblzma/Symbol.map @@ -142,7 +142,6 @@ XZprivate_1.0 { lzma_index_prealloc; lzma_lz_decoder_init; lzma_lz_decoder_memusage; - lzma_lz_decoder_uncompressed; lzma_lz_encoder_init; lzma_lz_encoder_memusage; lzma_lzma2_block_size; From nobody Thu Mar 7 01:06:42 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqrjZ60Vcz5CHqm; Thu, 7 Mar 2024 01:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqrjZ4L2vz4n8j; Thu, 7 Mar 2024 01:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ptg9mkXdH6nWfjn75O4fhULFbFXgfDHOybXBhwMQ7P4=; b=Gpm+z9jFKpm5/es/+p8j90bFEJmkt1WFs03ZTr9m70V/kg2BxESai0htTfExwEKjpIweKu kozPOrV053xLRPIa8YuZGpw+GUPF78j5zZjVpU+sYp7Sp/inhHxMd1E8X9ZpDKD48Ui/bL QAvLyTtRYG+TIvRUsWkaKmadZEp6tU/T7A7JrckyqqcRNRXDjG7y5thA9yrFisR7SYG1Gp 8ljGnic+Xev6r8UKYYkPIhOASOteR/mZm5FHMLoXP7+dDIHGrenJoXkDOXKm/0Lw04LH13 oW74sNt0Iru71GR+xBnPtU/5Uisnbn0zus+celN8buITrU6OB68nCa7NKw3XJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773602; a=rsa-sha256; cv=none; b=s9swJa48R2QDMIZAYGRwlgKCi9DLP6QgwaVhE9OCwAEgtHW3Eqm1MpgP0k+JyaV87ydcsf ZiR6pdr6jNVmiDUaVmxOaEwLGSRRbjUmUgKI3f4pVl41rEgEOSmLd7o8LG8KX3Sf5hgKjv wRQIHtyL+m2qtQCeYpaiIqP1O88EqHmg8nM/i+03TdmAvW/2XgQ9Z7cPBJvJvujeiHI+Lw aC9v66xKLXnKBjGCdkkX9H2qS7bdswuJ2fSbzQ8Hb29a6SFmt3NApfxoDulpa7GIFf5sxx sNj0LnC956z0NkH/NZ0OgFr5dVyJ3XlMUUuKJUUsR4IWoly4sTA7diFNYJwkYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ptg9mkXdH6nWfjn75O4fhULFbFXgfDHOybXBhwMQ7P4=; b=JrCPGG6AGSwF5efjIvW9AHPpLqqS384sGePDXaHJargWDSRQcoAwGzqzeSuQzS61Ol30EV vfwQ9UNSln7anMKKwyCFGE/beOHLj+y0tqaw1Z0xlxbsyaXDmVp5mj2Dfuf+x926RA1HJp QZJpKCdiCto9nRw6EULbB7OhIuz0lKfLGfk2yF6PgqqHlcmyeq3riPDeZArl3yzYnPnv5P z/CbJ5KEatBTjElDnkU7SmKN/tWEUh3pVFTXeQCLEVGfuDQBOyP90VVpCrA3zd+nmeiF8K WK9ZMNfG70TONFuM/XWulpZ1bsniITLpWbIZnGSKmprYYso9HjKlzUnR45Kv8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqrjZ3xN6z1Cbc; Thu, 7 Mar 2024 01:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716gbl006338; Thu, 7 Mar 2024 01:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716g2h006335; Thu, 7 Mar 2024 01:06:42 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:42 GMT Message-Id: <202403070106.42716g2h006335@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: de4386d17414 - main - heimdal: don't export nonexistant _wind_ucs2read List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de4386d174146781c45907204a61aec4cbbb2b44 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=de4386d174146781c45907204a61aec4cbbb2b44 commit de4386d174146781c45907204a61aec4cbbb2b44 Author: Brooks Davis AuthorDate: 2024-03-07 00:54:55 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:54:55 +0000 heimdal: don't export nonexistant _wind_ucs2read This symbol table entry came in with the 1.5 import (commit 7c450da7b446), but the only other mention is a commented out entry in lib/wind/libwind-exports.def. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D44245 --- crypto/heimdal/lib/wind/version-script.map | 1 - 1 file changed, 1 deletion(-) diff --git a/crypto/heimdal/lib/wind/version-script.map b/crypto/heimdal/lib/wind/version-script.map index 6b5abb5ee2a5..79f02471abe9 100644 --- a/crypto/heimdal/lib/wind/version-script.map +++ b/crypto/heimdal/lib/wind/version-script.map @@ -23,7 +23,6 @@ HEIMDAL_WIND_1.0 { _wind_stringprep_map; _wind_stringprep_normalize; _wind_ldap_case_exact_attribute; - _wind_ucs2read; local: *; }; From nobody Thu Mar 7 01:06:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjc0jglz5CHxv; Thu, 7 Mar 2024 01:06: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 4Tqrjb66qjz4nFj; Thu, 7 Mar 2024 01:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKCqvQ3bw+3+nR9pmBIIgbr8FYxvfzLaUUp7iggFO2k=; b=Y7jjpgrTj0dhnY5GZIbHUX1L+XtaZS9cGhzLRP/+GQnyB1qTGrnlfCSTUYwiCW+AmTc1rl Np0XT7q1Xg5jQQoPz6ju230rOklOOjqdlx45zAgDlst9x3m5o98GWmWRtTXE7TF9M3j66I P6utkIPhLVKhf50D0WrpYvAE0CzUX5SdsecpQFKRUPERYeQDSi7mv3+6+Y0TOUZiTDphc2 6Xr8Vlr94wixuceLdvAJ/SYhCtQsvKDUZR4wg6351JHgppBHHijylmBB85brIg15rTXLN1 nDG5bq6oH4JLLUO6W8CNZAOy5PaBV/hktjni1juGby172cWVpJb7FwAzphGuSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773603; a=rsa-sha256; cv=none; b=xfe4k/yqLonaBY1DMkD/g0c0PLB7HpDKrTcUE4yoVk6WFzeuJhx1Og34y2Q42ftxaSyTvx McfYSTLfxiIrqehrhfms734arpB/HQMPjyhFn6eeoa+kIoicvlpTAZuVnHoKI8i8FHkIcY 75TcEReQXndGZaHyfJsx2glWj5KYLYnrS3O9FHsoZBMKUGlu5hIHTab6f+kEr0wUNOIqRu rC4XlsDi+zYH/rhOJgZ7UrCuZBbgsC6iQ+v3l1mD7kOI7FsZnpfc7tLjXytaX1sxMPWFi2 A9Jv9lgKnHxfm8fkFA/9zf8WXJJEA+YA0eFWSFokexwL02CqIepOwmjA6UnTYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773603; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aKCqvQ3bw+3+nR9pmBIIgbr8FYxvfzLaUUp7iggFO2k=; b=l1gbRGCZtgN8nBjGP93sSSl32NeMeWkr1eGDiyQ+BxHwxtYDCFKklY9K1Xs/NLNfmgRLih 6d05JPjqYrtc34Xear8X0IhvoowliHU/K4fSscul/927JTq/8180SKu0qnkHH/QxnSd5Ox rYkmfvcBisx+AEaydjgkCGkVcfx8h13FUJt7lLoyHo5D7M5QUiydS7IqqikvH6E2upqAj/ tV1ZkRoXSAhxA5M86xARycu/Pf9bsDl8Du2k/75asjSjcLRnCARuLDTMvV6+wKJiUyq2gi xyKWUgEXRilDmDZOEQXzJwaZbK9vg8D0zpf7pLoPncji6MVIslO8v2e6OBmc4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjb5Jz1z1CPd; Thu, 7 Mar 2024 01:06:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716h8C006391; Thu, 7 Mar 2024 01:06:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716hq6006388; Thu, 7 Mar 2024 01:06:43 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:43 GMT Message-Id: <202403070106.42716hq6006388@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: cec2adb0d3ef - main - heimdal: don't try to expose nonexistant symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cec2adb0d3ef91fc4279529a65975a934bcd2ff4 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cec2adb0d3ef91fc4279529a65975a934bcd2ff4 commit cec2adb0d3ef91fc4279529a65975a934bcd2ff4 Author: Brooks Davis AuthorDate: 2024-03-07 00:55:11 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:55:11 +0000 heimdal: don't try to expose nonexistant symbols For one reason or another these symbols aren't present so don't try to make them available for linkage. In the case of libroken these seem to be compatability bits we don't need a thus don't compile. For others it seems to rot upstream, but I've not investigated deeply. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D44246 --- crypto/heimdal/lib/hx509/version-script.map | 5 --- crypto/heimdal/lib/kadm5/version-script.map | 2 - crypto/heimdal/lib/krb5/version-script.map | 22 ---------- crypto/heimdal/lib/roken/version-script.map | 65 ----------------------------- 4 files changed, 94 deletions(-) diff --git a/crypto/heimdal/lib/hx509/version-script.map b/crypto/heimdal/lib/hx509/version-script.map index 7ee26dd91922..99ce18daf7b4 100644 --- a/crypto/heimdal/lib/hx509/version-script.map +++ b/crypto/heimdal/lib/hx509/version-script.map @@ -21,7 +21,6 @@ HEIMDAL_X509_1.2 { _hx509_request_add_email; _hx509_request_parse; _hx509_request_print; - _hx509_request_set_email; _hx509_request_to_pkcs10; _hx509_unmap_file_os; _hx509_write_file; @@ -51,8 +50,6 @@ HEIMDAL_X509_1.2 { hx509_ca_tbs_set_unique; hx509_ca_tbs_subject_expand; hx509_ca_tbs_template_units; - hx509_cert; - hx509_cert_attribute; hx509_cert_binary; hx509_cert_check_eku; hx509_cert_cmp; @@ -85,7 +82,6 @@ HEIMDAL_X509_1.2 { hx509_certs_free; hx509_certs_info; hx509_certs_init; - hx509_certs_iter; hx509_certs_iter_f; hx509_certs_merge; hx509_certs_next_cert; @@ -133,7 +129,6 @@ HEIMDAL_X509_1.2 { hx509_env_find; hx509_env_find_binding; hx509_env_free; - hx509_env_init; hx509_env_lfind; hx509_err; hx509_free_error_string; diff --git a/crypto/heimdal/lib/kadm5/version-script.map b/crypto/heimdal/lib/kadm5/version-script.map index 90bd6fee10b1..51235b784254 100644 --- a/crypto/heimdal/lib/kadm5/version-script.map +++ b/crypto/heimdal/lib/kadm5/version-script.map @@ -2,8 +2,6 @@ HEIMDAL_KAMD5_SERVER_1.0 { global: - kadm5_ad_init_with_password; - kadm5_ad_init_with_password_ctx; kadm5_add_passwd_quality_verifier; kadm5_check_password_quality; kadm5_chpass_principal; diff --git a/crypto/heimdal/lib/krb5/version-script.map b/crypto/heimdal/lib/krb5/version-script.map index 818e6e071cbd..05fc0cef1bd9 100644 --- a/crypto/heimdal/lib/krb5/version-script.map +++ b/crypto/heimdal/lib/krb5/version-script.map @@ -2,10 +2,6 @@ HEIMDAL_KRB5_2.0 { global: krb524_convert_creds_kdc; krb524_convert_creds_kdc_ccache; - krb5_425_conv_principal; - krb5_425_conv_principal_ext2; - krb5_425_conv_principal_ext; - krb5_524_conv_principal; krb5_abort; krb5_abortx; krb5_acl_match_file; @@ -109,7 +105,6 @@ HEIMDAL_KRB5_2.0 { krb5_cc_move; krb5_cc_new_unique; krb5_cc_next_cred; - krb5_cc_next_cred_match; krb5_cc_register; krb5_cc_remove_cred; krb5_cc_resolve; @@ -339,7 +334,6 @@ HEIMDAL_KRB5_2.0 { krb5_get_in_tkt_with_keytab; krb5_get_in_tkt_with_password; krb5_get_in_tkt_with_skey; - krb5_get_init_creds; krb5_get_init_creds_keyblock; krb5_get_init_creds_keytab; krb5_get_init_creds_opt_alloc; @@ -705,7 +699,6 @@ HEIMDAL_KRB5_2.0 { krb5_mcc_ops; krb5_acc_ops; krb5_fcc_ops; - krb5_scc_ops; krb5_kcm_ops; krb5_wrfkt_ops; krb5_mkt_ops; @@ -727,20 +720,6 @@ HEIMDAL_KRB5_2.0 { _krb5_get_krbtgt; _krb5_build_authenticator; - # V4 compat glue - _krb5_krb_tf_setup; - _krb5_krb_dest_tkt; - _krb5_krb_life_to_time; - _krb5_krb_decomp_ticket; - _krb5_krb_decomp_ticket; - _krb5_krb_create_ticket; - _krb5_krb_create_ciph; - _krb5_krb_create_auth_reply; - _krb5_krb_rd_req; - _krb5_krb_free_auth_data; - _krb5_krb_time_to_life; - _krb5_krb_cr_err_reply; - # Shared with libkdc _krb5_AES_string_to_default_iterator; _krb5_dh_group_ok; @@ -766,7 +745,6 @@ HEIMDAL_KRB5_2.0 { krb5_pk_enterprise_cert; # testing - _krb5_aes_cts_encrypt; _krb5_n_fold; _krb5_expand_default_cc_name; local: diff --git a/crypto/heimdal/lib/roken/version-script.map b/crypto/heimdal/lib/roken/version-script.map index bb2139ed74cc..94c8918b0eb1 100644 --- a/crypto/heimdal/lib/roken/version-script.map +++ b/crypto/heimdal/lib/roken/version-script.map @@ -4,23 +4,13 @@ HEIMDAL_ROKEN_1.0 { arg_printusage_i18n; base64_decode; base64_encode; - cgetcap; - cgetclose; - cgetmatch; - cgetnum; - cgetset; - cgetustr; ct_memcmp; - err; - errx; fbsd_ossl_provider_load; free_getarg_strings; get_default_username; get_window_size; getarg; getnameinfo_verified; - hex_decode; - hex_encode; issuid; k_getpwnam; k_getpwuid; @@ -36,15 +26,11 @@ HEIMDAL_ROKEN_1.0 { print_time_table; print_units_table; rk_asnprintf; - rk_asprintf; rk_bswap16; rk_bswap32; - rk_cgetent; - rk_cgetstr; rk_cloexec; rk_cloexec_file; rk_cloexec_dir; - rk_closefrom; rk_copyhostent; rk_dns_free_data; rk_dns_lookup; @@ -59,39 +45,17 @@ HEIMDAL_ROKEN_1.0 { rk_esetenv; rk_estrdup; rk_ewrite; - rk_flock; - rk_fnmatch; rk_free_environment; - rk_freeaddrinfo; - rk_freehostent; - rk_freeifaddrs; - rk_gai_strerror; - rk_getaddrinfo; - rk_getifaddrs; - rk_getipnodebyaddr; - rk_getipnodebyname; - rk_getnameinfo; - rk_getprogname; - rk_glob; - rk_globfree; rk_hex_decode; rk_hex_encode; rk_hostent_find_fqdn; - rk_inet_ntop; - rk_inet_pton; - rk_localtime_r; - rk_mkstemp; rk_pid_file_delete; rk_pid_file_write; rk_pidfile; rk_pipe_execv; rk_random_init; rk_read_environment; - rk_readv; rk_realloc; - rk_strerror; - rk_strerror_r; - rk_setprogname; rk_simple_execle; rk_simple_execlp; rk_simple_execve; @@ -112,39 +76,18 @@ HEIMDAL_ROKEN_1.0 { rk_socket_set_tos; rk_socket_sockaddr_size; rk_strcollect; - rk_strftime; - rk_strlcat; - rk_strlcpy; rk_strlwr; - rk_strndup; - rk_strnlen; rk_strpoolcollect; rk_strpoolfree; rk_strpoolprintf; - rk_strptime; rk_strsep_copy; - rk_strsvis; - rk_strsvisx; - rk_strunvis; - rk_strunvisx; rk_strupr; - rk_strvis; - rk_strvisx; - rk_svis; - rk_timegm; rk_timevaladd; rk_timevalfix; rk_timevalsub; - rk_tdelete; - rk_tfind; - rk_tsearch; - rk_twalk; rk_undumpdata; rk_unvis; rk_vasnprintf; - rk_vasprintf; - rk_vis; - rk_vsnprintf; rk_vstrcollect; rk_wait_for_process; rk_wait_for_process_timed; @@ -176,7 +119,6 @@ HEIMDAL_ROKEN_1.0 { rtbl_set_prefix; rtbl_set_separator; signal; - simple_execl; tm2time; unix_verify_user; unparse_bytes; @@ -186,13 +128,6 @@ HEIMDAL_ROKEN_1.0 { unparse_time_approx; unparse_units; unparse_units_approx; - verr; - verrx; - vwarn; - vwarnx; - warn; - warnx; - writev; local: *; }; From nobody Thu Mar 7 01:06:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjd6Xwxz5CJ4N; Thu, 7 Mar 2024 01:06: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 4Tqrjc6mjyz4ncr; Thu, 7 Mar 2024 01:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZoHP/LvR7IH88CbTKodefi6sq3RnciAXxvDLi8uUEw=; b=QUav0dd9pPx/9nqELFa+hZmUPmgv6fsgNIsmhATOfShrH/DIes+LzZgdTossZWtNm7+zHz BWrGdkkSGgl735TxQRmkx+APWwcsN78WnLf2fXkhNM8CQXHbNK1olDg5aGWYBg537fB0h+ z+w/rMcZlUlLaO0cdak5Ip+WTvyNYcbskEu1kT4iPoPepK4Od+3ldBFDmpvSr6tmAhV5gC 3W6Uf3V/o0dWsiD6gm1jV82vivWEJWMoUIAHf93E5e94yAVzxV18tj4SJdyBT0225udRdC VdR/P8zRxU7l+CzVNuBUmuF7FHPSBtTb1RM80X4F0kmJYxYpW3tX40N8JI7ucA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773604; a=rsa-sha256; cv=none; b=OGWjiwsteuBPg38qhhn/oqNJPvW5Frvib94uwnYvkWpDB99WL36QaUtMSTl/kkny3aU8wK UnRsotkbT42OoUWdfxkuE7MykgWQ4xzoK+02Uy33XcbNpxNeembUhe8RK7Mw0N5LrMQuvZ zk5WLRjB3qRt2FkLvDBdxOI8YV61N6zE9GWp9CEytyVsEiKUGob4KBxZdf4IUAqciTLtJ7 ZYuCWpoCvZyLJjzIH1L7UxRNWxGaLridcRbwWeNl17GVdc+MMjX/H48WwmOWk551YcPh6S spFc5F1vDemILXvy83ZGGvtk+Z40h+UDjGKOWLtJR3kC9i5p2bvw1VBZ6Is3Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZoHP/LvR7IH88CbTKodefi6sq3RnciAXxvDLi8uUEw=; b=dneiCfk4U6a5avyvLi95Y0/sNabiW5hTtLBM0/HpT1R11ceQqxJ9uV2jdusg4lW1RDzTxg HiV1jrBJ2VU2ZFjnzupFfGMvSnluGY7Z3/8rsLim+NkkBm4gzusF6qx7OWcNQSA1dWPxim qryyNj5CCNunmKDNbyBAdYL4Y2cCjNAwKnyMzPXDHrmeFfg8KupxeHsiRNQOE5rLRp3qLB kq44mqsSWmBlhKfoLkN3/F7kxFs6SlC/IZxyJOUmypxpNdEhpGiBD+CRaxrq/3+46M/yZc bXntfVOoTXI2OJAGcqg902wJJPejhiExvAeAE9DVGo57MCgfkkUZEfOx6CILPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjc6J5Jz1CPf; Thu, 7 Mar 2024 01:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716idj006438; Thu, 7 Mar 2024 01:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716iqR006435; Thu, 7 Mar 2024 01:06:44 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:44 GMT Message-Id: <202403070106.42716iqR006435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 269593dc4a4c - main - libsys/aarch64: end syscall stubs with newlines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 269593dc4a4c516dcd29380b684cead6bbeb31b4 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=269593dc4a4c516dcd29380b684cead6bbeb31b4 commit 269593dc4a4c516dcd29380b684cead6bbeb31b4 Author: Brooks Davis AuthorDate: 2024-03-07 00:58:29 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:58:29 +0000 libsys/aarch64: end syscall stubs with newlines Technically speaking, POSIX text files must end with a newline. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44231 --- lib/libsys/Makefile.sys | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index 706adc974feb..b3d41c804290 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -150,7 +150,7 @@ NOTE_GNU_STACK='\t.section .note.GNU-stack,"",%%progbits\n' NOTE_GNU_STACK='' .endif .if ${MACHINE_CPUARCH} == "aarch64" -FEATURE_NOTE='\#include \nGNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)' +FEATURE_NOTE='\#include \nGNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)\n' .else FEATURE_NOTE='' .endif From nobody Thu Mar 7 01:06:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjf1QTqz5CJ4P; Thu, 7 Mar 2024 01:06: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 4Tqrjf0L3wz4nd4; Thu, 7 Mar 2024 01:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WYwHnwGk/rLjzwH4cCHirrSotmNzHD2BJysMfABU6cc=; b=Ugw6Av4UsmQmTOTkJbgiN9M96rFeIiMSDQ+nMBdH1dzuIC1G3A88g9PK52cvzEKha4+7Xk nUHXRW0h2W7Kkv6GtcPM9I+Rvk3qjf76KM8pHdj/3WlN9e9G/O+rOKGCkKCO24DK/OeAgL cQXVnscOKrAiXciAh612tMC74ahYumaqa73uu4ztHOKAxwxcSU0pi46vaYX5KP5X4uCwhJ Hkxdwa/g5DSKO/7vXnG47N6FwMmc/MkgenP+oHV2Mfg4nh8vAOLdiF7/3JjdytxbX16Fp1 2dMkH8jcfyAbPgxBGkJGOjYY+YXz7hkP03E8d6S5Tr06BxgsOq4B8MceciW8PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773606; a=rsa-sha256; cv=none; b=TG6GX/4B1K1d519cVUTvUnQvu3m8/9us0xi7PEAFwD8sb4gF02nopJLiUEPVmIorxV+Xen NQyl+E4fiZb98SdPBhWlQMOfS6NWMj6e2w83rWypedce5RSA+cgnzpCu9Sy3zKUyVBtgGW 6gPpcOtDe13LWOlZGyyhfPSjXPs+ERI7oo3QFO0bc4/OAN0x5ifJIZWF79xFLMN8cGENfq iR23DUAzCs6CrpBPZaMVsf2F8QOwxaj+iDtphslb9ORLtOBjhKaONT2b4DBQRsjIoy5wWb nWC2Gjf0fN2nmlKLVKHdw6CD0oTYUGwmh8JHp+ySzeHYFEOmZfnyUxwlTHDQhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WYwHnwGk/rLjzwH4cCHirrSotmNzHD2BJysMfABU6cc=; b=aKEFl60oZOmNCxBQ5UkCSwXq9Shih8PBjIeGSwXPEl0K9tkdgFCutd3HHhSV+1Bt6UB8O9 u/TAjQibUxcxDLE2gtzjhtfue2nLzJks5y8q8ou8tvbbr/cdhRHeWicFA6pzJ0Pq6pU8WT 7/kkSUT2Ip2nmuQ6VUz3ujWVfFdG7xfpCZsSDxVRRVGG2+0zGCca2dlghgwql11qkStCO1 YhYkC4R2nfIHe4Yp7TYhy92JDk0wlraSoUGEvviH3o4sI7TvciQxAj+5zhGhtZ+K3LF7Q0 S4ZYT0PZcVfeDrOiXyYvizEd3ST3Az2dAQFlapThpAjGq8IfsV/PsaiCyx00cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjd73v1z1Cnt; Thu, 7 Mar 2024 01:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716jG1006483; Thu, 7 Mar 2024 01:06:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716jKC006480; Thu, 7 Mar 2024 01:06:45 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:45 GMT Message-Id: <202403070106.42716jKC006480@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: e6ffc7669a56 - main - libsys/riscv: Remove pointless MD syscall(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6ffc7669a56bbacb276a107f2bd1146787e86d5 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=e6ffc7669a56bbacb276a107f2bd1146787e86d5 commit e6ffc7669a56bbacb276a107f2bd1146787e86d5 Author: Brooks Davis AuthorDate: 2024-03-07 00:58:44 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:58:44 +0000 libsys/riscv: Remove pointless MD syscall(2) This file is functionally identical to the stub generated by Makefile.sys once the MD version is removed. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44232 --- lib/libsys/riscv/Makefile.sys | 1 - lib/libsys/riscv/syscall.S | 38 -------------------------------------- 2 files changed, 39 deletions(-) diff --git a/lib/libsys/riscv/Makefile.sys b/lib/libsys/riscv/Makefile.sys index e4e66ba19bd6..2ff84735f484 100644 --- a/lib/libsys/riscv/Makefile.sys +++ b/lib/libsys/riscv/Makefile.sys @@ -2,5 +2,4 @@ SRCS+= __vdso_gettc.c \ sched_getcpu_gen.c MDASM= cerror.S \ - syscall.S \ vfork.S diff --git a/lib/libsys/riscv/syscall.S b/lib/libsys/riscv/syscall.S deleted file mode 100644 index 54dbff768f93..000000000000 --- a/lib/libsys/riscv/syscall.S +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * Copyright (c) 2015 Ruslan Bukin - * All rights reserved. - * - * Portions of this software were developed by SRI International and the - * University of Cambridge Computer Laboratory under DARPA/AFRL contract - * FA8750-10-C-0237 ("CTSRD"), as part of the DARPA CRASH research programme. - * - * Portions of this software were developed by the University of Cambridge - * Computer Laboratory as part of the CTSRD Project, with support from the - * UK Higher Education Innovation Fund (HEIF). - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "SYS.h" - -RSYSCALL(syscall) From nobody Thu Mar 7 01:06:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjg4NcYz5CHxJ; Thu, 7 Mar 2024 01:06: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 4Tqrjg1KMnz4nlR; Thu, 7 Mar 2024 01:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9lehCZ7Vse1RflSVNxOSF0Ssd9U7pfllEB3uJMqAUOk=; b=sIIMpme/CvVvNBQJi1ZZr/ux5KxnjH4lB4//1LgP8w2n6FMpsliQdyURWbLFR/HJXp00vK XeHYz5akPoZPJbqp+Gi3HdSPzWs/TdC+/KMh/dog9yheWfYuu1sE3vfD/ByMziqHuCZBI2 YJ/ePPDEtd5a8MTaQrUNybgMCAdMADvfNut76TaPYYAbMonZeKN9fYluPSu7LghjwNt2c4 stHdKDRRj9G/q8hXpOs4aqLKbJqxJMknMVITsJsOv9QPGVsuIyF7l53m6GJY7QSvA92wrB iUJfwIUTM7TudLbCE3JgxD1FxpfeLLvHFix/OxDoJcXfv763Wpj7zoaBDRifaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773607; a=rsa-sha256; cv=none; b=V+KX6F+toEaJ45u9Wjb8ZsVk1PKLRPLeBpjDp9u+fTWq4wreDzomVbETraHOvaZo6MuPTc qAjBQIRKZQOdgxjMbA/kFhunF0l/KQ3AduMLhPW/O8y8dRRvosd+BimS71trXNJ5uOD7OS U8+bOyKIg5N2N93HjYPuggC+gBGuvM/LMKxu6EQadc7XNxQOKS25UTaWys5IvjauI1MFIa Hb7T8OgjsCG7TfwZfp3FbJf+VlTEl85QXYVgAv4X3YXUrnt6uCkho1tcpBpsXMG9fI10s+ Khs6VfdVu/5RqyDGGr0QqJjbIkeGcEz3xA9f2kdQSYBAW8HFqDtlabxmwLiM5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9lehCZ7Vse1RflSVNxOSF0Ssd9U7pfllEB3uJMqAUOk=; b=hDxtdVtA9rv1MPDkQvWIBMOZvJvRzRnNcqBlHqrIILhCkzZ5V0wTdzr99D8YO/goGC8iFa p/XEavqJcuCaBMbEAr427Hc7SaUJxUTtUcqybhllAfr/08PXRoqqUtCBYRU+2D8lfl3coT yIbTaWIBB4QlB7Kl405SM1ZaefFWHD/CK5PhEAu+M0/mbcM8kpQtjTFSMLcEPk4k1ouXwm g9kmj5ys1FF3fVO4ZJCsm69ZfSZ/P8N3KoMQbGD5/3bUAX3F3SuM52LngKOIpCCfgVRmvs wMWX+RlTqvLKUuuooyEvdzxsWOsWe7jAaV+t3YDm3eY4p3/U7Qmt2AirOJy1bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjg0wTnz1Cbd; Thu, 7 Mar 2024 01:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716ljr006526; Thu, 7 Mar 2024 01:06:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716l7b006523; Thu, 7 Mar 2024 01:06:47 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:47 GMT Message-Id: <202403070106.42716l7b006523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 0ee0ae237324 - main - libsys/arm: Remove pointless MD syscall(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ee0ae2373242a4d2283cd46563296dd1cd1ced3 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee0ae2373242a4d2283cd46563296dd1cd1ced3 commit 0ee0ae2373242a4d2283cd46563296dd1cd1ced3 Author: Brooks Davis AuthorDate: 2024-03-07 00:58:55 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:58:55 +0000 libsys/arm: Remove pointless MD syscall(2) This file is functionally identical to the stub generated by Makefile.sys once the MD version is removed. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44233 --- lib/libsys/arm/Makefile.sys | 4 +++- lib/libsys/arm/syscall.S | 37 ------------------------------------- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/lib/libsys/arm/Makefile.sys b/lib/libsys/arm/Makefile.sys index ccfaa03a201b..27d78978a2f4 100644 --- a/lib/libsys/arm/Makefile.sys +++ b/lib/libsys/arm/Makefile.sys @@ -1,4 +1,6 @@ SRCS+= __vdso_gettc.c \ sched_getcpu_gen.c -MDASM= vfork.S cerror.S syscall.S +MDASM= \ + cerror.S \ + vfork.S diff --git a/lib/libsys/arm/syscall.S b/lib/libsys/arm/syscall.S deleted file mode 100644 index ccf5991e67b5..000000000000 --- a/lib/libsys/arm/syscall.S +++ /dev/null @@ -1,37 +0,0 @@ -/* $NetBSD: syscall.S,v 1.4 2003/08/07 16:42:05 agc Exp $ */ - -/*- - * Copyright (c) 1990 The Regents of the University of California. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include "SYS.h" - -RSYSCALL(syscall) - - .section .note.GNU-stack,"",%progbits From nobody Thu Mar 7 01:06:48 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjh5WC4z5CJ4W; Thu, 7 Mar 2024 01:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tqrjh2JCqz4nnq; Thu, 7 Mar 2024 01:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C3VKZU16lIV2e3hb3EOeMuoRFarV9QDct3H6xUAR7Fo=; b=Hhr1udqtFNXQN0nKGxTzmPkTkyj/IPmGMVx6vYxpam1svxnJmDkXIzKspQtNCDKPo8+bJF lFL9qEAoA+wdgem0vCkN7lB/OAI5CXTUjROshz731eYi/c8psDEIXptx4eA8jwRsx82j91 3xwC5hwhxh6phKeifpxdkj5YpsA2cNC/HT7wdv34BwtYltXnUY835XcWgRAT4JFo9zG/fa qTszQZzxgc3+McOJNcuX2WGuXQoa+Szp67RjPysxoiSFhvHXbUQZ+T1ndO+UA8XILIsRUK MyV94mt4VLaRlu05245O3dMjE045PfoIqChvoZe0hC2Ie0DzF58D3yQqR/5z/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773608; a=rsa-sha256; cv=none; b=H1jZHAM3+LI1TtiQnUhE5N2tlwRGhiby0hJufTnWoHS14+580gXUAckRO5ZqmjEOnUWhXm tmKyUue9o2GkqdulcAig4bp2kU0ZR59N4339lFFRzep9+OgJqiN5kKgcfXVkogvNZFR2sY FIMHkzxA/SqQVrTu2fRjGmLfrIBRbKTkGbrrQ/DGFjSiio07nt2dvKy0zR4aFyQxjKUobi VKDHMIY8JiZ0xCjGc1Agw88W6B6cHpoVcUuNhNldyOqtIh0MZySIxn6MlpdqHyfZdeM4yD XDAsYagvdps9YxKKN2NxamhKY4SPIqkV1lKNsADqi2vbuoXJTRgrgnpy540p+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C3VKZU16lIV2e3hb3EOeMuoRFarV9QDct3H6xUAR7Fo=; b=AjmTrMbVIsgjsUl8nsBOCo3Zqqkn9b7YQPhKx+zqvH9XS/U81gPnjO89JhlS2BOYidvf3/ hFzXJt2a+CVE3f0gWItfkrAdfnQydPgTr21l8SIF4J8xbj/7sKGrf3dVPe18XQ11eMCngD srTSuXa7lbggMWsvCVdtAXZoWhGREbI76H4sII8yhksFrnQM7v3clh7+Sk/ftnnasHCNgq 10QftHVBgZI9dh6I/qivbi04/p0LHnseNI0sUYVGR5vCOI3yut6sNLEOL6WHFtnMbc/zOZ sNcPtioWLAjRNCvfvTQkCTn9biLK8gNDQd6vMWMQXo4HbCxuugZUvIjAhh5/eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjh1wctz1CsW; Thu, 7 Mar 2024 01:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716mu4006569; Thu, 7 Mar 2024 01:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716mGM006566; Thu, 7 Mar 2024 01:06:48 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:48 GMT Message-Id: <202403070106.42716mGM006566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7b3836c28188 - main - libsys/aarch: Remove pointless MD syscall(2) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b3836c28188efc1599cbbe6879616836341e426 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7b3836c28188efc1599cbbe6879616836341e426 commit 7b3836c28188efc1599cbbe6879616836341e426 Author: Brooks Davis AuthorDate: 2024-03-07 00:59:01 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:59:01 +0000 libsys/aarch: Remove pointless MD syscall(2) This file is functionally identical to the stub generated by Makefile.sys once the MD version is removed. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44234 --- lib/libsys/aarch64/Makefile.sys | 1 - lib/libsys/aarch64/syscall.S | 35 ----------------------------------- 2 files changed, 36 deletions(-) diff --git a/lib/libsys/aarch64/Makefile.sys b/lib/libsys/aarch64/Makefile.sys index 38eb13fb89be..04b95602c580 100644 --- a/lib/libsys/aarch64/Makefile.sys +++ b/lib/libsys/aarch64/Makefile.sys @@ -4,5 +4,4 @@ SRCS+= __vdso_gettc.c \ sched_getcpu_gen.c MDASM= cerror.S \ - syscall.S \ vfork.S diff --git a/lib/libsys/aarch64/syscall.S b/lib/libsys/aarch64/syscall.S deleted file mode 100644 index 037c4b12ddae..000000000000 --- a/lib/libsys/aarch64/syscall.S +++ /dev/null @@ -1,35 +0,0 @@ -/*- - * Copyright (c) 2014 The FreeBSD Foundation - * - * This software was developed by Andrew Turner under - * sponsorship from the FreeBSD Foundation. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -#include -#include "SYS.h" - -RSYSCALL(syscall) - -GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL) From nobody Thu Mar 7 01:06:50 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjk5LgCz5CHyx; Thu, 7 Mar 2024 01:06: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 4Tqrjk49Rkz4nk3; Thu, 7 Mar 2024 01:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rL3sNH3jcM0tX8334WsRFFu6XoKS7RNwM/FBKp22g3w=; b=fun58/ojfaSi3XGTGUzDqLazQBJlKbXIZxQMrYpjp/BLVlTwAwlHDs+N7f/sFuFcT/RBmt WnVRE1/wjhyrunLHiF/Ehyx8JSDo9XU8E2R0CrtZhMKQa9IvGht+U1PQuoRYQidLGrcN5Z fW+5t9ztwM6OsE4Pbd/+5q+s2uvq7W2EKvkMf2++Rer+hwO1BK4exltbwZoxYhrcyN65Kq oRZATj25x/ZfcvWXq/O4n3VO/53W77ufd3FhAMLOKB62aodSpH3G2Ow2cB0j+kJNf4brel +eXH2mSgekGPa35APifL+VW8LLiopG7wXeyAU9x+THvossqJkndziwPNQKbWlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773610; a=rsa-sha256; cv=none; b=U0K0fr2eLO71eG+Nzvu087+oSrt/fKdnwE4BqS6sWY/ygrMelEy4Q4dvEVk7Qc7uaJl5mV 2DEc4nNFibyX29TVBt+8WUU6U/fnv89xj3A8UWd19tt4d96wlooNlZ1fPusyUXTWgAdW8T ULe9Y85dVNosM3ULOra9OiasOyXwXzDn7DpMfNCV67kN17KsQtyf0NFxdj8g2homB7n6w8 lZwVp/Y16kXeJX2zGuorwoeeBjTPoFfKjyhRW755e3IFlbCXGBscoB97C+js/ldDCiEF4Q cnjSMXDR+VCUx0dJqt24wS19LMZlvkXFUvlHX7tccUVmW3YGBtvE+HOfGW1EXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rL3sNH3jcM0tX8334WsRFFu6XoKS7RNwM/FBKp22g3w=; b=DF03vg+Nwad15onZX2j8kaYvzB7T/pUYZlBFawkz9FhBe/BcbI7gGViBuv55YNfaGnLtG+ DiSUnvyMUNNitngK+rk5JHOGFxxV/VIgncI6VpQw7//ei1Z/4s0R7P0mE8uc74/jWr/CiJ S8afvvXx5LVN975duQCoqhte6sQhT96EXGcNC2TYKY1t2Cqh6f2IgcptvygweSpAT55fPy bVtzKURZALKVfOaX7qU3TkkrOrk7J9ge4+2tefsQFr5CAdI/A63W27y8Ac6ienhSCH67zH 9jlnXlivcSBzN5WtggxHXMqkJ5vRbR17MLkdsGtZhowMuMrw6aKIDZplY4Y6WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjk3nSHz1CsC; Thu, 7 Mar 2024 01:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716omt006662; Thu, 7 Mar 2024 01:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716oV3006659; Thu, 7 Mar 2024 01:06:50 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:50 GMT Message-Id: <202403070106.42716oV3006659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: cc4ffc978668 - main - libsys: don't try to expose yield List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc4ffc978668cbc9cd58ae7c9e01025a276aa5fd Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cc4ffc978668cbc9cd58ae7c9e01025a276aa5fd commit cc4ffc978668cbc9cd58ae7c9e01025a276aa5fd Author: Brooks Davis AuthorDate: 2024-03-07 01:01:36 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 01:01:36 +0000 libsys: don't try to expose yield The undocumented yield system call has never been implemented via libc or libsys (except accidentally for <15 minutes in 1998 between commits abd529cebab9 and 0db2fac06ab7). Avoid trying to export it now to avoid failures when linking with --no-undefined-version. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44236 --- lib/libsys/syscalls.map | 2 -- sys/tools/makesyscalls.lua | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/libsys/syscalls.map b/lib/libsys/syscalls.map index b79c512834e0..eeb75dc28a2c 100644 --- a/lib/libsys/syscalls.map +++ b/lib/libsys/syscalls.map @@ -353,8 +353,6 @@ FBSDprivate_1.0 { __sys_aio_cancel; _aio_error; __sys_aio_error; - _yield; - __sys_yield; _mlockall; __sys_mlockall; _munlockall; diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 8784ff603e81..6f21079d0ebc 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -924,6 +924,10 @@ local function handle_noncompat(sysnum, thr_flag, flags, sysflags, rettype, config.syscallprefix, funcalias, sysnum)) write_line("sysmk", string.format(" \\\n\t%s.o", funcalias)) + -- yield has never been exposed as a syscall + if funcalias == "yield" then + return + end if funcalias ~= "exit" and funcalias ~= "vfork" then write_line("libsysmap", string.format("\t_%s;\n", funcalias)) From nobody Thu Mar 7 01:06:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjj4CL4z5CJ2W; Thu, 7 Mar 2024 01:06: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 4Tqrjj3Cj7z4nbH; Thu, 7 Mar 2024 01:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0uK724dUJzhfNzXLOZ0+ksQ3g3G/tBgMN8y3faPg/+w=; b=JLj+RCdROdPZjVvDw7dg9GvuBvLrCRYIqDm9RrVWV1uyEdpBOHjmJSYLxwwjFSEbSvivnU IuSajlesvUpTVal7zr/ne3gQKqLrhg46gDjOndMH2SSoErD1n2X5jeCV77HpB526DBQuXE QGeYNkiF3oi+ZWR4wvVnAC1eC7lOkyYUVg+LXYf6aCrgHp6ZX0AlS3RcfouTl+gn5zx/TQ +FsN8hH0Nt5HzXd7yfJUueezPuMNAq155gx4gQ1lvDuxuV3q+RVz1CTfDRzEz2miwJz+I/ ixDfHwO20jt5XtFjl0La6nQX2oF5/ZqZ32/x+8sFXBSXQ/A6yZIX1GIhASbONg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773609; a=rsa-sha256; cv=none; b=cqeXHBBS80r5tLHYQiImoz5YLRd13fxCYs2MePWaHVf5M3VLbQe2pZcb7gSsuczan2jM93 5OZPWAjK6ykXisC0H6TKYnWsLvmVkOqSDz9c5R4AAySGYmrGYR8kYzS6wukoKMexbzvR72 YN8D87yfwZp9Cj4n3B5fGExNe1IhacZjYT4NcCq5DLhNqFPfthAm2OjUp+qTvD66Dz1/HP KkLgZuXYVG6l3hNzEE8KL3JjPKkPqu42CdWmlriuO5E3OTOhzaqer1wcyi08Gj1BxkUXTv F8STjkzVqnUuAYhNdlKliNqV1yO2vSY9lk2NTK8HAQ6GdG5brRswJ6fNlfdBFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0uK724dUJzhfNzXLOZ0+ksQ3g3G/tBgMN8y3faPg/+w=; b=Lm84FjfJ5oiFM28TfjIFQuiq51XYW4PXAfl1KHY8UYdZIlJbkia9ohll6hu8UhhBgVtCJl xY1+I1+CFD4XUqCKrh2F5Kr2MyEkt9PVjPsCRqO3mF2M2CsMZDRGQvDKoBSZhNJf6NE8Yg ohAsbEPLK6Mdu618QILLprYjGXbo/6CD7WhuGnGBgI/QUAhn6wr0FOr5kuYxqXBkjFirgR oHtzLFZolx8KNiVkthngSeEpDvjf1qBNsRHMW0Ny8XwJNGBDMNbpJmfFfw451KL1fyNdbX KrQKtKeFrD2Kkna6oLRt0ricAHQMwHZYzfFqDhg0YXcZG3T7YQghMbmhKAH+pQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjj2kkyz1CsB; Thu, 7 Mar 2024 01:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716nXS006617; Thu, 7 Mar 2024 01:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716nQm006614; Thu, 7 Mar 2024 01:06:49 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:49 GMT Message-Id: <202403070106.42716nQm006614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 39a15d747007 - main - syscall(2): make i386 less of an outlier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 39a15d747007b934cc515d6151595055d8262828 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=39a15d747007b934cc515d6151595055d8262828 commit 39a15d747007b934cc515d6151595055d8262828 Author: Brooks Davis AuthorDate: 2024-03-07 00:59:07 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 00:59:07 +0000 syscall(2): make i386 less of an outlier Unlike other architectures, i386 only defined syscall() and not _syscall() or __sys_syscall(). The syscall() function then invoked the desired system call directly rather than invoking syscall(2). Keep the latter as it's marginally more efficent, but also create the conventional _syscall() and __sys_syscall() stubs. This avoids the need to special case syscall(2) in the symbol list generation in libsys. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44235 --- lib/libsys/i386/syscall.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libsys/i386/syscall.S b/lib/libsys/i386/syscall.S index 9eaf193c1d7a..bed7156e28ac 100644 --- a/lib/libsys/i386/syscall.S +++ b/lib/libsys/i386/syscall.S @@ -44,4 +44,6 @@ ENTRY(syscall) ret END(syscall) +PSEUDO(syscall) + .section .note.GNU-stack,"",%progbits From nobody Thu Mar 7 01:06:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tqrjm1Tffz5CJ2q; Thu, 7 Mar 2024 01:06: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 4Tqrjl4wfSz4p3C; Thu, 7 Mar 2024 01:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Qth6CO2xOMdSj5rSWw7mGRnCdCvyYykYEp4h2enMZ4=; b=psUJSoUEB5IFEX7plfNUTxylpAH74DUzALNbNHYsYgq8C/+jO6R/AX4mTbFJ6z5bvkzl4y JOAO29IzEEJe4JGmrIXl10gHm5K9bqAj95onu73VDYA9g+2C9ub6H3kh19nF6fnsVWXg1E 9Oqt6n3T3WviDQusuoHT/4mdMnXqdwhnEC5H5WuFa3WiLmeAxHWm584z0YD7dEZ/xqc4mh lgDOjDuHxYVgt3k7MVgIKvWERdJ5Jp7Qxg0PPAFovcHKb8wPksJypxtv6aXIBn2jnivVOY d8vrp85THf3UuKfMs/fpeHjRBhQEG/KVHqPxcKv/eD0cfBPkK6yXtSpqKhytwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709773611; a=rsa-sha256; cv=none; b=Uu3uRS7xrLqfCv44qDSV/vwg8qSTivEAjqDTNloY2m5D3msMHAQQDyaCY+i20zLv+5FLy/ 3wf938KBbrEe2mKewYu723OHq/hBNIeOGaOWHdkttOVFnbexnavuqhzjcfT3PqizUHc0D1 0mCvJJAhKN3BdPpFhew/KMQDX1c3QCZmWoMnQi6t5orAX2NltUJdgw+jEe/q1ppwKtnOU2 YtFBETSvGxQnSNXnBasd5CE6QfHgVF1OmYd8ZqzALf1XXXK/nGPTiCvmf9bRZYOfP4f1m2 6CK05PHQIbaNTmGH75s/HUFtK0Gi+LrvmSxtrskjUqW3K0/Ruf/ZlAls+ogHNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709773611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9Qth6CO2xOMdSj5rSWw7mGRnCdCvyYykYEp4h2enMZ4=; b=axI6Te2C9OGEdL3Cr691i/aR65cZORoori1vroosQ03LADMylahTn6LlB3qYhE8WE1Y5DK g3n3w5ctTWXsLbERl1IAXGzSwrsIuy6ipYUCrZ+Os+dqoNidofDxICnoIrYS66R2HG16ud MR/Lgif0paUK7cN7IcvkB/gKtKuAQenDuhUxakEwsc1YmbJ5S7nsCo5M6tDRP2mMbR+3Wq tCN0QrgqtNqVeRg8CBNFN6KO9ghYq4chXjO6v0b58Y0mvT0Wh6QW0b0W7VuJo4s4Kj1ksr RW0T8hfTGR9oMPVasoWP3AGqQEim/g8yhW4swwCyqneQAE9uQYEVk168C5RhNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tqrjl4VYbz1CsD; Thu, 7 Mar 2024 01:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42716pCN006701; Thu, 7 Mar 2024 01:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42716p7w006698; Thu, 7 Mar 2024 01:06:51 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:06:51 GMT Message-Id: <202403070106.42716p7w006698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 83392afeebdb - main - libsys: don't expose __init_elf_aux_vector List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 83392afeebdb9e6d6216e0c5f5b3a3a3aeb56057 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=83392afeebdb9e6d6216e0c5f5b3a3a3aeb56057 commit 83392afeebdb9e6d6216e0c5f5b3a3a3aeb56057 Author: Brooks Davis AuthorDate: 2024-03-07 01:02:25 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 01:02:25 +0000 libsys: don't expose __init_elf_aux_vector __init_elf_aux_vector is now complied statically so don't try to export it from the dynamic library. Fixes: 8271d9b99a3b libsys: remove usage of pthread_once and _once_stub Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44237 --- lib/libsys/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map index 4f72ea204039..1a24998b1465 100644 --- a/lib/libsys/Symbol.map +++ b/lib/libsys/Symbol.map @@ -1,5 +1,4 @@ FBSDprivate_1.0 { __elf_aux_vector; - __init_elf_aux_vector; _elf_aux_info; }; From nobody Thu Mar 7 01:39:12 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqsR50tV7z5CLlK; Thu, 7 Mar 2024 01:39: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 4TqsR50NHMz4vLY; Thu, 7 Mar 2024 01:39:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDnsPyodec7cnjIMbTFAumgFrMSXB8wu1Lg+R3ZMptM=; b=ClZXGNLthXnW8qEanAHFeoTT3PvBMtBJkTQfRFY/yqYEH2xOLCnVIKt7uS29fEz6P7B0FN C+rHtBaaWi83j8JMHJL40PqkDplNnbc4QGi5n4w96rvUtAWNpo7L1M27kF/ktUWaWT+Rgs PVN0mZoj4pwVksJIKcQ6omhY03EVq/TpKQmTBFwvlUf5XLNX6/6qEyWEDhtOVe+nXrEGpD ZO+fDiKH5pu3oYUByiCJ3PmKbFPg2nsMAco/ZHxrqKXVO3R6O6eiSPr8mhqvWf7xEmVtmT YnuvhO+1hqLdw8RxKB12TZtJ9VtD3jZxmQJaa0V9adw+BLpa6f0Hb05ODH2UCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709775553; a=rsa-sha256; cv=none; b=xR6lHMXi3fV1a146/G7YOS94F+4v3LUL3oCzMbPDu1dZz8QVZjn/LNkQegOT8U7VHW6Obx gvvrntiPaXm4mYj4wNHJgfJ4JcOca85nX/jdIUGjHOuqxx3iinVdEjlts1rsFAu5vjGksm xUp4AVe1n3PAkhQdFxBlJTd7OvyJZmGvu8O9KW1lDeg5Z2GnlKoG/Ka8Voey0lQuO0Dane LBNn0qRRNAyDSdPxUIn3tf/UF3U3w1i1Z58djyrpALnNu4IqF6SL23D6TK+dGNYeSrFuTS nP1oZE5cIhr4NhGUIX2Cv5KqlhTcBcVoXTrQbDdMlkIvnYLGQeVOj7RcSbYfSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pDnsPyodec7cnjIMbTFAumgFrMSXB8wu1Lg+R3ZMptM=; b=bdKg9zH/2Kn4wIiQdE80D3Z2ILrkcsZ2NxUkybUaY7XzL23z0o/yxz1nfD9q+LHX008SeG qeZ/rU1QLULfUgvlk7T90QFyGlUwT9oL2jORha3RJYsDRX8+92yl2NY02Mm2Ysv2Wl4Owk +bbUpRVwMilJuCLu1z592Dl29um0Xt4dA2eeeld8MavFjIWmcW6TUiA0hVY5hyyxM9bPa9 LkQ63fogd0ubRXBWK5l/Syr2jlpkwYnrr8OrHoOJAyZZqGBjn8tPPcoGsykJq+IdRiYMLp OxopKZPoqTeidKGrQeavsnaB+d4TQx4n2jiWdasuJz+O8CsT5dBvyNwl8+AsZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqsR475l6zF3p; Thu, 7 Mar 2024 01:39:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4271dCZP057025; Thu, 7 Mar 2024 01:39:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4271dCXb057021; Thu, 7 Mar 2024 01:39:12 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:39:12 GMT Message-Id: <202403070139.4271dCXb057021@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fc3afe939530 - main - nvme: split devctl out to its own function List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc3afe93953082549e84925d303f4d9c8676f0ba Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fc3afe93953082549e84925d303f4d9c8676f0ba commit fc3afe93953082549e84925d303f4d9c8676f0ba Author: Warner Losh AuthorDate: 2024-03-07 01:22:13 +0000 Commit: Warner Losh CommitDate: 2024-03-07 01:38:59 +0000 nvme: split devctl out to its own function Split the devctl aspect of things out to its own function in nvme_ctrlr_devctl_log. In preparing to document this, and based on actual use, we want something different for the SMART errors, so this will facilitate that. Sponsored by: Netflix Reviewed by: chuck, mav Differential Revision: https://reviews.freebsd.org/D44209 --- sys/dev/nvme/nvme_ctrlr.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 0d33454125bd..1bc0331f002c 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -55,6 +55,24 @@ nvme_ctrlr_barrier(struct nvme_controller *ctrlr, int flags) bus_barrier(ctrlr->resource, 0, rman_get_size(ctrlr->resource), flags); } +static void +nvme_ctrlr_devctl_va(struct nvme_controller *ctrlr, const char *type, + const char *msg, va_list ap) +{ + struct sbuf sb; + int error; + + if (sbuf_new(&sb, NULL, 0, SBUF_AUTOEXTEND | SBUF_NOWAIT) == NULL) + return; + sbuf_printf(&sb, "name=\"%s\" reason=\"", device_get_nameunit(ctrlr->dev)); + sbuf_vprintf(&sb, msg, ap); + sbuf_printf(&sb, "\""); + error = sbuf_finish(&sb); + if (error == 0) + devctl_notify("nvme", "controller", type, sbuf_data(&sb)); + sbuf_delete(&sb); +} + static void nvme_ctrlr_devctl_log(struct nvme_controller *ctrlr, const char *type, const char *msg, ...) { @@ -71,17 +89,10 @@ nvme_ctrlr_devctl_log(struct nvme_controller *ctrlr, const char *type, const cha error = sbuf_finish(&sb); if (error == 0) printf("%s\n", sbuf_data(&sb)); - - sbuf_clear(&sb); - sbuf_printf(&sb, "name=\"%s\" reason=\"", device_get_nameunit(ctrlr->dev)); + sbuf_delete(&sb); va_start(ap, msg); - sbuf_vprintf(&sb, msg, ap); + nvme_ctrlr_devctl_va(ctrlr, type, msg, ap); va_end(ap); - sbuf_printf(&sb, "\""); - error = sbuf_finish(&sb); - if (error == 0) - devctl_notify("nvme", "controller", type, sbuf_data(&sb)); - sbuf_delete(&sb); } static int From nobody Thu Mar 7 01:39:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqsR61yDDz5CLyq; Thu, 7 Mar 2024 01:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqsR61Lzqz4vZL; Thu, 7 Mar 2024 01:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDt2dfxIir0TRgWJoYuOXWPB0Fy3h6AWB8DYABFLAJE=; b=fXNydrM5fvOlaLO5UxfR/J+bvx7sDCKk6KN6uAKcW7xXQ+bWo/vVqJJf3rZtxLDalThrAz JSaesTWm6pULmw+9c9PLJkWPXZZEXqFBOrNgDcQU1fiTSx7CA/QsCy+p1V/S4HCcJso4KT muXBwNiVz6V2jbg68xz4LOnykA5i+7SAktsNJg25+FmWQxKk9/vhil5ABZtNwC/mzcQiPE 6KGU5KmTNDmPU5FCGVl7kjYI1HOkxJp2qmTSZ/f49eQFzgIrpnbrIMLrRQVlYuwZsBHpFD v3wjMIY7tfZFiVHPV3cHhMzrnhdKOmmNlAUMIFCkWgqu+WaXQ5jm6bOiGXBdGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709775554; a=rsa-sha256; cv=none; b=rgWo1QRiy7Gv4TO1fcH5D95pxHl5SZTSfpkItiUF7NSYm9YctaWkQIW84996wPNrxAI9Bs smMHg9M3fqPFeHGj1WPFARzD/E6HVMYqB0TbCyyEAFGBZ8cSXwa0KJ4apqBhf2IXOJtgWK H7mJWy6PrsPQos57XLj7+zM2QYrVk7HDz/rZfVzHfsw3H3D+p+pluT/VW1b65tlUtFGU2Y mg+MWTZ8rX84XWzYoQAJh9xxZ2bjTY3bqNR0TX0ffq+TMKKxERZe8MGT+0ao71+/gMCQWz brrT4rHSMcansTrz2u86PpXufydtOcOY8vXDVPmLLqDH62AHm9EZa8KP46xxtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDt2dfxIir0TRgWJoYuOXWPB0Fy3h6AWB8DYABFLAJE=; b=YYifY14fbUsn4Ztyb5/n4refVlxl605R2yLGq4ZZMB2A/d0G+TqmHywTL1oT6OYI+W2PBc VtoOleaRfDAZZKfAaNImEESyX+dbzNIp5aF7mXcDZK5Xi35eEa2lUVotmu4s7Adedj1GUS F4rFsWzxrLrCnnU+ZHs/PM3wNqUDpRnyl/t9zJ393XEGMPbxRhCtuHwiHwmk3Bot3p41PU 3BBMgxBkM8DA+RJkL5oKVaJupR+DCytwpEiKV+LA6H0Gh1t/6jlhsj1k0XZ92h/XZ5jDGq uwQTVZVVnLjIvXwe9+6Ruc/7DBMGysraex3qX3203GYOv0A4Q/FjdjJXzPa2Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqsR60xr7z1Cvd; Thu, 7 Mar 2024 01:39:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4271dEMj057087; Thu, 7 Mar 2024 01:39:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4271dELt057084; Thu, 7 Mar 2024 01:39:14 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:39:14 GMT Message-Id: <202403070139.4271dELt057084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4f817fcf6a26 - main - nvme: Change devctl events for the controller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f817fcf6a26435ef634645d9be9ef641b6ee164 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f817fcf6a26435ef634645d9be9ef641b6ee164 commit 4f817fcf6a26435ef634645d9be9ef641b6ee164 Author: Warner Losh AuthorDate: 2024-03-07 01:22:26 +0000 Commit: Warner Losh CommitDate: 2024-03-07 01:38:59 +0000 nvme: Change devctl events for the controller Change the devctl events slightly for the controller. SMART errors will log the changed bits in the NVME SMART Critical Warning State as its event. Reset will now emit 'event=start'. Soon more. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D44210 --- sys/dev/nvme/nvme_ctrlr.c | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 1bc0331f002c..609794edbf67 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -64,15 +64,24 @@ nvme_ctrlr_devctl_va(struct nvme_controller *ctrlr, const char *type, if (sbuf_new(&sb, NULL, 0, SBUF_AUTOEXTEND | SBUF_NOWAIT) == NULL) return; - sbuf_printf(&sb, "name=\"%s\" reason=\"", device_get_nameunit(ctrlr->dev)); + sbuf_printf(&sb, "name=\"%s\" ", device_get_nameunit(ctrlr->dev)); sbuf_vprintf(&sb, msg, ap); - sbuf_printf(&sb, "\""); error = sbuf_finish(&sb); if (error == 0) devctl_notify("nvme", "controller", type, sbuf_data(&sb)); sbuf_delete(&sb); } +static void +nvme_ctrlr_devctl(struct nvme_controller *ctrlr, const char *type, const char *msg, ...) +{ + va_list ap; + + va_start(ap, msg); + nvme_ctrlr_devctl_va(ctrlr, type, msg, ap); + va_end(ap); +} + static void nvme_ctrlr_devctl_log(struct nvme_controller *ctrlr, const char *type, const char *msg, ...) { @@ -640,29 +649,25 @@ nvme_ctrlr_log_critical_warnings(struct nvme_controller *ctrlr, { if (state & NVME_CRIT_WARN_ST_AVAILABLE_SPARE) - nvme_ctrlr_devctl_log(ctrlr, "critical", - "available spare space below threshold"); + nvme_printf(ctrlr, "SMART WARNING: available spare space below threshold\n"); if (state & NVME_CRIT_WARN_ST_TEMPERATURE) - nvme_ctrlr_devctl_log(ctrlr, "critical", - "temperature above threshold"); + nvme_printf(ctrlr, "SMART WARNING: temperature above threshold\n"); if (state & NVME_CRIT_WARN_ST_DEVICE_RELIABILITY) - nvme_ctrlr_devctl_log(ctrlr, "critical", - "device reliability degraded"); + nvme_printf(ctrlr, "SMART WARNING: device reliability degraded\n"); if (state & NVME_CRIT_WARN_ST_READ_ONLY) - nvme_ctrlr_devctl_log(ctrlr, "critical", - "media placed in read only mode"); + nvme_printf(ctrlr, "SMART WARNING: media placed in read only mode\n"); if (state & NVME_CRIT_WARN_ST_VOLATILE_MEMORY_BACKUP) - nvme_ctrlr_devctl_log(ctrlr, "critical", - "volatile memory backup device failed"); + nvme_printf(ctrlr, "SMART WARNING: volatile memory backup device failed\n"); if (state & NVME_CRIT_WARN_ST_RESERVED_MASK) - nvme_ctrlr_devctl_log(ctrlr, "critical", - "unknown critical warning(s): state = 0x%02x", + nvme_printf(ctrlr, "SMART WARNING: unknown critical warning(s): state = 0x%02x\n", state & NVME_CRIT_WARN_ST_RESERVED_MASK); + + nvme_ctrlr_devctl(ctrlr, "critical", "SMART_ERROR", "state=0x%02x", state); } static void @@ -1172,7 +1177,7 @@ nvme_ctrlr_reset_task(void *arg, int pending) struct nvme_controller *ctrlr = arg; int status; - nvme_ctrlr_devctl_log(ctrlr, "RESET", "resetting controller"); + nvme_ctrlr_devctl_log(ctrlr, "RESET", "event=\"start\""); status = nvme_ctrlr_hw_reset(ctrlr); if (status == 0) nvme_ctrlr_start(ctrlr, true); From nobody Thu Mar 7 01:39:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqsR72YVvz5CLyx; Thu, 7 Mar 2024 01:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqsR71zLRz4vLq; Thu, 7 Mar 2024 01:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6hPwt3FPiIGxqsfFZ1kW1kZWWSx072jCUkpE6TW62Y=; b=hYCPTYtNgH/nneAujoB1SRJ4HnAtkXVRHCbV9AyjcaxZN1wnoVbvu/wajV0tJrb5xJagVo f+8eab4Zz9L05XLKI8tvnwI8ZsYxmWH6JEP0GYHvNlGl+Q4NVvrENuosPR45Z+kFXysV1v OoSgyCOCf5/ilXVKe2bJBRWuxWJ5svzT+OAG+hBcgfyGKVcEXE0tPetDRI1eEBVLg9yN+I 5WhQXYjx+hTkGzaxFrNy7qE7oeOh8MFYOUu4adXiZdaZwv8prIvvSUhzFs8gvY36oxaB6E MIrV4y+LFGuu63b2JwHE/Y1mkcqPF1i9AxuAiiYT3PJvZu+9rX9CIKPxwYefvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709775555; a=rsa-sha256; cv=none; b=B7KvTkZg+LZu0CyPkfpqNaeb+EgOeRcm6NYnEpdYXKoBXpRKkeCUKrq2IgcibH1hpKrH8p dpk+H8hm/WxWQ67/Jr+5VrsclGhuMFwHlThMh1wmqtFjCe+PHExVyIBDWSuyg9atNps+x7 E9V+B6BoK2q2PKxSMj7TV4awLMfWn0TbBT1wY/dzXxPC0lcB9unGwo2v/cq3m+uU8siFFY shU9CuOHIFXGqFsmHBNx4eTDlsx3AUFuEDIW24z34edYDfMur/xKggOeOoFV66M30drFF0 j+l/gu1l00ZLroIKqaW7KktKNF2aYuN2554QDD4VyX8S8Q81oEnjxEqfpqsWVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J6hPwt3FPiIGxqsfFZ1kW1kZWWSx072jCUkpE6TW62Y=; b=inrc+ltwGl8bChTZCjdo5MTZsTE4CIZYevYKAouSKl5+LlN4F5+hnYm71AaCKMaw0LBM1c kr/eTaQZLkuFjxIA9D+pi6ASmXYhWGf/OdrXExR3PeAe01H3pvXjtpEuSYvFYaNWIORJdk U/2sOGf5A6F+/mkZhPHcsPeGtf8tkOVhKuPNAmVnUqeqDsbcg9QSUSI1J01NOex5y0lVFL tlcJ4Du6jUB7DQPHh01f8hcAe87AakL0BFuPl3oBoas7DQMm0E9rHufgW7j+Mnmrqcgfuk bcLlEJrGge23CCA4+2HA0TDwH/a5i8Mbh/cRakZb5FFmRyBqsN9TdpTC181W6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqsR71XxJzDcV; Thu, 7 Mar 2024 01:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4271dFj4057139; Thu, 7 Mar 2024 01:39:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4271dFdW057136; Thu, 7 Mar 2024 01:39:15 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:39:15 GMT Message-Id: <202403070139.4271dFdW057136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5cdedf676d03 - main - nvme: Log reset success or failure to devd List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5cdedf676d0300966b0dbed073d0f34c59282e03 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5cdedf676d0300966b0dbed073d0f34c59282e03 commit 5cdedf676d0300966b0dbed073d0f34c59282e03 Author: Warner Losh AuthorDate: 2024-03-07 01:22:34 +0000 Commit: Warner Losh CommitDate: 2024-03-07 01:38:59 +0000 nvme: Log reset success or failure to devd We're logging when we start a reset, but not when we complete it, nor the result. Create now log a success or timed_out event for the reset. Currently, the only detectable error we have from reset is 'failure to become ready in time,' though the code looks like it might be more generic. Log this and if we ever have other failure modes, change the logging to devd when that happens. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44211 --- sys/dev/nvme/nvme_ctrlr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 609794edbf67..ca26ca8e92d8 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -1179,10 +1179,13 @@ nvme_ctrlr_reset_task(void *arg, int pending) nvme_ctrlr_devctl_log(ctrlr, "RESET", "event=\"start\""); status = nvme_ctrlr_hw_reset(ctrlr); - if (status == 0) + if (status == 0) { + nvme_ctrlr_devctl_log(ctrlr, "RESET", "event=\"success\""); nvme_ctrlr_start(ctrlr, true); - else + } else { + nvme_ctrlr_devctl_log(ctrlr, "RESET", "event=\"timed_out\""); nvme_ctrlr_fail(ctrlr); + } atomic_cmpset_32(&ctrlr->is_resetting, 1, 0); } From nobody Thu Mar 7 01:39:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqsR83qljz5CLtk; Thu, 7 Mar 2024 01:39: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 4TqsR82xqzz4vcw; Thu, 7 Mar 2024 01:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+nvtojJmuNLbAtYqRVN0GUv+LemjshlZFb1MreUrzY=; b=jWJhL2IGMRm3P1qocPV7OD+UMxBI2Q7voivCHtTkwcxd+zfg5+TuMehTVSg5Q8is7eQVeM vBVO8ULdy6iXT5Ea2/IjiinuU92vfF7Wow7V34bEhYyLUUA/JwaDg3U7uKnMBlPT6lH/Gi AspArOTyn55Fvo4TkQxPAlM2gVuuil11B6tBwMmY5hsgEaFW6PSB1Y6TaA8slHz1zmlQzo x3/ZTZ9u6nX+zqRKt63jB+3repR5Bvdmf+VmAnZ4z5JU3cyNLtTRS4I/7pNqnpAVAw/77y 5nmxRi9IwPhJeV050bAmWyWZ+NsG8qeRhNNY6f6vgQNvNtyNVKcteFu7iwNFfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709775556; a=rsa-sha256; cv=none; b=uXxtu1fvWsbdtUl4LQatEXlVG9W0f+wv+J1rw1UexE7idTRdqf6SOjFzJrdqBJZu2f/nLx AyoNFQXf+mS5fX7DYWx37P2YcRiMgQvi1oiyO7ftN2rVFZztPW8IUeJTY5dJe74pPC30ei orvNYHPj5+VlB4ywjIbwdKprnlXLj3wtCm8D0sKk5p18QTud/OHrzXjLtncLlz9jTXhbYR v92uAd8KzzuPG8kJkPuFaElsL68xa7bZm+isb208s45gCaR95gLStvUNMZPXLKZdatKqPu i6Wbg8QYiNJlp5o6bmLK9OeaVLt5TlCoVGHAAYxm5xI5w+IJiUoPY+iwQ092Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6+nvtojJmuNLbAtYqRVN0GUv+LemjshlZFb1MreUrzY=; b=bim1uR8fDi2iaXSJq7bikrSq+k/9okRBlkOdd/hqMn7czj3urMqGgSV6zLCwVT62OsjOEI d5qkEV53eAyuuDOl+2RHyLd+wzd37ugu9tvEujsyV5SiPEGEZz4F6baBgeVUeNpK6DRmpr dqmF/3kJfYYtoygQ2OzJwe/ITjzcSi4LyhLUD82tl+mfL7MZZ+99+AS7PxjEtaPdgj2/5q ayGsHX8r69TSgkkK4eB+vycW6VFis40wbmdRHpCU8eS2cM+rmnDlEo2nhHBOP4iF8Q2H67 oHTo6aCan6apRlbb0ebYG/6+CAjoQbIYoC4B585YW2r46+2mTexCsCTD9sVU6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqsR82YgLzDcW; Thu, 7 Mar 2024 01:39:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4271dGfg057192; Thu, 7 Mar 2024 01:39:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4271dG4P057189; Thu, 7 Mar 2024 01:39:16 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:39:16 GMT Message-Id: <202403070139.4271dG4P057189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2a2682ee5330 - main - nvme: Add SMART WARNING for persistent memory region List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a2682ee5330ec3803f349b85090577b2fd72987 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a2682ee5330ec3803f349b85090577b2fd72987 commit 2a2682ee5330ec3803f349b85090577b2fd72987 Author: Warner Losh AuthorDate: 2024-03-07 01:22:44 +0000 Commit: Warner Losh CommitDate: 2024-03-07 01:38:59 +0000 nvme: Add SMART WARNING for persistent memory region NVME 2.0 added persistent memory regions, and this bit reports critical warnings / errors with those regions. Sponsored by: Netflix Reviewed by: mav Differential Revision: https://reviews.freebsd.org/D44213 --- sys/dev/nvme/nvme.h | 3 ++- sys/dev/nvme/nvme_ctrlr.c | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index 137aff792868..9013e79b8882 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -553,8 +553,9 @@ enum nvme_critical_warning_state { NVME_CRIT_WARN_ST_DEVICE_RELIABILITY = 0x4, NVME_CRIT_WARN_ST_READ_ONLY = 0x8, NVME_CRIT_WARN_ST_VOLATILE_MEMORY_BACKUP = 0x10, + NVME_CRIT_WARN_ST_PERSISTENT_MEMORY_REGION = 0x20, }; -#define NVME_CRIT_WARN_ST_RESERVED_MASK (0xE0) +#define NVME_CRIT_WARN_ST_RESERVED_MASK (0xC0) #define NVME_ASYNC_EVENT_NS_ATTRIBUTE (0x100) #define NVME_ASYNC_EVENT_FW_ACTIVATE (0x200) diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index ca26ca8e92d8..7334c7169efb 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -663,6 +663,9 @@ nvme_ctrlr_log_critical_warnings(struct nvme_controller *ctrlr, if (state & NVME_CRIT_WARN_ST_VOLATILE_MEMORY_BACKUP) nvme_printf(ctrlr, "SMART WARNING: volatile memory backup device failed\n"); + if (state & NVME_CRIT_WARN_ST_PERSISTENT_MEMORY_REGION) + nvme_printf(ctrlr, "SMART WARNING: persistent memory read only or unreliable\n"); + if (state & NVME_CRIT_WARN_ST_RESERVED_MASK) nvme_printf(ctrlr, "SMART WARNING: unknown critical warning(s): state = 0x%02x\n", state & NVME_CRIT_WARN_ST_RESERVED_MASK); From nobody Thu Mar 7 01:39:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqsR95n6dz5CLnb; Thu, 7 Mar 2024 01:39: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 4TqsR93dhVz4vd3; Thu, 7 Mar 2024 01:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KB+mZm5Cca/v8k3zXzRHObgYIdmfKFsK4PhOYeGbJ3c=; b=WKKCmEp75cbJGJa8dfk0Jzsl5+E0VSeEz7xgTQuB1Q5k2C9KhrFNbbotPAunfPHTNE0aaw vniwrd8yqpu/bzgRy4ej95zHOX1E0ZPmeR6ksReF55CMCbj39VRL2iaz3Ot1XwdCfwcbx1 ZQMJaup5NgH5l+zWaW7BHq5MatUHXpS/fofVUAznWX/yLvpAndAqdZhD1Lai/welll3QEb ywCixE53pXOZZY8+nfN1rsI8mWkvw9eEek8SnevGIvOC/8sYr9E2szREi4WRofTbprIYyr riIURqf1tl+RKQZ7nVB6InHYId9lCRXFh1PLdBIrGb6FwFjPxIdC3ND1rStSlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709775557; a=rsa-sha256; cv=none; b=B/kMuE+3qpbwNAum9QJwgGHGD/CotPdjZQxfUykw4Nj3Q07Y+nZ8D7SDaUwj0fNxM11vEM H6J8CKqT8IjqIu8+YwErj3C7W+2nD7cBvUOYHv91Iri+hsdXeTRsmVGd+ZNroHam6buBqb DPalGhNnkPmao3SKqpg8EJLMgPOQVkMjkhATxL/0o444lg3S9P29KFuJ45ooG3sAEAYKtp pIpK/SHMq/gNBR2UeH5mChE+dXzw3qAN0gYey8qpEUaYq2lPzSVHeqBLA6LWghYaR8usM9 XRPOmLpEyktnC3q6bmaGUx0otntaJfhBYvKqLxRKkl6OVhz2gGhkRPEJSccd6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775557; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KB+mZm5Cca/v8k3zXzRHObgYIdmfKFsK4PhOYeGbJ3c=; b=x1wyrBzGCyxnOoE3pzR2xmvnIwpMCgCv8Lu5HD2/9HG4F5Vm3KpqEIDvHUlqjs/l0amB3R 2dMKF70cTIXIU4VuZ/unmDAZMT2Mq8Pcg5bbgJdN5FtAQB2xTcG9Rm2YuqqLJZxj2d7dU5 bQCUIux7GAWf2rG0Uk962rYjJr/BOK40rAXeXj5xGiVYSAcC/rVuBzNqI9Pi9koQ0Y3vtM 3lmCpyDyYVml2D981SShNEbVmhx85yDVPHItBf+g+efVeLVo6oy4ecQXSYHkTpSSzWWJ+s eHHwPXQO3GHeCT4zZPLaLVxK1JWh98478joPVj0WaT2/rhAAKXF5X48LmUOzEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqsR93GDgzDrF; Thu, 7 Mar 2024 01:39:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4271dHNv057241; Thu, 7 Mar 2024 01:39:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4271dHQF057238; Thu, 7 Mar 2024 01:39:17 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:39:17 GMT Message-Id: <202403070139.4271dHQF057238@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6a3877a0e2b5 - main - devd: Document the nvme devd events List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a3877a0e2b5c1345f967981a5c9c249d4a44e2e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6a3877a0e2b5c1345f967981a5c9c249d4a44e2e commit 6a3877a0e2b5c1345f967981a5c9c249d4a44e2e Author: Warner Losh AuthorDate: 2024-03-07 01:22:39 +0000 Commit: Warner Losh CommitDate: 2024-03-07 01:38:59 +0000 devd: Document the nvme devd events Nvme informs devd of smart and reset controller events. Document them. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44212 --- sbin/devd/devd.conf.5 | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index c9c421090ab9..cf2e7dc5534a 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -38,7 +38,7 @@ .\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS .\" SOFTWARE. .\" -.Dd December 1, 2022 +.Dd March 6, 2024 .Dt DEVD.CONF 5 .Os .Sh NAME @@ -481,6 +481,34 @@ Notification that the system has woken from the suspended state. .Pp .Bl -column "System" "Subsystem" "1234567" -compact .Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" +.It Li nvme Ta Li controller Ta Li SMART_ERROR Ta +A SMART Critical Warning State change has happened. +$state has a hex bitmask of the bits that changed, as defined +in the NVMe Standard for Critical Warning field of log page 2 +.Dq SMART / Health Information Log : +.Bl -column "Bit Value" "Meaning" -compact +.Sy "Bit Value" Ta Sy "Meaning" +.It 0x1 Ta Spare capacity below threshold +.It 0x2 Ta Temperature outside acceptable range +.It 0x4 Ta Reliability of media degraded +.It 0x8 Ta Media placed into read-only mode +.It 0x10 Ta Volatime memory backup failure +.It 0x20 Ta Persistent memrory read-only or degraded +.El +.It Li nvme Ta Li controller Ta Li RESET Ta +A controller reset event has happened. +$event is one of +.Dq start , +.Dq success , +and +.Dq timed_out +representing the start of a controller reset, the successful completion of a +controller reset, and a timeout while waiting for the controller to reset +respectively. +.El +.Pp +.Bl -column "System" "Subsystem" "1234567" -compact +.Sy "System" Ta Sy "Subsystem" Ta Sy "Type" Ta Sy "Description" .It Li PMU Ta Ta Ta Notification of events from various types of Power Management Units. .It Li PMU Ta Li "AC" Ta Ta From nobody Thu Mar 7 01:39:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqsRC0s8kz5CM51; Thu, 7 Mar 2024 01:39: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 4TqsRB508Kz4vlb; Thu, 7 Mar 2024 01:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ei4oDOECnGn0BFGeTxLne57DXrTtEMXqb7/Hoa+tvEg=; b=RF1BkxoLf6RiY0X05zjNSGv4rgHQWqA0c3nmJQmZfnkiMrsMQSgnVTbzDpU9Sp9uQiMvtr 7rKPTCADC6Wyrizdh2I5XQEjVkdf+qwfOj2WWcQ6ZK3bqjAfIwDBxKog6yfBXBX2qlqGAp aqeytGKYO+5q0FtHziV81r4uYwQPzPaaQw08NPu/S/Biv5F0nR1pOyQOsLYMJTZM2/vOfC ykfNTr4nkdkONgMTdnHYjg8hn7tbudbtzCCfpr0QkddCZX4c9MxDK2H5bHwQ6hWSEgERZU /BuQfs5bNEwx29/1/8ZQp+/0PHgQtJOr2o0sh4OrvIhzTNaCYqhBB4vsJ+gB9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709775558; a=rsa-sha256; cv=none; b=YOOqTLCy3TPijnOvNTqNlb/LrlJg7QsFnoc6mUy/Amyk4EFQRFQUGVcyp2CH7i86XOOh2J 0r9z8EL75oWpZ9TXvxXrSQ5ZtAT992ZvPam4CQTi9IR5DsANRKrYLUEaHUK1xLnUslDDLK 9o04o/BL+hp5aZdYlp6ihVFVRJt8TnoXn9MWA1VB6WnGx8pfKGH08JcDtapnC2v/0UUt19 Xqul5YAJI2KLbdovoZZo4uOurjoFmVn4tGuwC9vdAHywbD+53e8iok8YhzpS5/JcWf3kRb gDx/jUBq9NxgJLmhztZcR4mRZN4RICAJM8PrS3bKKkogsIm9cz9q6t7iIC8/Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709775558; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ei4oDOECnGn0BFGeTxLne57DXrTtEMXqb7/Hoa+tvEg=; b=GhTswvq8ll2IBXy++PutBMmNE+JVkdYBWOXLMpmWLkD87NC2/xf8p0i34NcBJ5rqjnm6v8 AnF77cETl1tMUSJ4UsH0N2O7nGNk4zygK4kx73QbY4dRCecqHlXWK61Z31ADNo1OErB1yZ 9A7vOGj+aShXrIX2p/T9V5DxG0OAmPhdV2lDSZSu14QVco3pLxGlB0PYRi4Eal0UKP7Oxr 1GLkxH/WGVWhqwi4MieRXczuqbz0H49G7C0de6XmRrQtzsnbNpo6u3btPRpNjS485eTDwG kCjqz4oFyUjEIk8nGBZcUV+R0SqHA2myyrrxengCM7kJ7YZtWS2gLsIes95skA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqsRB4b0QzDrG; Thu, 7 Mar 2024 01:39:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4271dIF2057281; Thu, 7 Mar 2024 01:39:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4271dI9B057278; Thu, 7 Mar 2024 01:39:18 GMT (envelope-from git) Date: Thu, 7 Mar 2024 01:39:18 GMT Message-Id: <202403070139.4271dI9B057278@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 7c6af2096915 - main - devd: Add directory information List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c6af20969159d3c6c3253dd82a9526c355c1c7c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=7c6af20969159d3c6c3253dd82a9526c355c1c7c commit 7c6af20969159d3c6c3253dd82a9526c355c1c7c Author: Warner Losh AuthorDate: 2024-03-07 01:38:07 +0000 Commit: Warner Losh CommitDate: 2024-03-07 01:38:59 +0000 devd: Add directory information Devd searches /etc/devd and /usr/local/etc/devd by default (given the default devd.conf file). Document that here. Sponsored by: Netflix --- sbin/devd/devd.conf.5 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sbin/devd/devd.conf.5 b/sbin/devd/devd.conf.5 index cf2e7dc5534a..ceff27e8be60 100644 --- a/sbin/devd/devd.conf.5 +++ b/sbin/devd/devd.conf.5 @@ -43,7 +43,7 @@ .Os .Sh NAME .Nm devd.conf -.Nd configuration file for +.Nd configuration file format for .Xr devd 8 .Sh DESCRIPTION .Ss General Syntax @@ -752,6 +752,14 @@ regardless of the value of the variable. The .Xr devd 8 configuration file. +.It Pa /etc/devd +A directory that +.Nm devd +searches for additional configuration files. +.It Pa /usr/local/etc/devd +A directory that +.Nm devd +searches for additional configuration files. .El .Sh EXAMPLES .Bd -literal From nobody Thu Mar 7 02:29:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqtXq3KHXz5CRXd; Thu, 7 Mar 2024 02:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqtXq1mW1z52dd; Thu, 7 Mar 2024 02:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709778555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvMr61DnC9q/zLh7bvKB6LggVqUxDf1gzKeB1Iq0d5k=; b=RHNClK2dEmUVbKX+tWzFDuLFBdKtjtRQXA9DFuUewghro86AXUYQHNzxJLr7mw8b+39qOY eTV7FWFaVYNFfO2kbJLtLOmLpIcckyOjMvTwuGlf8nxBJgMkGdc+FGWmtOxUneP4qNemno GUJoDrdAh5mCLLQDvh72M+YJkzihA7OSB4+0znhYjHjkQViKcWVtzyRITReUzanJ82yY0L Wy3eCjvumQ02szzaTWTRlPLQebZswgaKAqrauYlnoCRUSs7Oo2t1VGbsx3kDU3GVNN5O6p 2inWhNBLAYFOCjTr4waEjnyb+RGqwuAfickH596hByzN2fl5y14oHF3gKmAwQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709778555; a=rsa-sha256; cv=none; b=n8TKOh31rYobe1/9F9UtI9keNZsLL+KnWeAqDuuwbVDkfJrzfboWF/YMyHzsbd9DTl3YfP w2KMFaVwg9Ypm6wLdfCJBofHJhJsBfMVCTYK5BH+vQjjOt/wny+9dOA3FlSTc2vqKuUbn+ wGkLqJCm9TMOeQaqKKWY8EEcgSdGv/DXZWsWhdt3LMqJnOWSiU0fg4nCjIrrrbKWWyz3yB yfu18t4aeB9KyZGUA0tmOd0nF5Sb4bH+kThsi06AKRIeOCEqQasVG8rhcidBD6jgutkYWD ALDDLjdPLVICXHa+kDOgERgReBgQdRo2FArOxesj6KI6iwltgnLvBBH7Gf4jmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709778555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wvMr61DnC9q/zLh7bvKB6LggVqUxDf1gzKeB1Iq0d5k=; b=vAxPGrRNgmMQQpIG38dMogrfd+JwpYwWxsZmJHRIENC6G+9iZ/BZal9GjpfttfO81ANU3z yiBP3EDWFyOutGffFM58XzVZXWqV/lCDaFcD+6iQihEZF0yP1eDf9YJnEl3PQGG5m51Fjt 8Wl0oW9qlhkIhg68fA8DEF0qNjW3N5J56vLJ15+GLCqaf88R2PkSmCeXuGAOipAIu53cjD 4kTvQBPhONVpfK4bDpbPaALM55fZYhBkXl/YyWhvPLfHWkaSBd9RVndzbTLDrcMjFfuxss UTO6Vw68SOa0JMFSzpgOXFB3EddgOzkBl+v7iGrdLeIxGmqACKI6EcIM/lQCNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqtXq1JjZzGbk; Thu, 7 Mar 2024 02:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4272TFKf041553; Thu, 7 Mar 2024 02:29:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4272TFY0041550; Thu, 7 Mar 2024 02:29:15 GMT (envelope-from git) Date: Thu, 7 Mar 2024 02:29:15 GMT Message-Id: <202403070229.4272TFY0041550@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 275aee513b58 - stable/14 - bsdinstall: prefer HTTP List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 275aee513b58d4797823e87a9f2292ba4a51ae16 Auto-Submitted: auto-generated The branch stable/14 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=275aee513b58d4797823e87a9f2292ba4a51ae16 commit 275aee513b58d4797823e87a9f2292ba4a51ae16 Author: Philip Paeps AuthorDate: 2024-02-15 13:49:33 +0000 Commit: Philip Paeps CommitDate: 2024-03-07 02:27:28 +0000 bsdinstall: prefer HTTP In 2024, users are more likely to have working HTTP than working FTP. Present http://ftp.FreeBSD.org as the first option in the installer. Keep ftp://ftp.FreeBSD.org as the second option. MFC after: 3 weeks (cherry picked from commit 9c59988175ffd6b42c6927c0939e13abc43f7344) --- usr.sbin/bsdinstall/scripts/mirrorselect | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/mirrorselect b/usr.sbin/bsdinstall/scripts/mirrorselect index 82a726c009b6..1ffbf1512ee2 100755 --- a/usr.sbin/bsdinstall/scripts/mirrorselect +++ b/usr.sbin/bsdinstall/scripts/mirrorselect @@ -40,7 +40,8 @@ MIRROR=`bsddialog --backtitle "$OSNAME Installer" \ --title "Mirror Selection" --extra-button --extra-label "Other" \ --menu "Please select the best suitable site for you or \"other\" if you want to specify a different choice. The \"Main Site\" directs users to the nearest project managed mirror via GeoDNS (they carry the full range of possible distributions and support both IPv4 and IPv6). All other sites are known as \"Community Mirrors\"; not every site listed here carries more than the base distribution kits. Select a site!" \ 0 0 16 \ - ftp://download.freebsd.org "Main Site (GeoDNS)"\ + http://ftp.freebsd.org "Main Site (GeoDNS, HTTP)"\ + ftp://ftp.freebsd.org "Main Site (GeoDNS, FTP)"\ http://ftp.au.freebsd.org "Australia - IPv6"\ ftp://ftp3.au.freebsd.org "Australia #3"\ ftp://ftp.at.freebsd.org "Austria - IPv6"\ From nobody Thu Mar 7 05:58:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqzBT263Jz5CnLS; Thu, 7 Mar 2024 05:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqzBT1Ld5z48WR; Thu, 7 Mar 2024 05:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709791121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TZDU0uvzeNHcUg8KqGQO8Jn46JWIRHP5lpbYzVTpi9A=; b=aR4FaoXzr9LyzQ5nfGRWxCUkdMYcHH03hQ6sl1OyjqNHLsJW6Kfthlhf0FelQaOMbCnlDl DRGIz5RYndQCAgEqjqy0yNW/ZQaqz6BS+mMRAxKpbxXaWNewdCkamYRkud8O8ICunr0/bn XYJ8YlGfdEzZuL86CQeQNROw8Mx7jX67WzJJW33Zvk4Xab/H4skM2ViEz3KWUTESP7WBtI v+QbDgnoIOEfYJnaN+YTxxKI0AZNstqzmj1XddEgc1VLoMb+tP53k0jJTUX1zR1WkxTb2l QENHIZvHnu5xcZEyYlTtQFpQSwH2Y3HR7Jx31W+/1gJUjBSR5Q4a2CggVHco1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709791121; a=rsa-sha256; cv=none; b=jA76Ev+FMHsAHjIeTGtUv4xW8g53rAn7A7DECVYDTTiKQXZJsNlCEp5LHtbH7Ozqhue0BY K5pdyY1NxY578agRASuY7O8NVb45kzhQQItnYjVc0wP9Fotv3nK6MA7WNWCPKrEI+k1epP sQwn9M/GqV5L0wamc6u1WZSolSyAgQv1Dtg1LOEFtjNHPBxNe2arguLYoIARVT/7MROXRr ky6ccgHQOhTWmyco6e61Q0zxKxoWYz38wyP5rzpMox5scCt9jYUs6+0JtJKuZLpLNKY7ak BG3rBn6OAntIvcgZETMzNjONkLfiuCzuYdNL7UKOS2VZi3bpwZoPCAhnzmjEGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709791121; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TZDU0uvzeNHcUg8KqGQO8Jn46JWIRHP5lpbYzVTpi9A=; b=QjrJK0k52VFy34zcWZJcBubjar2zALHCx4xsN+6uYT25GKs6rMZ8luyZetcdG5O8IPUdBO 9F632zMz1X0dOQ/wXmV6o82d64/mbblh3SmdQ3IesvQMUkZC42xsT+WgIRJ3hoWLEHC17x k4wrDUz1mp32hmBizG1wSM2vNFFXps7WAfnENPEnwsS/x/Rm5oKm7dkfr4ckMARdAecWMj o1XymrLaIh4DipxHbHN8vQpurR0WOdYtPxtPDoR1lh4wFbnhTo2k1PJwdyWzJKFV6jWTuW ZdB6TgtU6VPIX5IbEd1pMjTAsIWMglY7K1GfajmlL2ozT7P/Xq9JRpP/5iwlkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqzBT0qjyzMnV; Thu, 7 Mar 2024 05:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4275wfOx096122; Thu, 7 Mar 2024 05:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4275wf1f096119; Thu, 7 Mar 2024 05:58:41 GMT (envelope-from git) Date: Thu, 7 Mar 2024 05:58:41 GMT Message-Id: <202403070558.4275wf1f096119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 8a802df1de2d - main - bhyve/gdb: Avoid rebuilding target.xml for install targets List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a802df1de2d77fd0a62996bd785ca3f1326887f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8a802df1de2d77fd0a62996bd785ca3f1326887f commit 8a802df1de2d77fd0a62996bd785ca3f1326887f Author: Mark Johnston AuthorDate: 2024-03-07 05:39:07 +0000 Commit: Mark Johnston CommitDate: 2024-03-07 05:39:07 +0000 bhyve/gdb: Avoid rebuilding target.xml for install targets Otherwise it's impossible to install from a read-only objdir. Fixes: f81cdf24ba54 ("bhyve: Add support for XML register definitions") Reported by: olivier --- usr.sbin/bhyve/gdb/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/bhyve/gdb/Makefile b/usr.sbin/bhyve/gdb/Makefile index a444b0cc4c69..cc9ba4d224da 100644 --- a/usr.sbin/bhyve/gdb/Makefile +++ b/usr.sbin/bhyve/gdb/Makefile @@ -8,6 +8,7 @@ XMLARCH= i386:x86-64 FILES+= amd64.xml .endif +.if !make(install*) target.xml: .PHONY @echo "" > ${.TARGET} @echo "" >> ${.TARGET} @@ -17,5 +18,6 @@ target.xml: .PHONY @echo " " >> ${.TARGET} .endfor @echo "" >> ${.TARGET} +.endif .include From nobody Thu Mar 7 07:12:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tr0rZ5CJNz5CvBB; Thu, 7 Mar 2024 07:13:18 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Received: from mailgate.Leidinger.net (bastille.leidinger.net [89.238.82.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (P-256) client-digest SHA256) (Client CN "mailgate.leidinger.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tr0rZ2Yndz4Gr9; Thu, 7 Mar 2024 07:13:18 +0000 (UTC) (envelope-from Alexander@Leidinger.net) Authentication-Results: mx1.freebsd.org; none List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=leidinger.net; s=outgoing-alex; t=1709795585; 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=1to9LSd1RfBeKPV+z0vswxPdzqpatIOlxUMD47cYPJE=; b=XoSAdyOIpVQ0ZPwynEqsMPIhw/G5iks/+2JLXtUaQ/nugCaIEAlJC5SF1flb0AnczGSPN6 oiGlIB0MqNccuWw7C2IMm1xeuuiIhNBiBt4l//wZAAfzj2ZNvgaL08x3OBDS6WIZ4Mu6Yt vcag8BwhrB283+XQLr99QVD62h2oSfUtu6gEbPn4+t0NVv9bnBetCNEescUJyHCIxL53yR 3gt4+1XLerV6A9lGCAJSIQV7cDOP1MezwlmQlqIxxcX50sNS2s5RIb9w8roglvU1N+78OK s5eIjHofuV1JSBXkQDnBo+nMHFPRkiRKKnpo/wW9E5dgOzHhjt4Jmic64g+wyQ== Date: Thu, 07 Mar 2024 08:12:16 +0100 From: Alexander Leidinger To: Baptiste Daroussin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 0ecf0b26a750 - main - timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae In-Reply-To: <202403061729.426HTRUH027491@gitrepo.freebsd.org> References: <202403061729.426HTRUH027491@gitrepo.freebsd.org> Message-ID: <7df9a505bcb2ab09627d4753d030e559@Leidinger.net> Organization: No organization, this is a private message. Content-Type: multipart/signed; protocol="application/pgp-signature"; boundary="=_a6bf593b52119bb72e23271a529c0f59"; micalg=pgp-sha256 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:34240, ipnet:89.238.64.0/18, country:DE] X-Rspamd-Queue-Id: 4Tr0rZ2Yndz4Gr9 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --=_a6bf593b52119bb72e23271a529c0f59 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Am 2024-03-06 18:29, schrieb Baptiste Daroussin: > The branch main has been updated by bapt: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=0ecf0b26a750582b804e238e6446db55188d7fdc > > commit 0ecf0b26a750582b804e238e6446db55188d7fdc > Author: Baptiste Daroussin > AuthorDate: 2024-03-06 17:28:02 +0000 > Commit: Baptiste Daroussin > CommitDate: 2024-03-06 17:28:02 +0000 > > timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae > > Remove the include that crept in by accident > Clang complains about CLOCK_BOOTTIME being the same for now as > CLOCK_UPTIME, so remove CLOCK_BOOTTIME and leave a comment for > what to do when CLOCK_BOOTTIME will be different for real. What about a compile time assert CLOCK_BOOTTIME == CLOCK_UPTIME, to make sure that someone knows to look at this piece if they want to make it different for other reasons? Bye, Alexander. -- http://www.Leidinger.net Alexander@Leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netchild@FreeBSD.org : PGP 0x8F31830F9F2772BF --=_a6bf593b52119bb72e23271a529c0f59 Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc; size=833 Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEER9UlYXp1PSd08nWXEg2wmwP42IYFAmXpaN8ACgkQEg2wmwP4 2Ibx8g/9GaUiZRaptrnIUEF+tw9admD3+tR5y84sszUzZOnzqoOIulHFTUXtOEoQ u6XdkzrRM+VUTfngngwD3rQAIjYQ6Gs61OkXqm3eAd9IYzeVI5PU41Tds2FMA7KC R9XLrmZqCa8E541aTMj5HBhOkhmc8wwkBcCAx33i6UG4SLjU5pHM/DfPH+FON0X/ 7V8ZPdieoawbWqq1Uun/h0UCySS9DzFPf5lfzMcKejplg8VGhVGU0clmQlTfeOYR LGcHBiFjflSuRpEMxRoxI9Zh8fNVpE0PJTKVn2a8Shb5dY6Kr+0IzEHT06ZZQL5l MMOHtikcbvUaLAdjCw84Ou7r4rgizoK7LQVA4Xy9Yq2/VGwAAmfGsrn34/wnbFLa 3d1Vu/Cf0xOtR4UAKv7QwG766ko8YD2u7j/A0MhBnzQs8rpfmLzFLBQeZp4ePylL DMSIE0lB4/RV+k8jmBN+kYFG2RK8TXQi+Bk/XP5TBvvNqPdDJ3eIENbtIqpUy5Yw bR5kELy+mUfmg7p8DozeYkXSfMX6IjmvG9XQWhFTHKUQ527d1tDKi3GJJEKqkDJi 0HMehDIQuRdukFXfccFjUGegnWfEmYu0Nu+yk02dKdrTP3LA4b/NDrxDUva31IuG JeCTNg2DPGdpsbiSQfbTTgPiBfTmW+QyDzSfLMHQmsmwi62Hrfk= =cRzO -----END PGP SIGNATURE----- --=_a6bf593b52119bb72e23271a529c0f59-- From nobody Thu Mar 7 08:16:23 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tr2FM5PG0z5D120; Thu, 7 Mar 2024 08:16: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 4Tr2FM4rQFz4Lvw; Thu, 7 Mar 2024 08:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709799383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n0T3PnWuEM7ygBo+ziqeNpnctZWSzmr48PzN0T4O8oY=; b=IxHuy7LG6E0tSPV9G5176XF/bTeWzAj7oyV/7bTe6yEgJShtaS1qzQ9l7cuiO4HHbGOZBP GQ3f2U+lTIq9vXKNo+XYCpaRW/Wz1QgugSC6rSqXHzxanrtk2GlgKcwHb7VnAmPwq2uCo+ 5zMgz0+XA8ujH8VqsSE7NyF7nEwZA6wHprBSpjIu9KQuERKJTBEH1p7tNePmPTob6VbYnW Zxv7DL8jME9SgD78qr26l/8cI1MgN6+bUoLNuJ6GQoOhCJa/5+kATHjTEs9011pgqhjzvS SALmrgfjnZZFaVBm4WNGGiIOiBYSxSskuAHY2ludf0AxWuTZikpNJ9jyl8ptnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709799383; a=rsa-sha256; cv=none; b=UVLdJr4t4Cn/50hn9UWfjtFN2fw3RYMbxPKFcXwYM+sDMlSrf8wxZi0oO2bFsaFkmbA7pc 086Thp6WizA9F46AzD0aTK5ZHwZqdkwYVEN2UUPYNnH2iKtpJ8/l/nioRGTTleKm0miuuO Hq6WvjeP81vBux/EdiCpQCyCIMwCjgphCVWuk7+lY2ZioywD01egInJHpqKXqvzrtHxVNC Z8mPx+8B8J57V/fYoJHCcScbpIb7MCQ8K7JliMkEe98TZszV+7poBxhSTx4cAHAXla+soh DK0lozo4nJkAydcCFWrGtPB/6n4ChyrDkMNLqDRokJ1tPB0YAv7romsSTXKnLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709799383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n0T3PnWuEM7ygBo+ziqeNpnctZWSzmr48PzN0T4O8oY=; b=spkv1a8XJlMxpxXG5mFwgunmrdX06Q/QnkLHUX31F6FzniczEK6w35Ux/6MRWeKDG0Z3LU KvAYMSki4Qjks6Nw0KvTBSSLZqqHBrUXRpKESbrwgCjH/XULjBtiAHk9Ng1gVyDTGYScvk AyJtFs6sQ1Ce6rl6QE0xeMl8ODRufCk4YTqznE2SnKaBMT+q/3FP4/ILTuQ9Ppy4yAxviT k8YHKTxw2lPq2cq6dONOABRvq8Xy4rz39HAcASNLx3noGaun1noBp59UKNL5hNh8QVlMEO eanjgEqJUC8uCsEi7kXHV078kgZ/WN2OHve/nz7Oh8zNL8bxuWAb7YnpQQx55Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tr2FM4RKLzRWL; Thu, 7 Mar 2024 08:16:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4278GN5m031812; Thu, 7 Mar 2024 08:16:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4278GNgU031809; Thu, 7 Mar 2024 08:16:23 GMT (envelope-from git) Date: Thu, 7 Mar 2024 08:16:23 GMT Message-Id: <202403070816.4278GNgU031809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: cbddb2f02c76 - main - tarfs: Fix checksum on 32-bit platforms. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbddb2f02c7687d1039abcffd931e94e481c11a5 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=cbddb2f02c7687d1039abcffd931e94e481c11a5 commit cbddb2f02c7687d1039abcffd931e94e481c11a5 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-07 08:15:54 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-07 08:15:54 +0000 tarfs: Fix checksum on 32-bit platforms. MFC after: 3 days Fixes: b56872332e47786afc09515a4daaf1388da4d73c Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44261 --- sys/fs/tarfs/tarfs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/tarfs/tarfs_vfsops.c b/sys/fs/tarfs/tarfs_vfsops.c index ce896c5841c0..d1af7070e706 100644 --- a/sys/fs/tarfs/tarfs_vfsops.c +++ b/sys/fs/tarfs/tarfs_vfsops.c @@ -205,7 +205,7 @@ static boolean_t tarfs_checksum(struct ustar_header *hdrp) { const unsigned char *ptr; - unsigned long checksum, hdrsum; + int64_t checksum, hdrsum; if (tarfs_str2int64(hdrp->checksum, sizeof(hdrp->checksum), &hdrsum) != 0) { TARFS_DPF(CHECKSUM, "%s: invalid header checksum \"%.*s\"\n", From nobody Thu Mar 7 10:40:26 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tr5Rd4MTNz5DDft; Thu, 7 Mar 2024 10:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tr5Rd3glhz4bh5; Thu, 7 Mar 2024 10:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709808029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxmCh4kVl9xwMeWYCjMkURVJB3lky381p4OPmrVAEUg=; b=Y7Grctq6wDFUORvQNNgBBD5l2zYO1nwffTXFoPOIJTnmZSfo6lSP3VXkU2iRB4esBgC3LN LmkG28BFLSebIyfmTteZE7Ez+C7vhCx9mYIViJKn2Xs9nkvWs9vxcCX2+nqv7THS3DhLZg Za9SEKlk7ylgaerx/xefm/8Af0ZtCstcebaKxfhP+6FDDz5oHuA8BErt7mqW72zW6g/iEe oxRl8jUvGv4ymVPW7gzMh1XbVmoGPXC+lb9YdUmTer55mrjvhlxw33NeF88f/idhah3/u2 qpBnIr1algnp3c4xibdKAyXpwRINytliREz1bL+hOyqGotzNQ0Xm6H69+82m+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709808029; a=rsa-sha256; cv=none; b=m4Bru5XpAE3ZywTcEToPwCW9LNNVFnmIFQcIsW+5iLgAbPn0YkJx5nSpfskUbiOGJq2z24 nSxInpfDtKaqExbbXV3GgFjSZsH12EMtAGUkqhvEFp9v2v05szro4UtqfUY5Vt+0yBIIeY jEA8s/OaNOg2z/pMeZXqBX58S0p2rE+4LftsxU8pBLSEBHFxEZCiY98KM+m9IM3xDn8VkZ yccTGd3wqfsEs+LOn+ep5kd83rOJwRYck9NJNPA0q2cZmMnPfKF22xZrgfhy2PJ+QmJzD4 TH6psYziTzzp3y/PlcO7dNVW+/1pJxY0XVQWkP+plxO6lRMhJUh/IgzqSlEkkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709808029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pxmCh4kVl9xwMeWYCjMkURVJB3lky381p4OPmrVAEUg=; b=Z6rjJU4dTT65tYs9wWJswTJ0aB8GeONAZQlxYQIZ1FJ85nCNo9wbXvvA4VXHuAZ6TI5kJ7 kVglX8np7q7nH+PEebJ0RWKRUTA6CJiT/4L60B2oIn4hejv5tPIsTsOhjcnjz0nCSoh0Yz NeujWGAo8Quuwv6r0a/tsAM5pg+rztlqT/G8+4o5c+RMPn7nsXCQTaqkCMwxGlbflnEEaY GEOnN/zsvBXkVXmBIQUCVvEfEupSnOybg6xsxdMDGx9dGcACmRLoPVnEOey/rAFtjjim1i XZYa36EK79T/B5vMBcaSMgUOFqpYLEjjZxD/ONd8V4HMlCjS+XOsoz9jIsXG1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tr5Rd3780zWN8; Thu, 7 Mar 2024 10:40:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427AeTK4078725; Thu, 7 Mar 2024 10:40:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427AeQYq078717; Thu, 7 Mar 2024 10:40:26 GMT (envelope-from git) Date: Thu, 7 Mar 2024 10:40:26 GMT Message-Id: <202403071040.427AeQYq078717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: 4fefe1b76357 - main - zfs: merge openzfs/zfs@8f2f6cd2a List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fefe1b763573c873bf3dbf3b6f28c22de0ffada Auto-Submitted: auto-generated The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=4fefe1b763573c873bf3dbf3b6f28c22de0ffada commit 4fefe1b763573c873bf3dbf3b6f28c22de0ffada Merge: cbddb2f02c76 8f2f6cd2ac68 Author: Martin Matuska AuthorDate: 2024-03-07 09:49:48 +0000 Commit: Martin Matuska CommitDate: 2024-03-07 09:52:19 +0000 zfs: merge openzfs/zfs@8f2f6cd2a Notable upstream pull request merges: #15887 -multiple Fast Dedup: Cleanup and documentation ahead of integrating Fast Dedup #15907 5600dff0e Fixed parameter passing error when calling zfs_acl_chmod #15908 8f2f6cd2a ddt: reduce DDT_NAMELEN Obtained from: OpenZFS OpenZFS commit: 8f2f6cd2ac688916adb2caf979daf95365ccb48f cddl/lib/libzpool/Makefile | 1 + sys/conf/files | 1 + sys/contrib/openzfs/cmd/Makefile.am | 2 - sys/contrib/openzfs/cmd/zdb/zdb.c | 18 +- sys/contrib/openzfs/config/Rules.am | 4 +- sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/sys/ddt.h | 199 +++---- sys/contrib/openzfs/include/sys/ddt_impl.h | 95 ++++ sys/contrib/openzfs/include/sys/spa.h | 2 - .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 10 + sys/contrib/openzfs/lib/libzpool/Makefile.am | 1 + sys/contrib/openzfs/module/Kbuild.in | 1 + sys/contrib/openzfs/module/Makefile.bsd | 2 + sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 4 +- sys/contrib/openzfs/module/zfs/ddt.c | 584 +++++++++------------ sys/contrib/openzfs/module/zfs/ddt_stats.c | 212 ++++++++ sys/contrib/openzfs/module/zfs/ddt_zap.c | 136 +++-- sys/contrib/openzfs/module/zfs/dsl_scan.c | 4 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 22 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 27 +- .../tests/functional/bclone/bclone_common.kshlib | 6 + .../block_cloning_copyfilerange_cross_dataset.ksh | 5 +- .../block_cloning_cross_enc_dataset.ksh | 5 +- sys/modules/zfs/Makefile | 2 + sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 26 files changed, 859 insertions(+), 491 deletions(-) diff --cc cddl/lib/libzpool/Makefile index c801cf571e88,000000000000..f641edaccb52 mode 100644,000000..100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@@ -1,337 -1,0 +1,338 @@@ + +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + +# ZFS_COMMON_SRCS +.PATH: ${ZFSTOP}/module/zfs +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/module/unicode +# LUA_SRCS +.PATH: ${ZFSTOP}/module/lua +# ZSTD_SRCS +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress + +.PATH: ${ZFSTOP}/module/os/linux/zfs + +.PATH: ${ZFSTOP}/lib/libzpool + +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack +.else +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern +ATOMIC_SRCS= opensolaris_atomic.c +.endif + +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" +# Don't waste GOT entries on small data. +PICFLAG= -fPIC +.endif + +PACKAGE= zfs +LIB= zpool + +USER_C = \ + kernel.c \ + taskq.c \ + util.c + +KERNEL_C = \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_zstd.c \ + zpool_prop.c \ + zprop_common.c \ + abd.c \ + abd_os.c \ + aggsum.c \ + arc.c \ + arc_os.c \ + blake3_zfs.c \ + blkptr.c \ + bplist.c \ + bpobj.c \ + bptree.c \ + bqueue.c \ + btree.c \ + brt.c \ + cityhash.c \ + dbuf.c \ + dbuf_stats.c \ + ddt.c \ ++ ddt_stats.c \ + ddt_zap.c \ + dmu.c \ + dmu_diff.c \ + dmu_object.c \ + dmu_objset.c \ + dmu_recv.c \ + dmu_redact.c \ + dmu_send.c \ + dmu_traverse.c \ + dmu_tx.c \ + dmu_zfetch.c \ + dnode.c \ + dnode_sync.c \ + dsl_bookmark.c \ + dsl_dataset.c \ + dsl_deadlist.c \ + dsl_deleg.c \ + dsl_dir.c \ + dsl_crypt.c \ + dsl_pool.c \ + dsl_prop.c \ + dsl_scan.c \ + dsl_synctask.c \ + dsl_destroy.c \ + dsl_userhold.c \ + edonr_zfs.c \ + entropy_common.c \ + error_private.c \ + fm.c \ + fse_compress.c \ + fse_decompress.c \ + gzip.c \ + hist.c \ + hkdf.c \ + huf_compress.c \ + huf_decompress.c \ + lzjb.c \ + lz4.c \ + lz4_zfs.c \ + metaslab.c \ + mmp.c \ + multilist.c \ + objlist.c \ + pathname.c \ + pool.c \ + range_tree.c \ + refcount.c \ + rrwlock.c \ + sa.c \ + sha2_zfs.c \ + skein_zfs.c \ + spa.c \ + spa_checkpoint.c \ + spa_config.c \ + spa_errlog.c \ + spa_history.c \ + spa_log_spacemap.c \ + spa_misc.c \ + spa_stats.c \ + space_map.c \ + space_reftree.c \ + txg.c \ + trace.c \ + uberblock.c \ + unique.c \ + vdev.c \ + vdev_draid.c \ + vdev_draid_rand.c \ + vdev_file.c \ + vdev_indirect_births.c \ + vdev_indirect.c \ + vdev_indirect_mapping.c \ + vdev_initialize.c \ + vdev_label.c \ + vdev_label_os.c \ + vdev_mirror.c \ + vdev_missing.c \ + vdev_queue.c \ + vdev_raidz.c \ + vdev_raidz_math_aarch64_neon.c \ + vdev_raidz_math_aarch64_neonx2.c \ + vdev_raidz_math_avx2.c \ + vdev_raidz_math_avx512bw.c \ + vdev_raidz_math_avx512f.c \ + vdev_raidz_math.c \ + vdev_raidz_math_scalar.c \ + vdev_rebuild.c \ + vdev_removal.c \ + vdev_root.c \ + vdev_trim.c \ + xxhash.c \ + zap.c \ + zap_leaf.c \ + zap_micro.c \ + zcp.c \ + zcp_get.c \ + zcp_global.c \ + zcp_iter.c \ + zcp_set.c \ + zcp_synctask.c \ + zfeature.c \ + zfs_byteswap.c \ + zfs_chksum.c \ + zfs_debug.c \ + zfs_fm.c \ + zfs_fuid.c \ + zfs_sa.c \ + zfs_znode.c \ + zfs_racct.c \ + zfs_ratelimit.c \ + zfs_rlock.c \ + zil.c \ + zio.c \ + zio_checksum.c \ + zio_compress.c \ + zio_crypt.c \ + zio_inject.c \ + zle.c \ + zrlock.c \ + zstd_common.c \ + zstd_compress.c \ + zstd_compress_literals.c \ + zstd_compress_sequences.c \ + zstd_compress_superblock.c \ + zstd_ddict.c \ + zstd_decompress.c \ + zstd_decompress_block.c \ + zstd_double_fast.c \ + zstd_fast.c \ + zstd_lazy.c \ + zstd_ldm.c \ + zstd_opt.c \ + zthr.c + +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += vdev_raidz_math_sse2.c \ + vdev_raidz_math_ssse3.c \ + zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 -DHAVE_SSE3 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F \ + -DHAVE_AVX512BW +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +LUA_C = \ + lapi.c \ + lauxlib.c \ + lbaselib.c \ + lcode.c \ + lcompat.c \ + lcorolib.c \ + lctype.c \ + ldebug.c \ + ldo.c \ + lfunc.c \ + lgc.c \ + llex.c \ + lmem.c \ + lobject.c \ + lopcodes.c \ + lparser.c \ + lstate.c \ + lstring.c \ + lstrlib.c \ + ltable.c \ + ltablib.c \ + ltm.c \ + lvm.c \ + lzio.c + +UNICODE_C = u8_textprep.c uconv.c + +SRCS= ${USER_C} ${KERNEL_C} ${LUA_C} ${UNICODE_C} ${ARCH_C} + +WARNS?= 2 +CFLAGS+= \ + -DIN_BASE \ + -I${ZFSTOP}/include \ + -I${ZFSTOP}/lib/libspl/include \ + -I${ZFSTOP}/lib/libspl/include/os/freebsd \ + -I${SRCTOP}/sys \ + -I${ZFSTOP}/include/os/freebsd/zfs \ + -I${SRCTOP}/cddl/compat/opensolaris/include \ + -I${ZFSTOP}/module/icp/include \ + -include ${ZFSTOP}/include/os/freebsd/spl/sys/ccompile.h \ + -DHAVE_ISSETUGID \ + -include ${SRCTOP}/sys/modules/zfs/zfs_config.h \ + -I${SRCTOP}/sys/modules/zfs \ + -I${ZFSTOP}/include/os/freebsd/zfs \ + -DLIB_ZPOOL_BUILD -DZFS_DEBUG \ + +# XXX: pthread doesn't have mutex_owned() equivalent, so we need to look +# into libthr private structures. That's sooo evil, but it's only for +# ZFS debugging tools needs. +CFLAGS+= -DWANTS_MUTEX_OWNED +CFLAGS+= -I${SRCTOP}/lib/libpthread/thread +CFLAGS+= -I${SRCTOP}/lib/libpthread/sys +CFLAGS+= -I${SRCTOP}/lib/libthr/arch/${MACHINE_CPUARCH}/include +CFLAGS.gcc+= -fms-extensions + +LIBADD= md pthread z spl icp nvpair avl umem + +# atomic.S doesn't like profiling. +MK_PROFILE= no + +CSTD= c99 + +# Since there are many asserts in this library, it makes no sense to compile +# it without debugging. + +CFLAGS+= -g -DDEBUG=1 + +# Pointer values are used as debugging "tags" to mark reference count +# ownerships and in some cases the tag reference is dropped after an +# object is freed. +CFLAGS.dbuf.c= ${NO_WUSE_AFTER_FREE} +CFLAGS.entropy_common.c= -fno-tree-vectorize +CFLAGS.entropy_common.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.error_private.c= -fno-tree-vectorize +CFLAGS.error_private.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.fse_compress.c= -fno-tree-vectorize +CFLAGS.fse_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.fse_decompress.c= -fno-tree-vectorize +CFLAGS.fse_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.hist.c= -fno-tree-vectorize +CFLAGS.hist.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_compress.c= -fno-tree-vectorize +CFLAGS.huf_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.huf_decompress.c= -fno-tree-vectorize +CFLAGS.huf_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.pool.c= -fno-tree-vectorize +CFLAGS.pool.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.xxhash.c= -fno-tree-vectorize +CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress.c= -fno-tree-vectorize +CFLAGS.zstd_compress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_literals.c= -fno-tree-vectorize +CFLAGS.zstd_compress_literals.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_sequences.c= -fno-tree-vectorize +CFLAGS.zstd_compress_sequences.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_compress_superblock.c= -fno-tree-vectorize +CFLAGS.zstd_compress_superblock.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_double_fast.c= -fno-tree-vectorize +CFLAGS.zstd_double_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_fast.c= -fno-tree-vectorize +CFLAGS.zstd_fast.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_lazy.c= -fno-tree-vectorize +CFLAGS.zstd_lazy.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_ldm.c= -fno-tree-vectorize +CFLAGS.zstd_ldm.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_opt.c= -fno-tree-vectorize +CFLAGS.zstd_opt.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_ddict.c= -fno-tree-vectorize +CFLAGS.zstd_ddict.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress.c= -fno-tree-vectorize +CFLAGS.zstd_decompress.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} +CFLAGS.zstd_decompress_block.c= -fno-tree-vectorize +CFLAGS.zstd_decompress_block.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL} + +.include diff --cc sys/conf/files index 3c87c0b88528,000000000000..e57c82238380 mode 100644,000000..100644 --- a/sys/conf/files +++ b/sys/conf/files @@@ -1,5244 -1,0 +1,5245 @@@ +# +# The long compile-with and dependency lines are required because of +# limitations in config: backslash-newline doesn't work in strings, and +# dependency lines other than the first are silently ignored. +# +acpi_quirks.h optional acpi \ + dependency "$S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \ + no-obj no-implicit-rule before-depend \ + clean "acpi_quirks.h" +bhnd_nvram_map.h optional bhnd \ + dependency "$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \ + compile-with "sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -h" \ + no-obj no-implicit-rule before-depend \ + clean "bhnd_nvram_map.h" +bhnd_nvram_map_data.h optional bhnd \ + dependency "$S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/tools/nvram_map_gen.awk $S/dev/bhnd/nvram/nvram_map" \ + compile-with "sh $S/dev/bhnd/tools/nvram_map_gen.sh $S/dev/bhnd/nvram/nvram_map -d" \ + no-obj no-implicit-rule before-depend \ + clean "bhnd_nvram_map_data.h" +fdt_static_dtb.h optional fdt fdt_dtb_static \ + compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.CURDIR}'" \ + dependency "${FDT_DTS_FILE:T:R}.dtb" \ + no-obj no-implicit-rule before-depend \ + clean "fdt_static_dtb.h" +feeder_eq_gen.h optional sound \ + dependency "$S/tools/sound/feeder_eq_mkfilter.awk" \ + compile-with "${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \ + no-obj no-implicit-rule before-depend \ + clean "feeder_eq_gen.h" +feeder_rate_gen.h optional sound \ + dependency "$S/tools/sound/feeder_rate_mkfilter.awk" \ + compile-with "${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \ + no-obj no-implicit-rule before-depend \ + clean "feeder_rate_gen.h" +font.h optional sc_dflt_font \ + compile-with "uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < ${SRCTOP}/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ + no-obj no-implicit-rule before-depend \ + clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" +snd_fxdiv_gen.h optional sound \ + dependency "$S/tools/sound/snd_fxdiv_gen.awk" \ + compile-with "${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \ + no-obj no-implicit-rule before-depend \ + clean "snd_fxdiv_gen.h" +miidevs.h optional miibus | mii \ + dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ + compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \ + no-obj no-implicit-rule before-depend \ + clean "miidevs.h" +kbdmuxmap.h optional kbdmux_dflt_keymap \ + compile-with "${KEYMAP} -L ${KBDMUX_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \ + no-obj no-implicit-rule before-depend \ + clean "kbdmuxmap.h" +teken_state.h optional sc | vt \ + dependency "$S/teken/gensequences $S/teken/sequences" \ + compile-with "${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \ + no-obj no-implicit-rule before-depend \ + clean "teken_state.h" +ukbdmap.h optional ukbd_dflt_keymap \ + compile-with "${KEYMAP} -L ${UKBD_DFLT_KEYMAP} | ${KEYMAP_FIX} > ${.TARGET}" \ + no-obj no-implicit-rule before-depend \ + clean "ukbdmap.h" +usbdevs.h optional usb | hid \ + dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \ + no-obj no-implicit-rule before-depend \ + clean "usbdevs.h" +usbdevs_data.h optional usb \ + dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ + compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \ + no-obj no-implicit-rule before-depend \ + clean "usbdevs_data.h" +sdiodevs.h optional mmccam \ + dependency "$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \ + compile-with "${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -h" \ + no-obj no-implicit-rule before-depend \ + clean "sdiodevs.h" +sdiodevs_data.h optional mmccam \ + dependency "$S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs" \ + compile-with "${AWK} -f $S/tools/sdiodevs2h.awk $S/dev/sdio/sdiodevs -d" \ + no-obj no-implicit-rule before-depend \ + clean "sdiodevs_data.h" +cam/cam.c optional scbus +cam/cam_compat.c optional scbus +cam/cam_iosched.c optional scbus +cam/cam_periph.c optional scbus +cam/cam_queue.c optional scbus +cam/cam_sim.c optional scbus +cam/cam_xpt.c optional scbus +cam/ata/ata_all.c optional scbus +cam/ata/ata_xpt.c optional scbus +cam/ata/ata_pmp.c optional scbus +cam/nvme/nvme_all.c optional scbus +cam/nvme/nvme_da.c optional nda | da +cam/nvme/nvme_xpt.c optional scbus +cam/scsi/scsi_xpt.c optional scbus +cam/scsi/scsi_all.c optional scbus +cam/scsi/scsi_cd.c optional cd +cam/scsi/scsi_ch.c optional ch +cam/ata/ata_da.c optional ada | da +cam/ctl/ctl.c optional ctl +cam/ctl/ctl_backend.c optional ctl +cam/ctl/ctl_backend_block.c optional ctl +cam/ctl/ctl_backend_ramdisk.c optional ctl +cam/ctl/ctl_cmd_table.c optional ctl +cam/ctl/ctl_frontend.c optional ctl +cam/ctl/ctl_frontend_cam_sim.c optional ctl +cam/ctl/ctl_frontend_ioctl.c optional ctl +cam/ctl/ctl_frontend_iscsi.c optional ctl cfiscsi +cam/ctl/ctl_ha.c optional ctl +cam/ctl/ctl_scsi_all.c optional ctl +cam/ctl/ctl_tpc.c optional ctl +cam/ctl/ctl_tpc_local.c optional ctl +cam/ctl/ctl_error.c optional ctl +cam/ctl/ctl_util.c optional ctl +cam/ctl/scsi_ctl.c optional ctl +cam/mmc/mmc_xpt.c optional scbus mmccam +cam/mmc/mmc_sim.c optional scbus mmccam +cam/mmc/mmc_sim_if.m optional scbus mmccam +cam/mmc/mmc_da.c optional scbus mmccam da +cam/scsi/scsi_da.c optional da +cam/scsi/scsi_pass.c optional pass +cam/scsi/scsi_pt.c optional pt +cam/scsi/scsi_sa.c optional sa +cam/scsi/scsi_enc.c optional ses +cam/scsi/scsi_enc_ses.c optional ses +cam/scsi/scsi_enc_safte.c optional ses +cam/scsi/scsi_sg.c optional sg +cam/scsi/scsi_targ_bh.c optional targbh +cam/scsi/scsi_target.c optional targ +cam/scsi/smp_all.c optional scbus + +# shared between zfs and dtrace +cddl/compat/opensolaris/kern/opensolaris.c optional dtrace compile-with "${CDDL_C}" +cddl/compat/opensolaris/kern/opensolaris_proc.c optional zfs | dtrace compile-with "${CDDL_C}" +contrib/openzfs/module/os/freebsd/spl/spl_misc.c optional zfs | dtrace compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_cmn_err.c optional zfs | dtrace compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_taskq.c optional zfs | dtrace compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_kmem.c optional zfs | dtrace compile-with "${ZFS_C}" + +#zfs solaris portability layer +contrib/openzfs/module/os/freebsd/spl/acl_common.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/callb.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/list.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_acl.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_dtrace.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_kstat.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_policy.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_procfs_list.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_string.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_sunddi.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_sysevent.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_uio.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_vfs.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_vm.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_zlib.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/spl/spl_zone.c optional zfs compile-with "${ZFS_C}" + + + +# zfs specific + +#zfs avl +contrib/openzfs/module/avl/avl.c optional zfs compile-with "${ZFS_C}" + +# zfs lua support +contrib/openzfs/module/lua/lapi.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lauxlib.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lbaselib.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lcode.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lcompat.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lcorolib.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lctype.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/ldebug.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/ldo.c optional zfs compile-with "${ZFS_C} ${NO_WINFINITE_RECURSION}" +contrib/openzfs/module/lua/lfunc.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lgc.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/llex.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lmem.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lobject.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lopcodes.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lparser.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lstate.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lstring.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lstrlib.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/ltable.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/ltablib.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/ltm.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lvm.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/lua/lzio.c optional zfs compile-with "${ZFS_C}" + +# zfs nvpair support +contrib/openzfs/module/nvpair/fnvpair.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/nvpair/nvpair.c optional zfs compile-with "${ZFS_RPC_C} ${NO_WSTRINGOP_OVERREAD}" +contrib/openzfs/module/nvpair/nvpair_alloc_fixed.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/nvpair/nvpair_alloc_spl.c optional zfs compile-with "${ZFS_C}" + +#zfs platform compatibility code +contrib/openzfs/module/os/freebsd/zfs/abd_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/arc_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/crypto_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/dmu_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/event_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/hkdf.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/kmod_core.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/spa_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/sysctl_os.c optional zfs compile-with "${ZFS_C} -include $S/modules/zfs/zfs_config.h" +contrib/openzfs/module/os/freebsd/zfs/vdev_file.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/vdev_label_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/vdev_geom.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_acl.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_debug.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_dir.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_file_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_compat.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_racct.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_vfsops.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zio_crypt.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/os/freebsd/zfs/zvol_os.c optional zfs compile-with "${ZFS_C}" + +#zfs unicode support +contrib/openzfs/module/unicode/uconv.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/unicode/u8_textprep.c optional zfs compile-with "${ZFS_C}" + +#zfs checksums / zcommon +contrib/openzfs/module/zcommon/cityhash.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfeature_common.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfs_comutil.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfs_deleg.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfs_fletcher.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfs_fletcher_superscalar.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfs_fletcher_superscalar4.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfs_namecheck.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zfs_prop.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zpool_prop.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zcommon/zprop_common.c optional zfs compile-with "${ZFS_C}" + +# zfs edon-r hash support +contrib/openzfs/module/icp/algs/edonr/edonr.c optional zfs compile-with "${ZFS_C}" + +# zfs blake3 hash support +contrib/openzfs/module/icp/algs/blake3/blake3.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/icp/algs/blake3/blake3_generic.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/icp/algs/blake3/blake3_impl.c optional zfs compile-with "${ZFS_C}" + +# zfs sha2 hash support +contrib/openzfs/module/icp/algs/sha2/sha2_generic.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/icp/algs/sha2/sha256_impl.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/icp/algs/sha2/sha512_impl.c optional zfs compile-with "${ZFS_C}" + +#zfs core common code +contrib/openzfs/module/zfs/abd.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/aggsum.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/arc.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/blake3_zfs.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/blkptr.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/bplist.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/bpobj.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/bptree.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/brt.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/btree.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/bqueue.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dbuf.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dbuf_stats.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dataset_kstats.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/ddt.c optional zfs compile-with "${ZFS_C}" ++contrib/openzfs/module/zfs/ddt_stats.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/ddt_zap.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_diff.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_object.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_objset.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_recv.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_redact.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_send.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_traverse.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_tx.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dmu_zfetch.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dnode.c optional zfs compile-with "${ZFS_C} ${NO_WUNUSED_BUT_SET_VARIABLE}" \ + warning "kernel contains CDDL licensed ZFS filesystem" +contrib/openzfs/module/zfs/dnode_sync.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_bookmark.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_crypt.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_dataset.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_deadlist.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_deleg.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_destroy.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_dir.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_pool.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_prop.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_scan.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_synctask.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/dsl_userhold.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/edonr_zfs.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/fm.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/gzip.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/lzjb.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/lz4.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/lz4_zfs.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/metaslab.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/mmp.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/multilist.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/objlist.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/pathname.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/range_tree.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/refcount.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/rrwlock.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/sa.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/sha2_zfs.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/skein_zfs.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_checkpoint.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_config.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_errlog.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_history.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_log_spacemap.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_misc.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/spa_stats.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/space_map.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/space_reftree.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/txg.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/uberblock.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/unique.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_draid.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_draid_rand.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_indirect.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_indirect_births.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_indirect_mapping.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_initialize.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_label.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_mirror.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_missing.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_queue.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_raidz.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_raidz_math.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_raidz_math_scalar.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_rebuild.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_removal.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_root.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/vdev_trim.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zap.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zap_leaf.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zap_micro.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zcp.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zcp_get.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zcp_global.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zcp_iter.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zcp_set.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zcp_synctask.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfeature.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_byteswap.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_chksum.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_fm.c optional zfs compile-with "${ZFS_C} ${NO_WUNUSED_BUT_SET_VARIABLE}" +contrib/openzfs/module/zfs/zfs_fuid.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_impl.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_ioctl.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_log.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_onexit.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_quota.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_ratelimit.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_replay.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_rlock.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_sa.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zfs_vnops.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zstd/zfs_zstd.c optional zfs zstdio compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zil.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zio.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zio_checksum.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zio_compress.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zio_inject.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zle.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zrlock.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zthr.c optional zfs compile-with "${ZFS_C}" +contrib/openzfs/module/zfs/zvol.c optional zfs compile-with "${ZFS_C}" + +# dtrace specific +cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c optional dtrace compile-with "${DTRACE_C}" \ + warning "kernel contains CDDL licensed DTRACE" +cddl/contrib/opensolaris/uts/common/dtrace/dtrace_xoroshiro128_plus.c optional dtrace compile-with "${DTRACE_C}" +cddl/dev/dtmalloc/dtmalloc.c optional dtmalloc | dtraceall compile-with "${CDDL_C}" +cddl/dev/profile/profile.c optional dtrace_profile | dtraceall compile-with "${CDDL_C}" +cddl/dev/sdt/sdt.c optional dtrace_sdt | dtraceall compile-with "${CDDL_C}" +cddl/dev/fbt/fbt.c optional dtrace_fbt | dtraceall compile-with "${FBT_C}" +cddl/dev/systrace/systrace.c optional dtrace_systrace | dtraceall compile-with "${CDDL_C}" +cddl/dev/prototype.c optional dtrace_prototype | dtraceall compile-with "${CDDL_C}" +fs/nfsclient/nfs_clkdtrace.c optional dtnfscl nfscl | dtraceall nfscl compile-with "${CDDL_C}" +compat/freebsd32/freebsd32_abort2.c optional compat_freebsd32 +compat/freebsd32/freebsd32_capability.c optional compat_freebsd32 +compat/freebsd32/freebsd32_ioctl.c optional compat_freebsd32 +compat/freebsd32/freebsd32_misc.c optional compat_freebsd32 +compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32 +compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32 +contrib/ck/src/ck_array.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_barrier_centralized.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_barrier_combining.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_barrier_dissemination.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_barrier_mcs.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_barrier_tournament.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_epoch.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_hp.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_hs.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_ht.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/ck/src/ck_rhs.c standard compile-with "${NORMAL_C} -I$S/contrib/ck/include" +contrib/dev/acpica/common/ahids.c optional acpi acpi_debug +contrib/dev/acpica/common/ahuuids.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbcmds.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbconvert.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbdisply.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbexec.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbhistry.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbinput.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbmethod.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbnames.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbobject.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbstats.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbtest.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbutils.c optional acpi acpi_debug +contrib/dev/acpica/components/debugger/dbxface.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmcstyle.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmdeferred.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmnames.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmopcode.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmresrc.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmresrcl.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmresrcl2.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmresrcs.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmutils.c optional acpi acpi_debug +contrib/dev/acpica/components/disassembler/dmwalk.c optional acpi acpi_debug +contrib/dev/acpica/components/dispatcher/dsargs.c optional acpi +contrib/dev/acpica/components/dispatcher/dscontrol.c optional acpi +contrib/dev/acpica/components/dispatcher/dsdebug.c optional acpi +contrib/dev/acpica/components/dispatcher/dsfield.c optional acpi +contrib/dev/acpica/components/dispatcher/dsinit.c optional acpi +contrib/dev/acpica/components/dispatcher/dsmethod.c optional acpi +contrib/dev/acpica/components/dispatcher/dsmthdat.c optional acpi +contrib/dev/acpica/components/dispatcher/dsobject.c optional acpi +contrib/dev/acpica/components/dispatcher/dsopcode.c optional acpi +contrib/dev/acpica/components/dispatcher/dspkginit.c optional acpi +contrib/dev/acpica/components/dispatcher/dsutils.c optional acpi +contrib/dev/acpica/components/dispatcher/dswexec.c optional acpi +contrib/dev/acpica/components/dispatcher/dswload.c optional acpi +contrib/dev/acpica/components/dispatcher/dswload2.c optional acpi +contrib/dev/acpica/components/dispatcher/dswscope.c optional acpi +contrib/dev/acpica/components/dispatcher/dswstate.c optional acpi +contrib/dev/acpica/components/events/evevent.c optional acpi +contrib/dev/acpica/components/events/evglock.c optional acpi +contrib/dev/acpica/components/events/evgpe.c optional acpi +contrib/dev/acpica/components/events/evgpeblk.c optional acpi +contrib/dev/acpica/components/events/evgpeinit.c optional acpi +contrib/dev/acpica/components/events/evgpeutil.c optional acpi +contrib/dev/acpica/components/events/evhandler.c optional acpi +contrib/dev/acpica/components/events/evmisc.c optional acpi +contrib/dev/acpica/components/events/evregion.c optional acpi +contrib/dev/acpica/components/events/evrgnini.c optional acpi +contrib/dev/acpica/components/events/evsci.c optional acpi +contrib/dev/acpica/components/events/evxface.c optional acpi +contrib/dev/acpica/components/events/evxfevnt.c optional acpi +contrib/dev/acpica/components/events/evxfgpe.c optional acpi +contrib/dev/acpica/components/events/evxfregn.c optional acpi +contrib/dev/acpica/components/executer/exconcat.c optional acpi +contrib/dev/acpica/components/executer/exconfig.c optional acpi +contrib/dev/acpica/components/executer/exconvrt.c optional acpi +contrib/dev/acpica/components/executer/excreate.c optional acpi +contrib/dev/acpica/components/executer/exdebug.c optional acpi +contrib/dev/acpica/components/executer/exdump.c optional acpi +contrib/dev/acpica/components/executer/exfield.c optional acpi +contrib/dev/acpica/components/executer/exfldio.c optional acpi +contrib/dev/acpica/components/executer/exmisc.c optional acpi +contrib/dev/acpica/components/executer/exmutex.c optional acpi +contrib/dev/acpica/components/executer/exnames.c optional acpi +contrib/dev/acpica/components/executer/exoparg1.c optional acpi +contrib/dev/acpica/components/executer/exoparg2.c optional acpi +contrib/dev/acpica/components/executer/exoparg3.c optional acpi +contrib/dev/acpica/components/executer/exoparg6.c optional acpi +contrib/dev/acpica/components/executer/exprep.c optional acpi +contrib/dev/acpica/components/executer/exregion.c optional acpi +contrib/dev/acpica/components/executer/exresnte.c optional acpi +contrib/dev/acpica/components/executer/exresolv.c optional acpi +contrib/dev/acpica/components/executer/exresop.c optional acpi +contrib/dev/acpica/components/executer/exserial.c optional acpi +contrib/dev/acpica/components/executer/exstore.c optional acpi +contrib/dev/acpica/components/executer/exstoren.c optional acpi +contrib/dev/acpica/components/executer/exstorob.c optional acpi +contrib/dev/acpica/components/executer/exsystem.c optional acpi +contrib/dev/acpica/components/executer/extrace.c optional acpi +contrib/dev/acpica/components/executer/exutils.c optional acpi +contrib/dev/acpica/components/hardware/hwacpi.c optional acpi +contrib/dev/acpica/components/hardware/hwesleep.c optional acpi +contrib/dev/acpica/components/hardware/hwgpe.c optional acpi +contrib/dev/acpica/components/hardware/hwpci.c optional acpi +contrib/dev/acpica/components/hardware/hwregs.c optional acpi +contrib/dev/acpica/components/hardware/hwsleep.c optional acpi +contrib/dev/acpica/components/hardware/hwtimer.c optional acpi +contrib/dev/acpica/components/hardware/hwvalid.c optional acpi +contrib/dev/acpica/components/hardware/hwxface.c optional acpi +contrib/dev/acpica/components/hardware/hwxfsleep.c optional acpi +contrib/dev/acpica/components/namespace/nsaccess.c optional acpi \ + compile-with "${NORMAL_C} ${NO_WUNUSED_BUT_SET_VARIABLE}" +contrib/dev/acpica/components/namespace/nsalloc.c optional acpi +contrib/dev/acpica/components/namespace/nsarguments.c optional acpi +contrib/dev/acpica/components/namespace/nsconvert.c optional acpi +contrib/dev/acpica/components/namespace/nsdump.c optional acpi +contrib/dev/acpica/components/namespace/nseval.c optional acpi +contrib/dev/acpica/components/namespace/nsinit.c optional acpi +contrib/dev/acpica/components/namespace/nsload.c optional acpi +contrib/dev/acpica/components/namespace/nsnames.c optional acpi +contrib/dev/acpica/components/namespace/nsobject.c optional acpi +contrib/dev/acpica/components/namespace/nsparse.c optional acpi +contrib/dev/acpica/components/namespace/nspredef.c optional acpi +contrib/dev/acpica/components/namespace/nsprepkg.c optional acpi +contrib/dev/acpica/components/namespace/nsrepair.c optional acpi +contrib/dev/acpica/components/namespace/nsrepair2.c optional acpi +contrib/dev/acpica/components/namespace/nssearch.c optional acpi +contrib/dev/acpica/components/namespace/nsutils.c optional acpi +contrib/dev/acpica/components/namespace/nswalk.c optional acpi +contrib/dev/acpica/components/namespace/nsxfeval.c optional acpi +contrib/dev/acpica/components/namespace/nsxfname.c optional acpi +contrib/dev/acpica/components/namespace/nsxfobj.c optional acpi +contrib/dev/acpica/components/parser/psargs.c optional acpi +contrib/dev/acpica/components/parser/psloop.c optional acpi +contrib/dev/acpica/components/parser/psobject.c optional acpi +contrib/dev/acpica/components/parser/psopcode.c optional acpi +contrib/dev/acpica/components/parser/psopinfo.c optional acpi +contrib/dev/acpica/components/parser/psparse.c optional acpi +contrib/dev/acpica/components/parser/psscope.c optional acpi +contrib/dev/acpica/components/parser/pstree.c optional acpi +contrib/dev/acpica/components/parser/psutils.c optional acpi +contrib/dev/acpica/components/parser/pswalk.c optional acpi +contrib/dev/acpica/components/parser/psxface.c optional acpi +contrib/dev/acpica/components/resources/rsaddr.c optional acpi +contrib/dev/acpica/components/resources/rscalc.c optional acpi +contrib/dev/acpica/components/resources/rscreate.c optional acpi +contrib/dev/acpica/components/resources/rsdump.c optional acpi acpi_debug +contrib/dev/acpica/components/resources/rsdumpinfo.c optional acpi +contrib/dev/acpica/components/resources/rsinfo.c optional acpi +contrib/dev/acpica/components/resources/rsio.c optional acpi +contrib/dev/acpica/components/resources/rsirq.c optional acpi +contrib/dev/acpica/components/resources/rslist.c optional acpi +contrib/dev/acpica/components/resources/rsmemory.c optional acpi +contrib/dev/acpica/components/resources/rsmisc.c optional acpi +contrib/dev/acpica/components/resources/rsserial.c optional acpi +contrib/dev/acpica/components/resources/rsutils.c optional acpi +contrib/dev/acpica/components/resources/rsxface.c optional acpi +contrib/dev/acpica/components/tables/tbdata.c optional acpi +contrib/dev/acpica/components/tables/tbfadt.c optional acpi +contrib/dev/acpica/components/tables/tbfind.c optional acpi +contrib/dev/acpica/components/tables/tbinstal.c optional acpi +contrib/dev/acpica/components/tables/tbprint.c optional acpi +contrib/dev/acpica/components/tables/tbutils.c optional acpi +contrib/dev/acpica/components/tables/tbxface.c optional acpi +contrib/dev/acpica/components/tables/tbxfload.c optional acpi +contrib/dev/acpica/components/tables/tbxfroot.c optional acpi +contrib/dev/acpica/components/utilities/utaddress.c optional acpi +contrib/dev/acpica/components/utilities/utalloc.c optional acpi +contrib/dev/acpica/components/utilities/utascii.c optional acpi +contrib/dev/acpica/components/utilities/utbuffer.c optional acpi +contrib/dev/acpica/components/utilities/utcache.c optional acpi +contrib/dev/acpica/components/utilities/utcksum.c optional acpi +contrib/dev/acpica/components/utilities/utcopy.c optional acpi +contrib/dev/acpica/components/utilities/utdebug.c optional acpi +contrib/dev/acpica/components/utilities/utdecode.c optional acpi +contrib/dev/acpica/components/utilities/utdelete.c optional acpi +contrib/dev/acpica/components/utilities/uterror.c optional acpi +contrib/dev/acpica/components/utilities/uteval.c optional acpi +contrib/dev/acpica/components/utilities/utexcep.c optional acpi +contrib/dev/acpica/components/utilities/utglobal.c optional acpi +contrib/dev/acpica/components/utilities/uthex.c optional acpi +contrib/dev/acpica/components/utilities/utids.c optional acpi +contrib/dev/acpica/components/utilities/utinit.c optional acpi +contrib/dev/acpica/components/utilities/utlock.c optional acpi +contrib/dev/acpica/components/utilities/utmath.c optional acpi +contrib/dev/acpica/components/utilities/utmisc.c optional acpi +contrib/dev/acpica/components/utilities/utmutex.c optional acpi +contrib/dev/acpica/components/utilities/utnonansi.c optional acpi +contrib/dev/acpica/components/utilities/utobject.c optional acpi +contrib/dev/acpica/components/utilities/utosi.c optional acpi +contrib/dev/acpica/components/utilities/utownerid.c optional acpi +contrib/dev/acpica/components/utilities/utpredef.c optional acpi +contrib/dev/acpica/components/utilities/utresdecode.c optional acpi acpi_debug +contrib/dev/acpica/components/utilities/utresrc.c optional acpi +contrib/dev/acpica/components/utilities/utstate.c optional acpi *** 6413 LINES SKIPPED *** From nobody Thu Mar 7 15:31:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrCtw0vlXz5DDXB; Thu, 7 Mar 2024 15:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrCtw0RSKz45cf; Thu, 7 Mar 2024 15:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709825464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DwKvq1EzoAhJ3vJoU9WHg8Ufi/v9ujx2EbAS3DSc888=; b=D/6si/AxQr4a/SQQ9lP4lqgFgetWONOG1KaNsGbORcuGTFlA8sg4B9ZhUB0A7/bcvX/FmC 5602fnC3VH3+KjZbSLFLkVyHZkf5w3AsgZNAHJBDFPlvhnyYA5SzSfNclMZFM9B96lgcVQ AMAhVAeJCzyX3CrpQ/XryCBuM9F/gOabzXF6CxNROAXaQh/n2B4NvkgJbv3txJbvpfwey8 3LCXDxNrP2lblsPXfTYi2iEZI5yFWPyBay9/y7VpIh+xRl15w5M8ReczuqNexG+u4CqxiE NazN3pqlLx6HnBm26sKl/l4a3ApW80Pyw01yZ1l/PEiS7N0VAJHeRx5uHopxWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709825464; a=rsa-sha256; cv=none; b=qR4YNLsE+m0ZT1zZHuMVqQmbdBt7+0n7GkxIoLVz6s9XOhr3aGI4aYFUQgJppbEVJpM18W N5FQ1gTaH21OBczFuwWs8XYQQvcAOdlVAwkz9fQHndqLgBpy9Dxll+oqdniuDvqlisswNs fVNKzFPVlViblF0Tpn48ESLjjRY3xX4QY6g5D1jIFhxzylPMPQmJKETnbJONq6k/+n4gUy ql6QGlLMryffIV/gtPBrciGeTYERh049EvHL8Nij3QHWzwz+404xHmfkzVqxYvlPo5JJIL yQ2QaCdSN1hxXSTOJK+RgMg6vA7igLZZI3yabjNJiaEXJKf46VjXxa5ocEeo2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709825464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DwKvq1EzoAhJ3vJoU9WHg8Ufi/v9ujx2EbAS3DSc888=; b=bc6duL58+od1rNeAzer48fRNruOLroIjvFtiZES5TUbufKCzYDYm9DzhiAQFqXF3DE64hh JItJ7PY16Dr1tA2LXNMysZSDuMOFSJSR7Epjyd5jYmZ8NxfphdnyuRoAdCp+/b3mY5ksGP 5pJHV+IIUa9WVgAro5tmcMyFjy/eVFcvJLIOD50Br674Fylsre/l3C4UEaTjtw2WTACxTn nDWoIVF2TwDojw64aS3J6e4j+NglzXf9zsmqC3gn6mQpvqu2cfI0R4Fr4Ubjsp9l/C1mh/ dGD1nAk2Bh1oRoodXOWRHhFYDCB74sqs88Gu/9f16CF9K9KnywcI9hOufj/c1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrCtw02yYzgK7; Thu, 7 Mar 2024 15:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427FV3ju069902; Thu, 7 Mar 2024 15:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427FV3JI069899; Thu, 7 Mar 2024 15:31:03 GMT (envelope-from git) Date: Thu, 7 Mar 2024 15:31:03 GMT Message-Id: <202403071531.427FV3JI069899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c849eb8f1925 - main - nullfs: Add the vfs.nullfs.cache_nodes sysctl to control nocache default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c849eb8f1925f95ebfb8dbbe00672d902486a973 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c849eb8f1925f95ebfb8dbbe00672d902486a973 commit c849eb8f1925f95ebfb8dbbe00672d902486a973 Author: Seigo Tanimura AuthorDate: 2024-03-04 13:50:25 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-07 15:19:18 +0000 nullfs: Add the vfs.nullfs.cache_nodes sysctl to control nocache default Differential revision: https://reviews.freebsd.org/D44217 MFC after: 1 week --- sys/fs/nullfs/null_vfsops.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 2fa592ebbe9c..04a3817a828d 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -63,6 +64,13 @@ static vfs_unmount_t nullfs_unmount; static vfs_vget_t nullfs_vget; static vfs_extattrctl_t nullfs_extattrctl; +SYSCTL_NODE(_vfs, OID_AUTO, nullfs, CTLFLAG_RW, 0, "nullfs"); + +static bool null_cache_vnodes = true; +SYSCTL_BOOL(_vfs_nullfs, OID_AUTO, cache_vnodes, CTLFLAG_RWTUN, + &null_cache_vnodes, 0, + "cache free nullfs vnodes"); + /* * Mount null layer */ @@ -198,7 +206,8 @@ nullfs_mount(struct mount *mp) } xmp->nullm_flags |= NULLM_CACHE; - if (vfs_getopt(mp->mnt_optnew, "nocache", NULL, NULL) == 0 || + if (!null_cache_vnodes || + vfs_getopt(mp->mnt_optnew, "nocache", NULL, NULL) == 0 || (xmp->nullm_vfs->mnt_kern_flag & MNTK_NULL_NOCACHE) != 0) xmp->nullm_flags &= ~NULLM_CACHE; From nobody Thu Mar 7 18:55:29 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrJQp02V3z5DcL4; Thu, 7 Mar 2024 18:55:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrJQn6Jpxz4X6D; Thu, 7 Mar 2024 18:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709837729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFeUYJ8AOEcTGmDi7NktkemDS6RwlXhiX5MPElspYr8=; b=St+yUYhGV3deaUJru8aoQiKkiCRg/DInvq97ou36TFJK3tCd2mXahu0Ahm4HYV6tHYR8kt cyyPPyDUlaxWW+PVzqzhLZiyqAY0+n1KSgQro84jcaGC1p50msFZmcfJ2USgviK9EQN2wu X1KJOri0bLNsCo211fnyFHSvp4IAbWtYOBHbR7AULu/jzXoQgUuywnHOWogZY9aawHgzYt Ywxk79Z0PkExg2WEVwx+H+hV8n6GqKDh78INEO8tkpOgeZTGrZhlUPclC7SMm+eqMWLUdB UNBXWoQVKaapmlP7d5MVlduc2MDYfar7XUEHEq/88As7N4NpmH+nM52zN+8+QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709837729; a=rsa-sha256; cv=none; b=yqjJvJznIRgrpgiX0tzUmwnUIeunSiXWo7VeA5JhNH5o9HQ9SbiNFkaRcqFa5H3+r+fR8u RMFeJqFyeyJ/ORssrGQBd3fscMldJSOeJg0MliCFm0esmwyuL9JSk9fXLiI6xJU995bQrf GNvGW/08JRcuGJ2BEnEmYvqrQAvllIur6QdotAqY2Gwr3JqlPEL+2jmZsZtTS1tpjcj70U jrHCyjrHORprhJ8grymKyCaHbMU9wmiE3jIVDoFEV8bEmTaTSNsIynCN0vVMRmrIyw/s8J 3QvobYtMgcEoKj6gHLyUJ+TKNHoJjXID47Ac/DLvMe22rNAwVsX1GRwlFmZ5GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709837729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AFeUYJ8AOEcTGmDi7NktkemDS6RwlXhiX5MPElspYr8=; b=NHcXSHvJPiI2wIjKUQYqR3jxLO+xEnqPOc6glGEYO7o+Y1xVgyJYZ6GzyeoDPl2bFeV153 pDthGdFpPoUWecKAimcpm2PXsFSWq/UsIv2Gw18YDZEe9YCE359cRCvDKpxA9BYhlwbMMX vyNqKu8Xx4xrwIHF9eiDOplLbDwZcK8o7c66D2Pi1sHDgGBc6FHkkSmdMQgy6tFtKsF/BR IwPX8ZuGMGiLwCwWAXkDLsecDzKApvQcYUsaa5qcJHiFuayxaryc6xAYXUswO6OcjhZnqj t/OcSMDdUiIY9OdCpgZfFZA661tsjxZe/JO5VPtFYiY4pdoYt9Rrpte7VhbRIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrJQn5wYvzmbp; Thu, 7 Mar 2024 18:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427ItTJw012329; Thu, 7 Mar 2024 18:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427ItT45012327; Thu, 7 Mar 2024 18:55:29 GMT (envelope-from git) Date: Thu, 7 Mar 2024 18:55:29 GMT Message-Id: <202403071855.427ItT45012327@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 7cbffbfcd9a5 - main - if_bnxt: Fix media speed update issue in "ifconfig -m" during PHY hot plug List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7cbffbfcd9a5185be61bec65790674159bb7c0a8 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=7cbffbfcd9a5185be61bec65790674159bb7c0a8 commit 7cbffbfcd9a5185be61bec65790674159bb7c0a8 Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:13:07 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 18:42:39 +0000 if_bnxt: Fix media speed update issue in "ifconfig -m" during PHY hot plug Currently, if a media type (e.g., DAC) is hot-plugged out and another type (e.g., optical cable) is hot-plugged in, the new speed is not reflected in ifconfig. This occurs when the driver fails to update speeds with unchanged tx and rx flow control. To fix, a phy_type check ensures update of phy speeds upon detecting the new phy. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42951 --- sys/dev/bnxt/bnxt.h | 1 + sys/dev/bnxt/if_bnxt.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index 2b5c16e263d7..4484c8db5430 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -298,6 +298,7 @@ struct bnxt_link_info { uint8_t last_link_up; uint8_t duplex; uint8_t last_duplex; + uint8_t last_phy_type; struct bnxt_flow_ctrl flow_ctrl; struct bnxt_flow_ctrl last_flow_ctrl; uint8_t duplex_setting; diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index e3d82214a8a8..8439504af49a 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -3071,6 +3071,7 @@ bnxt_report_link(struct bnxt_softc *softc) if (!link_info->link_up) return; if ((link_info->duplex == link_info->last_duplex) && + (link_info->phy_type == link_info->last_phy_type) && (!(BNXT_IS_FLOW_CTRL_CHANGED(link_info)))) return; } @@ -3101,6 +3102,7 @@ bnxt_report_link(struct bnxt_softc *softc) link_info->last_link_up = link_info->link_up; link_info->last_duplex = link_info->duplex; + link_info->last_phy_type = link_info->phy_type; link_info->last_flow_ctrl.tx = link_info->flow_ctrl.tx; link_info->last_flow_ctrl.rx = link_info->flow_ctrl.rx; link_info->last_flow_ctrl.autoneg = link_info->flow_ctrl.autoneg; From nobody Thu Mar 7 19:05:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrJfn0bPwz5Dd2Y; Thu, 7 Mar 2024 19:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrJfn028Vz4Y74; Thu, 7 Mar 2024 19:05:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709838353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hmB768MwGH6d9bkqpjXZJ00d4VvfSYhfhfiy0VmzPNY=; b=ZzfB4KZ2VE8hiP/HVKXN70mCxwLPSnB/5EkkTwyfmzqmgv+2tF8EI75OIJ83qGn8F0DvAr nueFptdMbBxgVFqKUgbTsl25ftDcnVPI2mUGvPZypiBXr8jne6aodGryDb6UweHLeC3gGO 03CvnwKg9gZPfT4QcQpgE1+fReZW2SdYd/Fahp+DHZED79qosAlp8C4DhNanAvwNGihnCm QiRhFV1YI9HUifS81CBnHtXickEHmMoAt90PZ6xw7rrjYk1TnqZQkVnbxCVxsWPNu/0GE9 kU3xY9sZx/xC3N2So8mDXpE3rW5J0rO53ZQe6IOj2E4oWaJpmw92ewtR2sPFPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709838353; a=rsa-sha256; cv=none; b=dzFsGFYCwoEzF9F+dWHXZcMlT1IZrHJkbFKiH5XEL+61ePDiC4oGBjzfnkRD9dfdZJuEqY 0aRYyZgDAowIXe5J8lyNvw4/uSPKj/k5FOg1ngWNU3/dKuGrKm59y+I2SLycWf5qXwg/Mb zzQIFG6sV6IPYbz7+HLwuqx3AA8NHcIXZs0/Y2VEfgIrrf9zZvbEsNnwxsnsA/MX07I0tQ g/MvEXWGFFdV/Z39GYvRtuGFr5ZVQqqKEcTCsbVpvzAcRtFs0B29IEYBIcdngWD1Gq6xPK 2JsFlJuU/qNvk5nhKr1VTXB2xYeEGN751C6sREl7v1z59LpdQdiP+DWxEoXvdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709838353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hmB768MwGH6d9bkqpjXZJ00d4VvfSYhfhfiy0VmzPNY=; b=tUlWW2GBCWRztsCUgj4pk04JnIewR3GulkHoKqPDNr26QvjyDDWUMyv+tJhj76UCQVVZkw uVL00Q+YViZgdUQQNICjK0Q9a2wO2C7Wx3pCQn+Ht7WcRzBgdITTht5EjgKDYNyZXnJf9o tK/CtnsfEtLbwU4a4Ya7k0By5L/9EWhMit78FDVWx3oigkwgNNwVytutXYTNxw0MzqgOnu m79TYzb4pwTB4iaLykZ7fTLujumTwSdzMi3KCNRrqZ2LfhtgMwHAXvoAliOsc04Uw3WZ4X QL3b6caow/lOSQ3vjwbhkECjc2XzAIyIZlQ7we0RXcKDaeZSAXS9heluO6Q3EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrJfm6l0ZzmcX; Thu, 7 Mar 2024 19:05:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427J5qF8030443; Thu, 7 Mar 2024 19:05:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427J5qJw030440; Thu, 7 Mar 2024 19:05:52 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:05:52 GMT Message-Id: <202403071905.427J5qJw030440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fe52c3384c61 - main - nvme_sim: Add comment about the is_failed test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe52c3384c61a092a305deebc063968a47dc854f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe52c3384c61a092a305deebc063968a47dc854f commit fe52c3384c61a092a305deebc063968a47dc854f Author: Warner Losh AuthorDate: 2024-03-06 21:30:01 +0000 Commit: Warner Losh CommitDate: 2024-03-07 19:05:28 +0000 nvme_sim: Add comment about the is_failed test We only see a request with a failed controller while we're in the process of failing the controller. Add a comment to that effect. Sponsored by: Netflix --- sys/dev/nvme/nvme_sim.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/nvme/nvme_sim.c b/sys/dev/nvme/nvme_sim.c index 70bb95602bf8..f561756f99b7 100644 --- a/sys/dev/nvme/nvme_sim.c +++ b/sys/dev/nvme/nvme_sim.c @@ -270,6 +270,10 @@ nvme_sim_action(struct cam_sim *sim, union ccb *ccb) case XPT_NVME_IO: /* Execute the requested I/O operation */ case XPT_NVME_ADMIN: /* or Admin operation */ if (ctrlr->is_failed) { + /* + * I/O came in while we were failing the drive, so drop + * it. Once falure is complete, we'll be destroyed. + */ ccb->ccb_h.status = CAM_DEV_NOT_THERE; break; } From nobody Thu Mar 7 19:09:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrJlM3f8Cz5DdKx; Thu, 7 Mar 2024 19:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrJlM1nDVz4YQZ; Thu, 7 Mar 2024 19:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709838591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3E4p2G2gt+HMzvZBmGOEOgivQgixruoFp6CBMMOcy0=; b=cow06qOrfV+PQudhMUxYk+7TXSxklAE2zWPNkr8+imSyfcjJqQEwn0QhQSolms1kwBaA/t ab+tNycxjwMT8kD5pKlzU8uN7XRuehOsllQI82BrPR3YUTsdgAnWHUBUCOrXMX+15XTP3I nuMgARdlcgpzCtHWD0ZkApwnXIdAHIvQIWOxBv4kLQw+D5p4biAQzQINQHLvN+WVBouzDd MCSBVIKVYiMLVMW+jS3SE/aksrz+8ANRyUadGUvRhosDxeILeCs89DE6FTi7EnKoeeVxns 1+j5QHfwRQEuuwhRb2LgaDvqm3gP2IwlKTd8QuEPIxTuZEQDnqXyvnDBjyWNdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709838591; a=rsa-sha256; cv=none; b=Mv6k9GsyJKMDiX8jiE0v5Rh8LaIwpB8S/6WHqOys7MkGUbn1YYxi8+t82hvARji5eg1uxH dtZ8sELGhv9JjlwgxPodB+n6HEUCKz0BvkDHe3COAahy7WJKmmOPLrp9oDtk5cOdBeo4/0 oGLg1//WazD/60L6zQXN9fjNsLE+EaxZC4LsMKt00Sn72ZO15FlEIPCf266dT311CaPVLS rLrKR32RyfluKrSebQT7aIa92ee3kQQVK8x7fAIRVIA3QV1p9Qaqy5KEQb2Z8nRA855Qmp OlIjg3+pCICvr3SL0H+DWNv0dChNFjYj4op31vXb5DlUYVRAOI/VFaQQuXXIrg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709838591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d3E4p2G2gt+HMzvZBmGOEOgivQgixruoFp6CBMMOcy0=; b=MCCV779scym0PwinYdll4MOsj0kHv3mf/WTNO02OgoPGs7qGfwtKCW+yvVnQyXWWx96Rst gv+Rx/DP/O9WW/V3SPn3YZZL1LjpB9YJ2JMubmeGJMUbdRpa9hQYlWwo+k8EwLJ0SVqwnM E+18ZD0sA9ckj7J7xnismkhdq+eM86u8H+OABO5vmaLdFRddqU6in3Gt4FeHGvhvc7SAf7 oL8D6cOawiDYbBp8y78PIwEGy8HVmhXMaIPN5/PGRoPPHOqoOznK0vam3/GOm8lIN4PNgd KGx5HBtNHt6Eyo6ChotbhIRv6I9iiUcQHbYlpIX/nAOIXd7+YhxoRXbg9uH3lw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrJlM1NkvzmcZ; Thu, 7 Mar 2024 19:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427J9p5L031085; Thu, 7 Mar 2024 19:09:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427J9pKk031082; Thu, 7 Mar 2024 19:09:51 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:09:51 GMT Message-Id: <202403071909.427J9pKk031082@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: c5108e37fbf9 - main - if_bnxt: Incorrect Labeling of Supported Medium in `ifconfig -m ` Command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5108e37fbf93a538c76325766b8a3d76a72f119 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=c5108e37fbf93a538c76325766b8a3d76a72f119 commit c5108e37fbf93a538c76325766b8a3d76a72f119 Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:14:27 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:09:13 +0000 if_bnxt: Incorrect Labeling of Supported Medium in `ifconfig -m ` Command The 1G speed on DAC medium is incorrectly labeled as 1000baseT, it should be 1000baseCX. Updated the label accordingly. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42952 --- sys/dev/bnxt/if_bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 8439504af49a..6d447e8070d5 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -2890,7 +2890,7 @@ bnxt_add_media_types(struct bnxt_softc *softc) BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_CR4); BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_CR); BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_CR1); - BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_T); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_CX); break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4: From nobody Thu Mar 7 19:27:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7K3VQDz5DfXt; Thu, 7 Mar 2024 19:27: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 4TrK7K2drgz4b6q; Thu, 7 Mar 2024 19:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jPqk33pS8muBTuHaPOW1ULgIxZJezX6hL5TJSMnnckk=; b=OudrQP+OdmHwTtpZ9MFP+e+uPhRd7hS+ApFZsFl1Wfs209UqpMe0npDo/n6ZwbE56vNkdM e6D8nz5IlYVwEdU6DsKltrB+nDXN7lLrg360H/hxNpY1UMIpDfSkglkGf7NcVWvgCiV6U9 fds3ddPx/ZOSJSgD//qau5cf9j1qmn092AMZDFzIua71TSYwIvpf8T6llPayDE8/VZM0w2 baDKaYXqWaJVhTIj4v3kDwXH6EfsSBQsio8Fc+HP+vzneJrr7yLrbOhIyxb6w02M+gbNrV ew8Oqz4k9BmTfFIq6khFKFUXabJwYHDb3GSrv0cHHXZp7iasjaeonrAGtHTgMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839629; a=rsa-sha256; cv=none; b=r5RpP8e6zb+bFOsKr5nOh/ihDCHP2YSE6VV6Whi67Mkg6fznvIGzcDK/CBJ9sD7BQehszG SS63ser7o1Ir5HogHZ0TdaUeUKTdgbgzjI2eKpRwRO7/r7XA8fp6hpSRnbCkskVr5rBvV2 kAt0bf37VcQnf2Q71fasXFdiGyXM9qocVxdxTss/Q8Y6BbGgf5yWzIdxEJz8rpu0mJfRe8 mpCxpdn+9E+2CTuhXNclt6FrcsA0k5YS+rVImvD4bLigbWu7fILnrXWc4vzbTvWC1Ftb/I /Q9La6/9ZcsY7xdKh/FDBFdhG5YMVO9bpPffxISQRZRmvi+doaNEDg3PsJsIKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jPqk33pS8muBTuHaPOW1ULgIxZJezX6hL5TJSMnnckk=; b=WhStqIqrUXYnak7cUBuXjPBGB9VX5vTzjaGt4LUHtiSAsFnJYJLUKheJh3O945epZkWsfL b/cXDL3UwCJob6brUq9+lFeM/bRi/io6HTfBWvP/M3SUFi7HSvpv3HkSDtgL9BwAkMl3v1 afMegE2epga+0KHMooyp7oqL7zkMPOgAMT6qfvOXfDETlMxP4r77Vn+HFKcV94eAGEExyq oN11f0X6X4TcNF8lVUGuMXuJ86IrdrAjwFildCi+D9z5p746XLiK4hEMc72ZfNZILx+zwT RFNMQFQjdb2SPg3y3ZwRTTUt7Jt/58XzE+jS6zbdICq9qDyrf2klzu+/SV/fPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7K2DGvznR5; Thu, 7 Mar 2024 19:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JR9MC064137; Thu, 7 Mar 2024 19:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JR9Kd064134; Thu, 7 Mar 2024 19:27:09 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:09 GMT Message-Id: <202403071927.427JR9Kd064134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 0f8d1a9e0cd2 - main - if_bnxt: Enabled support for 1G SX, CX, and LX forced speed settings List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f8d1a9e0cd26bf4dd0b2fe2d28c1ab15d03cce4 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=0f8d1a9e0cd26bf4dd0b2fe2d28c1ab15d03cce4 commit 0f8d1a9e0cd26bf4dd0b2fe2d28c1ab15d03cce4 Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:15:32 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:16:38 +0000 if_bnxt: Enabled support for 1G SX, CX, and LX forced speed settings Enabled User Configuration of 1G Speed on Wh+ SFP28 Port with AOC cable. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42953 --- sys/dev/bnxt/if_bnxt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 6d447e8070d5..92e448567f9e 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -2082,6 +2082,9 @@ bnxt_media_change(if_ctx_t ctx) case IFM_1000_KX: case IFM_1000_T: case IFM_1000_SGMII: + case IFM_1000_CX: + case IFM_1000_SX: + case IFM_1000_LX: softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; softc->link_info.req_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_1GB; From nobody Thu Mar 7 19:27:10 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7L4ldgz5Dfdy; Thu, 7 Mar 2024 19:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrK7L3c9tz4ZrX; Thu, 7 Mar 2024 19:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0akUnNycXq9eOzVZBmf93Ref+P4ouHqD1/l2tRzZBI=; b=Hz7b5ZFt+f4qQVwAU+WxwFYOc4yrXa6XlSJOpewQEGdltgKsm1Om/BmiZ7kM0kwqvugpnr QGkvwkq/989aCw3Dwuc1t3kIGHE7MPXhBq1h/lwUA3PW1+2T9vZebcFU4JRmWkcAKNMhkJ gvCpEOVSCnKz2LArK03soylLTlvG2gKfsC8WCWEU5Cl3etJVGYAd6N5tNwndzTQVTKdLcx 1NgV14CRhdOdNIYyX2LnYPCMW2IkBITg5Lvhnn6Ew8MrnuFqGjoenPw2zyAdFCiN+VzuoD 1mQKRsto4T0NSNfp8B1erg5wwVpnsCMQrREOWcz8UJB7um2uXHjnO+t1Vch2/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839630; a=rsa-sha256; cv=none; b=hJpkvC0JktEWmGjE9vLPykNEoycMkHxTl1F1GmowqpimBtQOSDhLjLlXnh7Fo9LDDHrA+K TfEcxIaZY593nS1neun0nNtfWoxJs8WAUcpqGBAFdpYWeUstTQK2fAFIrskTh5zaKKTK3w xS/CUHuVZqJ1mRFCo67CUXqkyK7j+zwQ6w0NxfvYBJk2WWPgZ5/2Ku5Ym7Fh0qnvueCNBP z3TYK/O3VsFU2CsuQk3jKF3PJQx6pxoUJabOxI7dNg4ylTQ6P6bfsnoEV3DMtY6hhTN8Rc Me0KBMrdgHfbbHNeI/NSro0RD5Y4SF80uWr2G8qLebNra+2xEB2qNugAsUW8Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T0akUnNycXq9eOzVZBmf93Ref+P4ouHqD1/l2tRzZBI=; b=g5nHWipPcBVH666Rem6cXxVppP9ggzcbrhBs0ep6MEyEv6pOxPkKUHM7UROXByL1oJx3yW iBUBO53ho6Xp1AvJHcE1Upq6ZgB3190OgEkwBaQyHXNnHUUHt4Xz5zAJdu4vIR8Mr9pZX2 vBVWEf14qzQSWfypkz8GS5koxxah4fFf4Gye02BMLYjENN4B9gWrTVgbPqQAfd667VZaMg OEevETxgyyVE5yZeTLGYaU58tYkfwFZYOwpmzSTzRo9kj4Ze4A1r9GwqMfDp0dATzW1IOD oJ0DM259E6tJtVcml/Qa9WEBQltAyYRX48WJtH2zQHRDq3FOEVNPL2bDT0GTQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7L3CbCzmjr; Thu, 7 Mar 2024 19:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JRAcx064191; Thu, 7 Mar 2024 19:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JRAe4064188; Thu, 7 Mar 2024 19:27:10 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:10 GMT Message-Id: <202403071927.427JRAe4064188@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 8a3aab53e335 - main - if_bnxt: Update Maximum Configurable MTU from 9000 to 9600 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a3aab53e335dadb3c95c0eb0664143a955f1ab7 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=8a3aab53e335dadb3c95c0eb0664143a955f1ab7 commit 8a3aab53e335dadb3c95c0eb0664143a955f1ab7 Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:16:38 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:16:39 +0000 if_bnxt: Update Maximum Configurable MTU from 9000 to 9600 Increasing the maximum configurable MTU from 9000 to 9600 to align with the firmware's capability of handling an MTU up to 9600. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42954 --- sys/dev/bnxt/bnxt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index 4484c8db5430..73122f82c7ad 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -98,7 +98,7 @@ CSUM_IP_UDP|CSUM_IP_TCP|CSUM_IP_SCTP| \ CSUM_IP6_UDP|CSUM_IP6_TCP|CSUM_IP6_SCTP) -#define BNXT_MAX_MTU 9000 +#define BNXT_MAX_MTU 9600 #define BNXT_RSS_HASH_TYPE_TCPV4 0 #define BNXT_RSS_HASH_TYPE_UDPV4 1 From nobody Thu Mar 7 19:27:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7P2J6Lz5DfBr; Thu, 7 Mar 2024 19:27: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 4TrK7P1flQz4b5N; Thu, 7 Mar 2024 19:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uttddTumfRAUDqTHMiq628uZpE9Gt94yV1htKdqdYT0=; b=NCSURxYlOw4ob1yDy+MCBJdHlWYipaBspt70Bd9o7YI1YTL4z5wUNhEMbf3TD4WPUvWu9h YzJ53I+QoqutJ5Q6PfJOsPfLLIO5H9LidEHIdbijYBzm6qprpCHnk5fzro+4a3/lWhwJdG KnJEBQU9C1RAAHMOXDtwrT/WdW0CcBWX9lxMDzvNBkFePFmtUdD6wM9qrdIUGTOMUM+y+i ElO//jBFQTw4MCxON9MmEdUkVQupLQF9ASi+ToO8wfEwLVzB0QwEaMNZ9dD5M5LRDC5yPc WmgiG90hhcOXA6OiIeeQJOHmPopfqPuLdVWIPmnhKnoahFUPQqzgnl7GbuclmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839633; a=rsa-sha256; cv=none; b=Y9LUqktjpspRtVq26wBFT/PUMAqAL72qa2K1zhPDO9NJ16bdTgDrb1AQvM7FOKZx+7+q2Z 0olO5RA6Yz/Qdtlcvdn0urEaoomBsL1MqhTzjD6C8wImJ/gXVLMs0pYKmVv13b4xDWo1UZ txQ8aC6WrlBMwc4xszNLF+SdtksWbuVyr1gbSulGEpCUPHD8kAzqVHVLwJvsDcMWFU/SOz nswhZwFWQYvkrzwq8JuEQOez7HQ5urtblMhA6zknpWyHUSJVzeLFo4+c1a4mGsxk/LaBgZ hJWRbwJFT/u3fy5Tfoz4oMqgD2DJkgCha0v7b0QWGci64xXyi3tByhz7UqAipQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uttddTumfRAUDqTHMiq628uZpE9Gt94yV1htKdqdYT0=; b=ldSpdcZyVmWMF+gzQbitKxm4/Ymj1cKZgHs8OCZFijFwUgjsxnuBPinbZBZbkDFocWX7XO Gqb2+06bXRXXmyjD2WWbrp+h0jtAac4jrtMcUxCnB2jCKXrZBYf5kwSqyhBqWpgeOzhfzP lcmX1/YS3nmlFxuS+Dike3NEa83N4qXENb6rGffgRd6TEamjfXVSWrCmUawrbdKrVRn0H+ yxqTu8ZeTCaUDGI+cl3lL9bMep570k7QeZk4I2JFny6/hbxXSaXNolInfWEIEznMh7sxJH sVZOLQuWXlvr7WuTVUdHmM4AczV8XoJXqVfFIjG2rWguyB43ykhQQwYpLJjSXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7P15hQznCf; Thu, 7 Mar 2024 19:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JRDCx064249; Thu, 7 Mar 2024 19:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JRBU2064246; Thu, 7 Mar 2024 19:27:11 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:11 GMT Message-Id: <202403071927.427JRBU2064246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 25f38d09907f - main - if_bnxt: Update Firmware Header to Latest Version 1.10.2.136 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25f38d09907fdfcc473fdc53c17b7c2d8c7c09a1 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=25f38d09907fdfcc473fdc53c17b7c2d8c7c09a1 commit 25f38d09907fdfcc473fdc53c17b7c2d8c7c09a1 Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:17:50 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:16:39 +0000 if_bnxt: Update Firmware Header to Latest Version 1.10.2.136 Update Firmware Header to Latest Version 1.10.2.136. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42955 --- sys/dev/bnxt/hsi_struct_def.h | 93714 +++++++++++++++++++++++----------------- 1 file changed, 53950 insertions(+), 39764 deletions(-) diff --git a/sys/dev/bnxt/hsi_struct_def.h b/sys/dev/bnxt/hsi_struct_def.h index 576e1e9a7ed8..d2097ca1ca33 100644 --- a/sys/dev/bnxt/hsi_struct_def.h +++ b/sys/dev/bnxt/hsi_struct_def.h @@ -28,8 +28,10 @@ */ #include +__FBSDID("$FreeBSD$"); + /* - * Copyright(c) 2001-2021, Broadcom. All rights reserved. The + * Copyright(c) 2001-2023, Broadcom. All rights reserved. The * term Broadcom refers to Broadcom Inc. and/or its subsidiaries. * Proprietary and Confidential Information. * @@ -40,8 +42,8 @@ * DO NOT MODIFY!!! This file is automatically generated. */ -#ifndef _HSI_STRUCT_DEF_EXTERNAL_H_ -#define _HSI_STRUCT_DEF_EXTERNAL_H_ +#ifndef _HSI_STRUCT_DEF_H_ +#define _HSI_STRUCT_DEF_H_ /* This is the HWRM command header. */ /* hwrm_cmd_hdr (size:128b/16B) */ @@ -433,6 +435,10 @@ typedef struct hwrm_short_input { ((x) == 0xd7 ? "HWRM_PORT_SFP_SIDEBAND_QCFG": \ ((x) == 0xd8 ? "HWRM_FW_STATE_UNQUIESCE": \ ((x) == 0xd9 ? "HWRM_PORT_DSC_DUMP": \ + ((x) == 0xda ? "HWRM_PORT_EP_TX_QCFG": \ + ((x) == 0xdb ? "HWRM_PORT_EP_TX_CFG": \ + ((x) == 0xdc ? "HWRM_PORT_CFG": \ + ((x) == 0xdd ? "HWRM_PORT_QCFG": \ ((x) == 0xe0 ? "HWRM_TEMP_MONITOR_QUERY": \ ((x) == 0xe1 ? "HWRM_REG_POWER_QUERY": \ ((x) == 0xe2 ? "HWRM_CORE_FREQUENCY_QUERY": \ @@ -450,7 +456,7 @@ typedef struct hwrm_short_input { ((x) == 0xfa ? "HWRM_CFA_METER_INSTANCE_CFG": \ ((x) == 0xfd ? "HWRM_CFA_VFR_ALLOC": \ ((x) == 0xfe ? "HWRM_CFA_VFR_FREE": \ - "Unknown decode" )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ + "Unknown decode" )))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ (((x) < 0x180) ? \ ((x) == 0x100 ? "HWRM_CFA_VF_PAIR_ALLOC": \ ((x) == 0x101 ? "HWRM_CFA_VF_PAIR_FREE": \ @@ -492,6 +498,8 @@ typedef struct hwrm_short_input { ((x) == 0x125 ? "HWRM_CFA_TFLIB": \ ((x) == 0x126 ? "HWRM_CFA_LAG_GROUP_MEMBER_RGTR": \ ((x) == 0x127 ? "HWRM_CFA_LAG_GROUP_MEMBER_UNRGTR": \ + ((x) == 0x128 ? "HWRM_CFA_TLS_FILTER_ALLOC": \ + ((x) == 0x129 ? "HWRM_CFA_TLS_FILTER_FREE": \ ((x) == 0x12e ? "HWRM_ENGINE_CKV_STATUS": \ ((x) == 0x12f ? "HWRM_ENGINE_CKV_CKEK_ADD": \ ((x) == 0x130 ? "HWRM_ENGINE_CKV_CKEK_DELETE": \ @@ -531,7 +539,7 @@ typedef struct hwrm_short_input { ((x) == 0x163 ? "HWRM_ENGINE_NQ_FREE": \ ((x) == 0x164 ? "HWRM_ENGINE_ON_DIE_RQE_CREDITS": \ ((x) == 0x165 ? "HWRM_ENGINE_FUNC_QCFG": \ - "Unknown decode" ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ + "Unknown decode" ))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) : \ (((x) < 0x200) ? \ ((x) == 0x190 ? "HWRM_FUNC_RESOURCE_QCAPS": \ ((x) == 0x191 ? "HWRM_FUNC_VF_RESOURCE_CFG": \ @@ -549,7 +557,20 @@ typedef struct hwrm_short_input { ((x) == 0x19d ? "HWRM_FUNC_PTP_PIN_CFG": \ ((x) == 0x19e ? "HWRM_FUNC_PTP_CFG": \ ((x) == 0x19f ? "HWRM_FUNC_PTP_TS_QUERY": \ - "Unknown decode" )))))))))))))))) : \ + ((x) == 0x1a0 ? "HWRM_FUNC_PTP_EXT_CFG": \ + ((x) == 0x1a1 ? "HWRM_FUNC_PTP_EXT_QCFG": \ + ((x) == 0x1a2 ? "HWRM_FUNC_KEY_CTX_ALLOC": \ + ((x) == 0x1a3 ? "HWRM_FUNC_BACKING_STORE_CFG_V2": \ + ((x) == 0x1a4 ? "HWRM_FUNC_BACKING_STORE_QCFG_V2": \ + ((x) == 0x1a5 ? "HWRM_FUNC_DBR_PACING_CFG": \ + ((x) == 0x1a6 ? "HWRM_FUNC_DBR_PACING_QCFG": \ + ((x) == 0x1a7 ? "HWRM_FUNC_DBR_PACING_BROADCAST_EVENT": \ + ((x) == 0x1a8 ? "HWRM_FUNC_BACKING_STORE_QCAPS_V2": \ + ((x) == 0x1a9 ? "HWRM_FUNC_DBR_PACING_NQLIST_QUERY": \ + ((x) == 0x1aa ? "HWRM_FUNC_DBR_RECOVERY_COMPLETED": \ + ((x) == 0x1ab ? "HWRM_FUNC_SYNCE_CFG": \ + ((x) == 0x1ac ? "HWRM_FUNC_SYNCE_QCFG": \ + "Unknown decode" ))))))))))))))))))))))))))))) : \ (((x) < 0x280) ? \ ((x) == 0x200 ? "HWRM_SELFTEST_QLIST": \ ((x) == 0x201 ? "HWRM_SELFTEST_EXEC": \ @@ -568,7 +589,15 @@ typedef struct hwrm_short_input { ((x) == 0x20e ? "HWRM_MFG_PARAM_SEEPROM_SYNC": \ ((x) == 0x20f ? "HWRM_MFG_PARAM_SEEPROM_READ": \ ((x) == 0x210 ? "HWRM_MFG_PARAM_SEEPROM_HEALTH": \ - "Unknown decode" ))))))))))))))))) : \ + ((x) == 0x211 ? "HWRM_MFG_PRVSN_EXPORT_CSR": \ + ((x) == 0x212 ? "HWRM_MFG_PRVSN_IMPORT_CERT": \ + ((x) == 0x213 ? "HWRM_MFG_PRVSN_GET_STATE": \ + ((x) == 0x214 ? "HWRM_MFG_GET_NVM_MEASUREMENT": \ + ((x) == 0x215 ? "HWRM_MFG_PSOC_QSTATUS": \ + ((x) == 0x216 ? "HWRM_MFG_SELFTEST_QLIST": \ + ((x) == 0x217 ? "HWRM_MFG_SELFTEST_EXEC": \ + ((x) == 0x218 ? "HWRM_STAT_GENERIC_QSTATS": \ + "Unknown decode" ))))))))))))))))))))))))) : \ (((x) < 0x300) ? \ ((x) == 0x2bc ? "HWRM_TF": \ ((x) == 0x2bd ? "HWRM_TF_VERSION_GET": \ @@ -583,6 +612,8 @@ typedef struct hwrm_short_input { ((x) == 0x2ce ? "HWRM_TF_SESSION_RESC_FREE": \ ((x) == 0x2cf ? "HWRM_TF_SESSION_RESC_FLUSH": \ ((x) == 0x2d0 ? "HWRM_TF_SESSION_RESC_INFO": \ + ((x) == 0x2d1 ? "HWRM_TF_SESSION_HOTUP_STATE_SET": \ + ((x) == 0x2d2 ? "HWRM_TF_SESSION_HOTUP_STATE_GET": \ ((x) == 0x2da ? "HWRM_TF_TBL_TYPE_GET": \ ((x) == 0x2db ? "HWRM_TF_TBL_TYPE_SET": \ ((x) == 0x2dc ? "HWRM_TF_TBL_TYPE_BULK_GET": \ @@ -606,7 +637,33 @@ typedef struct hwrm_short_input { ((x) == 0x2fd ? "HWRM_TF_GLOBAL_CFG_GET": \ ((x) == 0x2fe ? "HWRM_TF_IF_TBL_SET": \ ((x) == 0x2ff ? "HWRM_TF_IF_TBL_GET": \ - "Unknown decode" )))))))))))))))))))))))))))))))))))) : \ + "Unknown decode" )))))))))))))))))))))))))))))))))))))) : \ + (((x) < 0x400) ? \ + ((x) == 0x380 ? "HWRM_TFC_TBL_SCOPE_QCAPS": \ + ((x) == 0x381 ? "HWRM_TFC_TBL_SCOPE_ID_ALLOC": \ + ((x) == 0x382 ? "HWRM_TFC_TBL_SCOPE_CONFIG": \ + ((x) == 0x383 ? "HWRM_TFC_TBL_SCOPE_DECONFIG": \ + ((x) == 0x384 ? "HWRM_TFC_TBL_SCOPE_FID_ADD": \ + ((x) == 0x385 ? "HWRM_TFC_TBL_SCOPE_FID_REM": \ + ((x) == 0x386 ? "HWRM_TFC_TBL_SCOPE_POOL_ALLOC": \ + ((x) == 0x387 ? "HWRM_TFC_TBL_SCOPE_POOL_FREE": \ + ((x) == 0x388 ? "HWRM_TFC_SESSION_ID_ALLOC": \ + ((x) == 0x389 ? "HWRM_TFC_SESSION_FID_ADD": \ + ((x) == 0x38a ? "HWRM_TFC_SESSION_FID_REM": \ + ((x) == 0x38b ? "HWRM_TFC_IDENT_ALLOC": \ + ((x) == 0x38c ? "HWRM_TFC_IDENT_FREE": \ + ((x) == 0x38d ? "HWRM_TFC_IDX_TBL_ALLOC": \ + ((x) == 0x38e ? "HWRM_TFC_IDX_TBL_ALLOC_SET": \ + ((x) == 0x38f ? "HWRM_TFC_IDX_TBL_SET": \ + ((x) == 0x390 ? "HWRM_TFC_IDX_TBL_GET": \ + ((x) == 0x391 ? "HWRM_TFC_IDX_TBL_FREE": \ + ((x) == 0x392 ? "HWRM_TFC_GLOBAL_ID_ALLOC": \ + ((x) == 0x393 ? "HWRM_TFC_TCAM_SET": \ + ((x) == 0x394 ? "HWRM_TFC_TCAM_GET": \ + ((x) == 0x395 ? "HWRM_TFC_TCAM_ALLOC": \ + ((x) == 0x396 ? "HWRM_TFC_TCAM_ALLOC_SET": \ + ((x) == 0x397 ? "HWRM_TFC_TCAM_FREE": \ + "Unknown decode" )))))))))))))))))))))))) : \ (((x) < 0x480) ? \ ((x) == 0x400 ? "HWRM_SV": \ "Unknown decode" ) : \ @@ -641,6 +698,7 @@ typedef struct hwrm_short_input { ((x) == 0xff2b ? "HWRM_DBG_USEQ_RESP_HDR": \ "Unknown decode" )))))))))))))))))))))))))))) : \ (((x) <= 0xffff) ? \ + ((x) == 0xffec ? "HWRM_NVM_DEFRAG": \ ((x) == 0xffed ? "HWRM_NVM_REQ_ARBITRATION": \ ((x) == 0xffee ? "HWRM_NVM_FACTORY_DEFAULTS": \ ((x) == 0xffef ? "HWRM_NVM_VALIDATE_OPTION": \ @@ -660,8 +718,8 @@ typedef struct hwrm_short_input { ((x) == 0xfffd ? "HWRM_NVM_READ": \ ((x) == 0xfffe ? "HWRM_NVM_WRITE": \ ((x) == 0xffff ? "HWRM_NVM_RAW_WRITE_BLK": \ - "Unknown decode" ))))))))))))))))))) : \ - "Unknown decode" ))))))))) + "Unknown decode" )))))))))))))))))))) : \ + "Unknown decode" )))))))))) /* @@ -864,6 +922,10 @@ typedef struct cmd_nums { #define HWRM_FW_STATE_UNQUIESCE UINT32_C(0xd8) /* Tells the fw to collect dsc dump on a given port and lane. */ #define HWRM_PORT_DSC_DUMP UINT32_C(0xd9) + #define HWRM_PORT_EP_TX_QCFG UINT32_C(0xda) + #define HWRM_PORT_EP_TX_CFG UINT32_C(0xdb) + #define HWRM_PORT_CFG UINT32_C(0xdc) + #define HWRM_PORT_QCFG UINT32_C(0xdd) #define HWRM_TEMP_MONITOR_QUERY UINT32_C(0xe0) #define HWRM_REG_POWER_QUERY UINT32_C(0xe1) #define HWRM_CORE_FREQUENCY_QUERY UINT32_C(0xe2) @@ -902,9 +964,7 @@ typedef struct cmd_nums { #define HWRM_CFA_FLOW_FREE UINT32_C(0x104) /* Experimental */ #define HWRM_CFA_FLOW_FLUSH UINT32_C(0x105) - /* Experimental */ #define HWRM_CFA_FLOW_STATS UINT32_C(0x106) - /* Experimental */ #define HWRM_CFA_FLOW_INFO UINT32_C(0x107) /* Experimental */ #define HWRM_CFA_DECAP_FILTER_ALLOC UINT32_C(0x108) @@ -965,6 +1025,10 @@ typedef struct cmd_nums { #define HWRM_CFA_LAG_GROUP_MEMBER_RGTR UINT32_C(0x126) /* Experimental */ #define HWRM_CFA_LAG_GROUP_MEMBER_UNRGTR UINT32_C(0x127) + /* Experimental */ + #define HWRM_CFA_TLS_FILTER_ALLOC UINT32_C(0x128) + /* Experimental */ + #define HWRM_CFA_TLS_FILTER_FREE UINT32_C(0x129) /* Engine CKV - Get the current allocation status of keys provisioned in the key vault. */ #define HWRM_ENGINE_CKV_STATUS UINT32_C(0x12e) /* Engine CKV - Add a new CKEK used to encrypt keys. */ @@ -1075,6 +1139,38 @@ typedef struct cmd_nums { #define HWRM_FUNC_PTP_CFG UINT32_C(0x19e) /* PTP - Queries for PHC timestamps. */ #define HWRM_FUNC_PTP_TS_QUERY UINT32_C(0x19f) + /* PTP - Extended PTP configuration. */ + #define HWRM_FUNC_PTP_EXT_CFG UINT32_C(0x1a0) + /* PTP - Query extended PTP configuration. */ + #define HWRM_FUNC_PTP_EXT_QCFG UINT32_C(0x1a1) + /* The command is used to allocate KTLS or QUIC key contexts. */ + #define HWRM_FUNC_KEY_CTX_ALLOC UINT32_C(0x1a2) + /* The is the new API to configure backing stores. */ + #define HWRM_FUNC_BACKING_STORE_CFG_V2 UINT32_C(0x1a3) + /* The is the new API to query backing store configurations. */ + #define HWRM_FUNC_BACKING_STORE_QCFG_V2 UINT32_C(0x1a4) + /* To support doorbell pacing configuration. */ + #define HWRM_FUNC_DBR_PACING_CFG UINT32_C(0x1a5) + /* To query doorbell pacing configuration. */ + #define HWRM_FUNC_DBR_PACING_QCFG UINT32_C(0x1a6) + /* + * To broadcast the doorbell event to the drivers to + * initiate pacing of doorbells. + */ + #define HWRM_FUNC_DBR_PACING_BROADCAST_EVENT UINT32_C(0x1a7) + /* The is the new API to query backing store capabilities. */ + #define HWRM_FUNC_BACKING_STORE_QCAPS_V2 UINT32_C(0x1a8) + /* To query doorbell pacing NQ id list configuration. */ + #define HWRM_FUNC_DBR_PACING_NQLIST_QUERY UINT32_C(0x1a9) + /* + * To notify the firmware that recovery cycle has been + * completed by host function drivers. + */ + #define HWRM_FUNC_DBR_RECOVERY_COMPLETED UINT32_C(0x1aa) + /* Configures SyncE configurations. */ + #define HWRM_FUNC_SYNCE_CFG UINT32_C(0x1ab) + /* Queries SyncE configurations. */ + #define HWRM_FUNC_SYNCE_QCFG UINT32_C(0x1ac) /* Experimental */ #define HWRM_SELFTEST_QLIST UINT32_C(0x200) /* Experimental */ @@ -1112,6 +1208,40 @@ typedef struct cmd_nums { #define HWRM_MFG_PARAM_SEEPROM_READ UINT32_C(0x20f) /* Tells the fw to get the health of seeprom data */ #define HWRM_MFG_PARAM_SEEPROM_HEALTH UINT32_C(0x210) + /* + * The command is used for certificate provisioning to export a + * Certificate Signing Request (CSR) from the device. + */ + #define HWRM_MFG_PRVSN_EXPORT_CSR UINT32_C(0x211) + /* + * The command is used for certificate provisioning to import a + * CA-signed certificate chain to the device. + */ + #define HWRM_MFG_PRVSN_IMPORT_CERT UINT32_C(0x212) + /* + * The command is used for certificate provisioning to query the + * provisioned state. + */ + #define HWRM_MFG_PRVSN_GET_STATE UINT32_C(0x213) + /* + * The command is used to get the hash of the NVM configuration that is + * calculated during firmware boot. + */ + #define HWRM_MFG_GET_NVM_MEASUREMENT UINT32_C(0x214) + /* Retrieves the PSOC status and provisioning information. */ + #define HWRM_MFG_PSOC_QSTATUS UINT32_C(0x215) + /* + * This command allows manufacturing tool to determine which selftests + * are available to be run. + */ + #define HWRM_MFG_SELFTEST_QLIST UINT32_C(0x216) + /* + * This command allows manufacturing tool to request which selftests + * to run. + */ + #define HWRM_MFG_SELFTEST_EXEC UINT32_C(0x217) + /* Queries the generic stats */ + #define HWRM_STAT_GENERIC_QSTATS UINT32_C(0x218) /* Experimental */ #define HWRM_TF UINT32_C(0x2bc) /* Experimental */ @@ -1139,6 +1269,10 @@ typedef struct cmd_nums { /* Experimental */ #define HWRM_TF_SESSION_RESC_INFO UINT32_C(0x2d0) /* Experimental */ + #define HWRM_TF_SESSION_HOTUP_STATE_SET UINT32_C(0x2d1) + /* Experimental */ + #define HWRM_TF_SESSION_HOTUP_STATE_GET UINT32_C(0x2d2) + /* Experimental */ #define HWRM_TF_TBL_TYPE_GET UINT32_C(0x2da) /* Experimental */ #define HWRM_TF_TBL_TYPE_SET UINT32_C(0x2db) @@ -1184,6 +1318,54 @@ typedef struct cmd_nums { #define HWRM_TF_IF_TBL_SET UINT32_C(0x2fe) /* Experimental */ #define HWRM_TF_IF_TBL_GET UINT32_C(0x2ff) + /* TruFlow command to check firmware table scope capabilities. */ + #define HWRM_TFC_TBL_SCOPE_QCAPS UINT32_C(0x380) + /* TruFlow command to allocate a table scope ID and create the pools. */ + #define HWRM_TFC_TBL_SCOPE_ID_ALLOC UINT32_C(0x381) + /* TruFlow command to configure the table scope memory. */ + #define HWRM_TFC_TBL_SCOPE_CONFIG UINT32_C(0x382) + /* TruFlow command to deconfigure a table scope memory. */ + #define HWRM_TFC_TBL_SCOPE_DECONFIG UINT32_C(0x383) + /* TruFlow command to add a FID to a table scope. */ + #define HWRM_TFC_TBL_SCOPE_FID_ADD UINT32_C(0x384) + /* TruFlow command to remove a FID from a table scope. */ + #define HWRM_TFC_TBL_SCOPE_FID_REM UINT32_C(0x385) + /* TruFlow command to allocate a table scope pool. */ + #define HWRM_TFC_TBL_SCOPE_POOL_ALLOC UINT32_C(0x386) + /* TruFlow command to free a table scope pool. */ + #define HWRM_TFC_TBL_SCOPE_POOL_FREE UINT32_C(0x387) + /* Experimental */ + #define HWRM_TFC_SESSION_ID_ALLOC UINT32_C(0x388) + /* Experimental */ + #define HWRM_TFC_SESSION_FID_ADD UINT32_C(0x389) + /* Experimental */ + #define HWRM_TFC_SESSION_FID_REM UINT32_C(0x38a) + /* Experimental */ + #define HWRM_TFC_IDENT_ALLOC UINT32_C(0x38b) + /* Experimental */ + #define HWRM_TFC_IDENT_FREE UINT32_C(0x38c) + /* TruFlow command to allocate an index table entry */ + #define HWRM_TFC_IDX_TBL_ALLOC UINT32_C(0x38d) + /* TruFlow command to allocate and set an index table entry */ + #define HWRM_TFC_IDX_TBL_ALLOC_SET UINT32_C(0x38e) + /* TruFlow command to set an index table entry */ + #define HWRM_TFC_IDX_TBL_SET UINT32_C(0x38f) + /* TruFlow command to get an index table entry */ + #define HWRM_TFC_IDX_TBL_GET UINT32_C(0x390) + /* TruFlow command to free an index table entry */ + #define HWRM_TFC_IDX_TBL_FREE UINT32_C(0x391) + /* TruFlow command to allocate resources for a global id. */ + #define HWRM_TFC_GLOBAL_ID_ALLOC UINT32_C(0x392) + /* TruFlow command to set TCAM entry. */ + #define HWRM_TFC_TCAM_SET UINT32_C(0x393) + /* TruFlow command to get TCAM entry. */ + #define HWRM_TFC_TCAM_GET UINT32_C(0x394) + /* TruFlow command to allocate a TCAM entry. */ + #define HWRM_TFC_TCAM_ALLOC UINT32_C(0x395) + /* TruFlow command allocate and set TCAM entry. */ + #define HWRM_TFC_TCAM_ALLOC_SET UINT32_C(0x396) + /* TruFlow command to free a TCAM entry. */ + #define HWRM_TFC_TCAM_FREE UINT32_C(0x397) /* Experimental */ #define HWRM_SV UINT32_C(0x400) /* Experimental */ @@ -1241,6 +1423,7 @@ typedef struct cmd_nums { #define HWRM_DBG_USEQ_DELIVERY_REQ UINT32_C(0xff2a) /* Experimental */ #define HWRM_DBG_USEQ_RESP_HDR UINT32_C(0xff2b) + #define HWRM_NVM_DEFRAG UINT32_C(0xffec) #define HWRM_NVM_REQ_ARBITRATION UINT32_C(0xffed) /* Experimental */ #define HWRM_NVM_FACTORY_DEFAULTS UINT32_C(0xffee) @@ -1360,6 +1543,13 @@ typedef struct ret_codes { * by the host is not allowed due to a secure lock violation. */ #define HWRM_ERR_CODE_RESOURCE_LOCKED UINT32_C(0x11) + /* + * This error code is reported by Firmware when an operation requested + * by a VF cannot be forwarded to the parent PF as required, either + * because the PF is down or otherwise doesn't have an appropriate + * async completion ring or associated forwarding buffers configured. + */ + #define HWRM_ERR_CODE_PF_UNAVAILABLE UINT32_C(0x12) /* * This value indicates that the HWRM response is in TLV format and * should be interpreted as one or more TLVs starting with the @@ -1396,7 +1586,8 @@ typedef struct ret_codes { ((x) == 0xf ? "HWRM_ERROR": \ ((x) == 0x10 ? "BUSY": \ ((x) == 0x11 ? "RESOURCE_LOCKED": \ - "Unknown decode" )))))))))))))))))) : \ + ((x) == 0x12 ? "PF_UNAVAILABLE": \ + "Unknown decode" ))))))))))))))))))) : \ (((x) < 0x8080) ? \ ((x) == 0x8000 ? "TLV_ENCAPSULATED_RESPONSE": \ "Unknown decode" ) : \ @@ -1479,8 +1670,8 @@ typedef struct hwrm_err_output { #define HWRM_VERSION_MINOR 10 #define HWRM_VERSION_UPDATE 2 /* non-zero means beta version */ -#define HWRM_VERSION_RSVD 34 -#define HWRM_VERSION_STR "1.10.2.34" +#define HWRM_VERSION_RSVD 136 +#define HWRM_VERSION_STR "1.10.2.136" /**************** * hwrm_ver_get * @@ -1728,6 +1919,7 @@ typedef struct hwrm_ver_get_output { * If set to 1, firmware is capable to support flow aging. * If set to 0, firmware is not capable to support flow aging. * By default, this flag should be 0 for older version of core firmware. + * (deprecated) */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_FLOW_AGING_SUPPORTED UINT32_C(0x200) /* @@ -1735,6 +1927,7 @@ typedef struct hwrm_ver_get_output { * Meter drop counters and EEM counters. * If set to 0, firmware is not capable to support advanced flow counters. * By default, this flag should be 0 for older version of core firmware. + * (deprecated) */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_ADV_FLOW_COUNTERS_SUPPORTED UINT32_C(0x400) /* @@ -1743,6 +1936,7 @@ typedef struct hwrm_ver_get_output { * If set to 0, firmware is not capable to support the use of the * CFA EEM feature. * By default, this flag should be 0 for older version of core firmware. + * (deprecated) */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_CFA_EEM_SUPPORTED UINT32_C(0x800) /* @@ -1767,6 +1961,11 @@ typedef struct hwrm_ver_get_output { * core firmware. */ #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_CFA_TRUFLOW_SUPPORTED UINT32_C(0x4000) + /* + * If set to 1, then firmware supports secure boot. + * If set to 0, then firmware doesn't support secure boot. + */ + #define HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_SECURE_BOOT_CAPABLE UINT32_C(0x8000) /* * This field represents the major version of RoCE firmware. * A change in major version represents a major release. @@ -1858,7 +2057,7 @@ typedef struct hwrm_ver_get_output { * backing store not been available. * For Example, PCIe hot-plug: * Hot plug timing is system dependent. It generally takes up to - * 600 miliseconds for firmware to clear DEV_NOT_RDY flag. + * 600 milliseconds for firmware to clear DEV_NOT_RDY flag. * If set to 0, device is ready to accept all HWRM commands. */ #define HWRM_VER_GET_OUTPUT_FLAGS_DEV_NOT_RDY UINT32_C(0x1) @@ -2019,7 +2218,18 @@ typedef struct hwrm_ver_get_output { * used with the short cmd request format. */ uint16_t max_ext_req_len; - uint8_t unused_1[5]; + /* + * This field returns the maximum request timeout value in seconds. + * For backward compatibility, a value of zero should be interpreted + * as the default value of 40 seconds. Drivers should always honor the + * maximum timeout, but are permitted to warn if a longer duration than + * this default is advertised. Values larger than 40 seconds should + * only be used as a stopgap measure to address a device limitation or + * for the purposes of test and debugging. The long term goal is for + * firmware to significantly reduce this value in the passage of time. + */ + uint16_t max_req_timeout; + uint8_t unused_1[3]; /* * This field is used in Output records to indicate that the output * is completely written to RAM. This field should be read as '1' @@ -2341,7 +2551,7 @@ typedef struct cfa_bds_event_collect_cmd_data_msg { uint64_t host_address; } cfa_bds_event_collect_cmd_data_msg_t, *pcfa_bds_event_collect_cmd_data_msg_t; -/* ce_bds_add_data_msg (size:512b/64B) */ +/* ce_bds_add_data_msg (size:576b/72B) */ typedef struct ce_bds_add_data_msg { uint32_t version_algorithm_kid_opcode; @@ -2377,9 +2587,8 @@ typedef struct ce_bds_add_data_msg { /* * Version number of TLS connection. HW will provide registers that * converts the 4b encoded version number to 16b of actual version - * number in the TLS Header. * Initialized --> By mid-path command * - * Updated --> Never though another mid-path command will result in an - * update. + * number in the TLS Header. This field is initialized/updated by + * this "KTLS crypto add" mid-path command. */ #define CE_BDS_ADD_DATA_MSG_VERSION_MASK UINT32_C(0xf0000000) #define CE_BDS_ADD_DATA_MSG_VERSION_SFT 28 @@ -2388,18 +2597,15 @@ typedef struct ce_bds_add_data_msg { /* TLS1.3 Version */ #define CE_BDS_ADD_DATA_MSG__TLS1_3 (UINT32_C(0x1) << 28) #define CE_BDS_ADD_DATA_MSG__LAST CE_BDS_ADD_DATA_MSG__TLS1_3 - /* - * Command Type in the TLS header. HW will provide registers that - * converts the 3b encoded command type to 8b of actual command type in - * the TLS Header. * Initialized --> By mid-path command * Updated --> - * Never though another mid-path command will result in an update - */ - uint8_t cmd_type; - #define CE_BDS_ADD_DATA_MSG_CMD_TYPE_MASK UINT32_C(0x7) - #define CE_BDS_ADD_DATA_MSG_CMD_TYPE_SFT 0 - /* Application */ - #define CE_BDS_ADD_DATA_MSG_CMD_TYPE_APP UINT32_C(0x0) - #define CE_BDS_ADD_DATA_MSG_CMD_TYPE_LAST CE_BDS_ADD_DATA_MSG_CMD_TYPE_APP + uint8_t ctx_kind; + /* This field selects the context kind for the request. */ + #define CE_BDS_ADD_DATA_MSG_CTX_KIND_MASK UINT32_C(0x1f) + #define CE_BDS_ADD_DATA_MSG_CTX_KIND_SFT 0 + /* Crypto key transmit context */ + #define CE_BDS_ADD_DATA_MSG_CTX_KIND_CK_TX UINT32_C(0x11) + /* Crypto key receive context */ + #define CE_BDS_ADD_DATA_MSG_CTX_KIND_CK_RX UINT32_C(0x12) + #define CE_BDS_ADD_DATA_MSG_CTX_KIND_LAST CE_BDS_ADD_DATA_MSG_CTX_KIND_CK_RX uint8_t unused0[3]; /* * Salt is part of the nonce that is used as the Initial Vector (IV) in @@ -2411,8 +2617,8 @@ typedef struct ce_bds_add_data_msg { * is zero padded to 12B and then xor'ed with the 4B of salt to generate * the 12B of IV. This value is initialized by this mid-path command. */ - uint32_t salt; - uint32_t unused1; + uint8_t salt[4]; + uint8_t unused1[4]; /* * This field keeps track of the TCP sequence number that is expected as * the first byte in the next TCP packet. This field is calculated by HW @@ -2445,19 +2651,24 @@ typedef struct ce_bds_add_data_msg { * exchanged during the hand-shake protocol by the client-server and * provided to HW through this mid-path BD. */ - uint32_t session_key[8]; + uint8_t session_key[32]; + /* + * Additional IV that is exchanged as part of sessions setup between + * the two end points. This field is used for TLS1.3 only. + */ + uint8_t addl_iv[8]; } ce_bds_add_data_msg_t, *pce_bds_add_data_msg_t; -/* ce_bds_delete_data_msg (size:64b/8B) */ +/* ce_bds_delete_data_msg (size:32b/4B) */ typedef struct ce_bds_delete_data_msg { - uint32_t kid_opcode; + uint32_t kid_opcode_ctx_kind; /* * This value selects the operation for the mid-path command for the * crypto blocks. */ - #define CE_BDS_DELETE_DATA_MSG_OPCODE_MASK UINT32_C(0xf) - #define CE_BDS_DELETE_DATA_MSG_OPCODE_SFT 0 + #define CE_BDS_DELETE_DATA_MSG_OPCODE_MASK UINT32_C(0xf) + #define CE_BDS_DELETE_DATA_MSG_OPCODE_SFT 0 /* * This is the delete command. Using this opcode, the host Driver * can remove a key context from the CFCK. If context is deleted @@ -2467,15 +2678,26 @@ typedef struct ce_bds_delete_data_msg { * receive packets, no crypto operation will be performed, * payload will be unmodified. */ - #define CE_BDS_DELETE_DATA_MSG_OPCODE_DELETE UINT32_C(0x2) - #define CE_BDS_DELETE_DATA_MSG_OPCODE_LAST CE_BDS_DELETE_DATA_MSG_OPCODE_DELETE + #define CE_BDS_DELETE_DATA_MSG_OPCODE_DELETE UINT32_C(0x2) + #define CE_BDS_DELETE_DATA_MSG_OPCODE_LAST CE_BDS_DELETE_DATA_MSG_OPCODE_DELETE /* * This field is the Crypto Context ID. The KID is used to store * information used by the associated kTLS offloaded connection. */ #define CE_BDS_DELETE_DATA_MSG_KID_MASK UINT32_C(0xfffff0) #define CE_BDS_DELETE_DATA_MSG_KID_SFT 4 - uint32_t unused0; + /* This field selects the context kind for the request. */ + #define CE_BDS_DELETE_DATA_MSG_CTX_KIND_MASK UINT32_C(0x1f000000) + #define CE_BDS_DELETE_DATA_MSG_CTX_KIND_SFT 24 + /* Crypto Key Transmit Context. */ + #define CE_BDS_DELETE_DATA_MSG_CTX_KIND_CK_TX (UINT32_C(0x11) << 24) + /* Crypto Key Receive Context. */ + #define CE_BDS_DELETE_DATA_MSG_CTX_KIND_CK_RX (UINT32_C(0x12) << 24) + /* QUIC Key Transmit Context. */ + #define CE_BDS_DELETE_DATA_MSG_CTX_KIND_QUIC_TX (UINT32_C(0x14) << 24) + /* QUIC Key Receive Context. */ + #define CE_BDS_DELETE_DATA_MSG_CTX_KIND_QUIC_RX (UINT32_C(0x15) << 24) + #define CE_BDS_DELETE_DATA_MSG_CTX_KIND_LAST CE_BDS_DELETE_DATA_MSG_CTX_KIND_QUIC_RX } ce_bds_delete_data_msg_t, *pce_bds_delete_data_msg_t; /* ce_bds_resync_resp_ack_msg (size:128b/16B) */ @@ -2596,6 +2818,18 @@ typedef struct crypto_presync_bd_cmd { * associated with the presync BD. */ #define CRYPTO_PRESYNC_BD_CMD_FLAGS_UPDATE_IN_ORDER_VAR UINT32_C(0x1) + /* + * When packet with an authentication TAG is lost in the network, + * During retransmission Device driver will post the entire record for + * the hardware to recalculate the TAG. Hardware is set to retransmit + * only portions of the record, it does so by looking at the Header + * TCP Sequence Number and Start TCP Sequence Number. However, there + * is a case where the header packet gets dropped in the stack for ex + * BPF packet filter and it is impossible for the Hardware to + * determine if this is a case of full replay for only the TAG + * generation. + */ + #define CRYPTO_PRESYNC_BD_CMD_FLAGS_FULL_REPLAY_RETRAN UINT32_C(0x2) uint8_t unused0; uint16_t unused1; /* @@ -2631,7 +2865,7 @@ typedef struct crypto_presync_bd_cmd { uint32_t end_tcp_seq_num; /* * For TLS1.2, an explicit nonce is used as part of the IV (concatenated - * with the SALT). For retans packets, this field is extracted from the + * with the SALT). For retrans packets, this field is extracted from the * TLS record, field right after the TLS Header and stored in the * context. This field needs to be stored in context as TCP segmentation * could have split the field into multiple TCP packets. This value is @@ -2639,7 +2873,7 @@ typedef struct crypto_presync_bd_cmd { * the first TLS header. When subsequent TLS Headers are detected, the * value is extracted from packet. */ - uint64_t explicit_nonce; + uint8_t explicit_nonce[8]; /* * This is sequence number for the TLS record in a particular session. In * TLS1.2, record sequence number is part of the Associated Data (AD) in @@ -2654,6 +2888,93 @@ typedef struct crypto_presync_bd_cmd { uint64_t record_seq_num; } crypto_presync_bd_cmd_t, *pcrypto_presync_bd_cmd_t; +/* ce_bds_quic_add_data_msg (size:832b/104B) */ + +typedef struct ce_bds_quic_add_data_msg { + uint32_t ver_algo_kid_opcode; + /* + * This value selects the operation for the mid-path command for the + * crypto blocks. + */ + #define CE_BDS_QUIC_ADD_DATA_MSG_OPCODE_MASK UINT32_C(0xf) + #define CE_BDS_QUIC_ADD_DATA_MSG_OPCODE_SFT 0 + /* + * This is the add command. Using this opcode, Host Driver can add + * information required for QUIC processing. The information is + * updated in the CFCK context. + */ + #define CE_BDS_QUIC_ADD_DATA_MSG_OPCODE_ADD UINT32_C(0x1) + #define CE_BDS_QUIC_ADD_DATA_MSG_OPCODE_LAST CE_BDS_QUIC_ADD_DATA_MSG_OPCODE_ADD + /* + * This field is the Crypto Context ID. The KID is used to store + * information used by the associated QUIC offloaded connection. + */ + #define CE_BDS_QUIC_ADD_DATA_MSG_KID_MASK UINT32_C(0xfffff0) + #define CE_BDS_QUIC_ADD_DATA_MSG_KID_SFT 4 + /* Algorithm used for encryption and decryption. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_ALGORITHM_MASK UINT32_C(0xf000000) + #define CE_BDS_QUIC_ADD_DATA_MSG_ALGORITHM_SFT 24 + /* AES_GCM_128 Algorithm. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_ALGORITHM_AES_GCM_128 (UINT32_C(0x1) << 24) + /* AES_GCM_256 Algorithm. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_ALGORITHM_AES_GCM_256 (UINT32_C(0x2) << 24) + /* Chacha20 Algorithm. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_ALGORITHM_CHACHA20 (UINT32_C(0x3) << 24) + #define CE_BDS_QUIC_ADD_DATA_MSG_ALGORITHM_LAST CE_BDS_QUIC_ADD_DATA_MSG_ALGORITHM_CHACHA20 + /* Version number of QUIC connection. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_VERSION_MASK UINT32_C(0xf0000000) + #define CE_BDS_QUIC_ADD_DATA_MSG_VERSION_SFT 28 + /* TLS1.2 Version */ + #define CE_BDS_QUIC_ADD_DATA_MSG__TLS1_2 (UINT32_C(0x0) << 28) + /* TLS1.3 Version */ + #define CE_BDS_QUIC_ADD_DATA_MSG__TLS1_3 (UINT32_C(0x1) << 28) + /* DTLS1.2 Version */ + #define CE_BDS_QUIC_ADD_DATA_MSG__DTLS1_2 (UINT32_C(0x2) << 28) + /* DTLS1.2 for RoCE Version */ + #define CE_BDS_QUIC_ADD_DATA_MSG__DTLS1_2_ROCE (UINT32_C(0x3) << 28) + /* QUIC Version */ + #define CE_BDS_QUIC_ADD_DATA_MSG__QUIC (UINT32_C(0x4) << 28) + #define CE_BDS_QUIC_ADD_DATA_MSG__LAST CE_BDS_QUIC_ADD_DATA_MSG__QUIC + uint32_t ctx_kind_dcid_width_key_phase; + /* Key phase. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_KEY_PHASE UINT32_C(0x1) + /* Destination connection ID width. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_DCID_WIDTH_MASK UINT32_C(0x3e) + #define CE_BDS_QUIC_ADD_DATA_MSG_DCID_WIDTH_SFT 1 + /* This field selects the context kind for the request. */ + #define CE_BDS_QUIC_ADD_DATA_MSG_CTX_KIND_MASK UINT32_C(0x7c0) + #define CE_BDS_QUIC_ADD_DATA_MSG_CTX_KIND_SFT 6 + /* QUIC key transmit context */ + #define CE_BDS_QUIC_ADD_DATA_MSG_CTX_KIND_QUIC_TX (UINT32_C(0x14) << 6) + /* QUIC key receive context */ + #define CE_BDS_QUIC_ADD_DATA_MSG_CTX_KIND_QUIC_RX (UINT32_C(0x15) << 6) + #define CE_BDS_QUIC_ADD_DATA_MSG_CTX_KIND_LAST CE_BDS_QUIC_ADD_DATA_MSG_CTX_KIND_QUIC_RX + uint64_t unused_0; + /* + * Least-significant 64 bits (of 96) of additional IV that is + * exchanged as part of sessions setup between the two end + * points for QUIC operations. + */ + uint64_t quic_iv_lo; + /* + * Most-significant 32 bits (of 96) of additional IV that is + * exchanged as part of sessions setup between the two end + * points for QUIC operations. + */ + uint32_t quic_iv_hi; + uint32_t unused_1; + /* + * Key used for encrypting or decrypting records. The Key is exchanged + * as part of sessions setup between the two end points through this + * mid-path BD. + */ + uint32_t session_key[8]; + /* Header protection key. */ + uint32_t hp_key[8]; + /* Packet number associated with the QUIC connection. */ + uint64_t pkt_number; +} ce_bds_quic_add_data_msg_t, *pce_bds_quic_add_data_msg_t; + /* bd_base (size:64b/8B) */ typedef struct bd_base { @@ -2696,6 +3017,12 @@ typedef struct bd_base { * sync command through the fast path and destined for TCE. */ #define BD_BASE_TYPE_TX_BD_PRESYNC_CMD UINT32_C(0x9) + /* + * Indicates a timed transmit BD. This is a 16b BD that is inserted + * into a packet BD chain immediately after the first BD. It is used + * to control the flow in a timed transmit operation. + */ + #define BD_BASE_TYPE_TX_BD_TIMEDTX UINT32_C(0xa) /* * Indicates that this BD is 32B long and is used for * normal L2 packet transmission. @@ -2979,10 +3306,22 @@ typedef struct tx_bd_long_hi { */ #define TX_BD_LONG_LFLAGS_NOCRC UINT32_C(0x4) /* - * If set to 1, the device will record the time at which the packet - * was actually transmitted at the TX MAC for 2-step time sync. + * This bit, in conjunction with the stamp_1step bit, controls whether + * a TX packet timestamp is collected and the type of timestamp that + * is collected. * * This bit must be valid on the first BD of a packet. + * + * Enumerations of the concatenation { stamp, stamp_1step } are + * as follows: + * + * - 2'b00: ts_none - no timestamp + * - 2'b01: ts_ptp_1step - 1-step PTP + * - 2'b10: ts_2cmpl - 2-step PTP timestamp or PA timestamp + * - 2'b11: ts_rsvd - reserved, same behavior as ts_none + * For the ts_2cmpl enumeration, an additional completion is returned. + * This additional completion may carry a 2-step PTP timestamp or a PA + * timestamp, depending on parsing of the transmitted packet. */ #define TX_BD_LONG_LFLAGS_STAMP UINT32_C(0x8) /* @@ -2991,15 +3330,15 @@ typedef struct tx_bd_long_hi { * of the packet associated with this descriptor. * * For outer UDP checksum, global outer UDP checksum TE_NIC register - * needs to be enabled. If the global outer UDP checksum TE_NIC register - * bit is set, outer UDP checksum will be calculated for the following - * cases: - * 1. Packets with tcp_udp_chksum flag set to offload checksum for inner - * packet AND the inner packet is TCP/UDP. If the inner packet is ICMP for - * example (non-TCP/UDP), even if the tcp_udp_chksum is set, the outer UDP - * checksum will not be calculated. - * 2. Packets with lso flag set which implies inner TCP checksum calculation - * as part of LSO operation. + * needs to be enabled. If the global outer UDP checksum TE_NIC + * register bit is set, outer UDP checksum will be calculated for + * the following cases: + * 1. Packets with tcp_udp_chksum flag set to offload checksum for + * inner packet AND the inner packet is TCP/UDP. If the inner packet + * is ICMP for example (non-TCP/UDP), even if the tcp_udp_chksum is + * set, the outer UDP checksum will not be calculated. + * 2. Packets with lso flag set which implies inner TCP checksum + * calculation as part of LSO operation. */ #define TX_BD_LONG_LFLAGS_T_IP_CHKSUM UINT32_C(0x10) /* @@ -3050,6 +3389,11 @@ typedef struct tx_bd_long_hi { * If set to '1', then the timestamp from the BD is used. If cleared * to 0, then TWE provides the timestamp. */ + /* + * The BD timestamp feature cannot be enabled concurrently with + * cryptography (KTLS), thus lflags.bd_ts_en and lflags.crypto_en + * shall never both be set in a BD. + */ #define TX_BD_LONG_LFLAGS_BD_TS_EN UINT32_C(0x400) /* * If set to '1', this operation will cause a trace capture in each @@ -3057,26 +3401,32 @@ typedef struct tx_bd_long_hi { */ #define TX_BD_LONG_LFLAGS_DEBUG_TRACE UINT32_C(0x800) /* - * If set to '1', the device will record the time at which the packet - * was actually transmitted at the TX MAC for 1-step time sync. This - * bit must be valid on the first BD of a packet. + * This bit, in conjunction with the stamp bit, controls whether a + * TX packet timestamp is collected and the type of timestamp that + * is collected. + * + * See the stamp field for a description of the valid combinations of + * stamp and stamp_1step. + * + * This bit must be valid on the first BD of a packet. */ #define TX_BD_LONG_LFLAGS_STAMP_1STEP UINT32_C(0x1000) /* * If set to '1', the controller replaces the Outer-tunnel IP checksum * field with hardware calculated IP checksum for the IP header of the * packet associated with this descriptor. For outer UDP checksum, it - * will be the following behavior for all cases independent of settings - * of inner LSO and checksum offload BD flags. If outer UDP checksum - * is 0, then do not update it. If outer UDP checksum is non zero, then - * the hardware should compute and update it. + * will be the following behavior for all cases independent of + * settings of inner LSO and checksum offload BD flags. + * If outer UDP checksum is 0, then do not update it. + * If outer UDP checksum is non zero, then the hardware should + * compute and update it. */ #define TX_BD_LONG_LFLAGS_OT_IP_CHKSUM UINT32_C(0x2000) /* - * If set to zero when LSO is '1', then the IPID of the Outer-tunnel IP - * header will not be modified during LSO operations. If set to one - * when LSO is '1', then the IPID of the Outer-tunnel IP header will be - * incremented for each subsequent segment of an LSO operation. The + * If set to zero when LSO is '1', then the IPID of the Outer-tunnel + * IP header will not be modified during LSO operations. If set to one + * when LSO is '1', then the IPID of the Outer-tunnel IP header will + * be incremented for each subsequent segment of an LSO operation. The * flag is ignored if the LSO packet is a normal (non-tunneled) TCP * packet. */ @@ -3085,6 +3435,11 @@ typedef struct tx_bd_long_hi { * If set to '1', When set to 1, KTLS encryption will be enabled for * the packet. */ + /* + * The BD timestamp feature cannot be enabled concurrently with + * cryptography (KTLS), thus lflags.bd_ts_en and lflags.crypto_en + * shall never both be set in a BD. + */ #define TX_BD_LONG_LFLAGS_CRYPTO_EN UINT32_C(0x8000) uint16_t kid_or_ts_low_hdr_size; /* @@ -3100,8 +3455,13 @@ typedef struct tx_bd_long_hi { #define TX_BD_LONG_HDR_SIZE_SFT 0 /* * If lflags.bd_ts_en is 1, this is the lower 7 bits of the 24-bit - * timestamp. If lflags.crypto_en is 1, this is the lower 7 bits of the - * 20-bit KID. + * timestamp. If lflags.crypto_en is 1, this is the lower 7 bits of + * the 20-bit KID. + */ + /* + * The KID value of all-ones is reserved for non-KTLS packets, which + * only implies that this value must not be used when filling this + * field for crypto packets. */ #define TX_BD_LONG_KID_OR_TS_LOW_MASK UINT32_C(0xfe00) #define TX_BD_LONG_KID_OR_TS_LOW_SFT 9 @@ -3120,6 +3480,11 @@ typedef struct tx_bd_long_hi { * timestamp. If lflags.crypto_en is 1, the least significant 13 bits * of this field contain the upper 13 bits of the 20-bit KID. */ + /* + * The KID value of all-ones is reserved for non-KTLS packets, which + * only implies that this value must not be used when filling this + * field for crypto packets. + */ #define TX_BD_LONG_KID_OR_TS_HIGH_MASK UINT32_C(0xffff8000) #define TX_BD_LONG_KID_OR_TS_HIGH_SFT 15 /* @@ -3197,11 +3562,11 @@ typedef struct tx_bd_long_hi { } tx_bd_long_hi_t, *ptx_bd_long_hi_t; /* - * This structure is used to inform the NIC of packet data that needs to be - * transmitted with additional processing that requires extra data such as - * VLAN insertion plus attached inline data. This BD type may be used to - * improve latency for small packets needing the additional extended features - * supported by long BDs. + * This structure is used to inform the NIC of packet data that needs to + * be transmitted with additional processing that requires extra data + * such as VLAN insertion plus attached inline data. + * This BD type may be used to improve latency for small packets needing + * the additional extended features supported by long BDs. */ /* tx_bd_long_inline (size:256b/32B) */ @@ -3266,16 +3631,21 @@ typedef struct tx_bd_long_inline { * * This field must be valid on all BDs of a packet. */ + /* + * A fatal error will be generated if the value of this field + * does not correspond with the value of flags.bd_cnt. For example, if + * this field carries a value of 20, then bd_cnt must equal 4. + */ uint16_t len; /* * The opaque data field is passed through to the completion and can be - * used for any data that the driver wants to associate with the transmit - * BD. This field must be valid on the first BD of a packet. If - * completion coalescing is enabled on the TX ring, it is suggested that - * the driver populate the opaque field to indicate the specific TX ring - * with which the completion is associated, then utilize the opaque and - * sq_cons_idx fields in the coalesced completion record to determine - * the specific packets that are to be completed on that ring. + * used for any data that the driver wants to associate with the + * transmit BD. This field must be valid on the first BD of a packet. + * If completion coalescing is enabled on the TX ring, it is suggested + * that the driver populate the opaque field to indicate the specific + * TX ring with which the completion is associated, then utilize the + * opaque and sq_cons_idx fields in the coalesced completion record to + * determine the specific packets that are to be completed on that ring. * * This field must be valid on the first BD of a packet. */ @@ -3347,6 +3717,11 @@ typedef struct tx_bd_long_inline { * If set to '1', then the timestamp from the BD is used. If cleared * to 0, then TWE provides the timestamp. */ + /* + * The BD timestamp feature cannot be enabled concurrently with + * cryptography (KTLS), thus lflags.bd_ts_en and lflags.crypto_en + * shall never both be set in a BD. + */ #define TX_BD_LONG_INLINE_LFLAGS_BD_TS_EN UINT32_C(0x400) /* * If set to '1', this operation will cause a trace capture in each @@ -3382,6 +3757,11 @@ typedef struct tx_bd_long_inline { * If set to '1', When set to 1, KTLS encryption will be enabled for * the packet. */ + /* + * The BD timestamp feature cannot be enabled concurrently with + * cryptography (KTLS), thus lflags.bd_ts_en and lflags.crypto_en + * shall never both be set in a BD. + */ #define TX_BD_LONG_INLINE_LFLAGS_CRYPTO_EN UINT32_C(0x8000) uint8_t unused2; uint8_t kid_or_ts_low; @@ -3391,6 +3771,11 @@ typedef struct tx_bd_long_inline { * timestamp. If lflags.crypto_en is 1, this is the lower 7 bits of * the 20-bit KID. */ + /* + * The KID value of all-ones is reserved for non-KTLS packets, which + * only implies that this value must not be used when filling this + * field for crypto packets. + */ #define TX_BD_LONG_INLINE_KID_OR_TS_LOW_MASK UINT32_C(0xfe) #define TX_BD_LONG_INLINE_KID_OR_TS_LOW_SFT 1 uint32_t kid_or_ts_high; @@ -3401,6 +3786,11 @@ typedef struct tx_bd_long_inline { * timestamp. If lflags.crypto_en is 1, the least significant 13 bits * of this field contain the upper 13 bits of the 20-bit KID. */ + /* + * The KID value of all-ones is reserved for non-KTLS packets, which + * only implies that this value must not be used when filling this + * field for crypto packets. + */ #define TX_BD_LONG_INLINE_KID_OR_TS_HIGH_MASK UINT32_C(0xffff8000) #define TX_BD_LONG_INLINE_KID_OR_TS_HIGH_SFT 15 /* @@ -3525,6 +3915,11 @@ typedef struct tx_bd_mp_cmd { * This value defines the length of command field in bytes. The maximum * value shall be 496. */ + /* + * Note that a fatal error will be generated if the value of this field + * does not correspond with the value of flags.bd_cnt. For example, if + * this field carries a value of 20, then bd_cnt must equal 3. *** 106642 LINES SKIPPED *** From nobody Thu Mar 7 19:27:14 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7Q36Z3z5DfWW; Thu, 7 Mar 2024 19:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrK7Q2WgCz4b5b; Thu, 7 Mar 2024 19:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rVR+X3ox7ApgFgCcwbNgAo0pIxaNhr4ve4ybyb/q17U=; b=FhPFESlbRoARIkHtZemret4PP2XwnahJvbXbw4tzzwFGdaqs1WN5LneH3xz7y1R/zSTipd wadlAJymKeDlYw06u3EVM/zx3PGCF40WrkCUQbT4V0O0DTFA1/GIST66vKQyg7PI+usJpn EHJaakrFKHFd4XjpAuL6erhCDAfVJPKLMLqU0BaWcHqdVTxWQO1DjzjGVKSvLAtJyK1V90 4CaulO+1qec9p4d+CDWq0qvw03mlUo0tbz6L8Cuncrh64fsII+WTm5pIBypfMAKWW2g5UY aaLoNjNIWIO+O4SM6uOblaEqwOwl5Z/pvXV2f/lJ/KJntZwyjQxk9eql8Ac/qw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839634; a=rsa-sha256; cv=none; b=nf10+FiCGmm6ZC6tvYKVmoA7CGy53nhAdiwaydrMzOEatZAPBcZnbGuwECZK16TwQi60LU LvvDzd6LGvn+2Bk2cVi9bsEFZyV1BUnE3vbDgMK0TlSHi3v+3lcFLOyu3Zi+IthDHNN8eu 40FZLBLV9IAxOjUUAX9yYxRtVvLmwBSI7ZONyCICKw5GSNNXktAusABtPsuD5nkdSuCwUG T9QrUdkv6uIy57PW6shPY2kCSHnDW0jzoLJc8M42YpFBbraGalVSBL2id/HHRU3BFH+VBq /MbdiRYQkLYssEGvlBjju1qAB9ZHXvD0LRhFw/hh13XKXBjWixjnP2LNDDydUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rVR+X3ox7ApgFgCcwbNgAo0pIxaNhr4ve4ybyb/q17U=; b=KVxcvsDZcKco9HHeHDArMOV3QJ6pbOHtuVzu9gSaFa1GBQ4TPxxB0awhC9lrehmmumjJx1 7ZnJ8rBj3DGVRjW806L8ms440qa6exz3H2RbBKLYVO13U4mLXFVnslQnKegR24cQr7sd7i HQC6DLRqHbUzV0h3QhX14JdwlB04ZGbheMiVwBJJaxRWwcwaTw2dkelUJd0haG7EvInps3 aRHHGT/P/y93Ygb4I1PVncxmsa5Bzxy9rAp2uX14oiR76jS6oy2FFgbCLmdzKEcvvjWej5 zeSDh6Zbd9krcrJ7k6EgZWQmGoAULyYgsFyTUPpLTDZf4OiuGPX2QhVGnFvvCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7Q22GwzmpD; Thu, 7 Mar 2024 19:27:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JRECF064306; Thu, 7 Mar 2024 19:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JREsQ064303; Thu, 7 Mar 2024 19:27:14 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:14 GMT Message-Id: <202403071927.427JREsQ064303@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 816abba22efc - main - if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 816abba22efcf1ba51f61b1d89320ca8b576274e Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=816abba22efcf1ba51f61b1d89320ca8b576274e commit 816abba22efcf1ba51f61b1d89320ca8b576274e Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:18:41 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:16:39 +0000 if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D429506 --- sys/dev/bnxt/if_bnxt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 92e448567f9e..238c0729cdaf 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -2120,6 +2120,8 @@ bnxt_media_change(if_ctx_t ctx) case IFM_40G_KR4: case IFM_40G_LR4: case IFM_40G_SR4: + case IFM_40G_XLAUI: + case IFM_40G_XLAUI_AC: softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; softc->link_info.req_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_40GB; @@ -2936,6 +2938,8 @@ bnxt_add_media_types(struct bnxt_softc *softc) case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE: BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_ACC); BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_AOC); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_XLAUI); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_XLAUI_AC); break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASECX: From nobody Thu Mar 7 19:27:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7R6CNgz5Dfh9; Thu, 7 Mar 2024 19:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrK7R3gzcz4bH7; Thu, 7 Mar 2024 19:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fa7EchGxrYagac4S7aHN5qKMcAAazBO+oYUHPS5rst4=; b=BektkP5UICk3aZU9gq6lSPW+I5Rgk9K+0f9wFrurYy8gtjtxYrUL+hAqE1RVsc6EY0ox/i fBlFkWcpwQNEjp4ZaVSgMxD5PF24Dx89DONbPKTGC04oW4IKvtoA+4IDHFTb5D/zWpWW9D C3jn/5Fhhf2aXcRnx+IUsBqz6p4w97IBHtJ849y5C1PagA1kvUxun2A0Q/1+tClW27hRpQ 2sl2LDIoP99IQYigYRQbL+zL3xtNyV+THp4UQIBU2qge7fOAx6RkgW5JLJ6Lr2b3qivQUs G9j3x0V7OYUDs2H+G7r2Lp0yvIqFVZwAbb7ma9iMR8a27Et6aQEhfjK7RydyqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839635; a=rsa-sha256; cv=none; b=gdNlww9rnr3v0tCW3CCUFRrdZwSYGwpVbzl7wuyCY4Qi3wTKyoWvT23rxfwjzuZmlC7sZ8 HaOW8fWojg+QFwkdqdZtl5jTHrG4WqJtxLcuKeWhY+uxZ1MKmTwMGpFAjggavDWEXDLfFj QBaZZBnx82D2vugkyDoWm12fCQzrQg1raCgRPPxF1reNVzGUtf+jcuWtAuOZDrMIy9Moq/ U2SE8UF+uCTComr1QSTC057OksWFE6eYJm3IWX5iFuX/61d5gHErtvTDkBd798hJdFOnto KIce2aavgwRvQmQLsowoLG2sTSdNoT2Kpu+yF+h4IjEkvSGcpD/4i5oAx8ouiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fa7EchGxrYagac4S7aHN5qKMcAAazBO+oYUHPS5rst4=; b=R27y1j/6esiEtqWztJdqDLPDMd2oa4i/5VSHokIXAgGwraLBqAlNQdVhExv3rD025+ku+W E6gl/qiWWwr6twB3GKeuQhf3bgBW/6QPdPucxs4wSSoFUooZNETp2mIsG+hS0rdnEpK59u fxDJAbgeotsbLVZ+MWlgcNXbSfInm0jBmbIPNLYj/amrlr4oZx4ze4UTka33W3ue1ux6jM 02+UJphHUtsPrARYecRtx6hcVcrlgpVRxW2ZfVoW/1i0QbWIF1n42dhEI9SeVNmSqgwtqc 3N9QqtEndnazvT8kTJkY3ynSWBLKmvyLfCtl53dW6bUyvYDiaXhaFoQ+iPM4Ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7R3Hv9zn3k; Thu, 7 Mar 2024 19:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JRFwH064366; Thu, 7 Mar 2024 19:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JRFuv064363; Thu, 7 Mar 2024 19:27:15 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:15 GMT Message-Id: <202403071927.427JRFuv064363@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: d36b36621a9c - main - if_bnxt: Implementation of Extended Port Hardware Stats Support for THOR Controller List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d36b36621a9c0f785ebea495c57e975b8a526b67 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=d36b36621a9c0f785ebea495c57e975b8a526b67 commit d36b36621a9c0f785ebea495c57e975b8a526b67 Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:20:28 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:16:39 +0000 if_bnxt: Implementation of Extended Port Hardware Stats Support for THOR Controller The newly added port extended hardware statistics are now accessible to users through the sysctl interface. Also, Few obsolete stats are removed and few stats are renamed. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42957 --- sys/dev/bnxt/bnxt.h | 20 +- sys/dev/bnxt/bnxt_hwrm.c | 28 ++- sys/dev/bnxt/bnxt_hwrm.h | 1 + sys/dev/bnxt/bnxt_sysctl.c | 457 +++++++++++++++++++++++++++++++----------- sys/dev/bnxt/hsi_struct_def.h | 2 +- sys/dev/bnxt/if_bnxt.c | 48 ++++- 6 files changed, 419 insertions(+), 137 deletions(-) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index 73122f82c7ad..a5c607dbe247 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -671,13 +671,14 @@ struct bnxt_softc { struct bnxt_bar_info hwrm_bar; struct bnxt_bar_info doorbell_bar; struct bnxt_link_info link_info; -#define BNXT_FLAG_VF 0x0001 -#define BNXT_FLAG_NPAR 0x0002 -#define BNXT_FLAG_WOL_CAP 0x0004 -#define BNXT_FLAG_SHORT_CMD 0x0008 -#define BNXT_FLAG_FW_CAP_NEW_RM 0x0010 -#define BNXT_FLAG_CHIP_P5 0x0020 -#define BNXT_FLAG_TPA 0x0040 +#define BNXT_FLAG_VF 0x0001 +#define BNXT_FLAG_NPAR 0x0002 +#define BNXT_FLAG_WOL_CAP 0x0004 +#define BNXT_FLAG_SHORT_CMD 0x0008 +#define BNXT_FLAG_FW_CAP_NEW_RM 0x0010 +#define BNXT_FLAG_CHIP_P5 0x0020 +#define BNXT_FLAG_TPA 0x0040 +#define BNXT_FLAG_FW_CAP_EXT_STATS 0x0080 uint32_t flags; #define BNXT_STATE_LINK_CHANGE (0) #define BNXT_STATE_MAX (BNXT_STATE_LINK_CHANGE + 1) @@ -714,6 +715,11 @@ struct bnxt_softc { struct rx_port_stats *rx_port_stats; struct tx_port_stats *tx_port_stats; + struct iflib_dma_info hw_tx_port_stats_ext; + struct iflib_dma_info hw_rx_port_stats_ext; + struct tx_port_stats_ext *tx_port_stats_ext; + struct rx_port_stats_ext *rx_port_stats_ext; + int num_cp_rings; struct bnxt_cp_ring *nq_rings; diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index 88ba185e2c27..38e6c0db670f 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -550,7 +550,7 @@ bnxt_hwrm_passthrough(struct bnxt_softc *softc, void *req, uint32_t req_len, input->resp_addr = htole64(softc->hwrm_cmd_resp.idi_paddr); BNXT_HWRM_LOCK(softc); old_timeo = softc->hwrm_cmd_timeo; - if (input->req_type == HWRM_NVM_INSTALL_UPDATE) + if (input->req_type == HWRM_NVM_INSTALL_UPDATE) softc->hwrm_cmd_timeo = BNXT_NVM_TIMEO; else softc->hwrm_cmd_timeo = max(app_timeout, softc->hwrm_cmd_timeo); @@ -694,7 +694,8 @@ bnxt_hwrm_ver_get(struct bnxt_softc *softc) softc->hwrm_cmd_timeo = le16toh(resp->def_req_timeout); if (!softc->hwrm_cmd_timeo) softc->hwrm_cmd_timeo = DFLT_HWRM_CMD_TIMEOUT; - + + dev_caps_cfg = le32toh(resp->dev_caps_cfg); if ((dev_caps_cfg & HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_SHORT_CMD_SUPPORTED) && (dev_caps_cfg & HWRM_VER_GET_OUTPUT_DEV_CAPS_CFG_SHORT_CMD_REQUIRED)) @@ -777,6 +778,9 @@ bnxt_hwrm_func_qcaps(struct bnxt_softc *softc) if (resp->flags & htole32(HWRM_FUNC_QCAPS_OUTPUT_FLAGS_WOL_MAGICPKT_SUPPORTED)) softc->flags |= BNXT_FLAG_WOL_CAP; + if (resp->flags & + htole32(HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT_STATS_SUPPORTED)) + softc->flags |= BNXT_FLAG_FW_CAP_EXT_STATS; func->fw_fid = le16toh(resp->fid); memcpy(func->mac_addr, resp->mac_address, ETHER_ADDR_LEN); @@ -1408,6 +1412,26 @@ bnxt_hwrm_port_qstats(struct bnxt_softc *softc) return rc; } +void +bnxt_hwrm_port_qstats_ext(struct bnxt_softc *softc) +{ + struct hwrm_port_qstats_ext_input req = {0}; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_PORT_QSTATS_EXT); + + req.port_id = htole16(softc->pf.port_id); + req.tx_stat_size = htole16(sizeof(struct tx_port_stats_ext)); + req.rx_stat_size = htole16(sizeof(struct rx_port_stats_ext)); + req.rx_stat_host_addr = htole64(softc->hw_rx_port_stats_ext.idi_paddr); + req.tx_stat_host_addr = htole64(softc->hw_tx_port_stats_ext.idi_paddr); + + BNXT_HWRM_LOCK(softc); + _hwrm_send_message(softc, &req, sizeof(req)); + BNXT_HWRM_UNLOCK(softc); + + return; +} + int bnxt_hwrm_cfa_l2_set_rx_mask(struct bnxt_softc *softc, struct bnxt_vnic_info *vnic) diff --git a/sys/dev/bnxt/bnxt_hwrm.h b/sys/dev/bnxt/bnxt_hwrm.h index e016677707ce..6dd015a15d40 100644 --- a/sys/dev/bnxt/bnxt_hwrm.h +++ b/sys/dev/bnxt/bnxt_hwrm.h @@ -64,6 +64,7 @@ int bnxt_hwrm_stat_ctx_alloc(struct bnxt_softc *softc, struct bnxt_cp_ring *cpr, uint64_t paddr); int bnxt_hwrm_stat_ctx_free(struct bnxt_softc *softc, struct bnxt_cp_ring *cpr); int bnxt_hwrm_port_qstats(struct bnxt_softc *softc); +void bnxt_hwrm_port_qstats_ext(struct bnxt_softc *softc); int bnxt_hwrm_ring_grp_alloc(struct bnxt_softc *softc, struct bnxt_grp_info *grp); int bnxt_hwrm_ring_grp_free(struct bnxt_softc *softc, struct bnxt_grp_info *gr); diff --git a/sys/dev/bnxt/bnxt_sysctl.c b/sys/dev/bnxt/bnxt_sysctl.c index 971754029afd..09e79a72f68f 100644 --- a/sys/dev/bnxt/bnxt_sysctl.c +++ b/sys/dev/bnxt/bnxt_sysctl.c @@ -233,17 +233,17 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) &softc->tx_port_stats->tx_512b_1023b_frames, "Transmitted 512b 1023b frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_1024b_1518_frames", CTLFLAG_RD, + "tx_1024b_1518b_frames", CTLFLAG_RD, &softc->tx_port_stats->tx_1024b_1518b_frames, - "Transmitted 1024b 1518 frames"); + "Transmitted 1024b 1518b frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "tx_good_vlan_frames", CTLFLAG_RD, &softc->tx_port_stats->tx_good_vlan_frames, "Transmitted good vlan frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_1519b_2047_frames", CTLFLAG_RD, + "tx_1519b_2047b_frames", CTLFLAG_RD, &softc->tx_port_stats->tx_1519b_2047b_frames, - "Transmitted 1519b 2047 frames"); + "Transmitted 1519b 2047b frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "tx_2048b_4095b_frames", CTLFLAG_RD, &softc->tx_port_stats->tx_2048b_4095b_frames, @@ -284,53 +284,9 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) "tx_fcs_err_frames", CTLFLAG_RD, &softc->tx_port_stats->tx_fcs_err_frames, "Transmitted fcs err frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_control_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_control_frames, - "Transmitted control frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_oversz_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_oversz_frames, "Transmitted oversz frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_single_dfrl_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_single_dfrl_frames, - "Transmitted single dfrl frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_multi_dfrl_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_multi_dfrl_frames, - "Transmitted multi dfrl frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_single_coll_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_single_coll_frames, - "Transmitted single coll frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_multi_coll_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_multi_coll_frames, - "Transmitted multi coll frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_late_coll_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_late_coll_frames, - "Transmitted late coll frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_excessive_coll_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_excessive_coll_frames, - "Transmitted excessive coll frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_frag_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_frag_frames, "Transmitted frag frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "tx_err", CTLFLAG_RD, &softc->tx_port_stats->tx_err, "Transmitted err"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_tagged_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_tagged_frames, "Transmitted tagged frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_dbl_tagged_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_dbl_tagged_frames, - "Transmitted dbl tagged frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "tx_runt_frames", CTLFLAG_RD, - &softc->tx_port_stats->tx_runt_frames, "Transmitted runt frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "tx_fifo_underruns", CTLFLAG_RD, &softc->tx_port_stats->tx_fifo_underruns, @@ -417,7 +373,7 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) &softc->rx_port_stats->rx_512b_1023b_frames, "Received 512b 1023b frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_1024b_1518_frames", CTLFLAG_RD, + "rx_1024b_1518b_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_1024b_1518b_frames, "Received 1024b 1518 frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, @@ -464,34 +420,10 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_pfc_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_pfc_frames, "Received pfc frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_unsupported_opcode_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_unsupported_opcode_frames, - "Received unsupported opcode frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_unsupported_da_pausepfc_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_unsupported_da_pausepfc_frames, - "Received unsupported da pausepfc frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_wrong_sa_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_wrong_sa_frames, - "Received wrong sa frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_align_err_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_align_err_frames, "Received align err frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_oor_len_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_oor_len_frames, - "Received oor len frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_code_err_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_code_err_frames, - "Received code err frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_false_carrier_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_false_carrier_frames, - "Received false carrier frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_ovrsz_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_ovrsz_frames, @@ -504,14 +436,6 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) "rx_mtu_err_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_mtu_err_frames, "Received mtu err frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_match_crc_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_match_crc_frames, - "Received match crc frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_promiscuous_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_promiscuous_frames, - "Received promiscuous frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_tagged_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_tagged_frames, @@ -520,46 +444,10 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) "rx_double_tagged_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_double_tagged_frames, "Received double tagged frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_trunc_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_trunc_frames, - "Received trunc frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_good_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_good_frames, "Received good frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri0", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri0, - "Received pfc xon2xoff frames pri0"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri1", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri1, - "Received pfc xon2xoff frames pri1"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri2", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri2, - "Received pfc xon2xoff frames pri2"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri3", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri3, - "Received pfc xon2xoff frames pri3"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri4", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri4, - "Received pfc xon2xoff frames pri4"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri5", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri5, - "Received pfc xon2xoff frames pri5"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri6", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri6, - "Received pfc xon2xoff frames pri6"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_pfc_xon2xoff_frames_pri7", CTLFLAG_RD, - &softc->rx_port_stats->rx_pfc_xon2xoff_frames_pri7, - "Received pfc xon2xoff frames pri7"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_pfc_ena_frames_pri0", CTLFLAG_RD, &softc->rx_port_stats->rx_pfc_ena_frames_pri0, @@ -599,9 +487,6 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_undrsz_frames", CTLFLAG_RD, &softc->rx_port_stats->rx_undrsz_frames, "Received undrsz frames"); - SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, - "rx_frag_frames", CTLFLAG_RD, - &softc->rx_port_stats->rx_frag_frames, "Received frag frames"); SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, "rx_eee_lpi_events", CTLFLAG_RD, &softc->rx_port_stats->rx_eee_lpi_events, "Received eee lpi events"); @@ -644,6 +529,338 @@ bnxt_create_port_stats_sysctls(struct bnxt_softc *softc) "rx_stat_err", CTLFLAG_RD, &softc->rx_port_stats->rx_stat_err, "Received stat err"); + if (BNXT_CHIP_P5(softc) && + (softc->flags & BNXT_FLAG_FW_CAP_EXT_STATS)) { + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos0", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos0, "Transmitted bytes count cos0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos0", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos0, "Transmitted packets count cos0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos1", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos1, "Transmitted bytes count cos1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos1", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos1, "Transmitted packets count cos1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos2", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos2, "Transmitted bytes count cos2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos2", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos2, "Transmitted packets count cos2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos3", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos3, "Transmitted bytes count cos3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos3", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos3, "Transmitted packets count cos3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos4", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos4, "Transmitted bytes count cos4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos4", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos4, "Transmitted packets count cos4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos5", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos5, "Transmitted bytes count cos5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos5", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos5, "Transmitted packets count cos5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos6", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos6, "Transmitted bytes count cos6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos6", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos6, "Transmitted packets count cos6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_bytes_cos7", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_bytes_cos7, "Transmitted bytes count cos7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "tx_packets_cos7", CTLFLAG_RD, + &softc->tx_port_stats_ext->tx_packets_cos7, "Transmitted packets count cos7"); + + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri0_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri0_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri0_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri0_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri1_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri1_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri1_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri1_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri2_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri2_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri2_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri2_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri3_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri3_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri3_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri3_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri4_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri4_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri4_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri4_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri5_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri5_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri5_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri5_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri6_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri6_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri6_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri6_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri7_tx_duration_us", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri7_tx_duration_us, "Time duration between" + "XON to XOFF and XOFF to XON for pri7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri7_tx_transitions", CTLFLAG_RD, + &softc->tx_port_stats_ext->pfc_pri7_tx_transitions, "Num times transition" + "between XON to XOFF and XOFF to XON for pri7"); + + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "link_down_events", CTLFLAG_RD, + &softc->rx_port_stats_ext->link_down_events, "Num times link states down"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "continuous_pause_events", CTLFLAG_RD, + &softc->rx_port_stats_ext->continuous_pause_events, "Num times pause events"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "resume_pause_events", CTLFLAG_RD, + &softc->rx_port_stats_ext->resume_pause_events, "Num times pause events" + "resumes"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "continuous_roce_pause_events", CTLFLAG_RD, + &softc->rx_port_stats_ext->continuous_roce_pause_events, "Num times roce" + "pause events"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "resume_roce_pause_events", CTLFLAG_RD, + &softc->rx_port_stats_ext->resume_roce_pause_events, "Num times roce pause" + "events resumes"); + + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos0", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos0, "Received bytes count cos0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos0", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos0, "Received packets count cos0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos1", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos1, "Received bytes count cos1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos1", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos1, "Received packets count cos1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos2", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos2, "Received bytes count cos2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos2", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos2, "Received packets count cos2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos3", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos3, "Received bytes count cos3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos3", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos3, "Received packets count cos3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos4", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos4, "Received bytes count cos4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos4", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos4, "Received packets count cos4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos5", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos5, "Received bytes count cos5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos5", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos5, "Received packets count cos5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos6", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos6, "Received bytes count cos6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos6", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos6, "Received packets count cos6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bytes_cos7", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bytes_cos7, "Received bytes count cos7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_packets_cos7", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_packets_cos7, "Received packets count cos7"); + + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri0_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri0_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri0_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri0_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri1_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri1_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri1_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri1_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri2_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri2_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri2_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri2_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri3_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri3_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri3_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri3_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri4_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri4_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri4_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri4_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri5_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri5_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri5_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri5_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri6_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri6_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri6_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri6_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri7_rx_duration_us", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri7_rx_duration_us, "Time duration in receiving" + "between XON to XOFF and XOFF to XON for pri7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "pfc_pri7_rx_transitions", CTLFLAG_RD, + &softc->rx_port_stats_ext->pfc_pri7_rx_transitions, "Num times rx transition" + "between XON to XOFF and XOFF to XON for pri7"); + + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_bits", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_bits, "total number of received bits"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_buffer_passed_threshold", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_buffer_passed_threshold, "num of events port" + "buffer" + "was over 85%"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_pcs_symbol_err", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_pcs_symbol_err, "num of symbol errors wasn't" + "corrected by FEC"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_corrected_bits", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_corrected_bits, "num of bits corrected by FEC"); + + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos0", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos0, "num of rx discard bytes" + "count on cos0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos0", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos0, "num of rx discard packets" + "count on cos0"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos1", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos1, "num of rx discard bytes" + "count on cos1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos1", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos1, "num of rx discard packets" + "count on cos1"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos2", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos2, "num of rx discard bytes" + "count on cos2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos2", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos2, "num of rx discard packets" + "count on cos2"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos3", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos3, "num of rx discard bytes" + "count on cos3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos3", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos3, "num of rx discard packets" + "count on cos3"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos4", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos4, "num of rx discard bytes" + "count on cos4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos4", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos4, "num of rx discard packets" + "count on cos4"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos5", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos5, "num of rx discard bytes" + "count on cos5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos5", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos5, "num of rx discard packets" + "count on cos5"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos6", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos6, "num of rx discard bytes" + "count on cos6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos6", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos6, "num of rx discard packets" + "count on cos6"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_bytes_cos7", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_bytes_cos7, "num of rx discard bytes" + "count on cos7"); + SYSCTL_ADD_QUAD(&softc->hw_stats, SYSCTL_CHILDREN(oid), OID_AUTO, + "rx_discard_packets_cos7", CTLFLAG_RD, + &softc->rx_port_stats_ext->rx_discard_packets_cos7, "num of rx discard packets" + "count on cos7"); + } + + return 0; } diff --git a/sys/dev/bnxt/hsi_struct_def.h b/sys/dev/bnxt/hsi_struct_def.h index d2097ca1ca33..12b112c42ca7 100644 --- a/sys/dev/bnxt/hsi_struct_def.h +++ b/sys/dev/bnxt/hsi_struct_def.h @@ -800,7 +800,7 @@ typedef struct cmd_nums { #define HWRM_FUNC_VLAN_QCFG UINT32_C(0x34) #define HWRM_QUEUE_PFCENABLE_QCFG UINT32_C(0x35) #define HWRM_QUEUE_PFCENABLE_CFG UINT32_C(0x36) - #define HWRM_QUEUE_PRI2COS_QCFG UINT32_C(0x37) + #define HWRM_QUEUE_PRI2COS_QCFG UINT32_C(0x37) #define HWRM_QUEUE_PRI2COS_CFG UINT32_C(0x38) #define HWRM_QUEUE_COS2BW_QCFG UINT32_C(0x39) #define HWRM_QUEUE_COS2BW_CFG UINT32_C(0x3a) diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 238c0729cdaf..e4a14aa954f5 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -499,6 +499,8 @@ bnxt_queues_free(if_ctx_t ctx) iflib_dma_free(&softc->rx_stats[i]); iflib_dma_free(&softc->hw_tx_port_stats); iflib_dma_free(&softc->hw_rx_port_stats); + iflib_dma_free(&softc->hw_tx_port_stats_ext); + iflib_dma_free(&softc->hw_rx_port_stats_ext); free(softc->grp_info, M_DEVBUF); free(softc->ag_rings, M_DEVBUF); free(softc->rx_rings, M_DEVBUF); @@ -573,9 +575,9 @@ bnxt_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, bus_dmamap_sync(softc->hw_rx_port_stats.idi_tag, softc->hw_rx_port_stats.idi_map, BUS_DMASYNC_PREREAD); + rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats) + BNXT_PORT_STAT_PADDING, &softc->hw_tx_port_stats, 0); - if (rc) goto hw_port_tx_stats_alloc_fail; @@ -585,6 +587,26 @@ bnxt_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, softc->rx_port_stats = (void *) softc->hw_rx_port_stats.idi_vaddr; softc->tx_port_stats = (void *) softc->hw_tx_port_stats.idi_vaddr; + + rc = iflib_dma_alloc(ctx, sizeof(struct rx_port_stats_ext), + &softc->hw_rx_port_stats_ext, 0); + if (rc) + goto hw_port_rx_stats_ext_alloc_fail; + + bus_dmamap_sync(softc->hw_rx_port_stats_ext.idi_tag, + softc->hw_rx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD); + + rc = iflib_dma_alloc(ctx, sizeof(struct tx_port_stats_ext), + &softc->hw_tx_port_stats_ext, 0); + if (rc) + goto hw_port_tx_stats_ext_alloc_fail; + + bus_dmamap_sync(softc->hw_tx_port_stats_ext.idi_tag, + softc->hw_tx_port_stats_ext.idi_map, BUS_DMASYNC_PREREAD); + + softc->rx_port_stats_ext = (void *) softc->hw_rx_port_stats_ext.idi_vaddr; + softc->tx_port_stats_ext = (void *) softc->hw_tx_port_stats_ext.idi_vaddr; + for (i = 0; i < nrxqsets; i++) { /* Allocation the completion ring */ softc->rx_cp_rings[i].stats_ctx_id = HWRM_NA_SIGNATURE; @@ -653,7 +675,7 @@ bnxt_rx_queues_alloc(if_ctx_t ctx, caddr_t *vaddrs, * HWRM every sec with which firmware timeouts can happen */ if (BNXT_PF(softc)) - bnxt_create_port_stats_sysctls(softc); + bnxt_create_port_stats_sysctls(softc); /* And finally, the VNIC */ softc->vnic_info.id = (uint16_t)HWRM_NA_SIGNATURE; @@ -699,16 +721,24 @@ rss_grp_alloc_fail: iflib_dma_free(&softc->vnic_info.rss_hash_key_tbl); rss_hash_alloc_fail: iflib_dma_free(&softc->vnic_info.mc_list); -tpa_alloc_fail: mc_list_alloc_fail: - for (i = i - 1; i >= 0; i--) - free(softc->rx_rings[i].tpa_start, M_DEVBUF); + for (i = i - 1; i >= 0; i--) { + if (softc->rx_rings[i].tpa_start) + free(softc->rx_rings[i].tpa_start, M_DEVBUF); + } +tpa_alloc_fail: + iflib_dma_free(&softc->hw_tx_port_stats_ext); +hw_port_tx_stats_ext_alloc_fail: + iflib_dma_free(&softc->hw_rx_port_stats_ext); +hw_port_rx_stats_ext_alloc_fail: iflib_dma_free(&softc->hw_tx_port_stats); hw_port_tx_stats_alloc_fail: iflib_dma_free(&softc->hw_rx_port_stats); hw_port_rx_stats_alloc_fail: - for (i = i - 1; i >= 0; i--) - iflib_dma_free(&softc->rx_stats[i]); + for (i=0; i < nrxqsets; i++) { + if (softc->rx_stats[i].idi_vaddr) + iflib_dma_free(&softc->rx_stats[i]); + } hw_stats_alloc_fail: free(softc->grp_info, M_DEVBUF); grp_alloc_fail: @@ -2207,6 +2237,10 @@ bnxt_update_admin_status(if_ctx_t ctx) bnxt_hwrm_port_qstats(softc); + if (BNXT_CHIP_P5(softc) && + (softc->flags & BNXT_FLAG_FW_CAP_EXT_STATS)) + bnxt_hwrm_port_qstats_ext(softc); + if (BNXT_CHIP_P5(softc)) { struct ifmediareq ifmr; From nobody Thu Mar 7 19:27:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7T01K7z5DfWd; Thu, 7 Mar 2024 19:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrK7S4tw4z4b47; Thu, 7 Mar 2024 19:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LO0zTDEY+St5eINhvpl31JG7Gt9Bsq2j+InNr8vBozo=; b=XUhUFYwkdAceN2X3WT2vO1VpO6r2VGnbCIbxsX7jmMwjVnUHgLDRh/Nn6FxXn5WCg9OCxV 7ymHZDj9DxWidgnTp/5mDpVUhFsgjer0gQK9VeL6uh/WxOdhHLlDn6X890NquWNF4Z+t6I PZF6u2d9qNFvRqveTN9OMO2fP5LHj3KFwsiKCC4fn7raGKTVcu/mQSNii2pNSNT+0ckiFT xUZ63r+6W1a6jhIRlQX1lZMyME6rC+MH6Akm14cR6JYzF+rLqDPY0E0i1XXIdn1knl9sNW hoEXSSVCjmKthuKtwnNBPW8pLYQA6yD0mwdQathTgKLK0tiI1VPp4D+UIdGPGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839636; a=rsa-sha256; cv=none; b=w78qCaADUX2Xsy32ZbaV0qXOf1KCaqWKs6nd4zb9NdoJqyXA3qBIu56Q1R3la5VDqBWGyp rw5pqDwD3tjkuEgXAy9rnCmZLyAXGvCoifup0UYcCYq2nEQ8jU6zI/Ax4z7OpFbXxoT36H IsE8UHVcz/1FIX1SL8ELYXK/kzDKZf8kh+pJJOyMn2D3J7tbCpyYvfXWDw/2FQ9y01PlwQ BF4MZf0zn1kek26nDOpABz229vwkeum6diwfGfg+6z4waT0wkUBW7mnysN/UxBaCdAbcih 0dT0Kq1tB/3yjVipFGMtRMj3nugbC6/XPN10zUrOGSIh45o4EvoYwA+S+kF56w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LO0zTDEY+St5eINhvpl31JG7Gt9Bsq2j+InNr8vBozo=; b=IYyHKUqvM0w0aZfvL2LQ/BR45dfCzrAVXZ5hI1bVwh/dvOL1N5TPBauypRRIjpgEs3TxiE Wa8puZ7nGEGjVSyOhkWQtmRR5ee3UaJttoRZOGck58DLJpanPzn9MCYNlUtJKc3KMwsIaa k9J+9U2kvbD+EG7QRoLKECvnm8ZiG5j/BfT0BhwEvVX2effl1YrFyWZA7yK801DUXIOEPg 2G2/FGRFze0szQpMHowH4QMiwg2qGKC4oCCKuNIZ0e0W9nZVobVKHqHJ6WHpm07fOUeYGN kQP8hukucWoosKux+FHxXkVYwFLjKf+C+vQ3prw1UlhCfNVE3A+tgyVOTKXDhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7S4L0RznNh; Thu, 7 Mar 2024 19:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JRGCN064408; Thu, 7 Mar 2024 19:27:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JRGFS064405; Thu, 7 Mar 2024 19:27:16 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:16 GMT Message-Id: <202403071927.427JRGFS064405@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 3320f0f69f06 - main - if_bnxt: Pluggable Module Display Support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3320f0f69f06df5c36daa8ff71e0c07908ff0f1a Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=3320f0f69f06df5c36daa8ff71e0c07908ff0f1a commit 3320f0f69f06df5c36daa8ff71e0c07908ff0f1a Author: Sumit Saxena AuthorDate: 2024-03-06 13:21:21 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:16:39 +0000 if_bnxt: Pluggable Module Display Support This update enables the display of pluggable module information to users via the ifconfig utility. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42958 --- sys/dev/bnxt/bnxt.h | 8 +++++++ sys/dev/bnxt/bnxt_hwrm.c | 40 ++++++++++++++++++++++++++++++++ sys/dev/bnxt/if_bnxt.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 107 insertions(+) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index a5c607dbe247..4397e0478a0c 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -319,6 +319,8 @@ struct bnxt_link_info { #define BNXT_AUTONEG_FLOW_CTRL 2 uint8_t req_duplex; uint16_t req_link_speed; + uint8_t module_status; + struct hwrm_port_phy_qcfg_output phy_qcfg_resp; }; enum bnxt_cp_type { @@ -802,9 +804,15 @@ struct bnxt_filter_info { uint64_t l2_filter_id_hint; }; +#define I2C_DEV_ADDR_A0 0xa0 +#define BNXT_MAX_PHY_I2C_RESP_SIZE 64 + /* Function declarations */ void bnxt_report_link(struct bnxt_softc *softc); bool bnxt_check_hwrm_version(struct bnxt_softc *softc); struct bnxt_softc *bnxt_find_dev(uint32_t domain, uint32_t bus, uint32_t dev_fn, char *name); +int bnxt_read_sfp_module_eeprom_info(struct bnxt_softc *bp, uint16_t i2c_addr, + uint16_t page_number, uint8_t bank, bool bank_sel_en, uint16_t start_addr, + uint16_t data_length, uint8_t *buf); #endif /* _BNXT_H */ diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index 38e6c0db670f..97574c768235 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -2184,6 +2184,44 @@ bnxt_hwrm_fw_set_time(struct bnxt_softc *softc, uint16_t year, uint8_t month, return hwrm_send_message(softc, &req, sizeof(req)); } +int bnxt_read_sfp_module_eeprom_info(struct bnxt_softc *softc, uint16_t i2c_addr, + uint16_t page_number, uint8_t bank,bool bank_sel_en, uint16_t start_addr, + uint16_t data_length, uint8_t *buf) +{ + struct hwrm_port_phy_i2c_read_output *output = + (void *)softc->hwrm_cmd_resp.idi_vaddr; + struct hwrm_port_phy_i2c_read_input req = {0}; + int rc = 0, byte_offset = 0; + + BNXT_HWRM_LOCK(softc); + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_PORT_PHY_I2C_READ); + + req.i2c_slave_addr = i2c_addr; + req.page_number = htole16(page_number); + req.port_id = htole16(softc->pf.port_id); + do { + uint16_t xfer_size; + + xfer_size = min_t(uint16_t, data_length, BNXT_MAX_PHY_I2C_RESP_SIZE); + data_length -= xfer_size; + req.page_offset = htole16(start_addr + byte_offset); + req.data_length = xfer_size; + req.bank_number = bank; + req.enables = htole32((start_addr + byte_offset ? + HWRM_PORT_PHY_I2C_READ_INPUT_ENABLES_PAGE_OFFSET : 0) | + (bank_sel_en ? + HWRM_PORT_PHY_I2C_READ_INPUT_ENABLES_BANK_NUMBER : 0)); + rc = hwrm_send_message(softc, &req, sizeof(req)); + if (!rc) + memcpy(buf + byte_offset, output->data, xfer_size); + byte_offset += xfer_size; + } while (!rc && data_length > 0); + + BNXT_HWRM_UNLOCK(softc); + + return rc; +} + int bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc) { @@ -2200,6 +2238,7 @@ bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc) if (rc) goto exit; + memcpy(&link_info->phy_qcfg_resp, resp, sizeof(*resp)); link_info->phy_link_status = resp->link; link_info->duplex = resp->duplex_cfg; link_info->auto_mode = resp->auto_mode; @@ -2264,6 +2303,7 @@ bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc) link_info->transceiver = resp->xcvr_pkg_type; link_info->phy_addr = resp->eee_config_phy_addr & HWRM_PORT_PHY_QCFG_OUTPUT_PHY_ADDR_MASK; + link_info->module_status = resp->module_status; exit: BNXT_HWRM_UNLOCK(softc); diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index e4a14aa954f5..f82d32c3ff5b 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -224,6 +224,8 @@ static uint64_t bnxt_get_baudrate(struct bnxt_link_info *link); static void bnxt_get_wol_settings(struct bnxt_softc *softc); static int bnxt_wol_config(if_ctx_t ctx); static bool bnxt_if_needs_restart(if_ctx_t, enum iflib_restart_event); +static int bnxt_i2c_req(if_ctx_t ctx, struct ifi2creq *i2c); +static void bnxt_get_port_module_status(struct bnxt_softc *softc); /* * Device Interface Declaration @@ -287,6 +289,7 @@ static device_method_t bnxt_iflib_methods[] = { DEVMETHOD(ifdi_suspend, bnxt_suspend), DEVMETHOD(ifdi_shutdown, bnxt_shutdown), DEVMETHOD(ifdi_resume, bnxt_resume), + DEVMETHOD(ifdi_i2c_req, bnxt_i2c_req), DEVMETHOD(ifdi_needs_restart, bnxt_if_needs_restart), @@ -1807,6 +1810,33 @@ bnxt_rss_grp_tbl_init(struct bnxt_softc *softc) } } +static void bnxt_get_port_module_status(struct bnxt_softc *softc) +{ + struct bnxt_link_info *link_info = &softc->link_info; + struct hwrm_port_phy_qcfg_output *resp = &link_info->phy_qcfg_resp; + uint8_t module_status; + + if (bnxt_update_link(softc, false)) + return; + + module_status = link_info->module_status; + switch (module_status) { + case HWRM_PORT_PHY_QCFG_OUTPUT_MODULE_STATUS_DISABLETX: + case HWRM_PORT_PHY_QCFG_OUTPUT_MODULE_STATUS_PWRDOWN: + case HWRM_PORT_PHY_QCFG_OUTPUT_MODULE_STATUS_WARNINGMSG: + device_printf(softc->dev, "Unqualified SFP+ module detected on port %d\n", + softc->pf.port_id); + if (softc->hwrm_spec_code >= 0x10201) { + device_printf(softc->dev, "Module part number %s\n", + resp->phy_vendor_partnumber); + } + if (module_status == HWRM_PORT_PHY_QCFG_OUTPUT_MODULE_STATUS_DISABLETX) + device_printf(softc->dev, "TX is disabled\n"); + if (module_status == HWRM_PORT_PHY_QCFG_OUTPUT_MODULE_STATUS_PWRDOWN) + device_printf(softc->dev, "SFP+ module is shutdown\n"); + } +} + /* Device configuration */ static void bnxt_init(if_ctx_t ctx) @@ -1969,6 +1999,7 @@ skip_def_cp_ring: } bnxt_do_enable_intr(&softc->def_cp_ring); + bnxt_get_port_module_status(softc); bnxt_media_status(softc->ctx, &ifmr); bnxt_hwrm_cfa_l2_set_rx_mask(softc, &softc->vnic_info); return; @@ -2874,6 +2905,33 @@ exit: return rc; } +static int +bnxt_i2c_req(if_ctx_t ctx, struct ifi2creq *i2c) +{ + struct bnxt_softc *softc = iflib_get_softc(ctx); + uint8_t *data = i2c->data; + int rc; + + /* No point in going further if phy status indicates + * module is not inserted or if it is powered down or + * if it is of type 10GBase-T + */ + if (softc->link_info.module_status > + HWRM_PORT_PHY_QCFG_OUTPUT_MODULE_STATUS_WARNINGMSG) + return -EOPNOTSUPP; + + /* This feature is not supported in older firmware versions */ + if (!BNXT_CHIP_P5(softc) || + (softc->hwrm_spec_code < 0x10202)) + return -EOPNOTSUPP; + + + rc = bnxt_read_sfp_module_eeprom_info(softc, I2C_DEV_ADDR_A0, 0, 0, 0, + i2c->offset, i2c->len, data); + + return rc; +} + /* * Support functions */ @@ -2890,6 +2948,7 @@ bnxt_probe_phy(struct bnxt_softc *softc) return (rc); } + bnxt_get_port_module_status(softc); /*initialize the ethool setting copy with NVM settings */ if (link_info->auto_mode != HWRM_PORT_PHY_QCFG_OUTPUT_AUTO_MODE_NONE) link_info->autoneg |= BNXT_AUTONEG_SPEED; From nobody Thu Mar 7 19:27:17 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7T6nmKz5DfY6; Thu, 7 Mar 2024 19:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrK7T5Wq4z4bBB; Thu, 7 Mar 2024 19:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rL0nTZcuS4jWxpOx/cU6b/2DDO1ZcIKH8193zG1Tkjw=; b=lEe/X05ko29hbOGlSu8ZIvaf9JQ6whiKGQEm72TI33P3Ld2JL59uGVe7/M2jAYHrNK7F5b 4qXq4W0C2DGCeEQpvU+bfTQfaXTsGjpoqSSAA5rL2LcR7OW0aovPf4mDFbWs6Avw9yyIRG kZnORmZFWp1Zk5BnZB40kXgWZHshMe/dZnuqlgt3JXLiz1c6aH2fzGhP0UP7yGcouck2Rv r2Gg+6lwRStbLlCPe+V3XgS4qTerN0zUbr+4PrvBTrT31SAOdg4nGsPNQdc+vg5OGMuCPM Ztj3/WXwC/AJCT9FO7D+ffoBIy8GO2l1FBLSMZYq3hJuIB5bi6pf/VvzBqkWPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839637; a=rsa-sha256; cv=none; b=rE49bkTfEaWq7uvsPM4ml8q5G1SngWU53dXv5LpAPMKEoRMwB1qpHaWn/38Lcrk4M9cDy2 6psfI++oKkL8siczNn+vMraAeZeVfcr2DZTK9VnuhR9wra5F4t8Ou/aq9oDz3VsFFgKmap j2Y+PvTALsP4hZrWhQHM0HpR84ey+QinXnCC1RWfI/QN3VY1jaDLZFHrQaBwjxJw9aBMOa GZEpQrwrMwdcxqCl8MlpBdTvr6hxmczutnG7CZHUT51XwGmQB8rwdeLjKcfW9VLGv25MJd R4NQcYRhA1fsenBjiE4/uy4Zvad/BBzxRDJJRPdlX/TBwaOArGGEvz2YeAyeOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rL0nTZcuS4jWxpOx/cU6b/2DDO1ZcIKH8193zG1Tkjw=; b=XI5MkZlgUJ//i3BYzsDjrlcG1VfYaQXZ4wPQ0T7Msd7XsVSjvYECRqy4X+39Bauar7mQSG yuwKjquaWJZtzTfnSz7B1g3PYH+zx3PqzKliepylakCEjAntKzmPZOGhwh4sAyhRNMiQNm Bf8Q1q4brUVp9wO02acbKWuRFiy7LEB38sQQNK4vHJuElMREYB96B6CntojI+tb0wun+LR Q/+RfL1W9AJ0QBLjqRfjQN2U/umjSvBdqBCe+4L440Ab7Qp+gS0GPIri16T3je1J0JbQkm OQ9j9ALHjS3Ca13KEKknQNavqGbrrwypZvB8l8YZMaztq3TDhqGsIXYL5MqBZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7T57jCznNj; Thu, 7 Mar 2024 19:27:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JRHpB064462; Thu, 7 Mar 2024 19:27:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JRHiH064459; Thu, 7 Mar 2024 19:27:17 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:17 GMT Message-Id: <202403071927.427JRHiH064459@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: c63d67e137f3 - main - if_bnxt: 50G, 100G and 200G PAM4 support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c63d67e137f353f4bc4d0d56bd793f83204a3e1e Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=c63d67e137f353f4bc4d0d56bd793f83204a3e1e commit c63d67e137f353f4bc4d0d56bd793f83204a3e1e Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:21:52 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:16:39 +0000 if_bnxt: 50G, 100G and 200G PAM4 support Add support for 50G, 100G and 200G PAM4 support Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42959 --- sys/dev/bnxt/bnxt.h | 31 ++++++- sys/dev/bnxt/bnxt_hwrm.c | 78 ++++++++++++++++- sys/dev/bnxt/bnxt_hwrm.h | 1 + sys/dev/bnxt/if_bnxt.c | 213 +++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 284 insertions(+), 39 deletions(-) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index 4397e0478a0c..204284d45428 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -306,12 +306,33 @@ struct bnxt_link_info { #define PHY_VER_LEN 3 uint8_t phy_ver[PHY_VER_LEN]; uint8_t phy_type; +#define BNXT_PHY_STATE_ENABLED 0 +#define BNXT_PHY_STATE_DISABLED 1 + uint8_t phy_state; + uint16_t link_speed; uint16_t support_speeds; + uint16_t support_pam4_speeds; uint16_t auto_link_speeds; - uint16_t auto_link_speed; + uint16_t auto_pam4_link_speeds; uint16_t force_link_speed; + uint16_t force_pam4_link_speed; + bool force_pam4_speed_set_by_user; + + uint16_t advertising; + uint16_t advertising_pam4; + uint32_t preemphasis; + uint16_t support_auto_speeds; + uint16_t support_force_speeds; + uint16_t support_pam4_auto_speeds; + uint16_t support_pam4_force_speeds; +#define BNXT_SIG_MODE_NRZ HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_NRZ +#define BNXT_SIG_MODE_PAM4 HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_PAM4 + uint8_t req_signal_mode; + + uint8_t active_fec_sig_mode; + uint8_t sig_mode; /* copy of requested setting */ uint8_t autoneg; @@ -323,6 +344,14 @@ struct bnxt_link_info { struct hwrm_port_phy_qcfg_output phy_qcfg_resp; }; +enum bnxt_phy_type { + BNXT_MEDIA_CR = 0, + BNXT_MEDIA_LR, + BNXT_MEDIA_SR, + BNXT_MEDIA_KR, + BNXT_MEDIA_END +}; + enum bnxt_cp_type { BNXT_DEFAULT, BNXT_TX, diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index 97574c768235..481d45350488 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -857,6 +857,7 @@ static void bnxt_hwrm_set_link_common(struct bnxt_softc *softc, struct hwrm_port_phy_cfg_input *req) { + struct bnxt_link_info *link_info = &softc->link_info; uint8_t autoneg = softc->link_info.autoneg; uint16_t fw_link_speed = softc->link_info.req_link_speed; @@ -869,8 +870,15 @@ bnxt_hwrm_set_link_common(struct bnxt_softc *softc, req->flags |= htole32(HWRM_PORT_PHY_CFG_INPUT_FLAGS_RESTART_AUTONEG); } else { - req->force_link_speed = htole16(fw_link_speed); req->flags |= htole32(HWRM_PORT_PHY_CFG_INPUT_FLAGS_FORCE); + + if (link_info->force_pam4_speed_set_by_user) { + req->force_pam4_link_speed = htole16(fw_link_speed); + req->enables |= htole32(HWRM_PORT_PHY_CFG_INPUT_ENABLES_FORCE_PAM4_LINK_SPEED); + link_info->force_pam4_speed_set_by_user = false; + } else { + req->force_link_speed = htole16(fw_link_speed); + } } /* tell chimp that the setting takes effect immediately */ @@ -2284,7 +2292,7 @@ bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc) else link_info->link_speed = 0; link_info->force_link_speed = le16toh(resp->force_link_speed); - link_info->auto_link_speed = le16toh(resp->auto_link_speed); + link_info->auto_link_speeds = le16toh(resp->auto_link_speed); link_info->support_speeds = le16toh(resp->support_speeds); link_info->auto_link_speeds = le16toh(resp->auto_link_speed_mask); link_info->preemphasis = le32toh(resp->preemphasis); @@ -2304,6 +2312,72 @@ bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc) link_info->phy_addr = resp->eee_config_phy_addr & HWRM_PORT_PHY_QCFG_OUTPUT_PHY_ADDR_MASK; link_info->module_status = resp->module_status; + link_info->support_pam4_speeds = le16toh(resp->support_pam4_speeds); + link_info->auto_pam4_link_speeds = le16toh(resp->auto_pam4_link_speed_mask); + link_info->force_pam4_link_speed = le16toh(resp->force_pam4_link_speed); + + if (softc->hwrm_spec_code >= 0x10504) + link_info->active_fec_sig_mode = resp->active_fec_signal_mode; + +exit: + BNXT_HWRM_UNLOCK(softc); + return rc; +} + +static bool +bnxt_phy_qcaps_no_speed(struct hwrm_port_phy_qcaps_output *resp) +{ + if (!resp->supported_speeds_auto_mode && + !resp->supported_speeds_force_mode && + !resp->supported_pam4_speeds_auto_mode && + !resp->supported_pam4_speeds_force_mode) + return true; + + return false; +} + +int bnxt_hwrm_phy_qcaps(struct bnxt_softc *softc) +{ + struct bnxt_link_info *link_info = &softc->link_info; + struct hwrm_port_phy_qcaps_output *resp = + (void *)softc->hwrm_cmd_resp.idi_vaddr; + struct hwrm_port_phy_qcaps_input req = {}; + int rc; + + if (softc->hwrm_spec_code < 0x10201) + return 0; + + bnxt_hwrm_cmd_hdr_init(softc, &req, HWRM_PORT_PHY_QCAPS); + + BNXT_HWRM_LOCK(softc); + rc = _hwrm_send_message(softc, &req, sizeof(req)); + if (rc) + goto exit; + + if (softc->hwrm_spec_code >= 0x10a01) { + if (bnxt_phy_qcaps_no_speed(resp)) { + link_info->phy_state = BNXT_PHY_STATE_DISABLED; + device_printf(softc->dev, "Ethernet link disabled\n"); + } else if (link_info->phy_state == BNXT_PHY_STATE_DISABLED) { + link_info->phy_state = BNXT_PHY_STATE_ENABLED; + device_printf(softc->dev, "Ethernet link enabled\n"); + /* Phy re-enabled, reprobe the speeds */ + link_info->support_auto_speeds = 0; + link_info->support_pam4_auto_speeds = 0; + } + } + if (resp->supported_speeds_auto_mode) + link_info->support_auto_speeds = + le16toh(resp->supported_speeds_auto_mode); + if (resp->supported_speeds_force_mode) + link_info->support_force_speeds = + le16toh(resp->supported_speeds_force_mode); + if (resp->supported_pam4_speeds_auto_mode) + link_info->support_pam4_auto_speeds = + le16toh(resp->supported_pam4_speeds_auto_mode); + if (resp->supported_pam4_speeds_force_mode) + link_info->support_pam4_force_speeds = + le16toh(resp->supported_pam4_speeds_force_mode); exit: BNXT_HWRM_UNLOCK(softc); diff --git a/sys/dev/bnxt/bnxt_hwrm.h b/sys/dev/bnxt/bnxt_hwrm.h index 6dd015a15d40..930ff424ecb8 100644 --- a/sys/dev/bnxt/bnxt_hwrm.h +++ b/sys/dev/bnxt/bnxt_hwrm.h @@ -116,6 +116,7 @@ int bnxt_hwrm_fw_set_time(struct bnxt_softc *softc, uint16_t year, uint8_t month, uint8_t day, uint8_t hour, uint8_t minute, uint8_t second, uint16_t millisecond, uint16_t zone); int bnxt_hwrm_port_phy_qcfg(struct bnxt_softc *softc); +int bnxt_hwrm_phy_qcaps(struct bnxt_softc *softc); uint16_t bnxt_hwrm_get_wol_fltrs(struct bnxt_softc *softc, uint16_t handle); int bnxt_hwrm_alloc_wol_fltr(struct bnxt_softc *softc); int bnxt_hwrm_free_wol_fltr(struct bnxt_softc *softc); diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index f82d32c3ff5b..4abd8b425444 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -2134,6 +2134,9 @@ bnxt_media_change(if_ctx_t ctx) if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER) return EINVAL; + softc->link_info.req_signal_mode = + HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_PAM4; + switch (IFM_SUBTYPE(ifm->ifm_media)) { case IFM_100_T: softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; @@ -2189,10 +2192,22 @@ bnxt_media_change(if_ctx_t ctx) break; case IFM_50G_CR2: case IFM_50G_KR2: + case IFM_50G_SR2: softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; softc->link_info.req_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_50GB; break; + case IFM_50G_CP: + case IFM_50G_LR: + case IFM_50G_SR: + case IFM_50G_KR_PAM4: + softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; + softc->link_info.req_link_speed = + HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_50GB; + softc->link_info.req_signal_mode = + HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_PAM4; + softc->link_info.force_pam4_speed_set_by_user = true; + break; case IFM_100G_CR4: case IFM_100G_KR4: case IFM_100G_LR4: @@ -2201,6 +2216,30 @@ bnxt_media_change(if_ctx_t ctx) softc->link_info.req_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_100GB; break; + case IFM_100G_CP2: + case IFM_100G_SR2: + case IFM_100G_KR_PAM4: + case IFM_100G_KR2_PAM4: + softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; + softc->link_info.req_link_speed = + HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_100GB; + softc->link_info.req_signal_mode = + HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_PAM4; + softc->link_info.force_pam4_speed_set_by_user = true; + break; + case IFM_200G_SR4: + case IFM_200G_FR4: + case IFM_200G_LR4: + case IFM_200G_DR4: + case IFM_200G_CR4_PAM4: + case IFM_200G_KR4_PAM4: + softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; + softc->link_info.req_link_speed = + HWRM_PORT_PHY_CFG_INPUT_FORCE_PAM4_LINK_SPEED_200GB; + softc->link_info.force_pam4_speed_set_by_user = true; + softc->link_info.req_signal_mode = + HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_PAM4; + break; default: device_printf(softc->dev, "Unsupported media type! Using auto\n"); @@ -2941,6 +2980,13 @@ bnxt_probe_phy(struct bnxt_softc *softc) struct bnxt_link_info *link_info = &softc->link_info; int rc = 0; + rc = bnxt_hwrm_phy_qcaps(softc); + if (rc) { + device_printf(softc->dev, + "Probe phy can't get phy capabilities (rc: %x)\n", rc); + return rc; + } + rc = bnxt_update_link(softc, false); if (rc) { device_printf(softc->dev, @@ -2949,26 +2995,99 @@ bnxt_probe_phy(struct bnxt_softc *softc) } bnxt_get_port_module_status(softc); + /*initialize the ethool setting copy with NVM settings */ if (link_info->auto_mode != HWRM_PORT_PHY_QCFG_OUTPUT_AUTO_MODE_NONE) link_info->autoneg |= BNXT_AUTONEG_SPEED; link_info->req_duplex = link_info->duplex_setting; + + /* NRZ link speed */ if (link_info->autoneg & BNXT_AUTONEG_SPEED) - link_info->req_link_speed = link_info->auto_link_speed; + link_info->req_link_speed = link_info->auto_link_speeds; else link_info->req_link_speed = link_info->force_link_speed; + + /* PAM4 link speed */ + if (link_info->auto_pam4_link_speeds) + link_info->req_link_speed = link_info->auto_pam4_link_speeds; + if (link_info->force_pam4_link_speed) + link_info->req_link_speed = link_info->force_pam4_link_speed; + return (rc); } +static void +add_media(struct bnxt_softc *softc, uint8_t media_type, uint16_t supported, + uint16_t supported_pam4) +{ + switch (media_type) { + case BNXT_MEDIA_CR: + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_50G, IFM_50G_CP); + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_100G, IFM_100G_CP2); + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_200G, IFM_200G_CR4_PAM4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_CR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_CR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_CR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_CR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_CR1); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_CX); + break; + + case BNXT_MEDIA_LR: + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_50G, IFM_50G_LR); + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_200G, IFM_200G_LR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_LR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_LR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_LR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_LR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_LR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_LX); + break; + + case BNXT_MEDIA_SR: + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_50G, IFM_50G_SR); + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_100G, IFM_100G_SR2); + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_200G, IFM_200G_SR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_SR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_SR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_SR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_SR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_SR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_SX); + break; + + case BNXT_MEDIA_KR: + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_50G, IFM_50G_KR_PAM4); + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_100G, IFM_100G_KR2_PAM4); + BNXT_IFMEDIA_ADD(supported_pam4, PAM4_SPEEDS_200G, IFM_200G_KR4_PAM4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_KR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_KR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_KR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_KR4); + BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_KR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_20GB, IFM_20G_KR2); + BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR); + BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_KX); + break; + + default: + break; + + } + return; + +} + static void bnxt_add_media_types(struct bnxt_softc *softc) { struct bnxt_link_info *link_info = &softc->link_info; - uint16_t supported; - uint8_t phy_type = get_phy_type(softc); + uint16_t supported = 0, supported_pam4 = 0; + uint8_t phy_type = get_phy_type(softc), media_type; supported = link_info->support_speeds; + supported_pam4 = link_info->support_pam4_speeds; /* Auto is always supported */ ifmedia_add(softc->media, IFM_ETHER | IFM_AUTO, 0, NULL); @@ -2977,55 +3096,44 @@ bnxt_add_media_types(struct bnxt_softc *softc) return; switch (phy_type) { + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_200G_BASECR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASECR2: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_50G_BASECR: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASECR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_L: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_S: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASECR_CA_N: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASECR: - BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_CR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_CR2); - BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_CR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_CR); - BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_CR1); - BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_CX); + media_type = BNXT_MEDIA_CR; break; + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_200G_BASELR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASELR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_50G_BASELR: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASELR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASELR: - BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_LR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_LR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_LR); - BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_LR); - BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_LX); + media_type = BNXT_MEDIA_LR; break; + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_200G_BASESR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR10: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASESR4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_50G_BASESR: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASESR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASESR: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_BASEER4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_100G_BASEER4: + case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_200G_BASEER4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_25G_BASESR: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASESX: - BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_SR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_SR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_SR); - BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_SR); - BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_SX); + media_type = BNXT_MEDIA_SR; break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR4: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR2: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKR: - BNXT_IFMEDIA_ADD(supported, SPEEDS_100GB, IFM_100G_KR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_50GB, IFM_50G_KR2); - BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_KR4); - BNXT_IFMEDIA_ADD(supported, SPEEDS_25GB, IFM_25G_KR); - BNXT_IFMEDIA_ADD(supported, SPEEDS_20GB, IFM_20G_KR2); - BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR); - BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_KX); + media_type = BNXT_MEDIA_KR; break; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_40G_ACTIVE_CABLE: @@ -3033,11 +3141,11 @@ bnxt_add_media_types(struct bnxt_softc *softc) BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_AOC); BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_XLAUI); BNXT_IFMEDIA_ADD(supported, SPEEDS_40GB, IFM_40G_XLAUI_AC); - break; + return; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASECX: BNXT_IFMEDIA_ADD(supported, SPEEDS_1GBHD, IFM_1000_CX); - break; + return; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET: case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET: @@ -3047,27 +3155,39 @@ bnxt_add_media_types(struct bnxt_softc *softc) BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_T); BNXT_IFMEDIA_ADD(supported, SPEEDS_100MB, IFM_100_T); BNXT_IFMEDIA_ADD(supported, SPEEDS_10MB, IFM_10_T); - break; + return; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASEKX: BNXT_IFMEDIA_ADD(supported, SPEEDS_10GB, IFM_10G_KR); BNXT_IFMEDIA_ADD(supported, SPEEDS_2_5GB, IFM_2500_KX); BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_KX); - break; + return; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_SGMIIEXTPHY: BNXT_IFMEDIA_ADD(supported, SPEEDS_1GB, IFM_1000_SGMII); - break; + return; case HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_UNKNOWN: /* Only Autoneg is supported for TYPE_UNKNOWN */ - device_printf(softc->dev, "Unknown phy type\n"); - break; + return; default: /* Only Autoneg is supported for new phy type values */ device_printf(softc->dev, "phy type %d not supported by driver\n", phy_type); - break; + return; + } + + /* add_media is invoked twice, once with a firmware speed mask of 0 and a valid + * value for both NRZ and PAM4 sig mode. This ensures accurate display of all + * supported medias and currently configured media in the "ifconfig -m" output + */ + + if (link_info->sig_mode == BNXT_SIG_MODE_PAM4) { + add_media(softc, media_type, supported, 0); + add_media(softc, media_type, 0, supported_pam4); + } else { + add_media(softc, media_type, 0, supported_pam4); + add_media(softc, media_type, supported, 0); } return; @@ -3166,6 +3286,7 @@ bnxt_report_link(struct bnxt_softc *softc) { struct bnxt_link_info *link_info = &softc->link_info; const char *duplex = NULL, *flow_ctrl = NULL; + const char *signal_mode = ""; if (link_info->link_up == link_info->last_link_up) { if (!link_info->link_up) @@ -3190,9 +3311,27 @@ bnxt_report_link(struct bnxt_softc *softc) flow_ctrl = "FC - receive"; else flow_ctrl = "FC - none"; + + if (softc->link_info.phy_qcfg_resp.option_flags & + HWRM_PORT_PHY_QCFG_OUTPUT_OPTION_FLAGS_SIGNAL_MODE_KNOWN) { + uint8_t sig_mode = softc->link_info.active_fec_sig_mode & + HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_MASK; + switch (sig_mode) { + case BNXT_SIG_MODE_NRZ: + signal_mode = "(NRZ) "; + break; + case BNXT_SIG_MODE_PAM4: + signal_mode = "(PAM4) "; + break; + default: + break; + } + link_info->sig_mode = sig_mode; + } + iflib_link_state_change(softc->ctx, LINK_STATE_UP, IF_Gbps(100)); - device_printf(softc->dev, "Link is UP %s, %s - %d Mbps \n", duplex, + device_printf(softc->dev, "Link is UP %s %s, %s - %d Mbps \n", duplex, signal_mode, flow_ctrl, (link_info->link_speed * 100)); } else { iflib_link_state_change(softc->ctx, LINK_STATE_DOWN, @@ -3378,7 +3517,7 @@ bnxt_def_cp_task(void *context) softc->db_ops.bnxt_db_rx_cq(cpr, 1); } -static uint8_t +uint8_t get_phy_type(struct bnxt_softc *softc) { struct bnxt_link_info *link_info = &softc->link_info; @@ -3471,6 +3610,8 @@ bnxt_get_baudrate(struct bnxt_link_info *link) return IF_Gbps(100); case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_10MB: return IF_Mbps(10); + case HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_200GB: + return IF_Gbps(200); } return IF_Gbps(100); } From nobody Thu Mar 7 19:27:18 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrK7W0lh4z5DfYB; Thu, 7 Mar 2024 19:27:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrK7V6GfQz4b8k; Thu, 7 Mar 2024 19:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWznjpacpr2yCAZdJ0wXDn0NXaTJ4asZVXuLynak2wM=; b=gQ2vhQTHhzgl7Vmc0nqH4PLj0KvEr2gV1oNfJaU/wcY1eYArqjymt6DUPqVjVu7OBGi4UX AZP6kRUP0LqBnvNwSUy8gPpsNffvAIjMlkFdT7KHF5RUqz98d5U5IDYAsA1z/8b5u36DU5 2pnQ2cjdnshwshu4DfEGS8QOmYdFEco9gUT7sQx7zIL9Jks+ncb/F6iWxnpXQfkgwtb3ZH zT6yn7WlK1O04Io0002vQnCpIjZ9vGUaWA7MuZ5XglKtN40hFszFqVIE70/JdK1sqHjcwz CEGkZ/E3z5+PynDi5TImBdnkdtSf9uLUVbot1EL48ImEpBTdmcRjm6PzdrWTYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709839638; a=rsa-sha256; cv=none; b=VmHmpNmapigMytdxGkV70hmp53opOGPK9KeoR8lEIBiJ+iNn9tQbPX5rKdP+A4dSijcLJt FgxKkoxLgS2UtUSIjQ+/0XTLxI3znSFhqDCcLCbJ8DmIL3/4QEFsVpH31IDSLwG6yp5ckY dJYU6nu31z8YGB7ZTHVGXktQyamOBxkh46kZZqVotYV017qYbAIUkcjvSHivi5if6TAmN6 1X+6eYZ/XyUzzYsVBv+CR5egVMXK0yHPjV+8oKyrEwX9DZz0X7a+v1P5bJPYA+1kMNabxH wmqYWQRl8vdBn+PvzQV49wqZiY4uK/3nERfZvcEzu3Frifk8EPariU7X0ZwXVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709839638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cWznjpacpr2yCAZdJ0wXDn0NXaTJ4asZVXuLynak2wM=; b=vpSUG8l5pgNfnrVvoFtw2lDIVs50y+Kab7aJsIo5Yu49B3DHhTJb7+oAyiQXrufEqApiil b0DCT674VoEXUfz9HSa+WFAwyqCh1ESkSouivbUhmq4IoBTPsOIKCGzicV3b5UP9QjdJ2G WTaNe9IBSGN1VFFx5SRBtfgSsStTmHtPNsVFyX23oJ6hjhyNeVcyeD0C3oZdJVp0y8ZELM 5oJcyDLlWj56Dj4XUdPry6Ne00Hva/QyXLln8w4sV3qGhqaYgcX34+K+k1CaktdCuuGKZh kvAnvrxe34cTLb7l5omvenxBSdjwT1R87xgY66nDgLAFHvm2d/WVuW9hcl/rDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrK7V5ttvzn3l; Thu, 7 Mar 2024 19:27:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JRIqN064516; Thu, 7 Mar 2024 19:27:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JRIrX064513; Thu, 7 Mar 2024 19:27:18 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:27:18 GMT Message-Id: <202403071927.427JRIrX064513@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 770e7ba3ebe8 - main - if_bnxt: Set 1G/10G baseT force speed as auto speeds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 770e7ba3ebe87ba7ffc872c87de72707757b4e25 Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=770e7ba3ebe87ba7ffc872c87de72707757b4e25 commit 770e7ba3ebe87ba7ffc872c87de72707757b4e25 Author: Chandrakanth Patil AuthorDate: 2024-03-06 13:23:04 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:26:34 +0000 if_bnxt: Set 1G/10G baseT force speed as auto speeds The firmware lacks support for manually setting 1G and 10G baseT speeds. However, the driver can enable auto speed masks to achieve automatic configuration at these speeds. Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42960 --- sys/dev/bnxt/bnxt.h | 1 + sys/dev/bnxt/bnxt_hwrm.c | 16 ++++++++++++++-- sys/dev/bnxt/if_bnxt.c | 11 ++++++++--- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index 204284d45428..0547bae91e09 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -843,5 +843,6 @@ struct bnxt_softc *bnxt_find_dev(uint32_t domain, uint32_t bus, uint32_t dev_fn, int bnxt_read_sfp_module_eeprom_info(struct bnxt_softc *bp, uint16_t i2c_addr, uint16_t page_number, uint8_t bank, bool bank_sel_en, uint16_t start_addr, uint16_t data_length, uint8_t *buf); +uint8_t get_phy_type(struct bnxt_softc *softc); #endif /* _BNXT_H */ diff --git a/sys/dev/bnxt/bnxt_hwrm.c b/sys/dev/bnxt/bnxt_hwrm.c index 481d45350488..37238b857ef5 100644 --- a/sys/dev/bnxt/bnxt_hwrm.c +++ b/sys/dev/bnxt/bnxt_hwrm.c @@ -862,8 +862,20 @@ bnxt_hwrm_set_link_common(struct bnxt_softc *softc, uint16_t fw_link_speed = softc->link_info.req_link_speed; if (autoneg & BNXT_AUTONEG_SPEED) { - req->auto_mode |= - HWRM_PORT_PHY_CFG_INPUT_AUTO_MODE_ALL_SPEEDS; + uint8_t phy_type = get_phy_type(softc); + + if (phy_type == HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_1G_BASET || + phy_type == HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASET || + phy_type == HWRM_PORT_PHY_QCFG_OUTPUT_PHY_TYPE_BASETE) { + + req->auto_mode |= htole32(HWRM_PORT_PHY_CFG_INPUT_AUTO_MODE_SPEED_MASK); + if (link_info->advertising) { + req->enables |= htole32(HWRM_PORT_PHY_CFG_INPUT_ENABLES_AUTO_LINK_SPEED_MASK); + req->auto_link_speed_mask = htole16(link_info->advertising); + } + } else { + req->auto_mode |= HWRM_PORT_PHY_CFG_INPUT_AUTO_MODE_ALL_SPEEDS; + } req->enables |= htole32(HWRM_PORT_PHY_CFG_INPUT_ENABLES_AUTO_MODE); diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index 4abd8b425444..9fd76301d6b3 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -219,7 +219,6 @@ static void bnxt_mark_cpr_invalid(struct bnxt_cp_ring *cpr); static void bnxt_def_cp_task(void *context); static void bnxt_handle_async_event(struct bnxt_softc *softc, struct cmpl_base *cmpl); -static uint8_t get_phy_type(struct bnxt_softc *softc); static uint64_t bnxt_get_baudrate(struct bnxt_link_info *link); static void bnxt_get_wol_settings(struct bnxt_softc *softc); static int bnxt_wol_config(if_ctx_t ctx); @@ -2144,7 +2143,6 @@ bnxt_media_change(if_ctx_t ctx) HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_100MB; break; case IFM_1000_KX: - case IFM_1000_T: case IFM_1000_SGMII: case IFM_1000_CX: case IFM_1000_SX: @@ -2163,7 +2161,6 @@ bnxt_media_change(if_ctx_t ctx) case IFM_10G_KR: case IFM_10G_LR: case IFM_10G_SR: - case IFM_10G_T: softc->link_info.autoneg &= ~BNXT_AUTONEG_SPEED; softc->link_info.req_link_speed = HWRM_PORT_PHY_CFG_INPUT_FORCE_LINK_SPEED_10GB; @@ -2240,6 +2237,14 @@ bnxt_media_change(if_ctx_t ctx) softc->link_info.req_signal_mode = HWRM_PORT_PHY_QCFG_OUTPUT_SIGNAL_MODE_PAM4; break; + case IFM_1000_T: + softc->link_info.advertising = HWRM_PORT_PHY_CFG_INPUT_AUTO_LINK_SPEED_MASK_1GB; + softc->link_info.autoneg |= BNXT_AUTONEG_SPEED; + break; + case IFM_10G_T: + softc->link_info.advertising = HWRM_PORT_PHY_CFG_INPUT_AUTO_LINK_SPEED_MASK_10GB; + softc->link_info.autoneg |= BNXT_AUTONEG_SPEED; + break; default: device_printf(softc->dev, "Unsupported media type! Using auto\n"); From nobody Thu Mar 7 19:34:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrKJJ22G9z5DgTn; Thu, 7 Mar 2024 19:34: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 4TrKJJ1V36z4f34; Thu, 7 Mar 2024 19:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709840096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9ZLeToDzkD0QmalD8+ANt2s4FYZiinvduoYBoJ75rs=; b=IEK2bEcTYBEa4/Pdj4YJkxAypMIdWzAlHzK5Ye2ARiVxr4Dr3aQ9lQGwS7qpvMtVVBXrbo 4XnukltmI/m3CAemsYiRPKWPiYN5Qe53plK2BgHAnP/pqC+EaTyaNxbTXBgS903p//f/CW cC7jk1ahCmLwaOVVax9+57AX2HfnrorNzO3di0TO9BCLZv7hWfTKbAGk4GsLiS6WioxsbG Gtbk2Jp5BE29A7YQVPeoqT39n5f83QD+igoQ8cCWMJyi+mMq0fFEkeaefoWg/jq8zmr1Qa ajlons6Jzyel+tfpwLmzLxK8TvgZjo3YNYxXHDVqih68oFwbc8oo6bqpBBZR2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709840096; a=rsa-sha256; cv=none; b=hjuOAkZE/ZlAcAZlUcN2AeZhyh0evztobbkJgokvGGCbcAvTy5/kbAIVfnTrEm6Y1vuVSu pR/kSm3+Vv8Pl6oKoW8JhSMjlJXW9R5RFDUbaletjA+XI9dzT+KLGwNCW5k1mKn8mBcecl Ad7A1/OOGQojuftW8eBhrFRxJ4Bq7kumkPAK32iXqTaF08kpsvnlZGNDArUIEpbmqGTGxH AKVZuMWGnNAlLYDUSPlMbJPYB0qHJwrsyZFan8uipw2cJC7LIt2MOepYaVHB/BvKN870K4 TcseLC6kWAmjCY6rM4IXzD5/vmyHtncK67BLYPxmnmw954dtWoNA6jJLJaRvfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709840096; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C9ZLeToDzkD0QmalD8+ANt2s4FYZiinvduoYBoJ75rs=; b=Oh0Qgbe+IoD1BY5FzKfUHtt0YtbFlk/OWjVhwGFl8JXygyA7DqPyGGLM1JgpIi4olQiXxv gagC5RqmfNmqcoQaH76VHtB8dh9yUniFyV9Pk9OccvSwQD5Y/8Gq96KP9rvF7pFKtEGqtW DikKC18wgt03vye19igI4Ik2NnB1lWvzEDaHActbzESNE41OFqs1N9U1b3Y2eXxqjNczz7 8+4mLUjj/yixshXSvemO+X2uew4Z/Cpe0JHTv436rHtfQMz0noYw9Vaibc10PkdbqOMTmM Yf88prG03bPLcA85Dgrt8/t0eFuia7C9nw9Xcqn4E6I33JPhYPAVBGm2pQwbkQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrKJJ0z19znXC; Thu, 7 Mar 2024 19:34:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427JYuS9080530; Thu, 7 Mar 2024 19:34:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427JYtN4080527; Thu, 7 Mar 2024 19:34:55 GMT (envelope-from git) Date: Thu, 7 Mar 2024 19:34:55 GMT Message-Id: <202403071934.427JYtN4080527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Sumit Saxena Subject: git: 72ecb165a206 - main - amend! if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ssaxena X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ecb165a206cbedce6900f1ec09d5c1d865e8fa Auto-Submitted: auto-generated The branch main has been updated by ssaxena: URL: https://cgit.FreeBSD.org/src/commit/?id=72ecb165a206cbedce6900f1ec09d5c1d865e8fa commit 72ecb165a206cbedce6900f1ec09d5c1d865e8fa Author: Sumit Saxena AuthorDate: 2024-03-07 19:33:40 +0000 Commit: Sumit Saxena CommitDate: 2024-03-07 19:34:12 +0000 amend! if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed Reviewed by: imp Approved by: imp Differential revision: https://reviews.freebsd.org/D42956 From nobody Thu Mar 7 19:38:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrKNf5vPbz5DgVJ for ; Thu, 7 Mar 2024 19:38:42 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrKNf1p2gz4f6v for ; Thu, 7 Mar 2024 19:38:42 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-il1-x132.google.com with SMTP id e9e14a558f8ab-36576b35951so5824755ab.3 for ; Thu, 07 Mar 2024 11:38:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1709840320; x=1710445120; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=RrzGgYLLX3p2DotU1B3jcwFCeY93GLStZDwgB33ib7U=; b=bikKZbEf/JcdHKuSjA4TQMiKBV83T/fzP8CNFO9JCz7IuRbjXLBEoinYpj4zUd7rPo Ttzzp3QcbRKgSDgtC6UhBeGv+yvC3Emg+Z30EjdmnchTWGAj/p0NZEY0FUZwP4+i+5t3 E/XY5f1Mqd93c/hfgq6Oqbwa+i7TPi9M4V+t+7JQ8UBARIyzzMUBJoudw1s0yvW9LPpz ZqBmDAdj767vCOmQi/tWHyrT2aePekYy7pQI8apv/OLJ1KtfiI2VG33BJ5ETEhd0m07W PChudcTVOzP69Ee8G5hCcaRYxDGIGelwd9QOWWk0UgT0A1aJgt4lNcH6yXnJZPk7BG5x o3fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709840320; x=1710445120; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RrzGgYLLX3p2DotU1B3jcwFCeY93GLStZDwgB33ib7U=; b=fTtzM2isYNXNzFAnxGzRah1Yl0P0KJF24bkaNiNP0in/TP4sL9mcc+DQnispCvFHeo 6U15mz9xDDwLiMyJWZUzVTfmaIPJZC7bqAt/4xnm1Ar9Dd+Whv3x+ltgIJqekKZaVZ45 fIKcSsh0lkpuFhMtVgJfB6Z5j3ymBGB8gOlOOdyILXkmq9UwEyNOQbZLagdAf6n0beHH nFsGoWC050bnCZ4fpnSjdXo2oMz40OFPdnCimWBUs/fU+Em7YZ1/HMv4OAnp0J4U3bHH nE9jDEDqHuXhnoVYh2u87KN7YB7rOAr8VkBrMFRJO1K0uzf4LnPUSTPnuxAx+sdCZ+e1 60Qw== X-Forwarded-Encrypted: i=1; AJvYcCWeoHVstdg5yAE+cPbWT1BMPN70KTU+9iUwxhIhwQ3yuQhoTU5f5w3cd/7Nm4/TJjji4ZbheulIaWzVAidTTSL1rcwXJuO+aT4DVcgGuGHc X-Gm-Message-State: AOJu0YxgMCaUhXLokWFRipDBlBNWPHCZERe6XSF90vuXWLe5T/npgadq jZzpkJgh2SUxwz45rNfWThZCiHRryT2hflXORv1YBqH57D+2Imdr6bKYsUevqiM= X-Google-Smtp-Source: AGHT+IHXIaIv1DXqnnmWdqLHyXXSGCUlgpuv2sNKLyKvSsLSQ3rt67FZ4TxgtIXXSwFICzkaYAZ03g== X-Received: by 2002:a05:6e02:1807:b0:365:69a:86b2 with SMTP id a7-20020a056e02180700b00365069a86b2mr25978479ilv.17.1709840320630; Thu, 07 Mar 2024 11:38:40 -0800 (PST) Received: from mutt-hbsd (174-24-72-211.clsp.qwest.net. [174.24.72.211]) by smtp.gmail.com with ESMTPSA id u7-20020a02b1c7000000b00474a1ac6434sm4094635jah.162.2024.03.07.11.38.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 11:38:39 -0800 (PST) Date: Thu, 7 Mar 2024 19:38:39 +0000 From: Shawn Webb To: Sumit Saxena Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 72ecb165a206 - main - amend! if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed Message-ID: X-Operating-System: FreeBSD mutt-hbsd 15.0-CURRENT-HBSD FreeBSD 15.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <202403071934.427JYtN4080527@gitrepo.freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="pgmacibhacvzllrf" Content-Disposition: inline In-Reply-To: <202403071934.427JYtN4080527@gitrepo.freebsd.org> X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4TrKNf1p2gz4f6v --pgmacibhacvzllrf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 07, 2024 at 07:34:55PM +0000, Sumit Saxena wrote: > The branch main has been updated by ssaxena: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D72ecb165a206cbedce6900f1ec= 09d5c1d865e8fa >=20 > commit 72ecb165a206cbedce6900f1ec09d5c1d865e8fa > Author: Sumit Saxena > AuthorDate: 2024-03-07 19:33:40 +0000 > Commit: Sumit Saxena > CommitDate: 2024-03-07 19:34:12 +0000 >=20 > amend! if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed > =20 > if_bnxt: Integrate AOC Cable Support into Current 40G PHY Speed > =20 > Reviewed by: imp > Approved by: imp > Differential revision: https://reviews.freebsd.org/D42956 >=20 Hey Sumit, What's the purpose of this commit? 0 files changed. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 303-901-1600 / shawn_webb_opsec.50 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --pgmacibhacvzllrf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmXqF6gACgkQ/y5nonf4 4fq7pA/8C1FqEG5a5wNR6QuLuckoVgmxkCklUCwnIopo7oF8NjqWKCDFFftc07qr /YfXTBtG9OsGxTz5E+hKi6/QiRmxs3KodzENa3iq0NbBjop0RKx6/E0fMB7UyCAU uoyMKNV9IL8JdU2sQ3Ifh2d7oA7xnhBnlbpVznbIY+IM1OYcCuVqqaWWEScAbPkh t4fKvBe9Uvz5WCwVWil2KBjU0+Z943auVNGKtZ0qs8XV8mHeurAIELqNoX+hb2tZ ftOQdUkRDWuaVuaB2CqAS4QQQhwwRgpBWKx+3vnHfZ/HPK3XYP/RSI0nT7SR1XGN sCkauRFaaqoRFkTG/2jpDShREpBEKURmxz5JIU352ydkYYAaNX+5U1J4snZGa685 xwOsjl6+bvLRP4XTZjfWvI2Xxk6vegTPYodOyQZs6ZuMXu8eOibnV5m6qFUMHJ2X caPLKuppNuPxP5LCNmo5FrdMptbO7vfNg9t2ifCOiqAx558awpb7OSinRysLUKoM EbvBRQiTfqOJuqRjrFaMGBhriHBahYfd/q5tQ2t8Qs6PkZ4oB5sjBiQ09Mz841Qd hq2x2Cy74+68UaW94zPmq8GhI9vSmEg3gUa4bKkig8IGVKGhAufti1oGt9lQfXwd mHK2/ygAr767lJVP2aArVQsn8rV3P3ftKA4jZYrYzHy4LBnSifA= =haok -----END PGP SIGNATURE----- --pgmacibhacvzllrf-- From nobody Thu Mar 7 20:12:38 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrL7q1kc7z5Dk6W; Thu, 7 Mar 2024 20:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrL7q18DTz4kgT; Thu, 7 Mar 2024 20:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOJ2VWGWjm30LWFeDtQLOe78esgiBLy40vHYiVDB1+Q=; b=pnsgLFcW2m3d537WZJnIQKwHZtcnbK4kwHlKZgOA1ITolbpArZfLWUQsCDjfeRdPx+qOc1 pkrHB5sZxhbNIjVGsdVFGGqCtvfMjzAAA4EkpPkUBd20JmIgxmRGaoC2oH0A9Dcw7JkAcO K332l6Pvbx5HtfXC7ZlqZaVCnelqtGY1T+JMh0ybPAKESwKbOLS+SFAnkN8udqdusP4Y8P +sxHYJnLbIvropGD5+sQFae9qJ/r3UlP12snFl/T/hr90p5jLdIEc+odR+20OumVaWN6Sm RzVvpWfheqC+4Ve0qjDHEr6O4Y/CNTE9JtjJRsc5g/QAZOlHe6e1SHQ14n4ohg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709842359; a=rsa-sha256; cv=none; b=Gh/C4BN08Ed988g2z3qXRe7K/hPzEWHs3vcpKzaLQ0uKxcOuQkqkKXRcYdexzfdGfd+/8F XX/QOrcVpyS/iaTXmDZJFV/tBe+BkA6wPS1lUvmM5eO9v5+CzEDobZ5Yo5G5n10RsdF8Tc K+BsZltnOdboVQkucpgQn1/j/N/rvVkBv+359nNa/WyEU1mvXgCdQ3R6iUZjbDIIlr67ut /IzSDbxt08Q9nfs57O7cpdcDpc7ykZ++row6FABpSll4emDbWKXVA+grJwT7z+7DvBlj0A JlzND8S6Ht/XqMkrUTZj5Zr+2KxukOAohULXwAbgxdJW+zsvB16XFIzvcsWT/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842359; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dOJ2VWGWjm30LWFeDtQLOe78esgiBLy40vHYiVDB1+Q=; b=AJnyECBWBQFCxA0HvemqH4l6o8kXnXuX/3lPaFdClyDML1BSfMC3qnBCVOTrOiRtgtweyV tNNQtGWnJ8ES2eavRdRsNoC0bLEZh7yio6e7xYCioYRU2ntQTFdMUvbWdk1ceeBU1L8a9u zEquDiX5v9WQtyanjm0GtIoTzRBYGqSUL6QvYBNAL0tS2Zd1qctsSpVMDSNc2WRR0YgVC0 p8RahXR206lcMNizV9PwgT3r44rrXiBCCNpsl2h4dWMDMliZnkdUURRKby7rNK3XIvvr85 XgMHcIcBdcX+/wlPWHTKB0X5MrXG8noGVJlE0Ldq4/AyXOLXsrPL1acEXIKaFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrL7q0McXzpZF; Thu, 7 Mar 2024 20:12:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427KCcKv048180; Thu, 7 Mar 2024 20:12:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427KCchr048177; Thu, 7 Mar 2024 20:12:38 GMT (envelope-from git) Date: Thu, 7 Mar 2024 20:12:38 GMT Message-Id: <202403072012.427KCchr048177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 8c8882ce9673 - main - libc/iconv: don't export nonexistant symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c8882ce96738f474ac1c537b878be12b2f466ce Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=8c8882ce96738f474ac1c537b878be12b2f466ce commit 8c8882ce96738f474ac1c537b878be12b2f466ce Author: Brooks Davis AuthorDate: 2024-03-07 20:08:38 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 20:12:22 +0000 libc/iconv: don't export nonexistant symbols It's unclear to me that any of these symbols ever existed. The ones I've spot checked are only mentioned in the initial Citrus iconv import (commit ad30f8e79bd1) and this code hasn't changed much over time. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44183 --- lib/libc/iconv/Symbol.map | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/lib/libc/iconv/Symbol.map b/lib/libc/iconv/Symbol.map index 49dd63aca9da..d36e0733a4f0 100644 --- a/lib/libc/iconv/Symbol.map +++ b/lib/libc/iconv/Symbol.map @@ -15,15 +15,6 @@ FBSD_1.3 { FBSDprivate_1.0 { _citrus_bcs_convert_to_lower; _citrus_bcs_convert_to_upper; - _citrus_bcs_isalnum; - _citrus_bcs_isalpha; - _citrus_bcs_isblank; - _citrus_bcs_isdigit; - _citrus_bcs_iseol; - _citrus_bcs_islower; - _citrus_bcs_isspace; - _citrus_bcs_isupper; - _citrus_bcs_isxdigit; _citrus_bcs_skip_nonws; _citrus_bcs_skip_nonws_len; _citrus_bcs_skip_ws; @@ -32,12 +23,8 @@ FBSDprivate_1.0 { _citrus_bcs_strncasecmp; _citrus_bcs_strtol; _citrus_bcs_strtoul; - _citrus_bcs_tolower; - _citrus_bcs_toupper; _citrus_bcs_trunc_rws_len; - _citrus_bcs_trunc_ws_len; _citrus_csmapper_open; - _citrus_csmapper_close; _citrus_db_factory_add_by_string; _citrus_db_factory_add_string_by_string; _citrus_db_factory_add32_by_string; @@ -59,41 +46,16 @@ FBSDprivate_1.0 { _citrus_lookup_factory_convert; _citrus_map_file; _citrus_mapper_close; - _citrus_mapper_convert; _citrus_mapper_create_area; - _citrus_mapper_get_dst_max; - _citrus_mapper_get_src_max; - _citrus_mapper_get_state_size; - _citrus_mapper_init_state; _citrus_mapper_open; _citrus_mapper_open_direct; _citrus_mapper_set_persistent; - _citrus_memory_stream_bind; _citrus_memory_stream_chr; - _citrus_memory_stream_getc; _citrus_memory_stream_getln; - _citrus_memory_stream_getln_region; - _citrus_memory_stream_getregion; - _citrus_memory_stream_iseof; _citrus_memory_stream_matchline; - _citrus_memory_stream_peek; - _citrus_memory_stream_remainder; - _citrus_memory_stream_rewind; - _citrus_memory_stream_seek; _citrus_memory_stream_skip_ws; - _citrus_memory_stream_tell; - _citrus_memory_stream_ungetc; _citrus_pivot_factory_convert; - _citrus_prop_object_init; - _citrus_prop_object_uninit; _citrus_prop_parse_variable; - _citrus_prop_read_bool; - _citrus_prop_read_character; - _citrus_prop_read_character_common; - _citrus_prop_read_element; - _citrus_prop_read_num; - _citrus_prop_read_str; - _citrus_prop_read_symbol; _citrus_stdenc_close; _citrus_stdenc_open; _citrus_unmap_file; From nobody Thu Mar 7 20:12:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrL7r1qq0z5DkLB; Thu, 7 Mar 2024 20:12: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 4TrL7r1QHYz4kyS; Thu, 7 Mar 2024 20:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwOrYCyXxWoBDWF8Dw+vjGyM0rrhDdVRgPOWTa054WM=; b=pG8vcT4dTeSzyDC2v/Y1X9zO1qAlMeMER8nE/HRIMX990ccnQGe3/SZTSxBoRcpS8eLR91 qCpo5oDU1zcHF/4En6hYZSkHEEnUbzQqhifpxpvg5PBOUiLDnogT7+dyr9rFlFRV7I4W0L 3bqL8wkFSKY8c5ZtpgHtKK6maerkGD9D0X+t6KUhq2AO+OvWjSlBAsy1pP+gpj7E8NkKQ5 EwDvzK0iqvZ10TRYsoY4rB+igT9mpvJ6Nq2tm3pMcFZbFM/RDIggW9owg9sVKNhOk62j7V MAOH/YZVheeEsZewGpS9hVPCidX488iXwqFImpHC7HaoV3fxO691SOClVln8mg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709842360; a=rsa-sha256; cv=none; b=qKG7ej3iROPQZ6CAMTwT4meBxx2v2t7k0aV1pWU6a7PnDTBUwz1fXJtO9xz6e4RemZ0pTj xfogjq2rAzsldXltDjAbOHgvello4Km/WVqCl89N8VTKEQORkGE9irlhwfLDxlE0rq7IEK umEYRKw709gfaDPhdq+Hsm/7OlC7Dy7X6/3zuH2dnlXXXxjfHto6I6Wk8HWv9ENavJ9SvE KHHfQwqQTiLFI7+PhXHE368TpKUyhFgkYECSxq3DZWbk8r1XVhiQj+Vy40L0g5gl5nVcQ+ 6D/gdVwd7O+UiuXT6bd/cXTGlCGENy9U66tqcyODhHBxHje8hFa9PmU8ff51ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwOrYCyXxWoBDWF8Dw+vjGyM0rrhDdVRgPOWTa054WM=; b=p8xOq9o7Q0R37G9h86JZI6R9piflClz0ODE6g+HPszt4kV9S4xkCTyD7kLo80PvBEmKk1A zC3IjB/DGXSfwf23d2KiaA43FdE5UHvxmdKXSL9htjL31QABkpWiMxPdNVvV7tz28qK3ve 4lfTwopd8tyaQCc0T1mP2nRDsVrmDAJ35N+y9POQ33Pu+WGeqhVLX6YufLMrL+esCpOMOJ Npt0H3kS/qIqeT2x059Fsp1lqLW+g9kCchPzZh9Pbw2A9N5YP46UOUMNGf6gEBlaif1o6E /T4bBNtYINL3LlpsIThkfAY/VCPRCCBqCdjoy1oK8tM0KOT5fekKJuvpQQ1LeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrL7r11vbznW8; Thu, 7 Mar 2024 20:12:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427KCeaf048238; Thu, 7 Mar 2024 20:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427KCeW8048235; Thu, 7 Mar 2024 20:12:40 GMT (envelope-from git) Date: Thu, 7 Mar 2024 20:12:40 GMT Message-Id: <202403072012.427KCeW8048235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 6e6cd03c911c - main - libc/quad: narrow list of symbols exposed on i386 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e6cd03c911c0f226e284fc0c5c5ca5e30bea2e9 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6e6cd03c911c0f226e284fc0c5c5ca5e30bea2e9 commit 6e6cd03c911c0f226e284fc0c5c5ca5e30bea2e9 Author: Brooks Davis AuthorDate: 2024-03-07 20:09:00 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 20:12:22 +0000 libc/quad: narrow list of symbols exposed on i386 These symbols aren't present on i386 so don't try to expose them. Given the structure of quad/Makefile.inc, it might make more sense to have per-arch symbol maps here, but this is sufficent to build with WITHOUT_UNDEFINED_VERSION on i386. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44243 --- lib/libc/quad/Symbol.map | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/libc/quad/Symbol.map b/lib/libc/quad/Symbol.map index 86fc2ee9c334..81f794acd498 100644 --- a/lib/libc/quad/Symbol.map +++ b/lib/libc/quad/Symbol.map @@ -5,8 +5,10 @@ FBSD_1.0 { * broken and they expect to see them in libc. glibc exports * them, but they do not appear to be exported in Solaris. */ +#ifndef __i386__ __adddi3; __anddi3; +#endif __ashldi3; __ashrdi3; __cmpdi2; @@ -17,18 +19,26 @@ FBSD_1.0 { __fixunssfdi; __floatdidf; __floatdisf; +#ifndef __i386__ __floatunsdidf; __iordi3; __lshldi3; +#endif __lshrdi3; __moddi3; __muldi3; __negdi2; +#ifndef __i386__ __one_cmpldi2; +#endif __qdivrem; +#ifndef __i386__ __subdi3; +#endif __ucmpdi2; __udivdi3; __umoddi3; +#ifndef __i386__ __xordi3; +#endif }; From nobody Thu Mar 7 20:15:16 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrLBr5x54z5DkWX; Thu, 7 Mar 2024 20:15: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 4TrLBr59Kmz4lSK; Thu, 7 Mar 2024 20:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Y7wZnffDEMBohY76b0E7/bTsqdKdyWIzlBQpd8aCwk=; b=MM0TSkOmhXbcZPedlp09SBxBXhmbbMsdRTq/uEN1aYmY6G9s1l0Y8xsSUdAkYrbZbAt4yb UghfSG9h9n6xJwNPNYrFRtCbQA/6ujaYaQoHdlff/iFdIg3sIvo1ry5UAJk4N2i1Mj1svP AdGjiV7inB2T5ViFgcdzbFyDPKoU8HN9hDLRmFTb6jI+nqG4YYkkJ95Y3VkkF4sa51JkQh 8iQ4eDHqsjtiNoppI8F0e0DNo7HYGQgud+Laaq95mOUvHWrcz9W99OePnwjZqSs26kRRmM 97gCxUMjJPJfH6JVo/w6i9Lua5jioOwEs+SXj9ZeSCvh/a5M7iDUsGCOOrOGJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709842516; a=rsa-sha256; cv=none; b=SYbjM3VmuyZ8Rro1dp73FPQtz9qODyq+qdpRiPTLE4bi/9XSPfvK2Gw0OVOnUW2juDIPzY al5p8dBfv4jUPbCZlpdwyBrE8xKtCKLT8p+AM0zkCjQ88aZQTMhFEdXieaCTQ34y8CXnqQ +tD8v6/iXocrkXAC42tckpomcOB95HeGmEnLHUCpneKlfU4eObcprt4+vvZrmvqAa9d8Oc CxHvjVxgMehaO6qqkRpfGQ1hRYkg334dakm/qCMiLRJnfV5fRwNIpA62j0pknngoCDMSXw JoMHztj5jW9ZYkH39oJAMQccdww+3p4LF7tFL5KtIyL26kcPu1SD63j/DHmtug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709842516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Y7wZnffDEMBohY76b0E7/bTsqdKdyWIzlBQpd8aCwk=; b=jxlIveXqyikMVbe2Wp+ymG/wP0qtVAupvRmYkYgnBh8skOQ66xfk2vSQlIf2D5MHXUJtLG K0tPiJ6I3mGr+1pEfNDH8FREoWe4nal6vxkH/hPLTT8K8iWA4CsvAxtSO9gIHb2+Xl1IY5 Cb5E6kE8nvUkN25wbBvxDBFM7OaOJRvbSUYSWhhfsK27bQTV8i/Kqq/xW6fgbfWHpj4QWZ Kgc+Jy31pTX0RwaJS+PBvzzaD/xuVbeNKpQ32Skn4Itj5vMT4Nc/rk9BQDcwvBqTCuqSJw TobXmTuOclnBmoTbHJ0VV2JksvHh1Zg8Bic3c7gyTpZCci4aHWIJhLdyWfCSmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrLBr4mvSzpWF; Thu, 7 Mar 2024 20:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 427KFGmW048735; Thu, 7 Mar 2024 20:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 427KFGOp048732; Thu, 7 Mar 2024 20:15:16 GMT (envelope-from git) Date: Thu, 7 Mar 2024 20:15:16 GMT Message-Id: <202403072015.427KFGOp048732@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 32c7350beb82 - main - libc/i386: don't attempt to export alloca List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 32c7350beb82c0c6f4a2b06afc2369e313126cae Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=32c7350beb82c0c6f4a2b06afc2369e313126cae commit 32c7350beb82c0c6f4a2b06afc2369e313126cae Author: Brooks Davis AuthorDate: 2024-03-07 20:14:55 +0000 Commit: Brooks Davis CommitDate: 2024-03-07 20:14:55 +0000 libc/i386: don't attempt to export alloca The assembly implementation was removed in 2006 (commit 3c03c7095e7e). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D44242 --- lib/libc/i386/Symbol.map | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/i386/Symbol.map b/lib/libc/i386/Symbol.map index 270ba4b129a7..2278db54c583 100644 --- a/lib/libc/i386/Symbol.map +++ b/lib/libc/i386/Symbol.map @@ -5,7 +5,6 @@ */ FBSD_1.0 { .mcount; - alloca; __flt_rounds; ___tls_get_addr; }; From nobody Fri Mar 8 05:55:27 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trb4H1zVmz5CwXg; Fri, 8 Mar 2024 05:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Trb4H1P5xz4dG9; Fri, 8 Mar 2024 05:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709877327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2gqIHriwJPcDhw86dBbHwAQAr0bf/KGT3AIZS5Oei4=; b=K0C53HVCJGQLpheXFEWo2hjBqwm9An6aLVC4+6W7hkexq9v+gDnv9Dk+oUvRh+lKJaek/K JRZ4v5sv7kF6AUr6NsbjU8uT51B+Eb6QP/8jtbG8giHUcYFRXqZwydGSBk4aRtKMMtfjiZ +yMf9lveBpLOwaHElGrIDt8h2N7PMXrLShZ5x8/HoHBaoj8D7fC6A7wbBrnPlQCorrLXCA zJvH/YqVMwMBXbNx93Fuhfel18AqnZHgJZ+CASqJ1PN7cDjxn+KAuLHXBC0DJLlDhe9hb5 hBxsqDAl+5j8LKxQZdScGi3pSSlqb22TaLv85TcOkirimzvIcqtfUAJiLwxkIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709877327; a=rsa-sha256; cv=none; b=fNrblo8DJIC5fIFvM+RSodhYn+iEdxzUGly1YSWREGpWEvcqZsi1mXeB+ROcuqu/IriJz4 VnJiFhUEangDFGGPUqfZUkgOw8UCwbW5FntCRRjikcY8bEwW+5TDQ5L6GwQTLORNv5mVz6 mU8XkWcNoRG3IJmaFxwkfgmqjZLILoF9uCv1/mhzVivKkVllNBT8UtCWEVBD6ASTp8fLkc oie3FT2NPUlKH1/EGvDqHI4L9rb6FmbY5bJdq2Clfeae980GndSj26TcvC3TsVxhFW1CAz vKTK3vkgcMdpbWZOYKfqw3D+cUZP0q8ZcNnEhwUxjmpRXc57X9yCWORkCBGRyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709877327; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r2gqIHriwJPcDhw86dBbHwAQAr0bf/KGT3AIZS5Oei4=; b=EISl4PqbWl3+G3mXbVRDT3OUcXPoeu8es+fmU9c14+/EB0xW2gf6WdWu9hianDol6uFUgZ x754ISJwXsNprLa20q46mHSZc9b//DMLq/RKfQBjWCR2KZm8CeWrN080/rzfwZZ7Wc1wJQ Ap3Q9yK6Ygl8wiceoaFF4Vs1gnv+vgqBTVN13Hu1227xwIXdGHzq5NNd375z7FbjINxBm7 P4xyR3QKTu/7yN96+yhCdKDEcH2Zyz0rtlX/E0EcRfrKqnQrf2sGA34XWEiL2Z2pAG54gx mJ2bMlAGbM+AgycwIkQIx0EPEvKIP0pTnIbD4ejtQzHxT/1X2WKakOHOOHcIHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trb4H10Yrz15bY; Fri, 8 Mar 2024 05:55:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4285tRT3023943; Fri, 8 Mar 2024 05:55:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4285tRhA023940; Fri, 8 Mar 2024 05:55:27 GMT (envelope-from git) Date: Fri, 8 Mar 2024 05:55:27 GMT Message-Id: <202403080555.4285tRhA023940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ba7b7f94c239 - main - awk: Fix the tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba7b7f94c239ce43343d7af403734fdc941b7664 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ba7b7f94c239ce43343d7af403734fdc941b7664 commit ba7b7f94c239ce43343d7af403734fdc941b7664 Author: Warner Losh AuthorDate: 2024-03-08 05:40:43 +0000 Commit: Warner Losh CommitDate: 2024-03-08 05:52:56 +0000 awk: Fix the tests I'd forgotten that we have to adjust the stderr tests from upstream. Remove the OK files. Also remove system-status.*. These restore the fixes I made in 517e52b6c21c which were lost when I imported the last version of awk. Also, force LANG to be C.UTF-8 when testing to ensure that stray lang settings don't fail tests. Sponsored by: Netflix --- contrib/one-true-awk/bugs-fixed/missing-precision.ok | 2 -- contrib/one-true-awk/bugs-fixed/negative-nf.ok | 2 -- contrib/one-true-awk/bugs-fixed/pfile-overflow.ok | 4 ---- contrib/one-true-awk/bugs-fixed/system-status.awk | 19 ------------------- contrib/one-true-awk/bugs-fixed/system-status.bad | 3 --- contrib/one-true-awk/bugs-fixed/system-status.ok | 3 --- contrib/one-true-awk/bugs-fixed/system-status.ok2 | 3 --- usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh | 1 + 8 files changed, 1 insertion(+), 36 deletions(-) diff --git a/contrib/one-true-awk/bugs-fixed/missing-precision.ok b/contrib/one-true-awk/bugs-fixed/missing-precision.ok deleted file mode 100644 index 75e1e3d00446..000000000000 --- a/contrib/one-true-awk/bugs-fixed/missing-precision.ok +++ /dev/null @@ -1,2 +0,0 @@ -../a.out: not enough args in printf(%*s) - source line number 1 diff --git a/contrib/one-true-awk/bugs-fixed/negative-nf.ok b/contrib/one-true-awk/bugs-fixed/negative-nf.ok deleted file mode 100644 index de97f8b27def..000000000000 --- a/contrib/one-true-awk/bugs-fixed/negative-nf.ok +++ /dev/null @@ -1,2 +0,0 @@ -../a.out: cannot set NF to a negative value - source line number 1 diff --git a/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok b/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok deleted file mode 100644 index a0de50f9007f..000000000000 --- a/contrib/one-true-awk/bugs-fixed/pfile-overflow.ok +++ /dev/null @@ -1,4 +0,0 @@ -../a.out: syntax error at source line 1 source file pfile-overflow.awk - context is - >>> <<< -../a.out: bailing out at source line 1 source file pfile-overflow.awk diff --git a/contrib/one-true-awk/bugs-fixed/system-status.awk b/contrib/one-true-awk/bugs-fixed/system-status.awk deleted file mode 100644 index 8daf563e6f4f..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.awk +++ /dev/null @@ -1,19 +0,0 @@ -# Unmodified nawk prints the 16 bit exit status divided by 256, but -# does so using floating point arithmetic, yielding strange results. -# -# The fix is to use the various macros defined for wait(2) and to -# use the signal number + 256 for death by signal, or signal number + 512 -# for death by signal with core dump. - -BEGIN { - status = system("exit 42") - print "normal status", status - - status = system("kill -HUP $$") - print "death by signal status", status - - status = system("kill -ABRT $$") - print "death by signal with core dump status", status - - system("rm -f core*") -} diff --git a/contrib/one-true-awk/bugs-fixed/system-status.bad b/contrib/one-true-awk/bugs-fixed/system-status.bad deleted file mode 100644 index a1317dba54a8..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.bad +++ /dev/null @@ -1,3 +0,0 @@ -normal status 42 -death by signal status 0.00390625 -death by signal with core dump status 0.523438 diff --git a/contrib/one-true-awk/bugs-fixed/system-status.ok b/contrib/one-true-awk/bugs-fixed/system-status.ok deleted file mode 100644 index 737828f5ed7a..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.ok +++ /dev/null @@ -1,3 +0,0 @@ -normal status 42 -death by signal status 257 -death by signal with core dump status 518 diff --git a/contrib/one-true-awk/bugs-fixed/system-status.ok2 b/contrib/one-true-awk/bugs-fixed/system-status.ok2 deleted file mode 100644 index f1f631e1cb33..000000000000 --- a/contrib/one-true-awk/bugs-fixed/system-status.ok2 +++ /dev/null @@ -1,3 +0,0 @@ -normal status 42 -death by signal status 257 -death by signal with core dump status 262 diff --git a/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh b/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh index 7c8cfa47f99e..588e2f86b0b7 100644 --- a/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh +++ b/usr.bin/awk/tests/bugs-fixed/bug_fix_test.sh @@ -25,6 +25,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +export LANG=C.UTF-8 SRCDIR=$(atf_get_srcdir) check() From nobody Fri Mar 8 06:04:54 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrbHB4r1xz5CxJg; Fri, 8 Mar 2024 06:04: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 4TrbHB457yz4fc2; Fri, 8 Mar 2024 06:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709877894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2lX1JYr8y5EUuvrLFwyPo3U7YDVhnt7SEU8Q2uFG9g=; b=eVeshNd4CvS8VJZLIHrwmfTV/eTIvl92kM2GtcpwkXklqpPeYiyZZr0TBC9GV6N5SGqFeN /wivL96k6dnlDybiSYmdDOFEWtnl0lnM3izfpDd4mbV7VaJ7Amh2jvP9PWN+ymKKm+8D8D GjK83ShFPsmT8bFNXw+GlT3f+eEA0E7kpUyRbG9ffBD2vl0mezdnWKhqDM8r435pS6vxH2 H2cGuuKsRQPdZxsHvcoZ/2P19tzz/G0ujIhCoEJyHsREAguNykwM1cZMJzn5rHRRlDse/J eFhd7JiLYWtmFJ26HT6caLYBVp1MqTXnaqYBrpb0MMRv/k8nM0Pb1EWclAC8AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709877894; a=rsa-sha256; cv=none; b=Mb2o5QGHE0ZPKkD8k2RiEhBcCefmR2fO5exAqDi12GYdRWWjxE0xlK4rDhGDphyP6DEib/ nUAsFztA8zZReikF3zCyF32T6SxOZE0w2U7XyNJ2MYOx/0EVobm5JUVuRxIKqx7jbs7Zhs 1Q+EQxLDfNFaojYM1IdsZ6t926dauxFXp09xJwaEKXjPUNszanE6dExvjqxLVvVDY84Aqn GpFBYCFU1DyaZFzGXFyT/zYjVQeJ7k2pmMBn6az5PA2TNShwCX0+5cq4D1pTgZGMl1aeyb LUMuCaKpyBAInOp6toMJagJNACdsOXC5ufRQt6KdO2dHG1ZEcyHULUADZG7QGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709877894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2lX1JYr8y5EUuvrLFwyPo3U7YDVhnt7SEU8Q2uFG9g=; b=c8AR2Jy6B/QSraaFZfg+zIspaKYT/1BNaxT7TYgg5NvIXjk8prj8qykU8YaJOtKynxOE9e znob/M1uMSU399do/2iL1Rirqc8i0aTN+ddeM98mDeHgI6Qu9LAuGbSCTXiR347KYLWUOZ xDmLAHrgBvacg3ZGhiP+U+TGaZO/IiSatst2uRXPxJk1H/brgrhRaLazZR64sKYlgPaUpu CvFVoWvzR0noqAk4jEA6sGxjxiSMhNtOuYySaGDwLtfb1p7Jrw0OjryH4mGSyqbdRmfulY NZ5RRW0Hg54GXwwsSnRY7ad/4SjMBu7Hu5uAsalpcYEmE35GqMZdpiujZbsCOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrbHB3hwMz15c8; Fri, 8 Mar 2024 06:04:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42864s7Q041560; Fri, 8 Mar 2024 06:04:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42864sC9041556; Fri, 8 Mar 2024 06:04:54 GMT (envelope-from git) Date: Fri, 8 Mar 2024 06:04:54 GMT Message-Id: <202403080604.42864sC9041556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4f9fbde5ee94 - main - ObsoleteFiles.inc: add the awk tests I just remvoed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f9fbde5ee9478e5e48030e38e824440e34e2692 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4f9fbde5ee9478e5e48030e38e824440e34e2692 commit 4f9fbde5ee9478e5e48030e38e824440e34e2692 Author: Warner Losh AuthorDate: 2024-03-08 06:03:41 +0000 Commit: Warner Losh CommitDate: 2024-03-08 06:03:41 +0000 ObsoleteFiles.inc: add the awk tests I just remvoed These files were bogusly added when I imported awk 2nd edition. Sponsored by: Netflix --- ObsoleteFiles.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 7aa9cc4f036a..ed8a6b9bb1b2 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,14 @@ # xargs -n1 | sort | uniq -d; # done +# 20240307: Improperly installed awk tests removed +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/missing-precision.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/negative-nf.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/pfile-overflow.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.awk +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.bad +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok +OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok2 # 20240211: caroot bundle updated OLD_FILES+=usr/share/certs/trusted/Security_Communication_Root_CA.pem From nobody Fri Mar 8 08:19:28 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrfGS4DhCz5D88y; Fri, 8 Mar 2024 08:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrfGS1bKxz4rWs; Fri, 8 Mar 2024 08:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NN9gT4aTs02twnsSGC9yzAl3fLpZqEgDozP3N7Xc+yY=; b=KUEeAp4LJR5vXLhzSBIMIiJ6NoFpZhhjyzyXoWc7o/I7jcczR461tWfJtA+26IcygllzNH dMonpUHehRFmiT756LN2WqsTRJGymzKBzlPJ/QScNluqzgIhzRju/3yIE95bzV5bGcUJFF nrDaDUMaGVSe6mwTOAb+bTrrkkZnW4HlbwEg7XM1Oqf3Q+oEDMZ7ZjisqXknqNGp2w7PnO bbqhIXmPQIaD4jdXTfOxCldyNQVM5a/2RguwRG1iWeZKK2CZDFkQSMaM+457oq9E0SoWWG PQ620/pSmpaSGfrkdVCXR1aKi1c05RVqMaVDgWVXQ1g+U41Nii9jJO6583ycfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709885968; a=rsa-sha256; cv=none; b=bEs0nGFjVcyTMc1taF/788/PVZ+SFRti9U/qXnE/6Ye1U2I5Nik+cXXoYmEruv5b3Yol9J oxmW0Uwpbw5xmH//QzhdewM2PcF516y3BtOqKRyPLk/+jIGmH24Bu3mqZDqddKOPzQGKje zvtfC/hU2gxI4Et2BjtDCtSchQDpnR8jhuarIwVepZoLwNKAYeapCjSn65yMCF5CqZD6D3 Dnqmuwe5nW5lw2c3WKnFLcAVamFA7rQc+XiVCsuQ4idMnBdE1fV9GkH8f01ak0WV4UB+s9 BrjpySBH9LCb9i5LP1W5bw5nR/XDDEs5eU64UeZ4dbb/1atB2DSphuWB0pMQIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NN9gT4aTs02twnsSGC9yzAl3fLpZqEgDozP3N7Xc+yY=; b=INtGH3pgq9osys10hs4ezfJuAFmmUWCoyS41R/iyxfHbivDgG7uk+lgSm8nDgQOnFUzFqh RYjQCZTL+GZyx+YHR9Y5QjfqWJCGHXpEUiMLxtDBi8LnrXE5lc4jrPDOT576YNgRssUHbx 4q5PIhG4ZLBPuuthjVF87PJk8lVmS3F4T7jYTpiCjLcvfeFTRNq9p4XDxs/o8Wfk1BD1ZG jgYuA84SSiMsuC7VDZ/2v1bvvNnYbHzGWiy8URefOJ+0HJ7HjtEl1gUhY9mSk0P4x2Q/sW ZTiC4R++3C+d6ovt1kXWbtELFtYvqQ81j7LicVP2jkzr7mdzn4ngSYFCgb3eVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrfGS1Bqkz19cC; Fri, 8 Mar 2024 08:19:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4288JSsD061597; Fri, 8 Mar 2024 08:19:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4288JSd7061594; Fri, 8 Mar 2024 08:19:28 GMT (envelope-from git) Date: Fri, 8 Mar 2024 08:19:28 GMT Message-Id: <202403080819.4288JSd7061594@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: fc31d474c40a - stable/14 - Merge commit f800c1f3b207 from llvm-project (by Arthur Eubanks): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fc31d474c40a50066310b3d03a8eb0724a00609d Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=fc31d474c40a50066310b3d03a8eb0724a00609d commit fc31d474c40a50066310b3d03a8eb0724a00609d Author: Dimitry Andric AuthorDate: 2024-03-04 20:30:54 +0000 Commit: Dimitry Andric CommitDate: 2024-03-08 08:15:49 +0000 Merge commit f800c1f3b207 from llvm-project (by Arthur Eubanks): [PEI] Don't zero out noreg operands A tail call may have $noreg operands. Fixes a crash. Reviewed By: xgupta Differential Revision: https://reviews.llvm.org/D156485 This should fix an assertion failure building qemu, specifically those parts using -fzero-call-used-regs. Reported by: Daniel Berrangé PR: 277474 MFC after: 3 days (cherry picked from commit a39b3aa463f3474fabb3aedb5aecf943b54b4357) --- contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp index e323aaaeefaf..49047719fdaa 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp @@ -1285,6 +1285,8 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) { continue; MCRegister Reg = MO.getReg(); + if (!Reg) + continue; // This picks up sibling registers (e.q. %al -> %ah). for (MCRegUnit Unit : TRI.regunits(Reg)) @@ -1308,8 +1310,11 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) { if (!MO.isReg()) continue; - for (const MCPhysReg &Reg : - TRI.sub_and_superregs_inclusive(MO.getReg())) + MCRegister Reg = MO.getReg(); + if (!Reg) + continue; + + for (const MCPhysReg Reg : TRI.sub_and_superregs_inclusive(Reg)) RegsToZero.reset(Reg); } } From nobody Fri Mar 8 08:19:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrfGr56LNz5D8Lv; Fri, 8 Mar 2024 08:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrfGr1581z4rtP; Fri, 8 Mar 2024 08:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nrps8a1bNGwXTZ5WYn4drHbf7qYKhFJZCz/spdR8T4A=; b=UP3ak9wnfkubz5q3zRxHQAfE0TY/2YBoUsF+x/oT4MYar7MexVO+SuFdxRbu2AEPngMnPz YLcxgBZVj2lZ5NRgYMXWABCp28QoPm2slJYlZZ9mMwMFa5dYOzOv8LEofI45onzDP4Qau8 xf24JMGe5ZU5Q3xBxlc8w8Er+k4a7uXsAm42nGl+Q0U8bnYkIigxL4xAge6KBR0OE81Ged HVzHn+Mr6E1CSMI2S6Ym4P2kQSBOYZDH0syE8f7d6NCxPrrpjLSnU/LC0onqilmbrfiLYt b4xA/2qbPca5wAP40KmzzW3W0ozZNsVi/ZxXQv3MsfvJs5Ej/akaPJOnesTLzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709885988; a=rsa-sha256; cv=none; b=hUUFybA9eTSGOW8j5vyGZISwubcER0k+PoIklLEJUDVnyhpMhcNcgeV4lbDlyd3+40ZNBd DEES6La/KH8DFYC9I4KLqRzkEWPC+IDhAbeTWoM8fg1fGuErkWZXsi8vjYhibosDbiWkbN dLoRQNNIgY0gVKK2p8QkskCUHC732SApinaLA3e9opCfcBIpLwUAcBW8P2iVQewyy9dVZ4 3eBW3ZIx/NAI94NaODtUXUn97X8YDrlLgPciJnGhZeyEixJcXTQ4lfRgJfBNBZwKbA7tdE lIJXkUgxnU/j8OcSTMluiZPhYIEZ7p31rpftH96XDTq3kWJYkcQN0GWtYLtJpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Nrps8a1bNGwXTZ5WYn4drHbf7qYKhFJZCz/spdR8T4A=; b=xLaAmprcQdeqUsKLuOZu8ySR2CIRpvai2D7eYJ4ppq6jqD2j6wifndUeIi0MZZ0lYJKJ8a 2maOsjjioWRYKhbC6B5e4q8XFTNWHxdplKAfq3I79vO+YtNyB1p6xvJa9wRHnPl09fh4sc tBaLO5zu2tcY2ES8te5Fkp1hjOXhjYw9FnIAqkNm4F8s+tA5MbSduoOJpKfEK5jOLDZubR Mde7ZOl9o6cf1/0h4qm+1dg2HgJFP/ZMcgVbzY6uG8U2eIehq4Bk8hZPs0FeOL52EribhM HkNno1C1TqFsbAPPbAN8pERGRco+EwBDd4fZWFfpmHrPW0HY/UPA/4Dy9YBTqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrfGr0Xy0z194J; Fri, 8 Mar 2024 08:19:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4288JlWZ061801; Fri, 8 Mar 2024 08:19:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4288Jlen061798; Fri, 8 Mar 2024 08:19:47 GMT (envelope-from git) Date: Fri, 8 Mar 2024 08:19:47 GMT Message-Id: <202403080819.4288Jlen061798@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: f5fca73651a3 - stable/13 - Optionally create full debuginfo for llvm-related executables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f5fca73651a39dd75683c0f2374ac2cb0d11e670 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=f5fca73651a39dd75683c0f2374ac2cb0d11e670 commit f5fca73651a39dd75683c0f2374ac2cb0d11e670 Author: Dimitry Andric AuthorDate: 2024-02-11 19:02:51 +0000 Commit: Dimitry Andric CommitDate: 2024-03-08 08:19:05 +0000 Optionally create full debuginfo for llvm-related executables Commit de6feefdb7cfd limited the amount of debuginfo generated for clang and other llvm-related executables. This was done to save disk space and memory during building, but it makes debugging any of these executables much harder. Add a new src.conf(5) setting, WITH_LLVM_FULL_DEBUGINFO, to generate full debuginfo instead. This is off by default, but could for example be enabled for release builds or snapshots, so llvm executables are easier to debug. Reviewed by: emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43839 (cherry picked from commit 73ff7384e025033abc98fd5437a48beb8077a90b) --- lib/clang/Makefile.inc | 4 +++- lib/clang/headers/Makefile | 1 + lib/clang/libclang/Makefile | 2 +- lib/clang/libclangminimal/Makefile | 1 + lib/clang/liblldb/Makefile | 1 + lib/clang/libllvm/Makefile | 2 +- lib/clang/libllvmminimal/Makefile | 1 + share/man/man5/src.conf.5 | 5 ++++- share/mk/src.opts.mk | 1 + tools/build/options/WITH_LLVM_FULL_DEBUGINFO | 2 ++ usr.bin/clang/Makefile.inc | 8 +++++--- 11 files changed, 21 insertions(+), 7 deletions(-) diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc index 0a2ae8f6b802..75d3b7c14507 100644 --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -1,12 +1,14 @@ -.include +.include MK_PIE:= no # Explicit libXXX.a references +.if ${MK_LLVM_FULL_DEBUGINFO} == "no" .if ${COMPILER_TYPE} == "clang" DEBUG_FILES_CFLAGS= -gline-tables-only .else DEBUG_FILES_CFLAGS= -g1 .endif +.endif WARNS?= 0 diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 49f78b0a4d97..f72567514f20 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -1,4 +1,5 @@ +.include .include "../clang.pre.mk" .PATH: ${CLANG_SRCS}/lib/Headers diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 51c209d879f1..8d911905808d 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,5 +1,5 @@ -.include +.include .include "../clang.pre.mk" LIB= clang diff --git a/lib/clang/libclangminimal/Makefile b/lib/clang/libclangminimal/Makefile index 744e1a835f90..22faa7b98aeb 100644 --- a/lib/clang/libclangminimal/Makefile +++ b/lib/clang/libclangminimal/Makefile @@ -1,4 +1,5 @@ +.include .include "../clang.pre.mk" LIB= clangminimal diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index c32e4a387b2e..e6e1e638abce 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,4 +1,5 @@ +.include .include "../lldb.pre.mk" LIB= lldb diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index df39f2eb212e..b59d881ad99a 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,5 +1,5 @@ -.include +.include .include "../llvm.pre.mk" LIB= llvm diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile index 83c7101b04f5..ce5535a59072 100644 --- a/lib/clang/libllvmminimal/Makefile +++ b/lib/clang/libllvmminimal/Makefile @@ -1,4 +1,5 @@ +.include .include "../llvm.pre.mk" LIB= llvmminimal diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 9aab6fc459c1..181b4fea466d 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. .\" $FreeBSD$ -.Dd September 24, 2023 +.Dd March 8, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -916,6 +916,9 @@ Do not build the tool. .It Va WITHOUT_LLVM_CXXFILT Install ELF Tool Chain's cxxfilt as c++filt, instead of LLVM's llvm-cxxfilt. +.It Va WITH_LLVM_FULL_DEBUGINFO +Generate full debug information for LLVM libraries and tools, which uses +more disk space and build resources, but allows for easier debugging. .It Va WITHOUT_LLVM_TARGET_AARCH64 Do not build LLVM target support for AArch64. The diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 3add35bc07c3..811b0a493d50 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -210,6 +210,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_FIREWIRE \ LOADER_VERBOSE \ LOADER_VERIEXEC_PASS_MANIFEST \ + LLVM_FULL_DEBUGINFO \ OFED_EXTRA \ OPENLDAP \ RPCBIND_WARMSTART_SUPPORT \ diff --git a/tools/build/options/WITH_LLVM_FULL_DEBUGINFO b/tools/build/options/WITH_LLVM_FULL_DEBUGINFO new file mode 100644 index 000000000000..4362de9eb762 --- /dev/null +++ b/tools/build/options/WITH_LLVM_FULL_DEBUGINFO @@ -0,0 +1,2 @@ +Generate full debug information for LLVM libraries and tools, which uses +more disk space and build resources, but allows for easier debugging. diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 8fb62b876678..8f6b098de2d4 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,15 +1,17 @@ -WARNS?= 0 - -.include +.include MK_PIE:= no # Explicit libXXX.a references +.if ${MK_LLVM_FULL_DEBUGINFO} == "no" .if ${COMPILER_TYPE} == "clang" DEBUG_FILES_CFLAGS= -gline-tables-only .else DEBUG_FILES_CFLAGS= -g1 .endif +.endif + +WARNS?= 0 .if ${MACHINE_ARCH:Mmips*} && ${MACHINE_ARCH:Mmips64*} == "" CFLAGS+= -mxgot From nobody Fri Mar 8 08:19:49 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrfGs30cJz5D8RC; Fri, 8 Mar 2024 08:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrfGs1Qfjz4rtR; Fri, 8 Mar 2024 08:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OoLvR5X3ZNGlc355PkUK0s3JqEbCz1NI3q4iHMDja7s=; b=CJYsyU605PWdxonOWRzkUa4lMLzO1GfGpazZPx+En/lzO/LEi/nO765idmJ6qoPS0HH3UK iRe2XwCz8HEaEL+gDXik6k3QCPbgzVtBcFc7jfZrcV2MIzEvo4JWleuYMfXhWFRC/1LE/w qeo8zC27stjJzpyM1BZIbP6gdo2zKE1T9FWEBYfuPr5e8E7jSoXglAeVASZrM+Tkzehwhr AVckHBC+Qjh6SPiwHnycZ2KdL09x9zOaUhG9KqlnTlPnXwb/7xCUhVfsOwHvr6mwxSTFnX ORmm81xb169fam/WJA97OCBc1/TtSFu3frU7vL4+uXgpLpU7IJPFcrQvfvz/TA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709885989; a=rsa-sha256; cv=none; b=Cq7Em+mdZxujVTyYi+Ys+OQ3VerSk/aS5l35cwJDhlSrTf4tDR6D39C/CapPBYZLvQLt3j TLhDAlG65vIY5Dp9YvaLlnpCP1N7FLyeBuui82uNtdoaBwQpDs3u/U1pGgYmsC4osHQDnK 232JSxS37zMSEhGZs/UFlgeig+KXTd1hXTW7wTMmYZsMkJSiJldrA7/bbjrVoQ3DOE/+7v mSB4rx8PoCUM4hnQC8iZWH1q9q02fOB4wULuwxDnB/UX4jE3g6UD1wbB3aDyWYbJ6HBEo/ KQBOuN2Xd9YBFZNPpEAE9rlBK6FIB/g5B/qlzBB7R/uy6xsTSLNk2oq8j+ujVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OoLvR5X3ZNGlc355PkUK0s3JqEbCz1NI3q4iHMDja7s=; b=wbLPw7IKsa+53QJpHn4s2IJNRlkDx48krbb+QLVwLgbVZTYyBcjP1iHMmK0QVjcudsFHwt OvRJKquAASZz1b/+V0gk9bjxp1RHaAPKjAzrUgkZspFmNWT+S+yxx2nvxpMT5NdUoXwzVq XVkChYDQzkukOUkKY7J/CawnhRIswI8uOSr/1G4ohPA8McRwX0OKjtA+gglOpxpSHNS/uv jZdmRVqZ6guWz+rK0043DIoN5Ij3a4UoT8DZW9TPpjdE1XEzUAkG/I20FC8RB0iscq+/a2 JS1Oe5iyc8pDIzXFWri3gLCwkpjnC6BXsjBLshUyUSHNxoFPflsDomz5njjZyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrfGs12v5z1914; Fri, 8 Mar 2024 08:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4288Jn2U061853; Fri, 8 Mar 2024 08:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4288Jnbe061850; Fri, 8 Mar 2024 08:19:49 GMT (envelope-from git) Date: Fri, 8 Mar 2024 08:19:49 GMT Message-Id: <202403080819.4288Jnbe061850@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: 961271f952fc - stable/13 - Merge commit f800c1f3b207 from llvm-project (by Arthur Eubanks): List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 961271f952fc390396f967d50903291e3e6c59c6 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=961271f952fc390396f967d50903291e3e6c59c6 commit 961271f952fc390396f967d50903291e3e6c59c6 Author: Dimitry Andric AuthorDate: 2024-03-04 20:30:54 +0000 Commit: Dimitry Andric CommitDate: 2024-03-08 08:19:10 +0000 Merge commit f800c1f3b207 from llvm-project (by Arthur Eubanks): [PEI] Don't zero out noreg operands A tail call may have $noreg operands. Fixes a crash. Reviewed By: xgupta Differential Revision: https://reviews.llvm.org/D156485 This should fix an assertion failure building qemu, specifically those parts using -fzero-call-used-regs. Reported by: Daniel Berrangé PR: 277474 MFC after: 3 days (cherry picked from commit a39b3aa463f3474fabb3aedb5aecf943b54b4357) --- contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp index e323aaaeefaf..49047719fdaa 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/PrologEpilogInserter.cpp @@ -1285,6 +1285,8 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) { continue; MCRegister Reg = MO.getReg(); + if (!Reg) + continue; // This picks up sibling registers (e.q. %al -> %ah). for (MCRegUnit Unit : TRI.regunits(Reg)) @@ -1308,8 +1310,11 @@ void PEI::insertZeroCallUsedRegs(MachineFunction &MF) { if (!MO.isReg()) continue; - for (const MCPhysReg &Reg : - TRI.sub_and_superregs_inclusive(MO.getReg())) + MCRegister Reg = MO.getReg(); + if (!Reg) + continue; + + for (const MCPhysReg Reg : TRI.sub_and_superregs_inclusive(Reg)) RegsToZero.reset(Reg); } } From nobody Fri Mar 8 09:11:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrgQ76chyz5DDSC; Fri, 8 Mar 2024 09:11: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 4TrgQ76BJkz3ymX; Fri, 8 Mar 2024 09:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709889071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4/3/nv+yqsJ7lI/VmZja4qp7eaAapLvJqn+LKnBgMs=; b=B8om9sfwM+nJwJDCA+6W77MEcHd3Tqm6sYZit4pSN6qCNe0s5719XI7kOVljk+HHKwCzY3 ahLvVHSzu/RPcOSes0VG0rf7bnVtV+ME+VCHhHjUvW9uGVbEgdG2c/K9f25N8T6ZLuYLHw eA7n6iNIMnUNQSjVmFbEP1kPUJH6NzvUtYtCsXlOmYf9S5hkaMAGPrfG5Fn3zKkdEwRgCf pAJwAMtq3fU5rZ7YsLj0pgGvEfntTpzkgcuUCIdmt3u5NsSUlElpWYCaP1RkHiWBr0KgQU faGd2f8T+QDx4UtEq+xlCiIrPsRNTfoNKPt0sC2pGVF1V75n84R/QHFCX9x28g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709889071; a=rsa-sha256; cv=none; b=VOGnCW0qO1bWufzNEef5za6q8QAg2vMOstkSk6EC6nUnmihYI+6RcUQLufWR/nh3Xc1QN6 GmpyLycE6GqQNfqGeKQljlB1jBS8gp9rVvTVlhgvFBZwY5Wxm8BO80qScll1ng1CVVJR9g v9lBNRl9usT4LVXEo3KSGodhnqm6sh0Fefddb21HPgjBun9pYPRllyTpIX/4J+LoEHI2j1 XO17YnOXzG1RrMxMfZqOE88xh7sKEFHQLv2Jfv0PkWIYv3JpID7btkN30KCHdHEH4xCXgK bsCvjSy91tY+nCVR1eefzN/hOmWbfetHogVmHYELlF4OI1rNlJ+Rb5nKIsfb4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709889071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4/3/nv+yqsJ7lI/VmZja4qp7eaAapLvJqn+LKnBgMs=; b=QbMoL20OMn2z4QFD27hR0YmtjUSnCS/7+u1a4j1okt+X5zMsbWGz/stSTTxtNw7nm9jRv1 DzvPadirwVxoDP2fx3EdlUPFzYK8kmVgsDX7QTg12yr4l8tLvxjojHVyy1PvGOvjtKQuKe G0FQNpXZuPNW/KhBmAPpri4EKgiEsobPhhGO9pSPlFsPByrl7JnAFdTCkXtQBCxbZCi2vO sVrYHXOr3yo5k7BLvYIZG1wCQ4t30stUehRfLsr9wS0LTsy50bppmvh/dYqsw3OWew3eQ9 3Nwpx9zr+7c4r5DVUsNY11Iqbr1EO3wAhfjJF9CIHM0VhAf3bL8+4SaXPvhahQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrgQ75nNzz1BcH; Fri, 8 Mar 2024 09:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4289BBsi056297; Fri, 8 Mar 2024 09:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4289BBI4056294; Fri, 8 Mar 2024 09:11:11 GMT (envelope-from git) Date: Fri, 8 Mar 2024 09:11:11 GMT Message-Id: <202403080911.4289BBI4056294@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: d1ce01214a55 - main - TCP LRO: disable mbuf queuing when packet filter hooks are in place List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1ce01214a5540db8a7e09fdf46b7ea2d06ffc48 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d1ce01214a5540db8a7e09fdf46b7ea2d06ffc48 commit d1ce01214a5540db8a7e09fdf46b7ea2d06ffc48 Author: Michael Tuexen AuthorDate: 2024-03-08 09:03:43 +0000 Commit: Michael Tuexen CommitDate: 2024-03-08 09:03:43 +0000 TCP LRO: disable mbuf queuing when packet filter hooks are in place When doing mbuf queueing, the packet filter hooks in ether_demux(), ip_input(), and ip6_input() are by-passed. This means that the packet filters don't process incoming packets, which might result in connection failures. For example bypassing the TCP sequence number validation will result in dropping valid packets. Please note that this patch is only disabling mbuf queueing, not LRO. Reported by: Herbert J. Skuhra Reviewed by: glebius, rrs, rscheff MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43769 --- sys/netinet/tcp_lro_hpts.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c index 84944c8db1ce..9c0d4be91d53 100644 --- a/sys/netinet/tcp_lro_hpts.c +++ b/sys/netinet/tcp_lro_hpts.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -54,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -424,7 +426,7 @@ tcp_lro_lookup(struct ifnet *ifp, struct lro_parser *pa) { struct inpcb *inp; - CURVNET_SET(ifp->if_vnet); + CURVNET_ASSERT_SET(); switch (pa->data.lro_type) { #ifdef INET6 case LRO_TYPE_IPV6_TCP: @@ -449,10 +451,8 @@ tcp_lro_lookup(struct ifnet *ifp, struct lro_parser *pa) break; #endif default: - CURVNET_RESTORE(); return (NULL); } - CURVNET_RESTORE(); return (intotcpcb(inp)); } @@ -488,9 +488,28 @@ _tcp_lro_flush_tcphpts(struct lro_ctrl *lc, struct lro_entry *le) IN6_IS_ADDR_UNSPECIFIED(&le->inner.data.s_addr.v6))) return (TCP_LRO_CANNOT); #endif + + CURVNET_SET(lc->ifp->if_vnet); + /* + * Ensure that there are no packet filter hooks which would normally + * being triggered in ether_demux(), ip_input(), or ip6_input(). + */ + if ( +#ifdef INET + PFIL_HOOKED_IN(V_inet_pfil_head) || +#endif +#ifdef INET6 + PFIL_HOOKED_IN(V_inet6_pfil_head) || +#endif + PFIL_HOOKED_IN(V_link_pfil_head)) { + CURVNET_RESTORE(); + return (TCP_LRO_CANNOT); + } + /* Lookup inp, if any. Returns locked TCP inpcb. */ tp = tcp_lro_lookup(lc->ifp, (le->inner.data.lro_type == LRO_TYPE_NONE) ? &le->outer : &le->inner); + CURVNET_RESTORE(); if (tp == NULL) return (TCP_LRO_CANNOT); From nobody Fri Mar 8 09:11:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrgQb0wXpz5DDVT; Fri, 8 Mar 2024 09:11: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 4TrgQb0W7yz40X5; Fri, 8 Mar 2024 09:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709889095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OtxI8S0eYNlmA32JM1BnpeevQdEOmV5UXuENhiF0ORY=; b=GAYUyN6h3vH5UNQ54b2Fl8x+krM1S7RH5KAR+4IIxmflf0rhhOHNaHGrBSly7EB4IEcH72 hwg7OerMB5Xyj9WJuZK/6gPM5W69sVa91UK8zo9Id1nqudUS0eibuPuoZEHW9KFXO6xWCd Hg7/K1cpm8uSUPJEtOWHEbVdXx0+FhU382aGgDZ3hrioLAcnL0+RUx84znHNOs9W1GUwjE E2Loz0/tB9UEgA4+nna6X0HamZR4vYEblKV1M4jq8vKjEiiT+s8/EVecwczDvmf8de/YMH rXKqpERvQ8/+CNeWYim/8zmIKqBsbj9cy3e4Gqknlswd2RM7KC/fDCKeoqRslw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709889095; a=rsa-sha256; cv=none; b=nswVFy+XgmQ8LWl1JpJm/HX4VYYZamcBsPpaRavMM56cbuN9Aix9NiIDWTj0JmIJBgAFDj 9G8aLr60zruFHMT1ZuMubFUmuW8iEE6g8v4YkwfR1c52xj674aMEyyLf3hAPShyzsjsQhf sk8ru8HGtKfuvIT68WohBdhwtqhIdbXXOanJTE1iUljEMplbE4ZBBrMfzhdPOcnhn0GMCL ixiZzYJe/EQHO/X11u6dL6s1P3MCPIaPttAy2iboVoW0zZE2vpo6ndADNBzczUT6Id/B72 3pT6Mat9+MPs7Fgt2M3ltJ8qpxgiAtSeXoPA7KgussSAoEB0aj/9f0btiQiM0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709889095; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OtxI8S0eYNlmA32JM1BnpeevQdEOmV5UXuENhiF0ORY=; b=ZxNnIdD0fDRcQZc8D0oehTEjQlXYSZOf+4BHpJyubDC3n4kLtWOprNWc45WzGGIgOdmLm8 hUtj2oBPqAyRC/oE5yD92sNWJCfdG9jheuqVFJj41uj787squumJtkzJcgg3Ed3Vdlp5Bn 4o+YggfkOQ3U2RNvfxfb64IlPiCROU0yugDoWqPmKQOKGjDFBBNNSE09wGw5tuQK3A4wqp YE1YAvYp48D5n/NtNFIVKLr4W7F0mT6PdOgGwCY5p1GYMgAzrbnClBK0nZCLoChXvmR8bG mRDuc+KKWeAfrhZRPK+E5yySuVe1EihIlzS9hp3dUJyu7+lp3hrxk8CJ2SSeXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrgQb06Vlz1B3S; Fri, 8 Mar 2024 09:11:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4289BYIG057392; Fri, 8 Mar 2024 09:11:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4289BYuH057389; Fri, 8 Mar 2024 09:11:34 GMT (envelope-from git) Date: Fri, 8 Mar 2024 09:11:34 GMT Message-Id: <202403080911.4289BYuH057389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: 14bbf0943308 - stable/14 - netlink: fix casts List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 14bbf0943308a53fdca3779334f6dde2c62fb0cd Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=14bbf0943308a53fdca3779334f6dde2c62fb0cd commit 14bbf0943308a53fdca3779334f6dde2c62fb0cd Author: Kristof Provost AuthorDate: 2024-02-26 10:18:30 +0000 Commit: Kristof Provost CommitDate: 2024-03-08 09:11:15 +0000 netlink: fix casts Reviewed by: melifaro MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D44088 (cherry picked from commit 48f33b55b0148c3c8991e53156f37c42b8bc22e9) --- sys/netlink/netlink_message_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index bf0140c98120..614bc96ab9f4 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -321,7 +321,7 @@ nlattr_get_uint8(struct nlattr *nla, struct nl_pstate *npt, const void *arg, voi nla->nla_type, NLA_DATA_LEN(nla)); return (EINVAL); } - *((uint16_t *)target) = *((const uint16_t *)NL_RTA_DATA_CONST(nla)); + *((uint8_t *)target) = *((const uint8_t *)NL_RTA_DATA_CONST(nla)); return (0); } From nobody Fri Mar 8 09:25:02 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trgk6657hz5DFPX; Fri, 8 Mar 2024 09:25: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 4Trgk65TFmz41R9; Fri, 8 Mar 2024 09:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709889902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaZxHDMo4mT46X1NRWYNT2zgMNsggsInXtGA9TpzQME=; b=DuabmklORJeE+Pce5jjBi8x3QuetTbqjZ//ILUCQdYT31g/bsoUX80LpVE9Tkri0rxVnmO 2tV9Fbz+Aw/4/NzIPi66NvvBoBz5NySzkRjJSGC05u2nvjP9k/p8iKpdo7WdYpSr79aQ0B 2URRWQyeVUuSIiAcYjikaomI13Q2HjKmE1lf3NsJlehVrVpVQyUU//yNbsrsF3ufUJ46N4 jE7J6optb9gbSbUIiTAtjUpQ3VJK4nvm1NVE18c4xMNIyHyTUR/pxZnXNt8ngkxiqBJmum xdFbr4yJAygWdhHoVtSg4lLgiLbQOK/LZjqaZCyxunu+OLiVscurRO+VPHFG6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709889902; a=rsa-sha256; cv=none; b=YW774FB5drG0ceArHCX8SQz6FKkpArKtQMyMLYsd407+MMlGQZ05Tzh48hvKDxTm4xd/tt 4iKne0ieh6Fjxy+ZuZHn2uRdJlw5QUr3B/6QNiDg6zHUQ1rb2zjo2CPj25/D2+yvHJjBDu IL/Ls/LE/lJVFIcHbXwK9f6TsDZfT5kpXa9FtKXFsTI1IfoHSzq+wbbnjE5tFy8KygqMh9 3pDHQF597vOjq4TOlTZLk4RvmSl4AT3lEwyLuItJ0PyOoRKLVKYUYnkr2YJwuGmZ/xxKPz sAwhFml9AUVcPte2vbFWTt2PvQCc1UDSWvqAuCJsZwDhnZelcZ+DSKV8bc9EgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709889902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NaZxHDMo4mT46X1NRWYNT2zgMNsggsInXtGA9TpzQME=; b=MjYC1GtHoNZWZDGfD2T+FsdEIE+c9qB4XyeEgTIBMTR0maM332+afG0WADowFeME3/rNFd 8h/TvVHYOIq87+AbmXe+kkqJGsUCAdHleTYmZYMv1Vte3JX5VbzRtm8oGR3eqiMJdVzUxL F0wRnu7jqWOi2ebxGdKC7pc/kZqpBQY8Ya1MEf6wVTHM3TJFe0IfEMYkJQoMiXnaa7jjtb e78A91TEHq0oUj/wdrukHIHTXN0Kfn4lVVCqH0+oj0o07xfiIF89GvTnRStv9/gqfxr/zO 9SrzEvc2zv8zuJVZv6fz7s3cD1VkpjjMzQu25L55v8p0ZYVtnzSXw9C9rZB+SQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trgk654s9z1Bps; Fri, 8 Mar 2024 09:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4289P2WA079999; Fri, 8 Mar 2024 09:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4289P2E4079996; Fri, 8 Mar 2024 09:25:02 GMT (envelope-from git) Date: Fri, 8 Mar 2024 09:25:02 GMT Message-Id: <202403080925.4289P2E4079996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 96ad640178ea - main - TCP LRO: add dtrace probe points List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96ad640178ea0a8a9d1772687659dce5be18fbd9 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=96ad640178ea0a8a9d1772687659dce5be18fbd9 commit 96ad640178ea0a8a9d1772687659dce5be18fbd9 Author: Michael Tuexen AuthorDate: 2024-03-08 09:21:09 +0000 Commit: Michael Tuexen CommitDate: 2024-03-08 09:21:09 +0000 TCP LRO: add dtrace probe points Add the IP, UDP, and TCP receive static probes to the code path, which avoids if_input. Reviewed by: rrs, markj MFC after: 1 week` Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D43727 --- sys/netinet/tcp_lro_hpts.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c index 9c0d4be91d53..cd757d5a6164 100644 --- a/sys/netinet/tcp_lro_hpts.c +++ b/sys/netinet/tcp_lro_hpts.c @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -281,22 +282,64 @@ do_bpf_strip_and_compress(struct tcpcb *tp, struct lro_ctrl *lc, case LRO_TYPE_IPV4_TCP: tcp_hdr_offset -= sizeof(*le->outer.ip4); m->m_pkthdr.lro_etype = ETHERTYPE_IP; + IP_PROBE(receive, NULL, NULL, le->outer.ip4, lc->ifp, + le->outer.ip4, NULL); break; case LRO_TYPE_IPV6_TCP: tcp_hdr_offset -= sizeof(*le->outer.ip6); m->m_pkthdr.lro_etype = ETHERTYPE_IPV6; + IP_PROBE(receive, NULL, NULL, le->outer.ip6, lc->ifp, + NULL, le->outer.ip6); break; default: goto compressed; } break; case LRO_TYPE_IPV4_TCP: + switch (le->outer.data.lro_type) { + case LRO_TYPE_IPV4_UDP: + IP_PROBE(receive, NULL, NULL, le->outer.ip4, lc->ifp, + le->outer.ip4, NULL); + UDP_PROBE(receive, NULL, NULL, le->outer.ip4, NULL, + le->outer.udp); + break; + case LRO_TYPE_IPV6_UDP: + IP_PROBE(receive, NULL, NULL, le->outer.ip6, lc->ifp, + NULL, le->outer.ip6); + UDP_PROBE(receive, NULL, NULL, le->outer.ip6, NULL, + le->outer.udp); + break; + default: + __assert_unreachable(); + break; + } tcp_hdr_offset -= sizeof(*le->outer.ip4); m->m_pkthdr.lro_etype = ETHERTYPE_IP; + IP_PROBE(receive, NULL, NULL, le->inner.ip4, NULL, + le->inner.ip4, NULL); break; case LRO_TYPE_IPV6_TCP: + switch (le->outer.data.lro_type) { + case LRO_TYPE_IPV4_UDP: + IP_PROBE(receive, NULL, NULL, le->outer.ip4, lc->ifp, + le->outer.ip4, NULL); + UDP_PROBE(receive, NULL, NULL, le->outer.ip4, NULL, + le->outer.udp); + break; + case LRO_TYPE_IPV6_UDP: + IP_PROBE(receive, NULL, NULL, le->outer.ip6, lc->ifp, + NULL, le->outer.ip6); + UDP_PROBE(receive, NULL, NULL, le->outer.ip6, NULL, + le->outer.udp); + break; + default: + __assert_unreachable(); + break; + } tcp_hdr_offset -= sizeof(*le->outer.ip6); m->m_pkthdr.lro_etype = ETHERTYPE_IPV6; + IP_PROBE(receive, NULL, NULL, le->inner.ip6, NULL, NULL, + le->inner.ip6); break; default: goto compressed; @@ -313,6 +356,7 @@ do_bpf_strip_and_compress(struct tcpcb *tp, struct lro_ctrl *lc, th->th_sum = 0; /* TCP checksum is valid. */ tcp_fields_to_host(th); + TCP_PROBE5(receive, NULL, tp, m, tp, th); /* Check if ACK can be compressed */ can_compress = tcp_lro_ack_valid(m, th, &ts_ptr, &other_opts); From nobody Fri Mar 8 09:50:19 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrhHH52rGz5Cn13; Fri, 8 Mar 2024 09:50: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 4TrhHH4VvHz44pD; Fri, 8 Mar 2024 09:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709891419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RghiAJqn8gtVnsS1dMVPrPtgW8Cm0B2uMRP4zvz8Xbg=; b=KIHDpLrINKtwVCWwrLDdDgu+MbjbYNtCxZ33LeOXP4lIMsC7kqgQOrOB/TKW19jOlv3iGD Wzaxet3Of6fewJQ/7buBdjJFcnfxDqbTjYWIWfq2I6VgXEpnPpByGSSgz4a1XIj5zO3TKC VoDFfIgzRWPAR6THJVNLrRjIf5SBow6cjKYhsEuKFpa8syxh3Fcj7c7vkd8LRKx6X6eecB jYVNKSQ4iFJIDbicIoVV2Vuug6tx0p+5dEkJ0FLqX42x6SmaykkFPkRltY77FSV44un7EN GxoUSVOcRi1ezuh/eWFlWqL3AWSqsEzGtlvJ+ZqpVTLdYIJL7H3jl/xRa3Q5PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709891419; a=rsa-sha256; cv=none; b=LMCzhnk5OQy2UzhNhNF5pWaBoqQh0F/4ij3zjqWrZ4EjuaIjWSv4iVRfpsk+y1A0qXkey5 cbLsG8IDtYmxF2xJ6vXBr7GIYGo09x9kmmSFhRCJTR6O2gJrlXffvti6nRilJ6t2d6kDl8 zLwg8DOkvQ0lTGCRQh17m1+XLJEMamDLmleW2YFx296d2g1PwIvKLh4sJTcE8qRhlVbvig 7vBU/z3+s7utgUq9EjN8M0kYf/JaAmyryxMEXfgaP7IeaFxumxCxmdd9lD/L4Z86HgYsBR 81sZQRQBwSwiOmgRnSdmmwJ5xLF7VqOvgnpJBOc9k+Js2u9/5T/44jXi3oMPWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709891419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RghiAJqn8gtVnsS1dMVPrPtgW8Cm0B2uMRP4zvz8Xbg=; b=V/PEVUf7L31omONQKPTP4g/6WwTENXqolB7nGL//wDBY7E/ZuHWrTbtoIfsaA95m61H3nN Dt9nYpdGKSIjPsjHh/BCrUwFUhJz6c0FT6evV/z7rW6V112TclI6Wd4T6aadBn416ds6gf SXeFsRromJK0/2DAW0NfwYxBT6A6PNfxyJL0xjnKfXLZnRzBXkNx5vGtgVie8O+QmlIeBz Uxza87peNvIv4ox+QyVfFxqJI7e2tCdbXUcI6hcLmghOau7BlfwRCL4XfLthz5xs5D+njN iJjkEeFQE8VxQH0+i5omSjTp8/jjiEc7D7Xb2dXhDr2YS4xwy7HFzmiqq0Timw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrhHH469dz1Ckj; Fri, 8 Mar 2024 09:50:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4289oJFb022869; Fri, 8 Mar 2024 09:50:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4289oJfn022866; Fri, 8 Mar 2024 09:50:19 GMT (envelope-from git) Date: Fri, 8 Mar 2024 09:50:19 GMT Message-Id: <202403080950.4289oJfn022866@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: 428e5165fec7 - stable/14 - tcp_rack.4: Remove a mentioned paper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/14 X-Git-Reftype: branch X-Git-Commit: 428e5165fec788999749dad79fb21cf2bca72fa9 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=428e5165fec788999749dad79fb21cf2bca72fa9 commit 428e5165fec788999749dad79fb21cf2bca72fa9 Author: Gordon Bergling AuthorDate: 2024-03-05 02:03:50 +0000 Commit: Gordon Bergling CommitDate: 2024-03-08 09:50:06 +0000 tcp_rack.4: Remove a mentioned paper The paper "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" has nothing to do with our TCP RACK implementation, so remove it. Reported by: tuexen (cherry picked from commit 7701b993554321f305ef662a26238f375c4d2dba) --- share/man/man4/tcp_rack.4 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index 566834f4283b..2ebffca08e26 100644 --- a/share/man/man4/tcp_rack.4 +++ b/share/man/man4/tcp_rack.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 25, 2024 +.Dd March 5, 2024 .Dt TCP_RACK 4 .Os .Sh NAME @@ -130,13 +130,6 @@ What method should we use for rate sampling 0=high, 1=low .%O "RFC 8985" .%D "February 2021" .Re -.Rs -.%A "Ahmed M. Abdelmoniem" -.%A "Brahim Bensaou" -.%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" -.%O "https://arxiv.org/pdf/2102.07477.pdf" -.%D "February 2021" -.Re .Sh HISTORY The .Nm From nobody Fri Mar 8 09:52:55 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrhLH33Qxz5CnLQ; Fri, 8 Mar 2024 09:52: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 4TrhLH26Mcz45XG; Fri, 8 Mar 2024 09:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709891575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nYxWj+G0VOVoWHQ4Zt4xXAb0qgA3XRQ3P9RqIPn9N+o=; b=STXZWi7RW1bKL/VnF6VYuYVTmK79XfrnuZ7BbHGiHNga1t/BOBDgQVxJpPuS2HTD30wsZE teEN2MmE3u3eoRRPe/els5GLKf1gl0UYxpzdDnoBNqk6hplYvZC/7pUDl822QZX2vZ85WM x7UxgDqncBGCLWDtL1x4WWGEAUBcN7LXiLYaq4TTx/+gEOYRQEBgUOCQb2Y4HEj+sX5taF INzKCRuH6CWJsd5uMMRZ+L2LEhv+BNEq+ErTUt8MLYYZDVrTQ0izyUFrfoTNXX0h7FOl5O 6owBV83z4R6nDjfP9OAV4shMWeI1Fc8RcBQ5UY8SBZOEQQHcuuWawpX+3kFb4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709891575; a=rsa-sha256; cv=none; b=TzQNRvERBaYEy3B0+dyyHLHLDc0VErYkGegaCesMMzw5sXS0jeXliqQ3EC4cRPWUAg1w21 TQZU5MlXhpxV5jk7TVppwoc+81zNiUOArps39U6t+gsBY5uCqZMDiDJWs02Ykc9if1l/AS vubR7Fbuy7sd5Xc6znRnRjC5xNqU5SQxobI1ZOWrN+33NN9qqUPpWVQJiU0prxLgEvPol1 bMYyH8I10z6VzXadNdCaaUa+Nw35Fb1J/GW4ON4AqIK2xTQ1REUiUKlMGP+5pHorlfTI2/ 3v//unVvp7t+4A76WX2dMSM5z95vBVRoD3bPwcBXU2duvX3WWsW6Uke6qDlQRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709891575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nYxWj+G0VOVoWHQ4Zt4xXAb0qgA3XRQ3P9RqIPn9N+o=; b=LsC2oTtIbWpwL3dL2A/9ewCEX1/Gbp7al445Kh97lakRq1i296DvrM5xiaC+mbHsdo4ta1 69RRP9mJA/wIOkek33cula82VYNl2jRsPQgBhgtcEM+irhV4xyjMPKO7+oDnPEzeaZ3EaT dRhr78Bd9lfzcRCqqXphdWHCvzVvv+HTrGxZILZAM96zoGVYv69OqGEja3qeCkj2GOL6P0 y7o95o75V+cu/4/037cGuu2bzcZ3iatcp870KVytbt7o5DyR86niM44msbqeItXfa3LJPc R4RBViCvWF9QTyjs/SxFpUS6lSCJXfOpvXLftPhA23ySAG85K9Eaehc+xNmBuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrhLH1jmrz1Clf; Fri, 8 Mar 2024 09:52:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4289qtdT029632; Fri, 8 Mar 2024 09:52:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4289qtEm029629; Fri, 8 Mar 2024 09:52:55 GMT (envelope-from git) Date: Fri, 8 Mar 2024 09:52:55 GMT Message-Id: <202403080952.4289qtEm029629@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: 2feed11fbe6d - stable/13 - tcp_rack.4: Remove a mentioned paper List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2feed11fbe6db38cbc82d3efc51a9a7cdfb12e0f Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=2feed11fbe6db38cbc82d3efc51a9a7cdfb12e0f commit 2feed11fbe6db38cbc82d3efc51a9a7cdfb12e0f Author: Gordon Bergling AuthorDate: 2024-03-05 02:03:50 +0000 Commit: Gordon Bergling CommitDate: 2024-03-08 09:52:45 +0000 tcp_rack.4: Remove a mentioned paper The paper "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" has nothing to do with our TCP RACK implementation, so remove it. Reported by: tuexen (cherry picked from commit 7701b993554321f305ef662a26238f375c4d2dba) --- share/man/man4/tcp_rack.4 | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index cfdedb9901b8..496b7d9cc496 100644 --- a/share/man/man4/tcp_rack.4 +++ b/share/man/man4/tcp_rack.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd March 19, 2023 +.Dd March 5, 2024 .Dt TCP_RACK 4 .Os .Sh NAME @@ -136,13 +136,6 @@ What method should we use for rate sampling 0=high, 1=low .%O "RFC 8985" .%D "February 2021" .Re -.Rs -.%A "Ahmed M. Abdelmoniem" -.%A "Brahim Bensaou" -.%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" -.%O "https://arxiv.org/abs/2102.07477" -.%D "February 2021" -.Re .Sh HISTORY The .Nm From nobody Fri Mar 8 09:57:40 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrhRw2M9Rz5Cnvr; Fri, 8 Mar 2024 09:57:48 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrhRv6Cxbz45lp; Fri, 8 Mar 2024 09:57:47 +0000 (UTC) (envelope-from zlei@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709891867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=305Ud1iDYUmt64JJEVeEDhBxJ14yPr+m8SiLshmPdpk=; b=DlrP14kcsrZf2O9CIxop003EMAF5uK8FBw784Vf89Q33tADQf2HD8ZAGN/MRaavJIdhDTi bmaV9Ju0hjByoEkOyqZ7VhxGPB4qYSf7DpaczjhEiLZr1f3MrQLjPFLlBjJnh7jEYnip3o aP+MmwbDojOiagVqYa0OpmoCJbRbeoueCB9X1VJdDKchVUPQS4Ts/3aN4u/IwkVvJEOjZy 1UXLOjADi5VLc2yOVmD53ZFobBcci9/bT5apdNExM8raCBowQInxiEAUdDfXfXRm59W56F 4/dYvQOlJZi0q1i/e6F8cttPp53eEfE+toaPKN5UFOdSKdGRhi08GviZ02eeRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709891867; a=rsa-sha256; cv=none; b=jBhflWHnnkZDiANj1EJbyyuV8w5JJarQl5AIdm9hS+zgjLfdLXDlv4oFoV06Xmfe+PCRrq DJPl3ynoozwDfp3ZFnPWfKS7Z52cZuGKOVlzkY5LBvwfL4HRAzBBdZ3nNkUH1jbRDTv0Ch AQ5FiSlBxruPVPfm+EUeVomBeYaJOsLNJMfUJzmi9X3F//aZF/DHzUKbgHFDqdfI91HpiE mYp9WYaUmzxEWv4aJptaGAmNFLIPoPDy9KAhHXNheJzV6li1K4Qc86gV9res0sY7UwMSR5 zHX5GCLRJUheuOBoT5avq3iZny3jCOKvnJIaRH3suSKn1w7xsSM2aRJkW8ACnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709891867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=305Ud1iDYUmt64JJEVeEDhBxJ14yPr+m8SiLshmPdpk=; b=c0LMslzmhXzaWUizCXBB5h6nG27XU/VJ958DoXpKuZayjPjzimGS2T/V1+YBsgxzNY9b4a zgmobGE29xnXqhVximr18XP54dM3PxyAc/dZmWCNqhQrwmpZCFwfcXdf3j+OZAB1Qi426b k70eMmwkV9rC7tYzyZaUIIdWRPAgrYB8O1BUV7n+GbQSDYUMGFFSLffnqC5HG9SRs1ctJZ /H2git+eJl2HNgnvR1ElHK+4RsXxAeCiwhzmoiJpMvsH0QnI425rQDb2mXcemXNxCCHklJ 7nWx1WWt4W545dWSBOD1Hf6dQ7vTGqFa1t5mDmwjx+h+A0mPFJIHZuTi+2rcUg== Received: from smtpclient.apple (ns1.oxydns.net [45.32.91.63]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: zlei/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrhRt3F5jzH62; Fri, 8 Mar 2024 09:57:46 +0000 (UTC) (envelope-from zlei@FreeBSD.org) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.8\)) Subject: Re: git: 96ad640178ea - main - TCP LRO: add dtrace probe points From: Zhenlei Huang In-Reply-To: <202403080925.4289P2E4079996@gitrepo.freebsd.org> Date: Fri, 8 Mar 2024 17:57:40 +0800 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <62073048-DC1D-4A40-8325-701022E9A356@FreeBSD.org> References: <202403080925.4289P2E4079996@gitrepo.freebsd.org> To: Michael Tuexen X-Mailer: Apple Mail (2.3696.120.41.1.8) > On Mar 8, 2024, at 5:25 PM, Michael Tuexen wrote: >=20 > The branch main has been updated by tuexen: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D96ad640178ea0a8a9d1772687659dce5= be18fbd9 >=20 > commit 96ad640178ea0a8a9d1772687659dce5be18fbd9 > Author: Michael Tuexen > AuthorDate: 2024-03-08 09:21:09 +0000 > Commit: Michael Tuexen > CommitDate: 2024-03-08 09:21:09 +0000 >=20 > TCP LRO: add dtrace probe points >=20 > Add the IP, UDP, and TCP receive static probes to the code path, > which avoids if_input. >=20 > Reviewed by: rrs, markj > MFC after: 1 week` Be aware the last character ` in meta message 'MFC after' . No idea = whether the reminder mail for MFCing will be correctly composed or not. > Sponsored by: Netflix, Inc. > Differential Revision: https://reviews.freebsd.org/D43727 > --- > sys/netinet/tcp_lro_hpts.c | 44 = ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 44 insertions(+) >=20 > diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c > index 9c0d4be91d53..cd757d5a6164 100644 > --- a/sys/netinet/tcp_lro_hpts.c > +++ b/sys/netinet/tcp_lro_hpts.c > @@ -50,6 +50,7 @@ > #include >=20 > #include > +#include > #include > #include > #include > @@ -281,22 +282,64 @@ do_bpf_strip_and_compress(struct tcpcb *tp, = struct lro_ctrl *lc, > case LRO_TYPE_IPV4_TCP: > tcp_hdr_offset -=3D sizeof(*le->outer.ip4); > m->m_pkthdr.lro_etype =3D ETHERTYPE_IP; > + IP_PROBE(receive, NULL, NULL, le->outer.ip4, = lc->ifp, > + le->outer.ip4, NULL); > break; > case LRO_TYPE_IPV6_TCP: > tcp_hdr_offset -=3D sizeof(*le->outer.ip6); > m->m_pkthdr.lro_etype =3D ETHERTYPE_IPV6; > + IP_PROBE(receive, NULL, NULL, le->outer.ip6, = lc->ifp, > + NULL, le->outer.ip6); > break; > default: > goto compressed; > } > break; > case LRO_TYPE_IPV4_TCP: > + switch (le->outer.data.lro_type) { > + case LRO_TYPE_IPV4_UDP: > + IP_PROBE(receive, NULL, NULL, le->outer.ip4, = lc->ifp, > + le->outer.ip4, NULL); > + UDP_PROBE(receive, NULL, NULL, le->outer.ip4, = NULL, > + le->outer.udp); > + break; > + case LRO_TYPE_IPV6_UDP: > + IP_PROBE(receive, NULL, NULL, le->outer.ip6, = lc->ifp, > + NULL, le->outer.ip6); > + UDP_PROBE(receive, NULL, NULL, le->outer.ip6, = NULL, > + le->outer.udp); > + break; > + default: > + __assert_unreachable(); > + break; > + } > tcp_hdr_offset -=3D sizeof(*le->outer.ip4); > m->m_pkthdr.lro_etype =3D ETHERTYPE_IP; > + IP_PROBE(receive, NULL, NULL, le->inner.ip4, NULL, > + le->inner.ip4, NULL); > break; > case LRO_TYPE_IPV6_TCP: > + switch (le->outer.data.lro_type) { > + case LRO_TYPE_IPV4_UDP: > + IP_PROBE(receive, NULL, NULL, le->outer.ip4, = lc->ifp, > + le->outer.ip4, NULL); > + UDP_PROBE(receive, NULL, NULL, le->outer.ip4, = NULL, > + le->outer.udp); > + break; > + case LRO_TYPE_IPV6_UDP: > + IP_PROBE(receive, NULL, NULL, le->outer.ip6, = lc->ifp, > + NULL, le->outer.ip6); > + UDP_PROBE(receive, NULL, NULL, le->outer.ip6, = NULL, > + le->outer.udp); > + break; > + default: > + __assert_unreachable(); > + break; > + } > tcp_hdr_offset -=3D sizeof(*le->outer.ip6); > m->m_pkthdr.lro_etype =3D ETHERTYPE_IPV6; > + IP_PROBE(receive, NULL, NULL, le->inner.ip6, NULL, NULL, > + le->inner.ip6); > break; > default: > goto compressed; > @@ -313,6 +356,7 @@ do_bpf_strip_and_compress(struct tcpcb *tp, struct = lro_ctrl *lc, >=20 > th->th_sum =3D 0; /* TCP checksum is valid. */ > tcp_fields_to_host(th); > + TCP_PROBE5(receive, NULL, tp, m, tp, th); >=20 > /* Check if ACK can be compressed */ > can_compress =3D tcp_lro_ack_valid(m, th, &ts_ptr, &other_opts); Best regards, Zhenlei From nobody Fri Mar 8 10:25:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trj485qxJz5CrPb; Fri, 8 Mar 2024 10:25: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 4Trj484SRxz47tg; Fri, 8 Mar 2024 10:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709893544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqsc9/fSYWJYWcngw5qgVcKbOn1XyPcExz43gRQmfs4=; b=cLQPBQ5wLMNGIo/N6nPo4i8WqSG9B/YShZ5qxscbAJh+G4/Y1nfr4nNTZUaZ27ZV1pdDKL tjfmdhqnY/SZV98veMijH2E8thlVD7hgnqtuyA7HSoF+6DtohuIj1owJrUI5jCR9PJVnf/ 49xkHJvc+UsvSoxORTy6AalZAD3V5ga/O1YRA05l9LT4sjYRIrCaHYIOkp4KqscBUawQ4c NaK03Qbba5IDgh3ofTST91BL2tZDZpjxBP3+6Ts5FDrskT020R3coc5pGD6cIaWJVu9xbH MDh+gzaMfa7R6ON8GoTEa4L19LlcQ1LSuWwy4rdOEE7zer+6mpRCdkjM3fXFxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709893544; a=rsa-sha256; cv=none; b=VfIqalUOPttY3mIdVs35pwSG2TAz6R7IkvuQptv9HTY5rgibvTg1HhQabiqbbcATJ+klje hOLR0T7XDZfaNpuwx3tIf48UgtXx43+Jv49hqutBd9SdQlN5YZrd6iqri0tW+nmvYmnxSJ NiDSuTf3j5o+oioMOGp2KNXtH1Sqa2jm1FYwPlXzH7QbKHWWhTYnkpIhLSgO2GHq+tQ7RG s25K9wOT7P/8cWycYVFnO8Qr/G5Ha1Y+YFtnw7qR9cXLGrMjibLK7JKKziDaHm9FBVBcDW tHpce5jsQgOvX39L9sQcwCpqxDimkNm19Ldgu8xRJxfp/w1xWTfZk0FZ7DRb+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709893544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tqsc9/fSYWJYWcngw5qgVcKbOn1XyPcExz43gRQmfs4=; b=IGy5sK8FLmWGo/3oQrN2H1i6SXTEtPPJyZ/H4y0dPCGu3AdsHzjmrugzsDGXOOlrmjY2HF qZL9qoGMy00psZUxVZUGJpmnJuqZ9GXRbmw5PLpgHbbdJVqTSAIpgd5Ys7rvXf64iXRHEE ScgetYlLv/xSr1gD4K4U6pim2ArhIpg8sJa6Aw+KqS83M2HyLKqD6CwnIdJ4zVHkH36BIA 0q8FTYud6+xqPRhsS9FRaBKC75BEXpGn4CRLqztl+enUkyEVjN3iJ3mIYMZyzypiRaqZdB FWdAWRm+XpRvaj9oSnLWvEGC23aTQeTfXK5wEriO6b4pWaEdJcjaFUlkDxqxLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trj4844FDzFBb; Fri, 8 Mar 2024 10:25:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428APisG081413; Fri, 8 Mar 2024 10:25:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428APiau081410; Fri, 8 Mar 2024 10:25:44 GMT (envelope-from git) Date: Fri, 8 Mar 2024 10:25:44 GMT Message-Id: <202403081025.428APiau081410@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: 999174ba0364 - main - Hyper-V: vPCI: fix cpu id mis-mapping in vmbus_pcib_map_msi() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 999174ba03642fa63c9654752993a62db461afc9 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=999174ba03642fa63c9654752993a62db461afc9 commit 999174ba03642fa63c9654752993a62db461afc9 Author: Wei Hu AuthorDate: 2024-03-08 10:00:25 +0000 Commit: Wei Hu CommitDate: 2024-03-08 10:16:10 +0000 Hyper-V: vPCI: fix cpu id mis-mapping in vmbus_pcib_map_msi() The msi address contains apic id. The code in vmbus_pcib_map_msi() treats it as cpu id, which could cause mis-configuration of msix IRQs, leading to missing interrupts for SRIOV devices. This happens when apic id is not the same as cpu id on certain large VM sizes with multiple numa domains in Azure. Fix this issue by correctly mapping apic ids to cpu ids. On vPCI version before 1.4, it only supports up to 64 vcpus for msi/msix interrupt. This change also adds a check and returns error if the vcpu_id is greater than 63. Reported by: NetApp Tested by: whu MFC after: 1 week --- sys/dev/hyperv/pcib/vmbus_pcib.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/dev/hyperv/pcib/vmbus_pcib.c b/sys/dev/hyperv/pcib/vmbus_pcib.c index f7c825d1bcf9..3fa349b0c0c5 100644 --- a/sys/dev/hyperv/pcib/vmbus_pcib.c +++ b/sys/dev/hyperv/pcib/vmbus_pcib.c @@ -67,6 +67,7 @@ #if defined(__i386__) || defined(__amd64__) #include #include +#include #endif #if defined(__aarch64__) #include @@ -1927,11 +1928,21 @@ vmbus_pcib_map_msi(device_t pcib, device_t child, int irq, vcpu_id = VMBUS_GET_VCPU_ID(device_get_parent(pcib), pcib, cpu); vector = v_data; #else - cpu = (v_addr & MSI_INTEL_ADDR_DEST) >> 12; + cpu = apic_cpuid((v_addr & MSI_INTEL_ADDR_DEST) >> 12); vcpu_id = VMBUS_GET_VCPU_ID(device_get_parent(pcib), pcib, cpu); vector = v_data & MSI_INTEL_DATA_INTVEC; #endif + if (hpdev->hbus->protocol_version < PCI_PROTOCOL_VERSION_1_4 && + vcpu_id > 63) { + /* We only support vcpu_id < 64 before vPCI version 1.4 */ + device_printf(pcib, + "Error: " + "vcpu_id %u overflowed on PCI VMBus version 0x%x\n", + vcpu_id, hpdev->hbus->protocol_version); + return (ENODEV); + } + init_completion(&comp.comp_pkt.host_event); memset(&ctxt, 0, sizeof(ctxt)); From nobody Fri Mar 8 10:31:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrjCd1myhz5Crb7; Fri, 8 Mar 2024 10:32:13 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrjCc2gzLz4DwD; Fri, 8 Mar 2024 10:32:12 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:d1d6:8232:24e7:2597]) (Authenticated sender: micmac) by drew.franken.de (Postfix) with ESMTPSA id EFDA5721E2821; Fri, 8 Mar 2024 11:31:59 +0100 (CET) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: git: 96ad640178ea - main - TCP LRO: add dtrace probe points From: tuexen@freebsd.org In-Reply-To: <62073048-DC1D-4A40-8325-701022E9A356@FreeBSD.org> Date: Fri, 8 Mar 2024 11:31:59 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202403080925.4289P2E4079996@gitrepo.freebsd.org> <62073048-DC1D-4A40-8325-701022E9A356@FreeBSD.org> To: Zhenlei Huang X-Mailer: Apple Mail (2.3774.400.31) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:2001:638::/32, country:DE] X-Rspamd-Queue-Id: 4TrjCc2gzLz4DwD > On Mar 8, 2024, at 10:57, Zhenlei Huang wrote: >=20 >=20 >=20 >> On Mar 8, 2024, at 5:25 PM, Michael Tuexen = wrote: >>=20 >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D96ad640178ea0a8a9d1772687659dce5= be18fbd9 >>=20 >> commit 96ad640178ea0a8a9d1772687659dce5be18fbd9 >> Author: Michael Tuexen >> AuthorDate: 2024-03-08 09:21:09 +0000 >> Commit: Michael Tuexen >> CommitDate: 2024-03-08 09:21:09 +0000 >>=20 >> TCP LRO: add dtrace probe points >>=20 >> Add the IP, UDP, and TCP receive static probes to the code path, >> which avoids if_input. >>=20 >> Reviewed by: rrs, markj >> MFC after: 1 week` >=20 > Be aware the last character ` in meta message 'MFC after' . No idea = whether the reminder mail > for MFCing will be correctly composed or not. Typo on side. Sorry for it and thanks for drawing attention to it. Best regards Michael >=20 >> Sponsored by: Netflix, Inc. >> Differential Revision: https://reviews.freebsd.org/D43727 >> --- >> sys/netinet/tcp_lro_hpts.c | 44 = ++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 44 insertions(+) >>=20 >> diff --git a/sys/netinet/tcp_lro_hpts.c b/sys/netinet/tcp_lro_hpts.c >> index 9c0d4be91d53..cd757d5a6164 100644 >> --- a/sys/netinet/tcp_lro_hpts.c >> +++ b/sys/netinet/tcp_lro_hpts.c >> @@ -50,6 +50,7 @@ >> #include >>=20 >> #include >> +#include >> #include >> #include >> #include >> @@ -281,22 +282,64 @@ do_bpf_strip_and_compress(struct tcpcb *tp, = struct lro_ctrl *lc, >> case LRO_TYPE_IPV4_TCP: >> tcp_hdr_offset -=3D sizeof(*le->outer.ip4); >> m->m_pkthdr.lro_etype =3D ETHERTYPE_IP; >> + IP_PROBE(receive, NULL, NULL, le->outer.ip4, lc->ifp, >> + le->outer.ip4, NULL); >> break; >> case LRO_TYPE_IPV6_TCP: >> tcp_hdr_offset -=3D sizeof(*le->outer.ip6); >> m->m_pkthdr.lro_etype =3D ETHERTYPE_IPV6; >> + IP_PROBE(receive, NULL, NULL, le->outer.ip6, lc->ifp, >> + NULL, le->outer.ip6); >> break; >> default: >> goto compressed; >> } >> break; >> case LRO_TYPE_IPV4_TCP: >> + switch (le->outer.data.lro_type) { >> + case LRO_TYPE_IPV4_UDP: >> + IP_PROBE(receive, NULL, NULL, le->outer.ip4, lc->ifp, >> + le->outer.ip4, NULL); >> + UDP_PROBE(receive, NULL, NULL, le->outer.ip4, NULL, >> + le->outer.udp); >> + break; >> + case LRO_TYPE_IPV6_UDP: >> + IP_PROBE(receive, NULL, NULL, le->outer.ip6, lc->ifp, >> + NULL, le->outer.ip6); >> + UDP_PROBE(receive, NULL, NULL, le->outer.ip6, NULL, >> + le->outer.udp); >> + break; >> + default: >> + __assert_unreachable(); >> + break; >> + } >> tcp_hdr_offset -=3D sizeof(*le->outer.ip4); >> m->m_pkthdr.lro_etype =3D ETHERTYPE_IP; >> + IP_PROBE(receive, NULL, NULL, le->inner.ip4, NULL, >> + le->inner.ip4, NULL); >> break; >> case LRO_TYPE_IPV6_TCP: >> + switch (le->outer.data.lro_type) { >> + case LRO_TYPE_IPV4_UDP: >> + IP_PROBE(receive, NULL, NULL, le->outer.ip4, lc->ifp, >> + le->outer.ip4, NULL); >> + UDP_PROBE(receive, NULL, NULL, le->outer.ip4, NULL, >> + le->outer.udp); >> + break; >> + case LRO_TYPE_IPV6_UDP: >> + IP_PROBE(receive, NULL, NULL, le->outer.ip6, lc->ifp, >> + NULL, le->outer.ip6); >> + UDP_PROBE(receive, NULL, NULL, le->outer.ip6, NULL, >> + le->outer.udp); >> + break; >> + default: >> + __assert_unreachable(); >> + break; >> + } >> tcp_hdr_offset -=3D sizeof(*le->outer.ip6); >> m->m_pkthdr.lro_etype =3D ETHERTYPE_IPV6; >> + IP_PROBE(receive, NULL, NULL, le->inner.ip6, NULL, NULL, >> + le->inner.ip6); >> break; >> default: >> goto compressed; >> @@ -313,6 +356,7 @@ do_bpf_strip_and_compress(struct tcpcb *tp, = struct lro_ctrl *lc, >>=20 >> th->th_sum =3D 0; /* TCP checksum is valid. */ >> tcp_fields_to_host(th); >> + TCP_PROBE5(receive, NULL, tp, m, tp, th); >>=20 >> /* Check if ACK can be compressed */ >> can_compress =3D tcp_lro_ack_valid(m, th, &ts_ptr, &other_opts); >=20 > Best regards, > Zhenlei >=20 From nobody Fri Mar 8 14:10:03 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trp3012mGz5DCv7; Fri, 8 Mar 2024 14:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Trp300Zb3z4Ww0; Fri, 8 Mar 2024 14:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=USUF7jDuTrynFxX6uuu64aKbLHbwr0MziipJaJfB3mo=; b=hKz0z7s7WASbBuE7PU5OFwKrKoaEbd2owIchMmwpZKint95wGmGonL3tG7FV7XayZ6+7UT EuRK+6W8Q2sDgRIr9WH2hVRmLCJMiBqGx8pt3Xe/gmhcCc0p5fRA/RmBaq+mBcsur4JELQ l19y6uQO/NOg66srcIv+r9AlmmI/1XDfAUgjdslxRC0dQBNP0PFap6mtUP97nyHHE2vTKC qr/rA9+807lLRA6huHtu9sE7Vo+gRMwISNbyV4fAmz+bal6xd26Ac6Pux7VbnG7S0ZAx8J OZK6HE/hxhCvlbP1R6iYNuFbwwMJDVQ8OGjQbR1Mr9I2Awe2xJLTPdB9TLjpBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709907004; a=rsa-sha256; cv=none; b=JPaheA1lccu6P0F2an5o/Z94mJ7N1VWN+1hENFUc5V/qc6tzk/WAKnsvxd10yToWPN1IVP F/5jwILG79ty6F8W1Hx/uYvpMXOssFuNmeG38apf5KnYOTNg58gBVHK++WhlGAi/fOS6rE KkldVI+yw/hHLHdXXAq71qqKaXx/9sGE1u6PGLHanNxj+tNwo344R5TjtkapZSJYkVn6yb PxF2tHe8OqlCoyOGjxkcNsaQ4d15WaoESaNXWFaQb4jhZmWnVndFq/sGE1ical0DNrv01L HcwtFWe+ApS54xBlyRWIObbZqTzghrP4kIuihJMy1casBCqByKiiMsDG0DuFyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=USUF7jDuTrynFxX6uuu64aKbLHbwr0MziipJaJfB3mo=; b=QwUgufQaVTIQ3WvMudanZLHCGVVZKy18ttuikKs2ivSPch6ezQ70h6Cgv/TH+mXH4x9Y0y 5SHCO/lLFFc5AUED9iJx4J13aIEA4UBywss5u5ewlRBTo8fWjr5nQhwOinMMECAvNhWhYV Rjv6As47iFPDF27sR9sYdN9V+pGFcM9K63P0Z+z4BXERlf2SKI2vaUPOCWiqQp2PRM787J P8kvKnS4FmOXm1xMnigaPt3BAMnTGaQRo/f/B+gvlx7dT72gDblF5uPXnpjzL5JeTCYdqe AmgJxkLXtUwDtN9txgyI8+okTgYPvgi4f33ZEzZaugmiiQFB1jE2QJ7DgKxfRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trp3009mMzLLw; Fri, 8 Mar 2024 14:10:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428EA31U056821; Fri, 8 Mar 2024 14:10:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428EA36G056817; Fri, 8 Mar 2024 14:10:03 GMT (envelope-from git) Date: Fri, 8 Mar 2024 14:10:03 GMT Message-Id: <202403081410.428EA36G056817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 6e66bb9fc3d0 - main - clk_fixed: call clkdom_dump() for verbose boot List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e66bb9fc3d026765113fa1258cd12292da9309a Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=6e66bb9fc3d026765113fa1258cd12292da9309a commit 6e66bb9fc3d026765113fa1258cd12292da9309a Author: Mitchell Horne AuthorDate: 2024-03-08 14:08:22 +0000 Commit: Mitchell Horne CommitDate: 2024-03-08 14:09:36 +0000 clk_fixed: call clkdom_dump() for verbose boot This is standard practice for clock drivers that register clocks dynamically. Nothing else uses the CLK_DEBUG macro. The result is that the name and frequency of the fixed clock is printed for a verbose boot, which may aid in debugging. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44265 --- sys/dev/clk/clk_fixed.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/clk/clk_fixed.c b/sys/dev/clk/clk_fixed.c index 647ca6a05568..3f828b24c2b2 100644 --- a/sys/dev/clk/clk_fixed.c +++ b/sys/dev/clk/clk_fixed.c @@ -258,9 +258,10 @@ clk_fixed_attach(device_t dev) rv = ENXIO; goto fail; } -#ifdef CLK_DEBUG - clkdom_dump(sc->clkdom); -#endif + + if (bootverbose) + clkdom_dump(sc->clkdom); + OF_prop_free(__DECONST(char *, def.clkdef.name)); OF_prop_free(def.clkdef.parent_names); return (bus_generic_attach(dev)); From nobody Fri Mar 8 14:10:05 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trp311hN2z5DCrv; Fri, 8 Mar 2024 14:10: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 4Trp311Djmz4WjC; Fri, 8 Mar 2024 14:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FF7+YxFATct1f9G6iUVQEyKwvFYJHV3L8Fws2m/8GRE=; b=h2f5PIdle1w0zrZCALw70PUCGGV61Oa1apPNigaY1a+yqwc6/heJJL0mMZzEVLE7heYBnK vZ6/oYdbsbCaM/7vFZ5NpftEaJASE4txe2Jdc7a/+2WSF3oHleLUaJaRtscK47OT3n7a6c FQE62qc51y/Myhd9gIywMrCEhUZPLFjkjGPgD1lPVFfQjH0bmBBQ5+HGkKvdsAdENl96nB zke47iz2cD4H5W2vhbPBATlnLaoEQNkN2X6cSkkDekwuG4tY19Ij60rIXiFUNOF+Y/nVTi rNUAduKCb7cJDfXKD5S1RMu7O1DK85cl3FCzK4+NgvDo1tJTYaWkUwI281VIKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709907005; a=rsa-sha256; cv=none; b=dRJ6C0pKPhlI5kiLrM8hADWLT4Oc5HLdOpPE4ZxJjH/FcXqZFoxE0muMBWDY1q9XyoIa7r zrpbs8Yt2/QbosXdUzgM452qlK/Lza7V4PQdWrNeht04JO7HcYq2TVnnrKawJTGKLOYeaI istvbM+/wX82ZIWqOWfh7uaDs/yjpFXCc64HvIpkIW+9TllejN747msQwko738Vj78/OhV WPajvHT4gMpY5mPaP9HJMdyWTzrGafFEYt0LSYCp4+UFbc3dPyUPa6qBQHPcCXlC7iEeM5 poAeFK0FavtFBRsjoadPs8CdMdIVGY4w7ngCaeC+N5koLkMbSIt4CSmqrBQyhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FF7+YxFATct1f9G6iUVQEyKwvFYJHV3L8Fws2m/8GRE=; b=GUgj9voV4LOFctS7LI/3xxWh6kVmmwMSXKumeLyVr8kN9NJ4Bfo1751qG87y+ldZpMbIot umsoYTi5hXSKG/sGKgx1xhD/xrG+lVwds1z68Oaw7f+tuQvUscmCejEMLRzH0FYUJxA/GV +IvSmOB6e4wGdUU9/j2TPG7UoxTEkOOnwJLqIzkR6+fRKTfKxW0p12iFqxiplfBjNF3GGu RiCivsJmK3QugaQnXHPtWVfq3/Ly/RsXfPuwYJKrHywxKmY7UHhjRIuGqfiNHe31hm1zUN OZ4tGsOUA4WsoMxeXzQmR4yfNGSvJ2oIV0EZ2vuY0b1jShG+Bcvg/TALBVy7HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trp310p6XzLf2; Fri, 8 Mar 2024 14:10:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428EA519057100; Fri, 8 Mar 2024 14:10:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428EA5GH057095; Fri, 8 Mar 2024 14:10:05 GMT (envelope-from git) Date: Fri, 8 Mar 2024 14:10:05 GMT Message-Id: <202403081410.428EA5GH057095@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 1cb9f6f6413e - main - clk_fixed: quiet by default List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1cb9f6f6413e9d242de47e730ec7d4ce3e5688fe Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1cb9f6f6413e9d242de47e730ec7d4ce3e5688fe commit 1cb9f6f6413e9d242de47e730ec7d4ce3e5688fe Author: Mitchell Horne AuthorDate: 2024-03-08 14:08:49 +0000 Commit: Mitchell Horne CommitDate: 2024-03-08 14:09:36 +0000 clk_fixed: quiet by default We may attach several of these devices, but there is no meaningful information added to dmesg. For example: ofwbus0: clk_fixed0: on ofwbus0 clk_fixed1: on ofwbus0 clk_fixed2: on ofwbus0 clk_fixed3: on ofwbus0 clk_fixed4: on ofwbus0 clk_fixed5: on ofwbus0 clk_fixed6: on ofwbus0 clk_fixed7: on ofwbus0 clk_fixed8: on ofwbus0 clk_fixed9: on ofwbus0 clk_fixed10: on ofwbus0 clk_fixed11: on ofwbus0 To reduce this noise, quiet the devices for by default. For verbose boot, the message will be emitted. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44266 --- sys/dev/clk/clk_fixed.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/clk/clk_fixed.c b/sys/dev/clk/clk_fixed.c index 3f828b24c2b2..7aec5b92dfe0 100644 --- a/sys/dev/clk/clk_fixed.c +++ b/sys/dev/clk/clk_fixed.c @@ -163,13 +163,18 @@ clk_fixed_probe(device_t dev) return (ENXIO); } device_set_desc(dev, "Fixed clock"); - return (BUS_PROBE_DEFAULT); + break; case CLK_TYPE_FIXED_FACTOR: device_set_desc(dev, "Fixed factor clock"); - return (BUS_PROBE_DEFAULT); + break; default: return (ENXIO); } + + if (!bootverbose) + device_quiet(dev); + + return (BUS_PROBE_DEFAULT); } static int From nobody Fri Mar 8 14:10:06 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trp323pqPz5DCmj; Fri, 8 Mar 2024 14:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Trp321llNz4WlV; Fri, 8 Mar 2024 14:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMDrre9Qag8Gy+yy2x8t3bXXMb+BdMqHW66YYl71ha0=; b=y3l7hmOG8JASNeJtgbCH4kQblyziR1RcSPXpsCzh4Gwry5wgXnsYfXBkt21kkwbw24icYA 9CsPRE/suZrQ2klkkFJdOww6AGxKuyAEzBFpgWGnUAz1bRCgv38yR+6PC5VuBmrY077MkQ v/p5HWZ93FJYMHtl+3dd4ayiOIASZa/sOTlAm52BpR8eODCzd+K/ouexvbeFWiuCB+1cQx ySv/enuvAwerTA/I0SaIlDlVZS2aIjnbVkoztRrJCtCQ22cMUICvnidPJ6GQOrl9D2iz1b syeOZlWizM+kbvkmrfcvOepBx1pbHqoK2UtT9B7vnwpb8r1htzaqPKHnBWGaSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709907006; a=rsa-sha256; cv=none; b=r7t9sZe591Tl5vqKIPVzDf7CAryaDseo8qQv0MNHrZ5MHjVtm1SMeQ/a0CILVoO63z9HX/ py90J7uELowZoABJ2Sf8Q0nuALqx8oPxdV9dyOa8A7HOKay/nFxPLW8wGlw+GjqJvLF0qw e13EuwUOO83UQE3FI9cGvr8iiJMHP0RmD0EL8VHOKgCnufj41lUXsfyQMj7+0RnzBEz7c8 H87hS5+sKg85wHgLsAjp116P4OAzkdAvDmGCOtFOhVNJv9XYtz6XljawaGXvRhzfIuSKLt +lcXcKLi7+WTMfNHzNC3hbheBAd26W9wZOvTIhaSDpnwbyl/k9gN+cKBispZbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zMDrre9Qag8Gy+yy2x8t3bXXMb+BdMqHW66YYl71ha0=; b=wTMUhAwTAUpq5Kx5pjUeEMtQPyLrUf3zbBGzWIJxDep0tYOWJTWHQXyi78+sij/yIe99Wo PDV9Nx/ERTlgYRAQe8g0C1+AmbWzSTh3ZzpymLm/sH32+54yp9yeKunv/oJ8BjR5HOSk36 0t5HO2oFDzmAtQMjFF9r7e9jZdnNg+YLqwSxYOUgvfRuIH0FSX9WTDYF4N1O3v6+p6Orzu PAQItL+CtHAYB8qnhgKzUNeeyi9l+OcGRYj8VJwWmXrYEltAm4/ERpEgrHugn5+wkpKxMw a+64U9G48yftCJDEczpmKCs9fJyvNAPRgMN5w6IH/j9ujj54M7xeTsYtJb8yvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trp321LKtzLwK; Fri, 8 Mar 2024 14:10:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428EA6WO057374; Fri, 8 Mar 2024 14:10:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428EA69L057369; Fri, 8 Mar 2024 14:10:06 GMT (envelope-from git) Date: Fri, 8 Mar 2024 14:10:06 GMT Message-Id: <202403081410.428EA69L057369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 08635c51d1e3 - main - clkdom_dump(): improve output text List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08635c51d1e34f8a3e42c7cf35dc7264a5b68118 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=08635c51d1e34f8a3e42c7cf35dc7264a5b68118 commit 08635c51d1e34f8a3e42c7cf35dc7264a5b68118 Author: Mitchell Horne AuthorDate: 2024-03-08 14:09:08 +0000 Commit: Mitchell Horne CommitDate: 2024-03-08 14:09:36 +0000 clkdom_dump(): improve output text If the call to clknode_get_freq() returns an error (unlikely), report this, rather than printing the error code as the clock frequency. If the clock has no parent (e.g. a fixed reference clock), print "none" rather than "(NULL)(-1)". This is a more human-legible presentation of the same information. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44267 --- sys/dev/clk/clk.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/sys/dev/clk/clk.c b/sys/dev/clk/clk.c index 52015d4e2905..5c74d84cacc8 100644 --- a/sys/dev/clk/clk.c +++ b/sys/dev/clk/clk.c @@ -512,10 +512,20 @@ clkdom_dump(struct clkdom * clkdom) CLK_TOPO_SLOCK(); TAILQ_FOREACH(clknode, &clkdom->clknode_list, clkdom_link) { rv = clknode_get_freq(clknode, &freq); - printf("Clock: %s, parent: %s(%d), freq: %ju\n", clknode->name, - clknode->parent == NULL ? "(NULL)" : clknode->parent->name, - clknode->parent_idx, - (uintmax_t)((rv == 0) ? freq: rv)); + if (rv != 0) { + printf("Clock: %s, error getting frequency: %d\n", + clknode->name, rv); + continue; + } + + if (clknode->parent != NULL) { + printf("Clock: %s, parent: %s(%d), freq: %ju\n", + clknode->name, clknode->parent->name, + clknode->parent_idx, (uintmax_t)freq); + } else { + printf("Clock: %s, parent: none, freq: %ju\n", + clknode->name, (uintmax_t)freq); + } } CLK_TOPO_UNLOCK(); } From nobody Fri Mar 8 14:10:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trp332fkxz5DCkS; Fri, 8 Mar 2024 14:10: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 4Trp3320Zdz4WwS; Fri, 8 Mar 2024 14:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5gUP50FVTvNtEDFHETuzq9ceNof2UVsQ4FPQe2pBuS8=; b=N/YeeQxF1nI9VNv+rexo1LOKapAPVhSNItivdcrdJ5nRHLcmE2ctpUdvS3gD3FKdYI/B+h wsNE0SgsexBsJHxgGTTLrKHjB7yVs/Zp8dXIuRfAvL0NxyJTH0ugQjmVTmuhSOUTEM9om3 +WSeVRdVUA5b4Eu39EYb2mi2okTPOAWHpebCeaGD4PGAdQZGtg1YFIPgDduMg28HfMqGz5 08vj/HzR2M4v/UNm+yt742FrhVzBOzNRA44sAhy7ZZKpHWrTmpDt0x1Qh0CmaHw1KMaM+O jW4XmHlixznRVk9l8DLynRpXKj6V9pW5RlM7NGtU66QRY309KqSpJDZVg3WF3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709907007; a=rsa-sha256; cv=none; b=DwrCCwico6wvgdj0omJpUgSfN6vnj7KD5VY75PCyaF5iXghL45uq0WePJ1H/xONoRMwm5a TrFE7lTBoSGGGwvVVk/pg51x27YPmVjJqHbD64muwb+7j5BCqiwlcHjdVI55hROMVc9mzP xf1y0AdX70UuReugbdgeT8kBrk7WPZTguh3WioWz5sjcq1JhIZERQIBIhVxkvsPEbMoQB2 MrV7GOGOegtT3QrtyOOt1IqyBA8l+VvN4o/acMlNOPhdWNxr/QMtTj7Pd4s53kR9kwx/sS qXyxgByQwD7k+5ckxBdgHWCgn+BpVzwGhM5sWWEUUJ7/Zii9pdpWoBaDdr9uAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709907007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5gUP50FVTvNtEDFHETuzq9ceNof2UVsQ4FPQe2pBuS8=; b=ArS2XYJuHactdnb0aN40VY0KQlqVzuAbyox8md30odo3/KQK60n7TM2IP3TQiG6jc2z4h2 QRNR273OpUZHhCQ953cBCxNCyBUSxGTD6k8QtX7L9UpFe5y72/92UU4fw8TqGoyyDKH9Oj z5PWg+EfWa1wafnUz2wK+pGN/5G7PdXJjQg9ph/AICXpV+boFEasBPkjqwgmTt9X77kI66 kXBrB8l48cpTS6a1mlqlpVZ6UqIGhNmeH0Lx+ZDmjVpWg48u035no8x2AkW2cePsErTvUx J+oztQnJm0ga56wa36Q9LhMM+RTHBc87mN4NhA6Dgl76yHR5zn0pXKqYLKxmPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trp331cwQzLhB; Fri, 8 Mar 2024 14:10:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428EA7BB057646; Fri, 8 Mar 2024 14:10:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428EA7JG057642; Fri, 8 Mar 2024 14:10:07 GMT (envelope-from git) Date: Fri, 8 Mar 2024 14:10:07 GMT Message-Id: <202403081410.428EA7JG057642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: accda7815317 - main - simple_mfd: don't attach children twice List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: accda781531788a814bc438e1e96ef544c12aeaf Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=accda781531788a814bc438e1e96ef544c12aeaf commit accda781531788a814bc438e1e96ef544c12aeaf Author: Mitchell Horne AuthorDate: 2024-03-08 14:09:17 +0000 Commit: Mitchell Horne CommitDate: 2024-03-08 14:09:36 +0000 simple_mfd: don't attach children twice Trying to probe+attach the child device at the point it is added comes before the syscon handle is set up (if relevant). It will therefore be unavailable to the attach method which is expecting it, and the first attempt to attach the device will fail. Just rely on the call to bus_generic_attach() at the end of the function to perform probe+attach of dev's children. Reviewed by: manu MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44268 --- sys/dev/fdt/simple_mfd.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/fdt/simple_mfd.c b/sys/dev/fdt/simple_mfd.c index 3ca7578d234d..5228c6998821 100644 --- a/sys/dev/fdt/simple_mfd.c +++ b/sys/dev/fdt/simple_mfd.c @@ -168,7 +168,6 @@ simple_mfd_attach(device_t dev) { struct simple_mfd_softc *sc; phandle_t node, child; - device_t cdev; int rid; sc = device_get_softc(dev); @@ -203,9 +202,7 @@ simple_mfd_attach(device_t dev) /* Attach child devices */ for (child = OF_child(node); child > 0; child = OF_peer(child)) { - cdev = simple_mfd_add_device(dev, child, 0, NULL, -1, NULL); - if (cdev != NULL) - device_probe_and_attach(cdev); + (void)simple_mfd_add_device(dev, child, 0, NULL, -1, NULL); } if (ofw_bus_is_compatible(dev, "syscon")) { From nobody Fri Mar 8 18:44:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trw834nGdz5DcjH; Fri, 8 Mar 2024 18:44: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 4Trw83451lz51YC; Fri, 8 Mar 2024 18:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=toVWAeFGE6hjDKOhJa+hByhV3bfiT4/YgbReve/9PWE=; b=RVVCR7CLKz8bMw9WPLNlnvZQS16asrjl0SiWzLj42QAG7dDhMSSK+8Db0BrHlUk519hDpy PQ3zXD+lsbeCE6ndKO7GdF78Gj8okp1PTGwL07KDiLYM80+KdEiAyEFTOexf1BPwwnI4L7 gF5QzAzg65vKsheHqBYZ97Eufzt8eYlYTPO+5/FwEMC41ado6tXkLzRjMtutg0zHe/Dq5y VZYw9Ae41lQ3Esry2ay96hNPLCDO0POg9uQ3c6c1Q5uwmK8Rm/JIgPnGTqaAqxfhA/mavp T6Ea3D+EZJIy2VGZSylvw7U7frLA14gy2ZJUZ0n2XXTpfDxVdc2tZgsmNiTn/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709923491; a=rsa-sha256; cv=none; b=VSfRvMhMR3dE2gWb3aiKmHRFWbZEOnjuGTQ7W2YQnwTZHk6OvLqpxCvDu5s2QMWw5XPhIU kCfR+23LfKWxjrltawOt7S7tAsXR9wuEHopoFTcLcMLxF0vqlBOjwGS2G2CaeaBFFiNb4z 8ZVYozEombtO7N90/XesB6AshwDWv5RFkg/MjHNGdC5pG1EZJ9H6QOcqZgC+Y5Cn1VKiTQ Xi5ZbfEMVnPRrX110TEc5VSm+gMWAcuAd80EbfPLR+stkj4qpcFpyChyMZpy32KvKk2uE9 zRjB24EzyetwMCGSv1o7bhTXhKFGu0mkZ9AI8AaS6guTM4GJVKrUqDyrMKg1Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=toVWAeFGE6hjDKOhJa+hByhV3bfiT4/YgbReve/9PWE=; b=lWD/r0++zoDI0/X6GRwyuP+rjgxlFeKht0sMRP+WvhcE1+wPAvbHqh/MrK1IFGq9Zj0U7D 9q32GZn6DzfcHfsCBDJRiBo9cxLBDj8Ai0RKryldkiozqWunMR/Y0zCu1kiFGckl+yktFT IZL7LjDNpvNYjr9zJxHNtBZNGIQM0x38Xh1t7t2klrMvzAVhSm+ciIdyWIVcetN02gr1+B HYkxLMf8MpfQXnvBBioBiPLyeLtST6d6SC1Mo4ub+uAmDKUAGnQviZL3q6oVT8/fno6LIm 5c8mdnzHfnrh8ltcS4vBppMEM0kjgcfZUZ9jqXjvt+ve6/ogCc6DT81vNVXVSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trw833jMMzVdY; Fri, 8 Mar 2024 18:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428IipxZ025174; Fri, 8 Mar 2024 18:44:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428IipOt025171; Fri, 8 Mar 2024 18:44:51 GMT (envelope-from git) Date: Fri, 8 Mar 2024 18:44:51 GMT Message-Id: <202403081844.428IipOt025171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0724293331e4 - main - nullfs_mount(): remove unneeded cast List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0724293331e4c35c0a8cc5b8922a153545725c24 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0724293331e4c35c0a8cc5b8922a153545725c24 commit 0724293331e4c35c0a8cc5b8922a153545725c24 Author: Konstantin Belousov AuthorDate: 2024-03-08 18:37:43 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-08 18:44:21 +0000 nullfs_mount(): remove unneeded cast Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/nullfs/null_vfsops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 04a3817a828d..7ee6ce53fbde 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -170,8 +170,8 @@ nullfs_mount(struct mount *mp) return (EINVAL); } - xmp = (struct null_mount *) malloc(sizeof(struct null_mount), - M_NULLFSMNT, M_WAITOK | M_ZERO); + xmp = malloc(sizeof(struct null_mount), M_NULLFSMNT, + M_WAITOK | M_ZERO); /* * Save pointer to underlying FS and the reference to the From nobody Fri Mar 8 18:44:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trw850mDjz5Dckx; Fri, 8 Mar 2024 18:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Trw844swSz51YD; Fri, 8 Mar 2024 18:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uk522Dw6oeOtIATYuR0Y5coUk9wced281fKZMNO5Idw=; b=EYjCx3E914dZL2UlNe3AKSIZrYkItMbWkhZzTE0aZgHi3h+zgmi/WYGziOxuFp3VWtjsxa iTkps6RbI1quO9KFCjlS1UnWOy+v9nxoutSvoNwEGHUrhCW+2lFz/hYxoHO1Fx4LpTJnMD 402bt+Jc0P/4jb6WY2zuuiNGNr1CY7j18LvZy8/nOU0vdlDLsLP2TmBKz/Bu1QUJGCe4gr D18RQHfZgVjsjuctde3JwHXiWp6oE08Ho/8/oCLfsrik03ZT9hF66JTri9CnQvWezIt01j /on8VNc8ehxUNTv8I29006Ra8/2lIDFZC7EID/fvaKJ4J9G9Q5bvq7PDrjVarA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709923492; a=rsa-sha256; cv=none; b=ucSZOpozP+MPUcaO62NfVDOG2/JGzbfC5AEf0vxsbiMe3ADVOygnx8C8Yb1RBYdSien5P0 s2WAmOsxLIKg9xLaZgBaPq6uS39E0/oQZvX7BNQbqndeCKXUn7ShTa8MjwzGwBS/tEgCdb whvEqNcZ0YiHHBlMCguooM/5PDMasfrUE1GCCs1QQCSg40lvtF9x0bx09rrcjx9+S0npAH zHYk7yl+UKsJypOPp421z5yXohinVvDXHopbzglv0//+FRtmy84VjPB3rGwrPlUCeKISx3 T86NaSLijMH4JATpJPvwdsNifzcOCTaNW8hyOClvIAr31q3f9c5fUW7kGa71Fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923492; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uk522Dw6oeOtIATYuR0Y5coUk9wced281fKZMNO5Idw=; b=DGHKAv+GbuwIsqjCfyiaNgmyqk2W/juXo2TmmTaY3FoCZyzkdaCNPmMvMz/T4axVW+RmuZ 5DSmucpXWsbE/ufLucCaxkg/s9yQkvtGPgaEDEWwTwhrd5Nwy0d3x3lQVRkqCYMTQjGdN4 wpaGwLpxBYuhhkrOIAaH02h9FWLFOWfizI+Sp7SUPUtuz/+qKWkW+3YkGqQqGyr4mLob4e a6kjHdijjWsyiCx3XVHUd41ep0wjBh9DKz8JAIt+zpCV7YDS6rDXWdRs1yrTiQCllDs0Sw Qm2DrsjqwF8D3J7cdEGPI6DVPBOWposVRctSOdOkJFGRjjiWGxmE6zRHRsVqUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trw844QcSzTrl; Fri, 8 Mar 2024 18:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428IiqEE025213; Fri, 8 Mar 2024 18:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428Iiqjk025210; Fri, 8 Mar 2024 18:44:52 GMT (envelope-from git) Date: Fri, 8 Mar 2024 18:44:52 GMT Message-Id: <202403081844.428Iiqjk025210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8921216dbee6 - main - nullfs: add -o cache List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8921216dbee6884532e22d5347cff4d9ed23e782 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8921216dbee6884532e22d5347cff4d9ed23e782 commit 8921216dbee6884532e22d5347cff4d9ed23e782 Author: Konstantin Belousov AuthorDate: 2024-03-08 18:26:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-08 18:44:21 +0000 nullfs: add -o cache to allow overwrite global default if needed. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/fs/nullfs/null_vfsops.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 7ee6ce53fbde..63bdcd4788d9 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -205,12 +205,15 @@ nullfs_mount(struct mount *mp) MNT_IUNLOCK(mp); } - xmp->nullm_flags |= NULLM_CACHE; - if (!null_cache_vnodes || - vfs_getopt(mp->mnt_optnew, "nocache", NULL, NULL) == 0 || - (xmp->nullm_vfs->mnt_kern_flag & MNTK_NULL_NOCACHE) != 0) - xmp->nullm_flags &= ~NULLM_CACHE; - + if (vfs_getopt(mp->mnt_optnew, "cache", NULL, NULL) == 0) { + xmp->nullm_flags |= NULLM_CACHE; + } else if (vfs_getopt(mp->mnt_optnew, "nocache", NULL, NULL) == 0) { + ; + } else if (null_cache_vnodes && + (xmp->nullm_vfs->mnt_kern_flag & MNTK_NULL_NOCACHE) == 0) { + xmp->nullm_flags |= NULLM_CACHE; + } + if ((xmp->nullm_flags & NULLM_CACHE) != 0) { vfs_register_for_notification(xmp->nullm_vfs, mp, &xmp->notify_node); From nobody Fri Mar 8 18:44:53 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trw860zmsz5Dctm; Fri, 8 Mar 2024 18:44: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 4Trw855q8Gz51KP; Fri, 8 Mar 2024 18:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6iMELBahz4DdyUs8AaCXYcFmTyan237JQBIrTBQKqbs=; b=bQ1Tv/ZHN9980vh09whdEzlpjVe+a06LjLhCZGc3MvfpsJ3dK4KpHa6N26E2Mn35jhNKdI qJVCjGCA7Sz19exrGbNZjXxb0q3YkusvV2CEr7wIgeNpm1zaEmaOsQLa3+NOodyCvpUmZ2 6DnHT8VSd0XmHofTFRzH6aA/+XH09QRdyI8K+tmLerwPO67PDwx6nuFsmWnim/Sagwyr3A VNDtnPzkRQSvZVo6ZkBIRymbbY03byzZlYBmkLubti/zBcheLeDj+mZd41+bUdRlA+CpaT gMq8apwaagyS+SjEIxwKoUWcIWYa/fNyqUXI2x9FzttReRmBLzSe/U7yRfukOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709923493; a=rsa-sha256; cv=none; b=VxG4PPxMxhj0XQA4JXLUHOIO5LutZpFsUoRdEWPt+MfkAfa2KOFsISgHbgow8DeAID7wjs OxIrFUSZCwFjUStmEWF425uQZUgtwCXAa5Lk9jFuoHFENhc2Ulu4NAGFII4mWTkQ4S9Ce1 9aOTbWPoHE5k3TDjFZi2Y6kiAKISseqFn3GO2SJAQ2LReztFrYwaXXuAHHakDIrYrBT+4k 3lQqk+Gsm/W0maB5wzDxTRivnqFQEPunr9gB9VkriCsVj6lMFQwIfCltA3fHBGlu914b4L BAluHGbHBw9rqYcyBM6+RT/zjUNOAtp9dFYDCAh72dWeWOPnLpzjTlDyGAODwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6iMELBahz4DdyUs8AaCXYcFmTyan237JQBIrTBQKqbs=; b=qsaF44C6N1aeENqlDqHshD+fAw8lVIwmswrx4pEi0/CQ1SKiEdnCPVD2uwk0c09IFwIIcB yPoupcJCE3bfT4Afd40jwlhYlJ2hkzBB00PmJ05RCBGaYRXNxz8wlT3y5PyvlECeZEvFSy fzsAv44Rf0G1LqWhxzA9ZHRuYjS4nPAVPMsZDeaTFAotwbWmpfLFDTayXmUd0Cg3kEuD9y lazJ+0HBsj6x6sjLZrbp4h1vBnOAkxtI2Emi3EW4wY9Lppqp0i4haOCgewfDs5YnvZO3rn b0y7sUCsqYLVedIUBxoOe3AJWGT2pNt2bx+UxTzO0mDgj8+/G2AG6w+kBMyKsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trw855Rl8zVg3; Fri, 8 Mar 2024 18:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428IirZF025260; Fri, 8 Mar 2024 18:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428Iircl025257; Fri, 8 Mar 2024 18:44:53 GMT (envelope-from git) Date: Fri, 8 Mar 2024 18:44:53 GMT Message-Id: <202403081844.428Iircl025257@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4a2a69c4472c - main - mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a2a69c4472cf677f8dfc026fff3dd33c83580cb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4a2a69c4472cf677f8dfc026fff3dd33c83580cb commit 4a2a69c4472cf677f8dfc026fff3dd33c83580cb Author: Konstantin Belousov AuthorDate: 2024-03-08 18:26:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-08 18:44:21 +0000 mount_nullfs(8): document -o cache and vfs.nullfs.cache_vnodes Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sbin/mount_nullfs/mount_nullfs.8 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8 index 940cb1650a31..da7eb8f3d58b 100644 --- a/sbin/mount_nullfs/mount_nullfs.8 +++ b/sbin/mount_nullfs/mount_nullfs.8 @@ -30,7 +30,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 11, 2023 +.Dd March 24, 2024 .Dt MOUNT_NULLFS 8 .Os .Sh NAME @@ -90,15 +90,21 @@ See the .Xr mount 8 man page for possible options and their meanings. Additionally the following option is supported: -.Bl -tag -width indent +.Bl -tag -width nocache .It Cm nocache Disable metadata caching in the null layer. Some lower-layer file systems may force this option. Depending on the access pattern, this may result in increased lock contention. +.It Cm cache +Force enable metadate caching. .El .El .Pp +The +.Dv vfs.nullfs.cache_vnodes +sysctl specifies global default for mount-specific cache/nocache option. +.Pp The null layer has two purposes. First, it serves as a demonstration of layering by providing a layer which does nothing. From nobody Fri Mar 8 18:51:57 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrwJF3crMz5DdHG; Fri, 8 Mar 2024 18:51: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 4TrwJF3BYVz52Zy; Fri, 8 Mar 2024 18:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AILfZkZ35yKVn/q535cSYuGF6M9B/ljGZIUiT5VNvmk=; b=Fr9Op41KJKNXEryIggdvBd7OqTxpIi6aOWwrB8TvRDeU3ytTGEpmMuU2RXpW7WmcPDjTD9 2qb2o6pxPrkIn/Qc+wFVY7dN8hKO3Kguuo9/EmZTUinhyELKSwle2+1VnL9OXqUiRM1q/y W7ERPtC/T7lQtp11ZHnOw5VOTkFxQOg3K54dKheODOcx+sUmLiC/9fawY9JSUd2POpKOAj IOwLkbLM/vKoKXdKhqUQ7U9jBugzoRQF5DzCUqIzT702C7i5Frdv80edeaHespVUzFV5GJ 6Si/VbTQOqRHhIlmJsTMWEs7fHmZlef1Cs8UoADpjJcw+TWrFSU1Klko/xTyZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709923917; a=rsa-sha256; cv=none; b=cZI7sqQQ6c8FfBociBbfgQ2QZyqcH1k7E1nOGamSjXtix+VFWHwQhArNVNodj7747HJul5 MrbYG0ClFl/II96WOv5E/JOdPDejr4MyqdTcEzQJzVkdqP8HyOQtJDMd9eYXQ0LNjvFWld jn+65TS3We6osseAhPipYZCfm1ZQYqaE/vhOt9QjUvZFhSRTICPHe8ToxUFIIm3avH1Z9Q 35/+9oUS+BxOeMHMXacMK2OHU5KibCUvcw2aJ7CURf8HoU7IPPTOApM8gAC1YunOSOdoO/ QBGAx4OQ6txL5jWq/FMMlornBeLVVa8aj2DvLkwNeyS5sEIbN4dgCXko2NZYDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709923917; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AILfZkZ35yKVn/q535cSYuGF6M9B/ljGZIUiT5VNvmk=; b=P97ZrBJdmk7mqcShzVrY4Zo2jdKiuDTJfxHyfibpnEBdtNniZNdJpXDjqqHUoCG+jgM00v fhI+c0z4pW4nHJNxgEUgh3polCSFESNseezF3uLhwzDOUsrynvI4RnB9Vk0WoCaFHm0ZSe Xl1TxoG/jsy8aqjcf64lH97Qp/2+nUVHkBrW0zhivC7k01Azk86y6LFAwNzvboM933vL6B Hmcy0HkpxpZhERb2AeNQT5vyGOHI4E5vVRJ2ZH/032Dcgw3wZE3mGeV0jXKpul8Eq5ikbY tXKp0HVmn61+MtEJoJk8XAY7FHfoQ3MTO7UtmjpoGzGniWygxwXmTjQS5xIPaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrwJF2pFdzTPs; Fri, 8 Mar 2024 18:51:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428Ipvib039362; Fri, 8 Mar 2024 18:51:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428Ipv1c039359; Fri, 8 Mar 2024 18:51:57 GMT (envelope-from git) Date: Fri, 8 Mar 2024 18:51:57 GMT Message-Id: <202403081851.428Ipv1c039359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 4e8d264b0057 - main - nullfs_mount(): fix whitespace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e8d264b0057e80ed2c1086da30d5e2391d82ffc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4e8d264b0057e80ed2c1086da30d5e2391d82ffc commit 4e8d264b0057e80ed2c1086da30d5e2391d82ffc Author: Konstantin Belousov AuthorDate: 2024-03-08 18:51:04 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-08 18:51:39 +0000 nullfs_mount(): fix whitespace --- sys/fs/nullfs/null_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 63bdcd4788d9..a15a5e22673e 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -213,7 +213,7 @@ nullfs_mount(struct mount *mp) (xmp->nullm_vfs->mnt_kern_flag & MNTK_NULL_NOCACHE) == 0) { xmp->nullm_flags |= NULLM_CACHE; } - + if ((xmp->nullm_flags & NULLM_CACHE) != 0) { vfs_register_for_notification(xmp->nullm_vfs, mp, &xmp->notify_node); From nobody Fri Mar 8 19:19:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Trww62tCFz5DgKJ; Fri, 8 Mar 2024 19:19: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 4Trww62JrZz54VJ; Fri, 8 Mar 2024 19:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709925574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0DCAspaX/lntnH5R97IuWZJrSFnfwM5kVQQ5eDsXh+E=; b=g7YguYqm1X8CrWC+i2L1FrE1Tpx2/ADlwAmUHalTyThxvD8c9Hg05DWwdg0rRJCArUCOLO MkGkXoQfUQaFgJIimIpThCcgTTWggzhzIP5OVJjDTTguLjZDIlYr9PRVHGnkukDoZ1cV1e j5DnAWDRAdhVbpqmYsW3SBn0GwYdd/nFKAMEEdULfCnBdYArlL6G0kBZ+td8roQov3e1C1 BUMTnMvNqm7uxqH52xNOuukZ0fb2bgqNqBNtjv51t6MWbP6O+HHKSRVRDBeA+iTlzmIFTC OrBZjHgyxoXn1HLUwF3NHXXP/Wy1iFTQNfYOzWReKZwO8xSG6MGosisgmCuC2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709925574; a=rsa-sha256; cv=none; b=wzC/WikxQBor+nCViGFGE75fEK7O3Eh4RWmhggWwECXn9NCdG7KWdRIyK43k2IK7Jzzqut k3Nb39ITrWQKpjCK2r7DUPtcm3LgdsSEucT4touw+yZd86J8Hom6ii2AqnT4IYceXQ4sCJ SVYlw2bZKpQDHxMlgktMudckVOOnoBJb4yp44ttxmrXSbcLrhdIcsxkHYHbYBdgF68DhcV w+AA1IpIiQOOmZTNr5mVhxm7ONYnurOWWpw+b0nOkOYoDQJf+Hu2E5MUD4u+2kdVRaw5g+ SXdPcv/xshYZ45x9Smwl626IS31yt7G6TkLZzH5TDD9lyIrewhnwlziPNtzdRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709925574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0DCAspaX/lntnH5R97IuWZJrSFnfwM5kVQQ5eDsXh+E=; b=hoPIAv3ftZXApBWGJO1iNNSALr+iMYt9HXh5JaoKEYsykq/y06ZsBVD9WRQHJ2OH6wqRi4 E9sfLOCSmH3+XCsxAegEvzN28ITRHu8HcDB0XOVqZIunOvwNhs5EKPdBWjx3JQlaIEmUpz lPKMMLH9cqhKZqPDkUcwfQQi72z9Tu9fNeZewciTMXO/YN5MDYEJ4cIXAbSDQ+EzajXOCh tnnW7ppyel5TIhCU7V+9WCw/zRXISs0G2feBDWg4OrQgt23xh5m/B/veC9X6vrer/oufrg GAZzxsf7nmYXCe+nujXYDAryW9TrBfBtvlHDfvQMNhcTXMjOtvX6R3g5ax8ZhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Trww61wB9zWPW; Fri, 8 Mar 2024 19:19:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428JJYpt077520; Fri, 8 Mar 2024 19:19:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428JJYAI077517; Fri, 8 Mar 2024 19:19:34 GMT (envelope-from git) Date: Fri, 8 Mar 2024 19:19:34 GMT Message-Id: <202403081919.428JJYAI077517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a650ec0e55a9 - main - lib{c,sys}: fix incremental builds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a650ec0e55a9e0511321fd3e311bbd3aa46bcb12 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a650ec0e55a9e0511321fd3e311bbd3aa46bcb12 commit a650ec0e55a9e0511321fd3e311bbd3aa46bcb12 Author: Brooks Davis AuthorDate: 2024-03-08 19:14:24 +0000 Commit: Brooks Davis CommitDate: 2024-03-08 19:14:24 +0000 lib{c,sys}: fix incremental builds I removed lib/libsys/{aarch64,arm,riscv}/syscall.S in favor of an idential generated version. We need to clean out the .ddepend files to ensure the generated version is actually generated. The guard here is technically too strict, but should be fine in practice and I've verified both the breakage and fix on an armv7 build. Reported by: imp Fixes: e6ffc7669a56 Remove pointless MD syscall(2) Fixes: 0ee0ae237324 Remove pointless MD syscall(2) Fixes: 7b3836c28188 Remove pointless MD syscall(2) --- tools/build/depend-cleanup.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 4dfe694d5c0a..e327ee40a6df 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -218,3 +218,13 @@ clean_dep lib/libc fstatfs c clean_dep lib/libc getdirentries c clean_dep lib/libc getfsstat c clean_dep lib/libc statfs c + +# 20240308 e6ffc7669a56 Remove pointless MD syscall(2) +# 20240308 0ee0ae237324 Remove pointless MD syscall(2) +# 20240308 7b3836c28188 Remove pointless MD syscall(2) +if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depend.syscall.o && \ + grep -eq 'libsys/[^ /]*/syscall.S' "$OBJTOP"/lib/libsys/.depend.syscall.*; then + echo "Removing stale /syscall.S depends" + clean_dep lib/libsys syscall S + clean_dep lib/libc syscall S +fi From nobody Fri Mar 8 19:45:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrxV83x7lz5DjLb for ; Fri, 8 Mar 2024 19:45: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 4TrxV839YJz56fr; Fri, 8 Mar 2024 19:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709927136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzRBJGckU+U7ES7Ji3iALGTefNhHCfLg/uK9Xi914ys=; b=WwK2A8/o6Ljz86g1ze9zHtLwLltFxNqQFluVLDZ0eXkEbA2qc7EpuEkYtnLY0iSOuGNcRa dQ1tur27INxkA3+Nua5jS5F8l/9mck5umsy7Pik07zLCkf6k5UNiBbPI/MEYt9pk6nZ4Pz 1X7gDdDmEYsYdWi2Txfht6YP5XdK7lP8dzDLRO/kOLPo+6yOjYmtwaFlH1hr4j9YhzAPJi A7oVpismx4Z2wz5sceZscmUadkPn11vhlYwEIrNY41754GulgCk+KAbxvYGvWx2XjWCdbb jscpFPjz0hI1A796gI6ByCRoJWJNhQt6UJHhA6WU2jBT83h6nwIdOI89p2y2yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709927136; a=rsa-sha256; cv=none; b=XlbbsW04UAXMFaSxY6+2IY+vVyzePdLHjAJ54u2pNERKtZJIb17mr/b7UMOuVyBos7geCX bjB7HAcB/zbuPuCjOWbV2V6Rxe/F2sUYjKHTY0TZPM8UHj2xpclr08EuCJY/PQIf4WQ7Ul SJdk5JEJN6l6nv0xDJK06YfJ0Gzo9oPPIAFl+G6loT3U2j09SlLPplvembmIelGnhAcSMm D7Z3LHv5WYtXDrh3WZ/BZRx82TzDTgoSrsxZeAthWSXf2t36k/D1H4LRYWKvk/zGQc4iSC G/eQOmqTYoPpTVGhVh8i+C7xaEfi9YIKMDSQw5z3/aiBRlTaYEfBPMKDimrolQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709927136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kzRBJGckU+U7ES7Ji3iALGTefNhHCfLg/uK9Xi914ys=; b=VSqEMQ925pxjL/sitZqy2LynWyhBRTddkSc37f46nZl7nNQrAbvmsbtaoUp8P9Z/SWdxEo RL7DkVEmrQvWINYS7ENiwdI3oH/MhsjfbeUriUn/g+VSGGLF8iSVLuIQevdzT9T31po8wj Xxp4/HEeoh2RbGrVdEa+KgNQmw+E4bLf461Rlnn8NmZSiqsJugqiEYCKGpQfnBF94hMtoY Xw2r1HQa4R+ADhuJkwsIWpg1+Z7wh/bz+Nbtse8i07zNC2D7Ly/xxcMd4bJH8QziGKpD8t 0lF+JxjNZDyDUoAJDybHgeOcju9U/OcoI2X/zBSzz7uVBBPMdTgbMlO1uW/rzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrxV82g16zXck; Fri, 8 Mar 2024 19:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 428JjahB026359; Fri, 8 Mar 2024 19:45:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 428JjaRB026356; Fri, 8 Mar 2024 19:45:36 GMT (envelope-from git) Date: Fri, 8 Mar 2024 19:45:36 GMT Message-Id: <202403081945.428JjaRB026356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: John Baldwin Subject: git: 5d8edfb270be - internal/admin - Reactivate markm's commit bit per request List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 5d8edfb270be22e82b02225788a6b0db2844d26b Auto-Submitted: auto-generated The branch internal/admin has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5d8edfb270be22e82b02225788a6b0db2844d26b commit 5d8edfb270be22e82b02225788a6b0db2844d26b Author: John Baldwin AuthorDate: 2024-03-08 19:44:07 +0000 Commit: John Baldwin CommitDate: 2024-03-08 19:44:38 +0000 Reactivate markm's commit bit per request Approved by: core --- access | 1 + 1 file changed, 1 insertion(+) diff --git a/access b/access index fac901ba703c..97f3fc78a1b7 100644 --- a/access +++ b/access @@ -99,6 +99,7 @@ lwhsu manu marius markj +markm mav maxim mckusick From nobody Sat Mar 9 02:01:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ts5rB0yDkz5CZ8n; Sat, 9 Mar 2024 02:01: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 4Ts5rB0Gf4z4Yy3; Sat, 9 Mar 2024 02:01:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709949706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ltwkh+jN9rfoTRW67m90UNpxfjCbm2bsD5ynd0o/aAM=; b=xF8pDJOc/V443vChnV68uc9KL/BXyG2msHeDSrEaNdYqwAbb260yS/gbxdtEqN4/zayT/+ 2Hp+6s8RYzYIhGcKWEk4nKRFv4GqD0zaqlS37aisA2LytAYqyEh4skXsdmjmIbyNW+VB65 bMI6DBzj4RXMIel8KurOloIs/iDcRGE6Q+EeLzY426M8kjunSTBsC+mLmVO20pM1YCAC5h Np+Dd506RPmxmoRGsqcNStH6LD6wtWIbW0ytphJLESM6R4MpGtmBK3ZhpiRL2TQtKNnAuj yT0xzsg/N2unA1vs96hzV6NgPTA124/CgBBNRzKGOR79bo/XQD236d7wHaJCew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709949706; a=rsa-sha256; cv=none; b=Fg/bxchpMwwoJjS3bFaTliAkbXWjPK3XFXhK5BL2BUdhClhimUfzggBKEjsy2S13XnpizO 4hflCYgOxh8auKTrjv7KpPZ+OJkUH/fgV8hRNTEcpJnNfdTobKVg5ZCieJ60Tlnq+iWLaW J+Onh7DXaXCTK4rbI/nlRW+vQnFSox/MEOWwuPKsRbAG0HJ2xUWK8t/ROzUrD+e3sHj24s RJTHC6OzazNcgOBRMZYVwmUy+G/oad58T6wPLzqV7z7waB1SD6OcOvtfi5tTEVT5c7uZpv /42zbJkmnIc86Op0frco8S1stcYp7KYSsSTYxt1gmLk9RorE/kRh6anlYsZnDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709949706; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ltwkh+jN9rfoTRW67m90UNpxfjCbm2bsD5ynd0o/aAM=; b=L16bZMQQTaKuYAPG5qX/GK4EkY68ZOP69rG/Sg/Wz0f2lcHzAkiD7nzXKCW5z6I8+EWCke sM9d+JCRZ7JybRZTy06dhVrsXknblNOhlfdEbMBIjAiCk2mrZkL6BEAM9C8L1RmG65+Opi nhI9VEkb9OfwaIvi6+pfRRdMtQWDyOn+D3uHVAyxZuShO6Tv3z6He4t0nIIq0gMGkqGC01 NSSdTzpVMi9RTZPkupr3JuAKb55PRSyq7ulD9+UeoMRfNlM8i1RXhuCUFwciOfsFH3M7uR 1Ayi0IvsLbLJSapkOqM3BHLSy8o1/V+gYtDXZolXqzERaww0oiF1CtL26A88XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ts5r970Lfzk4c; Sat, 9 Mar 2024 02:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42921j13061414; Sat, 9 Mar 2024 02:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42921j6Q061411; Sat, 9 Mar 2024 02:01:45 GMT (envelope-from git) Date: Sat, 9 Mar 2024 02:01:45 GMT Message-Id: <202403090201.42921j6Q061411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 6e2cfb24ee87 - main - crunchgen: slap a dependency on the generated makefile for .lo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=6e2cfb24ee87fec0f538d04cd69d76a8d58c324f commit 6e2cfb24ee87fec0f538d04cd69d76a8d58c324f Author: Kyle Evans AuthorDate: 2024-03-09 02:01:17 +0000 Commit: Kyle Evans CommitDate: 2024-03-09 02:01:25 +0000 crunchgen: slap a dependency on the generated makefile for .lo crunchgen generates a foo.lo for each binary it will end up crunching into the final product. While they have a dependency on the libs that are used to link them, nothing will force relinking if the set of libs needed to link them is changed. Because of this, incremental builds may not be possible if one builds a version of, e.g., rescue/ with a broken set of libs specified for a project -- a subsequent fix won't be rolled in cleanly, it will require purging the rescue/ objdir. This is a bit crude, but the foo.mk we generate doesn't actually get regenerated all that often in practice, so a spurious relink for the vast majority of crunched objects won't actually happen all that often. Reviewed by: bapt, emaste, imp Differential Revision: https://reviews.freebsd.org/D43869 --- usr.sbin/crunch/crunchgen/crunchgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/crunch/crunchgen/crunchgen.c b/usr.sbin/crunch/crunchgen/crunchgen.c index 41713849b27b..1deb2bb2f7ea 100644 --- a/usr.sbin/crunch/crunchgen/crunchgen.c +++ b/usr.sbin/crunch/crunchgen/crunchgen.c @@ -1114,8 +1114,8 @@ prog_makefile_rules(FILE *outmk, prog_t *p) "int _crunched_%s_stub(int argc, char **argv, char **envp)" "{return main(argc,argv,envp);}\" >%s_stub.c\n", p->ident, p->ident, p->name); - fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS)", - p->name, p->name, p->ident); + fprintf(outmk, "%s.lo: %s_stub.o $(%s_OBJPATHS) %s", + p->name, p->name, p->ident, outmkname); if (p->libs) fprintf(outmk, " $(%s_LIBS)", p->ident); From nobody Sat Mar 9 04:40:43 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ts9Mb4GY0z5CqC6; Sat, 9 Mar 2024 04:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ts9Mb3Ym8z4nFn; Sat, 9 Mar 2024 04:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Ph4J5iSaGboONPGHZZ9Bw/auJO9qKpFRtlCi/LlCxQ=; b=leng4LGvZOt/i3xR3PlR1jPVKb4AMkq6qXPHBYzdAJE5uSHnNfRPsO38bbqsiGbbCQzR3b 2TDGODIyyB15FBQj22IIMvRlAssd7su9hmcsuhj5uT6S0byARobPy0HPp5QvZqPYqiV3Ns YJPou8jRaYb0bxvlce/2ap3LcPTxBp0pwYioNUblriZBYur2SpAfdTSqHzvSjm8Xh7IbxS EtrGCo/S7epLom3EX8l43ZCSgMcmY0nCSHcbOgsGDtHUwDz6Oe7vECJREIjBvHypRZQztH UAG2Li/45M3ci6EjouQH4vHJR6W5joB+kXsrPV2FPaT8/7Q/dbgWgqThubUCQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709959243; a=rsa-sha256; cv=none; b=A6L+V4NnJYOAtDD7bZOufLADF9OugFIMPPb/LM9v33N22VlyOad2ZLR3tSXACMCM0wgQ6L mFmALLjEiwCfrHh67WUc1TXJYiMhyQI20Ld78F1W8nF/w1W2bcA2Vvji9IT7F1g973GMrD EzfOCjxcM0NWQnzWT8NSL8UEFgFyvIP812OWDKXouua8SdmqVNuaHvwQBBveBge4CuZ6jA 4e7eCUOE+jaHWamrsynYKOsTUt6pQ2FYeRWks5yYnllN5VgVzCDgInjKLKSrIGqWyZ72s2 NjaPt2k1nkFPinAZrzEZ26VWJ8lOnouAhSl4vc2nMj3hLS+GWzGt6wI9BKAq4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Ph4J5iSaGboONPGHZZ9Bw/auJO9qKpFRtlCi/LlCxQ=; b=lvcq+PI6JRPwGOBIOGWGZBzQXdz9+q684FLjnPrfiwBdicBIZc0NdVhc4KaPEUIUjzuY+2 ai4/FfGELioEPnZXhy9Umw0oXk4Mvpqq6TX1ACLF6Hv5wJbCkSnXSj7PVEKNpkFJm3cDu/ jHF1sVO47gY+N1QKGAMnSglFKLPXiBzb8/epSfA5yPZ6EH5LpCDP4FOHE/A3R6IfS0J7cN KUG55J7vf1MNVbFR5KJSxGnQMnobSDI0S/lMDg+k91ZlFSEDHBqtDtfgNRdfALyQCwd+3s DYpIozka+ajmncqLVcfEmxSpCRggGaA/3atls6pDkK3t+DaPDDeRAkKB9zh21g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ts9Mb322zznqM; Sat, 9 Mar 2024 04:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4294ehKa030755; Sat, 9 Mar 2024 04:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4294ehRO030753; Sat, 9 Mar 2024 04:40:43 GMT (envelope-from git) Date: Sat, 9 Mar 2024 04:40:43 GMT Message-Id: <202403090440.4294ehRO030753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 69c4a0ef86a2 - stable/14 - arm64: Add a VM_FREELIST_DMA32 freelist List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 69c4a0ef86a22b384d887d5dae76cc13af43b5eb Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=69c4a0ef86a22b384d887d5dae76cc13af43b5eb commit 69c4a0ef86a22b384d887d5dae76cc13af43b5eb Author: Mark Johnston AuthorDate: 2024-01-25 21:33:46 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 04:26:57 +0000 arm64: Add a VM_FREELIST_DMA32 freelist When booting a KMSAN kernel on an Ampere Altra, I've seen some boot time hangs when the XHCI controller driver attempts to allocate memory for 32-bit DMA. The system boots fine with a GENERIC kernel; I believe that the additional memory requirements of KMSAN push it over the edge. The system has a bit less than 2GB of RAM below the 4GB boundary. Allocate a new freelist to segregate memory below 4GB, as we do on amd64, so that such memory allocation failures are less likely to occur. Reviewed by: alc MFC after: 1 month Sponsored by: Klara, Inc. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D43503 (cherry picked from commit 48d5dab7bace6bae938672784ca3aa8733d72eb9) --- sys/arm64/include/vmparam.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index 29fbf6221980..0176045f0cae 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -85,11 +85,13 @@ #define VM_FREEPOOL_DIRECT 1 /* - * Create one free page lists: VM_FREELIST_DEFAULT is for all physical - * pages. + * Create two free page lists: VM_FREELIST_DMA32 is for physical pages that have + * physical addresses below 4G, and VM_FREELIST_DEFAULT is for all other + * physical pages. */ -#define VM_NFREELIST 1 +#define VM_NFREELIST 2 #define VM_FREELIST_DEFAULT 0 +#define VM_FREELIST_DMA32 1 /* * When PAGE_SIZE is 4KB, an allocation size of 16MB is supported in order From nobody Sat Mar 9 04:40:44 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ts9Md18rJz5Cq28; Sat, 9 Mar 2024 04:40: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 4Ts9Mc5V3zz4nsW; Sat, 9 Mar 2024 04:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UZ71XDwhKX56t4P2Lie/+CBUM1dLPT/INKtE6ZXHf0=; b=Ju5zizFiBoJxfmgxPDRNqJ+E+rM579DbHn6hFzFwb+R1E+W5v5j9dCRJZVPSdLEiXKvNcx ddUE32+/mG5o1Qt8WxisB5BLv7Z4BxkruiGRM3Ffy4w996vb8buPkAB9qgKfWC/Zvsqqm7 u48obEtFnCbUOUJNPMIzD5/JHe01eRQ/9mrZqSls6DBy2SNGok+BvUY0nI8GPFr0RpO3Ep FmrDdMN/hiKzB1d/8B6AvU6OOA2lK2nu1ebkn1PfRkcXq+gS3wuBx+ohaZsbSnlB600i3z 9GkFR5dZllQEGRxNFiNMKoEuvyuxvaF73bqEynIu7p7j+jmv45/aqmn6WRfAFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709959244; a=rsa-sha256; cv=none; b=BEAcxSPdvBb+D0WYZP6U2UsnRSDMxQlCEk48kMNmYgon0Y7NtxKuHyjDLWSMAFKVLNF2R7 NwaNSm3xAyI+Tsn4cMz+QWDnNHGEkfI1lrTH5ym0zk6i7tR7hUbu8nNaxcLhIiyyv1m9iL S5G/LSX29csOfc4iIj4f/co2wSt2iT9e2QNLfbCzesKQby8lmAy5NYPxP3bOsM6y6fdlLU uiQ0ZE3A3Pn4s2dy+0rXcF1vEPc7DSZeztR5PT5fHCFLTfxhsru0MBRpiNr70918CmdsbP UW+zAdrWmAL4PmzDCZw0Q5Y6RjkEzceMKkAVh/3POgv7vliTUkg6SMPFbAddOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UZ71XDwhKX56t4P2Lie/+CBUM1dLPT/INKtE6ZXHf0=; b=k30oZOKBDaaxCJAzzpjJZcVHztgx8079u8utq1Z3KOaWwjh4nKTi2t7SaaKuBiE8lXy9pz sj0xdtTaHfJ29EMtHvycLys5MqZliSjVl9FN/zNXyBlWss21/nuMp0QOH3Ed1sO1S9tA0n ihYHYVJyOZwhb6tHB+r4tSNXK26C9VeE0oCBP6RFMuMdZr/JvYh+r2sm5J7MO3TCjk/RSr i2DQi57dIJCgkuSMmiG81yZsl0VAnZovEhw2TtU8ztMdfHNcnvkaBFM9XaQN3vLZ592x1V zE4IxCw1RiLG5XjbawWXuqsXFWeFahk1v5ye05TlkHrhbD8oivjsZ5+0EDAZJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ts9Mc4HXSznJX; Sat, 9 Mar 2024 04:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4294eiND030809; Sat, 9 Mar 2024 04:40:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4294eib4030806; Sat, 9 Mar 2024 04:40:44 GMT (envelope-from git) Date: Sat, 9 Mar 2024 04:40:44 GMT Message-Id: <202403090440.4294eib4030806@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c3751f89da78 - stable/14 - Fix subr_uio.c style(9) with uses of sizeof. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3751f89da781f9654b613688a728dbcc1644227 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c3751f89da781f9654b613688a728dbcc1644227 commit c3751f89da781f9654b613688a728dbcc1644227 Author: Alfredo Mazzinghi AuthorDate: 2024-01-17 17:23:58 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 04:27:07 +0000 Fix subr_uio.c style(9) with uses of sizeof. Obtained from: CheriBSD Reviewed by: jhb, kib, markj MFC after: 2 weeks Sponsored by: CHaOS, EPSRC grant EP/V000292/1 Differential Revision: https://reviews.freebsd.org/D43710 (cherry picked from commit f82e98237395693d1825243ff7b111aa321d383f) --- sys/kern/subr_uio.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index b0c4a256cd17..7a7fe9b0f4f9 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -354,7 +354,7 @@ copyiniov(const struct iovec *iovp, u_int iovcnt, struct iovec **iov, int error) *iov = NULL; if (iovcnt > UIO_MAXIOV) return (error); - iovlen = iovcnt * sizeof (struct iovec); + iovlen = iovcnt * sizeof(struct iovec); *iov = malloc(iovlen, M_IOV, M_WAITOK); error = copyin(iovp, *iov, iovlen); if (error) { @@ -375,8 +375,8 @@ copyinuio(const struct iovec *iovp, u_int iovcnt, struct uio **uiop) *uiop = NULL; if (iovcnt > UIO_MAXIOV) return (EINVAL); - iovlen = iovcnt * sizeof (struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + iovlen = iovcnt * sizeof(struct iovec); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); iov = (struct iovec *)(uio + 1); error = copyin(iovp, iov, iovlen); if (error) { @@ -406,8 +406,8 @@ cloneuio(struct uio *uiop) struct uio *uio; int iovlen; - iovlen = uiop->uio_iovcnt * sizeof (struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); + iovlen = uiop->uio_iovcnt * sizeof(struct iovec); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); *uio = *uiop; uio->uio_iov = (struct iovec *)(uio + 1); bcopy(uiop->uio_iov, uio->uio_iov, iovlen); From nobody Sat Mar 9 04:40:45 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ts9Mf0BMMz5CqHf; Sat, 9 Mar 2024 04:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ts9Md5pc5z4nhk; Sat, 9 Mar 2024 04:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b77J+24jBXxk5Xgrt4CMEavwHwS05jsy2/Lu5a0POx4=; b=k4dXp/ChzV3y1YBWWqjClqwW8g/j3C0YEMzP3aPj+J4i10DTPbahZmVCVBlcRgHA6HKL63 DOEfFAq2yM4AAXNgrfU4ooZHPHJ7miR5Rzh8rChO9lx6jxQu0/dODfqxCrrXMkagBBFVxO /xOsuxy5WxxqrMWpAskA8GrBOeFlew5NaojxpCnU9S9Oz0K2KzF+efrILNVmDL1bod8CS7 zAcW5zc4gVfw+ZvAntdZXa1gInYkHD6KPPjLmPAHumZ+um7DEXSNTNvH4/gYbqkagIahR1 UeHtXL1Zdf0uudjmjBhCc1UJ7ljkBGdyz7nLI91hgk1J0zinADmeVspt6c1lsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709959245; a=rsa-sha256; cv=none; b=t7CzNZsWRE8h5Weaxo5qrsiv0fAZdjG+EM7u85I2UccCuavg/J/vtfgHzacwtaejJtgY7M p2IrtWPrBnYKe9sv+3lzeGucmaQrs4GnOaDWyL60GbyvNKVAHaxnjogmfVbpmN1l2N3jeD 6v8e/J4K0KRSunHkLprU5REIVATdcCEKUV3qoynentX3COH+LuXe6sp5Bz+KbodNDDKrUd Jezx1DbfvBR5d23B4ii2CyhWlSEEC462P/c1utSpjFle/UScuEu7GncMeu0lcFBpjzqkQw Ofpdi4b0r+WUp0aAbC14alSeQKeiw5/MYPU5v+Fq9NspnI73dmuUVzkklk02Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b77J+24jBXxk5Xgrt4CMEavwHwS05jsy2/Lu5a0POx4=; b=eo9+gafZdmwRZtvSJ2EDJxF3ep+EQGLUaWy162zYWmUvbXXbtJqnxJn2H9Py64MRndfs0f GScIJtWHM0YTm3FAbVrW3Z7A86gqSPjE0Bjhl/6IosjqNUQ+iorzMyGM11Ly5KzvXVQc7u 8zu70iMo49AX1h9K+xhMS2t6L+KEFS8QCO8pODr8ngJ57kvZuDKjfVP6gWgpTgDB5ja7CY 5VxtDSvTx/k0PwooDV5wBsX9+bOmbrmxqx0Gd5ZcGzU6kTAJnR9EmyEqxOTji8ZODcJSnM 6nRizy5rjATuGxssFLSBVZ3nb1alx5Q2mZHryyZoQMS1RUFwlLS6pNqZA2rRgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ts9Md5Q0Wznsy; Sat, 9 Mar 2024 04:40:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4294ejsu030853; Sat, 9 Mar 2024 04:40:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4294ejc7030850; Sat, 9 Mar 2024 04:40:45 GMT (envelope-from git) Date: Sat, 9 Mar 2024 04:40:45 GMT Message-Id: <202403090440.4294ejc7030850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2de742797b5f - stable/14 - Abstract UIO allocation and deallocation. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2de742797b5fbcb1b7bf8c3e8dc36dddd051abb0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2de742797b5fbcb1b7bf8c3e8dc36dddd051abb0 commit 2de742797b5fbcb1b7bf8c3e8dc36dddd051abb0 Author: Alfredo Mazzinghi AuthorDate: 2024-01-18 13:04:41 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 04:27:20 +0000 Abstract UIO allocation and deallocation. Introduce the allocuio() and freeuio() functions to allocate and deallocate struct uio. This hides the actual allocator interface, so it is easier to modify the sub-allocation layout of struct uio and the corresponding iovec array. Obtained from: CheriBSD Reviewed by: kib, markj MFC after: 2 weeks Sponsored by: CHaOS, EPSRC grant EP/V000292/1 Differential Revision: https://reviews.freebsd.org/D43711 (cherry picked from commit 61cc4830a7b16400efade3d884a59fda6d80d651) --- sys/amd64/linux32/linux32_machdep.c | 2 +- sys/cddl/compat/opensolaris/kern/opensolaris_uio.c | 2 +- sys/compat/freebsd32/freebsd32_misc.c | 29 ++++++++--------- sys/compat/linux/linux_file.c | 6 ++-- sys/kern/kern_jail.c | 6 ++-- sys/kern/kern_ktrace.c | 4 +-- sys/kern/kern_sendfile.c | 4 +-- sys/kern/subr_prf.c | 2 +- sys/kern/subr_uio.c | 38 +++++++++++++++++----- sys/kern/sys_generic.c | 8 ++--- sys/kern/vfs_aio.c | 4 +-- sys/kern/vfs_mount.c | 2 +- sys/kern/vfs_vnops.c | 2 +- sys/sys/uio.h | 2 ++ 14 files changed, 66 insertions(+), 45 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index ba4dcc61af76..7f1c85cee201 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -106,7 +106,7 @@ linux_readv(struct thread *td, struct linux_readv_args *uap) if (error) return (error); error = kern_readv(td, uap->fd, auio); - free(auio, M_IOV); + freeuio(auio); return (error); } diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c b/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c index e1cc8f802762..b2a08a55bba4 100644 --- a/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c +++ b/sys/cddl/compat/opensolaris/kern/opensolaris_uio.c @@ -68,7 +68,7 @@ uiocopy(void *p, size_t n, enum uio_rw rw, struct uio *uio, size_t *cbytes) error = vn_io_fault_uiomove(p, n, uio_clone); *cbytes = uio->uio_resid - uio_clone->uio_resid; if (uio_clone != &small_uio_clone) - free(uio_clone, M_IOV); + freeuio(uio_clone); return (error); } diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index f2d66cf74b2b..facbf00a4c51 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -1196,32 +1196,29 @@ freebsd32_copyinuio(struct iovec32 *iovp, u_int iovcnt, struct uio **uiop) struct iovec32 iov32; struct iovec *iov; struct uio *uio; - u_int iovlen; int error, i; *uiop = NULL; if (iovcnt > UIO_MAXIOV) return (EINVAL); - iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof *uio, M_IOV, M_WAITOK); - iov = (struct iovec *)(uio + 1); + uio = allocuio(iovcnt); + iov = uio->uio_iov; for (i = 0; i < iovcnt; i++) { error = copyin(&iovp[i], &iov32, sizeof(struct iovec32)); if (error) { - free(uio, M_IOV); + freeuio(uio); return (error); } iov[i].iov_base = PTRIN(iov32.iov_base); iov[i].iov_len = iov32.iov_len; } - uio->uio_iov = iov; uio->uio_iovcnt = iovcnt; uio->uio_segflg = UIO_USERSPACE; uio->uio_offset = -1; uio->uio_resid = 0; for (i = 0; i < iovcnt; i++) { if (iov->iov_len > INT_MAX - uio->uio_resid) { - free(uio, M_IOV); + freeuio(uio); return (EINVAL); } uio->uio_resid += iov->iov_len; @@ -1241,7 +1238,7 @@ freebsd32_readv(struct thread *td, struct freebsd32_readv_args *uap) if (error) return (error); error = kern_readv(td, uap->fd, auio); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -1255,7 +1252,7 @@ freebsd32_writev(struct thread *td, struct freebsd32_writev_args *uap) if (error) return (error); error = kern_writev(td, uap->fd, auio); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -1269,7 +1266,7 @@ freebsd32_preadv(struct thread *td, struct freebsd32_preadv_args *uap) if (error) return (error); error = kern_preadv(td, uap->fd, auio, PAIR32TO64(off_t,uap->offset)); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -1283,7 +1280,7 @@ freebsd32_pwritev(struct thread *td, struct freebsd32_pwritev_args *uap) if (error) return (error); error = kern_pwritev(td, uap->fd, auio, PAIR32TO64(off_t,uap->offset)); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -2199,9 +2196,9 @@ freebsd32_do_sendfile(struct thread *td, out: if (hdr_uio) - free(hdr_uio, M_IOV); + freeuio(hdr_uio); if (trl_uio) - free(trl_uio, M_IOV); + freeuio(trl_uio); return (error); } @@ -2780,7 +2777,7 @@ freebsd32_jail_set(struct thread *td, struct freebsd32_jail_set_args *uap) if (error) return (error); error = kern_jail_set(td, auio, uap->flags); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -2807,7 +2804,7 @@ freebsd32_jail_get(struct thread *td, struct freebsd32_jail_get_args *uap) if (error != 0) break; } - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -3540,7 +3537,7 @@ freebsd32_nmount(struct thread *td, return (error); error = vfs_donmount(td, flags, auio); - free(auio, M_IOV); + freeuio(auio); return error; } diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 6eab8980a5c5..1279490ae8be 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -1038,7 +1038,7 @@ linux_preadv(struct thread *td, struct linux_preadv_args *uap) if (error != 0) return (error); error = kern_preadv(td, uap->fd, auio, offset); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -1065,7 +1065,7 @@ linux_pwritev(struct thread *td, struct linux_pwritev_args *uap) if (error != 0) return (error); error = kern_pwritev(td, uap->fd, auio, offset); - free(auio, M_IOV); + freeuio(auio); return (linux_enobufs2eagain(td, uap->fd, error)); } @@ -1872,6 +1872,6 @@ linux_writev(struct thread *td, struct linux_writev_args *args) if (error != 0) return (error); error = kern_writev(td, args->fd, auio); - free(auio, M_IOV); + freeuio(auio); return (linux_enobufs2eagain(td, args->fd, error)); } diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 91466c46bc62..1f775f78e581 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -534,7 +534,7 @@ sys_jail_set(struct thread *td, struct jail_set_args *uap) if (error) return (error); error = kern_jail_set(td, auio, uap->flags); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -2264,8 +2264,8 @@ sys_jail_get(struct thread *td, struct jail_get_args *uap) error = kern_jail_get(td, auio, uap->flags); if (error == 0) error = copyout(auio->uio_iov, uap->iovp, - uap->iovcnt * sizeof (struct iovec)); - free(auio, M_IOV); + uap->iovcnt * sizeof(struct iovec)); + freeuio(auio); return (error); } diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index 01158c2c238f..75b81457402b 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -770,7 +770,7 @@ ktrgenio(int fd, enum uio_rw rw, struct uio *uio, int error) char *buf; if (error) { - free(uio, M_IOV); + freeuio(uio); return; } uio->uio_offset = 0; @@ -778,7 +778,7 @@ ktrgenio(int fd, enum uio_rw rw, struct uio *uio, int error) datalen = MIN(uio->uio_resid, ktr_geniosize); buf = malloc(datalen, M_KTRACE, M_WAITOK); error = uiomove(buf, datalen, uio); - free(uio, M_IOV); + freeuio(uio); if (error) { free(buf, M_KTRACE); return; diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index f6f6b57adfc7..323e7fcde07b 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -1331,8 +1331,8 @@ sendfile(struct thread *td, struct sendfile_args *uap, int compat) (void)copyout(&sbytes, uap->sbytes, sizeof(off_t)); out: - free(hdr_uio, M_IOV); - free(trl_uio, M_IOV); + freeuio(hdr_uio); + freeuio(trl_uio); return (error); } diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c index f2be2f0dc664..60040a085162 100644 --- a/sys/kern/subr_prf.c +++ b/sys/kern/subr_prf.c @@ -388,7 +388,7 @@ log_console(struct uio *uio) msglogstr(consbuffer, pri, /*filter_cr*/ 1); } msgbuftrigger = 1; - free(uio, M_IOV); + freeuio(uio); free(consbuffer, M_TEMP); } diff --git a/sys/kern/subr_uio.c b/sys/kern/subr_uio.c index 7a7fe9b0f4f9..d836c0ed295e 100644 --- a/sys/kern/subr_uio.c +++ b/sys/kern/subr_uio.c @@ -376,21 +376,20 @@ copyinuio(const struct iovec *iovp, u_int iovcnt, struct uio **uiop) if (iovcnt > UIO_MAXIOV) return (EINVAL); iovlen = iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); - iov = (struct iovec *)(uio + 1); + uio = allocuio(iovcnt); + iov = uio->uio_iov; error = copyin(iovp, iov, iovlen); - if (error) { - free(uio, M_IOV); + if (error != 0) { + freeuio(uio); return (error); } - uio->uio_iov = iov; uio->uio_iovcnt = iovcnt; uio->uio_segflg = UIO_USERSPACE; uio->uio_offset = -1; uio->uio_resid = 0; for (i = 0; i < iovcnt; i++) { if (iov->iov_len > IOSIZE_MAX - uio->uio_resid) { - free(uio, M_IOV); + freeuio(uio); return (EINVAL); } uio->uio_resid += iov->iov_len; @@ -400,16 +399,39 @@ copyinuio(const struct iovec *iovp, u_int iovcnt, struct uio **uiop) return (0); } +struct uio * +allocuio(u_int iovcnt) +{ + struct uio *uio; + int iovlen; + + KASSERT(iovcnt <= UIO_MAXIOV, + ("Requested %u iovecs exceed UIO_MAXIOV", iovcnt)); + iovlen = iovcnt * sizeof(struct iovec); + uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); + uio->uio_iov = (struct iovec *)(uio + 1); + + return (uio); +} + +void +freeuio(struct uio *uio) +{ + free(uio, M_IOV); +} + struct uio * cloneuio(struct uio *uiop) { + struct iovec *iov; struct uio *uio; int iovlen; iovlen = uiop->uio_iovcnt * sizeof(struct iovec); - uio = malloc(iovlen + sizeof(*uio), M_IOV, M_WAITOK); + uio = allocuio(uiop->uio_iovcnt); + iov = uio->uio_iov; *uio = *uiop; - uio->uio_iov = (struct iovec *)(uio + 1); + uio->uio_iov = iov; bcopy(uiop->uio_iov, uio->uio_iov, iovlen); return (uio); } diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index c999bd60f95d..b569a9f808d5 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -273,7 +273,7 @@ sys_readv(struct thread *td, struct readv_args *uap) if (error) return (error); error = kern_readv(td, uap->fd, auio); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -312,7 +312,7 @@ sys_preadv(struct thread *td, struct preadv_args *uap) if (error) return (error); error = kern_preadv(td, uap->fd, auio, uap->offset); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -475,7 +475,7 @@ sys_writev(struct thread *td, struct writev_args *uap) if (error) return (error); error = kern_writev(td, uap->fd, auio); - free(auio, M_IOV); + freeuio(auio); return (error); } @@ -514,7 +514,7 @@ sys_pwritev(struct thread *td, struct pwritev_args *uap) if (error) return (error); error = kern_pwritev(td, uap->fd, auio, uap->offset); - free(auio, M_IOV); + freeuio(auio); return (error); } diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 45f912a7cc2d..fd6682ef03b0 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -559,7 +559,7 @@ aio_free_entry(struct kaiocb *job) fdrop(job->fd_file, curthread); crfree(job->cred); if (job->uiop != &job->uio) - free(job->uiop, M_IOV); + freeuio(job->uiop); uma_zfree(aiocb_zone, job); AIO_LOCK(ki); @@ -1736,7 +1736,7 @@ err3: knlist_delete(&job->klist, curthread, 0); err2: if (job->uiop != &job->uio) - free(job->uiop, M_IOV); + freeuio(job->uiop); uma_zfree(aiocb_zone, job); err1: ops->store_error(ujob, error); diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index c36fda4e8a9e..49d1d21d2d6d 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -474,7 +474,7 @@ sys_nmount(struct thread *td, struct nmount_args *uap) } error = vfs_donmount(td, flags, auio); - free(auio, M_IOV); + freeuio(auio); return (error); } diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index b650b32ccc55..62339387d7d0 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1444,7 +1444,7 @@ vn_io_fault1(struct vnode *vp, struct uio *uio, struct vn_io_fault_args *args, td->td_ma_cnt = prev_td_ma_cnt; curthread_pflags_restore(saveheld); out: - free(uio_clone, M_IOV); + freeuio(uio_clone); return (error); } diff --git a/sys/sys/uio.h b/sys/sys/uio.h index 6250b3cfbf03..e09a41ab1045 100644 --- a/sys/sys/uio.h +++ b/sys/sys/uio.h @@ -78,6 +78,8 @@ struct vm_object; struct vm_page; struct bus_dma_segment; +struct uio *allocuio(u_int iovcnt); +void freeuio(struct uio *uio); struct uio *cloneuio(struct uio *uiop); int copyiniov(const struct iovec *iovp, u_int iovcnt, struct iovec **iov, int error); From nobody Sat Mar 9 04:40:46 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ts9Mg3QQYz5CqLM; Sat, 9 Mar 2024 04:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ts9Mg04byz4nhr; Sat, 9 Mar 2024 04:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IH0w84iZwtlGRO1yJgIesJ3bJ3wsce4P73S/vnm/AkU=; b=j9YtpbrVjKbNFOa8ZJCz07VzV1E4aF1j6XM7IM6vNFf5YAORzZ51f7p9Q2rc+XQShLjfnn 89syjkQZNpyx/USWIIgt0NTEPa5x8czL9AKkqlGXIn7UwsonUwly2JlQEGsumZ7UpBd0Y7 RUv1I0hB05SqwDDfqubws8NMYnF4kx5YvFcgg++rjJZYQz3f52ATCioKv2MzXJzINdMEys 2rcLUt1f/VNx2eH1695vNTL0B0HgWTJRz3zKDQ5svDvVYUtSXA+8S6lBu/xk3wMgmSZvFI jNShQ6/rV5RrQz6/bEImuvurqY9yAvxBbtq1XpqbcDLWZV5+j+l7R7QB+E3YYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709959247; a=rsa-sha256; cv=none; b=MAz/ofdTqG9cU1OPeqMF+zig7PrKyIYJrTKRziDMbHBDaVB4Zd+yqsHt48Xr9oX0NMQM0u s05z8CNyfy2QI5aWC9nJ20lRGhHZUd5ZrKCnLa9xiphzdVI/RVL/ioT9lFEVJNfuEM3DUQ Stuf+wwLHOay63lCdtPyAg+Lff4oqi7ew3bcDv48aUlFN+sJoj2XvZxFBUxmzg2EdPOkjh NEYMJfCCCJn7bBiRLlncq6l4ykDT6ozBy9s6fW3ih9Z2y1APyoNdL8C0AnnfkYs6oAt28U 91Wa7HIbaPWX/kBqOHUebBsGrphlOG11JfgvA5XlyXh4EVJX4E6Te0C1K6RrVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IH0w84iZwtlGRO1yJgIesJ3bJ3wsce4P73S/vnm/AkU=; b=Zxm7qtugUKiJBi3iWiRsJyPMN9zHCaC9nye+VthybKF3xG8Uq3WMFK9DvLeUTC0dejgG+c vxf6RZnHJT1Y8HcrtUyO6ENa8/XvgxGKHaYKVq7ogp3lyaHBh/OMqAdXTif5ota97ni6hf o/wa5H9uaCodyRunNmemVS60MC8GC+ecfrVn4vGIv6lRZ1iBxV9/J3Kk+6TnIwRPxMZfn8 oyk/39soDqp2B1l8TEM5xk+KIcoUXFCZPVI23nKD6r33DHxEalnUKfzTZamgxLixtr0G8p zbjT7A6gEBH+obC7/h0WCDYH45amT+t1PTUa4HcK14JQ09ipb1I79GbTEwZ6kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ts9Mf6QbYznqN; Sat, 9 Mar 2024 04:40:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4294ekw6030902; Sat, 9 Mar 2024 04:40:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4294ekJ1030899; Sat, 9 Mar 2024 04:40:46 GMT (envelope-from git) Date: Sat, 9 Mar 2024 04:40:46 GMT Message-Id: <202403090440.4294ekJ1030899@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 465fe46da510 - stable/14 - arm64: Add netmap(4) to default kernel config List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 465fe46da51080950bf0063f984c52b8cf6fb144 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=465fe46da51080950bf0063f984c52b8cf6fb144 commit 465fe46da51080950bf0063f984c52b8cf6fb144 Author: Daniel Roethlisberger AuthorDate: 2024-02-06 15:26:13 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 04:28:01 +0000 arm64: Add netmap(4) to default kernel config Allows the development, testing and deployment of netmap(4)-based code on arm64 without having to recompile the kernel. netmap(4) is already in the amd64 and powerpc64 default configs, so it does not seem unreasonable to also provide it on arm64 by default. Note that netmap(4) is useful even on systems without NIC that fully support it. Reviewed by: vmaffione MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43702 (cherry picked from commit df64d7c8c82d59958cb546b23ba240ab97dc5033) --- sys/arm64/conf/std.dev | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm64/conf/std.dev b/sys/arm64/conf/std.dev index 74d2407e0aec..0c0ede38ed2b 100644 --- a/sys/arm64/conf/std.dev +++ b/sys/arm64/conf/std.dev @@ -87,6 +87,9 @@ device miibus # MII bus support # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter +# Netmap provides direct access to TX/RX rings on supported NICs +device netmap # netmap(4) support + # USB support options USB_DEBUG # enable debug msgs options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. From nobody Sat Mar 9 04:40:47 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ts9Mh6ZHZz5CqHq; Sat, 9 Mar 2024 04:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ts9Mh0k6xz4nRQ; Sat, 9 Mar 2024 04:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2S5sdo4NHln5awe57UbAFARLWpwvUIS7GiivJrT9Yxg=; b=tJleLAB7Ye4dNC2VIxeEf74Mz6SfiOu2JZgyY5dVTVTXsrE/rauPaIz8vQGS63Fdd+ALf8 zMhO5PN16PNAr/TaRcTzdI0rW3TPGVW3/lFaa+C75qLpQqidTE/vK1u3/WoYA6uNu1lMBn 1o9TvGdeaarzlVaayLMibFBz/YkrJgI87Hiktli2n01BpksRG5ND7PCouREhD+LdflyG1Q fWgzdD+bB+YzMSTZB1/RVV/pslLFfQqqNcCVOe8SXPCmZhj47k61DTxV+Nnot6fS2AC0id aSBaXZYxOgMT6vrR2FcZMjqwTq1ee0oUeIERfY7/ad35BkpWT7n0f0FbGTyzaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709959248; a=rsa-sha256; cv=none; b=Gq6u1CMlJWQvZQ6rS4eBOzjZRQakDW6BtoTwbiXPCwXk2GQ8Y3wV5Wh+IskALywRgHQLFF iPKiuzFViLmqgfHAE9RdkqiwBS7iMduD/QxHxAqHeiYwGBk7M2aMgNepS1kVaq/OJxV49/ J793VN85b9LdO/jJxKfZQziY7OUtz5UuuB+0oCLvNuNH/vejZYQCZ98dV2YFqIjNT0BiEq aLoTOw+SqQ3LXWA6bKNvs9vXuPON88iww7NU14ngROSTur4Xu8kqMbTxRnC0vSo/NID51T q49hdWCxvr26+CEg3yo58zBuy6qgN0PGO/7YbFimxGPbQ4oiU6TmgfXvL/U7Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709959248; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2S5sdo4NHln5awe57UbAFARLWpwvUIS7GiivJrT9Yxg=; b=ECnNTgsDhPgrK+9nvtTzGuomfoIiBdcCoxYMcuxZEWUnHBXgtCyTgn+PkMElPneJWk+2Io ok43o8Lsjfe2RZ6oTTcbVsSlGMk7Dug+/SSxW764hgY43eXBAVL4ybJmUPOZ9UU18RdQ2a 11+S6YnK/T02HfiSQtZQXeFRmxBj7k/StLhYj0ShSFapqLDmQVQ0iEjrH6i3Cvjud27qug 5gwsAtvhthvRqx+I9PyDOKXWcxoGxBbCG5l8XsM5IwN6RX2KGaeDvcB/7vt9pKkkWVUBrs E5VBNtVZC3o9u7ZIpWe/JG37DtJidQE1OR7S8o6e5e44drDdkBx2+EINlkqMXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ts9Mh0L9gzp5d; Sat, 9 Mar 2024 04:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4294elXa030947; Sat, 9 Mar 2024 04:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4294elfi030944; Sat, 9 Mar 2024 04:40:47 GMT (envelope-from git) Date: Sat, 9 Mar 2024 04:40:47 GMT Message-Id: <202403090440.4294elfi030944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a0f02252c417 - stable/14 - vmm: Expose more registers to VM_GET_REGISTER List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a0f02252c4175b5336c215cc7774c3ea08873476 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a0f02252c4175b5336c215cc7774c3ea08873476 commit a0f02252c4175b5336c215cc7774c3ea08873476 Author: Mark Johnston AuthorDate: 2024-02-07 13:47:24 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 04:28:39 +0000 vmm: Expose more registers to VM_GET_REGISTER In a follow-up revision the gdb stub will support sending an XML target description to gdb, which lets us send additional registers, including the ones added in this patch. Reviewed by: jhb MFC after: 1 month Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43665 (cherry picked from commit f493ea650e6137ba657dfa0627da1e8bb4a985e9) --- sys/amd64/include/vmm.h | 4 ++++ sys/amd64/vmm/amd/vmcb.c | 17 +++++++++++++++++ sys/amd64/vmm/intel/vmcs.c | 5 ++++- sys/amd64/vmm/intel/vmx.c | 10 +++++++++- 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 273a1a46ba04..7d5d13678122 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -98,6 +98,10 @@ enum vm_reg_name { VM_REG_GUEST_DR3, VM_REG_GUEST_DR6, VM_REG_GUEST_ENTRY_INST_LENGTH, + VM_REG_GUEST_FS_BASE, + VM_REG_GUEST_GS_BASE, + VM_REG_GUEST_KGS_BASE, + VM_REG_GUEST_TPR, VM_REG_LAST }; diff --git a/sys/amd64/vmm/amd/vmcb.c b/sys/amd64/vmm/amd/vmcb.c index ce05c912fc6a..4bd2fae9f821 100644 --- a/sys/amd64/vmm/amd/vmcb.c +++ b/sys/amd64/vmm/amd/vmcb.c @@ -39,6 +39,7 @@ #include "vmm_ktr.h" +#include "vlapic.h" #include "vmcb.h" #include "svm.h" #include "svm_softc.h" @@ -231,6 +232,22 @@ vmcb_read(struct svm_vcpu *vcpu, int ident, uint64_t *retval) *retval = seg->selector; break; + case VM_REG_GUEST_FS_BASE: + case VM_REG_GUEST_GS_BASE: + seg = vmcb_segptr(vmcb, ident == VM_REG_GUEST_FS_BASE ? + VM_REG_GUEST_FS : VM_REG_GUEST_GS); + KASSERT(seg != NULL, ("%s: unable to get segment %d from VMCB", + __func__, ident)); + *retval = seg->base; + break; + case VM_REG_GUEST_KGS_BASE: + *retval = state->kernelgsbase; + break; + + case VM_REG_GUEST_TPR: + *retval = vlapic_get_cr8(vm_lapic(vcpu->vcpu)); + break; + case VM_REG_GUEST_GDTR: case VM_REG_GUEST_IDTR: /* GDTR and IDTR don't have segment selectors */ diff --git a/sys/amd64/vmm/intel/vmcs.c b/sys/amd64/vmm/intel/vmcs.c index 53ed5fbfc9ba..1a7626f7a65d 100644 --- a/sys/amd64/vmm/intel/vmcs.c +++ b/sys/amd64/vmm/intel/vmcs.c @@ -120,10 +120,13 @@ vmcs_field_encoding(int ident) return (VMCS_GUEST_PDPTE3); case VM_REG_GUEST_ENTRY_INST_LENGTH: return (VMCS_ENTRY_INST_LENGTH); + case VM_REG_GUEST_FS_BASE: + return (VMCS_GUEST_FS_BASE); + case VM_REG_GUEST_GS_BASE: + return (VMCS_GUEST_GS_BASE); default: return (-1); } - } static int diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 317ed7e5d7fb..3fe20986ec8d 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -3404,8 +3404,16 @@ vmx_getreg(void *vcpui, int reg, uint64_t *retval) panic("vmx_getreg: %s%d is running", vm_name(vmx->vm), vcpu->vcpuid); - if (reg == VM_REG_GUEST_INTR_SHADOW) + switch (reg) { + case VM_REG_GUEST_INTR_SHADOW: return (vmx_get_intr_shadow(vcpu, running, retval)); + case VM_REG_GUEST_KGS_BASE: + *retval = vcpu->guest_msrs[IDX_MSR_KGSBASE]; + return (0); + case VM_REG_GUEST_TPR: + *retval = vlapic_get_cr8(vm_lapic(vcpu->vcpu)); + return (0); + } if (vmxctx_getreg(&vcpu->ctx, reg, retval) == 0) return (0); From nobody Sat Mar 9 05:40:08 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsBh854ZZz5Cvv0; Sat, 9 Mar 2024 05:40: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 4TsBh84TDpz4vJg; Sat, 9 Mar 2024 05:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709962808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7d+d66M7oUryq016dACZYXENql61fbn86+fzFyRdemQ=; b=YgomLsjanftn7RdRL+tCKmpcMJZPCdApi1dAU7ibEnoDc7xlEJOmvp65rkKuZtRprezsJ1 8JnvBM5O4F4nbUxzeAtbUOG2/SVyrDRPRa5eA/QGpCbjR4Vy1AkIyxiOCFS1oqmBf3fmEW rBOI2yhhP+GcZJC4Ct0bFcF5M39ncZ8r7a9UhwNMRo1PyhvB0YnEgzgmT5Kp/uVgc+8TQa eml5n7VMEZCu/bgoxAr0/bKw4pAOCQktHQR6WBQt/nKsjAcDd3EAAZbgI3abwCHVE/tNv7 KrQ8/8Xb9UewfFyZqO5h595W9cZenJjFzKYaTX7LWbnIS1EBG7U72ZeE0ztpeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709962808; a=rsa-sha256; cv=none; b=tL2fLXqkGA+GBk7WcYXpzWmhyZE464etXt4cV2sw5isx0W3ROE8yo8efFAcu31K6XZiR5D VLHast5eHxGzxHgE5+kPZ/aFsrcgfBQH9+G/M53Dn4aFFJ6ccasSPwSJglHOzrnZsDj8Z8 ixYKIUo6qkSQlntRqZLxQH0rCyRxLOZ5Vv0qCjtrHGCehmh2wrEHM1KTmtwd5PVzLWNt97 uINoKFeIu0DS0xeB0fFxOATCN0yAsgkFYeWqJNxw+vy4q79DmgrNkxriqjkqxqQAAjyQ4S r8LUi/Wm613wFwLTd9DKCXHSPDRaTBwE7zVdZIAEr95HgemxvWuaRqbYvr1cSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709962808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7d+d66M7oUryq016dACZYXENql61fbn86+fzFyRdemQ=; b=WyiSvn5EvjOMEBuluCIhoh4i3b0+iIZ68Ne6zKFWrTsCBcWbuK80Kk/jvDQd2fXsYqWIaF pS2a0ZTfNhSo8ij6KFHBLjoULpT31pEbBrM2r1blblzdULl4OkvOcEHxwtNCLIR4+MgX+o tOTOxpDv8BzdVHS1ZSxoU35d3uQrHJQ5lbywHvIXPvxWEUtGd6lQP/q09ny4SZU0YKxNg3 JR85mVqKC6K1Tt6wSJKVqziDkfDZ0RH6v446gYCn6s+SeUrMf/BzM8pBKbzN/BZhK2PQfJ +PCbQAgX+ksqQ+Wx6+WqmIsu4wS9wS41Lz2IlVtn9L6nWUkv18y2wekdUji/Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsBh83rr8zqJl; Sat, 9 Mar 2024 05:40:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4295e8ic026950; Sat, 9 Mar 2024 05:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4295e8I3026945; Sat, 9 Mar 2024 05:40:08 GMT (envelope-from git) Date: Sat, 9 Mar 2024 05:40:08 GMT Message-Id: <202403090540.4295e8I3026945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: cce4979133ba - main - ktrace: Add __ktrace_used List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cce4979133ba540ca2dfd57631c6f91673b9bafd Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cce4979133ba540ca2dfd57631c6f91673b9bafd commit cce4979133ba540ca2dfd57631c6f91673b9bafd Author: Mark Johnston AuthorDate: 2024-03-09 05:08:43 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 05:33:55 +0000 ktrace: Add __ktrace_used This suppresses warnings about write-only variables when the KTRACE option is disabled, akin __diagused and __witness_used. MFC after: 1 week --- sys/sys/ktrace.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/ktrace.h b/sys/sys/ktrace.h index 251efa1e48db..710c78c2604d 100644 --- a/sys/sys/ktrace.h +++ b/sys/sys/ktrace.h @@ -334,8 +334,10 @@ void ktrcapfail(enum ktr_cap_fail_type, const cap_rights_t *, extern u_int ktr_geniosize; #ifdef KTRACE extern int ktr_filesize_limit_signal; +#define __ktrace_used #else #define ktr_filesize_limit_signal 0 +#define __ktrace_used __unused #endif #else From nobody Sat Mar 9 05:40:09 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsBhB07yrz5Cvs1; Sat, 9 Mar 2024 05:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsBh95Gqjz4v5h; Sat, 9 Mar 2024 05:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709962809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHsUh7XtOzNK2tvbzDdrQTCQkDbxTGQUWlVu0gKuijM=; b=sM7PkyU4fBaEUIvSeHErZSsdOWf0lRcNpHbrTjeuVgjpySWAoY0gMY/lKN1D2FVzrgmpYn nSkXITu4NqrsTQGCkR9oNszRZdJHKJOPn8X6aNCFY95/NUkelwSv4zUHXs9HUwGtKEN1pP 0WQCDC7k+Q6xdzdTvsWxWgbSMNswbVKpNVU9K4bvBR/qh09RA9+SGEDiw0vR0kz8wrKpIV EDMUvUz3Sbp/eiLfvLme73t8YZB3uR/TcD8a93zNYNbxTKRNA9BetRbRJgKfvcElVAE59J CL7ee6/5Y807zsVRPqsoxsJ+c2WjoDpwXZT1LUT9rbCWh+canRWVXGvGFAuLgQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709962809; a=rsa-sha256; cv=none; b=ciYlThGdNdo04ES4BocsX2QmJP/EQeVwdX2VEl6R8dLpt+ik5lR82QuR5bAAYgNwlciGLn IDJ5BZlxXoxyAFuMpFRozJ3WBYc0LV7GCojD+4Gai4xHXQqffT0BkoizEkRayHeKKPYSWa 2fX1pl/nVA6Zxdw/lTZBGsgngoSORDIlIsZ5HYm2TVERRt3LB6Ehn5HCv3/wpqnLQzUDxq NYMmu9Pe9Csk15/NWvn8Dspm3jVcsj0hoCqotgOFwTavHtOsibUIVRzGnW2On3S+jeSBgG BZvQLuRytUZBFYoQ2Fkk6jScLeRMOp66ggtEC01Wf9QEeNzODxp2Ln5TccujQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709962809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZHsUh7XtOzNK2tvbzDdrQTCQkDbxTGQUWlVu0gKuijM=; b=etuzXFCN/qqT62BOUhbZFGSwFX18JGg9QJA5Ev8w/fOWA7/BoBqG8Vrhb69w2ZetALgsZU LSTmv6BuPlaA4npV+isyzY6xIXSq/farRqubSsK350t6ojRhd0ROWlnf2pnyb6wRkgInOt t2fylVHvVxUDhfsriSVfmaqIEuZ/3cl6ADlWqXVzShh9XWTgsV8+M5gdkLFRQbupRKil9M rL6O8RwseyiefQ2a9Ic7V8RzeqkrW1x9MDJNL1gASuySeRLwzNx/gjUFW/Kj74ulTN37AJ Eis41+DNFx5zoNGSOrQeIoj9PTndjPY838f/fm95JoUeb2n+xxga+5QPx/ke3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsBh94BR0zqJm; Sat, 9 Mar 2024 05:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4295e9Tp027405; Sat, 9 Mar 2024 05:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4295e9pG027396; Sat, 9 Mar 2024 05:40:09 GMT (envelope-from git) Date: Sat, 9 Mar 2024 05:40:09 GMT Message-Id: <202403090540.4295e9pG027396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: a58813fd701e - main - ktrace: Fix the build when options KTRACE is not configured List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a58813fd701ea4b248cca0dfab9971d863fbcf6a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a58813fd701ea4b248cca0dfab9971d863fbcf6a commit a58813fd701ea4b248cca0dfab9971d863fbcf6a Author: Mark Johnston AuthorDate: 2024-03-09 05:11:01 +0000 Commit: Mark Johnston CommitDate: 2024-03-09 05:33:55 +0000 ktrace: Fix the build when options KTRACE is not configured MFC after: 1 week Reported by: John Nielsen --- sys/kern/kern_condvar.c | 12 ++++++------ sys/kern/kern_synch.c | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 0d470aeafcd5..a55863595ce2 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -37,13 +37,13 @@ #include #include #include +#include #include #include #include #include #include #ifdef KTRACE -#include #include #include #endif @@ -112,7 +112,7 @@ _cv_wait(struct cv *cvp, struct lock_object *lock) char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; uintptr_t lock_state; td = curthread; @@ -174,7 +174,7 @@ _cv_wait_unlock(struct cv *cvp, struct lock_object *lock) char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; td = curthread; CV_ASSERT(cvp, lock, td); @@ -232,7 +232,7 @@ _cv_wait_sig(struct cv *cvp, struct lock_object *lock) char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; uintptr_t lock_state; int rval; @@ -301,7 +301,7 @@ _cv_timedwait_sbt(struct cv *cvp, struct lock_object *lock, sbintime_t sbt, char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; int lock_state, rval; td = curthread; @@ -371,7 +371,7 @@ _cv_timedwait_sig_sbt(struct cv *cvp, struct lock_object *lock, char wmesg[WMESGLEN + 1]; #endif struct lock_class *class; - struct thread *td; + struct thread *td __ktrace_used; int lock_state, rval; td = curthread; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index f12054a04b23..c7258b3cffa5 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -60,7 +61,6 @@ #include #ifdef KTRACE #include -#include #endif #ifdef EPOCH_TRACE #include @@ -131,7 +131,7 @@ int _sleep(const void *ident, struct lock_object *lock, int priority, const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) { - struct thread *td; + struct thread *td __ktrace_used; struct lock_class *class; uintptr_t lock_state; int catch, pri, rval, sleepq_flags; @@ -238,7 +238,7 @@ int msleep_spin_sbt(const void *ident, struct mtx *mtx, const char *wmesg, sbintime_t sbt, sbintime_t pr, int flags) { - struct thread *td; + struct thread *td __ktrace_used; int rval; WITNESS_SAVE_DECL(mtx); From nobody Sat Mar 9 09:05:34 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsHFB30rYz5DDpF; Sat, 9 Mar 2024 09:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsHFB2KRVz4G5h; Sat, 9 Mar 2024 09:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709975134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2mTIClQM4GRE4LJiQEJ+lT+6SIMBchjBE1ZDQ53lDVg=; b=C5OZj2jWUw+dTI9S+42VXnFCSxUVVPP3zZ5ZBN394WqAQ8aEz9YWpDsG9qIb8amBM0axfo yiDgEVrBehwUbWphtU26vJjWR3SCkgW84BhQfGSbyw3i7gd4wlSdWgeV0pcn/zWT0ykKWP FoUwClyJtybitcF79rDZvMKdURr4mIbalXBlQmmFoZ0w1V1eKcGtjdsk3hVVUBmJWdGTkx aEnK93jke8Q1Kx+LDF/x9rj+oWTSHL/vLE/CPr28leY7hWcWiWzVrEF/ZphhP67PAiVobW wGPuaaAL0wvpGXBgKEXjtuK/teXn/0VrhtkLH0quJNnZdgae+FyVEjssYdTURw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709975134; a=rsa-sha256; cv=none; b=NFTWHV7x8wwv6oUWGoEeeF9OpH8979j5S/liX2yNaJK0PCbYBIPK6Og2hqRrbczq+Ba2SM Wb8Dx8FRvBgg7FgCpO5k82vpc8mCr5//+74b4xegbCNpjUo8YNITH/KGUs8bdmoYPL+lWT rtXdqXYMFuKnxFpfNDnYhPydtIosg4azevxTPez2G6ptbfqcAMmcAeYA7X4t55Qg4QpXYA lVeUncSF953bCD1ihMZgrJjXTa0SGtOPZ2yXP0u6/AqpHsSyCJ1VfcBvgA22zwbMJMvH1n 0JevxrnbyO2swX4mA8AapFk4zoaRN8qscvVVZSImaMZ60UxTyVltxlywI9NVFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709975134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2mTIClQM4GRE4LJiQEJ+lT+6SIMBchjBE1ZDQ53lDVg=; b=TmNqvsS9Z0DfORTMQc+wtjJofU5X+ITv9Fo7LYmg07RoU7OLCBAqLZ7TaWjlgn5sKHgD9M GrR8Og3bTwMwhEnixYTGfLw38ww1pbiozoMcPgAUhG41njJQNTn2CCVMLDUcdU00hfzCig 9G8IeZ6NlA0W7GV2qb+yL+GCOuguZZovKwlJ4ry4I3fbWzy8kUGgFvzwLagatSbTbByFdD Loth88Y29IDHtizwv6ElXN3PLE6NexHiIO0TADBCz3OCbpucKN3QGZ2rWLqan2r4jmqxIz co+8WyodYqC86A0zIHXOrxsO1ufYP8fxAakUUbTJiaM8GZ0s3Uzq8DF76zqx0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsHFB1p1Vzwhk; Sat, 9 Mar 2024 09:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42995YW5078308; Sat, 9 Mar 2024 09:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42995YiG078305; Sat, 9 Mar 2024 09:05:34 GMT (envelope-from git) Date: Sat, 9 Mar 2024 09:05:34 GMT Message-Id: <202403090905.42995YiG078305@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: f7d51eb77e84 - stable/14 - getblkx(9): be more tolerant but also strict with the buffer size checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f7d51eb77e848a6f7823d98349ebabb6efce4e52 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f7d51eb77e848a6f7823d98349ebabb6efce4e52 commit f7d51eb77e848a6f7823d98349ebabb6efce4e52 Author: Konstantin Belousov AuthorDate: 2024-03-02 04:58:57 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-09 09:05:03 +0000 getblkx(9): be more tolerant but also strict with the buffer size checks PR: 277414 (cherry picked from commit 7e4ac11b6076e6a9bf7341ddeae22784284ed733) --- sys/kern/vfs_bio.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 56f9d604b9eb..1b55c523c436 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3980,9 +3980,11 @@ getblkx(struct vnode *vp, daddr_t blkno, daddr_t dblkno, int size, int slpflag, ("GB_KVAALLOC only makes sense with GB_UNMAPPED")); if (vp->v_type != VCHR) ASSERT_VOP_LOCKED(vp, "getblk"); - if (size > maxbcachebuf) - panic("getblk: size(%d) > maxbcachebuf(%d)\n", size, + if (size > maxbcachebuf) { + printf("getblkx: size(%d) > maxbcachebuf(%d)\n", size, maxbcachebuf); + return (EIO); + } if (!unmapped_buf_allowed) flags &= ~(GB_UNMAPPED | GB_KVAALLOC); @@ -4156,6 +4158,12 @@ newbuf_unlocked: vmio = vp->v_object != NULL; if (vmio) { maxsize = size + (offset & PAGE_MASK); + if (maxsize > maxbcachebuf) { + printf( + "getblkx: maxsize(%d) > maxbcachebuf(%d)\n", + maxsize, maxbcachebuf); + return (EIO); + } } else { maxsize = size; /* Do not allow non-VMIO notmapped buffers. */ From nobody Sat Mar 9 09:06:00 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsHFj03FKz5DDrh; Sat, 9 Mar 2024 09:06:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsHFh6jB2z4GGf; Sat, 9 Mar 2024 09:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709975160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1jsxCA6n0w10OsvuFkh3ovp2gbJz55UDVUEsXrx+3gw=; b=J312EU+aPV6U3U63xw68jcMnYTLySu+ctIRK6bWBEuhz7r7B6UlWvp3Q3GW2SUAfPLXSrx 2ClV6YU7iYZvUvIF+SV9vPfuM+8sz43yrGASV9iAcYl74rp8RZ7gWwoK1lkpdohdm1tANr 7seIZxACD+D9FUO3f1IsRioJkLT6q5WkilAI9m4WkAZZIpw+Fa/e8949cqpvXCNvfLFq7r nnZHctB/t7IuNAUhF3qtvguwvWo2xIARnBqvyBWG5+BzsI8JGpQTsvFJXuz8gfnnLWDnuH 0DUuXYG/xtl2H0NzqJtMgzX7DZLPn3ZOLvlBLMbsWDCWtWq8u4OqGckEcjY1VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709975160; a=rsa-sha256; cv=none; b=JDo8BBSNH3oOJEsFlC748t6f/vISvBfNVOHZL2IWjIhVa0e06MLc3HLSsknOR4HdaQBhcG zMgi4IpwL2jGPpwcqgx8I+aphtawipz2EtlDsewhg0saYgmaj6NpVHq5uMJlAuLXZLXRFz d6z4Ah6n169vJ+0IDNAhxtKQcgHnPYLlgSSAJcA+jlKW4OmFHKii6p0qTEmTVVmhWprQwT osFQQMnj/CCoDqemBxAZFJOCPXhY1v2MNGnIc81yvF6Tm/DyKU33QpLxTJB7E3P7iuLyAP T1L1d261qa3HZN8vV0taTcD7cUaV1oCZCbcrrTK12+KWXkGzJG+65mfv/ogi+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709975160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1jsxCA6n0w10OsvuFkh3ovp2gbJz55UDVUEsXrx+3gw=; b=ExBvMQuGzmtbViWHedr3csgGRaRAunPHYxqiJk5oomvuchlsZTSH3eDrnpdJ0QjvpaKOzm HYlgTI+xSbgMhJBgjb0fVeeK40e3sprPpIMpVJZnhxVroR0EznwRxYdiWBTZ8OLsNBnpZc HqpOAM8S6UI3CS8ozPs284eZU48YiV565F15I6JC4bFq8hBpEYGZHz3nndRixkrtFSZqKd 7ha8UGsjcfV1OxjgavWkvwLJCUdCy/KSKpfeCNqJYt1Pnl71TnK7y3t+ZF1Zth2bV1ga5/ nD1QeT8xVK3h5nbdFiH/CVC2XHWGPj2B9eJUwREXcZ/YjRIS9xOZj5M26Ero2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsHFh6Fhxzwhl; Sat, 9 Mar 2024 09:06:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429960W3078503; Sat, 9 Mar 2024 09:06:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4299602P078500; Sat, 9 Mar 2024 09:06:00 GMT (envelope-from git) Date: Sat, 9 Mar 2024 09:06:00 GMT Message-Id: <202403090906.4299602P078500@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: 1c1fde7540d8 - stable/13 - getblkx(9): be more tolerant but also strict with the buffer size checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1c1fde7540d813703d775e013a950145224f182e Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1c1fde7540d813703d775e013a950145224f182e commit 1c1fde7540d813703d775e013a950145224f182e Author: Konstantin Belousov AuthorDate: 2024-03-02 04:58:57 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-08 18:48:02 +0000 getblkx(9): be more tolerant but also strict with the buffer size checks PR: 277414 (cherry picked from commit 7e4ac11b6076e6a9bf7341ddeae22784284ed733) --- sys/kern/vfs_bio.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 546b6dfb6239..78dc6f511a4e 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -3963,9 +3963,11 @@ getblkx(struct vnode *vp, daddr_t blkno, daddr_t dblkno, int size, int slpflag, ("GB_KVAALLOC only makes sense with GB_UNMAPPED")); if (vp->v_type != VCHR) ASSERT_VOP_LOCKED(vp, "getblk"); - if (size > maxbcachebuf) - panic("getblk: size(%d) > maxbcachebuf(%d)\n", size, + if (size > maxbcachebuf) { + printf("getblkx: size(%d) > maxbcachebuf(%d)\n", size, maxbcachebuf); + return (EIO); + } if (!unmapped_buf_allowed) flags &= ~(GB_UNMAPPED | GB_KVAALLOC); @@ -4132,6 +4134,12 @@ newbuf_unlocked: vmio = vp->v_object != NULL; if (vmio) { maxsize = size + (offset & PAGE_MASK); + if (maxsize > maxbcachebuf) { + printf( + "getblkx: maxsize(%d) > maxbcachebuf(%d)\n", + maxsize, maxbcachebuf); + return (EIO); + } } else { maxsize = size; /* Do not allow non-VMIO notmapped buffers. */ From nobody Sat Mar 9 21:18:59 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsbWR6w88z5DxwL; Sat, 9 Mar 2024 21:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsbWR5zJVz4ZG3; Sat, 9 Mar 2024 21:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710019139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pMiOwHp1RrO8BTezeXxur0N0YVICqUx1jUXsUzxP9jY=; b=BlpchAjAkxn45B3ziOKS0ACJwUroY0TTYbkxrR8KD9lh+NBDn1hnS9IZlPW1kF7kEn8+Qx K5UUE51kmxZYAaQl915pJv7ejNOzkooshtX51f8TuZN1Mygb7sciL+yYOPALWB1lqyue+j jcM106a3O70764vTX4Rvg9Mq1abOvSe6Gd7wrcm+Qpar/dfRspBQOtyn9LQALCQ0TqkwHV /8m/fDwPD1G6S3ENXMFFG4mEdmDqoBj73xmbo7U9PpESA7PFzEYaoaHJxxmIIX8yfrvfFC TWvBHG9wrrTYmiJy6cvo6lM84jKE/DqnDgYJveNbRcTEy9s7SeA06MjckJZ5+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710019139; a=rsa-sha256; cv=none; b=dv4V2PEe8W9Tdg+qQX3M1sKTeufmz6BahCwIEn+S87dEGQ1BXSha9sWfmvRkPOvtKGkWWe 8bO7P+tJhe2E9sEw1x2G0/fubVe+UIxFV0qt3E3bDXqBMKeny7Qqv06PkXiHzR52Ek+VOz PCgs9PeWO/jXmq2qROdDY+VznpfHDHx76QEUVWqnpex6NZhz6rw+arsShCTjjlns7TdWbS G0V2Es0YRusQ3QRD6KrHQFTSWwmNfLECyimDBCW+yC5u7z64TsJIAMcyLPCDpkOH2sxk/N tbLGkZYpVKPqcZiE1stV9PWOkpYRQcYEbAsqZinYqCtgIsl4sJj9S+R1dr32xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710019139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pMiOwHp1RrO8BTezeXxur0N0YVICqUx1jUXsUzxP9jY=; b=WNeqyTN9TOvKuvuwh+SfpwwZFfh6o86hgcJTJSXVjpGN9RXaA595PsjKtHlEnVe6RuD94q M+U4IHVnNRyBufPq4aTyR6XwgoYRsO1nkaYlv4sGxjcs+dYvZ4PlKCIeCTqVp/xMDHTnrH 4vG466ekb6g+4JQWegpcvBT5K7L1gOU0hRQZNb++2IIZ5EBTgvo3I6GPCM4p7WZa8qvIaM YQro00P8+1VsuA4qdUTYc8jv2jipnp6igJ9CU5K3OJ1WcR4qc9vZBY+NFJCtoKUR5WXsG1 VGnCWqCOgKzTK4kLuwzlFSrkfMeqM05o2g9wD8GRNX4DdN6wuiURMLlUhr0xDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsbWR5SVrzJ63; Sat, 9 Mar 2024 21:18:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 429LIxSZ047639; Sat, 9 Mar 2024 21:18:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429LIx8F047636; Sat, 9 Mar 2024 21:18:59 GMT (envelope-from git) Date: Sat, 9 Mar 2024 21:18:59 GMT Message-Id: <202403092118.429LIx8F047636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bdf1587a4973 - main - mount_nullfs(8): fix typo List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdf1587a4973df2f012278b4e975da1cd8766f83 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bdf1587a4973df2f012278b4e975da1cd8766f83 commit bdf1587a4973df2f012278b4e975da1cd8766f83 Author: Konstantin Belousov AuthorDate: 2024-03-09 21:18:11 +0000 Commit: Konstantin Belousov CommitDate: 2024-03-09 21:18:39 +0000 mount_nullfs(8): fix typo Reported by: mckusick --- sbin/mount_nullfs/mount_nullfs.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8 index da7eb8f3d58b..8638c25c0610 100644 --- a/sbin/mount_nullfs/mount_nullfs.8 +++ b/sbin/mount_nullfs/mount_nullfs.8 @@ -97,7 +97,7 @@ Some lower-layer file systems may force this option. Depending on the access pattern, this may result in increased lock contention. .It Cm cache -Force enable metadate caching. +Force enable metadata caching. .El .El .Pp From nobody Sun Mar 10 01:46:07 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsjRh03ZFz5Cw2P; Sun, 10 Mar 2024 01:46: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 4TsjRg6d0xz4x1F; Sun, 10 Mar 2024 01:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710035167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6HnYASAc/dWWYFpDdeDl67+DzikMST1vnD84/Kb9HQ=; b=BKiD0G53y0DhyYiyS0pwcBGiYyKc04KOFnycqpAkoQarbq/R4ZoKaJZxCznv0wzSnd5oG2 kW2or7gnaEJXelCEclfTGatFWXZfXap0mSC4EK4r6KnHOC9dmh2/G8W/fyqdhy0yLq37Op Qn1x6vQxgcVqtcCHHV9r0agHInoW62BSSDiheuWmcptViYZtUHPn6aV6EFzrSRBYETcF1D GA5KoxMNE204Sn7eBpg4n/dj9Jjhp443ZZvonKbTRSd5hlbWKDHscb6vXZJZITK7vM2Mtb rgpccAxcCg8x1qi0mDJAmjFpvS+D9BETUkJt4vO7VOcqZIUxuSfaTmlJr44+5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710035167; a=rsa-sha256; cv=none; b=MoM6zi18tDgCqJh3rAwBGtxWVCHy7EY11ZCL0rnfHb/S7qDzcpFdrJgnjWnTyKDRGp5Ig6 9Cf4noIaRFDUXMQfFn6sKiegY7xMAeNFiN6kcLWIZsyM4yxO9R0K5Nw85nlzyHOUQG+jqE hy3/mU9J3AM1nSzArYz2zbAwhzRjYmNH5fv8CnwZNpPpF2kHUZn5D3WjKXdt0ECFdNDvg8 eug10JJH8+JPBr7VCnpaDF0TvJnhyHDcAw2h76HTFlhSJykYC4NJXisBI9A6++J6L9fo3e kaDYQpCXGawkvey6IJmldEnL5/W8q55GZk5pq0CBPtWe2M70F35VxNsk68t41Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710035167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C6HnYASAc/dWWYFpDdeDl67+DzikMST1vnD84/Kb9HQ=; b=m7UnQ5l6vMKc5Sq2zHg0EGB233IG7YXYdNCDXOiPMJlsrRooYryB9VQ4I6k/1sVFnS18Ct QQoa3i4eBxkDMnl+ICKsvKdzuu7K9KcfTQ4G32dhRlj322n9ovjrfrzZmmX2Y8pFc6dZSd GQiIMrJiwopr8MwZw8MPm1Xl07ULBQTpDDzYnJqFvD3XCva3Z6//iYZ4UbSEIPBbebBdYH PWTMkIpcxpFOFeJI5kGKqiXItdKmjEaC/vQQTl3NGzjPPBbhyqSAP4qz05xPxZrZDvKJ0p 5FFTy49hlOwpWvd0NArTZaWS5NXaLVphj7/hCXjgvXqVo6K4/kd0cnrKIr9i7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsjRg6CflzQnY; Sun, 10 Mar 2024 01:46:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42A1k7dB000589; Sun, 10 Mar 2024 01:46:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42A1k74F000586; Sun, 10 Mar 2024 01:46:07 GMT (envelope-from git) Date: Sun, 10 Mar 2024 01:46:07 GMT Message-Id: <202403100146.42A1k74F000586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: fa26f46dc29f - main - vn_lock_pair(): allow lkflags1/lkflags2 to be 0 if vp1/vp2 is NULL List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa26f46dc29f5ee1ac8e7b10fc12aa1f93cce702 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=fa26f46dc29f5ee1ac8e7b10fc12aa1f93cce702 commit fa26f46dc29f5ee1ac8e7b10fc12aa1f93cce702 Author: Jason A. Harmening AuthorDate: 2024-02-23 17:31:08 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-10 01:41:45 +0000 vn_lock_pair(): allow lkflags1/lkflags2 to be 0 if vp1/vp2 is NULL It's a bit strange to require the caller to pass contrived lock flags if the corresponding vnode is NULL, simply to appease the assertion that exactly one of LK_SHARED or LK_EXCLUSIVE must be set. On the other hand, we still want to catch cases in which completely bogus or corrupt flags are passed even if the corresponding vnode is NULL. Therefore, specifically allow empty flags for lkflags1/lkflags2 iff the respective vp1/vp2 param is NULL. Reviewed by: kib, olce MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44046 --- sys/kern/vfs_vnops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 77e4dd21f276..fd78b692b088 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -4101,9 +4101,11 @@ vn_lock_pair(struct vnode *vp1, bool vp1_locked, int lkflags1, { int error, locked1; - MPASS(((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)); + MPASS((((lkflags1 & LK_SHARED) != 0) ^ ((lkflags1 & LK_EXCLUSIVE) != 0)) || + (vp1 == NULL && lkflags1 == 0)); MPASS((lkflags1 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); - MPASS(((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)); + MPASS((((lkflags2 & LK_SHARED) != 0) ^ ((lkflags2 & LK_EXCLUSIVE) != 0)) || + (vp2 == NULL && lkflags2 == 0)); MPASS((lkflags2 & ~(LK_SHARED | LK_EXCLUSIVE | LK_NODDLKTREAT)) == 0); if (vp1 == NULL && vp2 == NULL) From nobody Sun Mar 10 01:52:35 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tsjb801dTz5CwQQ; Sun, 10 Mar 2024 01:52: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 4Tsjb76GP3z4xSq; Sun, 10 Mar 2024 01:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710035555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDlVNeiKtiYf5F0j7eXrwVtxQ42fO7TDkP6rpNIO/TU=; b=yGIcpDaIapLpF1L1KDOgbDd7/d9kSZEgGLqp4dzM3xY0NKTD0FhYNS4FsKqfXuGUFxq1IN GTIC0hYtOgADRd1HZVR0B87s8Pbna2Y38BY5tHo0GToxLi3mgOBfl8oBLHdZESw6yED8ck BX4Zs85g/Lq7dHpRnYsYpDaphbbT+fdmmFWwHlIalfQEAtzRyYSKhj+EAlJsGEjq16DwKm lrnO4HAkH2rYpgPWuLHkKUmiKXRJ8y40xNkgArCdBuU0B8n9mAvRqi+YUrs08kEz3+OdwL /urF732JXYTR7ixynq3sm9x14+gvoHtKAw9he9nMG1Yq1U1Us7cU19w6BbMIiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710035555; a=rsa-sha256; cv=none; b=xOtqrGE5RlSsm6ydgxNh7Cvt+iszobQNcpdicF7dVOmSYCoxGOa4t+7mdObw41W6Jfqv2f DyxHY+uNDKWnGWs+IG58gM9zqP3NKGauRtkbURLvDgw7zDlezV26WDOZ8GfLwHe/yf/pKY QE/Q4iEGEAmqcCoCt3cF6KjFkroZ9XKBQy1BqNBhMCvNGmRBil3HK8hv5OgpyGf9W7YElQ ZE/z1tBZIwnrUb36SJiU5tlGtLyZy1xyCqsA5O1kyROaWxVdXEVsLBhv+/HmdeM4ourscM BT7gX753rOSFf97bKDhVJx85lBkS+N6UYhubjrUkaXsabuk5vuGf1e5zA+WV5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710035555; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cDlVNeiKtiYf5F0j7eXrwVtxQ42fO7TDkP6rpNIO/TU=; b=bM1dr1rfvuJ+JgoCWlYIDrO7D4/gmNhxjjJgg0korODSdKUDSYSzD0b4y5ZNgoUxHiGIXs y5DmSXQUFAwHcXNOHGAHkXAYDwM4zTopCYrGnlSM1i26BVgUK0kvEAWGOiAa/Httfrl1+w EQB5ES0+uVHw6nePEJu+KwI+WdSxfM7Q7kFXRzHR1uKBu2dT2212c6T4YCPf5VIwy2Tv01 gVCLn11gmi8f4b8kUH7GNq7CCCusk7GGCPctHBrzASyRl3XMWp51EenuuFCBRYP/8cKRu9 TZKybXu4x/Vtl6MW9rdmEbJl5A+8+WhGCtdrrHkP9+9IVarKCoZ3UFJu8O/DBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tsjb75sffzRR3; Sun, 10 Mar 2024 01:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42A1qZX5017335; Sun, 10 Mar 2024 01:52:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42A1qZeX017332; Sun, 10 Mar 2024 01:52:35 GMT (envelope-from git) Date: Sun, 10 Mar 2024 01:52:35 GMT Message-Id: <202403100152.42A1qZeX017332@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: d56c175ac935 - main - uipc_bindat(): Explicitly specify exclusive locking for the new vnode List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d56c175ac9353bd701a488bb2606a3372623dcc5 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=d56c175ac9353bd701a488bb2606a3372623dcc5 commit d56c175ac9353bd701a488bb2606a3372623dcc5 Author: Jason A. Harmening AuthorDate: 2024-02-03 17:07:16 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-10 01:48:02 +0000 uipc_bindat(): Explicitly specify exclusive locking for the new vnode When calling VOP_CREATE(), uipc_bindat() reuses the componentname object from the preceding lookup operation, which is likely to specify LK_SHARED. Furthermore, the VOP_CREATE() interface technically only requires the newly-created vnode to be returned with a shared lock. However, the socket layer requires the new vnode to be locked exclusive and asserts to that effect. In most cases, this is not a practical concern because most if not all base-layer filesystems (certainly FFS, ZFS, and msdosfs at least) always return the vnode locked exclusive regardless of the lock flags. However, it is an issue for unionfs which uses cn_lkflags to determine how the new unionfs wrapper vnode should be locked. While it would be easy enough to work around this issue within unionfs itself, it seems better for the socket layer to be explicit about its locking requirements when issuing VOP_CREATE(). Reviewed by: kib, olce MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44047 --- sys/kern/uipc_usrreq.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 20facd9b0a44..6e83e2be6f05 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -594,8 +594,19 @@ restart: error = mac_vnode_check_create(td->td_ucred, nd.ni_dvp, &nd.ni_cnd, &vattr); #endif - if (error == 0) + if (error == 0) { + /* + * The prior lookup may have left LK_SHARED in cn_lkflags, + * and VOP_CREATE technically only requires the new vnode to + * be locked shared. Most filesystems will return the new vnode + * locked exclusive regardless, but we should explicitly + * specify that here since we require it and assert to that + * effect below. + */ + nd.ni_cnd.cn_lkflags = (nd.ni_cnd.cn_lkflags & ~LK_SHARED) | + LK_EXCLUSIVE; error = VOP_CREATE(nd.ni_dvp, &nd.ni_vp, &nd.ni_cnd, &vattr); + } NDFREE_PNBUF(&nd); if (error) { VOP_VPUT_PAIR(nd.ni_dvp, NULL, true); From nobody Sun Mar 10 01:58:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tsjk462z5z5Cx1X; Sun, 10 Mar 2024 01:58: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 4Tsjk44z5sz504F; Sun, 10 Mar 2024 01:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710035916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rie4W4cWQpjgdL16lL08CzJeqJVQZI9LpThXXUKQMg=; b=rtPLhxOJnD++ie+djrkILC1JhmoTzGfwHuOICsA9xW3G3bt0K3JfweMkZjJyU3vl7SajTs o5rZeth2W0nZZ2phXYx0yPIMWjbx0sDxUzMdeMvOIWIUXb3JNh6W5TY1KpJtJsxysn18SM DPGoTXp4RS18KtwofLGWkaKiXqNjD15hcas3IzErPBwy9UcDGFepX+ybzCLGo1wRrPqevs vRKq+IXDMSrlnCRkxY/TaF+yo12QVaBxLJMoyJwTRhTt29601sR/5TCsNJkmeUfA5I7/Of 4DjlOtzq5HxMctB2kF0LZBUyyTbbnGZzLpROEcjQ1crKjuuqfKrMbhDo6v5Teg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710035916; a=rsa-sha256; cv=none; b=GDRMxO6cqRQhRNXw204LOb9qmNxBwyuJtk+VWb4bALrWXdEhYOu0xlTZGWAyOy0gmiShum +OjwK/8/fmLqngrh4NL78rhAXn8pPjpSY3OZFBk+bGvEXLo3PcPp6XOON5St8rlb7iKJ2r QIN9r0GA3A/BA/lvkLnUXhSFafLj6e+zBDNDNKhIjIHHoA4Q//J1j1+NmVUPMPZq3PayNq NNF8b0iDxOyFcRLwfc0bv9luObsAMn1rj1tv4IMWwXk1Wq7dwEBgz/wjhXN7CFHBi4397W FUBGse3jxXyXvQJxOfKrRLcxwMkSg1QGPOPkOPNC9D8zl/xtY5mijUYiNHRrwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710035916; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9rie4W4cWQpjgdL16lL08CzJeqJVQZI9LpThXXUKQMg=; b=BP3a3izmbG5VAcjPLmRv/4UkkOHzNVJEbr8MRklCy/B9yDV1fsJDIroHCsCfedViK0UgnM DHQAfzrj5mc7jZSdOPQZhRNulH5tK0iR2itHar1nzdUF17sLY6SUXKq/SDzBbOXU1D4oeZ r4fpyaiYnSKvf7FgzaT17F0VzrV8BZ5VEVuFlIC3d7AnNHOGzf+0gZz7D+3GsbTOdcck3b Cab7BRfPsURCNe4BOukNYIh8H50JjjG1lxfBtCcm+SGfFpm+iY910SzckTwitTqbbEWVmr zrYDpb6qNQKSztnhOqPGa6516zPDUqWHMfBUzsONJXniyP1WRirbBip2LIgoHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tsjk44SRhzRSD; Sun, 10 Mar 2024 01:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42A1waxn018288; Sun, 10 Mar 2024 01:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42A1waGe018285; Sun, 10 Mar 2024 01:58:36 GMT (envelope-from git) Date: Sun, 10 Mar 2024 01:58:36 GMT Message-Id: <202403100158.42A1waGe018285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 6c8ded001540 - main - unionfs: accommodate underlying FS calls that may re-lock List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c8ded001540fd969ebc2eabd45a0066ebcc662b Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=6c8ded001540fd969ebc2eabd45a0066ebcc662b commit 6c8ded001540fd969ebc2eabd45a0066ebcc662b Author: Jason A. Harmening AuthorDate: 2024-01-02 21:22:24 +0000 Commit: Jason A. Harmening CommitDate: 2024-03-10 01:54:04 +0000 unionfs: accommodate underlying FS calls that may re-lock Since non-doomed unionfs vnodes always share their primary lock with either the lower or upper vnode, any forwarded call to the base FS which transiently drops that upper or lower vnode lock may result in the unionfs vnode becoming completely unlocked during that transient window. The unionfs vnode may then become doomed by a concurrent forced unmount, which can lead to either or both of the following: --Complete loss of the unionfs lock: in the process of being doomed, the unionfs vnode switches back to the default vnode lock, so even if the base FS VOP reacquires the upper/lower vnode lock, that no longer translates into the unionfs vnode being relocked. This will then violate that caller's locking assumptions as well as various assertions that are enabled with DEBUG_VFS_LOCKS. --Complete less of reference on the upper/lower vnode: the caller normally holds a reference on the unionfs vnode, while the unionfs vnode in turn holds references on the upper/lower vnodes. But in the course of being doomed, the unionfs vnode will drop the latter set of references, which can effectively lead to the base FS VOP executing with no references at all on its vnode, violating the assumption that vnodes can't be recycled during these calls and (if lucky) violating various assertions in the base FS. Fix this by adding two new functions, unionfs_forward_vop_start_pair() and unionfs_forward_vop_finish_pair(), which are intended to bookend any forwarded VOP which may transiently unlock the relevant vnode(s). These functions are currently only applied to VOPs that modify file state (and require vnode reference and lock state to be identical at call entry and exit), as the common reason for transiently dropping locks is to update filesystem metadata. Reviewed by: olce Tested by: pho MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D44076 --- sys/fs/unionfs/union.h | 22 +++++- sys/fs/unionfs/union_subr.c | 179 ++++++++++++++++++++++++++++++++++++++++--- sys/fs/unionfs/union_vnops.c | 148 +++++++++++++++++++++++------------ 3 files changed, 289 insertions(+), 60 deletions(-) diff --git a/sys/fs/unionfs/union.h b/sys/fs/unionfs/union.h index 0d678b4fed41..467db3b29ff8 100644 --- a/sys/fs/unionfs/union.h +++ b/sys/fs/unionfs/union.h @@ -144,8 +144,8 @@ int unionfs_create_uppervattr(struct unionfs_mount *, struct vnode *, struct vattr *, struct ucred *, struct thread *); int unionfs_mkshadowdir(struct unionfs_mount *, struct vnode *, struct unionfs_node *, struct componentname *, struct thread *); -int unionfs_mkwhiteout(struct vnode *, struct componentname *, - struct thread *, char *, int); +int unionfs_mkwhiteout(struct vnode *, struct vnode *, + struct componentname *, struct thread *, char *, int); int unionfs_relookup(struct vnode *, struct vnode **, struct componentname *, struct componentname *, struct thread *, char *, int, u_long); @@ -155,6 +155,24 @@ int unionfs_relookup_for_delete(struct vnode *, struct componentname *, struct thread *); int unionfs_relookup_for_rename(struct vnode *, struct componentname *, struct thread *); +void unionfs_forward_vop_start_pair(struct vnode *, int *, + struct vnode *, int *); +bool unionfs_forward_vop_finish_pair(struct vnode *, struct vnode *, int, + struct vnode *, struct vnode *, int); + +static inline void +unionfs_forward_vop_start(struct vnode *basevp, int *lkflags) +{ + unionfs_forward_vop_start_pair(basevp, lkflags, NULL, NULL); +} + +static inline bool +unionfs_forward_vop_finish(struct vnode *unionvp, struct vnode *basevp, + int lkflags) +{ + return (unionfs_forward_vop_finish_pair(unionvp, basevp, lkflags, + NULL, NULL, 0)); +} #define UNIONFSVPTOLOWERVP(vp) (VTOUNIONFS(vp)->un_lowervp) #define UNIONFSVPTOUPPERVP(vp) (VTOUNIONFS(vp)->un_uppervp) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 686043cc93de..bb57f3d56ade 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -936,14 +936,21 @@ unionfs_mkshadowdir(struct unionfs_mount *ump, struct vnode *udvp, *pathend = pathterm; if (!error) { - unionfs_node_update(unp, uvp, td); - /* * XXX The bug which cannot set uid/gid was corrected. * Ignore errors. */ va.va_type = VNON; VOP_SETATTR(uvp, &va, nd.ni_cnd.cn_cred); + + /* + * VOP_SETATTR() may transiently drop uvp's lock, so it's + * important to call it before unionfs_node_update() transfers + * the unionfs vnode's lock from lvp to uvp; otherwise the + * unionfs vnode itself would be transiently unlocked and + * potentially doomed. + */ + unionfs_node_update(unp, uvp, td); } vn_finished_write(mp); @@ -955,28 +962,180 @@ unionfs_mkshadowdir_abort: return (error); } +static inline void +unionfs_forward_vop_ref(struct vnode *basevp, int *lkflags) +{ + ASSERT_VOP_LOCKED(basevp, __func__); + *lkflags = VOP_ISLOCKED(basevp); + vref(basevp); +} + +/* + * Prepare unionfs to issue a forwarded VOP to either the upper or lower + * FS. This should be used for any VOP which may drop the vnode lock; + * it is not required otherwise. + * The unionfs vnode shares its lock with the base-layer vnode(s); if the + * base FS must transiently drop its vnode lock, the unionfs vnode may + * effectively become unlocked. During that window, a concurrent forced + * unmount may doom the unionfs vnode, which leads to two significant + * issues: + * 1) Completion of, and return from, the unionfs VOP with the unionfs + * vnode completely unlocked. When the unionfs vnode becomes doomed + * it stops sharing its lock with the base vnode, so even if the + * forwarded VOP reacquires the base vnode lock the unionfs vnode + * lock will no longer be held. This can lead to violation of the + * caller's sychronization requirements as well as various failed + * locking assertions when DEBUG_VFS_LOCKS is enabled. + * 2) Loss of reference on the base vnode. The caller is expected to + * hold a v_usecount reference on the unionfs vnode, while the + * unionfs vnode holds a reference on the base-layer vnode(s). But + * these references are released when the unionfs vnode becomes + * doomed, violating the base layer's expectation that its caller + * must hold a reference to prevent vnode recycling. + * + * basevp1 and basevp2 represent two base-layer vnodes which are + * expected to be locked when this function is called. basevp2 + * may be NULL, but if not NULL basevp1 and basevp2 should represent + * a parent directory and a filed linked to it, respectively. + * lkflags1 and lkflags2 are output parameters that will store the + * current lock status of basevp1 and basevp2, respectively. They + * are intended to be passed as the lkflags1 and lkflags2 parameters + * in the subsequent call to unionfs_forward_vop_finish_pair(). + * lkflags2 may be NULL iff basevp2 is NULL. + */ +void +unionfs_forward_vop_start_pair(struct vnode *basevp1, int *lkflags1, + struct vnode *basevp2, int *lkflags2) +{ + /* + * Take an additional reference on the base-layer vnodes to + * avoid loss of reference if the unionfs vnodes are doomed. + */ + unionfs_forward_vop_ref(basevp1, lkflags1); + if (basevp2 != NULL) + unionfs_forward_vop_ref(basevp2, lkflags2); +} + +static inline bool +unionfs_forward_vop_rele(struct vnode *unionvp, struct vnode *basevp, + int lkflags) +{ + bool unionvp_doomed; + + if (__predict_false(VTOUNIONFS(unionvp) == NULL)) { + if ((lkflags & LK_EXCLUSIVE) != 0) + ASSERT_VOP_ELOCKED(basevp, __func__); + else + ASSERT_VOP_LOCKED(basevp, __func__); + unionvp_doomed = true; + } else { + vrele(basevp); + unionvp_doomed = false; + } + + return (unionvp_doomed); +} + + +/* + * Indicate completion of a forwarded VOP previously prepared by + * unionfs_forward_vop_start_pair(). + * basevp1 and basevp2 must be the same values passed to the prior + * call to unionfs_forward_vop_start_pair(). unionvp1 and unionvp2 + * must be the unionfs vnodes that were initially above basevp1 and + * basevp2, respectively. + * basevp1 and basevp2 (if not NULL) must be locked when this function + * is called, while unionvp1 and/or unionvp2 may be unlocked if either + * unionfs vnode has become doomed. + * lkflags1 and lkflag2 represent the locking flags that should be + * used to re-lock unionvp1 and unionvp2, respectively, if either + * vnode has become doomed. + * + * Returns true if any unionfs vnode was found to be doomed, false + * otherwise. + */ +bool +unionfs_forward_vop_finish_pair( + struct vnode *unionvp1, struct vnode *basevp1, int lkflags1, + struct vnode *unionvp2, struct vnode *basevp2, int lkflags2) +{ + bool vp1_doomed, vp2_doomed; + + /* + * If either vnode is found to have been doomed, set + * a flag indicating that it needs to be re-locked. + * Otherwise, simply drop the base-vnode reference that + * was taken in unionfs_forward_vop_start(). + */ + vp1_doomed = unionfs_forward_vop_rele(unionvp1, basevp1, lkflags1); + + if (unionvp2 != NULL) + vp2_doomed = unionfs_forward_vop_rele(unionvp2, basevp2, lkflags2); + else + vp2_doomed = false; + + /* + * If any of the unionfs vnodes need to be re-locked, that + * means the unionfs vnode's lock is now de-coupled from the + * corresponding base vnode. We therefore need to drop the + * base vnode lock (since nothing else will after this point), + * and also release the reference taken in + * unionfs_forward_vop_start_pair(). + */ + if (__predict_false(vp1_doomed && vp2_doomed)) + VOP_VPUT_PAIR(basevp1, &basevp2, true); + else if (__predict_false(vp1_doomed)) { + /* + * If basevp1 needs to be unlocked, then we may not + * be able to safely unlock it with basevp2 still locked, + * for the same reason that an ordinary VFS call would + * need to use VOP_VPUT_PAIR() here. We might be able + * to use VOP_VPUT_PAIR(..., false) here, but then we + * would need to deal with the possibility of basevp2 + * changing out from under us, which could result in + * either the unionfs vnode becoming doomed or its + * upper/lower vp no longer matching basevp2. Either + * scenario would require at least re-locking the unionfs + * vnode anyway. + */ + if (unionvp2 != NULL) { + VOP_UNLOCK(unionvp2); + vp2_doomed = true; + } + vput(basevp1); + } else if (__predict_false(vp2_doomed)) + vput(basevp2); + + if (__predict_false(vp1_doomed || vp2_doomed)) + vn_lock_pair(unionvp1, !vp1_doomed, lkflags1, + unionvp2, !vp2_doomed, lkflags2); + + return (vp1_doomed || vp2_doomed); +} + /* * Create a new whiteout. * - * dvp should be locked on entry and will be locked on return. + * udvp and dvp should be locked on entry and will be locked on return. */ int -unionfs_mkwhiteout(struct vnode *dvp, struct componentname *cnp, - struct thread *td, char *path, int pathlen) +unionfs_mkwhiteout(struct vnode *dvp, struct vnode *udvp, + struct componentname *cnp, struct thread *td, char *path, int pathlen) { struct vnode *wvp; struct nameidata nd; struct mount *mp; int error; + int lkflags; wvp = NULLVP; NDPREINIT(&nd); - if ((error = unionfs_relookup(dvp, &wvp, cnp, &nd.ni_cnd, td, path, + if ((error = unionfs_relookup(udvp, &wvp, cnp, &nd.ni_cnd, td, path, pathlen, CREATE))) { return (error); } if (wvp != NULLVP) { - if (dvp == wvp) + if (udvp == wvp) vrele(wvp); else vput(wvp); @@ -984,9 +1143,11 @@ unionfs_mkwhiteout(struct vnode *dvp, struct componentname *cnp, return (EEXIST); } - if ((error = vn_start_write(dvp, &mp, V_WAIT | V_PCATCH))) + if ((error = vn_start_write(udvp, &mp, V_WAIT | V_PCATCH))) goto unionfs_mkwhiteout_free_out; - error = VOP_WHITEOUT(dvp, &nd.ni_cnd, CREATE); + unionfs_forward_vop_start(udvp, &lkflags); + error = VOP_WHITEOUT(udvp, &nd.ni_cnd, CREATE); + unionfs_forward_vop_finish(dvp, udvp, lkflags); vn_finished_write(mp); diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index 3ea427b5b53c..2fffe7d900bd 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -369,21 +369,27 @@ unionfs_create(struct vop_create_args *ap) error = EROFS; if (udvp != NULLVP) { + int lkflags; + bool vp_created = false; + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_CREATE(udvp, &vp, cnp, ap->a_vap); - if (error != 0) - goto unionfs_create_abort; - - if (vp->v_type == VSOCK) + if (error == 0) + vp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + lkflags)) && error == 0) { + error = ENOENT; + } + if (error == 0 && vp->v_type == VSOCK) *(ap->a_vpp) = vp; - else { + else if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); vrele(vp); - } + } else if (vp_created) + vput(vp); } -unionfs_create_abort: UNIONFS_INTERNAL_DEBUG("unionfs_create: leave (%d)\n", error); return (error); @@ -407,11 +413,14 @@ unionfs_whiteout(struct vop_whiteout_args *ap) error = EOPNOTSUPP; if (udvp != NULLVP) { + int lkflags; switch (ap->a_flags) { case CREATE: case DELETE: case LOOKUP: + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_WHITEOUT(udvp, cnp, ap->a_flags); + unionfs_forward_vop_finish(ap->a_dvp, udvp, lkflags); break; default: error = EINVAL; @@ -443,21 +452,27 @@ unionfs_mknod(struct vop_mknod_args *ap) error = EROFS; if (udvp != NULLVP) { + int lkflags; + bool vp_created = false; + unionfs_forward_vop_start(udvp, &lkflags); error = VOP_MKNOD(udvp, &vp, cnp, ap->a_vap); - if (error != 0) - goto unionfs_mknod_abort; - - if (vp->v_type == VSOCK) + if (error == 0) + vp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + lkflags)) && error == 0) { + error = ENOENT; + } + if (error == 0 && vp->v_type == VSOCK) *(ap->a_vpp) = vp; - else { + else if (error == 0) { VOP_UNLOCK(vp); error = unionfs_nodeget(ap->a_dvp->v_mount, vp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); vrele(vp); - } + } else if (vp_created) + vput(vp); } -unionfs_mknod_abort: UNIONFS_INTERNAL_DEBUG("unionfs_mknod: leave (%d)\n", error); return (error); @@ -890,8 +905,12 @@ unionfs_setattr(struct vop_setattr_args *ap) uvp = unp->un_uppervp; } - if (uvp != NULLVP) + if (uvp != NULLVP) { + int lkflags; + unionfs_forward_vop_start(uvp, &lkflags); error = VOP_SETATTR(uvp, vap, ap->a_cred); + unionfs_forward_vop_finish(ap->a_vp, uvp, lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_setattr: leave (%d)\n", error); @@ -925,6 +944,7 @@ unionfs_write(struct vop_write_args *ap) struct unionfs_node *unp; struct vnode *tvp; int error; + int lkflags; /* UNIONFS_INTERNAL_DEBUG("unionfs_write: enter\n"); */ @@ -933,7 +953,9 @@ unionfs_write(struct vop_write_args *ap) unp = VTOUNIONFS(ap->a_vp); tvp = (unp->un_uppervp != NULLVP ? unp->un_uppervp : unp->un_lowervp); + unionfs_forward_vop_start(tvp, &lkflags); error = VOP_WRITE(tvp, ap->a_uio, ap->a_ioflag, ap->a_cred); + unionfs_forward_vop_finish(ap->a_vp, tvp, lkflags); /* UNIONFS_INTERNAL_DEBUG("unionfs_write: leave (%d)\n", error); */ @@ -999,6 +1021,7 @@ unionfs_fsync(struct vop_fsync_args *ap) struct unionfs_node_status *unsp; struct vnode *ovp; enum unionfs_lkupgrade lkstatus; + int error, lkflags; KASSERT_UNIONFS_VNODE(ap->a_vp); @@ -1017,7 +1040,11 @@ unionfs_fsync(struct vop_fsync_args *ap) if (ovp == NULLVP) return (EBADF); - return (VOP_FSYNC(ovp, ap->a_waitfor, ap->a_td)); + unionfs_forward_vop_start(ovp, &lkflags); + error = VOP_FSYNC(ovp, ap->a_waitfor, ap->a_td); + unionfs_forward_vop_finish(ap->a_vp, ovp, lkflags); + + return (error); } static int @@ -1046,6 +1073,7 @@ unionfs_remove(struct vop_remove_args *ap) udvp = dunp->un_uppervp; cnp = ap->a_cnp; td = curthread; + unp = NULL; if (ap->a_vp->v_op != &unionfs_vnodeops) { if (ap->a_vp->v_type != VSOCK) @@ -1095,12 +1123,17 @@ unionfs_remove(struct vop_remove_args *ap) * XXX: if the vnode type is VSOCK, it will create whiteout * after remove. */ + int udvp_lkflags, uvp_lkflags; if (ump == NULL || ump->um_whitemode == UNIONFS_WHITE_ALWAYS || lvp != NULLVP) cnp->cn_flags |= DOWHITEOUT; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + ((unp == NULL) ? NULL : uvp), &uvp_lkflags); error = VOP_REMOVE(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, + ((unp == NULL) ? NULL : ap->a_vp), uvp, uvp_lkflags); } else if (lvp != NULLVP) - error = unionfs_mkwhiteout(udvp, cnp, td, path, pathlen); + error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, path, pathlen); UNIONFS_INTERNAL_DEBUG("unionfs_remove: leave (%d)\n", error); @@ -1156,8 +1189,14 @@ unionfs_link(struct vop_link_args *ap) if (needrelookup != 0) error = unionfs_relookup_for_create(ap->a_tdvp, cnp, td); - if (error == 0) + if (error == 0) { + int udvp_lkflags, uvp_lkflags; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + uvp, &uvp_lkflags); error = VOP_LINK(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_tdvp, udvp, udvp_lkflags, + ap->a_vp, uvp, uvp_lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_link: leave (%d)\n", error); @@ -1413,7 +1452,6 @@ unionfs_mkdir(struct vop_mkdir_args *ap) udvp = dunp->un_uppervp; if (udvp != NULLVP) { - vref(udvp); /* check opaque */ if (!(cnp->cn_flags & ISWHITEOUT)) { error = VOP_GETATTR(udvp, &va, cnp->cn_cred); @@ -1423,38 +1461,27 @@ unionfs_mkdir(struct vop_mkdir_args *ap) cnp->cn_flags |= ISWHITEOUT; } - if ((error = VOP_MKDIR(udvp, &uvp, cnp, ap->a_vap)) == 0) { + int udvp_lkflags; + bool uvp_created = false; + unionfs_forward_vop_start(udvp, &udvp_lkflags); + error = VOP_MKDIR(udvp, &uvp, cnp, ap->a_vap); + if (error == 0) + uvp_created = true; + if (__predict_false(unionfs_forward_vop_finish(dvp, udvp, + udvp_lkflags)) && error == 0) + error = ENOENT; + if (error == 0) { VOP_UNLOCK(uvp); cnp->cn_lkflags = LK_EXCLUSIVE; - /* - * The underlying VOP_MKDIR() implementation may have - * temporarily dropped the parent directory vnode lock. - * Because the unionfs vnode ordinarily shares that - * lock, this may allow the unionfs vnode to be reclaimed - * and its lock field reset. In that case, the unionfs - * vnode is effectively no longer locked, and we must - * explicitly lock it before returning in order to meet - * the locking requirements of VOP_MKDIR(). - */ - if (__predict_false(VTOUNIONFS(dvp) == NULL)) { - error = ENOENT; - goto unionfs_mkdir_cleanup; - } error = unionfs_nodeget(dvp->v_mount, uvp, NULLVP, dvp, ap->a_vpp, cnp); - cnp->cn_lkflags = lkflags; vrele(uvp); - } + cnp->cn_lkflags = lkflags; + } else if (uvp_created) + vput(uvp); } unionfs_mkdir_cleanup: - - if (__predict_false(VTOUNIONFS(dvp) == NULL)) { - vput(udvp); - vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY); - } else if (udvp != NULLVP) - vrele(udvp); - UNIONFS_INTERNAL_DEBUG("unionfs_mkdir: leave (%d)\n", error); return (error); @@ -1521,10 +1548,16 @@ unionfs_rmdir(struct vop_rmdir_args *ap) */ if (error == 0 && VN_IS_DOOMED(uvp)) error = ENOENT; - if (error == 0) + if (error == 0) { + int udvp_lkflags, uvp_lkflags; + unionfs_forward_vop_start_pair(udvp, &udvp_lkflags, + uvp, &uvp_lkflags); error = VOP_RMDIR(udvp, uvp, cnp); + unionfs_forward_vop_finish_pair(ap->a_dvp, udvp, udvp_lkflags, + ap->a_vp, uvp, uvp_lkflags); + } } else if (lvp != NULLVP) - error = unionfs_mkwhiteout(udvp, cnp, td, + error = unionfs_mkwhiteout(ap->a_dvp, udvp, cnp, td, unp->un_path, unp->un_pathlen); if (error == 0) { @@ -1558,15 +1591,24 @@ unionfs_symlink(struct vop_symlink_args *ap) udvp = dunp->un_uppervp; if (udvp != NULLVP) { + int udvp_lkflags; + bool uvp_created = false; + unionfs_forward_vop_start(udvp, &udvp_lkflags); error = VOP_SYMLINK(udvp, &uvp, cnp, ap->a_vap, ap->a_target); + if (error == 0) + uvp_created = true; + if (__predict_false(unionfs_forward_vop_finish(ap->a_dvp, udvp, + udvp_lkflags)) && error == 0) + error = ENOENT; if (error == 0) { VOP_UNLOCK(uvp); cnp->cn_lkflags = LK_EXCLUSIVE; error = unionfs_nodeget(ap->a_dvp->v_mount, uvp, NULLVP, ap->a_dvp, ap->a_vpp, cnp); - cnp->cn_lkflags = lkflags; vrele(uvp); - } + cnp->cn_lkflags = lkflags; + } else if (uvp_created) + vput(uvp); } UNIONFS_INTERNAL_DEBUG("unionfs_symlink: leave (%d)\n", error); @@ -2275,8 +2317,12 @@ unionfs_setacl(struct vop_setacl_args *ap) uvp = unp->un_uppervp; } - if (uvp != NULLVP) + if (uvp != NULLVP) { + int lkflags; + unionfs_forward_vop_start(uvp, &lkflags); error = VOP_SETACL(uvp, ap->a_type, ap->a_aclp, ap->a_cred, td); + unionfs_forward_vop_finish(ap->a_vp, uvp, lkflags); + } UNIONFS_INTERNAL_DEBUG("unionfs_setacl: leave (%d)\n", error); @@ -2458,9 +2504,13 @@ unionfs_setextattr_reopen: ovp = uvp; } - if (ovp == uvp) + if (ovp == uvp) { + int lkflags; + unionfs_forward_vop_start(ovp, &lkflags); error = VOP_SETEXTATTR(ovp, ap->a_attrnamespace, ap->a_name, ap->a_uio, cred, td); + unionfs_forward_vop_finish(ap->a_vp, ovp, lkflags); + } unionfs_setextattr_abort: UNIONFS_INTERNAL_DEBUG("unionfs_setextattr: leave (%d)\n", error); From nobody Sun Mar 10 03:57:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsmMh5wqFz5D7c2; Sun, 10 Mar 2024 03:57: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 4TsmMh5dWwz57pf; Sun, 10 Mar 2024 03:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710043072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tBEwXxZIQYft/yQzXOaj1bRY7Ezs7HupSOKMLjpDpmk=; b=g34jE16WM8rsuYKUYRZhkE3ZBoXQtdIv5IcFQVaN3K6UNbJHdw6aPdlmV/p5kz1aj6RoF7 1Vha3Fo1xKu4N2apIVwpeGRlPhBH3jNOaMYOEkct6+uxjj5U3WO1P7R4OBaPPrlFT6CA+W nnoP6BBq/8LeUQxbyl2vpXYTUSm8Bf8uEvBHI9eM3I5JtTRHvCSN7ARWJsVKqH2ZHRsi3n T3KrBdQwyW9LQIGmgeDrkLTlFRNzXe4U5vgmZ/hMb5zsOb9ycuqSvEYUQb4ljYPmol7tQf BSAAHGlnsbMV80ME3uU2lgivsyngCK2ILDPnVuMzPFiphCkC0KoJ7++r+EY0sQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710043072; a=rsa-sha256; cv=none; b=EPDwzHjnpdWTyWC2vZOIo7Ao7m6L9bQtSH1uEQQ+5DMjPQvAJ4P2+fRisMJdLaZeg3GGIl qNAlishVAD1rBVgkuL4W0uBftxMpOtresuxiFIQtgfP0M5Eu/Dnz/GVuFze6QnKpyQYt1o YZCwmBzZZhxsXAY8R42zyR8w6BvvDK2FraB3VIuLm0N8t77E2iXipWZ4Y/afOcZ5iYxp2y Xo5shxXz6mwaq6zYiH/raJyBmCM6K6Y0SPSPUDuyBL6mEH0npE9nF3pIhRFb4Wz85TCvCt 47DAfjBq94KKujTf89IGlR4xi5oh2zc+pOGQvDtAeTz0SpK59XpVgI0jArmXvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710043072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tBEwXxZIQYft/yQzXOaj1bRY7Ezs7HupSOKMLjpDpmk=; b=ouzQFXDIk/TwDO50+Zktumr2YFZdWDnmj538EgJBw7Rp2cvFKBuyDNSVzv6soZOsb0Tqic E6IpVg+X3nCtm5cuFQviCbSpLTxNEgBg1afVlXL72xeq/wFcspKudy/QvRIDD8YZD6e961 w9oioZa5/qBbdCNNgNqXL0cAySv9ap/nsGRIBjEYU7RS8N3KwCxuOEwLgfVX4QeqT69wcY 3LKdRaonNRVDA9LBUhAlAp9ict13noCDX3m4wHbrQZi8WmRHwnIpgQoSaXQZAS7WHmEVQy AJP0vsXPpgAS50+sAVcy2mxNdcIOSLHb+R7mPbQBbWhwzTc+LrViZfbLEk+e3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsmMh5DGhzW0H; Sun, 10 Mar 2024 03:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42A3vqP9021901; Sun, 10 Mar 2024 03:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42A3vqE0021898; Sun, 10 Mar 2024 03:57:52 GMT (envelope-from git) Date: Sun, 10 Mar 2024 03:57:52 GMT Message-Id: <202403100357.42A3vqE0021898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 965f92a28291 - stable/14 - MFV: xz 5.6.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 965f92a282911e0e18a583c4e9955d0506a4d9ef Auto-Submitted: auto-generated The branch stable/14 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=965f92a282911e0e18a583c4e9955d0506a4d9ef commit 965f92a282911e0e18a583c4e9955d0506a4d9ef Author: Xin LI AuthorDate: 2024-02-25 23:46:22 +0000 Commit: Xin LI CommitDate: 2024-03-10 03:57:25 +0000 MFV: xz 5.6.0. (cherry picked from commit 8db56defa766eacdbaf89a37f25b11a57fd9787a) --- contrib/xz/AUTHORS | 40 +- contrib/xz/COPYING | 116 +- contrib/xz/COPYING.0BSD | 11 + contrib/xz/COPYING.CC-BY-SA-4.0 | 427 + contrib/xz/ChangeLog | 16248 ++++++++----------- contrib/xz/README | 43 +- contrib/xz/THANKS | 7 + contrib/xz/TODO | 4 - contrib/xz/doxygen/Doxyfile | 6 +- contrib/xz/doxygen/footer.html | 13 + contrib/xz/doxygen/update-doxygen | 6 +- contrib/xz/src/common/mythread.h | 28 +- contrib/xz/src/common/sysdefs.h | 18 +- contrib/xz/src/common/tuklib_common.h | 27 +- contrib/xz/src/common/tuklib_config.h | 2 + contrib/xz/src/common/tuklib_cpucores.c | 5 +- contrib/xz/src/common/tuklib_cpucores.h | 5 +- contrib/xz/src/common/tuklib_exit.c | 5 +- contrib/xz/src/common/tuklib_exit.h | 9 +- contrib/xz/src/common/tuklib_gettext.h | 5 +- contrib/xz/src/common/tuklib_integer.h | 7 +- contrib/xz/src/common/tuklib_mbstr.h | 5 +- contrib/xz/src/common/tuklib_mbstr_fw.c | 5 +- contrib/xz/src/common/tuklib_mbstr_width.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.h | 5 +- contrib/xz/src/common/tuklib_physmem.c | 25 +- contrib/xz/src/common/tuklib_physmem.h | 5 +- contrib/xz/src/common/tuklib_progname.c | 5 +- contrib/xz/src/common/tuklib_progname.h | 5 +- contrib/xz/src/liblzma/api/lzma.h | 31 +- contrib/xz/src/liblzma/api/lzma/base.h | 23 +- contrib/xz/src/liblzma/api/lzma/bcj.h | 10 +- contrib/xz/src/liblzma/api/lzma/block.h | 5 +- contrib/xz/src/liblzma/api/lzma/check.h | 5 +- contrib/xz/src/liblzma/api/lzma/container.h | 43 +- contrib/xz/src/liblzma/api/lzma/delta.h | 5 +- contrib/xz/src/liblzma/api/lzma/filter.h | 11 +- contrib/xz/src/liblzma/api/lzma/hardware.h | 5 +- contrib/xz/src/liblzma/api/lzma/index.h | 36 +- contrib/xz/src/liblzma/api/lzma/index_hash.h | 5 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 7 +- contrib/xz/src/liblzma/api/lzma/stream_flags.h | 5 +- contrib/xz/src/liblzma/api/lzma/version.h | 9 +- contrib/xz/src/liblzma/api/lzma/vli.h | 5 +- contrib/xz/src/liblzma/check/check.c | 5 +- contrib/xz/src/liblzma/check/check.h | 5 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 119 + contrib/xz/src/liblzma/check/crc32_fast.c | 187 +- contrib/xz/src/liblzma/check/crc32_small.c | 5 +- contrib/xz/src/liblzma/check/crc32_table.c | 36 +- contrib/xz/src/liblzma/check/crc32_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc32_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc32_tablegen.c | 21 +- contrib/xz/src/liblzma/check/crc32_x86.S | 5 +- contrib/xz/src/liblzma/check/crc64_fast.c | 450 +- contrib/xz/src/liblzma/check/crc64_small.c | 5 +- contrib/xz/src/liblzma/check/crc64_table.c | 16 +- contrib/xz/src/liblzma/check/crc64_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc64_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc64_tablegen.c | 13 +- contrib/xz/src/liblzma/check/crc64_x86.S | 5 +- contrib/xz/src/liblzma/check/crc_common.h | 143 + contrib/xz/src/liblzma/check/crc_macros.h | 30 - contrib/xz/src/liblzma/check/crc_x86_clmul.h | 435 + contrib/xz/src/liblzma/common/alone_decoder.c | 5 +- contrib/xz/src/liblzma/common/alone_decoder.h | 5 +- contrib/xz/src/liblzma/common/alone_encoder.c | 5 +- contrib/xz/src/liblzma/common/auto_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.h | 5 +- contrib/xz/src/liblzma/common/block_decoder.c | 5 +- contrib/xz/src/liblzma/common/block_decoder.h | 5 +- contrib/xz/src/liblzma/common/block_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_encoder.h | 5 +- .../xz/src/liblzma/common/block_header_decoder.c | 5 +- .../xz/src/liblzma/common/block_header_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_util.c | 5 +- contrib/xz/src/liblzma/common/common.c | 5 +- contrib/xz/src/liblzma/common/common.h | 5 +- .../xz/src/liblzma/common/easy_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/easy_decoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_encoder.c | 5 +- .../xz/src/liblzma/common/easy_encoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.h | 5 +- contrib/xz/src/liblzma/common/file_info.c | 5 +- .../xz/src/liblzma/common/filter_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/filter_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/filter_common.c | 14 +- contrib/xz/src/liblzma/common/filter_common.h | 5 +- contrib/xz/src/liblzma/common/filter_decoder.c | 13 +- contrib/xz/src/liblzma/common/filter_decoder.h | 5 +- contrib/xz/src/liblzma/common/filter_encoder.c | 39 +- contrib/xz/src/liblzma/common/filter_encoder.h | 11 +- .../xz/src/liblzma/common/filter_flags_decoder.c | 5 +- .../xz/src/liblzma/common/filter_flags_encoder.c | 5 +- .../xz/src/liblzma/common/hardware_cputhreads.c | 5 +- contrib/xz/src/liblzma/common/hardware_physmem.c | 5 +- contrib/xz/src/liblzma/common/index.c | 5 +- contrib/xz/src/liblzma/common/index.h | 5 +- contrib/xz/src/liblzma/common/index_decoder.c | 5 +- contrib/xz/src/liblzma/common/index_decoder.h | 5 +- contrib/xz/src/liblzma/common/index_encoder.c | 5 +- contrib/xz/src/liblzma/common/index_encoder.h | 5 +- contrib/xz/src/liblzma/common/index_hash.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.h | 5 +- contrib/xz/src/liblzma/common/memcmplen.h | 24 +- contrib/xz/src/liblzma/common/microlzma_decoder.c | 5 +- contrib/xz/src/liblzma/common/microlzma_encoder.c | 5 +- contrib/xz/src/liblzma/common/outqueue.c | 5 +- contrib/xz/src/liblzma/common/outqueue.h | 5 +- .../xz/src/liblzma/common/stream_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/stream_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.h | 5 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 25 +- .../xz/src/liblzma/common/stream_flags_common.c | 5 +- .../xz/src/liblzma/common/stream_flags_common.h | 5 +- .../xz/src/liblzma/common/stream_flags_decoder.c | 5 +- .../xz/src/liblzma/common/stream_flags_encoder.c | 5 +- contrib/xz/src/liblzma/common/string_conversion.c | 14 +- contrib/xz/src/liblzma/common/vli_decoder.c | 5 +- contrib/xz/src/liblzma/common/vli_encoder.c | 5 +- contrib/xz/src/liblzma/common/vli_size.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.h | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_private.h | 5 +- contrib/xz/src/liblzma/liblzma.pc.in | 6 +- contrib/xz/src/liblzma/liblzma_generic.map | 7 + contrib/xz/src/liblzma/liblzma_linux.map | 7 + contrib/xz/src/liblzma/lz/lz_decoder.c | 48 +- contrib/xz/src/liblzma/lz/lz_decoder.h | 116 +- contrib/xz/src/liblzma/lz/lz_encoder.c | 13 +- contrib/xz/src/liblzma/lz/lz_encoder.h | 21 +- contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 5 +- contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h | 4 +- contrib/xz/src/liblzma/lz/lz_encoder_mf.c | 5 +- contrib/xz/src/liblzma/lzma/fastpos.h | 5 +- contrib/xz/src/liblzma/lzma/fastpos_table.c | 4 +- contrib/xz/src/liblzma/lzma/fastpos_tablegen.c | 17 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.c | 5 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 8 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 41 +- contrib/xz/src/liblzma/lzma/lzma_decoder.c | 760 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder.c | 18 +- contrib/xz/src/liblzma/lzma/lzma_encoder.h | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_fast.c | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_normal.c | 7 +- contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder_private.h | 9 +- contrib/xz/src/liblzma/rangecoder/price.h | 5 +- contrib/xz/src/liblzma/rangecoder/price_table.c | 4 +- contrib/xz/src/liblzma/rangecoder/price_tablegen.c | 22 +- contrib/xz/src/liblzma/rangecoder/range_common.h | 14 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 838 +- contrib/xz/src/liblzma/rangecoder/range_encoder.h | 5 +- contrib/xz/src/liblzma/simple/arm.c | 5 +- contrib/xz/src/liblzma/simple/arm64.c | 5 +- contrib/xz/src/liblzma/simple/armthumb.c | 5 +- contrib/xz/src/liblzma/simple/ia64.c | 5 +- contrib/xz/src/liblzma/simple/powerpc.c | 5 +- contrib/xz/src/liblzma/simple/riscv.c | 755 + contrib/xz/src/liblzma/simple/simple_coder.c | 5 +- contrib/xz/src/liblzma/simple/simple_coder.h | 14 +- contrib/xz/src/liblzma/simple/simple_decoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_decoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_private.h | 5 +- contrib/xz/src/liblzma/simple/sparc.c | 5 +- contrib/xz/src/liblzma/simple/x86.c | 5 +- contrib/xz/src/liblzma/validate_map.sh | 6 +- contrib/xz/src/lzmainfo/lzmainfo.1 | 4 +- contrib/xz/src/lzmainfo/lzmainfo.c | 5 +- contrib/xz/src/xz/args.c | 159 +- contrib/xz/src/xz/args.h | 8 +- contrib/xz/src/xz/coder.c | 648 +- contrib/xz/src/xz/coder.h | 31 +- contrib/xz/src/xz/file_io.c | 144 +- contrib/xz/src/xz/file_io.h | 21 +- contrib/xz/src/xz/hardware.c | 11 +- contrib/xz/src/xz/hardware.h | 5 +- contrib/xz/src/xz/list.c | 31 +- contrib/xz/src/xz/list.h | 5 +- contrib/xz/src/xz/main.c | 91 +- contrib/xz/src/xz/main.h | 5 +- contrib/xz/src/xz/message.c | 94 +- contrib/xz/src/xz/message.h | 15 +- contrib/xz/src/xz/mytime.c | 105 +- contrib/xz/src/xz/mytime.h | 11 +- contrib/xz/src/xz/options.c | 7 +- contrib/xz/src/xz/options.h | 5 +- contrib/xz/src/xz/private.h | 26 +- contrib/xz/src/xz/sandbox.c | 355 + contrib/xz/src/xz/sandbox.h | 43 + contrib/xz/src/xz/signals.c | 22 +- contrib/xz/src/xz/signals.h | 5 +- contrib/xz/src/xz/suffix.c | 17 +- contrib/xz/src/xz/suffix.h | 5 +- contrib/xz/src/xz/util.c | 36 +- contrib/xz/src/xz/util.h | 19 +- contrib/xz/src/xz/xz.1 | 439 +- contrib/xz/src/xzdec/xzdec.1 | 8 +- contrib/xz/src/xzdec/xzdec.c | 160 +- lib/liblzma/Makefile | 1 + lib/liblzma/Symbol.map | 5 +- lib/liblzma/Versions.def | 5 +- lib/liblzma/config.h | 120 +- usr.bin/xz/Makefile | 1 + 221 files changed, 13494 insertions(+), 11300 deletions(-) diff --git a/contrib/xz/AUTHORS b/contrib/xz/AUTHORS index 69bbfc3ef609..5012d0e01e83 100644 --- a/contrib/xz/AUTHORS +++ b/contrib/xz/AUTHORS @@ -9,15 +9,13 @@ Authors of XZ Utils specifically the LZMA SDK . Without this code, XZ Utils wouldn't exist. - The SHA-256 implementation in liblzma is based on the code found from - 7-Zip , which has a modified version of the SHA-256 - code found from Crypto++ . The SHA-256 code - in Crypto++ was written by Kevin Springle and Wei Dai. + The SHA-256 implementation in liblzma is based on code written by + Wei Dai in Crypto++ Library . - Some scripts have been adapted from gzip. The original versions - were written by Jean-loup Gailly, Charles Levert, and Paul Eggert. - Andrew Dudman helped adapting the scripts and their man pages for - XZ Utils. + A few scripts have been adapted from GNU gzip. The original + versions were written by Jean-loup Gailly, Charles Levert, and + Paul Eggert. Andrew Dudman helped adapting the scripts and their + man pages for XZ Utils. The initial version of the threaded .xz decompressor was written by Sebastian Andrzej Siewior. @@ -25,15 +23,31 @@ Authors of XZ Utils The initial version of the .lz (lzip) decoder was written by Michał Górny. - CLMUL-accelerated CRC code was contributed by Ilya Kurdyukov. + Architecture-specific CRC optimizations were contributed by + Ilya Kurdyukov, Hans Jansen, and Chenxi Mao. Other authors: - Jonathan Nieder - Joachim Henke - The GNU Autotools-based build system contains files from many authors, - which I'm not trying to list here. + Many people have contributed improvements or reported bugs. + Most of these people are mentioned in the file THANKS. - Several people have contributed fixes or reported bugs. Most of them - are mentioned in the file THANKS. + The translations of the command line tools and man pages have been + contributed by many people via the Translation Project: + + - https://translationproject.org/domain/xz.html + - https://translationproject.org/domain/xz-man.html + + The authors of the translated man pages are in the header comments + of the man page files. In the source package, the authors of the + translations are in po/*.po and po4a/*.po files. + + Third-party code whose authors aren't listed here: + + - GNU getopt_long() in the 'lib' directory is included for + platforms that don't have a usable getopt_long(). + + - The build system files from GNU Autoconf, GNU Automake, + GNU Libtool, GNU Gettext, Autoconf Archive, and related files. diff --git a/contrib/xz/COPYING b/contrib/xz/COPYING index e54eeacfbf3f..a31477d62d31 100644 --- a/contrib/xz/COPYING +++ b/contrib/xz/COPYING @@ -6,71 +6,95 @@ XZ Utils Licensing is a rough summary of which licenses apply to which parts of this package (but check the individual files to be sure!): - - liblzma is in the public domain. + - liblzma is under the BSD Zero Clause License (0BSD). - - xz, xzdec, and lzmadec command line tools are in the public - domain unless GNU getopt_long had to be compiled and linked - in from the lib directory. The getopt_long code is under - GNU LGPLv2.1+. + - The command line tools xz, xzdec, lzmadec, and lzmainfo are + under 0BSD except that, on systems that don't have a usable + getopt_long, GNU getopt_long is compiled and linked in from the + 'lib' directory. The getopt_long code is under GNU LGPLv2.1+. - The scripts to grep, diff, and view compressed files have been - adapted from gzip. These scripts and their documentation are - under GNU GPLv2+. - - - All the documentation in the doc directory and most of the - XZ Utils specific documentation files in other directories - are in the public domain. + adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless, + and xzmore) are under GNU GPLv2+. The man pages of the scripts + are under 0BSD; they aren't based on the man pages of GNU gzip. + + - Most of the XZ Utils specific documentation that is in + plain text files (like README, INSTALL, PACKAGERS, NEWS, + and ChangeLog) are under 0BSD unless stated otherwise in + the file itself. The files xz-file-format.txt and + lzma-file-format.xt are in the public domain but may + be distributed under the terms of 0BSD too. + + - Doxygen-generated HTML version of the liblzma API documentation: + While Doxygen is under the GNU GPLv2, the license information + in Doxygen includes the following exception: + + Documents produced by doxygen are derivative works + derived from the input used in their production; + they are not affected by this license. Note: The JavaScript files (under the MIT license) have - been removed from the Doxygen-generated HTML version of the - liblzma API documentation. Doxygen itself is under the GNU GPL - but the remaining files generated by Doxygen are not affected - by the licenses used in Doxygen because Doxygen licensing has - the following exception: + been removed from the Doxygen output. - "Documents produced by doxygen are derivative works - derived from the input used in their production; - they are not affected by this license." + - The XZ logo (xz-logo.png) included in the Doxygen-generated + documentation is under the Creative Commons BY-SA 4.0 license. - - Translated messages are in the public domain. + - Translated messages and man pages are under 0BSD except that + some old translations are in the public domain. - - The build system contains public domain files, and files that - are under GNU GPLv2+ or GNU GPLv3+. None of these files end up - in the binaries being built. + - Test files and test code in the 'tests' directory, and + debugging utilities in the 'debug' directory are under + the BSD Zero Clause License (0BSD). - - Test files and test code in the tests directory, and debugging - utilities in the debug directory are in the public domain. + - The GNU Autotools based build system contains files that are + under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses. + These files don't affect the licensing of the binaries being + built. - - The extra directory may contain public domain files, and files - that are under various free software licenses. + - The extra directory contain files that are under various + free software licenses. - You can do whatever you want with the files that have been put into - the public domain. If you find public domain legally problematic, - take the previous sentence as a license grant. If you still find - the lack of copyright legally problematic, you have too many - lawyers. + For the files under the BSD Zero Clause License (0BSD), if + a copyright notice is needed, the following is sufficient: - As usual, this software is provided "as is", without any warranty. + Copyright (C) The XZ Utils authors and contributors - If you copy significant amounts of public domain code from XZ Utils + If you copy significant amounts of 0BSD-licensed code from XZ Utils into your project, acknowledging this somewhere in your software is polite (especially if it is proprietary, non-free software), but - naturally it is not legally required. Here is an example of a good - notice to put into "about box" or into documentation: + it is not legally required by the license terms. Here is an example + of a good notice to put into "about box" or into documentation: - This software includes code from XZ Utils . + This software includes code from XZ Utils + . The following license texts are included in the following files: + - COPYING.0BSD: BSD Zero Clause License - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1 - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - - Note that the toolchain (compiler, linker etc.) may add some code - pieces that are copyrighted. Thus, it is possible that e.g. liblzma - binary wouldn't actually be in the public domain in its entirety - even though it contains no copyrighted code from the XZ Utils source - package. - - If you have questions, don't hesitate to ask the author(s) for more - information. + - COPYING.CC-BY-SA-4.0: Creative Commons Attribution-ShareAlike 4.0 + International Public License + + A note about old XZ Utils releases: + + XZ Utils releases 5.4.6 and older and 5.5.1alpha have a + significant amount of code put into the public domain and + that obviously remains so. The switch from public domain to + 0BSD for newer releases was made in Febrary 2024 because + public domain has (real or perceived) legal ambiguities in + some jurisdictions. + + There is very little *practical* difference between public + domain and 0BSD. The main difference likely is that one + shouldn't claim that 0BSD-licensed code is in the public + domain; 0BSD-licensed code is copyrighted but available under + an extremely permissive license. Neither 0BSD nor public domain + require retaining or reproducing author, copyright holder, or + license notices when distributing the software. (Compare to, + for example, BSD 2-Clause "Simplified" License which does have + such requirements.) + + If you have questions, don't hesitate to ask for more information. + The contact information is in the README file. diff --git a/contrib/xz/COPYING.0BSD b/contrib/xz/COPYING.0BSD new file mode 100644 index 000000000000..4322122aecf1 --- /dev/null +++ b/contrib/xz/COPYING.0BSD @@ -0,0 +1,11 @@ +Permission to use, copy, modify, and/or distribute this +software for any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL +THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/contrib/xz/COPYING.CC-BY-SA-4.0 b/contrib/xz/COPYING.CC-BY-SA-4.0 new file mode 100644 index 000000000000..7d4f96c54aa1 --- /dev/null +++ b/contrib/xz/COPYING.CC-BY-SA-4.0 @@ -0,0 +1,427 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 4dd0978ef313..54b68744af86 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,11756 +1,9764 @@ -commit 49053c0a649f4c8bd2b8d97ce915f401fbc0f3d9 +commit 2d7d862e3ffa8cec4fd3fdffcd84e984a17aa429 Author: Jia Tan -Date: 2023-10-31 22:30:29 +0800 +Date: 2024-02-24 15:55:08 +0800 - Bump version and soname for 5.4.5. + Bump version and soname for 5.6.0. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 6 +++--- + src/liblzma/liblzma_generic.map | 2 +- + src/liblzma/liblzma_linux.map | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) -commit 84c0cfc556287628df871703672879e530d0391f +commit a18fb1edef0d0aac12a09eed05e9c448c777af7b Author: Jia Tan -Date: 2023-11-01 20:18:30 +0800 +Date: 2024-02-24 15:50:36 +0800 - Add NEWS for 5.4.5. + Add NEWS for 5.6.0. - NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 74 insertions(+) + NEWS | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 143 insertions(+) -commit d90ed84db9770712e2421e170076b43bda9b64a7 -Author: Lasse Collin -Date: 2023-10-31 21:41:09 +0200 +commit 24355c5280bc95e3d594432d60bb8432aa6af173 +Author: Jia Tan +Date: 2024-02-22 22:27:01 +0800 - liblzma: Fix compilation of fastpos_tablegen.c. + Translations: Remove obsolete and fuzzy matches from some translations. - The macro lzma_attr_visibility_hidden has to be defined to make - fastpos.h usable. The visibility attribute is irrelevant to - fastpos_tablegen.c so simply #define the macro to an empty value. + The French and Brazilian Portuguese man page translations have not been + updated since the switch from public domain to 0BSD. The old GPLv2 + strings have now been removed from these files. + + po4a/fr.po | 4702 +++++++++++++++++++++++++++++++++++++---------------- + po4a/pt_BR.po | 4987 ++++++++++++++++++++++++++++++++++++++++----------------- + 2 files changed, 6832 insertions(+), 2857 deletions(-) + +commit 02ca4a7d7b703e2ec63e00b70feec825e919dbc1 +Author: Jia Tan +Date: 2024-02-21 00:31:54 +0800 + + Translations: Patch man pages to avoid fuzzy matches. - fastpos_tablegen.c is never built by the included build systems - and so the problem wasn't noticed earlier. It's just a standalone - program for generating fastpos_table.c. + This will be fixed in the next round of translations, but this avoids + having a fuzzy match or not fixing the English version. + + po4a/de.po | 2 +- + po4a/ko.po | 2 +- + po4a/ro.po | 2 +- + po4a/uk.po | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 898aad9fc711e03452d24d9e2c5b7f77a6f9ce64 +Author: Jia Tan +Date: 2024-02-21 00:30:43 +0800 + + xzmore: Fix typo in xzmore.1. - Fixes: https://github.com/tukaani-project/xz/pull/69 - Thanks to GitHub user Jamaika1. + Thanks to Yuri Chornoivan. - src/liblzma/lzma/fastpos_tablegen.c | 2 ++ - 1 file changed, 2 insertions(+) + src/scripts/xzmore.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) *** 32153 LINES SKIPPED *** From nobody Sun Mar 10 03:58:41 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TsmNf42drz5D7YZ; Sun, 10 Mar 2024 03:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TsmNf25vBz58Hm; Sun, 10 Mar 2024 03:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710043122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UnfDkFfG9teVM0R+7IuK7yIRfp4xRbkpv//fvYhiAy4=; b=p3Cw3dnq8FBEcwR5gErSjpU5j9lwXNheT33Li56TAs+YLylySymUv9+rAZP3VBAf8EdEl3 JOVOITJgXLwzasvgL5Ao4xG0RYdvm2Bif8Rbf/LgiBvCnLTBhd+/ZT2S/SjfIoM6Buwelc TPQ6q98xhkuHbZLQrD5J+Gln6X8RWY1SporLBvNSJcpBIPbsz30Jk9FA/VVTLP8UJbvcPQ TV7xw55q2PAk4PslKYmf4kqqRgPvJaxiN8BYbqafLsRGmYDLMwpnsrNcf8wmJarPKM7Mym 1miMxiqx/nE504Vqx6F14RBvGt7qYWibreS05bfbPUWKsv1V1O9gpXl0GlO0XA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710043122; a=rsa-sha256; cv=none; b=Y5l9yoqfPTw7eppP990Pzw4z9tM5YxAtr8FkmXZveN64ZEpK1hLOvHSuJ7aZOpB5gqTM4W Pw+h3DjEzpcx87pp5MQCoKoYkvRk7NHawNKFvPiS0gw0HMYnstpHTrmbhAV65Osu7i6QAg Pu7X1QQT4Auf1zvgal4fQmLuQS84cT25t0568iL78hXTZue/swjwuQzbc7TP8CVDm05oPO iOPu7+bZIwZAbeP/Xszqu+MC2n478vuW9JkmrkABQoSp9IZW9/DFUdwc/ibCVOmFJQl+/x d2ajdR3mYyQWVETiU18k38zqZLuFRca9AIpnbpbG5gg1YD33aZb6w5dXf8Mw7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710043122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UnfDkFfG9teVM0R+7IuK7yIRfp4xRbkpv//fvYhiAy4=; b=uYAfr2VfeAzBTpTYgIy9T1j1k0hCHRj8simNMMoMlC649p/f3IJFOM0DiDw2EBtZoYJWzl HT531p5tJxa74nzu3DKzpef6lW7sVoZ6PDx1qNtzN6KKFQBRsmhsKjZd+pfcvlPfqJySaM wN9PNdQWt2fanSJQFFm4B0TJp+PM4CexMboqPDjx7VcXX20j7AE13Fj7Vs28Zq9569COsx 5VwkRUq0yrD5HDuyjbvZ6FuvsB7JCRd9PqQLQJEG6ML+TKNjD/SPj8QPz/g7K2fbP8G0Su C2XAhpd98QuwQzFo23ndoDtpvkPCbhTTpCSjeiXJ6y/SrU0QpWaSz0YGQMicCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TsmNf1hv3zW4K; Sun, 10 Mar 2024 03:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42A3wg3w022162; Sun, 10 Mar 2024 03:58:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42A3wfJm022159; Sun, 10 Mar 2024 03:58:41 GMT (envelope-from git) Date: Sun, 10 Mar 2024 03:58:41 GMT Message-Id: <202403100358.42A3wfJm022159@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: b810e56effc1 - stable/13 - MFC: MFV: xz 5.6.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b810e56effc150f9fbb2c880fa8c0c85ccc08e14 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=b810e56effc150f9fbb2c880fa8c0c85ccc08e14 commit b810e56effc150f9fbb2c880fa8c0c85ccc08e14 Author: Xin LI AuthorDate: 2024-02-25 23:46:22 +0000 Commit: Xin LI CommitDate: 2024-03-10 03:58:18 +0000 MFC: MFV: xz 5.6.0. (cherry picked from commit 8db56defa766eacdbaf89a37f25b11a57fd9787a) --- contrib/xz/AUTHORS | 40 +- contrib/xz/COPYING | 116 +- contrib/xz/COPYING.0BSD | 11 + contrib/xz/COPYING.CC-BY-SA-4.0 | 427 + contrib/xz/ChangeLog | 16248 ++++++++----------- contrib/xz/README | 43 +- contrib/xz/THANKS | 7 + contrib/xz/TODO | 4 - contrib/xz/doxygen/Doxyfile | 6 +- contrib/xz/doxygen/footer.html | 13 + contrib/xz/doxygen/update-doxygen | 6 +- contrib/xz/src/common/mythread.h | 28 +- contrib/xz/src/common/sysdefs.h | 18 +- contrib/xz/src/common/tuklib_common.h | 27 +- contrib/xz/src/common/tuklib_config.h | 2 + contrib/xz/src/common/tuklib_cpucores.c | 5 +- contrib/xz/src/common/tuklib_cpucores.h | 5 +- contrib/xz/src/common/tuklib_exit.c | 5 +- contrib/xz/src/common/tuklib_exit.h | 9 +- contrib/xz/src/common/tuklib_gettext.h | 5 +- contrib/xz/src/common/tuklib_integer.h | 7 +- contrib/xz/src/common/tuklib_mbstr.h | 5 +- contrib/xz/src/common/tuklib_mbstr_fw.c | 5 +- contrib/xz/src/common/tuklib_mbstr_width.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.h | 5 +- contrib/xz/src/common/tuklib_physmem.c | 25 +- contrib/xz/src/common/tuklib_physmem.h | 5 +- contrib/xz/src/common/tuklib_progname.c | 5 +- contrib/xz/src/common/tuklib_progname.h | 5 +- contrib/xz/src/liblzma/api/lzma.h | 31 +- contrib/xz/src/liblzma/api/lzma/base.h | 23 +- contrib/xz/src/liblzma/api/lzma/bcj.h | 10 +- contrib/xz/src/liblzma/api/lzma/block.h | 5 +- contrib/xz/src/liblzma/api/lzma/check.h | 5 +- contrib/xz/src/liblzma/api/lzma/container.h | 43 +- contrib/xz/src/liblzma/api/lzma/delta.h | 5 +- contrib/xz/src/liblzma/api/lzma/filter.h | 11 +- contrib/xz/src/liblzma/api/lzma/hardware.h | 5 +- contrib/xz/src/liblzma/api/lzma/index.h | 36 +- contrib/xz/src/liblzma/api/lzma/index_hash.h | 5 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 7 +- contrib/xz/src/liblzma/api/lzma/stream_flags.h | 5 +- contrib/xz/src/liblzma/api/lzma/version.h | 9 +- contrib/xz/src/liblzma/api/lzma/vli.h | 5 +- contrib/xz/src/liblzma/check/check.c | 5 +- contrib/xz/src/liblzma/check/check.h | 5 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 119 + contrib/xz/src/liblzma/check/crc32_fast.c | 187 +- contrib/xz/src/liblzma/check/crc32_small.c | 5 +- contrib/xz/src/liblzma/check/crc32_table.c | 36 +- contrib/xz/src/liblzma/check/crc32_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc32_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc32_tablegen.c | 21 +- contrib/xz/src/liblzma/check/crc32_x86.S | 5 +- contrib/xz/src/liblzma/check/crc64_fast.c | 450 +- contrib/xz/src/liblzma/check/crc64_small.c | 5 +- contrib/xz/src/liblzma/check/crc64_table.c | 16 +- contrib/xz/src/liblzma/check/crc64_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc64_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc64_tablegen.c | 13 +- contrib/xz/src/liblzma/check/crc64_x86.S | 5 +- contrib/xz/src/liblzma/check/crc_common.h | 143 + contrib/xz/src/liblzma/check/crc_macros.h | 30 - contrib/xz/src/liblzma/check/crc_x86_clmul.h | 435 + contrib/xz/src/liblzma/common/alone_decoder.c | 5 +- contrib/xz/src/liblzma/common/alone_decoder.h | 5 +- contrib/xz/src/liblzma/common/alone_encoder.c | 5 +- contrib/xz/src/liblzma/common/auto_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.h | 5 +- contrib/xz/src/liblzma/common/block_decoder.c | 5 +- contrib/xz/src/liblzma/common/block_decoder.h | 5 +- contrib/xz/src/liblzma/common/block_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_encoder.h | 5 +- .../xz/src/liblzma/common/block_header_decoder.c | 5 +- .../xz/src/liblzma/common/block_header_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_util.c | 5 +- contrib/xz/src/liblzma/common/common.c | 5 +- contrib/xz/src/liblzma/common/common.h | 5 +- .../xz/src/liblzma/common/easy_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/easy_decoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_encoder.c | 5 +- .../xz/src/liblzma/common/easy_encoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.h | 5 +- contrib/xz/src/liblzma/common/file_info.c | 5 +- .../xz/src/liblzma/common/filter_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/filter_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/filter_common.c | 14 +- contrib/xz/src/liblzma/common/filter_common.h | 5 +- contrib/xz/src/liblzma/common/filter_decoder.c | 13 +- contrib/xz/src/liblzma/common/filter_decoder.h | 5 +- contrib/xz/src/liblzma/common/filter_encoder.c | 39 +- contrib/xz/src/liblzma/common/filter_encoder.h | 11 +- .../xz/src/liblzma/common/filter_flags_decoder.c | 5 +- .../xz/src/liblzma/common/filter_flags_encoder.c | 5 +- .../xz/src/liblzma/common/hardware_cputhreads.c | 5 +- contrib/xz/src/liblzma/common/hardware_physmem.c | 5 +- contrib/xz/src/liblzma/common/index.c | 5 +- contrib/xz/src/liblzma/common/index.h | 5 +- contrib/xz/src/liblzma/common/index_decoder.c | 5 +- contrib/xz/src/liblzma/common/index_decoder.h | 5 +- contrib/xz/src/liblzma/common/index_encoder.c | 5 +- contrib/xz/src/liblzma/common/index_encoder.h | 5 +- contrib/xz/src/liblzma/common/index_hash.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.h | 5 +- contrib/xz/src/liblzma/common/memcmplen.h | 24 +- contrib/xz/src/liblzma/common/microlzma_decoder.c | 5 +- contrib/xz/src/liblzma/common/microlzma_encoder.c | 5 +- contrib/xz/src/liblzma/common/outqueue.c | 5 +- contrib/xz/src/liblzma/common/outqueue.h | 5 +- .../xz/src/liblzma/common/stream_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/stream_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.h | 5 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 25 +- .../xz/src/liblzma/common/stream_flags_common.c | 5 +- .../xz/src/liblzma/common/stream_flags_common.h | 5 +- .../xz/src/liblzma/common/stream_flags_decoder.c | 5 +- .../xz/src/liblzma/common/stream_flags_encoder.c | 5 +- contrib/xz/src/liblzma/common/string_conversion.c | 14 +- contrib/xz/src/liblzma/common/vli_decoder.c | 5 +- contrib/xz/src/liblzma/common/vli_encoder.c | 5 +- contrib/xz/src/liblzma/common/vli_size.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.h | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_private.h | 5 +- contrib/xz/src/liblzma/liblzma.pc.in | 6 +- contrib/xz/src/liblzma/liblzma_generic.map | 7 + contrib/xz/src/liblzma/liblzma_linux.map | 7 + contrib/xz/src/liblzma/lz/lz_decoder.c | 48 +- contrib/xz/src/liblzma/lz/lz_decoder.h | 116 +- contrib/xz/src/liblzma/lz/lz_encoder.c | 13 +- contrib/xz/src/liblzma/lz/lz_encoder.h | 21 +- contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 5 +- contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h | 4 +- contrib/xz/src/liblzma/lz/lz_encoder_mf.c | 5 +- contrib/xz/src/liblzma/lzma/fastpos.h | 5 +- contrib/xz/src/liblzma/lzma/fastpos_table.c | 4 +- contrib/xz/src/liblzma/lzma/fastpos_tablegen.c | 17 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.c | 5 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 8 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 41 +- contrib/xz/src/liblzma/lzma/lzma_decoder.c | 760 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder.c | 18 +- contrib/xz/src/liblzma/lzma/lzma_encoder.h | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_fast.c | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_normal.c | 7 +- contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder_private.h | 9 +- contrib/xz/src/liblzma/rangecoder/price.h | 5 +- contrib/xz/src/liblzma/rangecoder/price_table.c | 4 +- contrib/xz/src/liblzma/rangecoder/price_tablegen.c | 22 +- contrib/xz/src/liblzma/rangecoder/range_common.h | 14 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 838 +- contrib/xz/src/liblzma/rangecoder/range_encoder.h | 5 +- contrib/xz/src/liblzma/simple/arm.c | 5 +- contrib/xz/src/liblzma/simple/arm64.c | 5 +- contrib/xz/src/liblzma/simple/armthumb.c | 5 +- contrib/xz/src/liblzma/simple/ia64.c | 5 +- contrib/xz/src/liblzma/simple/powerpc.c | 5 +- contrib/xz/src/liblzma/simple/riscv.c | 755 + contrib/xz/src/liblzma/simple/simple_coder.c | 5 +- contrib/xz/src/liblzma/simple/simple_coder.h | 14 +- contrib/xz/src/liblzma/simple/simple_decoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_decoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_private.h | 5 +- contrib/xz/src/liblzma/simple/sparc.c | 5 +- contrib/xz/src/liblzma/simple/x86.c | 5 +- contrib/xz/src/liblzma/validate_map.sh | 6 +- contrib/xz/src/lzmainfo/lzmainfo.1 | 4 +- contrib/xz/src/lzmainfo/lzmainfo.c | 5 +- contrib/xz/src/xz/args.c | 159 +- contrib/xz/src/xz/args.h | 8 +- contrib/xz/src/xz/coder.c | 648 +- contrib/xz/src/xz/coder.h | 31 +- contrib/xz/src/xz/file_io.c | 144 +- contrib/xz/src/xz/file_io.h | 21 +- contrib/xz/src/xz/hardware.c | 11 +- contrib/xz/src/xz/hardware.h | 5 +- contrib/xz/src/xz/list.c | 31 +- contrib/xz/src/xz/list.h | 5 +- contrib/xz/src/xz/main.c | 91 +- contrib/xz/src/xz/main.h | 5 +- contrib/xz/src/xz/message.c | 94 +- contrib/xz/src/xz/message.h | 15 +- contrib/xz/src/xz/mytime.c | 105 +- contrib/xz/src/xz/mytime.h | 11 +- contrib/xz/src/xz/options.c | 7 +- contrib/xz/src/xz/options.h | 5 +- contrib/xz/src/xz/private.h | 26 +- contrib/xz/src/xz/sandbox.c | 355 + contrib/xz/src/xz/sandbox.h | 43 + contrib/xz/src/xz/signals.c | 22 +- contrib/xz/src/xz/signals.h | 5 +- contrib/xz/src/xz/suffix.c | 17 +- contrib/xz/src/xz/suffix.h | 5 +- contrib/xz/src/xz/util.c | 36 +- contrib/xz/src/xz/util.h | 19 +- contrib/xz/src/xz/xz.1 | 439 +- contrib/xz/src/xzdec/xzdec.1 | 8 +- contrib/xz/src/xzdec/xzdec.c | 160 +- lib/liblzma/Makefile | 1 + lib/liblzma/Symbol.map | 5 +- lib/liblzma/Versions.def | 5 +- lib/liblzma/config.h | 120 +- usr.bin/xz/Makefile | 1 + 221 files changed, 13494 insertions(+), 11300 deletions(-) diff --git a/contrib/xz/AUTHORS b/contrib/xz/AUTHORS index 69bbfc3ef609..5012d0e01e83 100644 --- a/contrib/xz/AUTHORS +++ b/contrib/xz/AUTHORS @@ -9,15 +9,13 @@ Authors of XZ Utils specifically the LZMA SDK . Without this code, XZ Utils wouldn't exist. - The SHA-256 implementation in liblzma is based on the code found from - 7-Zip , which has a modified version of the SHA-256 - code found from Crypto++ . The SHA-256 code - in Crypto++ was written by Kevin Springle and Wei Dai. + The SHA-256 implementation in liblzma is based on code written by + Wei Dai in Crypto++ Library . - Some scripts have been adapted from gzip. The original versions - were written by Jean-loup Gailly, Charles Levert, and Paul Eggert. - Andrew Dudman helped adapting the scripts and their man pages for - XZ Utils. + A few scripts have been adapted from GNU gzip. The original + versions were written by Jean-loup Gailly, Charles Levert, and + Paul Eggert. Andrew Dudman helped adapting the scripts and their + man pages for XZ Utils. The initial version of the threaded .xz decompressor was written by Sebastian Andrzej Siewior. @@ -25,15 +23,31 @@ Authors of XZ Utils The initial version of the .lz (lzip) decoder was written by Michał Górny. - CLMUL-accelerated CRC code was contributed by Ilya Kurdyukov. + Architecture-specific CRC optimizations were contributed by + Ilya Kurdyukov, Hans Jansen, and Chenxi Mao. Other authors: - Jonathan Nieder - Joachim Henke - The GNU Autotools-based build system contains files from many authors, - which I'm not trying to list here. + Many people have contributed improvements or reported bugs. + Most of these people are mentioned in the file THANKS. - Several people have contributed fixes or reported bugs. Most of them - are mentioned in the file THANKS. + The translations of the command line tools and man pages have been + contributed by many people via the Translation Project: + + - https://translationproject.org/domain/xz.html + - https://translationproject.org/domain/xz-man.html + + The authors of the translated man pages are in the header comments + of the man page files. In the source package, the authors of the + translations are in po/*.po and po4a/*.po files. + + Third-party code whose authors aren't listed here: + + - GNU getopt_long() in the 'lib' directory is included for + platforms that don't have a usable getopt_long(). + + - The build system files from GNU Autoconf, GNU Automake, + GNU Libtool, GNU Gettext, Autoconf Archive, and related files. diff --git a/contrib/xz/COPYING b/contrib/xz/COPYING index e54eeacfbf3f..a31477d62d31 100644 --- a/contrib/xz/COPYING +++ b/contrib/xz/COPYING @@ -6,71 +6,95 @@ XZ Utils Licensing is a rough summary of which licenses apply to which parts of this package (but check the individual files to be sure!): - - liblzma is in the public domain. + - liblzma is under the BSD Zero Clause License (0BSD). - - xz, xzdec, and lzmadec command line tools are in the public - domain unless GNU getopt_long had to be compiled and linked - in from the lib directory. The getopt_long code is under - GNU LGPLv2.1+. + - The command line tools xz, xzdec, lzmadec, and lzmainfo are + under 0BSD except that, on systems that don't have a usable + getopt_long, GNU getopt_long is compiled and linked in from the + 'lib' directory. The getopt_long code is under GNU LGPLv2.1+. - The scripts to grep, diff, and view compressed files have been - adapted from gzip. These scripts and their documentation are - under GNU GPLv2+. - - - All the documentation in the doc directory and most of the - XZ Utils specific documentation files in other directories - are in the public domain. + adapted from GNU gzip. These scripts (xzgrep, xzdiff, xzless, + and xzmore) are under GNU GPLv2+. The man pages of the scripts + are under 0BSD; they aren't based on the man pages of GNU gzip. + + - Most of the XZ Utils specific documentation that is in + plain text files (like README, INSTALL, PACKAGERS, NEWS, + and ChangeLog) are under 0BSD unless stated otherwise in + the file itself. The files xz-file-format.txt and + lzma-file-format.xt are in the public domain but may + be distributed under the terms of 0BSD too. + + - Doxygen-generated HTML version of the liblzma API documentation: + While Doxygen is under the GNU GPLv2, the license information + in Doxygen includes the following exception: + + Documents produced by doxygen are derivative works + derived from the input used in their production; + they are not affected by this license. Note: The JavaScript files (under the MIT license) have - been removed from the Doxygen-generated HTML version of the - liblzma API documentation. Doxygen itself is under the GNU GPL - but the remaining files generated by Doxygen are not affected - by the licenses used in Doxygen because Doxygen licensing has - the following exception: + been removed from the Doxygen output. - "Documents produced by doxygen are derivative works - derived from the input used in their production; - they are not affected by this license." + - The XZ logo (xz-logo.png) included in the Doxygen-generated + documentation is under the Creative Commons BY-SA 4.0 license. - - Translated messages are in the public domain. + - Translated messages and man pages are under 0BSD except that + some old translations are in the public domain. - - The build system contains public domain files, and files that - are under GNU GPLv2+ or GNU GPLv3+. None of these files end up - in the binaries being built. + - Test files and test code in the 'tests' directory, and + debugging utilities in the 'debug' directory are under + the BSD Zero Clause License (0BSD). - - Test files and test code in the tests directory, and debugging - utilities in the debug directory are in the public domain. + - The GNU Autotools based build system contains files that are + under GNU GPLv2+, GNU GPLv3+, and a few permissive licenses. + These files don't affect the licensing of the binaries being + built. - - The extra directory may contain public domain files, and files - that are under various free software licenses. + - The extra directory contain files that are under various + free software licenses. - You can do whatever you want with the files that have been put into - the public domain. If you find public domain legally problematic, - take the previous sentence as a license grant. If you still find - the lack of copyright legally problematic, you have too many - lawyers. + For the files under the BSD Zero Clause License (0BSD), if + a copyright notice is needed, the following is sufficient: - As usual, this software is provided "as is", without any warranty. + Copyright (C) The XZ Utils authors and contributors - If you copy significant amounts of public domain code from XZ Utils + If you copy significant amounts of 0BSD-licensed code from XZ Utils into your project, acknowledging this somewhere in your software is polite (especially if it is proprietary, non-free software), but - naturally it is not legally required. Here is an example of a good - notice to put into "about box" or into documentation: + it is not legally required by the license terms. Here is an example + of a good notice to put into "about box" or into documentation: - This software includes code from XZ Utils . + This software includes code from XZ Utils + . The following license texts are included in the following files: + - COPYING.0BSD: BSD Zero Clause License - COPYING.LGPLv2.1: GNU Lesser General Public License version 2.1 - COPYING.GPLv2: GNU General Public License version 2 - COPYING.GPLv3: GNU General Public License version 3 - - Note that the toolchain (compiler, linker etc.) may add some code - pieces that are copyrighted. Thus, it is possible that e.g. liblzma - binary wouldn't actually be in the public domain in its entirety - even though it contains no copyrighted code from the XZ Utils source - package. - - If you have questions, don't hesitate to ask the author(s) for more - information. + - COPYING.CC-BY-SA-4.0: Creative Commons Attribution-ShareAlike 4.0 + International Public License + + A note about old XZ Utils releases: + + XZ Utils releases 5.4.6 and older and 5.5.1alpha have a + significant amount of code put into the public domain and + that obviously remains so. The switch from public domain to + 0BSD for newer releases was made in Febrary 2024 because + public domain has (real or perceived) legal ambiguities in + some jurisdictions. + + There is very little *practical* difference between public + domain and 0BSD. The main difference likely is that one + shouldn't claim that 0BSD-licensed code is in the public + domain; 0BSD-licensed code is copyrighted but available under + an extremely permissive license. Neither 0BSD nor public domain + require retaining or reproducing author, copyright holder, or + license notices when distributing the software. (Compare to, + for example, BSD 2-Clause "Simplified" License which does have + such requirements.) + + If you have questions, don't hesitate to ask for more information. + The contact information is in the README file. diff --git a/contrib/xz/COPYING.0BSD b/contrib/xz/COPYING.0BSD new file mode 100644 index 000000000000..4322122aecf1 --- /dev/null +++ b/contrib/xz/COPYING.0BSD @@ -0,0 +1,11 @@ +Permission to use, copy, modify, and/or distribute this +software for any purpose with or without fee is hereby granted. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL +THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, +NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN +CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/contrib/xz/COPYING.CC-BY-SA-4.0 b/contrib/xz/COPYING.CC-BY-SA-4.0 new file mode 100644 index 000000000000..7d4f96c54aa1 --- /dev/null +++ b/contrib/xz/COPYING.CC-BY-SA-4.0 @@ -0,0 +1,427 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + including for purposes of Section 3(b); and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. diff --git a/contrib/xz/ChangeLog b/contrib/xz/ChangeLog index 4dd0978ef313..54b68744af86 100644 --- a/contrib/xz/ChangeLog +++ b/contrib/xz/ChangeLog @@ -1,11756 +1,9764 @@ -commit 49053c0a649f4c8bd2b8d97ce915f401fbc0f3d9 +commit 2d7d862e3ffa8cec4fd3fdffcd84e984a17aa429 Author: Jia Tan -Date: 2023-10-31 22:30:29 +0800 +Date: 2024-02-24 15:55:08 +0800 - Bump version and soname for 5.4.5. + Bump version and soname for 5.6.0. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 6 +++--- + src/liblzma/liblzma_generic.map | 2 +- + src/liblzma/liblzma_linux.map | 2 +- + 4 files changed, 6 insertions(+), 6 deletions(-) -commit 84c0cfc556287628df871703672879e530d0391f +commit a18fb1edef0d0aac12a09eed05e9c448c777af7b Author: Jia Tan -Date: 2023-11-01 20:18:30 +0800 +Date: 2024-02-24 15:50:36 +0800 - Add NEWS for 5.4.5. + Add NEWS for 5.6.0. - NEWS | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 74 insertions(+) + NEWS | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 143 insertions(+) -commit d90ed84db9770712e2421e170076b43bda9b64a7 -Author: Lasse Collin -Date: 2023-10-31 21:41:09 +0200 +commit 24355c5280bc95e3d594432d60bb8432aa6af173 +Author: Jia Tan +Date: 2024-02-22 22:27:01 +0800 - liblzma: Fix compilation of fastpos_tablegen.c. + Translations: Remove obsolete and fuzzy matches from some translations. - The macro lzma_attr_visibility_hidden has to be defined to make - fastpos.h usable. The visibility attribute is irrelevant to - fastpos_tablegen.c so simply #define the macro to an empty value. + The French and Brazilian Portuguese man page translations have not been + updated since the switch from public domain to 0BSD. The old GPLv2 + strings have now been removed from these files. + + po4a/fr.po | 4702 +++++++++++++++++++++++++++++++++++++---------------- + po4a/pt_BR.po | 4987 ++++++++++++++++++++++++++++++++++++++++----------------- + 2 files changed, 6832 insertions(+), 2857 deletions(-) + +commit 02ca4a7d7b703e2ec63e00b70feec825e919dbc1 +Author: Jia Tan +Date: 2024-02-21 00:31:54 +0800 + + Translations: Patch man pages to avoid fuzzy matches. - fastpos_tablegen.c is never built by the included build systems - and so the problem wasn't noticed earlier. It's just a standalone - program for generating fastpos_table.c. + This will be fixed in the next round of translations, but this avoids + having a fuzzy match or not fixing the English version. + + po4a/de.po | 2 +- + po4a/ko.po | 2 +- + po4a/ro.po | 2 +- + po4a/uk.po | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +commit 898aad9fc711e03452d24d9e2c5b7f77a6f9ce64 +Author: Jia Tan +Date: 2024-02-21 00:30:43 +0800 + + xzmore: Fix typo in xzmore.1. - Fixes: https://github.com/tukaani-project/xz/pull/69 - Thanks to GitHub user Jamaika1. + Thanks to Yuri Chornoivan. - src/liblzma/lzma/fastpos_tablegen.c | 2 ++ - 1 file changed, 2 insertions(+) + src/scripts/xzmore.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) *** 32153 LINES SKIPPED *** From nobody Sun Mar 10 11:17:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tsy776StWz5Ccmb for ; Sun, 10 Mar 2024 11:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tsy775p4kz4ZMG; Sun, 10 Mar 2024 11:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710069459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GbN1ZP1ctmBf0dLLvH/crKJe9ndE5JDZ0PN8jx4oUc8=; b=b2w/QXjy0JEc7r3JmgMFtkwZAwQT/YjCmYz58wP7zh8NM3NNnk7/SpBT7oKx+kI2+5LzzT PnvC0wIVGWuH+mQ9JjOpTY3bshsnpD/lzDz5qZiv8Wbzynt/3Ho3m3Sxf/ofF//c4meYk7 20z7YByC5LtNRCp2EjHyCpnU0V4XYBKPXjXw3yDLkytguNAl4Uz+A5dCB1va1ff2MC2vhl WnwDuCHJpei1yiSKC1ZE/WeQ9ig9qyH1/v3yE+AH6El/tt2gUIgJfOUJZupUcJFLoDqp98 Fzj/ocCqbnrht4vWOnpHsSReZrfiSCkd7zVOQhORG/VBJ8FLVZBLQTIVCkJc7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710069459; a=rsa-sha256; cv=none; b=fZlzxjiK+ma6pJgt0BdnjCmNazqivbaGqfYeQfzgKBfS+2RK3o+eWG0nb7KkitfX1ygAx8 86mGXqa2I+aVLRChcIEjsF+7+lUR7ggug/44++S7XO33sJn8peiuF6UvZY5EYlfvqZSurP ht3Ah7pGzoY3xUC4aOgJuZTu0E9tSdZYo1QYmRUf9k3WbxFsdr2gdjtlzSP0M5tlHWuMy4 UjJD67chqeDZgFrJlJREzTfbcfV/qMEeBCpz7+RFNVFCCZ7KPbFg5yA1tcMj+G6PuDeb6H a/KajkHtZ/0oUbkwUMdnY0Xrz5rq4cDy3UsWwRnbQI8sEZRmxT8OiDrndZywlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710069459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GbN1ZP1ctmBf0dLLvH/crKJe9ndE5JDZ0PN8jx4oUc8=; b=mT5EyIOAjempTB0kxo5zAQIQt5jxCuYlINnwvX7RG2mwAJm7pL1vVRWtf8h/n+jZNT/ebD B+Dgn7btW5D7HniGvL3SQjZZKPefFRLNVRF2yMo/SVteR6YAKikH5tbI8CR7uNiTEUvubd IpoAcsZz4TjDzGZRlFRp3ntfR/Y8tYV51UyxKhcI7wI3IdTCpknjPH4ivXoAdWmk3N9SBP 0HQzHaGJH9/kGLETWQBf7YovH4rxL1u2Xjt3p/FOaUm7jiOUuylGAezS0w3jD11d3cFLWj 2e2V9Mjf5PpM6dRIOQe+F8QmvB2eH59CqrNf03+b01NMdKQTSlu/FAoMnC8Pow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tsy774zWrzkcB; Sun, 10 Mar 2024 11:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42ABHd5N065142; Sun, 10 Mar 2024 11:17:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ABHdqh065141; Sun, 10 Mar 2024 11:17:39 GMT (envelope-from git) Date: Sun, 10 Mar 2024 11:17:39 GMT Message-Id: <202403101117.42ABHdqh065141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: b3ca86c61e06..8b885620ff1b - vendor/llvm-project/release-18.x - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/vendor/llvm-project/release-18.x X-Git-Reftype: branch X-Git-Commit: 8b885620ff1b22914b6fac738d7b2874d94e7543 X-Git-Oldrev: b3ca86c61e0626b777466609594a8da23ef637e8 X-Git-Newrev: 8b885620ff1b22914b6fac738d7b2874d94e7543 Auto-Submitted: auto-generated The branch vendor/llvm-project/release-18.x has been updated by dim: URL: https://cgit.FreeBSD.org/src/log/?id=b3ca86c61e06..8b885620ff1b 8b885620ff1b Vendor import of llvm-project branch release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e. From nobody Sun Mar 10 11:17:39 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tsy776fkCz5Ccmc for ; Sun, 10 Mar 2024 11:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tsy775v3hz4ZXH; Sun, 10 Mar 2024 11:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710069459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0OIYL59DIRDR+0QdsqZIjlC+JAxI8UijoleRDWjq5PA=; b=EgdwXW4BROMWg0RCROH3e/RoDjDbGK91PDMC3xxeaTA8bC6wHjBu7fT63XW6VK79Ku6Jrh FfFSRgVTHxvY1Pe/0P2PDm7tEEDQjIGx49BX1w6WlD1IhZEpG7aSbyMZcGnn8WEByLU9QB XCocxegfGqO2hf8rVli3hoW17VkdHfeA68ANseury0S4G4cGREQ7JTXJy302EB1V16cFFT dwnbGlbiQaehcnXyFu6ZiNuh5PbSOKBJ7WflLMtVi1t3xE3Zv8RkSu8izolVRO/XMm8DFa J7o6BVM0a61rJSpajgv5O39sKsX3MG5GD8L4/+yH3Cw+i64KhN9avhuEG5w6MA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710069459; a=rsa-sha256; cv=none; b=STkoH4ftw4+vqLEjpjhE82ciuykNUDGRRV3hNGOCvo5HyXrjA1ZdEYZu7bN0Oy6Ao2O4xp 4oOA1FL3tgp2FIF1jAQZv/ZxpFeGnzeG9O1VH7UMHPHShRfSQnus9bMV8WN0k3fOFLPl46 4rw5FKUGgRzIqwZb1SKri453sAtqp0qy7mBo9UR1L5BakcMEBi7z/kfAi+eZsPElzeFWxa Cu1497h/TgbUXwL+41wO9EXxexfEAQC2jPmk6f/QPOAGsU8gySKNC2fkyaqwkqMceXy6aR 2a4gEVLwQCEKCXzJEaJnYWfMGWJDfXE6BHd94ZD0XSewS5TlQ/DvVEsiwEPeDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710069459; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0OIYL59DIRDR+0QdsqZIjlC+JAxI8UijoleRDWjq5PA=; b=qYSJHOX/PizwUfQbuZu7tczz/siyefRS2snm3tRGLHYPxTSdUi05zsJpiA+6G5A+8HSCtm ivSmHDo/jCqdZwobSac4N+B6HNoVoTdMRozys9BQIyZdZWxCpgh5paoF9D/GnQb8gzhAX5 N8BBPGncybffGozdkMND+C263CyzOe8TsvifJn/cHmStaCON3k6kMGoWAfGfP0DPKtOiLX dWoPUAhwo/8LagQOx4KPGWeHtvClwW4t/r/E9Uqx+URI6kxldKOWJtcquQutcW11RNOUOr ijZ5fdukdwj5rx8mjTgrKWTWygjyB/pechkkzJtUe3ednlDhhTlo9zjfOazNNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tsy775MdfzkJm; Sun, 10 Mar 2024 11:17:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42ABHdF1065161; Sun, 10 Mar 2024 11:17:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ABHddq065160; Sun, 10 Mar 2024 11:17:39 GMT (envelope-from git) Date: Sun, 10 Mar 2024 11:17:39 GMT Message-Id: <202403101117.42ABHddq065160@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Dimitry Andric Subject: git: eaa5b8eb4745 - Create tag vendor/llvm-project/llvmorg-18.1.1-0-gdba2a75e9c7e List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/tags/vendor/llvm-project/llvmorg-18.1.1-0-gdba2a75e9c7e X-Git-Reftype: annotated tag X-Git-Commit: eaa5b8eb4745ba1c7cbd0a7286165f13a50d0fc7 Auto-Submitted: auto-generated The annotated tag vendor/llvm-project/llvmorg-18.1.1-0-gdba2a75e9c7e has been created by dim: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/llvm-project/llvmorg-18.1.1-0-gdba2a75e9c7e tag vendor/llvm-project/llvmorg-18.1.1-0-gdba2a75e9c7e Tagger: Dimitry Andric TaggerDate: 2024-03-10 11:16:59 +0000 Tag llvm-project branch release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e. commit 8b885620ff1b22914b6fac738d7b2874d94e7543 Author: Dimitry Andric AuthorDate: 2024-03-10 11:16:42 +0000 Commit: Dimitry Andric CommitDate: 2024-03-10 11:16:42 +0000 Vendor import of llvm-project branch release/18.x llvmorg-18.1.1-0-gdba2a75e9c7e. From nobody Sun Mar 10 11:39:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tsycr29vcz5Cg00; Sun, 10 Mar 2024 11:39: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 4Tsycr1cGCz4dWS; Sun, 10 Mar 2024 11:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710070796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUhj0rYqua8w9mp1arM6TYlK/JiFLKCLy2mqo2/oWMg=; b=vGpfZ/vnU69IX3V4yMdM3LSK6LrEjBjAxS0GyQWF3xdd4wyfjfpVw0sFElF0KtHJ8LgIMY V4scV6W2rlMWZkCCPCewNb3YFkSZfTrAnKLqLzGl01MjuIBWpYkhKqkUlC8Tbed5dmX4xc KMWyN07MGgxHsV03lq3XaSZg6lRvU9Wv7iBZsLudLEWyR5YrSLOLjJAVwk9/70SJ1rwWIg ok2sGtzaOiz2ywBbh2eFMZw7QaWaQC4vpJXr3eFeL/pziUEPyO7FfXP8mpMrMA3tNgNZBC OBf7ziyMKiIf6+8MXgcWibKVQlrxJsCxx3mBEl9S0+dvSbr5N/Jc27kfytL3cQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710070796; a=rsa-sha256; cv=none; b=b4TS0oPOjTe6PRpwhWfE+ZefQTIBDFP6w5pWBJHbO5R+5jicntC7b6y60iw78yxz3u4wnG oqNHjX7hqzuUWVVgrQ6qw14vTHrhP5Fj+rzi6stJu75X9w+dovnD1o7lz+XOpLdn3Ez7eD l3g7lNarbalISMuQH3cG4MTtraIol1DpWVlFWuVVkg7ww3eqmZCmlpFsfliTLrxzVzCPo1 6CZ6A39sAh6IL1BjmNSPdQmjEqF3Hr8zVmKUGqhLqa9epxHcjYqmZy1xWIym2vMXBczakP 6lwJcfjzYKgwevGNEad9RW3Yn8x+vSo+T3u9WmBHV7b/Car0qXMn4QOBbIYPgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710070796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uUhj0rYqua8w9mp1arM6TYlK/JiFLKCLy2mqo2/oWMg=; b=vLQz+RqBGdy57lElawF+ozYd3gRrjMWSCGPYEgvhcdrKZPhzSETKebhVtRU+HmcCd3T4nb vMml50rmEejfdnCY8IgCC0oZceoOaPXPFQ6XVGXox3lhrandSMToSM/OkRtAIdWEb68+CK 43CHann5FxzZg6TIdDx18uPiX9k4MzDB8l/fslORBnzmlU6FVKphEjjeBeumNmLln5CYEu Sl+cy/UI1Q1GRQ8FLr4vDGfKHnvvRjOdk8FphLSMl0f/7fhiZxMKMzxFC8/fk1miZiTaxP FIceVMm+IRR6X7lIKQJeopZX31RDZ2d/BM9ZCRdVREILr1Aa43g1156EpabEyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tsycr1C9czl6P; Sun, 10 Mar 2024 11:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42ABduWf098637; Sun, 10 Mar 2024 11:39:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42ABduTB098634; Sun, 10 Mar 2024 11:39:56 GMT (envelope-from git) Date: Sun, 10 Mar 2024 11:39:56 GMT Message-Id: <202403101139.42ABduTB098634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 96c567f972e0 - main - Add space before 20240211 entry in ObsoleteFiles.inc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 96c567f972e05c47cd239b6c9226354e808f039b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=96c567f972e05c47cd239b6c9226354e808f039b commit 96c567f972e05c47cd239b6c9226354e808f039b Author: Dimitry Andric AuthorDate: 2024-03-10 11:36:28 +0000 Commit: Dimitry Andric CommitDate: 2024-03-10 11:36:28 +0000 Add space before 20240211 entry in ObsoleteFiles.inc --- ObsoleteFiles.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index ed8a6b9bb1b2..1586f310ecc9 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -59,6 +59,7 @@ OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.awk OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.bad OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok OLD_FILES+=usr/tests/usr.bin/awk/bugs-fixed/system-status.ok2 + # 20240211: caroot bundle updated OLD_FILES+=usr/share/certs/trusted/Security_Communication_Root_CA.pem