From nobody Mon Mar 4 00:27:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 09:34:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 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 18:51:45 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 Tue Mar 5 00:09:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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:57:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: 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 07:10:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=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 Wed Mar 6 07:43:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 08:33:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/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 Thu Mar 7 00:34:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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 02:29:15 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 Fri Mar 8 08:19:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrfGR1ncsz5D8NG; Fri, 8 Mar 2024 08:19: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 4TrfGR1FPFz4rZQ; Fri, 8 Mar 2024 08:19:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6hYSw9nS5LeAmaopmJ2rHev9gSl7Is2iBLfuNwCB1Y=; b=tvvepLVP6WNNrYzUjeYWdLwWjiulHtwS6C42eHV0puqIXEdw76nmpaaTnqhT+Q5dibC5TT Snjp/AyGsF0M5SH0GRLqQRWvAmNC4KehqDHNL3dE9vhCVrNzDYhLVMwIPGWDgCzFrGvW6I tvtu00kyOSThwbMsit9Qw1vPiUdT8NcOWtNR7JH0xXLn/iRrYCr1BXcEbxQY2IrxeA3u1I zxPQpzW3E5Q9ecmm/oWbNg9jXgxu5gWWli5MOTz+Kqw0/YksPEPEajwBveNUTfkO1ib/vu /s7ItkBHMcPeaiBB/ivR/I+1jLKCwtSTeaLx1F35V+8G81hVrmdjodgJChNP7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709885967; a=rsa-sha256; cv=none; b=bPYSKg+DGsRgK5QIZ5r2n4xWBIQPSKdIdgVQ0fEd1nyeMpN0S++5srRoMUkwPX3TMnB3Qu Lv3/16OIO5KldXnW7875jk+ejB1leXUJOgAwdzKz0LWgr8zpxS09zymm2F7Z6wvvjH1CeF mhNnScbcIqSRsNm96k4uE3kOdxKG47+mVhZlU123x3z31Bo09H5t31DWgP4Ywv9YhkcmKX jHxWtpV5gH0aj8hEJ/wS/jDu8SU2W8SdXdUbbSQwU2MSfv3xLTS+rELxWtcw2lNqy72jjK M20d91r5RamW2YisO6GSGLBi//kMV8yZ4vjzu7h8hEv1mjP8GIrZbREZuxZ9bQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709885967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S6hYSw9nS5LeAmaopmJ2rHev9gSl7Is2iBLfuNwCB1Y=; b=BCbsPOuq0JbeKGZeknxnBQLlk8LPuuYa1GkA2Rui8ltuqnz8YPS+ArsTcsbg60x6taMjRN 0WRrtObvhIw5iaHdn1YLTBaXELxNMhdOj+Skotv4/POoAcgoG1CT6s/5x0WX+7lsFZNfkW g0HuIR1H4/7ycj0a//iSp9ExwqX2+8n9wi7221GGC+lgHmgfUem1o6baboTGva6TFky3xQ rc2QT7Dh/xgtWzrmQCl8T7V4/az5CLhVRLfjLqItKOAME8Mp7Z+aIpxo2KT/YChbr7qOER lj6ftRQSbfP0/jX0ACxORlkfce4oQ1cVT+NQ9wr3wCRCx9AIW8inEglVABCjYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TrfGR0Xqrz19N1; Fri, 8 Mar 2024 08:19: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 4288JQex061544; Fri, 8 Mar 2024 08:19:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4288JQuA061541; Fri, 8 Mar 2024 08:19:26 GMT (envelope-from git) Date: Fri, 8 Mar 2024 08:19:26 GMT Message-Id: <202403080819.4288JQuA061541@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: c4149abc5d0e - stable/14 - Optionally create full debuginfo for llvm-related executables List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4149abc5d0ea1cd7ecf3b39c0b881483edab2d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=c4149abc5d0ea1cd7ecf3b39c0b881483edab2d0 commit c4149abc5d0ea1cd7ecf3b39c0b881483edab2d0 Author: Dimitry Andric AuthorDate: 2024-02-11 19:02:51 +0000 Commit: Dimitry Andric CommitDate: 2024-03-08 08:15:34 +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 2dfc966726b0..37da7ac759b1 100644 --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -1,13 +1,15 @@ -.include +.include PACKAGE= clang 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 89070b097f6f..fbd99580ba35 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd September 21, 2023 +.Dd March 8, 2024 .Dt SRC.CONF 5 .Os .Sh NAME @@ -938,6 +938,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 dd88772fc43b..7b3e8a441229 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -207,6 +207,7 @@ __DEFAULT_NO_OPTIONS = \ LOADER_VERIEXEC_PASS_MANIFEST \ LLVM_ASSERTIONS \ LLVM_BINUTILS \ + LLVM_FULL_DEBUGINFO \ MALLOC_PRODUCTION \ OFED_EXTRA \ OPENLDAP \ 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 831cd56a8c25..99e993b57cb2 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,14 +1,16 @@ -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 .include "../Makefile.inc" From nobody Fri Mar 8 08:19:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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:50:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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 Sat Mar 9 04:40:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 09:05:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 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 Sun Mar 10 03:57:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 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 ***