From nobody Mon Mar 20 05:22:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg35h5V7Bz40DHc; Mon, 20 Mar 2023 05:22: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 4Pg35h4xH2z3jvL; Mon, 20 Mar 2023 05:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679289752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/f6gt+DSgE9CCMLpO6qWjhS6my6PsWHjpY0uRXc01E=; b=EXsfG9vnDe79htIJrpzSr4WEwGthY53rbZ7UYnaZ3iFYjAPouMIPs8m+cpc2WrmyJISwlJ fk0EypdDGQ5/rJGaxt7a6vLp/wSbS0q8tOQrJ1Lw596OhYgCXR4rxdn+I9gdfpWKr5/IrB w1T742WlYO/k0mcGU/0NAhROenl8slukXXEO/L7gU026r2y8oP+KjzsHseN6NC8Bnv2eqa R0pZz9U9V0LFkF7fUGtEUe0wNNAENX89s+F674J3KymweimYMP+3pMZ4kHfvl/koa39InY qO/dZxDmzL8cc5zUEC0eqOboOJEtkd37wkJjPXWFJL5rB8XuJuMhXmi9wX12yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679289752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S/f6gt+DSgE9CCMLpO6qWjhS6my6PsWHjpY0uRXc01E=; b=bn/SlSdQxFzePIImIRL7nEmhFyKbzKj4F6X/H5p1HEG3J4ulP36IbE15oVokqHmzDeFGzf HtuxGEoHBwxL4Qq6GUrojmBjMnRR4ARZa5Nm0oESDYgrC/4eQcphPcXRDLRvdKMLTpGDJj erNKy+xKyyUlhhpIkLRQVZR3pkhU/FU/7QqyF9071lEDQUIL09EY2Kazgnr9oXp+cLtsG3 33jHK0uchPmJzr1kWfmBn9M14GUVyGeLTNMOr9MsBFeqI1Yz26/gsVyFZNDnYxSiUpBX8C vU28Adl0Cb0FFbtOmv/NrYNdT7y9FufyjegUiNV4vVIyikAgfCpmDkD8M/x+9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679289752; a=rsa-sha256; cv=none; b=UUfoAHSbARGt2gvK6USEcCF6W1ukhh8uy37Vl3eEK2n6BID0iCpZ09cY3g3KtLOOIzVvAQ HrqLhKnPuq63tiH1edUJlUScyf7zf3UBhF7yXwYdtqsgnOkvKfHGj6JWiZiIo1YIfYyiwd Xw8h7FDlr8ZupKXthdkWl7PcyJBUAlfdnCFJ+zApo4I/+WKdQ4MyoT1MJQtFZu/oCL+B6B ti98kjsI9qi4z9ArzMuF1thpB/HT2SCjEIo57rCc0ulri1KSzrnGge8ki40GEh+ULvjD+p fWAbzqregF4i9J4sgi3C0y+3SNYcCRRzKqNBd+rh6NQNybKmlDr3m/g4hhyYHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg35h40N7zHB0; Mon, 20 Mar 2023 05:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K5MWxg068834; Mon, 20 Mar 2023 05:22:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K5MWKR068833; Mon, 20 Mar 2023 05:22:32 GMT (envelope-from git) Date: Mon, 20 Mar 2023 05:22:32 GMT Message-Id: <202303200522.32K5MWKR068833@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: 24ed6ac44549 - stable/13 - FFS/UFS snapshots: improve documentation. 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: 24ed6ac445497ce2489c7be1723462030eef47d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=24ed6ac445497ce2489c7be1723462030eef47d4 commit 24ed6ac445497ce2489c7be1723462030eef47d4 Author: Kirk McKusick AuthorDate: 2023-03-06 05:37:23 +0000 Commit: Kirk McKusick CommitDate: 2023-03-20 05:22:06 +0000 FFS/UFS snapshots: improve documentation. This update provides a more detailed description of FFS/UFS snapshots and adds links to useful man pages. Requested by: Graham Perrin Submitted by: darius-dons.net.au Reviewed by: Ravi Pokala PR: 266358 Differential Revision: https://reviews.freebsd.org/D38817 (cherry picked from commit 528d8e55c8d338e78fa4e6c9f182e8975f75199a) --- sbin/mksnap_ffs/mksnap_ffs.8 | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8 index 201014522721..658502cffdcb 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.8 +++ b/sbin/mksnap_ffs/mksnap_ffs.8 @@ -32,9 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" -.Dd October 3, 2016 +.Dd March 5, 2023 .Dt MKSNAP_FFS 8 .Os .Sh NAME @@ -48,6 +46,18 @@ The .Nm utility creates a snapshot named .Ar snapshot_name . +This name is a path in the file system being snapshotted. +Typically this is under the +.Pa .snap +directory in the root of the file system, but it can +be anywhere. +Snapshots can be listed using the +.Xr snapinfo 8 +command. +.Pp +After a snapshot is taken it appears as a file. +The file is the size of the file system from which it was taken. +It can be moved, renamed or deleted (which removes the snapshot). .Pp The group ownership of the file is set to .Dq Li operator ; @@ -62,15 +72,22 @@ Create a snapshot of .Pa /usr/home file system and mount the snapshot elsewhere: .Bd -literal -offset indent -mksnap_ffs /usr/home/snapshot -mdconfig -a -t vnode -o readonly -f /usr/home/snapshot +mksnap_ffs /usr/home/.snap/snap1 +mdconfig -a -t vnode -o readonly -f /usr/home/.snap/snap1 mount -o ro /dev/md0 /mnt/ .Ed +.Pp +Delete a snapshot: +.Bd -literal -offset indent +rm /usr/home/.snap/snap1 +.Ed .Sh SEE ALSO +.Xr rm 1 , .Xr chmod 2 , .Xr chown 8 , .Xr mdconfig 8 , -.Xr mount 8 +.Xr mount 8 , +.Xr snapinfo 8 .Sh HISTORY The .Nm From nobody Mon Mar 20 05:22:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg35j6Wn6z40DHh; Mon, 20 Mar 2023 05:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg35j5j6Tz3kKR; Mon, 20 Mar 2023 05:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679289753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jJoy1gbz606p8BuWa9dVyY7qM8vNiFvK7U9lsS9j0fU=; b=mVc0HBl8JwXygnhe7Dpd018OpCRqQ1lk5zsQw5B7fq+cQTe6fDXQMYSzyYQJMVP56/AO+D vKg+fb9aGVyRmF+qCyYcZNvJlEvL7y/wO47I9HzgAV06/bEJ5t05gnPxzN4kBcMFRPq8Y2 rezhgD560/h0IC66H41RvuDHSA29Th75hFAU5s4nYZ8FVmCHMB3YGxtV+eQxZ+28YsFEeK UECRiYgU0Dvg/r1TkOH++RsPi6zyUaVhLMjmNpB+QKMtEDgIZbDXjzdEUq+5HJsgUJLtLT ++YU0rM3yiIsLQzDk8RrpVsBuEap+ANg3DRt3l1D8ESGgfb5Y6l5OGI7fe6DwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679289753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jJoy1gbz606p8BuWa9dVyY7qM8vNiFvK7U9lsS9j0fU=; b=GL3KJjczP/muLxmmPCEyq4IDfeLXczyRyR3j9HA4gTr4OSKYpIYrJlXBuZ2+aCd8HekI5U PxNSW0qNW5byhGOUtlVw+uLKTrAm8ApKZi10I/0QQeBxkIQP4/A7rK5UBAKR3oUmPvD+ML S7sjNiCKkvZL0QCD+MnEOZN6X3w+dpk9fvEDU2L/BwJ8YoZ5oblwNvPm9Ca24bFgWkned0 P/DvjwoARzu32+XVC8KHnj46t+reONL0fIqkssVv/8cc0yP0D7O8FdD26u5qKkWGw2uQWf BAicOsepo7wliTtTswJtkFXyRLiKlWybYCNl3fQpGHAlJdEYreTpwaJiP2EXoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679289753; a=rsa-sha256; cv=none; b=t0PZqmmt3vHDczqwmzdIuIv9sgqM8UxOo0bqoShKv8xhkoryALSuH8tB4VYmIHUfKU/wQc psGIfccTsh8WH57nStuIcd+cXaLam0P/CYvRgwZqYIBrpTUe3XNld3K+lYFG8vFhEIqI76 foCZMNyd0l2pk9diwkyncqNzz3LRtcq80opE+XwmV9MJSS2ovCEria87uhTUSejioEMIhf hDNFyaIYE+RYoyS+NmdZ9DuIuxqvXn+ouVHr+g23N7ZyHhlcpVRWjYjPxGMs/3j5DMmM9/ p57bOfTjoZ/aVKVk3zg1tmbWiB3/IjMMiPbMtoW6u3JbmqUe+z3jxd4tsPQjRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg35j4qK5zHB1; Mon, 20 Mar 2023 05:22:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K5MX1m068859; Mon, 20 Mar 2023 05:22:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K5MXKH068858; Mon, 20 Mar 2023 05:22:33 GMT (envelope-from git) Date: Mon, 20 Mar 2023 05:22:33 GMT Message-Id: <202303200522.32K5MXKH068858@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: d0d1bec32ba8 - stable/13 - FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. 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: d0d1bec32ba8b3c955714f9bb6263c71e50f93a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=d0d1bec32ba8b3c955714f9bb6263c71e50f93a7 commit d0d1bec32ba8b3c955714f9bb6263c71e50f93a7 Author: Kirk McKusick AuthorDate: 2023-03-07 05:43:32 +0000 Commit: Kirk McKusick CommitDate: 2023-03-20 05:22:06 +0000 FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. Minor clarification. (cherry picked from commit 7741a5c4dc5e318dcaabf5e336dfa9cf3f3b6805) --- sbin/mksnap_ffs/mksnap_ffs.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8 index 658502cffdcb..6274e93a4adb 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.8 +++ b/sbin/mksnap_ffs/mksnap_ffs.8 @@ -46,11 +46,11 @@ The .Nm utility creates a snapshot named .Ar snapshot_name . -This name is a path in the file system being snapshotted. +This name is a path in the file system to be snapshotted. Typically this is under the .Pa .snap directory in the root of the file system, but it can -be anywhere. +be anywhere in the filesystem being snapshotted. Snapshots can be listed using the .Xr snapinfo 8 command. From nobody Mon Mar 20 05:22:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg35k75N0z40DF4; Mon, 20 Mar 2023 05:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg35k6XlZz3kSq; Mon, 20 Mar 2023 05:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679289754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUxFSN0gDSIjG9fcXlvy1bfx4pXjKrUjwCAq0dHviTs=; b=mr5hgrhr1miFe97r7VPVwddpp0fk3fgH8SKVJseTvRQcHmoc0b20bXpZ+NE423VMQUUDrD D7Xi56OnjY+yOgltjReVWIjVXdNepsODSqF8ovEMcDWIlkMWyHCnt6CTkj/cznq7B7YRjU ndIXAO5Ed1HVhnDfGJSegVsbqPNbjhvyA6Do7pu9sVadRVblU03dTnJtGBdR4bQn/9OVzm FqwYy9FfSFhsQyLeyZk2hbwt/zacPXxEx0TFCWhpqJudKSSBLFxj9E4sUo1Od7bBFIZaXF vKACkMMnJHx5PfsYtouV832xjbwyYRrtgYvehLpl3SsvFcYodcA3hpqi5KZ+Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679289754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QUxFSN0gDSIjG9fcXlvy1bfx4pXjKrUjwCAq0dHviTs=; b=t/h8cCpEmBHPUXhUHTXjoWCZnCfE+LKHYCP5QPB337I0bdEoXFD/6jVacYuX/9CvBZ7jZE bUhXEvoLkrGal2KFs8wUCgNFvtxvZNw6rXDeR214Vz/s0nY86Kwa0H7AsYj/d0W2wBk3co Hcb7WkBcEX8p/XXk3ZIOajc/w6jVCOdJxLnruyTTL5BOHOkSXoxWGoHmTQkhBppnetGe+X E4tON1UjfCgd/8OOW09Io279jxpmIyNo9zJjeaVSUXcGp0mxs3I1RZqmPcr7lHefjfZsOR wKghi37/Rmjt/dHb1pBeI/680MpzEBrpcW3CVv2/Ymfv1P/Ei0HzytzYgKkjDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679289754; a=rsa-sha256; cv=none; b=mobH5KfA9X/lx+R+VbEXp7Yj5yeB+b5remZARk4BYjTJt29J2/UQ6vP4wLYPQEU5FLFOZL U+aoK3Iufs7tRl95ozWxTlnuBEuE3AgYQlQ2gQEJXv35M48VYWjD6SXKtz+phFLgerRxSN nYIV6iVIIb8O8qnyz9b0Nn56ElzCTeY6W4tbX3XRM6VTdHb+E/gUu1B64Da8BxaXwzUi0+ yAkFD5gI5TX7qMdVhw6AeYuRSKLqTuXuaRvYYNbHve2gWDY4TXwRIMFVafOT2zug15jnzg ewmM1UxzCvbHk9ocmYnkREFdRl97/ZQCHxa19B+9KqS57nKpo+yzr+nabMLkAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg35k5TFNzHw0; Mon, 20 Mar 2023 05:22:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K5MYhv068879; Mon, 20 Mar 2023 05:22:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K5MYs0068878; Mon, 20 Mar 2023 05:22:34 GMT (envelope-from git) Date: Mon, 20 Mar 2023 05:22:34 GMT Message-Id: <202303200522.32K5MYs0068878@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: 85dc1a471591 - stable/13 - FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. 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: 85dc1a471591990618bc22ce6b25ac407ad4722e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=85dc1a471591990618bc22ce6b25ac407ad4722e commit 85dc1a471591990618bc22ce6b25ac407ad4722e Author: Kirk McKusick AuthorDate: 2023-03-08 06:02:07 +0000 Commit: Kirk McKusick CommitDate: 2023-03-20 05:22:06 +0000 FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. Clarification of the size of the snapshot file. Suggested by: Matteo Riondato PR: 266358 Differential Revision: https://reviews.freebsd.org/D38817 (cherry picked from commit 129ea078cd16b768a1100b497282fd9359e8dfea) --- sbin/mksnap_ffs/mksnap_ffs.8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8 index 6274e93a4adb..2bba68150636 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.8 +++ b/sbin/mksnap_ffs/mksnap_ffs.8 @@ -56,7 +56,8 @@ Snapshots can be listed using the command. .Pp After a snapshot is taken it appears as a file. -The file is the size of the file system from which it was taken. +The size of the snapshot file is equal to the size of the +file system from which it was taken. It can be moved, renamed or deleted (which removes the snapshot). .Pp The group ownership of the file is set to From nobody Mon Mar 20 07:14:10 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg5ZV58Qwz40L7X; Mon, 20 Mar 2023 07:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg5ZV4HwJz42XF; Mon, 20 Mar 2023 07:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679296450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lc5mD9xJNmTZko0s7anoURYSd3W5gvR++iIFg58hmiQ=; b=g42ARvHTO3srKPVcvB6ZtoVXuFGl0B4W3kvpL6ezej7NB5j7JdSKMOtf2ySQs/R93JHB+B Owm3bzvpiSMvwKfWwQU+oapS76Ci0UtdE+JjrSUGMROk9etOM+N7+UP9R+Y3H+f+CsT5d3 Z03BCEG3gEjeorUZAyVLyXICU4hjCeiy6n/uub9KTCIXwG3xTT8xdYi5E6jtuJuKrP2eE/ JTK6NJfe0/Uc7aFYcE/61uTC/2XMcdAqqiQxx35qCwo/qcXdcscEO4RcCvHz0tuGeG1PYg d2/Lje7zvtqrW9cSsPstNMwJK7JHOMU22vfqp4IXoBUMh54ZUZ3YJqTMfiFxPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679296450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lc5mD9xJNmTZko0s7anoURYSd3W5gvR++iIFg58hmiQ=; b=lKvn5FqQumuTQ08EbloLg/WVhViVhyv+0MkdAOYRL3/ApDti6zqXGerwGBz6aYrXn+Ituf MBTSxpnogK8E2H+3+Ua47vdymvEuc/1GjzrQQGBO6K+kglvvTNemD8J19BfdyfG3jw07Pu ZwGFfuaUkH+f1lB6L7fD9dRI1M0oam+wD2DApqvIzsiAOpGjiC58HuxeKza5lko8+g4aUT RxjHHZyy3PB5xa3NhLOnY5PCaEEHFTUGfzG1euK7eGsPLpGqPqV53Bq1luXBipfbfNJ5D2 Fqbj/YWwVLNEj9Xo7swsQ3BnW9HkKKR4Jo+HA/dfYcMYleco1WSw5txirqP6ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679296450; a=rsa-sha256; cv=none; b=pEMmcuwOGSCs3vRFnKGAxPLGqGcEdUQxwKf0XeDUk5o4WKYLlXa89i0geC3hOQpVOv9VPZ WxqWQ8HEfBTjZ+SYhHqGW36ZoARDnG1jIwDIH+qqb2fY13wZF6Bd4ZRKSWlvl/0WiSmlCP WB2Iqu0OlOwTn2FBrdNAXAiVL3GSppBOH7ypNuDu24HaoqeufBLc84TqFmE14754VUdOAF dd/6t9z6uHjI73RdGcg2l+W/TeWlEyXfekEEUqMfH2A+qg4YgxTc7qtD+MhP3mdGJnRmUH jdqLrrA96xwbkI7TCxMB2KZ45owKnGC5A0H5DsTdP7lpQ9OVyCNYES+Y1jOszA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg5ZV3KkQzLfR; Mon, 20 Mar 2023 07:14:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K7EAOI049700; Mon, 20 Mar 2023 07:14:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K7EAHT049699; Mon, 20 Mar 2023 07:14:10 GMT (envelope-from git) Date: Mon, 20 Mar 2023 07:14:10 GMT Message-Id: <202303200714.32K7EAHT049699@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: 107004380c89 - stable/13 - amd64 acpi_wakeup.c: fix typo 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: 107004380c895d7ccd438eaf98941f92b4aa54b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=107004380c895d7ccd438eaf98941f92b4aa54b9 commit 107004380c895d7ccd438eaf98941f92b4aa54b9 Author: Konstantin Belousov AuthorDate: 2023-03-17 12:42:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-20 07:03:28 +0000 amd64 acpi_wakeup.c: fix typo (cherry picked from commit ff6d60946a0e9e0ade3045b734ed4bea08e20938) --- sys/amd64/acpica/acpi_wakeup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 0f04ccb6f2fc..9601a88e11a4 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -250,7 +250,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) ia32_pause(); } else { /* - * Re-initialize console hardware as soon as possibe. + * Re-initialize console hardware as soon as possible. * No console output (e.g. printf) is allowed before * this point. */ From nobody Mon Mar 20 07:14:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg5ZW66qLz40L9h; Mon, 20 Mar 2023 07:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg5ZW5bghz42jM; Mon, 20 Mar 2023 07:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679296451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/HVRmHniK7n0S9ze5x2A3GV8+KiAqgpFCsAYnZwmb4M=; b=ylAV6aPwef26ekjYt93bEoTL0bXJKgcEIweUg5g6axC4/H9vvTZP3StRcoqJ9bwba5I/ar sx6tXoQCncIGHlp3J8h6T/NTwTZlKrGMqw4HPd4RoLPTZ9qyiEmIX9siB/BqsgDwvPigor 1ij1b0kKYl1JRYdaRqOfiaxSubpyww8/LmL94vCIwlXLXjqP8mWSLx+kNjv3JGbrsMdcuD d0rnzSZ2VwH2glbLqpj0uWozw0SM9eQ/yzVSpy4CLsgY4rfnsRhIKOk9VPxj/L002+H59J +CmkZyuI9VHZAxCXqtYJ7jIi+gt574Q9QmqjZQ0QIJscOMrPLqjdwEfYI+LrWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679296451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/HVRmHniK7n0S9ze5x2A3GV8+KiAqgpFCsAYnZwmb4M=; b=tJyLWjbHHpiboarvNGQ3GQ/XuWvtFu9Y7jEjSgDZMnXlZsF1OKzSe097R16GXVtqW9Fcyh 9z1KbNwpqAjSXNuoLRJzxx40YvRFPvBmZg2hUMWcKmBj7Nzp5XJvSCzU8iUivwnTwyGdYI S9WK/fMYTd/ryLGA46NKaFyPBYUwuaDgSye4pea2no9hzZZD6Z7FoCoXTpfT3M9rB13SSB wHsN7fuksafezJ+x/ULsR091Br5OE4KbQeOoJe8MJsUl1RrNVjSDia6fH69Wemjggin22O PVYVl4nwgL3l6AxkuCRTO3L+NevPYQHpc903b5JX2axS1Kq0U+V0SZhMgHZ25g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679296451; a=rsa-sha256; cv=none; b=PCL6G+uNtOq8BQak4OLIDfqBhkG19G3Nrb681m5oHgP8+yubnv5d3fWYojVgu5ejJNt+kI jFFakFSbE2PczTttIZASQIxxhCk+r4rjRKgaebS3QoDti9DmEvFD7dHP8uhwZjWcCUCJAc UxVQtqRvWARQ0sYZanJn5B5RhHA8uz4uuIPMO+B8PD8JRfQT6v7b5UlIVfylI9GFk2R1HT LFV467hsbzwmEjtStcuXgnSi5Mgf0u6fSw9x9oaamOeE/GzTlTQHlzC2AS4MnzjhRABZnC 3f/EB0GPKZFSEOybZFCfqtFjwbwel+0Y+Szz9RlhGqzo4zK+4XzluDxjEK9THw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg5ZW4D4lzLY8; Mon, 20 Mar 2023 07:14:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K7EBQm049719; Mon, 20 Mar 2023 07:14:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K7EBZP049718; Mon, 20 Mar 2023 07:14:11 GMT (envelope-from git) Date: Mon, 20 Mar 2023 07:14:11 GMT Message-Id: <202303200714.32K7EBZP049718@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: 7c5d3ec4c02b - stable/13 - amd64: properly recalculate mitigations knobs after resume 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: 7c5d3ec4c02b89754ec3ce55d1b7943c404209df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7c5d3ec4c02b89754ec3ce55d1b7943c404209df commit 7c5d3ec4c02b89754ec3ce55d1b7943c404209df Author: Konstantin Belousov AuthorDate: 2023-03-17 13:02:03 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-20 07:03:28 +0000 amd64: properly recalculate mitigations knobs after resume (cherry picked from commit 02904a06c76be857307b78184863654b9e7b88ab) --- sys/amd64/acpica/acpi_wakeup.c | 14 ++++++++++++++ sys/amd64/amd64/initcpu.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 9601a88e11a4..1afbdc3a3bec 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -288,6 +288,20 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, if (!CPU_EMPTY(&suspcpus)) resume_cpus(suspcpus); #endif + + /* + * Re-read cpu_stdext_feature3, which was zeroed-out + * in acpi_sleep_machdep, after the microcode was + * reloaded. Then recalculate the active mitigations + * knobs that depend on the microcode and + * cpu_stdext_feature3. + */ + identify_cpu_ext_features(); + hw_ibrs_recalculate(true); + hw_ssb_recalculate(true); + amd64_syscall_ret_flush_l1d_recalc(); + x86_rngds_mitg_recalculate(true); + mca_resume(); if (vmm_resume_p != NULL) vmm_resume_p(); diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 16780a9e069b..8d4c9d9cbe64 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -313,7 +313,7 @@ initializecpu(void) } load_cr4(cr4); /* Reload cpu ext features to reflect cr4 changes */ - if (IS_BSP()) + if (IS_BSP() && cold) identify_cpu_ext_features(); if (IS_BSP() && (amd_feature & AMDID_NX) != 0) { msr = rdmsr(MSR_EFER) | EFER_NXE; From nobody Mon Mar 20 07:14:12 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg5ZX6KSdz40L1j; Mon, 20 Mar 2023 07:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg5ZX5pWsz42Yk; Mon, 20 Mar 2023 07:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679296452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQ6ngtlRnfOedVAWiHOFlaIrZQS8OwC3oXudOWWGmZo=; b=QYL0bnyKWa56hX3u+AbD/4aWWoOKm4RpZncHdKHR79p9zrrbVJ9QXX+Ka/PzWjBgR5S+sQ VQNMjYJYL26J1bvJD2d/tJKYxuWPhwJ7q6lkZgBYwlQfY8NAKOqvjfQTl/uh2Yrl2J2dQY I9XB4tynVr4L0CBKub9kXqTAxJKtaRBRDFIsUErfHj4Ao/4O8e4Cbpg5P20EdnDZrlESD4 /Zks95FQLsx6p9GASB0pWo9tuDevB/1PFMocgOw5BpRhTkKAMwQLiKeT//jwwcvbG3q7Uj aCKNYN9A3KRmFGDzn/eNAJE3RFgfnUIrImzI0pBRgs8hIRU5c3+5J3Yb+T2New== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679296452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQ6ngtlRnfOedVAWiHOFlaIrZQS8OwC3oXudOWWGmZo=; b=n7F3Gw5YQYzGI2QG7M/UOPhUztj8/oQIUYBlh4eX0XUJ9yt4wEeVCfkivto4orC7BNMXVm MTdVOvMzAit0H/Vo8ieZg++jwq2ojkkK2theV4ZjKXpx0BxUAx6PxlL1jMCmlJBOeCKw8x MhJIFQAsjCR2iCHZvtvvmvTWeGah16asFXX6Ii1V1h9U/iHpy1oSU4tftgNV5CED40bkSL 5OSmwqdhz/Y9eCz6Rw75VMHGCMGwlyp3ERB5QjKpJomta7PJCmfvG9ZR2pZ4koYSbzHi2m G4K6nPw6TEHaseVeiaJ2MIX76Q1NC+u3qG5vUMBtICmF+24DBgt65uMM1ix4Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679296452; a=rsa-sha256; cv=none; b=uAdsoG0laKSCA97c8Dax4m+hdRRwy+rFb1q+nDhUAsiJZGqE3B3fTqVaYEvQGpyRJuuspg RA5gVcYFjW0fovOmIy1ArECniYUMZfhbAqJRU1lcrKzgyL2TKpX7sFO3yiOUF82FrL+axf JUUMs3cxVUHRTssv8o4H+5yTQCxcDX8OrjYbNXTktWTv9/74PbAFgAc5vjXiz216tI24DS FUyADqBTUd1ypqz677hz5Ngew9IhQKkrgABnwLfUSYudZepGSsMvSFD3Vzdf/beQhlVXyc CwfCTtHPXxkmnA2A2lQbJNXwZTG7Wj5DzRaGadZ1OYXrbXmP1sPJi00df1gd/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg5ZX4tqhzLw6; Mon, 20 Mar 2023 07:14:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K7EC2A049738; Mon, 20 Mar 2023 07:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K7ECUb049737; Mon, 20 Mar 2023 07:14:12 GMT (envelope-from git) Date: Mon, 20 Mar 2023 07:14:12 GMT Message-Id: <202303200714.32K7ECUb049737@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: 38cefd30516e - stable/13 - acpi_wakeup.c: apply the reviewer' editorial corrections to the comment text. 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: 38cefd30516e0c27194b822cb7db5a7d92e780cd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=38cefd30516e0c27194b822cb7db5a7d92e780cd commit 38cefd30516e0c27194b822cb7db5a7d92e780cd Author: Konstantin Belousov AuthorDate: 2023-03-18 15:45:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-20 07:03:28 +0000 acpi_wakeup.c: apply the reviewer' editorial corrections to the comment text. (cherry picked from commit 2b4b3789f877918e9e89a217d3b25d854d1a2267) --- sys/amd64/acpica/acpi_wakeup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 1afbdc3a3bec..3df4457550d6 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -291,8 +291,8 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, /* * Re-read cpu_stdext_feature3, which was zeroed-out - * in acpi_sleep_machdep, after the microcode was - * reloaded. Then recalculate the active mitigations + * in acpi_sleep_machdep(), after the microcode was + * reloaded. Then recalculate the active mitigation * knobs that depend on the microcode and * cpu_stdext_feature3. */ From nobody Mon Mar 20 09:47:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg8zd548Zz40VNT; Mon, 20 Mar 2023 09:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg8zd4Vvmz4HgW; Mon, 20 Mar 2023 09:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679305661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fI3R4kqUQFrFzeJFthufTPq7INmnU63tS7UdDxB3kYM=; b=uLh9nvwPOJOu42Q6rrY6eUI91LfKErLnYE2ZRZya/B6rl+dscdp25um6fBqU/J/QelVfSZ 275W8yB6gZCPL8mflc66NJAi4ILmBurUaPBXCgsOGnh+8XOzVa//sHy2JiUSnE37WS9wW/ +m+0XDrksDnfewzw7n73QI5JCsGmpX4suUM1TAMYnRZr9tfCCUQNzCP8EynExU2rT5mBkT bKqK3YHI1QfZECJkqfVO4RCyQKDgxMC+q4D0rs4n6HGR1hy5d2hlSDjFvOGdf85i8wS9NP quGNKr0sW6LsFFHh99OKnHjwGP65f9Dr8ZHd8kdO2wTKq+h1IsQR4AGC5prwgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679305661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fI3R4kqUQFrFzeJFthufTPq7INmnU63tS7UdDxB3kYM=; b=cIJSP4CnN5/DaWmhnZEc8+hCaf5EfUfOrDBr38QF7Py7UBc1OWFhKArD9kMhTTaAGISsMX JJZ43yp7J3kekvFNR4aMLnDdtAslXl3MtSPBqidsxuI3Pq0OEfCrUPs87tunk9IeyDu+Jq DZuL3AVvSc4WOkDofKWkl4yQFJiy1hIhmBsx5cSCltlB0zSbqMhGUFUn1J4swCNPzcJQEV x7v70GaxMQ7A4vrGzqjZ1jqKe8gjjZiFRwyBvI61A6zqGe5xIhrp/vHGmt8O855+jpHvRl 9h9MbFB5vMkj05LdaN4cwSTtdlxmOFjRi1FV9jgKx+icheRCrhilKgWrPfDxZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679305661; a=rsa-sha256; cv=none; b=SWcckTXJy0ysmAnKsgfSEoQ4aD54NQ4MSji3psLil2nsgCDMUym4cBNGOEN/mDXIxsRbzl wSysGfcV9JvBkXfvjJr1OzFO4kpMDRhChKzzCwURPEojUrhyFjEZCb5SAHedm7myLK6z7f qdc93UPxw/0PTD/+q8Ouc+3sn7MRHACOfxT0krOdeDxBA50bHpGPrhJEP2BGBq8H+oc1IH Y52LXUbe5TfqZo9cFnGf6J6oHKRWPI6+KxnQYJH7YahS3bBhO1h55bnCEbGZPMTTx2nF3I fVBtYt6291LmUXyMzaS5s6/bg7ShEsd16o6/f6IXxVMFeAmE67l/rVMoPoVgwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg8zd3XFhzQWx; Mon, 20 Mar 2023 09:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K9lfiZ096576; Mon, 20 Mar 2023 09:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K9lfcH096575; Mon, 20 Mar 2023 09:47:41 GMT (envelope-from git) Date: Mon, 20 Mar 2023 09:47:41 GMT Message-Id: <202303200947.32K9lfcH096575@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: 5e7bbde17d53 - stable/13 - pf tests: test IPv6 fragmentation with link-local addresses 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/13 X-Git-Reftype: branch X-Git-Commit: 5e7bbde17d532024dca7b96a24e4188b65b1ed00 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5e7bbde17d532024dca7b96a24e4188b65b1ed00 commit 5e7bbde17d532024dca7b96a24e4188b65b1ed00 Author: Kristof Provost AuthorDate: 2023-03-12 15:08:31 +0000 Commit: Kristof Provost CommitDate: 2023-03-20 09:47:31 +0000 pf tests: test IPv6 fragmentation with link-local addresses We've observed a panic after pf_refragment6() with link-local addresses, because pf_refragment6() calls ip6_forward() even for a simple output case. That results in us entering ip6_forward() with an mbuf with a NULL m->m_pkthdr.rcvif, which can cause a NULL deref (but seemingly not for GUAs. Test sending fragmented link-local packets to pf. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39063 (cherry picked from commit 225e85513fd7a5e31f649e35f0b99454bb725776) --- tests/sys/netpfil/pf/fragmentation.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/sys/netpfil/pf/fragmentation.sh b/tests/sys/netpfil/pf/fragmentation.sh index 8b16c9655d08..ae394324cddc 100644 --- a/tests/sys/netpfil/pf/fragmentation.sh +++ b/tests/sys/netpfil/pf/fragmentation.sh @@ -103,6 +103,10 @@ v6_body() jexec singsing ifconfig ${epair_link}b inet6 -ifdisabled ifconfig ${epair_send}a inet6 -ifdisabled + ifconfig ${epair_send}a + jexec alcatraz ifconfig ${epair_send}b + lladdr=$(jexec alcatraz ifconfig ${epair_send}b | awk '/ scopeid / { print($2); }' | cut -f 1 -d %) + jexec alcatraz pfctl -e pft_set_rules alcatraz \ "scrub fragment reassemble" \ @@ -120,6 +124,12 @@ v6_body() atf_check -s exit:0 -o ignore\ ping -6 -c 1 -b 70000 -s 65000 2001:db8:42::2 + # Force an NDP lookup + ping -6 -c 1 ${lladdr}%${epair_send}a + + atf_check -s exit:0 -o ignore\ + ping -6 -c 1 -b 70000 -s 65000 ${lladdr}%${epair_send}a + # Forwarding test atf_check -s exit:0 -o ignore \ ping -6 -c 1 2001:db8:43::3 From nobody Mon Mar 20 09:47:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pg8zf16YCz40VJ6; Mon, 20 Mar 2023 09:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pg8zf0h2Fz4HgZ; Mon, 20 Mar 2023 09:47:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679305662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=miEsz5EhuV6VEwdvy+kM7CaIwfDVW5Fr3uE02/1giCA=; b=AxBmqL5+dN0sm7CF2cL8y7O0mRaKPI4C+jD1cv2fu9m5Yg+UElddVNdL/N8i6ejZ7mF3Wq g0yHpWbX+RH5zwFzoyBgX3zIKmPhB2AtvUmT7YtwnT5jXv6QqSYGTIJiL3ECw+nPAQkFIQ al63Fl/ttYLoFsvCb25goRf2i0yt7V53vcyh/v7rBbisk3kdCtC0wflYgpWxgKXhFXczPW 8mvh1Y8TM27n3aHuRUyF6pgbxOKxSnQMkH4yb/8FSwP8p7C5mFjMA/DND3rXJT9Mm1Sbk1 B1uUxIii2MU+eOaQEKtcqhWw+0iO3gTWJKGmtaa6kVlRcWjpseaEosKrYeW7Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679305662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=miEsz5EhuV6VEwdvy+kM7CaIwfDVW5Fr3uE02/1giCA=; b=ueWuTZRpgiTLf49A+91jpJvOigAfZfWfdpAVVtocJkqnvirxp0OvS3oxAuVjuDjMfoQNPO P6/kOovTSauw9FaELf5lE3zgXXZG8pMu3nT5KQg/TPPXN/hZumSCWzgRsSvcv0tygciJ/m sjEZpyvpjlNioocRAbt/ej5y88tna6UQkTjXHJMYLW2VJigl+RfGVkvPPrLlgX1/U5Q5gu +fAozWEsCgwNVGWZhgC/3iIeOeaXHMCOzXsAJMfePkLbai61fLU69tIiXsyMiKKpTX0Bkc GLo+r/J6bXoLp9R+6MPU3DQb8rIAZjH90rKulmbyXjSMbTUiarm7brjcc2kODQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679305662; a=rsa-sha256; cv=none; b=lBQLIzV41ca02Jss8mOH3UpYUTLAk0Pxi4tMJAq29LrM9XBUVg5E7jY3hkNDvj8LT5k/8r fyVTBdof3AsHL2l10Omqeyd5I1mP1I1SysXqBnXGUNoWADiqcsedojzT1gSoGfziVZlMZ4 AZTuOyHQibdOE2+4AXCi6HyE4EjUwHfUmL8M6+5VO+HwF64eeWxJhAZOjl+VqLxiUWrobV eA3pbyuA+ZNTWMHZ1adJWimz2B+XcXki4qnHpLGKIj8HbhMshmbyT+i3NyDr4DV5QwkLno VWJ1q7+xvDWKVOPWNREUpzJwGb3iOeBPJ07ETKGDHtmpeeSrHrQgUV91p2R1aA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pg8zd6tl9zQWy; Mon, 20 Mar 2023 09:47:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32K9lffS096649; Mon, 20 Mar 2023 09:47:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32K9lfwX096648; Mon, 20 Mar 2023 09:47:41 GMT (envelope-from git) Date: Mon, 20 Mar 2023 09:47:41 GMT Message-Id: <202303200947.32K9lfwX096648@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: 4b77c46dc29a - stable/12 - pf tests: test IPv6 fragmentation with link-local addresses 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/12 X-Git-Reftype: branch X-Git-Commit: 4b77c46dc29a84047c8c6e7d34b35882a54aaa69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=4b77c46dc29a84047c8c6e7d34b35882a54aaa69 commit 4b77c46dc29a84047c8c6e7d34b35882a54aaa69 Author: Kristof Provost AuthorDate: 2023-03-12 15:08:31 +0000 Commit: Kristof Provost CommitDate: 2023-03-20 09:41:37 +0000 pf tests: test IPv6 fragmentation with link-local addresses We've observed a panic after pf_refragment6() with link-local addresses, because pf_refragment6() calls ip6_forward() even for a simple output case. That results in us entering ip6_forward() with an mbuf with a NULL m->m_pkthdr.rcvif, which can cause a NULL deref (but seemingly not for GUAs. Test sending fragmented link-local packets to pf. MFC after: 3 days Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39063 (cherry picked from commit 225e85513fd7a5e31f649e35f0b99454bb725776) --- tests/sys/netpfil/pf/fragmentation.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/sys/netpfil/pf/fragmentation.sh b/tests/sys/netpfil/pf/fragmentation.sh index de83f5d5c82b..f9dcd90b92af 100755 --- a/tests/sys/netpfil/pf/fragmentation.sh +++ b/tests/sys/netpfil/pf/fragmentation.sh @@ -103,6 +103,10 @@ v6_body() jexec singsing ifconfig ${epair_link}b inet6 -ifdisabled ifconfig ${epair_send}a inet6 -ifdisabled + ifconfig ${epair_send}a + jexec alcatraz ifconfig ${epair_send}b + lladdr=$(jexec alcatraz ifconfig ${epair_send}b | awk '/ scopeid / { print($2); }' | cut -f 1 -d %) + jexec alcatraz pfctl -e pft_set_rules alcatraz \ "scrub fragment reassemble" \ @@ -120,6 +124,12 @@ v6_body() atf_check -s exit:0 -o ignore\ ping6 -c 1 -b 70000 -s 65000 2001:db8:42::2 + # Force an NDP lookup + ping -6 -c 1 ${lladdr}%${epair_send}a + + atf_check -s exit:0 -o ignore\ + ping -6 -c 1 -b 70000 -s 65000 ${lladdr}%${epair_send}a + # Forwarding test atf_check -s exit:0 -o ignore \ ping6 -c 1 2001:db8:43::3 From nobody Mon Mar 20 13:33:40 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0P0VzBz40kLJ; Mon, 20 Mar 2023 13:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PgG0N720wz3NQH; Mon, 20 Mar 2023 13:33:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jsZyGXqKdynoVjRgUQYOMYAkpvebyuSUUvRukBF+4o=; b=UWSCNR/JUKiiVjxfHICvA5MOE3W7CmayBpVOv56yTtzcAKRgy1v6Xks93ymCHLO+LMmDYy 7DRXA+/SnzD9fS+D0xdbQF/dEeTuon8kv89FghPUphK3+722DXawJxJ9Je8DyeNMEdhSXC ezQQ5wh+p1YQZN1U/SKhIlRb/tmElilNZzL5Es5hq45KVPTfQ73pTkRVJC7DhXB97TRXOs yndsN3nojV6wFhZ8UDarTUsTbA0SUqN/o0SCS3IBUxpgLpPwzCIcQIMgIYcEPafutrOWLW LGlMBcUl+eoRo+/6o34EAR0D7uTwl7C/xFhiyl6r8npkbrYIw6SH4kSwHA31fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jsZyGXqKdynoVjRgUQYOMYAkpvebyuSUUvRukBF+4o=; b=qzPaaAFpMa90jhuWpsmipRlSTR8rjDSMjOfSARgIu6WSfXcTsDuHqtLPZ4doliuNjZV130 Oq3lBFPxjjab00qMD7BWxQ0ce4CTdBI7rX7rg6Hp6moZgXrVAP5tz5oXgMb9jpcP0RGMXK IU28sWTYRVUsiIxUj1uqNOG+rMRzprdGK5apzWDtVpDRWC3CJ+pcFOPJy0vGa3RShNpao1 J2bZecM7vMEUpUEzxY5U5eFAWow8DOJGi+KXW+H6kmYQhWp0YwFZa2qTVDBaLv9tklBojf sNIf4X96L1kyJthLTOynDfcmQXEbqohJ89mNYYriAr9zKKhKKuCn3fbCgC281A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319221; a=rsa-sha256; cv=none; b=pUwwb7IqQSIft/LlHu29kQGNpNKCCX3Fr2qT5XPG2gRC/bwyEfh37uy+BMfhMdjMG+1VHO gPJdeA/G3hTEtwzsCLMVB+boxaQLrGyBv1SWxoFtTiFV3BZnYTjD70oMEGLIx6COUMATaT j04//ZqoVW+PkPkk3I5X7t0Mi3fxfF7fadIxtlsNCsdxbqREwDs4kXY/2NXJs+9t3sHY9C acLevebmBfhAJP+dZRu20mKR2U0tgMNS2hUKhdUr0b0hA8BZp8EPehdUM8L+UE2TIHAmxN fGHVbAYSX30OMKF6iOhnC/HSkA1WqbsCmKVwhUzbkxfCidkhIqRQHfxKFNK1yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0N658tzXLF; Mon, 20 Mar 2023 13:33:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXeoi073551; Mon, 20 Mar 2023 13:33:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXera073550; Mon, 20 Mar 2023 13:33:40 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:40 GMT Message-Id: <202303201333.32KDXera073550@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: 06fc9fe027f6 - stable/13 - netbsd-tests: Serialize message queue tests 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/13 X-Git-Reftype: branch X-Git-Commit: 06fc9fe027f68aaeb36fe52fbeb7ab0ac6e7012f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=06fc9fe027f68aaeb36fe52fbeb7ab0ac6e7012f commit 06fc9fe027f68aaeb36fe52fbeb7ab0ac6e7012f Author: Mark Johnston AuthorDate: 2023-03-10 22:07:06 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:52:07 +0000 netbsd-tests: Serialize message queue tests They can fail when run in parallel since they all share a global queue key. MFC after: 1 week (cherry picked from commit e1ccf64b884a1a47c48a2fb7d71e7eb18347c6d6) --- lib/libc/tests/sys/Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile index e4a1bf30a8f9..188196911666 100644 --- a/lib/libc/tests/sys/Makefile +++ b/lib/libc/tests/sys/Makefile @@ -74,6 +74,13 @@ NETBSD_ATF_TESTS_C+= write_test LIBADD.getpid_test+= pthread LIBADD.timer_create_test+= rt +# Message queue IPC tests need to be executed serially since they variously +# use global keys and exhaust global IPC limits. +TEST_METADATA.msgctl_test+= is_exclusive="true" +TEST_METADATA.msgget_test+= is_exclusive="true" +TEST_METADATA.msgsnd_test+= is_exclusive="true" +TEST_METADATA.msgrcv_test+= is_exclusive="true" + .include "../Makefile.netbsd-tests" SRCS.mlock_test+= mlock_helper.c From nobody Mon Mar 20 13:33:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0Q1cf5z40kJ2; Mon, 20 Mar 2023 13:33: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 4PgG0Q12jBz3N8c; Mon, 20 Mar 2023 13:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xAaF22SPXt/F1+9syTg4fS7C1zfege49nOYBh60OqxE=; b=PnpA/8kcc0C8OoqzkUPovQZm58E7bky5n8N5LK9khIiPLM1kuv6IiGHIPCTjS266Yo4vZN XmPSweiabu8f8f57rI1EcPIQARCLgTtC90wxLlAsqb7mpSEcGkR/tcn9CXYQfM4AvfvAOU 2tOUFJOr+QsUF5HKm5DU8DZvoPHXXIyt2tOS7ZUWYSC+jbps0wgVhNU2JgFKSHGjNaz9bb 3UiPpSDXB7V7kkJNEMsxdyGxm14rHUIo/kLc+jc7uvaZfiJ5dlTLquS58Dg9JiT8u9TE01 FFwySY8Vtosn7IKOI1Dbrv7fbD3Kq0pkt3c7r4GP5fbsHBjyW4fON7SUl1xkrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xAaF22SPXt/F1+9syTg4fS7C1zfege49nOYBh60OqxE=; b=XJFUAnQSBtTy2COede5llRqjIQneVqb1Nvz4JvcmkFWNvZ2OSD1RGc1gvFCekRZVWMndI9 P37WmhaNSS7To/0PZwt5RZvgJTt6ubMBCQgZDQZFTR6W46qT+cxgBFKm1tlme0kDezVfpc 6qcc3bnHW+WvxdzIZCulL78esOHWFggofKYc/R9GqE2vWGoMGnlO3F7Dcm062Gf35KY4xY 6nWw0B4VHqVQysS29Yj+5RVQjsZ2yGXx4kPlCaX7dGeHBKoSRpAsQAByGY6cuSNVoemN0m ZKRkojBxnOlmFgV9nhT8b38wHTurcgr6ghcdo+QZRzBtNrZnmt2ge9Am7PVMCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319222; a=rsa-sha256; cv=none; b=ZRdR+1Km0Y9VJ5wC7XHHCEtGkbzHhQVZk9MdXrzG6WOSFuFbBr3OJy5d/Dz+08ml24EIPw YR7m4iRLXRS0Vkkloal8FsSevOfM47070GDC5v1SS6zfQshk4MoiO/nU58rOvgaSIBXz9A lzXUOQwkzFwaxoHaJYkPa165PLccw3lhH9ilA0sbcr+0ybV2d6PN1GoPlxDC1v4VguNeyZ BZ9RMlwZTNA3XH4Fpu2LEHP7WKKtGWO+CI8PQrEUaaPxXxk8TKObFn8P8D15EFALYBQaWA BF6pnc5iCMe13FH4P6stZVVeqAABRGmxHYu2K9LTmzByxvG9a7F7ksGkLSyQqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0Q07jxzX4Q; Mon, 20 Mar 2023 13:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXfDI073577; Mon, 20 Mar 2023 13:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXfKs073576; Mon, 20 Mar 2023 13:33:41 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:41 GMT Message-Id: <202303201333.32KDXfKs073576@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: b09eed11cf20 - stable/13 - netbsd-tests: Remove some pointless sleeps from message queue tests 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/13 X-Git-Reftype: branch X-Git-Commit: b09eed11cf20101e9249aecf8ca83e2be6df5947 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b09eed11cf20101e9249aecf8ca83e2be6df5947 commit b09eed11cf20101e9249aecf8ca83e2be6df5947 Author: Mark Johnston AuthorDate: 2023-03-10 22:06:46 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:52:07 +0000 netbsd-tests: Remove some pointless sleeps from message queue tests - In the msgctl tests, there is no point in sleeping after a fork(). Just block immediately in wait(). - In non-blocking send/recv tests, just wait for the child to exit once it's reached a message limit. If a bug prevents the child from exiting promptly, the test will time out. MFC after: 1 week (cherry picked from commit 478de7f8e25849ce0b3a37b4baaf9c69e0b34072) --- contrib/netbsd-tests/lib/libc/sys/t_msgctl.c | 2 -- contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c | 2 -- contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c b/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c index 4c145cc89047..098ee91373bf 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_msgctl.c @@ -212,7 +212,6 @@ ATF_TC_BODY(msgctl_pid, tc) _exit(EXIT_SUCCESS); } - (void)sleep(1); (void)wait(&sta); (void)memset(&msgds, 0, sizeof(struct msqid_ds)); @@ -232,7 +231,6 @@ ATF_TC_BODY(msgctl_pid, tc) _exit(EXIT_SUCCESS); } - (void)sleep(1); (void)wait(&sta); (void)memset(&msgds, 0, sizeof(struct msqid_ds)); diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c b/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c index 522ceb82cd38..1bbf6e855acc 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_msgrcv.c @@ -275,8 +275,6 @@ ATF_TC_BODY(msgrcv_nonblock, tc) _exit(EXIT_SUCCESS); } - (void)sleep(2); - (void)kill(pid, SIGKILL); (void)wait(&sta); if (WIFSIGNALED(sta) != 0 || WTERMSIG(sta) == SIGKILL) diff --git a/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c b/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c index 562602a28a79..0251b42ff3d4 100644 --- a/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c +++ b/contrib/netbsd-tests/lib/libc/sys/t_msgsnd.c @@ -265,8 +265,6 @@ ATF_TC_BODY(msgsnd_nonblock, tc) } } - (void)sleep(2); - (void)kill(pid, SIGKILL); (void)wait(&sta); if (WIFEXITED(sta) == 0 || WIFSIGNALED(sta) != 0) From nobody Mon Mar 20 13:33:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0R36ftz40k0M; Mon, 20 Mar 2023 13:33: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 4PgG0R1yFvz3Nbx; Mon, 20 Mar 2023 13:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KkwYIsElpYSECQHItyaMaCdZR0QZviQww18HYNiJSw=; b=WAXvR7ZgMxY4NqWdAA9BxS6GKip5cdc8E+ggYx7MetU0bDMOybcDq8JQlTypM3BYpmrI+7 HweeDYKnHBiDKbiOOg3gcWi+ZseMRElRRqKsvssySZBrwZHaL98/u2enuewSBd7MGoswaI wZTLJ5Iorpupf+GsMP9Kl66ENkfbRef1sfKhSTyQXCK94zEWPav5jCDyqpJpIjagQYqBHT xnsBl7R5zKZVGsR0oxBi5f9vnxWMB5Wvd8rbgNPKEU3gQzwfH8lH2H3Dq2MUk8YIJcjJYV SHgzUZkaQk0pYyAtZIZawcpvr6TgNUhiGx9egKPjKmVdVBrLvBuFxha1/NOkTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319223; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0KkwYIsElpYSECQHItyaMaCdZR0QZviQww18HYNiJSw=; b=gwtgJeTxJCx/Td+oA8xxzxkf6Ut4xhOCe3bOHzCqLaPA4qyaVuJRrsosROga51FuHSVyFq LBxohioHRYrm+9qLAUhDISfiz7lutuV23ctVcAOLFZOkR5UETQW4ufXSq9NQ48KUgIKJtA 604EM3v8OKJzgSsvuBzg4eupaC/WF5hkDkWd1vi9Mw1wbVPVVCRfg6Zm+1/qQErCJGe5fU 0nP9p4GFfLRRLdb/kMN4vwuozIVlWwPWlgLl0agpTfEUWNrIlfGVOz4ZRZKi7cMXnXLF4D VRCtxXlg8ItvHrrn4etNS6r4rZxJbdW6+eL9xyBBYBcd6itdOvrWnvqbL1yU0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319223; a=rsa-sha256; cv=none; b=qbUPbh3fQWueYT+HYW5O/Qxvbv1is3zlVInx9H+a04gahl0VDOjWld2zfqNZb/KmZr5xUn nc6T7c6BAIRmvkCcZ5ux11tHicrH1UnR1fOD7mVO5v3As+Q0nzJOL83KpI5sUV3El1GgSC ktQycoG9yHW7PusutcxboLMH1jY+BRnq1/Ui09Ko0nSljfGs4+4PrEq7+veXCxOxUYRQgF HDwn8tbv2wDyc++hfwevdTlh+BrlRnvilEVGccSkGiATCIr7jtFSvcNBBaGmVn+Dx0bbc8 7gHYi0y2W1JPEHEGYDuNmx3W4b0l4axDDd7jrHWH4uW9/xdSzEsopnXiz59Ngw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0R149qzX4R; Mon, 20 Mar 2023 13:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXhqH073596; Mon, 20 Mar 2023 13:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXh1g073595; Mon, 20 Mar 2023 13:33:43 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:43 GMT Message-Id: <202303201333.32KDXh1g073595@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: a16d3089b295 - stable/13 - udp: Fix a memory leak in udp6_send() 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/13 X-Git-Reftype: branch X-Git-Commit: a16d3089b2951c3c13979fd79313bb6c7b652445 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a16d3089b2951c3c13979fd79313bb6c7b652445 commit a16d3089b2951c3c13979fd79313bb6c7b652445 Author: Mark Johnston AuthorDate: 2023-03-14 14:26:29 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:52:07 +0000 udp: Fix a memory leak in udp6_send() Reviewed by: glebius MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D38993 (cherry picked from commit e9ea690ae8486b74d6eeca62e316bf591d8aea4e) --- sys/netinet6/udp6_usrreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index ff7227cb99f3..6c40a8cae2d5 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -803,10 +803,10 @@ udp6_output(struct socket *so, int flags_arg, struct mbuf *m, * Given this is either an IPv6-only socket or no INET is * supported we will fail the send if the given destination * address is a v4mapped address. - * - * XXXGL: do we leak m and control? */ INP_UNLOCK(inp); + m_freem(m); + m_freem(control); return (EINVAL); } From nobody Mon Mar 20 13:33:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0S3nBbz40kLT; Mon, 20 Mar 2023 13:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PgG0S32GTz3Nfr; Mon, 20 Mar 2023 13:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SueeHq1V9VhyU/kIvgdLEqa2UlvD+twVhnY+nvrh66A=; b=EUqXbI20HWIlF+Jfkzi8lIVAZhOQbB+soGsKiLsDPvlRDKAcwkKzgS2IDeAlYZMQMY4AGb 4VhvBRxBkBu9KA0lbDIvQE5LSca0M2Gk4lCm0yDJ2hPWImJFlTBM1LQOb0+qvF86OX3+RB rb5n31O/hMNaGSl1dDNpG/OFp7d/5WmYTqzKjhQqmDD175L2YI8mXmtviq5otHxjKkOcje 9G0rcS0+TbJht7JjqzdOS11G5s8PO4vVTnVTT4mCtDo/vKJmbybj3VKwTQWDG5SV6VaZ15 h9d5r3JORHD/t2JnIgpwyoj+AvGi/iOUzSECHz+9S7cdZbGKI5vbQ/xaIqekaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SueeHq1V9VhyU/kIvgdLEqa2UlvD+twVhnY+nvrh66A=; b=cR4smShlgHzD+hBU4lmJ8isY6SxFKEoZ3cdGFj+GsUhYO++KgweKSfCXALXhxFsPUw3I5S g6Jev81a6w+g8cSRFbZzEC8cIOZDT5rCE1yLuE4RfqKDgQkJHFpgdBURhyM1BAw5/KAoLn pcU6jOktQITOYSu9hfJIcEUr7XFTFBZi6V1OQeHDh3e0Gc76PSSbCQ40dIK14qHztRQoUb lPiBLTR/QmQ/9A/1XE3v2+aZcycSYz8hrajXwHd0hQkd6mRwT3QdqL+6A5R5lWA0jF7sN+ yrbppc7Zx+x0v2SnQB30XHgifDyp+z4Ldnykha2Hv5O+kN9+tyVJQvk4E/TdUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319224; a=rsa-sha256; cv=none; b=n76uQn23UoQ+/A/M30Sj30zYjBCtP2Dt8UzxOiw2vekH9Gl0yH+YgHHIwtO6ASx+UfJRpI 86r1shO8LpJwGl6cf9XV57bnbrYvA1Al/Ev/HERl5zDDfIXFq3/PToWYHUgY+gYRk2eQ77 3v2vH51znm7QQZQ8kmLIseRRE1hep/AWa03+7Xeon5B+xhi5JeAKYPBsk5yas/rYlFvKVq i+aY72YUb9SYCz0Q1Ky3YbP1ge9cnMC9vVetLlxFxXiN5LXobw2p232sbsUsePJsrF4V5N 06eaBwaANT5997Ba84tbd+S/VSWm//Jhgcln9dy40Ja9Vwql8IJlm1G1LJ2i7Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0S22SmzXWk; Mon, 20 Mar 2023 13:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXit2073615; Mon, 20 Mar 2023 13:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXiYT073614; Mon, 20 Mar 2023 13:33:44 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:44 GMT Message-Id: <202303201333.32KDXiYT073614@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: 440dbf8a4b7a - stable/13 - readelf: fix -wR option, memory leaks, and -wf minor bug 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/13 X-Git-Reftype: branch X-Git-Commit: 440dbf8a4b7a983e3b93f5e357700093117b6b32 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=440dbf8a4b7a983e3b93f5e357700093117b6b32 commit 440dbf8a4b7a983e3b93f5e357700093117b6b32 Author: Christos Margiolis AuthorDate: 2023-03-06 17:50:13 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:52:57 +0000 readelf: fix -wR option, memory leaks, and -wf minor bug Reviewed by: markj MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38419 (cherry picked from commit cec2d0b1c7ac3196613813c0b07a2387916a8ccd) --- contrib/elftoolchain/readelf/readelf.c | 39 ++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/contrib/elftoolchain/readelf/readelf.c b/contrib/elftoolchain/readelf/readelf.c index 77125b77ebef..daaa7bf62dff 100644 --- a/contrib/elftoolchain/readelf/readelf.c +++ b/contrib/elftoolchain/readelf/readelf.c @@ -4938,8 +4938,10 @@ dump_dwarf_line(struct readelf *re) return; } if (dwarf_attrval_unsigned(die, DW_AT_stmt_list, &offset, - &de) != DW_DLV_OK) + &de) != DW_DLV_OK) { + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); continue; + } length = re->dw_read(d, &offset, 4); if (length == 0xffffffff) { @@ -4950,6 +4952,7 @@ dump_dwarf_line(struct readelf *re) if (length > d->d_size - offset) { warnx("invalid .dwarf_line section"); + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); continue; } @@ -5147,9 +5150,8 @@ dump_dwarf_line(struct readelf *re) (uintmax_t) line); p++; } - - } + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); } if (ret == DW_DLV_ERROR) warnx("dwarf_next_cu_header: %s", dwarf_errmsg(de)); @@ -5192,9 +5194,9 @@ dump_dwarf_line_decoded(struct readelf *re) printf("%-37s %11s %s\n", "Filename", "Line Number", "Starting Address"); if (dwarf_srclines(die, &linebuf, &linecount, &de) != DW_DLV_OK) - continue; + goto done; if (dwarf_srcfiles(die, &srcfiles, &srccount, &de) != DW_DLV_OK) - continue; + goto done; for (i = 0; i < linecount; i++) { ln = linebuf[i]; if (dwarf_line_srcfileno(ln, &fn, &de) != DW_DLV_OK) @@ -5208,6 +5210,8 @@ dump_dwarf_line_decoded(struct readelf *re) (uintmax_t) lineaddr); } putchar('\n'); +done: + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); } } @@ -5840,7 +5844,8 @@ dump_dwarf_ranges_foreach(struct readelf *re, Dwarf_Die die, Dwarf_Addr base) Dwarf_Addr base0; Dwarf_Half attr; Dwarf_Signed attr_count, cnt; - Dwarf_Unsigned off, bytecnt; + Dwarf_Unsigned bytecnt; + Dwarf_Off off; int i, j, ret; if ((ret = dwarf_attrlist(die, &attr_list, &attr_count, &de)) != @@ -5857,11 +5862,12 @@ dump_dwarf_ranges_foreach(struct readelf *re, Dwarf_Die die, Dwarf_Addr base) } if (attr != DW_AT_ranges) continue; - if (dwarf_formudata(attr_list[i], &off, &de) != DW_DLV_OK) { - warnx("dwarf_formudata failed: %s", dwarf_errmsg(de)); + if (dwarf_global_formref(attr_list[i], &off, &de) != DW_DLV_OK) { + warnx("dwarf_global_formref failed: %s", + dwarf_errmsg(de)); continue; } - if (dwarf_get_ranges(re->dbg, (Dwarf_Off) off, &ranges, &cnt, + if (dwarf_get_ranges(re->dbg, off, &ranges, &cnt, &bytecnt, &de) != DW_DLV_OK) continue; base0 = base; @@ -5900,6 +5906,8 @@ cont_search: warnx("dwarf_siblingof: %s", dwarf_errmsg(de)); else if (ret == DW_DLV_OK) dump_dwarf_ranges_foreach(re, ret_die, base); + + dwarf_dealloc(re->dbg, die, DW_DLA_DIE); } static void @@ -6204,7 +6212,7 @@ dump_dwarf_frame_section(struct readelf *re, struct section *s, int alt) Dwarf_Small cie_version; Dwarf_Ptr fde_addr, fde_inst, cie_inst; char *cie_aug, c; - int i, eh_frame; + int i, ret, eh_frame; Dwarf_Error de; printf("\nThe section %s contains:\n\n", s->name); @@ -6219,10 +6227,13 @@ dump_dwarf_frame_section(struct readelf *re, struct section *s, int alt) } } else if (!strcmp(s->name, ".eh_frame")) { eh_frame = 1; - if (dwarf_get_fde_list_eh(re->dbg, &cie_list, &cie_count, - &fde_list, &fde_count, &de) != DW_DLV_OK) { - warnx("dwarf_get_fde_list_eh failed: %s", - dwarf_errmsg(de)); + ret = dwarf_get_fde_list_eh(re->dbg, &cie_list, &cie_count, + &fde_list, &fde_count, &de); + if (ret != DW_DLV_OK) { + if (ret == DW_DLV_ERROR) { + warnx("dwarf_get_fde_list_eh failed: %s", + dwarf_errmsg(de)); + } return; } } else From nobody Mon Mar 20 13:33:45 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0T4Bc3z40kNs; Mon, 20 Mar 2023 13:33: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 4PgG0T3kq8z3NV9; Mon, 20 Mar 2023 13:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bLz5d7h+20Vay89baq+9SqxnIZJWYfDGCBca9XZRWQY=; b=bIZR/xshVH2hscd+n4oEr32JbtsvGNeeDx1WEKsJxtiaPaSZagTi5n7ZJBliZva8y4cP0I LzjTFkYAn4yvWGwVbo6RlkSGf6pcomxD24ZQvRD+55j4qljGxamaL5elzQf5IIfGZxKVW0 bSy5JZSC/UqaIahReAm9jyElsbRKDgpqAT9juh6QemaRvdFjAYl71V1GNHw08FD0olNB3q dMvfahMB7zxTsvl1puiISVX4QKWv5neD6TU3HEb+ceK+EFlfErmy6fTMRNXcahYPNZ6+yk gw+bCVVuCwStmcNl0dfIZbkgbByguNH/f9IdSvFXPgLN7LlI2uQidurzwpEuMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bLz5d7h+20Vay89baq+9SqxnIZJWYfDGCBca9XZRWQY=; b=r1Cuo98iMCY9z1sfftuE36KwLaEtTxV84/HoqahHIkkkhjIHLwz25MB34F0cD0Z1/TJxY6 A4un+e2RDHDsWsTOYkcZ9WeYhb36U8Y7srv9B/jMOhjUZ7gWgpVenujFz2FlseouAWMaTh Bv6nm328wL39iyXdA+5k8iS/8w0BkChM5F6wj8+bOA0OrYjqfj5pp1gqUr2Y1ccsIBFQLX ZYnLZBSnwdpL8xbT/GKLFsenx81BjHCxF4hqrm+wF91jCHofJuTAITbBbvide7fiRr8f5R tylHSfDcXTK8ywNxx0tpj8AEvvqoFDnYaIkoH12Pa/SmhGukt8Why0OnSbwY6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319225; a=rsa-sha256; cv=none; b=d2XOa8N4jd/p+dXK0p3iiq/4jKjVfSUWea43xhlH8iyF0BsHccT4sfuk+H7SqeUCVHx6qd yyeFj5z2kQI9jWSYAHgV1N1uA+pXjdpnWhaGVJpgZyKccuqSkd2zb3cuxoLhBqaMkkvKvz q6iDRZeMAH3GcnfjA+SpZLNBEyFWzalXcm7dp7Na71+GSkB1lOu991D/uVVApTytuNktk1 aQBuTl40xgF2jFjSIYgLkpb2iHufu+nf/7DeuHbQhBx9mfCJqEspPsTUBsX+ycQ0v923W8 z/ct+WvwKnqNPLWfjN16JI57QFicNpuWMVYOW76DiS4lhvjHPKxvQ6+JRfyY5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0T2rqLzX4S; Mon, 20 Mar 2023 13:33:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXjZt073634; Mon, 20 Mar 2023 13:33:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXjoi073633; Mon, 20 Mar 2023 13:33:45 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:45 GMT Message-Id: <202303201333.32KDXjoi073633@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: 68b0f84a88ed - stable/13 - epair: Remove unneeded includes and sort some of the rest 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/13 X-Git-Reftype: branch X-Git-Commit: 68b0f84a88ed5c0136db1447c181e170db76c883 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=68b0f84a88ed5c0136db1447c181e170db76c883 commit 68b0f84a88ed5c0136db1447c181e170db76c883 Author: Mark Johnston AuthorDate: 2023-03-13 13:27:47 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:53:15 +0000 epair: Remove unneeded includes and sort some of the rest No functional change intended. MFC after: 1 week (cherry picked from commit 29c9b1673305406dc64161aa7b565a296526fa67) --- sys/net/if_epair.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index aebcaca0cd2f..a2bc0044f7c9 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -45,7 +45,9 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include +#include #include +#include #include #include #include @@ -59,10 +61,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include -#include #include #include From nobody Mon Mar 20 13:33:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0V4Sqtz40k0R; Mon, 20 Mar 2023 13:33: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 4PgG0V42zdz3Ntn; Mon, 20 Mar 2023 13:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2UZRj0x14mNYdMhu0/g2dSoaZKDNnpcfRKP/Ht3JqYQ=; b=ntafdvyti9+lQQUy4/goTJ7d5CS1VhvzruxbBqLl30c8xMTdrkxf52QgYFQmmUd0a9SmOE S07FHP05YYJxt2zCr62IBIE/vGXB0Zn8Ib2IaBUcZPHXplc8h/gWAVYsG09wNxBddkjptw m+eF2GmRp/KekQTGUdxZWkUbASMFx/AvssR/YSvcQevIFsnTLmghSHJ4Ei/ertpUBM4slI aBc6i012uz9SSIoPVFPiQ8GkMT6/W89/AGMvh7lYRJMSLJSCi+2Qk3Qbd4t76P5Id2Wi6j DZKC6gtmhCiN6Y8uJ3IEzhdn+1BVNu75TCoOI0eWs2mDwEZ2c07qvY1d43WatA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2UZRj0x14mNYdMhu0/g2dSoaZKDNnpcfRKP/Ht3JqYQ=; b=VEGZyXGGV4qSnsVTvXyVW2Oe7m/DRUjGielbj1t3eEtMb4dulRWZ82xwyeKscyCr9oEpUp iPSgUOimEMDjeKRVfL4LjLss+JiqhzH+9QCvfcP6NKrSAYOGlE5NbaA4upjcfR/fepIQeo /JKLp2qqxfpTPWD8iBlehFxt/7ztifkDo9Ly0PHHhYwTKC9uZuMzBYWKfjqqqIhj7C72xc +Bgq7C6bXF8u52BfYUu3P1r03Lf9cLa0GNp7+FGDo4lYsC8PDvoEltzMLLFQABfXwdmoKI 0pBLg9dhqWs7SoKJI2vL7c2MLaOTmUpKyDQK3bc8zHF+jVlaARQ+kfM2XEwscg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319226; a=rsa-sha256; cv=none; b=eLX4bdJWQ/AX4J+MaFXZ5FFDHcCEkgVllKrN8I91dPrGV45EsNL/EJJ/8yC7pYkkK1EWzI Z2VaAjnrRHSn5V61wTBMCEhoXuccWfl/dhcjNG1pDjmAm4f0FnbKKPRx7ase8cWPepSuv5 hDdusIU/MbrpC5sb6QjLU7gojO85JGPBW6Wz0Vg13rka+zNOKrPZI39x5P9f32nw8i5elX rEwKUsONNDZY9iIMDuwbX+WF1Ddf2EC9pBsNRlBnfsl7u9BKSXe98BkMGxCJJqO5MzApnh ow1UBifHVSKqK7nNNFpXdukEd83qTuDlVOH3TEb4bYy62ACXK9gqoLJPIKoWnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0V396LzXJL; Mon, 20 Mar 2023 13:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXkGQ073653; Mon, 20 Mar 2023 13:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXkCw073652; Mon, 20 Mar 2023 13:33:46 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:46 GMT Message-Id: <202303201333.32KDXkCw073652@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: a765d2100e13 - stable/13 - smr: Remove the return value from smr_wait() 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/13 X-Git-Reftype: branch X-Git-Commit: a765d2100e13cca0b58cd359c6a60dab29e07579 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a765d2100e13cca0b58cd359c6a60dab29e07579 commit a765d2100e13cca0b58cd359c6a60dab29e07579 Author: Mark Johnston AuthorDate: 2023-02-07 21:38:07 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:53:49 +0000 smr: Remove the return value from smr_wait() This is supposed to be a blocking version of smr_poll(), so there's no need for a return value. No functional change intended. MFC after: 1 week (cherry picked from commit cd133525fad197ac8cbbd4bd68860a4dd51a561f) --- sys/kern/subr_smr.c | 1 + sys/sys/smr.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_smr.c b/sys/kern/subr_smr.c index cbbf185fee79..df2520005673 100644 --- a/sys/kern/subr_smr.c +++ b/sys/kern/subr_smr.c @@ -579,6 +579,7 @@ out: */ atomic_thread_fence_acq(); + KASSERT(success || !wait, ("%s: blocking poll failed", __func__)); return (success); } diff --git a/sys/sys/smr.h b/sys/sys/smr.h index 1319e2bf465b..2b6dbeb998da 100644 --- a/sys/sys/smr.h +++ b/sys/sys/smr.h @@ -241,11 +241,11 @@ void smr_destroy(smr_t smr); /* * Blocking wait for all readers to observe 'goal'. */ -static inline bool +static inline void smr_wait(smr_t smr, smr_seq_t goal) { - return (smr_poll(smr, goal, true)); + (void)smr_poll(smr, goal, true); } /* From nobody Mon Mar 20 13:33:47 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0X0H13z40kJC; Mon, 20 Mar 2023 13:33: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 4PgG0W5LSRz3NvN; Mon, 20 Mar 2023 13:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPyYrHUyORSC1ryD9rD3jdkPnRm/rc2TyDN+qUPLOgo=; b=aQ884Hlt7ZpL5kcbzsuWJhs7EwQh7NW5R+24vZgAT2CwygVtLtyGO79hCHyZuHKb+lrGHB fXYolpZPQN2e2WxdMPIU8QMiT4rF3zYnVLUa1KS3SXazqXKUeASsKjS65t+ezOV7ZliV0S qKNrO4DdUBtXy1Uouig5pzbi8z0VS/fh1SFk0UwUeT1sHEMg1HP53sMsgfwwREzY7VyKTs TH+LisbA900z3NIPQ9eRQi/HNtRieoEg6Ls7I6TyttHXxPOaT9dY3n0BNCmQLlWxCLMdRu ZwJoYeR0tVrvKM6+khWqDDaf9g6QG/+79hX2Y0wi9TPWd0cJY9ybGF58wPlePg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TPyYrHUyORSC1ryD9rD3jdkPnRm/rc2TyDN+qUPLOgo=; b=eInz3PkNX8lZT5y27CJVzPMZqnh8ttmbtRAX++CPYbunbC7NzeW+Jy8ZvswMojHhVYEkaz 6wD9Nb03ik90DGOKVATPVI87rsLj+TCoRr4AOOYU18BcQxErr6XbQkBbMUJecEZWiIbynl 62RSMORUUc0BF+I1kIa8UPaOJa7E/FghE4pMKOySq803VAyfJUTIay9y7m7/lBypo14Eoc HO0eab4FMd/t8JcazKAkEbsOK+XKZP+RVeMtae2CmAGxhNtM1Z2alz57Qwr+kDOXSgLzum Zpcgbl15Q9HX9OT1v5xs1WvtWJFEmImZukQaGvqvKY6IkcTdMjJo8HXhoX9MoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319227; a=rsa-sha256; cv=none; b=KZ3/9g5rZI3CGl9PHecJn9/OG1TsnOPSv+5fHabx0C/F8izpyx3N84BMpri3XJ7a5S7siA ZKQcDqg94e7lQuRtkd/omsASQ7ZvQWMjFFwDHpoYXgALVZ2LPi8Y4EP/8LYQZ0E39Bo8xk SYcjFvrbvcD/NaHcDHQQtKAXVu3OkIszbu6ar4s5HX5ukpdSANIJFJm3AC8r71NAfJ4aXU vGRSLa4HnXfM4a2Otiwmuuf8GS3mKsq6kPDOgjGtSlhXn/uV+esP0gFsUEkwpJkXzAdrNz 4gfYEUgysVmqhhUQXeStvBPY6RariBuPaN0LII/4sgM31hD7FUWHEl4UKjvYyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0W4QG8zX27; Mon, 20 Mar 2023 13:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXl9k073678; Mon, 20 Mar 2023 13:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXlcS073677; Mon, 20 Mar 2023 13:33:47 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:47 GMT Message-Id: <202303201333.32KDXlcS073677@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: fbe570ccc0d7 - stable/13 - sendfile tests: Mount filesystems under the test workdir 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/13 X-Git-Reftype: branch X-Git-Commit: fbe570ccc0d739b8da2804468070edd1247b9bb2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fbe570ccc0d739b8da2804468070edd1247b9bb2 commit fbe570ccc0d739b8da2804468070edd1247b9bb2 Author: Mark Johnston AuthorDate: 2023-03-12 18:50:14 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 12:58:23 +0000 sendfile tests: Mount filesystems under the test workdir Otherwise they can't be run in parallel as they share a mount point. MFC after: 1 week (cherry picked from commit 683853a92477a18f19b29d6bd8dd71ebe5553f89) --- tests/sys/kern/sendfile_test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/sys/kern/sendfile_test.sh b/tests/sys/kern/sendfile_test.sh index 2efda9310396..0bc575a4aaf4 100755 --- a/tests/sys/kern/sendfile_test.sh +++ b/tests/sys/kern/sendfile_test.sh @@ -37,7 +37,7 @@ # MD_DEVS="md.devs" -MNT=/mnt +MNT=mnt FILE=$MNT/file HELPER="$(atf_get_srcdir)/sendfile_helper" BSIZE=4096 @@ -122,10 +122,11 @@ common_body_setup() { us=$1 + atf_check mkdir $MNT atf_check -o ignore -e ignore newfs -b $BSIZE -U -j /dev/${us} atf_check mount /dev/${us} $MNT atf_check -e ignore dd if=/dev/zero of=$FILE bs=1m count=1 - atf_check umount /mnt + atf_check umount $MNT load_gnop atf_check gnop create /dev/${us} From nobody Mon Mar 20 13:33:48 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgG0Y09d9z40jwx; Mon, 20 Mar 2023 13:33: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 4PgG0X6Gjvz3P5l; Mon, 20 Mar 2023 13:33:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QvOR2636CzVYQ84J0toHQqlsp7HdIzH1PA3F4HXTJws=; b=J1qMxBTCzkRb7Z8oLwvJ4vVQ7u3n4YuQ8IGxmnp/+86Vg6OgqDW44O/N2UxxzoW5Tacom7 p5trAvoCgfwfUDVu8uQOsr3qo6fW8X7tyxyAbbZ+7GXHCvriGKzaEMuMWs/7fzb11WdZPU 8EO22yflJJgMP/N/0F/vGHy2XVUriKyLkgdUBcYxjYQJgGb7vgHH7yK9Yu/2KTHCt/5ujY eIK2BdlKCGApkR4dpR+YqQmCjTLejk60IJwr5pllkw2iPRR7R0Z1AO+bTNX39+9jv0rRNC 8c82WxSIvhm4L4c1i1UGSnt9bq+113khPhKfvoL4Vmx4ugTUehOILbhnymz6dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679319228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QvOR2636CzVYQ84J0toHQqlsp7HdIzH1PA3F4HXTJws=; b=eB3poN90VkrMhGj5O/n+tnqemFH8nqOTQ+xzu9Kjj2ydgvoxPQ3IvmzEDmxcqnzuD4ocq3 Y7PUvd6gnHM75jSY2x2zZ6wqBNDUlq+zNQjIKeTqzTWaRiE9T+/v/SkneGcWQv2sMleEvn MHzeZfaxA1ogu7NMO8RdStY/Ax1JcTsyxsp3Vsf2v0Wy7Ldy62637PQvjnfwZKRU5BBJl/ PqbgLb8zXT329rQI5j9BFmeIIhU+rqFtoz5yJpVe8w0g0pBZ7fFK7DBM7y7PX6uZ/H0G5H DlQwTbZa04LeXSIGZKtDxd+D089eNC3Bv0MnUld5aV8+jNFYz1+o51oIlICC1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679319228; a=rsa-sha256; cv=none; b=xiNGwao3jgps46BSipN4QOEwptZq6tXBkaFH3zYhSWnuP+crhCYJqalnxYtUiZPxKyonvd CH+1/fMmn8H1y9e8wJs+xoLa2RE8y3VoOn3ljH3FPb6FL6soHwePIU2c/aBGZWf5RiK9Hh IR7EjJuWPc9eQexGRFReZWQHD29vdpA+nySUpSNgX7QwOMQnjudgvs3krOro6XHhLSvMFb Q0lY76Ltgja1SACE4PLODFZ0OpoO/y0TDF7e8yEWluwstyRfX8bWIpGBeAPFCepLYfVtSQ sT+JZzvsbd1Jw1y6qiFT6ZwehrZgkjJmUDZegRUoFNadNKQbK8JaVN2yqm/cvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgG0X5P4DzXJM; Mon, 20 Mar 2023 13:33:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32KDXmFf073697; Mon, 20 Mar 2023 13:33:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32KDXmnB073696; Mon, 20 Mar 2023 13:33:48 GMT (envelope-from git) Date: Mon, 20 Mar 2023 13:33:48 GMT Message-Id: <202303201333.32KDXmnB073696@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: 795fda214f11 - stable/13 - netinet: Tighten checks for unspecified source addresses 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/13 X-Git-Reftype: branch X-Git-Commit: 795fda214f11ebb58b335fd064f736708df6b3ff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=795fda214f11ebb58b335fd064f736708df6b3ff commit 795fda214f11ebb58b335fd064f736708df6b3ff Author: Mark Johnston AuthorDate: 2023-03-06 20:06:00 +0000 Commit: Mark Johnston CommitDate: 2023-03-20 13:00:56 +0000 netinet: Tighten checks for unspecified source addresses The assertions added in commit b0ccf53f2455 ("inpcb: Assert against wildcard addrs in in_pcblookup_hash_locked()") revealed that protocol layers may pass the unspecified address to in_pcblookup(). Add some checks to filter out such packets before we attempt an inpcb lookup: - Disallow the use of an unspecified source address in in_pcbladdr() and in6_pcbladdr(). - Disallow IP packets with an unspecified destination address. - Disallow TCP packets with an unspecified source address, and add an assertion to verify the comment claiming that the case of an unspecified destination address is handled by the IP layer. Reported by: syzbot+9ca890fb84e984e82df2@syzkaller.appspotmail.com Reported by: syzbot+ae873c71d3c71d5f41cb@syzkaller.appspotmail.com Reported by: syzbot+e3e689aba1d442905067@syzkaller.appspotmail.com Reviewed by: glebius, melifaro MFC after: 2 weeks Sponsored by: Klara, Inc. Sponsored by: Modirum MDPay Differential Revision: https://reviews.freebsd.org/D38570 (cherry picked from commit 713264f6b8bc5f927dd52cf8ffcccfa397034fec) --- sys/netinet/in_pcb.c | 2 ++ sys/netinet/ip_input.c | 5 +++++ sys/netinet/tcp_input.c | 8 ++++++++ sys/netinet6/in6_pcb.c | 2 ++ 4 files changed, 17 insertions(+) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 55fa795457cb..d10bd9b32e89 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1338,6 +1338,8 @@ in_pcbladdr(struct inpcb *inp, struct in_addr *faddr, struct in_addr *laddr, } done: + if (error == 0 && laddr->s_addr == INADDR_ANY) + return (EHOSTUNREACH); return (error); } diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 750ddfc3a46f..2cfd3c544c72 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -515,6 +515,11 @@ ip_input(struct mbuf *m) goto bad; } } + /* The unspecified address can appear only as a src address - RFC1122 */ + if (__predict_false(ntohl(ip->ip_dst.s_addr) == INADDR_ANY)) { + IPSTAT_INC(ips_badaddr); + goto bad; + } if (m->m_pkthdr.csum_flags & CSUM_IP_CHECKED) { sum = !(m->m_pkthdr.csum_flags & CSUM_IP_VALID); diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 1c2fe014c7f3..9bc9923530e0 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -715,6 +715,8 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) * Note that packets with unspecified IPv6 destination is * already dropped in ip6_input. */ + KASSERT(!IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_dst), + ("%s: unspecified destination v6 address", __func__)); if (IN6_IS_ADDR_UNSPECIFIED(&ip6->ip6_src)) { /* XXX stat */ goto drop; @@ -783,6 +785,12 @@ tcp_input_with_port(struct mbuf **mp, int *offp, int proto, uint16_t port) TCPSTAT_INC(tcps_rcvbadsum); goto drop; } + KASSERT(ip->ip_dst.s_addr != INADDR_ANY, + ("%s: unspecified destination v4 address", __func__)); + if (__predict_false(ip->ip_src.s_addr == INADDR_ANY)) { + /* XXX stat */ + goto drop; + } } #endif /* INET */ diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 02fd3dff2ad7..ab04d402cf96 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -376,6 +376,8 @@ in6_pcbladdr(struct inpcb *inp, struct sockaddr_in6 *sin6, NET_EPOCH_EXIT(et); if (error) return (error); + if (IN6_IS_ADDR_UNSPECIFIED(&in6a)) + return (EHOSTUNREACH); /* * Do not update this earlier, in case we return with an error. From nobody Tue Mar 21 06:08:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pgh4X3ckDz40r4S; Tue, 21 Mar 2023 06:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pgh4X24Pcz3Q4r; Tue, 21 Mar 2023 06:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679378924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaayGjbmoC+D3koPBb+dsnTQVUexcI6e1AoAvzwJtTE=; b=pXvVc4RyAblc/OlREBheSBWDaLVeb1nKOh4sM7i/uSB6L5ZREl+hV7k0E3l18qILyJED9r VY0xgLF7TPCYxKqgAsFx9/SStd32ziA/gqyKDZBG3Lc/QfBTVJE/Ob+WGV4LsN3WBTL5bu QgeiVB4o3ohtcxRS+4F5uUsuUJxndD6ZsD1oTyA7awBgv6chhdOvQoOspL3c/k1kZN2Yv2 Ch5s0Ptp3ahbfTkOU8gHQtgX5fcDuCAxff03UHc6mGIp2cwokKoWVc8y5f+VYkTm+7sPFq /lmKZuneOQd+t1U4xGbVxaMAIFhYs7utCCVMs7q0KGj1orM7cBq5Zs3h9m0HZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679378924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UaayGjbmoC+D3koPBb+dsnTQVUexcI6e1AoAvzwJtTE=; b=uqpKB/4JKSGrdrwAOutagv1G51F7mF+YEx4eK0DhZXGpoABFsfms2ii+/8lGFWRZlqO9YW ZVEjyZ4lbXI1dXGsnY31TyOFJMf+g8FoVLekJJg9+Axx221usAdOi3PRHTioQ8He6Sjf3k 4Kt6QFJLTOj5dP7Z2dsLsamrEMQ5rhrJNqo0+m8nKlYQVHG4QmymxgzEWY67i4wPyA9Hn8 b69F+zFOEUz+iusHg1ZPyNGwNbpdVGaytXDGUyopmxkRXdxGM7E+n/4uay15TGJ5cg2YVA j5Rl5lWY4HE6BiHCEbkmGzw1bdKKVoCK0WhVN8iC/MiwEw18SbVDw3WPcjsfbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679378924; a=rsa-sha256; cv=none; b=b51GPhwfcQJT3w6mnL17qGcLgCKFoaGL+37mhNmlVCwyqTkgxK8H3KHVPq3Hy2FTV7FzvR PUaK1W5eEFQbsYfBZfZqvHxiLsG48eiw0TMD25DdQvVxcnI+R74kHprcjoU9wJXpFpnnXv uEgyuWf5uGTmovjmv0aADkeJ25x6o7YpAxlOm78pVFhmFF3MducDEoo7WadeRKJD4xrhHd HEph7XAbhsqKy84V7OGVHl20R0XNlYzSt2ntiM5gG8BOt8X4JrcKVHoJXJ25q0GXSEpeO6 kzgKSZHqF0BL6Plfj52ARGDxj9pPdWeVFoZntoY58T6+8VmeGMlO/TWALgt8pA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pgh4X18cZz11Db; Tue, 21 Mar 2023 06:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32L68i9a003206; Tue, 21 Mar 2023 06:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32L68i9m003205; Tue, 21 Mar 2023 06:08:44 GMT (envelope-from git) Date: Tue, 21 Mar 2023 06:08:44 GMT Message-Id: <202303210608.32L68i9m003205@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: 854424168f8e - stable/13 - smbfs.5: Us .An -nosplit for the AUTHORS section 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: 854424168f8e939894aa5fcffeec5201c4265542 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=854424168f8e939894aa5fcffeec5201c4265542 commit 854424168f8e939894aa5fcffeec5201c4265542 Author: Gordon Bergling AuthorDate: 2023-03-18 09:02:59 +0000 Commit: Gordon Bergling CommitDate: 2023-03-21 06:08:30 +0000 smbfs.5: Us .An -nosplit for the AUTHORS section Use .An -nosplit for the AUTHORS section, so that it renders without an unnecessary newline. No .Dd bump since it isn't a content change. (cherry picked from commit ac6bc808f51654414cb7a72f6849b3e61b1fb172) --- share/man/man5/smbfs.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/smbfs.5 b/share/man/man5/smbfs.5 index 79eaa9b20b39..7db97df14c1f 100644 --- a/share/man/man5/smbfs.5 +++ b/share/man/man5/smbfs.5 @@ -64,7 +64,6 @@ Users are advised to evaluate the .Pa sysutils/fusefs-smbnetfs port instead. .Ef -.Pp .Sh SEE ALSO .Xr smbutil 1 , .Xr mount_smbfs 8 @@ -90,6 +89,7 @@ The device driver first appeared in .Fx 4.4 . .Sh AUTHORS +.An -nosplit The .Nm device driver was written by From nobody Tue Mar 21 06:09:04 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pgh4x2DDZz40qn1; Tue, 21 Mar 2023 06:09: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 4Pgh4x0PK2z3Qd7; Tue, 21 Mar 2023 06:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679378945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=39Y0AM7850KZEwQXfA/quWQLFOjXxLFC56XskO4mIS8=; b=iUlmuENu0bFCv/RpT9AJkv+5be/PBp6Dok85dVoO4SVgUxKX/FTZXhRaAfbGmkFkMCNkef H/jFqV7sLivziz2mzz+lj9JOkdVjelCrHzlRMCHABlOKT1AOIRV0NVTQqRBpbGSB0wOhIt F2FZsEtTyOcdPJdDHx/WQ1BShAPzOoLDPOT+ddoSE7OlUdRX697F5fzwfVITsSyT56UJIq xZLnEk364S2vX+m+737CaHlh6vPrWro0kG2UYouOCMDtY41FGD5OEtr//HbwxZeidLDnls MHmHG+czzuGvCLfkDJd3AIGg4X6FKwJf9eMA98XQZxktTgcg7D4+w8eBxWGF7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679378945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=39Y0AM7850KZEwQXfA/quWQLFOjXxLFC56XskO4mIS8=; b=uGyjc1xWvbSrOPZjJra3jo3qn3uiFNE6KvQJvOstKWkPGTAPsjiYbh4Y3rOY9OZt5EvLEp jMJ9Q1WM7hDos1sCUHVP++mnkQvUkovPlgz6XHv8+/PrIDvVQF+dpFvTQuvOEyoVG4Mhjg 4X/Wyzj8Y4qx8Xg4bNLH/wohvnaGbMD1kfhaDJZYZkBdI/vvKV7Yx3RqftnJVqCKpRUCxs UtbZEvbOx6ZTaALL7HFa1d1Z0cS3qP3iRCy9ZGTxRa6R3PvqliHYW//wYsjDUWWxt3w9zH rv3OjmkncdxvCez4pUw326BI5RCh/nWbzgrme7LaEYw3su8kQ+oTvTVL4BTxog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679378945; a=rsa-sha256; cv=none; b=HnrNSkjN3ovfhW7kFtr5dNtrg5Z8rcLxkktJpIhPYZA+zugiYAADFKneNCcN3QfegfEmCu VaHGjgtBJfkkMFzthuthKX/3eiQJhxFbPr4UOjArvTUt9GojnxdiMRjnpf/aS8uQoUHuIe edkaDF2BHTRyr9NCMNsvK+mGc7E1DF62cAd+XE7ksyw7WfkRaWCqINX9lESZiZ0kVVwpu/ xrVt0y9Y0W+HJ4GMrEHimEGvBpp8VbwOiBaygRA+4cNS3rd5EHB9XnccN4h85pKweCuHgl 8xPuzisb0dB3K6J25I/UTMogW5SKrX087creL9Dlf5Li65wPGqIp1+EDMmd0Iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pgh4w6b3Tz11SW; Tue, 21 Mar 2023 06:09:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32L694uo003355; Tue, 21 Mar 2023 06:09:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32L694ul003353; Tue, 21 Mar 2023 06:09:04 GMT (envelope-from git) Date: Tue, 21 Mar 2023 06:09:04 GMT Message-Id: <202303210609.32L694ul003353@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: 7812b9ef0dc1 - stable/12 - smbfs.5: Us .An -nosplit for the AUTHORS section List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 7812b9ef0dc15118a4df78336982cfb67d59f49a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=7812b9ef0dc15118a4df78336982cfb67d59f49a commit 7812b9ef0dc15118a4df78336982cfb67d59f49a Author: Gordon Bergling AuthorDate: 2023-03-18 09:02:59 +0000 Commit: Gordon Bergling CommitDate: 2023-03-21 06:08:54 +0000 smbfs.5: Us .An -nosplit for the AUTHORS section Use .An -nosplit for the AUTHORS section, so that it renders without an unnecessary newline. No .Dd bump since it isn't a content change. (cherry picked from commit ac6bc808f51654414cb7a72f6849b3e61b1fb172) --- share/man/man5/smbfs.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man5/smbfs.5 b/share/man/man5/smbfs.5 index 79eaa9b20b39..7db97df14c1f 100644 --- a/share/man/man5/smbfs.5 +++ b/share/man/man5/smbfs.5 @@ -64,7 +64,6 @@ Users are advised to evaluate the .Pa sysutils/fusefs-smbnetfs port instead. .Ef -.Pp .Sh SEE ALSO .Xr smbutil 1 , .Xr mount_smbfs 8 @@ -90,6 +89,7 @@ The device driver first appeared in .Fx 4.4 . .Sh AUTHORS +.An -nosplit The .Nm device driver was written by From nobody Tue Mar 21 13:23:15 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pgsjw071Rz40K0h; Tue, 21 Mar 2023 13:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pgsjv6lJfz4NWR; Tue, 21 Mar 2023 13:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679404995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4jX2N6RspPFNy3D7Umj/X+YkbY6WXbpsKMJg9CMXbLM=; b=OZ1Wvxnpaogd7pvAU65kJkGju8EjYhOghCQpO+/uzjRQ3ZO0M7X+0kItajjzjcToWNa0Mc lYzRtG+5P6b/18o9lRD4nrcXu0KCSDs5/nfMFeZGyy5ImqFVpMFFB6po3dJt/aAWUJMet2 FBJancO8G/wRLko3Iq7SXRETU9m2IomftwqqWDygA49YIMBbRMQD908ETqyTKJj8vbmA0x ku9jYjqobOjf1sZUHvF9CAz7z9RsexApnDsIdx5ZooEDO6hy5hpmN0cimPrdftDxi/h63s 0Y1btgPq6JYp74rmA7o/zPZM0vE/WtyMBkD9+hRyoznjTde39lhRyg6jkz2b1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679404995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4jX2N6RspPFNy3D7Umj/X+YkbY6WXbpsKMJg9CMXbLM=; b=vdQm8vTRn+z+ZxlNtmSUsP9T8t9sr8Tj4REmxrpZnrIhTcoxXA7g7/VDRkMy34RS58ZJI6 DrByypv2ICsUABvRxKj/T23+P6/cL2x5QZV17mqfcch6pSPb/rEutgHpd4ae0YhsEuUYFH pxpoVu50OHUJsFlj6a6tIrj0W4CwlE6zbDOJ7JoRGGNaICN7Er0Cn7RLqbhPL56YSmjuFY 2hmIErWAX0do0sJPS51F9SSCuBiKMuJRRH9tpMc9mzDgVphGNfBdVboiW2Q7Lo1Q0d7nK5 /lbuiWxBPxvhErkECRtrXNYL00X0z+7+OCwzjp6JGDTXaQY2/S6mWbjh3CxQ4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679404995; a=rsa-sha256; cv=none; b=sSvAg/9mVrHBuRbf8XSpzU8KltOSZP36oSVIP5sBk9k+wp7WoBsj5Q3Yq+sAWfWuRIgv7A tAC47OO7RksjGNMFkfz5R4YPQfPNDr0Pek1SKGezDOsxH+Mcs9ZwM3KY8P7Z0TAA7zA3Tb upmkOkfBqASXqWcMNRTV7/2E4pGfQA/i9vNLCIwSWXZUPPmS9LTm7JinHN3TLUut13+FB9 LNsoZSa6gz/fKn4J9JTqq1IAt0SppuMSZ9gD3UQNuur1etqs0KTqrLILcbqojFaytjC8IX kQZcjMsIB5VZgx1iS6eCKnTNHLkOL4Vi1vOjakzcLzNNVHQpYAkqSOGMnzL3PA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pgsjv5phxz1CTP; Tue, 21 Mar 2023 13:23:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LDNFFh027772; Tue, 21 Mar 2023 13:23:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LDNFd9027771; Tue, 21 Mar 2023 13:23:15 GMT (envelope-from git) Date: Tue, 21 Mar 2023 13:23:15 GMT Message-Id: <202303211323.32LDNFd9027771@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: 2438e9b17075 - releng/13.2 - amd64 acpi_wakeup.c: fix typo 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 2438e9b170757f65c4425171839a5b543dfa8ed5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2438e9b170757f65c4425171839a5b543dfa8ed5 commit 2438e9b170757f65c4425171839a5b543dfa8ed5 Author: Konstantin Belousov AuthorDate: 2023-03-17 12:42:26 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-20 18:12:53 +0000 amd64 acpi_wakeup.c: fix typo Approved by: re (gjb) (cherry picked from commit ff6d60946a0e9e0ade3045b734ed4bea08e20938) (cherry picked from commit 107004380c895d7ccd438eaf98941f92b4aa54b9) --- sys/amd64/acpica/acpi_wakeup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 0f04ccb6f2fc..9601a88e11a4 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -250,7 +250,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state) ia32_pause(); } else { /* - * Re-initialize console hardware as soon as possibe. + * Re-initialize console hardware as soon as possible. * No console output (e.g. printf) is allowed before * this point. */ From nobody Tue Mar 21 13:23:16 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pgsjx1pYvz40JZv; Tue, 21 Mar 2023 13:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pgsjx1L9Sz4NZD; Tue, 21 Mar 2023 13:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679404997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48Vr8Bk3lpDG2jPa3NwEAcTqbPK75470ASvUXg0zkHU=; b=SY9M2OWaZWHw81goGiAcccr19fYiXDe3NUR/P2mYRBslM2lkxg+pYANgN4y4OYmz3iJYa/ tI6EaLtWIpUnL627xPgr2PhqA41cZ0OrLRH/i0mgz5oZv+Icauy1KG14DwM31hyRzQLcEz /UD+3t54pJbitcWyxfQC5gRn9yWn/e5ctZ87IotEAuglj574qucL/5Xwv579DsHQCTQE2F 82wivdTdThBSS8FL4c+g3BylhLPmQw2i3ThM7gEspFkIhTrk9uA4YXrkWV7z1wPpPZnrUu o4S0Qk4R1/QT1urbLeuEiX5G9lM+3jpar4aQI/SvTEXdIJbPbs4mjjwuKCwwpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679404997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=48Vr8Bk3lpDG2jPa3NwEAcTqbPK75470ASvUXg0zkHU=; b=NJU2BTLNre9Vk9aKcURQF36RlrBGt9BBq2jNZmxRuAKBqsKoLcJEOr1dIDukHb0u1dZ820 1rsAELrmFrJc8RDgwO3kWyV5c8SqMDs+LyBBKUOCWkm2H6C55HOMMuZUS147K4T4mPPYBi qA7wE2M3tLYK3HM5jMHoEqxEYTe6UPsqcrwDtLaKAg0QS1Pg8Yl3X54AS+BfNhqTTUE2LL 4AXtuvUjtcX146+jFgYHpyoFKnjYie6nejwY/g4yjOp/iIXlK7mRHqbXUIqv2QUGL8rENo UErE93kBDBFjprIf3byWM0Y33AzE9mxcPShGMa5/ENxGr2JI/ECib+X6Wn4f+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679404997; a=rsa-sha256; cv=none; b=iSr16y56QUvDj3JEqfSqaE9qq8wcz5QbTIvxHU4NlxvPkSn2j1SHDC+6zzAL55wztkrjRt Ohfhq7uOlzt8jWpk0pexxfq3gcW5bDO9phHbCxkqqXugH18k60zrFv3mscdinFtvK3j4I+ dSkDNo4Hxs5K6xFuiBLbdVTxl0pNSmSqvnpDYciuRCc3JIW6hlG2IOHWFc373NN8gXQ2zn wWf3J8cUIheivKomOCbUAovtl8edKQPJy9pZuc+y0Li9BnKVJw3+GJO6XTAc/1UEoUh/d4 LigxuLik3Odbbrs+J4Nyalx3UzIerIqG7FZ38QpFO6os28JWcCdf1DfJ0k7fUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pgsjx032vz1CWB; Tue, 21 Mar 2023 13:23:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LDNG9x027793; Tue, 21 Mar 2023 13:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LDNGmb027790; Tue, 21 Mar 2023 13:23:16 GMT (envelope-from git) Date: Tue, 21 Mar 2023 13:23:16 GMT Message-Id: <202303211323.32LDNGmb027790@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: 7622d3671cbe - releng/13.2 - amd64: properly recalculate mitigations knobs after resume 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 7622d3671cbef860d5dede0e4beace8fd152cd87 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7622d3671cbef860d5dede0e4beace8fd152cd87 commit 7622d3671cbef860d5dede0e4beace8fd152cd87 Author: Konstantin Belousov AuthorDate: 2023-03-17 13:02:03 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-20 18:13:02 +0000 amd64: properly recalculate mitigations knobs after resume Approved by: re (gjb) (cherry picked from commit 02904a06c76be857307b78184863654b9e7b88ab) (cherry picked from commit 7c5d3ec4c02b89754ec3ce55d1b7943c404209df) --- sys/amd64/acpica/acpi_wakeup.c | 14 ++++++++++++++ sys/amd64/amd64/initcpu.c | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 9601a88e11a4..1afbdc3a3bec 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -288,6 +288,20 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, if (!CPU_EMPTY(&suspcpus)) resume_cpus(suspcpus); #endif + + /* + * Re-read cpu_stdext_feature3, which was zeroed-out + * in acpi_sleep_machdep, after the microcode was + * reloaded. Then recalculate the active mitigations + * knobs that depend on the microcode and + * cpu_stdext_feature3. + */ + identify_cpu_ext_features(); + hw_ibrs_recalculate(true); + hw_ssb_recalculate(true); + amd64_syscall_ret_flush_l1d_recalc(); + x86_rngds_mitg_recalculate(true); + mca_resume(); if (vmm_resume_p != NULL) vmm_resume_p(); diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 16780a9e069b..8d4c9d9cbe64 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -313,7 +313,7 @@ initializecpu(void) } load_cr4(cr4); /* Reload cpu ext features to reflect cr4 changes */ - if (IS_BSP()) + if (IS_BSP() && cold) identify_cpu_ext_features(); if (IS_BSP() && (amd_feature & AMDID_NX) != 0) { msr = rdmsr(MSR_EFER) | EFER_NXE; From nobody Tue Mar 21 13:23:18 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pgsjy4q2yz40K0m; Tue, 21 Mar 2023 13:23: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 4Pgsjy44swz4Ns3; Tue, 21 Mar 2023 13:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679404998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmrfYDSAHM2sTKx3fJhYj0f9OlPgW+U1KrxF3u5udNU=; b=EuHjiwJRx15/Kx72788fA4YExrYw/fr4qTHHV4D+rp4MOYBxQbrAGP2kihYioAQd2sBlhd U+sBJoaUgvKwx2eN/vUQe9gxURA0ahuBoAJf5GSqsYd9W35+QWo3B+04CDF4nktbcdcb8r 5+PDtL8MFPt40Bs3O3AAJAktj6T1V5tLoZdPod0G2iXzw28XeuF9S5JJhU0P4rw8+6XyGc 7ng0SADNhdeDu7H4XCx2B0VTLtdWZavkqz25FXDbPfIUPrvVsLX0vW1cEhGgLm+OgfYgY7 Bf1bgcG3BZowAvH8zH6CfgHHM6a5//ChApEkz/FkZZheu5ySluPJg5FArwDAfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679404998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmrfYDSAHM2sTKx3fJhYj0f9OlPgW+U1KrxF3u5udNU=; b=XKJM/PZDQ+Kuaf5iiKBOp+0s9OYTzssVEEaRl9s75/5F8zYsRnecU4g+6z/gILdaNkPMMh wW1GvnzCTnvq8SMbvwnz3J9Lx3pqt+ISQvFa1KAydGnfBxX5amqyxVuT0ueGhV1YrqWHc1 sdibDhrcj+yCLvkNq0rrfzh8tDW1xBlZkHSX4KC0KVRZ149HjmzYQ4/MtN7YIzDKCeCrd8 uZeZWJ2O10YWZDHQFEypRnAW27EjKY+A4HfRzkLKDzBDUvuDobIfYSce0fv4zQsB/8Go2j oOg0uFdfuo+v178+nTNQ5pWuFfPOQmAwPf3FwNKqYCwb68llQLNiZlqE3TqRfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679404998; a=rsa-sha256; cv=none; b=OaW7yiJ9RELK16W6uSfMl/Sd2q8+6rgQ+wWmUNnVL7BOg3pmN5eHI9KShHvF6U9URiKuZw w0C6BJfGvTYQORz63H3WOE5AorRUay8+JzWWH6TxBksx/3GN7iJQ6ziqaybsHGKbEapRsx Asznh8ceGLkcjF4wahDjSMbwEW3d8E7UqyNkkLUo/g0DZWHecVFodJbbSKB6vOXOLwdvM5 zX+eFiaZwLCU4rhGpE46pKbY5G6LTGCjbsvNJQBtAnRTJcEFilRYenYk0hQalHe1YMUz+E aw/PBkY3wjaXCIvfgVmIiofFsupibNQSztrg6jY6JVmZtN2oIQMDDxrhkwNQGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pgsjy33lrz1Cvn; Tue, 21 Mar 2023 13:23:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LDNIOD027826; Tue, 21 Mar 2023 13:23:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LDNIB2027825; Tue, 21 Mar 2023 13:23:18 GMT (envelope-from git) Date: Tue, 21 Mar 2023 13:23:18 GMT Message-Id: <202303211323.32LDNIB2027825@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: 87b5b46ce892 - releng/13.2 - acpi_wakeup.c: apply the reviewer' editorial corrections to the comment text. 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 87b5b46ce89259e3b4307f076860796b91a41690 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87b5b46ce89259e3b4307f076860796b91a41690 commit 87b5b46ce89259e3b4307f076860796b91a41690 Author: Konstantin Belousov AuthorDate: 2023-03-18 15:45:49 +0000 Commit: Konstantin Belousov CommitDate: 2023-03-20 18:13:10 +0000 acpi_wakeup.c: apply the reviewer' editorial corrections to the comment text. Approved by: re (gjb) (cherry picked from commit 2b4b3789f877918e9e89a217d3b25d854d1a2267) (cherry picked from commit 38cefd30516e0c27194b822cb7db5a7d92e780cd) --- sys/amd64/acpica/acpi_wakeup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c index 1afbdc3a3bec..3df4457550d6 100644 --- a/sys/amd64/acpica/acpi_wakeup.c +++ b/sys/amd64/acpica/acpi_wakeup.c @@ -291,8 +291,8 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result, /* * Re-read cpu_stdext_feature3, which was zeroed-out - * in acpi_sleep_machdep, after the microcode was - * reloaded. Then recalculate the active mitigations + * in acpi_sleep_machdep(), after the microcode was + * reloaded. Then recalculate the active mitigation * knobs that depend on the microcode and * cpu_stdext_feature3. */ From nobody Tue Mar 21 15:59:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgxBF09Dxz40Snk; Tue, 21 Mar 2023 15:59: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 4PgxBD6klHz3kgT; Tue, 21 Mar 2023 15:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679414372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XvT1ZNyODxrKZeVr5NQFu4Y+RiwfphSVFXP6UrdmjcU=; b=V6IO7CHKikS3qxzD71TEaBqS5Sg7r/3fwsyoEOr8lBG+q/uHQi2UgtqXAW/CuJk3A0XRuf 0ld7WcHI/NWStTQQ/saYb53POM8JHiSBzi5zXezBLlKgD8oiSSR3+Hyw0Aw99jpPRz4TBE N+R291ZO+Zd+JFoxFojARXV8o+kGCrDbPK9vUhdopNR9k215MS231taApG6dvMvvKtvwuj nfkOTkktRvOXVe5magfwWz8W4IGZGK7c+/K7gT7E1W6jJExd0SoFz2h2fSHY0+357EGwhA fUWQtJxAZgAhebQdjOoMuRp2rQTyHYcRGX2kJiDVs0i/y+TvPsk2TmXD357STw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679414372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XvT1ZNyODxrKZeVr5NQFu4Y+RiwfphSVFXP6UrdmjcU=; b=kl45K0g3eDRRd3pzudI0ZU4u1z6SFnvUvAdTvn9yctBbvMQzuVwHbQxR7atZpUtT2EOHlH uPhVwGjGol7nMdHwjx8sAE6oo5tozP1sdHFUd1y+gaemyYrSylX4eZEAyZ7uUa3dc6y80j KdnS2yTvAn2e9mLl7TYk6H+RuZy9PMYeOwlik4FkNyLul9ooZDd3xGrCKpcEa/TtwgouKK 61lPMdQ7M6PsVuiUyvPaOdHf2t+fM4T+OIj792ykk5tOmcgXN/JsE5Gkt14Z1AkYEK8x3l 7p/Hxf0YFUN4pkwb6ee90v7cr+HOz2c1yZ/6v+z382VvZnroeC6f9VuXAaC3Hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679414372; a=rsa-sha256; cv=none; b=B/GjNVYAwN2P24haP+dd5e7XA1hvhQ6/hRDHz5jciOor9WMUgfXn2l+xqPyRfLyRGUVtvp qXbxAFXCBUS7iMC1iVvwO5xhzyM3Qe8HFgTFAH12ol76OzoEKeGf61294A0c05ipJQ7iae TYTwPRC9QvM8G8NtD+TEsxjlev1OFn9p2+WhW7C6P4FxiLjuzYm/F5ulO7dMsPfiOLqs/Q zSVttdwAoKuqn4rstJqOt08JQ8rUgAjlPE0hP2sTZUhz7LUKy+4pKxMXHlcPUpS/RyUJy0 1KrgNLM5dc99TjaZuuzGDv4EauJMylfaC4qTJkT2IdTvluEE0IJjJy5/osgNcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgxBD5nYJzHxX; Tue, 21 Mar 2023 15:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LFxWpK075405; Tue, 21 Mar 2023 15:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LFxWHe075404; Tue, 21 Mar 2023 15:59:32 GMT (envelope-from git) Date: Tue, 21 Mar 2023 15:59:32 GMT Message-Id: <202303211559.32LFxWHe075404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 27e1fad46a82 - stable/13 - CI: update QEMU command line to avoid deprecated option format List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 27e1fad46a82b1888d69f32655e7599e09a31807 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=27e1fad46a82b1888d69f32655e7599e09a31807 commit 27e1fad46a82b1888d69f32655e7599e09a31807 Author: Ed Maste AuthorDate: 2023-03-07 16:38:01 +0000 Commit: Ed Maste CommitDate: 2023-03-21 15:58:40 +0000 CI: update QEMU command line to avoid deprecated option format > warning: short-form boolean option 'readonly' deprecated > Please use readonly=on instead Sponsored by: The FreeBSD Foundation (cherry picked from commit a2de35e1a460126b99f63b6cdc3759157cc15860) --- tools/boot/ci-qemu-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/boot/ci-qemu-test.sh b/tools/boot/ci-qemu-test.sh index b730e9725014..9548c6a1289e 100755 --- a/tools/boot/ci-qemu-test.sh +++ b/tools/boot/ci-qemu-test.sh @@ -85,7 +85,7 @@ amd64) if [ ! -r "${OVMF}" ]; then die "Cannot read UEFI firmware file ${OVMF}" fi - QEMU="qemu-system-x86_64 -drive if=pflash,format=raw,readonly,file=${OVMF}" + QEMU="qemu-system-x86_64 -drive if=pflash,format=raw,readonly=on,file=${OVMF}" EFIBOOT=BOOTx64.EFI ROOTDEV=ada0s1 ;; From nobody Tue Mar 21 15:59:33 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgxBG1HmKz40T2c; Tue, 21 Mar 2023 15:59: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 4PgxBG0dBNz3kdT; Tue, 21 Mar 2023 15:59:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679414374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gDk/342zaQuwvTvUAoixpbhA3Ns3PRBkF3uKNiJbs84=; b=H2ikYlMAYUgSPsLVRrlukKwuhXZP+kFU42XitEabOYBOUZKQbudpsneVm5jv/Fn/Rd1GIe a51XbzuwFSHtkjdJOD6G1jBnkZhz7rFhgJpfoA75aCf6HYITnSAkirioNnc2+P40cSrJgd ZyAUnuuGSEBQnGUtviYAcPsrJDOCFBoZnhrUP/ynwN7jQouIqSUeZBY5WzfdLmd8HjnqMQ WJYxAfa+7cl/xC9/m4S1ny4UjBGwDmlbqqjWv+NkQjsSr0LoGVmRcQLFf/66t5Q398ilAq 15EWlvUpVAUecUVf9hmTGszP+120dw2qjw6KQDmXdy9aQdC6UHZw3/39DzWECg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679414374; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gDk/342zaQuwvTvUAoixpbhA3Ns3PRBkF3uKNiJbs84=; b=T5U3942+OaC/5KKfgVn7XQg1w/VvnQdbP3i8F24w0IZ0rJujV7Yd+I1ZaTc0uiD7HHQa8c yfjzdtorDOre7zNY7FbimuGbl1J65G4EDJdG2Zo4cqhNTcjRH8c/mPmulx/2H88GWZpczx oSLNyEkiFF6WhFkc13kNT0/s46d9r9ccIxtw+48H0D46AO2TFQ/0qQ2iray74mPtvFn3lj aC6kommP7OOW1VqCo3fLKfTgdA8eGVw9pTTapj1TVyRM4bXlL/hzfuMseD/pf7BnGfba48 1L/6SdjeDiLwWS3PsFA0tSXRo8jB9jaL4vbU5m1hMCjPAOsvIDrlaePhrRk5RA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679414374; a=rsa-sha256; cv=none; b=vPD5c9Wb7KazgfMsPa81Wnwv/LMh3QHNnJtJybKvoBtTyk1sfFT4B10l6gF6oAbXcgVmMS U6NSLh0+yQVpPES1wLQcmjsJAik9G3uQE+W/DTe77QxfnIHM9bjsbgU+YT1GPVXhFhDAUt P8Th3choX0mQanbpoAVLMIkm1fW8ZbEtH52vFR3KkBBjzQeEzUvz5lh/Wb/aPNsJb6J79o +vXmdSB+dYhG4envI88MpTPfXwoRUiQxeT3j8eOAKNHPG9ZEHX9g7H53xX00n01apBsgvL MLYs3G3U66ulvyJpQNZnSLwGHSeajD7yY2BD5CkpCxbj1pn99Z49r49CxqbeGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgxBF6j1FzHtY; Tue, 21 Mar 2023 15:59:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LFxXox075430; Tue, 21 Mar 2023 15:59:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LFxXbg075429; Tue, 21 Mar 2023 15:59:33 GMT (envelope-from git) Date: Tue, 21 Mar 2023 15:59:33 GMT Message-Id: <202303211559.32LFxXbg075429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: a16159aa2e33 - stable/13 - makefs: do not call brelse if bread returns an error List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a16159aa2e3358c9c89242627558707faf8f499f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a16159aa2e3358c9c89242627558707faf8f499f commit a16159aa2e3358c9c89242627558707faf8f499f Author: Ed Maste AuthorDate: 2023-03-13 20:51:51 +0000 Commit: Ed Maste CommitDate: 2023-03-21 15:58:40 +0000 makefs: do not call brelse if bread returns an error If bread returns an error there is no bp to brelse. One of these changes was taken from NetBSD commit 0a62dad69f62 ("This works well enough to populate..."), the rest were found by looking for the same pattern. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39069 (cherry picked from commit bc33c99234a676c41cde63cce389dd6b8b70adfc) --- usr.sbin/makefs/ffs/ffs_alloc.c | 2 -- usr.sbin/makefs/msdos/msdosfs_lookup.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/usr.sbin/makefs/ffs/ffs_alloc.c b/usr.sbin/makefs/ffs/ffs_alloc.c index b5fbb4111685..69cba0454b5f 100644 --- a/usr.sbin/makefs/ffs/ffs_alloc.c +++ b/usr.sbin/makefs/ffs/ffs_alloc.c @@ -305,7 +305,6 @@ ffs_alloccg(struct inode *ip, int cg, daddr_t bpref, int size) error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize, NULL, &bp); if (error) { - brelse(bp); return (0); } cgp = (struct cg *)bp->b_data; @@ -449,7 +448,6 @@ ffs_blkfree(struct inode *ip, daddr_t bno, long size) error = bread(ip->i_devvp, fsbtodb(fs, cgtod(fs, cg)), (int)fs->fs_cgsize, NULL, &bp); if (error) { - brelse(bp); return; } cgp = (struct cg *)bp->b_data; diff --git a/usr.sbin/makefs/msdos/msdosfs_lookup.c b/usr.sbin/makefs/msdos/msdosfs_lookup.c index dd6acb7ee37c..cebaad69e7d4 100644 --- a/usr.sbin/makefs/msdos/msdosfs_lookup.c +++ b/usr.sbin/makefs/msdos/msdosfs_lookup.c @@ -126,7 +126,6 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp, if (dirclust != MSDOSFSROOT) diroffset &= pmp->pm_crbomask; if ((error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp)) != 0) { - brelse(bp); return error; } ndep = bptoep(pmp, bp, ddep->de_fndoffset); @@ -158,7 +157,6 @@ createde(struct denode *dep, struct denode *ddep, struct denode **depp, error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return error; } ndep = bptoep(pmp, bp, ddep->de_fndoffset); @@ -213,7 +211,6 @@ readep(struct msdosfsmount *pmp, u_long dirclust, u_long diroffset, blsize = de_bn2off(pmp, pmp->pm_rootdirsize) & pmp->pm_crbomask; bn = detobn(pmp, dirclust, diroffset); if ((error = bread(pmp->pm_devvp, bn, blsize, NOCRED, bpp)) != 0) { - brelse(*bpp); *bpp = NULL; return (error); } @@ -273,7 +270,6 @@ uniqdosname(struct denode *dep, struct componentname *cnp, u_char *cp) } error = bread(pmp->pm_devvp, bn, blsize, NOCRED, &bp); if (error) { - brelse(bp); return error; } for (dentp = (struct direntry *)bp->b_data; From nobody Tue Mar 21 15:59:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgxBH1s8dz40T2d; Tue, 21 Mar 2023 15:59: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 4PgxBH1N18z3kxv; Tue, 21 Mar 2023 15:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679414375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DL3F7cjF5zka9ebkoW2AfkN05sLsZw8gZW6dHkLj4Ho=; b=bvxU7IpKJXgOpbjMLrDViJFoI7+NLCv1itTz/6VUg+Qug9iyppGdKEku34wZGa380Boqjg 2SXKKeNQUEI2LS27D2PzyOg7vVeVKmYExNU4W8L2VP2ELh+IzJYaT/UEDdikKfLI+WBShw mVXbhnhPWJbZtf6PjXl8j28AW75TiF3Qc17MQSAfDc4TS6fVKcCEXC9gP1b3kUowH/zQiW RmIHgMdKLClqIcSxn8RUr6L2w6AQeYIrV9+JYfhMTRsFeiyHU8CEYUPLA5ajdY8dolaM/G yBeB+BUMvZsV4gKsyV69ZZDvEBi6B5g08n/nZU8QTkN9rQXQEGtAEk62YzCduw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679414375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DL3F7cjF5zka9ebkoW2AfkN05sLsZw8gZW6dHkLj4Ho=; b=mo2S8Gr/FX6Vgml4CG4JcdYm0Qloq8EdAYRic36jlNQE+E1+Z585Idk5uZ6g+8GJSH13q/ JF73xuhR3HXhDO0AJBMGmO6sa5nYOmjboDnLlp7oRFoaV0aE5p/56lRBzMOOuNyXSj6Gnq tDpZcjt1JWoE/eCfOhVPwLoKUpIQmbGQiqWA7jHocT6T9PP/tvnMmAkPIL1n0YmOTCiF59 wY9lumBmHem5FkRvgcppITvywkhMR9vDQfRknY/0O7IzCCB2n1x6hiXDNnZZFXETffOatT jmQ3CYOzJ/RtXNjZ/6/GA2vx9ezYNpmOQDJc37Ooghc5ZE0zBHVt/qDhpnNDMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679414375; a=rsa-sha256; cv=none; b=QrPSXGUO5FZwTC1qkH6zszcpe3ca+IpJrXwcNw4J5SyhLIb+sHBv/JGtbAWmxEZqRq0tTn cVxXSEMXPSYzaai82CY2wJ445t91F/gpQDyYD7NE6OGXDJPM9KQ/uhiz70qXcpCmsMTzMi QGnIgHCasiFx888Hv7Cg11WHs9sw2ZUeyw55tREZFRGxccF6gGVOcXEhuq+R8Bghr0Bs1R zfWw/zXfmZkmHHq2s/6+BSPA7IsrYMET0m693lyccUrKc2TDfVXPjbznEjfEnIQPCBvleP aPFtpdi9wM54QjbG1gXGtfcbUV5VWsrvVLhVclC0yRY+0xULnTw3kUPsTn1dDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgxBH0VHLzJHK; Tue, 21 Mar 2023 15:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LFxYsu075450; Tue, 21 Mar 2023 15:59:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LFxYZZ075449; Tue, 21 Mar 2023 15:59:34 GMT (envelope-from git) Date: Tue, 21 Mar 2023 15:59:34 GMT Message-Id: <202303211559.32LFxYZZ075449@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: df5bb849a6e8 - stable/13 - Reserve u2f group for FIDO/U2F key support (SSH, etc.) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: df5bb849a6e80a287597fd08587a84e34257e726 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=df5bb849a6e80a287597fd08587a84e34257e726 commit df5bb849a6e80a287597fd08587a84e34257e726 Author: Ed Maste AuthorDate: 2022-02-18 18:13:20 +0000 Commit: Ed Maste CommitDate: 2023-03-21 15:59:07 +0000 Reserve u2f group for FIDO/U2F key support (SSH, etc.) We have FIDO/U2F support in the base system now, so reserve a group ID for it (maching the security/u2f-devd port). Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34341 (cherry picked from commit d0f1f38202c4176af277185a3b973098bb03fe6d) --- etc/group | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/group b/etc/group index 2a24f55303ca..4a8bc078e9b6 100644 --- a/etc/group +++ b/etc/group @@ -31,6 +31,7 @@ dialer:*:68: network:*:69: audit:*:77: www:*:80: +u2f:*:116: ntpd:*:123: _ypldap:*:160: hast:*:845: From nobody Wed Mar 22 06:29:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhJV04435z3yv2y; Wed, 22 Mar 2023 06:29: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 4PhJV03D0Tz3wr0; Wed, 22 Mar 2023 06:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NHnCu/mXVR4Eh+SAj7glCRaHLup9IkUOxwoVmuevBe0=; b=VkIl+GUGCI+yyy08qdvLlrPD4flHHG7EP/dHszMTSPkveCSfSdyNFkEuosCOD3SgdgtKQd nXzZhBB+a1w6enmxSVm3iRAoCbAL94v767vv78ZGN+n0pqlsa8VIJlKLGQSsgEsD0/VSso IovRVg6O2yHg00R2hSU+WFgafz4GN94x5zDc7wnMwXhNIfaW2vOhqsM5hcFXADuNyQLZXp hWniroJ3KP31Pg51mxuYxuVjPv0C5v6X5+vBnKsv3Jag6I1K/k0BVXm3cF4VztoVf8ys1A M/8izB1YqBGSQm3HlQkdaJK9YqcCPzJmQ1YnPY+xpwjS8OJns2mSUVfkzXe19g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NHnCu/mXVR4Eh+SAj7glCRaHLup9IkUOxwoVmuevBe0=; b=QCx5cBWpXjpchKtM+BJssgmI8shpyQk2a8XdyKFv6irCLKreeXvaKHBv8ZFln7zYsu/kSc yUjUDB1Vb8U1PwWN8kp5JtHAqHljOu4bvuLim6HPFi5jmW+ZOoUeByCzSK9SDrkCCVtDoI T9qo5Qqy6cOd6LqaNRH7iJpEwRSLPWidI794Orv1t5sGZBC18toLLwRnQj9jMCs1gGRin2 V7+dc9s9qbKMg/gyDrgWmNX7Dy6NK3XNV2i19HbZzERKRs0+sUwBargUz2yy5zAEtk6rn0 Rt7mQQujziCHYN52cZ80qlYgB/Otuyk+2huShG0YahsrOa93IvBxlWCUCRx2MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679466568; a=rsa-sha256; cv=none; b=A4+Cxbx2EZZzZbtMYdCLOMEQ8rGtdEbkqRpy/U0kGz4NQApcfPZR6+OiQEQ4lF593rxZtM pBr7rfjNb04HM8LxDaX4GY8c4HEq7SSu9snHXWqkEkHMa4W3XciIjtY9IFHQ7SVnfzJP38 ofbrCiQv8V5CvyabR/ZmrDCbPQpywVVJKQ9VlOefqkiL108/1EU9HJHAh8TzCkIgzV/FoI xcgx/wD1aRilNFFhx2urJsKy8ZXJ8u6Ulvl8a2rEifnFuV5sYcainln7cKY+chGG43X1Sx x5OlPDfQdP7WCV3IGbmMreg+HS9MUU9KO8Xnv4YCOfqOCGROnKUnFBoXUvMtJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhJV02Dqkzk36; Wed, 22 Mar 2023 06:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32M6TSWb024544; Wed, 22 Mar 2023 06:29:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32M6TS48024543; Wed, 22 Mar 2023 06:29:28 GMT (envelope-from git) Date: Wed, 22 Mar 2023 06:29:28 GMT Message-Id: <202303220629.32M6TS48024543@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: bdc4a7238254 - stable/13 - tcp_rack.4: Correct a link in the SEE ALSO section 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: bdc4a723825430d801b6811e70fba3c34c95022d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=bdc4a723825430d801b6811e70fba3c34c95022d commit bdc4a723825430d801b6811e70fba3c34c95022d Author: Gordon Bergling AuthorDate: 2023-03-19 08:49:33 +0000 Commit: Gordon Bergling CommitDate: 2023-03-22 06:29:02 +0000 tcp_rack.4: Correct a link in the SEE ALSO section The PDF at arxiv.org is only accessible when retrieving it via the website. (cherry picked from commit d37cca6570e9b42fae46ed9ae3a5af5d065f4440) --- share/man/man4/tcp_rack.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index ce424ae73045..cfdedb9901b8 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 November 7, 2022 +.Dd March 19, 2023 .Dt TCP_RACK 4 .Os .Sh NAME @@ -140,7 +140,7 @@ What method should we use for rate sampling 0=high, 1=low .%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" +.%O "https://arxiv.org/abs/2102.07477" .%D "February 2021" .Re .Sh HISTORY From nobody Wed Mar 22 06:33:13 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhJZK2SQWz3yvXw; Wed, 22 Mar 2023 06:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhJZK1vd6z3xr6; Wed, 22 Mar 2023 06:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aZyLD1WZXMDjg/6tf/ZNX2cG3Zw1lwnCaDKrEtDjr8=; b=HWdLUtpuBYhOlmY5gwHfhsEhZoDOgDAiQVZSCdm7xYuLH7VYfvH+tiru80Es3svCs566KU AoGXsZ5FyOQpzGdOekJE9J76wd5Imm+cg2yRQXf82/N4T0pSRpM+qb5OeqbFUQvdbCcy+6 rT+AcSeqP7UDPPjDx+NuDSOnawpbDGq0yMIkzVczhClGfuk/fcvnV8paGo9UlqqA8yItc6 OByLMSpkU5QkLI8TScTdNYEag0h9bQrq4KQBqPqSDSwQqLAQwFSoYXX4JqFaX1zJUklZH3 zOGffbB+Haldx41vbCWMcHwuRtKu8BFHiaHUE04Wi7HEZrx7gOsMnzbR3aJj5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3aZyLD1WZXMDjg/6tf/ZNX2cG3Zw1lwnCaDKrEtDjr8=; b=q9kOZe1oGUBaYd6B92cmTmsQXrWBMEC0b52F7oAwXHZZVP8vxmD8UnwiZShdKpGL9nLvAB IzpPVJdyj2IlV8LI623CqHMPJETQ5Pz44uyOIXWVpNrZCz3aciUGUIPxM49vu//NvsYAfZ oI7kEWE417nSVm2Kflb7xS/8XrRIxx/SfUwxok/T6w4mz2fRR/0oKbOHiQXF4nCiF77YiJ +HFc9FpLojUzdp9bCtOEkd9uyKHUJO6o/M0gG3ICz+DrvbheGtlNF9n2VYjsCZoeABQYm6 BTOvl4I6avwjrH1MgYbLtZQx5BFTIHxP8KqLHQwiYv+TS9Z3oI6/YAsF2pEhng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679466793; a=rsa-sha256; cv=none; b=Xhy1PKRQuzMqz+If31W8nhMrAV6tUoCHhWuNr5sKlOz5dxBRGeoyzZungLpRpTp3ySHj+s dKwYGs0FnCPsw5lq05WWJJZxBtqtD9Ki/MfHpng2N4ckLniUo5KK6GnFwRdK5tTV238kqF stI+MjZYp5LndcNVBZvBd1eFSKvzQhb5Uk+lpyHE2RtwFJx8qVl0pE917IRJGySoWDmUL9 k8h4rsDtRDPsYUYSP2QWLDPhPol1Ybv1GyG7VYXkeuh5Oq+bS3l9xbi8tG8lpCh8v719Mx SSkSjwjtzvucHUHGINTgTLgxWp/47Wo7MVLR8Gl+7QB2dVhaEn0ZUC5I22KkoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhJZK0xBMzk5d; Wed, 22 Mar 2023 06:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32M6XDGn039767; Wed, 22 Mar 2023 06:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32M6XDID039766; Wed, 22 Mar 2023 06:33:13 GMT (envelope-from git) Date: Wed, 22 Mar 2023 06:33:13 GMT Message-Id: <202303220633.32M6XDID039766@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: 33e13e4c921b - releng/13.2 - FFS/UFS snapshots: improve documentation. 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 33e13e4c921be81280c33e9baa8a2c7699776538 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=33e13e4c921be81280c33e9baa8a2c7699776538 commit 33e13e4c921be81280c33e9baa8a2c7699776538 Author: Kirk McKusick AuthorDate: 2023-03-06 05:37:23 +0000 Commit: Gordon Bergling CommitDate: 2023-03-22 06:32:29 +0000 FFS/UFS snapshots: improve documentation. This update provides a more detailed description of FFS/UFS snapshots and adds links to useful man pages. Requested by: Graham Perrin Submitted by: darius-dons.net.au Reviewed by: Ravi Pokala PR: 266358 Differential Revision: https://reviews.freebsd.org/D38817 Approved by: re (gjb) (cherry picked from commit 528d8e55c8d338e78fa4e6c9f182e8975f75199a) --- sbin/mksnap_ffs/mksnap_ffs.8 | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8 index 201014522721..658502cffdcb 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.8 +++ b/sbin/mksnap_ffs/mksnap_ffs.8 @@ -32,9 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" -.Dd October 3, 2016 +.Dd March 5, 2023 .Dt MKSNAP_FFS 8 .Os .Sh NAME @@ -48,6 +46,18 @@ The .Nm utility creates a snapshot named .Ar snapshot_name . +This name is a path in the file system being snapshotted. +Typically this is under the +.Pa .snap +directory in the root of the file system, but it can +be anywhere. +Snapshots can be listed using the +.Xr snapinfo 8 +command. +.Pp +After a snapshot is taken it appears as a file. +The file is the size of the file system from which it was taken. +It can be moved, renamed or deleted (which removes the snapshot). .Pp The group ownership of the file is set to .Dq Li operator ; @@ -62,15 +72,22 @@ Create a snapshot of .Pa /usr/home file system and mount the snapshot elsewhere: .Bd -literal -offset indent -mksnap_ffs /usr/home/snapshot -mdconfig -a -t vnode -o readonly -f /usr/home/snapshot +mksnap_ffs /usr/home/.snap/snap1 +mdconfig -a -t vnode -o readonly -f /usr/home/.snap/snap1 mount -o ro /dev/md0 /mnt/ .Ed +.Pp +Delete a snapshot: +.Bd -literal -offset indent +rm /usr/home/.snap/snap1 +.Ed .Sh SEE ALSO +.Xr rm 1 , .Xr chmod 2 , .Xr chown 8 , .Xr mdconfig 8 , -.Xr mount 8 +.Xr mount 8 , +.Xr snapinfo 8 .Sh HISTORY The .Nm From nobody Wed Mar 22 06:34:03 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhJbH2zsXz3yvY7; Wed, 22 Mar 2023 06:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhJbH2Svdz40MG; Wed, 22 Mar 2023 06:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKevTWgKTNocCHrm8TA+JaKW1m2s5R+tJpbNXLn4Y1I=; b=o0SQwghbB0+PoLKuuSN0r4xNVxytbC1WySRZWloUaCEJOz0tA5TH11GLjkmoiKCosfmXt6 vvsr/aES8hSw+ze/zMEbjsr9oIK2MuXGEJDDD2KZDza2ybaezx+mvjjQzJoCwjVwawjC4i Tll/nKSCQY2BZ7FUsqQIeuFMQapg3LAQm7EYR2jThOo8LBPyHd7j4+X8Dd+BhtXMcuIio2 8wCvS0zhKYpcz0CgOI5AAz6y5x5/ZK35qrQRpl80xsy1jyCU//SWxcTjXo8CdrJM52E/F3 tqqgLHth/FSxWOGxQw9+kqmuiHHOyn2v3rWmqRLC4ATqBzy8EivEIlrPAzN/pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466843; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rKevTWgKTNocCHrm8TA+JaKW1m2s5R+tJpbNXLn4Y1I=; b=GxLxogdspk3hTXOel+kty6sQWa/osVR7rkA+/QDrqbvXMl0rFF5n3GJENnEfvXbYo3Gn1X A7LgVYFdgm1pHtl7Lz9kH1tQ8hqBHOakilHjRnLGzb9TYEl2lbj1Llfgodn7nquJ/wTAC9 34+e5bp3vxl9YYCeHlbXEKLC2FYTT11WcJ9y5rSZ1Ufdghz2/Z2bQplrrHo22CWNXAmjgE 9bw3zjRDf9RojGPSfvu4CbWPA73FVhaNOib085Y0+orTiOcD1oa/7zSPHikky56SbDwVXa EpGruIv9NURF8xiX4hZHydpyLJfQzlA4DOvSYxB/4RDHA/YBRSM+Ym44UsIvmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679466843; a=rsa-sha256; cv=none; b=Ap2baXEJNDJ8Aa+LbSCzSjf7IH7NJ+/KMM+KIYY3jZlv1BAmBKAjam47tOhrv5Sy5CFCYd m+XmW8xYUpg6j1lGa+YfRHWqi/edO1HW/s7R7AAv5N8D09o7w56SrCUTFeU/AyBHCbZ2dW Vvbst9/Vr8LQuck/RzvycAgbRv+1DhzqxPutke/M1CyAV6y4irCncDk8Uis/zoiIIXSDUC 0uMRADrmgZik5V3bExzJ5wdfNo5/2sbsyQhT79y3JY0S6DKJHN1WrQmkUQF9eb/I4acb5I Jhfn/sQWayr21fR//ZV/7YGYXaTqI++VoWsQBTvdMp+z+XlkkSr+SSDIngQgLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhJbH1XjKzjk0; Wed, 22 Mar 2023 06:34:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32M6Y3fi040006; Wed, 22 Mar 2023 06:34:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32M6Y3Ig040005; Wed, 22 Mar 2023 06:34:03 GMT (envelope-from git) Date: Wed, 22 Mar 2023 06:34:03 GMT Message-Id: <202303220634.32M6Y3Ig040005@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: 79edbb740882 - releng/13.2 - FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 79edbb740882f1337d6d64aaa3c6f1754f6c4205 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=79edbb740882f1337d6d64aaa3c6f1754f6c4205 commit 79edbb740882f1337d6d64aaa3c6f1754f6c4205 Author: Kirk McKusick AuthorDate: 2023-03-07 05:43:32 +0000 Commit: Gordon Bergling CommitDate: 2023-03-22 06:33:26 +0000 FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. Minor clarification. Approved by: re (gjb) (cherry picked from commit 7741a5c4dc5e318dcaabf5e336dfa9cf3f3b6805) --- sbin/mksnap_ffs/mksnap_ffs.8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8 index 658502cffdcb..6274e93a4adb 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.8 +++ b/sbin/mksnap_ffs/mksnap_ffs.8 @@ -46,11 +46,11 @@ The .Nm utility creates a snapshot named .Ar snapshot_name . -This name is a path in the file system being snapshotted. +This name is a path in the file system to be snapshotted. Typically this is under the .Pa .snap directory in the root of the file system, but it can -be anywhere. +be anywhere in the filesystem being snapshotted. Snapshots can be listed using the .Xr snapinfo 8 command. From nobody Wed Mar 22 06:34:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhJc167MTz3yvw4; Wed, 22 Mar 2023 06:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhJc15c0Fz40V8; Wed, 22 Mar 2023 06:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxmMnfMwT159eZw2rK+Cr+tfSB1xMdBO6Sal5qWaVyo=; b=tYvmdRiMw3X3rJV5EES9XGZGAIO5VXRQvtCysfbWU1Q4SKiOZnW1XeInE11WqqGPS1CkZJ n6rk6yUoL8QeemfF3TndXM5wVFshkTnCzb2syGSxkqIgjhBrveAOHol4lxmplE2N6S1WkK xxOhlZk4ekvhIvhwrJ3WzCsxSjuksZv6MishRmku3yENsYjTWiWZfWmCxDBBRE5ZUQVzSx diUJNbHxTYgT+R3F+lNrcUT6OowzX3vaBISRDVrijaE0nnh6zHAHH8pm1gRFykwOlXqP1G kjb8vYgip3bU1lMzhnHszl2tDN/RJjFcaccMDn66x7slAjL1z63IzIO74t0Azw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679466881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lxmMnfMwT159eZw2rK+Cr+tfSB1xMdBO6Sal5qWaVyo=; b=yWxTteBx5G0J33olvzGIlUknfY8HL20aMz2ltAXS+ucd8l4TxuMVo1YGuXR3x8XJtjndzY jGTKIZFXRjzXKIhJwEq12nx6Z4MrqNrv/7lMhCMzOgDwUbWMTlb2dc5SeGfxxZZwCxXaWT Mc9+zurG2XdM5JDM3KMq2mu8A7WC5NRZtD36Eq+YhgBgwp3ZComBCGdUPF498euPTw2Zsa JCThcSdF5zVmg4WG0r7td44zSVyp/IQSnsCeqPMeWQpAcKSUUs/grxMUvofjvHn6RoMHKx 2zoNEE6HXHRPqzvjdxxfO0FJwE6MZc23Pl6yNFawgwQVJgSCzPT4reCkV/KbuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679466881; a=rsa-sha256; cv=none; b=NLg43Y7s8o0S7FHraVqVNLg4TWsvvR6FWK0wqt1u1mYXboURvty6aal4PFo3msDos30mqr qNIPXwbARuOghWBLGOGczeVPPDiLS9xoq4ccVL0o6BV3Gb6x43dWUPfQ64aOf/EChwcUvh /ftFMFG9Li0dcgzhhxCfzKUA1z/Uj5ntrWkktIbp4C073Tn5ndiGoDJrb8V7vFhexH24Ib lezsk7SmDPlBaYAJ3FXDRt1p9G6xInPncRbe1Dhwj5Uvz6JLsQ7lywyh7zDgtA9lGo3jXo F3XJyEnBreOmnUgEAiY2WEfXRfgj2BfZ8U0DzhLh0f4eYTIBLi4p02kjJaHbbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhJc14fTzzjrk; Wed, 22 Mar 2023 06:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32M6YfRD040201; Wed, 22 Mar 2023 06:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32M6YfGn040200; Wed, 22 Mar 2023 06:34:41 GMT (envelope-from git) Date: Wed, 22 Mar 2023 06:34:41 GMT Message-Id: <202303220634.32M6YfGn040200@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: 8295571e3f6a - releng/13.2 - FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 8295571e3f6a3de2fd0d3fcdcb9882bf73a47967 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=8295571e3f6a3de2fd0d3fcdcb9882bf73a47967 commit 8295571e3f6a3de2fd0d3fcdcb9882bf73a47967 Author: Kirk McKusick AuthorDate: 2023-03-08 06:02:07 +0000 Commit: Gordon Bergling CommitDate: 2023-03-22 06:34:15 +0000 FFS/UFS snapshots: improve documentation for removal (deletion) and unlinking. Clarification of the size of the snapshot file. Suggested by: Matteo Riondato PR: 266358 Differential Revision: https://reviews.freebsd.org/D38817 Approved by: re (gjb) (cherry picked from commit 129ea078cd16b768a1100b497282fd9359e8dfea) --- sbin/mksnap_ffs/mksnap_ffs.8 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/mksnap_ffs/mksnap_ffs.8 b/sbin/mksnap_ffs/mksnap_ffs.8 index 6274e93a4adb..2bba68150636 100644 --- a/sbin/mksnap_ffs/mksnap_ffs.8 +++ b/sbin/mksnap_ffs/mksnap_ffs.8 @@ -56,7 +56,8 @@ Snapshots can be listed using the command. .Pp After a snapshot is taken it appears as a file. -The file is the size of the file system from which it was taken. +The size of the snapshot file is equal to the size of the +file system from which it was taken. It can be moved, renamed or deleted (which removes the snapshot). .Pp The group ownership of the file is set to From nobody Wed Mar 22 13:17:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhTXg4dVXz40q6g; Wed, 22 Mar 2023 13:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhTXg441Yz4W0Y; Wed, 22 Mar 2023 13:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679491043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SYIVjr7NdqAKBxodIoUXiHpK7Nk8UaP+OLWFStUVDw=; b=bcOvDrROyp21zVw5pe3fUEXcRR295rjf0CawAoc8CarW2+u434y/xu1bTPOAlOUh/CDME4 5u/q+nQqvfTf+azWnJ3V0YoLcBGbbvK57GN5QpCM3rtm9Hhucm8MirpUHDN1Sf70rnDGkB Ph7EDub0FM3x1YBzHsn7kp8MvyxhBdAwEXzvskV81tWhGT1lFEpMGOqUoqCqBgxk8h6s58 xnWyL5txt1VShVozTNXKJJHBwpX0xT58L8snvA42qU8q1IRw3rdRHoRpxu8/Tp4/LZw89h oEGyhDjAabksTSRD4uS5LehjZWwbh7ZEfUYafwl29IqiiOpfa9U4N3IGJqPHNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679491043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1SYIVjr7NdqAKBxodIoUXiHpK7Nk8UaP+OLWFStUVDw=; b=r2otdb2XF+sV5lHfnaVbDXvUIUmjUXJrGzF2FJtqQymGLlncGIfLHym68u5xYHagj2TJv+ GlxTOzAUVDrwBUJnyEkfUs+TJl4qAEIC0wh3Mcj92YTkr/Bmey1AAF5V32fqdDViAvyxAS goc3dYZi8nnZqwAxtdCVROVceLnbrk9rq+S6fiHSDPy3H0M+1o3dON7inwoHZmwoYCAA9v Nn9ezTqs75LBzYT0/IPWfXdt+QJCKX5TKk3nX79KErA2cljQuZtUz2uROk6Tfg8WHm2S5k 6MUgSTb8mMyU3q6Bl8Sn+Gr2z/cHOcwfV1o22xDKxn+e3sSfc1942ksgywp0GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679491043; a=rsa-sha256; cv=none; b=PcJszz0MNulyI6qX7qZ1Zg439doSmn3QXdA2iNTxWxvXZ8JeG7SfIqwaTRe0GZtmbKhjB2 F5mPWrCX4QqqnnXeWYJHXEJouozYpbxBr/64+vocz1/NQEOYy7TJ7zdAAHN6mm6wxnviEk Zrf+M0sVUGo6jAviXOYssfOvEbpWKuKDMxUWtJFgHmGD9HgTdTkSWLH+MOTLpfG4+5Hy0w HU4lirSckAW2w7Sqk6cBf6Mjrp1ucBSkXC1lIyjTIThx0boRiqyOjErs/cptNZMuMvCYJS qta9NTw5rIF8JPbQ253j2CsTGikqU/Dpn7DlYt/kqansFpyQseT4nK1YLIZN8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhTXg36fgzvdh; Wed, 22 Mar 2023 13:17:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MDHNRl096640; Wed, 22 Mar 2023 13:17:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MDHN8n096639; Wed, 22 Mar 2023 13:17:23 GMT (envelope-from git) Date: Wed, 22 Mar 2023 13:17:23 GMT Message-Id: <202303221317.32MDHN8n096639@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: 2310894c1021 - stable/13 - kerneldump: Inline dump_savectx() into its callers 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/13 X-Git-Reftype: branch X-Git-Commit: 2310894c1021f49b6c3003ba215ca978eee2be75 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2310894c1021f49b6c3003ba215ca978eee2be75 commit 2310894c1021f49b6c3003ba215ca978eee2be75 Author: Mark Johnston AuthorDate: 2023-03-20 18:16:00 +0000 Commit: Mark Johnston CommitDate: 2023-03-22 13:04:19 +0000 kerneldump: Inline dump_savectx() into its callers The callers of dump_savectx() (i.e., doadump() and livedump_start()) subsequently call dumpsys()/minidumpsys(), which dump the calling thread's stack when writing the dump. If dump_savectx() gets its own stack frame, that frame might be clobbered when its caller later calls dumpsys()/minidumpsys(), making it difficult for debuggers to unwind the stack. Fix this by making dump_savectx() a macro, so that savectx() is always called directly by the function which subsequently calls dumpsys()/minidumpsys(). This fixes stack unwinding for the panicking thread from arm64 minidumps. The same happened to work on amd64, but kgdb reports the dump_savectx() calls as coming from dumpsys(), so in that case it appears to work by accident. Fixes: c9114f9f86f9 ("Add new vnode dumper to support live minidumps") Reviewed by: mhorne, jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39151 (cherry picked from commit c3179891f897d840f578a5139839fcacb587c96d) --- sys/kern/kern_shutdown.c | 15 ++------------- sys/kern/kern_vnodedumper.c | 1 + sys/sys/conf.h | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index ee6faa222206..cf9411420304 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -239,8 +239,8 @@ MTX_SYSINIT(dumper_configs, &dumpconf_list_lk, "dumper config list", MTX_DEF); static TAILQ_HEAD(dumpconflist, dumperinfo) dumper_configs = TAILQ_HEAD_INITIALIZER(dumper_configs); -/* Context information for dump-debuggers. */ -static struct pcb dumppcb; /* Registers. */ +/* Context information for dump-debuggers, saved by the dump_savectx() macro. */ +struct pcb dumppcb; /* Registers. */ lwpid_t dumptid; /* Thread ID. */ static struct cdevsw reroot_cdevsw = { @@ -381,17 +381,6 @@ print_uptime(void) printf("%lds\n", (long)ts.tv_sec); } -/* - * Set up a context that can be extracted from the dump. - */ -void -dump_savectx(void) -{ - - savectx(&dumppcb); - dumptid = curthread->td_tid; -} - int doadump(boolean_t textdump) { diff --git a/sys/kern/kern_vnodedumper.c b/sys/kern/kern_vnodedumper.c index 26154af20372..0104369b9d67 100644 --- a/sys/kern/kern_vnodedumper.c +++ b/sys/kern/kern_vnodedumper.c @@ -44,6 +44,7 @@ #include #include +#include #include static dumper_start_t vnode_dumper_start; diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 9f60dcaf62fa..b75af5a7705f 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -361,7 +361,21 @@ struct dumperinfo { extern int dumping; /* system is dumping */ -void dump_savectx(void); +/* + * Save registers for later extraction from a kernel dump. + * + * This must be inlined into the caller, which in turn must be the function that + * calls (mini)dumpsys(). Otherwise, the saved frame pointer will reference a + * stack frame that may be clobbered by subsequent function calls. + */ +#define dump_savectx() do { \ + extern struct pcb dumppcb; \ + extern lwpid_t dumptid; \ + \ + savectx(&dumppcb); \ + dumptid = curthread->td_tid; \ +} while (0) + int doadump(boolean_t); struct diocskerneldump_arg; int dumper_create(const struct dumperinfo *di_template, const char *devname, From nobody Wed Mar 22 13:47:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhVCr305Qz40s6g; Wed, 22 Mar 2023 13:47: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 4PhVCr2WJTz4YZ4; Wed, 22 Mar 2023 13:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679492872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6ILnzla/1k77aIK7Mh4G+a28IUWTvXuoPcp7Ycfuuk=; b=DIkO3/spxf+5ZZzX63uhSk4CGdiTVAWLe/yJ3d23latgSUmuIWEOXSklNGSYs+gGKMgr1U Ey9sX6AtlyK2Hh59bLYkteypl1Dzro9tnALc/3AsB8MjmSxNX+G2Ei7+hHW7SZoSmMZFHX SjGoDTZzjO453CdJ8B1ZRHbjX85ylT+dpX8fZRuNBPJ2cZw+7QawXM9RCQ4MdviGvupnv9 7GJOvwUXFojkybOvBv8Aww0ZPUOQnXumoEnbodSFziXjUBmgbjzopjDFB0MYl7mKldyKqg 5WfZWNTOJQEDnMhJfls9DZ6uZHQxc1amQ/wUG/bzqXscynr87duR5EJ/F5nppQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679492872; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X6ILnzla/1k77aIK7Mh4G+a28IUWTvXuoPcp7Ycfuuk=; b=eUWYU0GPE3aNbSYpZFnt0TZ67VRNfsTR6yLzsXRfZXYkEqBkkKZMSijm2nndEaj0yjcQhb D3/ACB/DufElRQ4CMP5RxM1lw08uL9NRqBIF4she0fvup9SJfMfd/HO0OWRB5Gh45iVcDy J7slk/0QyGJXRjWrMXY+tlh+Nu96P933Wyz35xBZPMi/ygK4LcUCkOwjr157+0H+uciByy QYpAEIT5w+3eJ0O+5LKTnFY8ULNNjN3X1VKRRZiNL8NNGV1DdBSzMJow+b0Zn6MyW2tO+y zFs/60DqW7Di902Co4wNchOJ3pKa5qKWg3aCFWg1tLNAjZ8iFbJQcHxVN1g8yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679492872; a=rsa-sha256; cv=none; b=RTKVT15AfJUkhBtoLdtpK+M1IcNdOsMX67GVmqHOAMSkUt6SLYJTZ8O3S8l8AQsY9/CuqW GG53N1lZq53U56c95NQTZTLXcWdw0tB/wo4NSK36+lTf19fMIFxfkbtCGzxApyMpwhZwPB 04yZtlpVhxfI64JqIhnD0OhU8E/NcPeGKtGlxgl4mrTyIuytAr2yvIr773C0G899avJYMf Jcfwf0mBEsCnEZZKnj/nGPmmvPUS3gbu/2t09Ckn2vGINFkK8NhkFkP0JUUZ4lQYYaKJ48 GJ+wHNoIVKDazPSi3Cpjj7LRI61jHnG+7uH8tgfCNhI1asCEEZjTVAFQ9nMkOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhVCr1Z66zw7Z; Wed, 22 Mar 2023 13:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MDlqKC045761; Wed, 22 Mar 2023 13:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MDlqdN045760; Wed, 22 Mar 2023 13:47:52 GMT (envelope-from git) Date: Wed, 22 Mar 2023 13:47:52 GMT Message-Id: <202303221347.32MDlqdN045760@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: 94c208a07f70 - releng/13.2 - kerneldump: Inline dump_savectx() into its callers 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 94c208a07f70512aa3aadcde8b3ee7f605ae6bf3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=94c208a07f70512aa3aadcde8b3ee7f605ae6bf3 commit 94c208a07f70512aa3aadcde8b3ee7f605ae6bf3 Author: Mark Johnston AuthorDate: 2023-03-20 18:16:00 +0000 Commit: Mark Johnston CommitDate: 2023-03-22 13:47:34 +0000 kerneldump: Inline dump_savectx() into its callers The callers of dump_savectx() (i.e., doadump() and livedump_start()) subsequently call dumpsys()/minidumpsys(), which dump the calling thread's stack when writing the dump. If dump_savectx() gets its own stack frame, that frame might be clobbered when its caller later calls dumpsys()/minidumpsys(), making it difficult for debuggers to unwind the stack. Fix this by making dump_savectx() a macro, so that savectx() is always called directly by the function which subsequently calls dumpsys()/minidumpsys(). This fixes stack unwinding for the panicking thread from arm64 minidumps. The same happened to work on amd64, but kgdb reports the dump_savectx() calls as coming from dumpsys(), so in that case it appears to work by accident. Approved by: re (gjb) Fixes: c9114f9f86f9 ("Add new vnode dumper to support live minidumps") Reviewed by: mhorne, jhb MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D39151 (cherry picked from commit c3179891f897d840f578a5139839fcacb587c96d) (cherry picked from commit 2310894c1021f49b6c3003ba215ca978eee2be75) --- sys/kern/kern_shutdown.c | 15 ++------------- sys/kern/kern_vnodedumper.c | 1 + sys/sys/conf.h | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c index ee6faa222206..cf9411420304 100644 --- a/sys/kern/kern_shutdown.c +++ b/sys/kern/kern_shutdown.c @@ -239,8 +239,8 @@ MTX_SYSINIT(dumper_configs, &dumpconf_list_lk, "dumper config list", MTX_DEF); static TAILQ_HEAD(dumpconflist, dumperinfo) dumper_configs = TAILQ_HEAD_INITIALIZER(dumper_configs); -/* Context information for dump-debuggers. */ -static struct pcb dumppcb; /* Registers. */ +/* Context information for dump-debuggers, saved by the dump_savectx() macro. */ +struct pcb dumppcb; /* Registers. */ lwpid_t dumptid; /* Thread ID. */ static struct cdevsw reroot_cdevsw = { @@ -381,17 +381,6 @@ print_uptime(void) printf("%lds\n", (long)ts.tv_sec); } -/* - * Set up a context that can be extracted from the dump. - */ -void -dump_savectx(void) -{ - - savectx(&dumppcb); - dumptid = curthread->td_tid; -} - int doadump(boolean_t textdump) { diff --git a/sys/kern/kern_vnodedumper.c b/sys/kern/kern_vnodedumper.c index 26154af20372..0104369b9d67 100644 --- a/sys/kern/kern_vnodedumper.c +++ b/sys/kern/kern_vnodedumper.c @@ -44,6 +44,7 @@ #include #include +#include #include static dumper_start_t vnode_dumper_start; diff --git a/sys/sys/conf.h b/sys/sys/conf.h index 9f60dcaf62fa..b75af5a7705f 100644 --- a/sys/sys/conf.h +++ b/sys/sys/conf.h @@ -361,7 +361,21 @@ struct dumperinfo { extern int dumping; /* system is dumping */ -void dump_savectx(void); +/* + * Save registers for later extraction from a kernel dump. + * + * This must be inlined into the caller, which in turn must be the function that + * calls (mini)dumpsys(). Otherwise, the saved frame pointer will reference a + * stack frame that may be clobbered by subsequent function calls. + */ +#define dump_savectx() do { \ + extern struct pcb dumppcb; \ + extern lwpid_t dumptid; \ + \ + savectx(&dumppcb); \ + dumptid = curthread->td_tid; \ +} while (0) + int doadump(boolean_t); struct diocskerneldump_arg; int dumper_create(const struct dumperinfo *di_template, const char *devname, From nobody Wed Mar 22 15:50:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhXxP0Lkqz410Jl; Wed, 22 Mar 2023 15:50: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 4PhXxN4Q3Dz3Hy0; Wed, 22 Mar 2023 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679500232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FlS4s6jKBhGuvHo1o+iY/yT0oscToNw8uI+F64J9TM=; b=xPDWlEppkbn6o8ugVvwunJ0lDrsxqy8qgJhMH/bocZT63n+voaAWwxV/OYwvFapXqwnAwG i9QavKOi4fId0Do0iMJIqUSlPXH9nkONKR7N0NY3PVAPmkdjpYMsfHfdrXddYjCyg3OeTG DW49XK/gbVR6TOOitzvnJtpRhPO+tCRdwnUQ+R/eJu/5Pjal/SO7Vz6hKS9vP8BXFn7HOM nNPBwkNSVdpgJzb/7x5XaKe32PWYLlnHJZPQOy9NP7lYh034VIt7nKjo+b3FQtXtcFqhMv gNQgTWHUvpgjJPghGaaBGY8RQ0+BYceOtU0HnaV0yx3wuuCxSvFRV6mxXRyitA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679500232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7FlS4s6jKBhGuvHo1o+iY/yT0oscToNw8uI+F64J9TM=; b=KTGCD/3J54wyvociGFCQ0vWcdPK1/7HtRwBbecaKMjXQFvHDq1LsZ7zS7QwNlDir6m8Gm9 yxs+I+BB/53nsBcwKpIAW4dbsafVd+RUCzIK0em9qoo49cBpxJ4RNiuPxLmxJZiwSPg78L FVG1PEK0USITve/2BLmEEEqJpBZkY0FHOhHIq99R6FcRvXepGm6zg+WNsMzcHaXoqby2u/ BcQJHAyHjeXyOxTwrGwz5v/M+TPYbyLshJ9gkT0hKqqBoZwNz7zr6Ifgh++AftDOWenij7 QUNaP6ONCx5SvejgYuqOUUFD50A4xeQrbFta/pSpBmp362Kj2hX5jVcx8qURxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679500232; a=rsa-sha256; cv=none; b=i/0jI2sOOmkaPpR6DS8SZ70OMdIJbN0T8AvEdHQTlGvakCEBQoetQI+N+s60wTVDsyOdSN CoY3dzcM0OEOCtUoGgKjCI7ZEKxK/M3UHSnQ1HO29fuuOBZgRIP5Xxltul7NP2C5C2IY+s 6/p2BHgqxsbg4b2rwbqEuNXPdpAezKhLFnUq3Ea4ijor5Xqr2zJvOiiW7fcTuPhzygtvsB 8NXQCN+UG5tQKt8tXWPKopzTO459ICPLOuWVfe+k16rRKdyr/z7lMonCBcAgBD/tvUrYTA LmZON8nl+ssdjJi6U2kTHP5zDCaTWWAFnMmPCSK3Iy3yCvxXVjJfqobnFS3tQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhXxN3MPLz10NH; Wed, 22 Mar 2023 15:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MFoWle051037; Wed, 22 Mar 2023 15:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MFoW26051036; Wed, 22 Mar 2023 15:50:32 GMT (envelope-from git) Date: Wed, 22 Mar 2023 15:50:32 GMT Message-Id: <202303221550.32MFoW26051036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: af28d08bda99 - releng/13.2 - carp: carp_master_down_locked() requires net epoch 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: af28d08bda99d7a841743f75d736cf677ab0ad0e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=af28d08bda99d7a841743f75d736cf677ab0ad0e commit af28d08bda99d7a841743f75d736cf677ab0ad0e Author: Zhenlei Huang AuthorDate: 2023-03-16 10:00:13 +0000 Commit: Zhenlei Huang CommitDate: 2023-03-22 15:46:43 +0000 carp: carp_master_down_locked() requires net epoch Reviewed by: kp Approved by: re (gjb) Fixes: 1d126e9b9474 carp: Widen epoch coverage MFC after: 1 day Differential Revision: https://reviews.freebsd.org/D39113 (cherry picked from commit 49cad3daf2a3abe8270f71ee5b15b8990a19529d) (cherry picked from commit c15ceae9e7f98f7e74ff7848b3aff7176c7e263a) --- sys/netinet/ip_carp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c index e84a85ebc11e..b6326b14c802 100644 --- a/sys/netinet/ip_carp.c +++ b/sys/netinet/ip_carp.c @@ -1732,6 +1732,7 @@ carp_carprcp(struct carpreq *carpr, struct carp_softc *sc, int priv) int carp_ioctl(struct ifreq *ifr, u_long cmd, struct thread *td) { + struct epoch_tracker et; struct carpreq carpr; struct ifnet *ifp; struct carp_softc *sc = NULL; @@ -1816,8 +1817,10 @@ carp_ioctl(struct ifreq *ifr, u_long cmd, struct thread *td) carp_delroute(sc); break; case MASTER: + NET_EPOCH_ENTER(et); carp_master_down_locked(sc, "user requested via ifconfig"); + NET_EPOCH_EXIT(et); break; default: break; From nobody Wed Mar 22 16:32:49 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYt92sT0z412Nk; Wed, 22 Mar 2023 16:32: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 4PhYt927Ljz3Pvw; Wed, 22 Mar 2023 16:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ikPBhxpvtMCiKzUsHLVYHhgsFN2aAMCteX8F+rrzqFc=; b=R3JSfkvIZgSbNOTWJ/4oyTP+j/MAOFWLRpqo9bV1/H53/lH3xZhxlrr72d3FSIN+Tgx/Io 7z5cWyRx/2qXQeLYsXyI3SsjnQk21IXiD9uwTDrv4ij03NFxoBIv02Yl5M5RYa3tpJ4tpp 5Hpsj0uLbigQa6H89ktMZ+8VTG9ljxevpAMXCM+SW10JEvfJqQfuJUnuIZS6+jxZKekOrd juHmPL+m312CczlQGFHmpZ1E/a+1TFrvcGmEoPMHch+VaBteIXkoFzLhyJiwAIED8jxfYd bbmiJi2VyzvegvsTDg+jD3FNnPgv2HbOoACcMKNKltfyEYvVdVHq8N7QuwoObA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ikPBhxpvtMCiKzUsHLVYHhgsFN2aAMCteX8F+rrzqFc=; b=FYDrLkvjySopPNjTMQ7yjmvI+DefxdMWBcoAHmRiEoqFvomIEV0CFgal9MwTT9CEAl6heT 5/rHskwhqMdsYV/YIdV4iIdF2O8+DfUKJuA2aInnNA9nd9S5tH0rBNSiRSIv1+84gwcR60 hZP4S3DspP/j2KlF5+gc03HJ6wBbMTSgaaoqmo5IkHElp7c9Llnsz7s9CzDXMqTtudHQAd uP/iF0m+2pRBIY43ijke8/vOerPMCa2d1cJPBczWS0YnXLgdreYdrW+JFrj7xnFimvVqw/ EL6m9/SKZE72GvtLCBBe7dT2xx7r5e1D5EYNoaMtK/z7hEnCryQR0KXFeHgXtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502769; a=rsa-sha256; cv=none; b=HoQlBw7HbgRAzfFxIhzJebJxF4vIDcVH1MnE89d4ZnTvoXN/Cu3TiWrRatUigEu0CZE8i/ XmtSWOkiylGduAmy9JLac0z2ez9lbR4LyAOUEhdzkR1z4+CtZKuEhVIFSZWd7qf3dhdoc7 f8MHvMQujoS6xFRPJ4wCTBh/2jrEZhFjOLNhjy5u8p5Vtm6gj4hUOHuDhOTi13fXKIgzcb YOMr+89MgoSBL4arFtVuMWasrPTZkpyuVz9fZq0vPuXke/T1wZF1Q9qPAWoQzp1WgWdUwV mpj5KuOYaFToXuw+aHxTGj65oT/GaNpa4sWZpTnl9mYQ6ljLxnhdcKFTkLuViA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYt91BFbz11hd; Wed, 22 Mar 2023 16:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWnnE023958; Wed, 22 Mar 2023 16:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWnGm023957; Wed, 22 Mar 2023 16:32:49 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:49 GMT Message-Id: <202303221632.32MGWnGm023957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b4e4d32d8450 - stable/13 - csu: Add missing GNU-stack annotations to note object files. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b4e4d32d845075221d9d2960d2ca9a237fe1d9c4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b4e4d32d845075221d9d2960d2ca9a237fe1d9c4 commit b4e4d32d845075221d9d2960d2ca9a237fe1d9c4 Author: John Baldwin AuthorDate: 2022-11-18 20:20:14 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:06 +0000 csu: Add missing GNU-stack annotations to note object files. ld.bfd marks the stack as executable for the crt objects due to the missing annotations which raises a fatal warning starting with version 2.39. (cherry picked from commit 74ad8d607ddbd530935524d53cc9f6f9d5517609) --- lib/csu/common/crtbrand.S | 2 ++ lib/csu/common/feature_note.S | 2 ++ lib/csu/common/ignore_init_note.S | 2 ++ 3 files changed, 6 insertions(+) diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S index bf223d84bc12..142ef56c2785 100644 --- a/lib/csu/common/crtbrand.S +++ b/lib/csu/common/crtbrand.S @@ -47,3 +47,5 @@ __FBSDID("$FreeBSD$"); 2: .p2align 2 3: .4byte __FreeBSD_version 4: + + .section .note.GNU-stack,"",%progbits diff --git a/lib/csu/common/feature_note.S b/lib/csu/common/feature_note.S index 0274ce61debc..c2a6c94d1ee2 100644 --- a/lib/csu/common/feature_note.S +++ b/lib/csu/common/feature_note.S @@ -40,3 +40,5 @@ __FBSDID("$FreeBSD$"); 2: .p2align 2 3: .4byte 0 4: + + .section .note.GNU-stack,"",%progbits diff --git a/lib/csu/common/ignore_init_note.S b/lib/csu/common/ignore_init_note.S index 804cefd47155..9026ba925891 100644 --- a/lib/csu/common/ignore_init_note.S +++ b/lib/csu/common/ignore_init_note.S @@ -41,3 +41,5 @@ __FBSDID("$FreeBSD$"); 2: .p2align 2 3: .4byte 0 4: + + .section .note.GNU-stack,"",%progbits From nobody Wed Mar 22 16:32:50 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtB3yXXz412Nr; Wed, 22 Mar 2023 16:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtB3Bgbz3QFF; Wed, 22 Mar 2023 16:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A6kLcRmNAxG6/SeSRE70lHGn0o0thS1eUsoFDYDx/9Q=; b=LgCJfykNIKRPk5qiGzBhWQDEgFMpP8Hs/nNk9HqsHlwCYhpfKlG4Cjms9s+Ja2wadilFxZ TV1ZsLX88DZR0v1oEJdjmBDkzEtCm0z4HeCPrgqyWoBkwszdM0nFCH1HNb07Y7aGjIxLdw 2eQxE0l0saVpQkjP1HqBs0Mov1NZYr1aE1mr9myKTakdGQA10DpMRWbwHfs8AHs210COjZ QXs8GkLvLmlpHDLoGdkb4zxMCJN/wNiCEtR4d7HxkQAHRcsAj9WccPm1T9p5AkKPqyPu6x ZPuV44I/IPLFHnYaenvsEuapPdeQGAoFeOh2aIJYr30oKsPnxjhK4KyvKGP/cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A6kLcRmNAxG6/SeSRE70lHGn0o0thS1eUsoFDYDx/9Q=; b=tKtMFBSPVkklLgkOzDEm/6VOBLIa39qMXnixyGVdW/9fPTaI29b9TjecigDXs/bGumwrfd uepM7JyEA1W3vCJRcf1PVc1WFsLEzJ1Qjauf3JQChpyO2zkqVSt4rPbVh6wLb08Dif22Fy 3nIQXvQrNpQ9FtW7RSY96MHvxwCbvfVCdZvJQlXIdZ8YbIFx2aX72G4MyVVm9+4NSoHYVr m7Iqh/og+fY+oRNCBiFq3EEGSR4sV9JeLgl5kWKT8esR8tW2xrQ/JR4FR/KXH3WVtPfcOl /8wFmVMGDmj9TwrL4WO7qh8LD2AjxWV5EjbcllsHqgD+vZzXUz2+6LMnCWSslQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502770; a=rsa-sha256; cv=none; b=SbZizhx1STHr/a1T2QGftei970MBYNAsRvfFzo0DqdJP0K38FWhFz1DEEQVCbJuAiUbLsT 0tmWFlbwggcLI2G+jgtj/fvHnLdG71CgzJnHSTYMahJEsUTsk+RF+zfJS1FuIHwhPynQcf zubhzBaPyO9KnGP38H+ryv9Gx24FLXSgjnSl07p+b6udWW0S/NOGDXkuCu4gB8xcGdbiAF n8uR5Msz6x+I1XQDbm62DenK/Ztn8xHosqmuSYyQ7I/Lc+b7E8sKixkXUBsaMVcYXfn/ss oPu+OT31G7RHAVzKYeNQI9bVmkMqnvbW7fH09yKdL3Ws9uSzE8WMTmj6+RKBJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtB25hSz11Y9; Wed, 22 Mar 2023 16:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWo1G023984; Wed, 22 Mar 2023 16:32:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWoMC023983; Wed, 22 Mar 2023 16:32:50 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:50 GMT Message-Id: <202303221632.32MGWoMC023983@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b5c260d1d292 - stable/13 - libcrypto padlock.so: Link with -z noexecstack for ld.bfd. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b5c260d1d2921e58cba56d5ddb55ecf6ce3d8e01 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b5c260d1d2921e58cba56d5ddb55ecf6ce3d8e01 commit b5c260d1d2921e58cba56d5ddb55ecf6ce3d8e01 Author: John Baldwin AuthorDate: 2022-11-22 16:37:04 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:06 +0000 libcrypto padlock.so: Link with -z noexecstack for ld.bfd. The assembly source files do not contain GNU-stack annotations, so ld.bfd defaults to using an executable stack. (cherry picked from commit 99df55bbb711150e7e3515f5c5a2c4d44654c278) --- secure/lib/libcrypto/engines/padlock/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/secure/lib/libcrypto/engines/padlock/Makefile b/secure/lib/libcrypto/engines/padlock/Makefile index 0dbe5bd2a390..4b67c9d58f0d 100644 --- a/secure/lib/libcrypto/engines/padlock/Makefile +++ b/secure/lib/libcrypto/engines/padlock/Makefile @@ -9,6 +9,8 @@ SRCS+= e_padlock-x86_64.S SRCS+= e_padlock-x86.S .endif +LDFLAGS.bfd+= -Wl,-znoexecstack + .include .PATH: ${SRCTOP}/sys/crypto/openssl/${MACHINE_CPUARCH} From nobody Wed Mar 22 16:32:51 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtC4f38z412hV; Wed, 22 Mar 2023 16:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtC41Jvz3QPS; Wed, 22 Mar 2023 16:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ga4QJHr6dIs+i+iJ/XYEgoxLcDhAVC3Vdlanfps2VwE=; b=nLCXEnqP5CyRZj77l33D0AFPgX6oT7dIDDuCHTiWQ6E+CvheJGMtTqyKElf+fB2FFAj0o7 bHs/YKpfuyiKJk15PYOAVEqxb0oPNxGTIB5VnVewWDVCRnWlLvqQJ1c1QPBb4QGzlRTpHi p1oxMvwbxZ3P0hu7mcCNXk2JyRbbjNiz0VnCdzDONyMFSCG/tsblgzYfDxYgXXv/sXL+1I 4aZ1LvwU03wcFYvy2id2AVUR9zfXCPXyGsLp5rzVPCxB+SSXn3dOqCS4/Kd25UM18eHnvf UkAH54fGEN5HkJADgbj3/N7n9mrp51k5iIP4wznQZG4i2WJzcWNrg/+RiIr+0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ga4QJHr6dIs+i+iJ/XYEgoxLcDhAVC3Vdlanfps2VwE=; b=o9C7KTmHq1L1YL5kVrGM3sSY7PyP/9dRsPl9vH7YcqJJYhm4jxjJvix8VFYKl8tiEn2qyo wzT0jsoOgWmFfk90bXFhoJenfc0SU9INCQEtrOAQ8X2SKDcZBF9lSuUeel0ppdSs/CsUWU bXgX2eRHRxPKOqyNuVn/e8pP58zP9vtdDnkTinki5rSAKKL2Ab3NEtxxDN5zgvOtz09VvX KCp3GUPH59x3S2a4RWEajgMmXAcvKDTGADDKQ1rXqiJ1AfLOYhk9JR0D8byofL8ZDdLYi9 uv4SabR+KJhJlZeqVUBSjXlgAAgMf5k5M/4n576QfpuwtRN00k8s+gzk7qdYlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502771; a=rsa-sha256; cv=none; b=ww/QNqbYcxsr1rUHyAjnBcduTJ1rmHyor+ObVL17T6PAR0BxXmdJvZd+PG6Hed8IsEynVw 19OirdbHOn0AyqCe4/HsslD8MwQQwduhiFUHQmeGu6jsI5o+6h6R1bxiao6+qwPQy6wce4 JR4ZFBecIr8yrOZadsfIe6b6DmbXEhHUFsyyphniwOwdTAwN2N5xI6dtjroVtTywCp34j3 Vwo5ezIwrs5o6sY3mWFSkjKCaZxpZXf43BUNBclebe6/yiGjVUC7Rsv+9WYNXxbYD0Y3bS cRFFSJi67wyzMVgQoPthrAlbHfpyhz+oAmY1GfaoUJCAcqm5MkOTUxbA0R+P9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtC329Sz11X1; Wed, 22 Mar 2023 16:32:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWpsT024005; Wed, 22 Mar 2023 16:32:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWpuo024004; Wed, 22 Mar 2023 16:32:51 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:51 GMT Message-Id: <202303221632.32MGWpuo024004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 6611fe011f79 - stable/13 - libicp: Link with -z noexecstack for ld.bfd. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6611fe011f79602cc13000e46acd7c4c76c7a08f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=6611fe011f79602cc13000e46acd7c4c76c7a08f commit 6611fe011f79602cc13000e46acd7c4c76c7a08f Author: John Baldwin AuthorDate: 2022-11-22 16:37:12 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:06 +0000 libicp: Link with -z noexecstack for ld.bfd. The assembly source files do not contain GNU-stack annotations, so ld.bfd defaults to using an executable stack. (cherry picked from commit 7e3e70ce214d042e202828b0665904840928a002) --- cddl/lib/libicp/Makefile | 2 ++ cddl/lib/libicp_rescue/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 6c0d73561818..f65d01593b12 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -94,4 +94,6 @@ CFLAGS.ghash-x86_64.S+= -DLOCORE CFLAGS.sha256_impl.S+= -DLOCORE CFLAGS.sha512_impl.S+= -DLOCORE +LDFLAGS.bfd+= -Wl,-znoexecstack + .include diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index 342afd2556cc..c5faae6aba58 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -92,4 +92,6 @@ CFLAGS.sha256_impl.S+= -DLOCORE CFLAGS.sha512_impl.S+= -DLOCORE CFLAGS.gcm.c+= -UCAN_USE_GCM_ASM +LDFLAGS.bfd+= -Wl,-znoexecstack + .include From nobody Wed Mar 22 16:32:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtF094tz412Yn; Wed, 22 Mar 2023 16:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtD4pgsz3QTg; Wed, 22 Mar 2023 16:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6VS4H6xw9lFotGLfFl56/mijmYery7I7ytQCVVsAO8=; b=upUAdBQ9wvIa6M/93y1RlfsNBSBkn0x6nMjSnhpjhOghcLNLcPDe1t2uqMSARapHinjokD xTZ6wAtsZzreG5GbavXHFnbx0XcKM7i7tZku9MZE7oOrSGJr93QcpEyRR58Rhp/nDnx+br /xOfxKp/UC9fXlZAGcmQyNo3V0rc6WcE6KEGYBH8JIpDGfi0EtYQvpPgYto/IDTHa0j2u+ nj2A4iID/Vg6Meq5BkGXsloI8l0UsKbri9q/UBkXwLZ0PF0a0/3xZOFRfgtLsj3goDTfM7 SBAh1MPbBX9u61nqJlLL16XlFS+28WGONewbOlgzRwgN6QXCqbovbkdbsvASCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6VS4H6xw9lFotGLfFl56/mijmYery7I7ytQCVVsAO8=; b=I86oacWU8RRnZj4vbxbbqIBFJ+efJx4iBeOQuJ8vi7dF2CH167b6VMM4r/+unMFxHeCUBW 4t0LWTITPmn1GDQU572y4mY2iNBkq5UrrZhtL95DJ7eYtgZoo4msdu2i5O+Qxk1Qs3TERa MPCnYsC7A7bMEBGiK05UfWoe/vbuJmCVvR8eXiYyl38PfN0BN9t/I7oDUD4ZBYCs4+yqqt OJXl1TD8KOdq1hFie+YXZBB83++sDLbmw2zFjos2103ZruWj4ePCvt7YO1Lz7Q330TPPoA TUEaPPxo7jE3tW5fBU8GUKPMZEA8CZQw2SlornyHZkjpkr6lJ+mVsAub8Q+dZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502772; a=rsa-sha256; cv=none; b=yivxN2uwHVVtmYJFFyJ4PpHEzcKHmgJAXiORzaDuqxi1ohydNRh8aWGU28mfcI6uRbFiN/ DWBShgFJtqW/ZD+UkTPFejbM9XotJrYzPrO4Zxt/f5gaUGkZU3lH3K1aSyYAdarGzkfpir 3JnmS1uWu0jKVc6EDRmt74u255T2yPmwDtHHjaK77Vv4IpgSgoCWkLrmkQwUBq6jZyhbeC veWazx32U3u7jk648Rw+RcKkrHnkBAs/a3pKH+QDFo/8QqBTeP09Mg7SkVXfvTwcxN7TeN kn+mghm+EpZemDRzmhK5i+E3Zu2q9HeH8nXwnUUZ4LV7bMzL8gjaBmKBUIk40w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtD3hFcz11X2; Wed, 22 Mar 2023 16:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWqqq024024; Wed, 22 Mar 2023 16:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWqco024023; Wed, 22 Mar 2023 16:32:52 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:52 GMT Message-Id: <202303221632.32MGWqco024023@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 3eb107dd5913 - stable/13 - Remove the MK_LIBCPLUSPLUS option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3eb107dd5913f1e114b1fc2a2ef702010cb99151 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3eb107dd5913f1e114b1fc2a2ef702010cb99151 commit 3eb107dd5913f1e114b1fc2a2ef702010cb99151 Author: Alex Richardson AuthorDate: 2021-01-30 17:56:35 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:07 +0000 Remove the MK_LIBCPLUSPLUS option This option has been equivalent to any form of C++ support since libstdc++ was removed. Therefore, replace all MK_LIBCPLUSPLUS uses with MK_CXX. Reviewed By: emaste Differential Revision: https://reviews.freebsd.org/D27974 (cherry picked from commit 5cf6f1c4bc281ac45ced086bc2e393f732f2fcc2) --- Makefile.inc1 | 8 ++++---- lib/Makefile | 2 +- lib/libproc/Makefile | 4 +--- share/man/man5/src.conf.5 | 2 -- share/mk/bsd.libnames.mk | 1 - share/mk/bsd.prog.mk | 4 ---- share/mk/src.libnames.mk | 4 ---- share/mk/src.opts.mk | 1 - tools/build/mk/OptionalObsoleteFiles.inc | 2 +- tools/build/options/WITHOUT_LIBCPLUSPLUS | 2 -- tools/build/options/WITH_LIBCPLUSPLUS | 2 -- 11 files changed, 7 insertions(+), 25 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 86f59040ac1d..23719eae7d0f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2912,7 +2912,7 @@ _prereq_libs+= lib/libssp_nonshared _startup_libs= lib/csu _startup_libs+= lib/libc _startup_libs+= lib/libc_nonshared -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" _startup_libs+= lib/libcxxrt .endif @@ -2921,7 +2921,7 @@ _startup_libs+= lib/libgcc_eh lib/libgcc_s lib/libgcc_s__L: lib/libc__L lib/libgcc_s__L: lib/libc_nonshared__L -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" lib/libcxxrt__L: lib/libgcc_s__L .endif @@ -2970,7 +2970,7 @@ gnu/lib/libdialog__L: lib/msun__L lib/ncurses/ncurses__L _prebuild_libs+= lib/libregex .endif -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" _prebuild_libs+= lib/libc++ .endif @@ -3136,7 +3136,7 @@ lib/libradius__L: lib/libmd__L lib/libproc__L: \ ${_cddl_lib_libctf:D${_cddl_lib_libctf}__L} lib/libelf__L lib/librtld_db__L lib/libutil__L -.if ${MK_CXX} != "no" && ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" lib/libproc__L: lib/libcxxrt__L .endif diff --git a/lib/Makefile b/lib/Makefile index 091bbc2a4ca8..cdebb4cea86b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -184,7 +184,7 @@ SUBDIR.${MK_STATS}+= libstats _libclang_rt= libclang_rt .endif -.if ${MK_LIBCPLUSPLUS} != "no" +.if ${MK_CXX} != "no" _libcxxrt= libcxxrt _libcplusplus= libc++ _libcplusplus+= libc++experimental diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index 7fe6dd958ebd..37d550cb22e3 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -17,10 +17,8 @@ CFLAGS+= -I${.CURDIR} .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE -.elif ${MK_LIBCPLUSPLUS} != "no" -LIBADD+= cxxrt .else -LIBADD+= supcplusplus +LIBADD+= cxxrt .endif LIBADD+= elf procstat rtld_db util z diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index b7ea2be546ab..7609a6fbbe56 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -880,8 +880,6 @@ runtime linker. .Pp This is a default setting on arm/armv6, arm/armv7, arm64/aarch64, i386/i386, mips/mips, powerpc/powerpc, riscv/riscv64 and riscv/riscv64sf. -.It Va WITHOUT_LIBCPLUSPLUS -Set to avoid building libcxxrt and libc++. .It Va WITH_LIBSOFT On armv6 only, enable soft float ABI compatibility libraries. This option is for transitioning to the new hard float ABI. diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 499bdeb66805..1342c09d190b 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -144,7 +144,6 @@ LIBSPL?= ${LIBDESTDIR}${LIBDIR_BASE}/libspl.a LIBSSL?= ${LIBDESTDIR}${LIBDIR_BASE}/libssl.a LIBSSP_NONSHARED?= ${LIBDESTDIR}${LIBDIR_BASE}/libssp_nonshared.a LIBSTATS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstats.a -LIBSTDCPLUSPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdc++.a LIBSTDTHREADS?= ${LIBDESTDIR}${LIBDIR_BASE}/libstdthreads.a LIBSYSDECODE?= ${LIBDESTDIR}${LIBDIR_BASE}/libsysdecode.a LIBTACPLUS?= ${LIBDESTDIR}${LIBDIR_BASE}/libtacplus.a diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 78fc920ec337..a55c2fd103fd 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -266,11 +266,7 @@ _EXTRADEPEND: .else echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE} .if defined(PROG_CXX) -.if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++) echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE} -.else - echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE} -.endif .endif .endif .endif # !defined(NO_EXTRADEPEND) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index d74926c7aca7..bf3eb1d3e970 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -323,11 +323,7 @@ _DP_radius= crypto _DP_rtld_db= elf procstat _DP_procstat= kvm util elf .if ${MK_CXX} == "yes" -.if ${MK_LIBCPLUSPLUS} != "no" _DP_proc= cxxrt -.else -_DP_proc= supcplusplus -.endif .endif .if ${MK_CDDL} != "no" _DP_proc+= ctf diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 76185a2bca49..403bbfb1a138 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -125,7 +125,6 @@ __DEFAULT_YES_OPTIONS = \ LDNS \ LDNS_UTILS \ LEGACY_CONSOLE \ - LIBCPLUSPLUS \ LLD \ LLD_BOOTSTRAP \ LLD_IS_LD \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index c3febff5800e..81ab89eff94f 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3665,7 +3665,7 @@ OLD_LIBS+=${DEBUG_LIB32_LIBS} . endif .endif -.if ${MK_LIBCPLUSPLUS} == no +.if ${MK_CXX} == no OLD_LIBS+=lib/libcxxrt.so.1 OLD_FILES+=usr/lib/libc++.a OLD_FILES+=usr/lib/libc++_p.a diff --git a/tools/build/options/WITHOUT_LIBCPLUSPLUS b/tools/build/options/WITHOUT_LIBCPLUSPLUS deleted file mode 100644 index 2449e30d4b10..000000000000 --- a/tools/build/options/WITHOUT_LIBCPLUSPLUS +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to avoid building libcxxrt and libc++. diff --git a/tools/build/options/WITH_LIBCPLUSPLUS b/tools/build/options/WITH_LIBCPLUSPLUS deleted file mode 100644 index 0f30dd8c1e4f..000000000000 --- a/tools/build/options/WITH_LIBCPLUSPLUS +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Set to build libcxxrt and libc++. From nobody Wed Mar 22 16:32:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtF5yFRz412hX; Wed, 22 Mar 2023 16:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtF5Vc8z3QVB; Wed, 22 Mar 2023 16:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ItHYrhWtIJbiFKJ4wxaswyRs1basMMM32EFPbh/g4qI=; b=rs3uE30uhEnJaAx1Ky6LetdIR8MYk5gc8mVM+G+FdgXQSQdktHdPUCLab7rPZTJsrcylWZ hX6cMLyO9fgbXbuV+9BLWnVuyim0GhfAtHgKtS55qhSP2lQLzFxc0A2ifm+xVfyMRyndRl sgZ0v+7xQwy3eSrbQnDIPpkcDt23aY1QLkeadu51ZWIdFML1flN8OHhu5SyGdYjueBFjMq LgRpEPVeRMqE8SiYqm0M5UWTHO/o4jFzcUWmely5tiUoIc3jfM0cvFN3VsuHu2wrJAqLk2 ukf8o5FS9mLDUTpoU/wER1VpYhfU+0DiI/66vpsVGo3oPiLrGcOcB/LgNC4QHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ItHYrhWtIJbiFKJ4wxaswyRs1basMMM32EFPbh/g4qI=; b=kK7O0w10XdsyD713uVYjOsIQm09saXBvVMCr3Ooha89ETMMn1M+GBmzlJSZ4lSyCcTlswG VG3GkxGPQg2q3O64egiQrQUKmNLO3nU/vWmPc3yVSKXtK3p80JPCUv6C6tzrX32y7No1VZ wUIO8JVdvV3JrRRxovkQLftcpVgWP4Narfse4125FfL+iJG8yXkdwvOE/mqH4zQcO/TAhJ FBv7zHKp+TRx5TBu46oA00jfpJ3m7SGY/4rQXnFzOtWp/fjFw3Y7TiMYGpdlVm7YZeEzPV EkUSnusT++4laweoTDtRB/s9C7e28Kt9rSrOTR1+xmLlFpeySOA3tfJptC7i5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502773; a=rsa-sha256; cv=none; b=R5DsgvkkXusboJBybPffoBE+yoW8GhtalDd2cIUhurvgtMP+PkYGlCRQqU2G1b4SUcvsi3 oJlOciiHFcBDeI2jESMuPH8UQChviULBQQSPT4vFrp1zJ2iJ0Pi4XuBQsKle5zV0uPFlFU m7t8oobzREOFK6cZB0NWESA9MRMdASIWHQHfKA4e/GKBwh2EIO/YUMO+QXBvMueRMNWQT8 a73O+g0dInCTucj/3FiGdGBSXw7fpNoVcCtw7YMKq9VGz/sS3LzFVEbrV8mrLHeuiK50Jy j9/p154f68fbmPZ/xjQHK3PwkL6JbTEoTjfx1TC5+0EmyJT31uwsEWo7SZte9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtF4bV1z11YB; Wed, 22 Mar 2023 16:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWr9k024044; Wed, 22 Mar 2023 16:32:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWrL6024043; Wed, 22 Mar 2023 16:32:53 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:53 GMT Message-Id: <202303221632.32MGWrL6024043@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f31f677c1d41 - stable/13 - makefs: Ignore some sign comparison warnings from GCC. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f31f677c1d418834999038a7767fb77668bccf31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f31f677c1d418834999038a7767fb77668bccf31 commit f31f677c1d418834999038a7767fb77668bccf31 Author: John Baldwin AuthorDate: 2022-11-23 18:38:29 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:07 +0000 makefs: Ignore some sign comparison warnings from GCC. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D37470 (cherry picked from commit abb9a940bb48716f8eb06980f02eec04e0921448) --- usr.sbin/makefs/ffs/Makefile.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc index a1e839fd7ab6..cff2c30b67c5 100644 --- a/usr.sbin/makefs/ffs/Makefile.inc +++ b/usr.sbin/makefs/ffs/Makefile.inc @@ -7,3 +7,5 @@ SRCS+= buf.c mkfs.c # Reach-over source from sys/ufs/ffs SRCS+= ffs_tables.c + +CWARNFLAGS.ffs_balloc.c+= -Wno-sign-compare From nobody Wed Mar 22 16:32:54 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtH0JmWz412LX; Wed, 22 Mar 2023 16:32: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 4PhYtG6gdqz3QXt; Wed, 22 Mar 2023 16:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxsS2dP7WLvRdGvCy4WnLHwAAXsdd+3l2BIWoUWuZAU=; b=DN0EUAj4y86kOeLFuPowa/n1BXQ5xVY6OgEp18HIukZb3U54ZCoQwcQOizrPCrtJYitno/ G7xrcZRmGrAf6NCN/XYuZM4ws/hs3IwGG5IFzfLJqJdx4NhoBlkTn/7I7B20tep0Wm1BVa CxlYi/UEdObHhu4cu6UxqUieN1bgtWDLXEO+PwnQlP4GHJ8XgLQz1ezUStNGfVOPQyZoI5 L00mRLgSpLlXJFXvP5X4dAwuKoWK7u8uEOdsED7XmWA7S4ZA0HBuPc00VOd7yRU7AGxSoP ohD+ZjLNx2jS5ueB4Pq2719jrF1j/9tSLKGVGXfngxUzP1UveBDwhdpBsesf8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QxsS2dP7WLvRdGvCy4WnLHwAAXsdd+3l2BIWoUWuZAU=; b=kO9h2ZEwVidZQnkH8AbdOwxmc2qGwpABpFN4O53rIAa5m3JJ4CXWnGWfG5J5UeHY2k9Gms F8WGfMPkEeV/IGuSOMD6NHZSH5RcmNlyk948DFrYTTSJ51uEF5Yfr7+dQECfA+4A3X1udt McnRuELGMCgTz+/4TbIrLlcTYAWDzexri7mveNuOVVZ5rleRyFbMr8RWX5n43TMkAxXRRq 9gsVfIYb4QwiS3tnwHJo/SU5pbhA8ygWqx4DQqwcuH69EqXV/6A2ZnQFzivG+jZziM++k7 8WPkZKKvElaTMUmkYOjE7cBLpMuTEP72KnLT8iDr9e/TXXvOHymB+PS932uImw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502774; a=rsa-sha256; cv=none; b=ZTqff/FCru/7xtBytlMwU7LnQhNKsFlzPcXOCE8Mk6QaN0RQCTVKd0qCWPQuGrUeVlKS66 D5M7JHhBkVBVMoa8i82OJOIvKPL/uIeIEwofEtH2ggCjI3HMh5834olRTu4Ijp8ONuqbxH K4PaVmdwEaHSljyRrs9+alLv9pjjZldJAaaGGBBFhnvJgp3oTF/ev8RBm+mDFfUyZsk9gj G6/Kdd73BXtE5WxIpFFDr3x63yUrIxGkuzbsN1rmIdCGrtLWbsb3fHEynhhaMePOtbyCBD 4XTwQWr3GWG/OdX53fHZSkWhlTbu1r6gSZ+4rWHkss7rBCgZaO+E3oms5rwafA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtG5XLrz11Jt; Wed, 22 Mar 2023 16:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWsld024064; Wed, 22 Mar 2023 16:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWsoq024063; Wed, 22 Mar 2023 16:32:54 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:54 GMT Message-Id: <202303221632.32MGWsoq024063@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 419f53cb21eb - stable/13 - Stop adding -Wredundant-decls to CWARNFLAGS. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 419f53cb21eba7aa22990d65e7a4656dcf8b3725 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=419f53cb21eba7aa22990d65e7a4656dcf8b3725 commit 419f53cb21eba7aa22990d65e7a4656dcf8b3725 Author: John Baldwin AuthorDate: 2022-02-07 20:47:51 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:07 +0000 Stop adding -Wredundant-decls to CWARNFLAGS. clang doesn't implement it, and Linux doesn't enforce it. As a result, new instances keep cropping up both in FreeBSD's code and in upstream sources from vendors. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D34144 (cherry picked from commit c227269e2f9dc2695d00be9e5a72b5fdeec5712a) --- share/mk/bsd.sys.mk | 3 +-- sys/conf/Makefile.powerpc | 1 - sys/conf/kern.mk | 2 +- sys/conf/kern.pre.mk | 3 +-- sys/conf/kmod.mk | 3 +-- sys/modules/ibcore/Makefile | 2 +- sys/powerpc/conf/QORIQ64 | 2 +- sys/powerpc/conf/dpaa/DPAA | 2 +- sys/powerpc/conf/dpaa/config.dpaa | 1 - 9 files changed, 7 insertions(+), 12 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 9e41fefc4fe4..25e2c9787329 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -60,7 +60,7 @@ CWARNFLAGS+= -Wcast-align .endif # !NO_WCAST_ALIGN !NO_WCAST_ALIGN.${COMPILER_TYPE} .endif # WARNS >= 4 .if ${WARNS} >= 6 -CWARNFLAGS+= -Wchar-subscripts -Wnested-externs -Wredundant-decls\ +CWARNFLAGS+= -Wchar-subscripts -Wnested-externs \ -Wold-style-definition .if !defined(NO_WMISSING_VARIABLE_DECLARATIONS) CWARNFLAGS.clang+= -Wmissing-variable-declarations @@ -172,7 +172,6 @@ CWARNFLAGS+= -Wno-error=address \ CWARNFLAGS+= -Wno-error=empty-body \ -Wno-error=maybe-uninitialized \ -Wno-error=nonnull-compare \ - -Wno-error=redundant-decls \ -Wno-error=shift-negative-value \ -Wno-error=tautological-compare \ -Wno-error=unused-const-variable diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index a933c6b42090..839fde10f9b2 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -53,7 +53,6 @@ DPAAWARNFLAGS += \ -Wno-error=enum-conversion .elif "${COMPILER_TYPE}" == "gcc" DPAAWARNFLAGS += \ - -Wno-error=redundant-decls \ -Wno-error=int-in-bool-context .endif diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 13cf41f05a24..1144522c357b 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -3,7 +3,7 @@ # # Warning flags for compiling the kernel and components of the kernel: # -CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ +CWARNFLAGS?= -Wall -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Wcast-qual \ -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ -Wmissing-include-dirs -fdiagnostics-show-option \ diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 6af49075cae8..5fba3e58295b 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -249,7 +249,6 @@ CDDL_CFLAGS= \ -Wno-nested-externs \ -Wno-parentheses \ -Wno-pointer-arith \ - -Wno-redundant-decls \ -Wno-strict-prototypes \ -Wno-switch \ -Wno-undef \ @@ -320,7 +319,7 @@ LINUXKPI_C= ${NORMAL_C} ${LINUXKPI_INCLUDES} # Infiniband C flags. Correct include paths and omit errors that linux # does not honor. OFEDINCLUDES= -I$S/ofed/include -I$S/ofed/include/uapi ${LINUXKPI_INCLUDES} -OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith -Wno-redundant-decls +OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith OFEDCFLAGS= ${CFLAGS:N-I*} -DCONFIG_INFINIBAND_USER_MEM \ ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF} diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 2a2ab1d02277..134b150af1d9 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -551,8 +551,7 @@ OPENZFS_CFLAGS= \ -I${SYSDIR}/cddl/contrib/opensolaris/uts/common \ -include ${ZINCDIR}/os/freebsd/spl/sys/ccompile.h OPENZFS_CWARNFLAGS= \ - -Wno-nested-externs \ - -Wno-redundant-decls + -Wno-nested-externs .include .include diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile index 801fcf9345ef..64444bd9925b 100644 --- a/sys/modules/ibcore/Makefile +++ b/sys/modules/ibcore/Makefile @@ -43,4 +43,4 @@ EXPORT_SYMS= YES .include -CWARNFLAGS+= -Wno-cast-qual -Wno-pointer-arith -Wno-redundant-decls +CWARNFLAGS+= -Wno-cast-qual -Wno-pointer-arith diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64 index 4131ed5935b5..5db473c5393b 100644 --- a/sys/powerpc/conf/QORIQ64 +++ b/sys/powerpc/conf/QORIQ64 @@ -14,7 +14,7 @@ machine powerpc powerpc64 include "dpaa/config.dpaa" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WITH_CTF=1 -#makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" +#makeoptions WERROR="-Werror -Wno-format" options FPU_EMU diff --git a/sys/powerpc/conf/dpaa/DPAA b/sys/powerpc/conf/dpaa/DPAA index 23b708591378..4032c2ddd446 100644 --- a/sys/powerpc/conf/dpaa/DPAA +++ b/sys/powerpc/conf/dpaa/DPAA @@ -12,7 +12,7 @@ cpu BOOKE_E500 machine powerpc powerpc #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -#makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" +#makeoptions WERROR="-Werror -Wno-format" makeoptions NO_MODULES=yes # Platform support diff --git a/sys/powerpc/conf/dpaa/config.dpaa b/sys/powerpc/conf/dpaa/config.dpaa index a40e3e5ea8bc..6161eb7db4a6 100644 --- a/sys/powerpc/conf/dpaa/config.dpaa +++ b/sys/powerpc/conf/dpaa/config.dpaa @@ -6,7 +6,6 @@ makeoptions DPAA_COMPILE_CMD="${LINUXKPI_C} ${DPAAWARNFLAGS} \ -Wno-cast-qual -Wno-unused-function -Wno-init-self -fms-extensions \ -include $S/contrib/ncsw/build/dflags.h \ -Wno-error=missing-prototypes \ - -Wno-redundant-decls \ -I$S/contrib/ncsw/build/ \ -I$S/contrib/ncsw/inc \ -I$S/contrib/ncsw/inc/cores \ From nobody Wed Mar 22 16:32:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtJ0w8Zz412Yr; Wed, 22 Mar 2023 16:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtJ0Chyz3QkS; Wed, 22 Mar 2023 16:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rRgE4/RwYGJsO3jcQPHC4kV1IaYLBeCorclFU79nzMg=; b=Xk0kMQyEaJPOTFq715Pb9SzW3FmZ6EC56oY+Xv5/w7ylujMOwaRi/9k+1jFWTEzHGYh6i8 ICBet8nMKyBtW0ZeNg+FWS7RmT5qLuZ63GsorYox/enjEdBtESCIt7VqwKC/Fvyt/8BXvd hi9O4G/50Y1AGAhjIykLEUswM4XD0hE4sHHWOIa6OF0B3ZoL1zN5j9tqZHHTbf3lP+S6+g xn0IWEvDZSRSPPTRXy34JA6yj7WmTFDsEcTqCSnLnZdTnlNpnANXvDkTRn047eYI6C7i8k 4TPS/Q11gvvaT0B4ZSmBCk8oPW4QmvkTzYzzvgaAt9EQekDrFtogWnNZMPdRlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rRgE4/RwYGJsO3jcQPHC4kV1IaYLBeCorclFU79nzMg=; b=FENXZRWDXIJC2HJDE6r+fyzdEpbwoN7i2wkMjXAHi2ta0obX840UnBinFjopXbn+QCs6QT haoPGnQ+sbbsuAmuaCk+iD3yg4NPlJIi8Mf53Hce5eKHsLCMaiMwZYgOG4eSC3bb3WYGnF Wtqlbw/RQG4wwtfLO6/SnyavQ2vJvwtdLPk/9LiVMd2EB07vr7M3QNpGBOZy9geNGpkZWL RUm+8DTFPTxRAwXoCIBmFSSM1MCspldVEBmbdrvm8D1uYYwDlJV34l7XeaFj2Op0/WatiL Ytq/CbddssRZWTT57eXyRwN8IOLZ0J07XsoxkXgrsiXQc64p1PXQwiOfYmcGkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502776; a=rsa-sha256; cv=none; b=gyYXFQqnnJ5JKRhN2ghWWM/bPzM11q+t61+s8N3bgzoAj+thsZ/ihuAcRxN8RlWOyGB6/1 u+DNzbjnrcKqR06epIofqBEG8wyFShnC41Y5BKKPjDqNbxFcL3Cu69Zr+luCmvhKzyEhPl qIyJZchtHJpuer4OOvY+W9NEMpTpeay4Skk4n/JOmqJwUheV16tli8eWa3cfWtOk4F6r+N baB1z36dfmbuj4cQigHAasp5hhAAGaFvjfIoOO9Jmb5KwpsDaCxYLHarQYn2793iGwVnkJ 5qCpNNOrDo2bzVwuUFHzVZNsjn5kmqCKEFyAy/teeCOGvn9tIUExM+F/uVUgJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtH6RhXz10fG; Wed, 22 Mar 2023 16:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWtFP024089; Wed, 22 Mar 2023 16:32:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWtBL024088; Wed, 22 Mar 2023 16:32:55 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:55 GMT Message-Id: <202303221632.32MGWtBL024088@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0ae6421c8573 - stable/13 - linuxkpi: Use a proper declaration for pm_suspend_via_firmware. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0ae6421c85732ccf203a10b04aa723da65345a5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ae6421c85732ccf203a10b04aa723da65345a5b commit 0ae6421c85732ccf203a10b04aa723da65345a5b Author: John Baldwin AuthorDate: 2023-01-28 03:29:39 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:22:07 +0000 linuxkpi: Use a proper declaration for pm_suspend_via_firmware. Reported by: GCC -Wstrict-prototypes (cherry picked from commit 4d77927e2af3a991c5b07071b7fe18673d7742f2) --- sys/compat/linuxkpi/common/include/linux/suspend.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/suspend.h b/sys/compat/linuxkpi/common/include/linux/suspend.h index 8ceafaf35f56..dacecbebdc08 100644 --- a/sys/compat/linuxkpi/common/include/linux/suspend.h +++ b/sys/compat/linuxkpi/common/include/linux/suspend.h @@ -15,7 +15,7 @@ extern suspend_state_t pm_suspend_target_state; #define PM_SUSPEND_MAX 4 static inline int -pm_suspend_via_firmware() +pm_suspend_via_firmware(void) { return 0; } From nobody Wed Mar 22 16:32:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtK2xvrz412P8; Wed, 22 Mar 2023 16:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtK0vx9z3Qkm; Wed, 22 Mar 2023 16:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yzcqMzCrh7iBw+7lYeynFWK5qEBvfkNNz8f1K0VWKWE=; b=ZId3O5Qk36QOM9iHcFpZWpr2V9TsQRheKVCY3GDY+kU2RQtFTsBFi0pEFoVrN+76hsRCZt lYhaRFm+YcKbDhs0DxQ8ffcq1ozcgogzAG3TGh7kqchm82iDvB3O/yL9KcR0l5SsYlQbz0 ZMYxMIbzrQxVLul6P9Xztn5ZK/Io35TVAIymk0viwWMX2XAF9YOwgS2WmraMnP73xz2QKa J8KzvPKTrrPlpdljtPWN7kCSW0HHtSk3/dSxSXiHuBF6STotJvYY5zVDO9M8ozmMuhdE9N /4prfBWaTvvCim6CFLS7aQ4Zy/FQhBlnVFTmbxnOxGV5hUB0yW92umFIylktHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yzcqMzCrh7iBw+7lYeynFWK5qEBvfkNNz8f1K0VWKWE=; b=LGumK6b1tWKiuc/fJq7Ze5xOYbKMu6SosX3nPiB8rsqCKWn+1a8F+8aFfNYrmE5DaRJnr9 IVT/HkjKjgWSTlwUeMJIeG6OIgXVhruXMs0xqoa37lRAaOHNRZkbxpEmh/rLWLYdDTsdlX yPLKG1rSjxpbSChpy73ZRFUwDDYJD1c0VjBaxX19e6QlPeFlN/OlL4UsazvJ7t9QfRVAix 81/VyVVfYfbtb6qD93nQAH2ZfMPA4H+PXIyxPllCMQMHweUGLaE9FHaq99vZojQ82QMEZt swxQl+vHMFcSqdm3uqI9nLnPGpzYeYD8XZk/X8fPvzzULS/kNVOmkAqTGL8jzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502777; a=rsa-sha256; cv=none; b=lpcDFc3yn5czj64nz6qJCC2SPtAIaBexdzHFY/Fcpt+HD5nEPN+QWTm1zq5AEv1vT3aT7Q CgkBGyoIJ8us4RTyarfGJSi6OrsbPmF3dyYyGzBN5x00fVZbURhZYVt8Jp50HAXrMhLI+n QU3jKvw7yI577VXtp8aB4LB1oz+jtKqlue+LTyfcKvdzSwxri7qYab50u2gVywn+zquedY oBXieP4dLbi9F6Nlwakv/ZpZMH0xxPnOOzCGCcKPDR26CrjD0Q3DjLXdq8azaNTL47v48e mWNdbrkzZOSDw0X0BMDKjGGtIQbYnFaDi2COg8Z6+WXbj9MCCLFhLAp657XnHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtK01wdz11l1; Wed, 22 Mar 2023 16:32:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWuEh024113; Wed, 22 Mar 2023 16:32:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWuVT024112; Wed, 22 Mar 2023 16:32:56 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:56 GMT Message-Id: <202303221632.32MGWuVT024112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8ca78eb03fd4 - stable/13 - LinuxKPI: Make FPU sections thread-safe and use the NOCTX flag. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8ca78eb03fd4b3c9f514ea6c075fc44dc9c02d27 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8ca78eb03fd4b3c9f514ea6c075fc44dc9c02d27 commit 8ca78eb03fd4b3c9f514ea6c075fc44dc9c02d27 Author: Hans Petter Selasky AuthorDate: 2021-07-31 13:32:52 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:32:56 +0000 LinuxKPI: Make FPU sections thread-safe and use the NOCTX flag. Reviewed by: kib Submitted by: greg@unrelenting.technology Differential Revision: https://reviews.freebsd.org/D29921 MFC after: 1 week Sponsored by: NVIDIA Networking (cherry picked from commit 469884cf04a9b92677c7c83e229ca6b8814f8b0a) --- sys/compat/linuxkpi/common/include/asm/fpu/api.h | 40 ++++------------------ sys/compat/linuxkpi/common/include/linux/sched.h | 3 +- sys/compat/linuxkpi/common/src/linux_fpu.c | 43 ++++++++++++++++++------ sys/conf/files.amd64 | 3 -- sys/conf/files.arm64 | 4 --- sys/conf/files.i386 | 3 -- sys/modules/linuxkpi/Makefile | 3 +- 7 files changed, 43 insertions(+), 56 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/fpu/api.h b/sys/compat/linuxkpi/common/include/asm/fpu/api.h index 4b598d88be03..133754abdc4b 100644 --- a/sys/compat/linuxkpi/common/include/asm/fpu/api.h +++ b/sys/compat/linuxkpi/common/include/asm/fpu/api.h @@ -28,41 +28,13 @@ #ifndef _LINUXKPI_ASM_FPU_API_H_ #define _LINUXKPI_ASM_FPU_API_H_ -#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) +#define kernel_fpu_begin() \ + lkpi_kernel_fpu_begin() -#include +#define kernel_fpu_end() \ + lkpi_kernel_fpu_end() -extern struct fpu_kern_ctx *__lkpi_fpu_ctx; -extern unsigned int __lkpi_fpu_ctx_level; - -static inline void -kernel_fpu_begin() -{ - if (__lkpi_fpu_ctx_level++ == 0) { - fpu_kern_enter(curthread, __lkpi_fpu_ctx, FPU_KERN_NORMAL); - } -} - -static inline void -kernel_fpu_end() -{ - if (--__lkpi_fpu_ctx_level == 0) { - fpu_kern_leave(curthread, __lkpi_fpu_ctx); - } -} - -#else - -static inline void -kernel_fpu_begin() -{ -} - -static inline void -kernel_fpu_end() -{ -} - -#endif +extern void lkpi_kernel_fpu_begin(void); +extern void lkpi_kernel_fpu_end(void); #endif /* _LINUXKPI_ASM_FPU_API_H_ */ diff --git a/sys/compat/linuxkpi/common/include/linux/sched.h b/sys/compat/linuxkpi/common/include/linux/sched.h index 6e0a01aa8466..f895cba0d894 100644 --- a/sys/compat/linuxkpi/common/include/linux/sched.h +++ b/sys/compat/linuxkpi/common/include/linux/sched.h @@ -89,7 +89,8 @@ struct task_struct { int bsd_interrupt_value; struct work_struct *work; /* current work struct, if set */ struct task_struct *group_leader; - unsigned rcu_section[TS_RCU_TYPE_MAX]; + unsigned rcu_section[TS_RCU_TYPE_MAX]; + unsigned int fpu_ctx_level; }; #define current ({ \ diff --git a/sys/compat/linuxkpi/common/src/linux_fpu.c b/sys/compat/linuxkpi/common/src/linux_fpu.c index 976e55e68ca1..08f7e075d827 100644 --- a/sys/compat/linuxkpi/common/src/linux_fpu.c +++ b/sys/compat/linuxkpi/common/src/linux_fpu.c @@ -30,21 +30,44 @@ #include #include +#include + +#include + +#if defined(__aarch64__) || defined(__amd64__) || defined(__i386__) + #include -struct fpu_kern_ctx *__lkpi_fpu_ctx; -unsigned int __lkpi_fpu_ctx_level = 0; +/* + * Technically the Linux API isn't supposed to allow nesting sections + * either, but currently used versions of GPU drivers rely on nesting + * working, so we only enter the section on the outermost level. + */ + +void +lkpi_kernel_fpu_begin(void) +{ + if ((current->fpu_ctx_level)++ == 0) + fpu_kern_enter(curthread, NULL, FPU_KERN_NOCTX); +} + +void +lkpi_kernel_fpu_end(void) +{ + if (--(current->fpu_ctx_level) == 0) + fpu_kern_leave(curthread, NULL); +} + +#else -static void -linux_fpu_init(void *arg __unused) +void +lkpi_kernel_fpu_begin(void) { - __lkpi_fpu_ctx = fpu_kern_alloc_ctx(0); } -SYSINIT(linux_fpu, SI_SUB_EVENTHANDLER, SI_ORDER_SECOND, linux_fpu_init, NULL); -static void -linux_fpu_uninit(void *arg __unused) +void +lkpi_kernel_fpu_end(void) { - fpu_kern_free_ctx(__lkpi_fpu_ctx); } -SYSUNINIT(linux_fpu, SI_SUB_EVENTHANDLER, SI_ORDER_SECOND, linux_fpu_uninit, NULL); + +#endif diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index b967a3be2a4f..4ae6fc3f33a1 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -436,9 +436,6 @@ x86/xen/pv.c optional xenhvm x86/xen/pvcpu_enum.c optional xenhvm x86/xen/xen_pci_bus.c optional xenhvm -compat/linuxkpi/common/src/linux_fpu.c optional compat_linuxkpi \ - compile-with "${LINUXKPI_C}" - contrib/openzfs/module/zcommon/zfs_fletcher_avx512.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zcommon/zfs_fletcher_intel.c optional zfs compile-with "${ZFS_C}" contrib/openzfs/module/zcommon/zfs_fletcher_sse.c optional zfs compile-with "${ZFS_C}" diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 6b96de28128d..3e91db3e22c6 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -575,10 +575,6 @@ arm64/rockchip/clk/rk3399_pmucru.c optional fdt soc_rockchip_rk3399 # Xilinx arm/xilinx/uart_dev_cdnc.c optional uart soc_xilinx_zynq -# Linuxkpi -compat/linuxkpi/common/src/linux_fpu.c optional compat_linuxkpi \ - compile-with "${LINUXKPI_C}" - # Cloudabi arm64/cloudabi32/cloudabi32_sysvec.c optional compat_cloudabi32 arm64/cloudabi64/cloudabi64_sysvec.c optional compat_cloudabi64 diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 4be98810b32e..89e1d47987c4 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -189,9 +189,6 @@ x86/x86/mptable.c optional apic x86/x86/mptable_pci.c optional apic pci x86/x86/msi.c optional apic pci -compat/linuxkpi/common/src/linux_fpu.c optional compat_linuxkpi \ - compile-with "${LINUXKPI_C}" - # Clock calibration subroutine; uses floating-point arithmetic subr_clockcalib.o standard \ dependency "$S/kern/subr_clockcalib.c" \ diff --git a/sys/modules/linuxkpi/Makefile b/sys/modules/linuxkpi/Makefile index 2ed6cda98b17..897c86f51733 100644 --- a/sys/modules/linuxkpi/Makefile +++ b/sys/modules/linuxkpi/Makefile @@ -8,6 +8,7 @@ SRCS= linux_compat.c \ linux_dmi.c \ linux_domain.c \ linux_firmware.c \ + linux_fpu.c \ linux_hrtimer.c \ linux_idr.c \ linux_interrupt.c \ @@ -35,7 +36,7 @@ SRCS= linux_compat.c \ .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" -SRCS+= opt_acpi.h acpi_if.h linux_acpi.c linux_fpu.c +SRCS+= opt_acpi.h acpi_if.h linux_acpi.c .endif SRCS+= opt_ddb.h From nobody Wed Mar 22 16:32:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtL2SWvz412hg; Wed, 22 Mar 2023 16:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhYtL21Lhz3Ql3; Wed, 22 Mar 2023 16:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLiQmIHtBsDFHSfFDmCV6qDnNdz/cCBNU4Rw7ychEWA=; b=oXNiJ4pefIFZZv8CerM/V4qa8GYYcf/IRO7XdTUmn8SX3nEVgtckeBPfGWncPdcfLVo/s9 mIfd3cXhfodG0ZG4LMnGY+ZdqPW48bj7Pr94XyMzCbsk52soMkdHScCw6cwyzKmB182zRH Par5+NC7Re5AqbNfJbqQrYU+67yXN236Zp3up/qTCNlo4lcr6abm++MQwJQObCIl1GXTF1 qMiu+j8w7pO4sOUmMybeQTioNY8X0tsCjmY8+0himRcWe8mm8efXLmzk5z2jKrPa3SFpaU WtcQd2axscYP2wmQ07hfD8pEkqSWVmXKlK/CVkosvejkNqTd/iZpyaGpE2qBbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502778; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PLiQmIHtBsDFHSfFDmCV6qDnNdz/cCBNU4Rw7ychEWA=; b=QdX33uFULMLGOq1H9+L/5COCvq8faAAUvvBEa0FAe67ePm22vCI4JcsJwJSExxbbfWm57l zh8u2uMdTLiT9ZhzIoTuUVlbTzWB87cKrf3rh4Mx22YuyWc+w6fwPp8tNMaLTdxeUA7mqS vip000IeFcHD76Eiyx8LM22OJh/xssSFkno6TvS5vSGHf7RThjcXIV/edFfexm+DRJPKgy ssjlPXLJg5vVBq+XtE3zNpHex0vnMJ0R5mKfRDFEK/Bb9+TiZTRF/F4U3713UuZTfGhU4d p57jmj+psVM1RMadKokLVxd/Z9M8Gk9Pz7Z8XFW62n50dF6BXpvYlx2QUqDtzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502778; a=rsa-sha256; cv=none; b=Slh8/sQbDIu6GQ99lSxZUQY3FxWjmQ86Zov2Cz06TrGFHYeoHsYmBPjbbXZ/HpBPZZ8tY9 b2Q07+Nx1nrOhRen1jOV7MeO6bzRTXrjyXrpKDGkOd9lFrZh/ihC9sfWoVn9SorUnbJeif YjywRFMB3yyr1BJ9t6ieXQMP2/TlkeHuWt/Mnki8+uQW5GtEVZ/Azter8qaO3qSOLF7xuG K4o4bXvD/xsn/IgtdPtWOLmEGTVywzfcc6XJX70blkRLym3kQHx3kdw0IVnreX2ngzh26r Hs714zNBIK7b8fvCEYQwohzWga3EQKaEj/RJIm64gAqctxHqNkIG3XOPW2f06g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtL0XwGz11l2; Wed, 22 Mar 2023 16:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWwDN024132; Wed, 22 Mar 2023 16:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWwiY024131; Wed, 22 Mar 2023 16:32:58 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:58 GMT Message-Id: <202303221632.32MGWwiY024131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: dbb7cc419b49 - stable/13 - Add missing file to sys/conf/files after 469884cf04a9b92677c7c83e229ca6b8814f8b0a . 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dbb7cc419b49d5743c0784c8ccce6b5202dcc904 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=dbb7cc419b49d5743c0784c8ccce6b5202dcc904 commit dbb7cc419b49d5743c0784c8ccce6b5202dcc904 Author: Hans Petter Selasky AuthorDate: 2021-08-02 06:24:22 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:33:07 +0000 Add missing file to sys/conf/files after 469884cf04a9b92677c7c83e229ca6b8814f8b0a . Found by: vishwin@ Differential Revision: https://reviews.freebsd.org/D29921 MFC after: 1 week Sponsored by: NVIDIA Networking (cherry picked from commit 9340ebd404efad7068b5a45fd3b3d8bb21187b91) --- sys/conf/files | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/conf/files b/sys/conf/files index 0c3a553c3dad..19b0445f2e0c 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -4628,6 +4628,8 @@ compat/linuxkpi/common/src/linux_domain.c optional compat_linuxkpi \ compile-with "${LINUXKPI_C}" compat/linuxkpi/common/src/linux_firmware.c optional compat_linuxkpi \ compile-with "${LINUXKPI_C}" +compat/linuxkpi/common/src/linux_fpu.c optional compat_linuxkpi \ + compile-with "${LINUXKPI_C}" compat/linuxkpi/common/src/linux_hrtimer.c optional compat_linuxkpi \ compile-with "${LINUXKPI_C}" compat/linuxkpi/common/src/linux_i2c.c optional compat_linuxkpi \ From nobody Wed Mar 22 16:32:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtM3nffz412hl; Wed, 22 Mar 2023 16:32: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 4PhYtM2lShz3QjN; Wed, 22 Mar 2023 16:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoooRTxUwxOwFdEnk+BUMt+RRXB9kT3x0KWYjvpT8u0=; b=Lvet8QUP6xaaApHjjopXTa4xEqLxelk32TINYIPfJaHN8pi7fDYRzd015rHLbHCH2KxiXu OjQLLSFYqPlgu9wtIngJQobf06UMduxaC8F64LjGxZTHFD41sMZuxbhsGPvc+qfL5JbUHF IMVKKkzSCH2nZU+JQe5oHIyh3kYhYldlsIJudFZCkC+zQTQMiirWMLPO1ghxH3i9/1P5r7 Dk5r14kuswgD8lCXxGKMPu7CagwNdkT0h54W5x18vbrOZGMLYgbNp/buFgkz8ouYk0hjrV zxVaohv/5il+yfrUPftK2MF/eSlnYElRPAzUMhLN6iLYC1miJq1pmD1ApYibPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoooRTxUwxOwFdEnk+BUMt+RRXB9kT3x0KWYjvpT8u0=; b=pUiOaAM30CF/tsXeMGijdhNv7RGb0W/8u8D+Tkr9DzTNDdxJirc4c/1giUgCSLov8RxEnv VQ3C63tj+CW4wWhzEBQK4x9oXTlVPj77wurtzuwAHTMH1r4KlAM82JmWHQ5qrEfGTewqhZ 3bAsWhRTKaWLsLxzuwcHLN0c1oR+y8oD1eJD/M6puGUXsP2DJPArFVDNiGSN6pjfNXsR4S aTgcU/xVF+ZZ+n3oUgswW7WIpw3MRQ4A6OyyY7+jCkqQmI6gSVJf5Nne1NEbKKO6HnvM7q 1pCLFIvVgCdb5oAu4YetcUv4yX2r/y4SXRVazIZd6RnmrvpTlg5zr9KZELU7zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502779; a=rsa-sha256; cv=none; b=rTc/T173s4rhcQWCPiECrh0c4aFX9DgwpyB25iGCGLHjRY+TedqAnqCqULgRI//T07nt8w WQyAJMecZuq/6EZMC4HYhKKJPUbVi+osbRgZsSHGHLzNfkjSEDfdlMiT1sDeaV1kiEVJCM d2mV+fT2WKgjkmx+3qG+YhNFH7fcRFj1fyPWRuz6D//zHVSZyQYb8QY2jZG+sFH3anln+r 0/Hj1gBAU8CmAnYEOG1829waVkitw3oe6ovd/30Me+cbxmdxi+Us8Xz+o0y/o74yPd00qS W9T2MR/oTDGXuayQFlZEBHfoqAQnzHVt1AoGNm62xclH+aHB6LpRKOyMkMYnqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtM1qrkz11N0; Wed, 22 Mar 2023 16:32:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGWxX3024152; Wed, 22 Mar 2023 16:32:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGWxNR024151; Wed, 22 Mar 2023 16:32:59 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:32:59 GMT Message-Id: <202303221632.32MGWxNR024151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e889fcdf8e8d - stable/13 - Disable -Wunused-function for {ed,x}25519_ref10.c in libsodium. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e889fcdf8e8ddc184c97e79b82bcf251126e1fa5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e889fcdf8e8ddc184c97e79b82bcf251126e1fa5 commit e889fcdf8e8ddc184c97e79b82bcf251126e1fa5 Author: John Baldwin AuthorDate: 2022-02-02 20:25:16 +0000 Commit: John Baldwin CommitDate: 2023-03-22 16:19:58 +0000 Disable -Wunused-function for {ed,x}25519_ref10.c in libsodium. (cherry picked from commit 63b7c2df8ec41bf9ac33ccaf9b9d16c7dc28ea0c) --- sys/conf/files | 4 ++-- sys/modules/crypto/Makefile | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 19b0445f2e0c..17dcd22facc7 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -5045,7 +5045,7 @@ opencrypto/xform_poly1305.c optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include -I$S/crypto/libsodium" contrib/libsodium/src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c \ optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" + compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium -Wno-unused-function" contrib/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" @@ -5066,7 +5066,7 @@ contrib/libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve255 compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" contrib/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c \ optional crypto \ - compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" + compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium -Wno-unused-function" contrib/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c \ optional crypto \ compile-with "${NORMAL_C} -I$S/contrib/libsodium/src/libsodium/include/sodium -I$S/crypto/libsodium" diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 877bae8d930e..471d04be1525 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -75,6 +75,7 @@ SRCS += aead_xchacha20poly1305.c CFLAGS.aead_xchacha20poly1305.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += ed25519_ref10.c CFLAGS.ed25519_ref10.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +CWARNFLAGS.ed25519_ref10.c += -Wno-unused-function SRCS += core_hchacha20.c CFLAGS.core_hchacha20.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += onetimeauth_poly1305.c @@ -89,6 +90,7 @@ SRCS += scalarmult_curve25519.c CFLAGS.scalarmult_curve25519.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += x25519_ref10.c CFLAGS.x25519_ref10.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} +CWARNFLAGS.x25519_ref10.c += -Wno-unused-function SRCS += verify.c CFLAGS.verify.c += -I${LIBSODIUM_INC}/sodium -I${LIBSODIUM_COMPAT} SRCS += randombytes.c From nobody Wed Mar 22 16:33:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhYtN5rlLz412Z3; Wed, 22 Mar 2023 16:33: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 4PhYtN3dJ8z3QvD; Wed, 22 Mar 2023 16:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RO35B6TMkR8YpEPCnFVg/ZfNGmk5YAFCvVtjMdjt+EY=; b=mQTefK6gLWvfKJDprKCz66Dt66NI0q0quUe2tuGBw/ZKp94gtegeuVRs3+MCmvM0B+oNt8 tsFZcgcu6vErSBDfQiwBwtoL5CxQQr2eqqCARxIegnm6kulb3SB+YmKYUIe73kAoNzcUxX xISmFUAvrDD2Ii7ImR0MJOALzbXLbRZHXBaoXZJ7poLHDpbyJBi7xuU6gfPMepkfWkevwo 3pAbgrQ8Hr5/23x+bT4tEQ8k4VmNQx9IehWlcS1QPPBZO9wrSvj6SWvVZ33+n0Ahv10PJ4 6yOD0Yd7Ge1DWBXoJEqKR53lZeMQUmaXVYiQRI22pWXSHbo5s/dNGhdAy4ZnSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679502780; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RO35B6TMkR8YpEPCnFVg/ZfNGmk5YAFCvVtjMdjt+EY=; b=u1tP0+tUdk0zMM746/gZT8F+gxkrwnB4sqGTn+Y0myUgr03T50QDEi/IHWsqTVMawGdFMu +fd52/ert2uC/Shgo1BQaP9kIgtNAkb/3oR49/5Q7Dpr1XlIUasVKdtlLkvFfc8SkAIR+P 6VqXUucbVAgR/t48W9nT5oHceybd+k3C0st/vcHJUIniy00sTN41XAhIpkr94zq7RK3J4b lrVYfgCD60S63tyj71VvOSUYsswFiw6FtaplOtMvEIjsXS2yqbEP0rsoxJMLvgdg3boIyU ZUwbu7fdDv6nxIZxw2UgQjGVlscpvbk38gnN5M2ke6B3r0mhQYQk7Pks8vkfTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679502780; a=rsa-sha256; cv=none; b=vsCGTWfgMNOJThwKxdq4X3Y7N8ntmub1Ky1brZDGXJ/RsqQ10N2RQhWfISyJEru4z6Gd+b ZqY1ZmfAK5YejgaQDxcRbu1yhI5M5gEF+3yFzU12KLseLjBzQs/17h/iMUMty70CK6zUqx 54/SKsE8/RuSkUa7pKt9Z8ZbfKZ5NBJveYXnxnsRAU6LzT7sIf4QWrGPhsiCYrtCmizv0v OpKKWVA9e+/qxlz/jV8NwS7OGo7r4vfh6QFJlbh+7UHlSKkBxtcltGi3GsSWw8t+yQj79c UFRq6w/Ps40oSfUxm8xzozy2Y77RyW24OHVMfSNyjPB0vuzRo287NX8DIYBqNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhYtN2hXwz11n1; Wed, 22 Mar 2023 16:33:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MGX0fd024192; Wed, 22 Mar 2023 16:33:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MGX0wS024191; Wed, 22 Mar 2023 16:33:00 GMT (envelope-from git) Date: Wed, 22 Mar 2023 16:33:00 GMT Message-Id: <202303221633.32MGX0wS024191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0d9e9c3d1586 - stable/13 - if_epair: Use ANSI C definition 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0d9e9c3d1586934b838a3e83cd912ff9a9c0e5a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0d9e9c3d1586934b838a3e83cd912ff9a9c0e5a2 commit 0d9e9c3d1586934b838a3e83cd912ff9a9c0e5a2 Author: Li-Wen Hsu AuthorDate: 2022-02-15 13:45:22 +0000 Commit: John Baldwin CommitDate: 2023-03-22 16:22:49 +0000 if_epair: Use ANSI C definition This fixes -Werror=strict-prototypes from gcc9 Sponsored by: The FreeBSD Foundation (cherry picked from commit 7442b6323127a349d5465fa18ce5fe4be0600970) --- sys/net/if_epair.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c index a2bc0044f7c9..2404afe63e0a 100644 --- a/sys/net/if_epair.c +++ b/sys/net/if_epair.c @@ -802,7 +802,7 @@ VNET_SYSUNINIT(vnet_epair_uninit, SI_SUB_INIT_IF, SI_ORDER_ANY, vnet_epair_uninit, NULL); static int -epair_mod_init() +epair_mod_init(void) { char name[32]; epair_tasks.tasks = 0; @@ -847,7 +847,7 @@ epair_mod_init() } static void -epair_mod_cleanup() +epair_mod_cleanup(void) { for (int i = 0; i < epair_tasks.tasks; i++) { From nobody Wed Mar 22 19:28:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhdmW5g65z41CQL; Wed, 22 Mar 2023 19:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhdmW4yhrz4BpP; Wed, 22 Mar 2023 19:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679513291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nK7eg6IE8uyqsuQ7JVwaQ1+MM9dF4bkHjiAwBMhSbOQ=; b=il2UIcWmxyp3ZgDtDrWfW6C/Oe+MIebNo6mlbxuQ9xS2tglEbmNeI89x25ado6+EjnPcEF V2v0IS+rcj5jv/QypjU8Qr66LRL678RWjDrDWTjUSdQlhK70ddbe+n8arn4Jjh6nupLKAD +IWrnsoxxhOTucUD8ICq5N23beXRW1X/sKcO9rQokLmJ6/gejIUHsEPg5VzsQXa1tT0TLM nPViJDnmJCyg2MRBg5p+rBJMR8Dh9YFUbChxY9iUq2T0+/z0XtAEmGVGZvu69QUyEARtpl EIEULXNDgilkfCihg/JuHb8mciVcROQvZThXkF6bz3L9W/UKOfUsOL3DVpeVKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679513291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nK7eg6IE8uyqsuQ7JVwaQ1+MM9dF4bkHjiAwBMhSbOQ=; b=Ac6QKhecmhzqWQCzs3UECOOuNX5U/wYONtgHlfSvYAxa7wd3Xfl82BO4YyBjl3P2W5Tzwo fheQm73F02UXBBvLpOfMiXWUUJmXaIdwJM4q72DlLaM8YkEYNfDhgTNsEVZp8Gk5CXf693 l/zIcapiXgumThtknEr3jC5u1JAwVF5PSs64T2TpSJpsJRFyhYW13PoGzUBhbHuK36PB2B aF1m1X+Y3awH6MBG3rIbx8w/XMRDyRQruJkCmOcxUlvsEGsf0zZTXSBmcyd8l9lei1PiEg zaa/JTGLlOynBj50+vUeA89kCY5XabZhMXyYK557qPSUNymD6YUbSCyWRFXdfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679513291; a=rsa-sha256; cv=none; b=EfM3Qj027sWr/7um6uPnuKbUNvucKg4JAllxPYBz5NMmO/OgM99XckCpdmHw8zaxOWgtSE Ng61RxbX14ZO4wQwi503dl9BjmcuNAQWaK1TUfXAVd0WUYAqkGe0ZLKZnEaj8CKOBNqK0R C+Klidt6jHvbrBoTjAd5GRP+bhaoMe6YjpWOpPsKHIItZCHzWBvVCOeBiMGi2qISPp5wfn 1edu4lQS3xjFc7gqCU5sPEEPKdF8CVqGD8nvxt11/Fi6XzPnVnq939dCxonOpnFbdue+CG D0H8oLtoRyxDUWeIDfquC/MIlhZ/lEYCIL9z/NsqROV5Dy/T3QntpnWvUtGiqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhdmW41F2z15bB; Wed, 22 Mar 2023 19:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MJSBLf003721; Wed, 22 Mar 2023 19:28:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MJSBJ0003720; Wed, 22 Mar 2023 19:28:11 GMT (envelope-from git) Date: Wed, 22 Mar 2023 19:28:11 GMT Message-Id: <202303221928.32MJSBJ0003720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 1a798187e554 - stable/13 - Fix kernel memory disclosures in mpr and mps 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: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1a798187e5546c817a3bab845d73520d4a88a185 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=1a798187e5546c817a3bab845d73520d4a88a185 commit 1a798187e5546c817a3bab845d73520d4a88a185 Author: Alan Somers AuthorDate: 2023-03-01 18:53:46 +0000 Commit: Alan Somers CommitDate: 2023-03-22 16:52:42 +0000 Fix kernel memory disclosures in mpr and mps In every mpr and mps ioctl that copies kernel data to userland, validate that the requested length does not exceed the size of the kernel's buffer. Note that all of these ioctls already required root access. Sponsored by: Axcient Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D38842 (cherry picked from commit 72aad3f9028af12e6c56a3a461b46a153abd7b24) --- sys/dev/mpr/mpr_user.c | 7 ++++--- sys/dev/mps/mps_user.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/dev/mpr/mpr_user.c b/sys/dev/mpr/mpr_user.c index d04aaa24ea0b..5b5c11dd4a65 100644 --- a/sys/dev/mpr/mpr_user.c +++ b/sys/dev/mpr/mpr_user.c @@ -863,7 +863,7 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) } mpr_unlock(sc); copyout(cm->cm_reply, PTRIN(data->PtrReply), - data->ReplySize); + MIN(sz, data->ReplySize)); mpr_lock(sc); } mprsas_free_tm(sc, cm); @@ -1087,7 +1087,8 @@ mpr_user_pass_thru(struct mpr_softc *sc, mpr_pass_thru_t *data) data->ReplySize, sz); } mpr_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), data->ReplySize); + copyout(cm->cm_reply, PTRIN(data->PtrReply), + MIN(sz, data->ReplySize)); mpr_lock(sc); if ((function == MPI2_FUNCTION_SCSI_IO_REQUEST) || @@ -2065,7 +2066,7 @@ mpr_user_event_report(struct mpr_softc *sc, mpr_event_report_t *data) if ((size >= sizeof(sc->recorded_events)) && (status == 0)) { mpr_unlock(sc); if (copyout((void *)sc->recorded_events, - PTRIN(data->PtrEvents), size) != 0) + PTRIN(data->PtrEvents), sizeof(sc->recorded_events)) != 0) status = EFAULT; mpr_lock(sc); } else { diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c index a16201cde131..3b8f79802808 100644 --- a/sys/dev/mps/mps_user.c +++ b/sys/dev/mps/mps_user.c @@ -874,7 +874,7 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) } mps_unlock(sc); copyout(cm->cm_reply, PTRIN(data->PtrReply), - data->ReplySize); + MIN(sz, data->ReplySize)); mps_lock(sc); } mpssas_free_tm(sc, cm); @@ -1027,7 +1027,8 @@ mps_user_pass_thru(struct mps_softc *sc, mps_pass_thru_t *data) data->ReplySize, sz); } mps_unlock(sc); - copyout(cm->cm_reply, PTRIN(data->PtrReply), data->ReplySize); + copyout(cm->cm_reply, PTRIN(data->PtrReply), + MIN(sz, data->ReplySize)); mps_lock(sc); if ((function == MPI2_FUNCTION_SCSI_IO_REQUEST) || @@ -1967,7 +1968,7 @@ mps_user_event_report(struct mps_softc *sc, mps_event_report_t *data) if ((size >= sizeof(sc->recorded_events)) && (status == 0)) { mps_unlock(sc); if (copyout((void *)sc->recorded_events, - PTRIN(data->PtrEvents), size) != 0) + PTRIN(data->PtrEvents), sizeof(sc->recorded_events)) != 0) status = EFAULT; mps_lock(sc); } else { From nobody Wed Mar 22 22:28:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjmV3cs0z41P27; Wed, 22 Mar 2023 22:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhjmV35Dlz3hS3; Wed, 22 Mar 2023 22:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53FZpzVroLg8QaDEYV56T3XwaJhQoUcfGxwBYPcXWgk=; b=SRYlm78lHbxdCeBp7jQ7X4iV/Ki0QflrgYWYCvy+3wLDVBnG9iCGfOw+CogPSVp8txlN2S XiyFid14SnjQPFuL3E2UCojfxxpAf+KsKTeZQ3NZdUtBGfWAVioa35wTfuioBcGLRP9uz2 kR5ujNM/rLXzI+NacvC67CfbBNBpM8I4Aqz2j0S3O11zEzZDo1zVjuU0Lpm9HN2v2GkE9/ pvWlnuQU3nfmunZuNLaiTIsC63Ns/6cXM2l11GXjR5plqvOAnDTu6O9u9jNxjbwEdt7dZC rrRLEQqDvDEtPjOj6B+SrCM3gOnCFG5ud3TWDv+jaOfjuD2hnAmbiEmnnUuUWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=53FZpzVroLg8QaDEYV56T3XwaJhQoUcfGxwBYPcXWgk=; b=qApO9ww3+8HXxapITc5jofYf5Q8+HhNb8LPqBpbvoDO7+fm6hgbIvZ1tsYTZsLegSUxP3K +rCOKXIoPfSh34fL9u6RYy6k8UeAsVH0cQeJ8eR+/0A3G1/+ysDr5T6bAl7wp9JEqh+ub1 EBaoNYh11xJRXa83dA5t30R/w2FJBEc3rwgqmREn9ksuQS7zV7ZZVU7EHn0naTTQdq5p2s Gg330qmoqyT+Uve60QnAyw6AjUwWgyG1RSdxNXP17fPdeWo9LyF7pfPqUwduPR9FAxVWCy ZoNIyNmkGXmPQygwV4WcAqBe/5fqI7IUhTrA98ig3FKrtQps7uxjsyJ7E3H0AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524106; a=rsa-sha256; cv=none; b=i0PnhVbgCIH9VsfUEmi08wbUQt5XHxwuJxqi06W7XDOhieRKdcNINpYeL4zxeZucc8jV27 WrDwX2vw9qmSM1c9a4H1xNSU+O0dBGHq4DHZrqpzTkJ+/STTVK+wH3Hw/WuS/qz2+ewSGL MX/pdP+dhwnFuN2HkJLQKacY92VDnI1ChsF6pSHyJwZG3wlpkbz0aM+4hSUHj4qsSevKBW 8i64/AYYyjZjTfOFX84YEqWaMtSYCoBx0OuwbAFQqhY6KebF7tQEcvTV9kY9CM1lP3K0hK 0i1EfggrO0zzhSHple6Vy6Hv2YXWjz1fOL8pN6yxFGF2OtBMiBUsTzeI9/7q9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhjmV278xz19v5; Wed, 22 Mar 2023 22:28:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSQ1D001593; Wed, 22 Mar 2023 22:28:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSQcx001592; Wed, 22 Mar 2023 22:28:26 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:26 GMT Message-Id: <202303222228.32MMSQcx001592@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 13ecd510decf - stable/12 - jemalloc: pick from upstream: Fix GCC-9.1 warning with macro GET_ARG_NUMERIC 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 13ecd510decfec102ec8513a4fb239be4df33f2e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=13ecd510decfec102ec8513a4fb239be4df33f2e commit 13ecd510decfec102ec8513a4fb239be4df33f2e Author: Ryan Libby AuthorDate: 2019-12-21 02:44:38 +0000 Commit: John Baldwin CommitDate: 2023-03-22 00:00:51 +0000 jemalloc: pick from upstream: Fix GCC-9.1 warning with macro GET_ARG_NUMERIC Pick 2d6d099fed05b1509e81e54458516528bfbbf38d from upstream jemalloc: Fix GCC-9.1 warning with macro GET_ARG_NUMERIC GCC-9.1 reports following error when trying to compile file src/malloc_io.c and with CFLAGS='-Werror' : src/malloc_io.c: In function ‘malloc_vsnprintf’: src/malloc_io.c:369:2: error: case label value exceeds maximum value for type [-Werror] 369 | case '?' | 0x80: \ | ^~~~ src/malloc_io.c:581:5: note: in expansion of macro ‘GET_ARG_NUMERIC’ 581 | GET_ARG_NUMERIC(val, 'p'); | ^~~~~~~~~~~~~~~ ... cc1: all warnings being treated as errors make: *** [Makefile:388: src/malloc_io.sym.o] Error 1 The warning is reported as by default the type 'char' is 'signed char' and or-ing 0x80 will turn the case label char negative which will be beyond the printable ascii range (0 - 127). The patch fixes this by explicitly casting the 'len' variable as unsigned char' inside the 'switch' statement so that value of expression " '?' | 0x80 " falls within the legal values of the variable 'len'. Discussed with: jasone (maintainer) Sponsored by: Dell EMC Isilon (cherry picked from commit 79457a8ad150d784f6c02c5e65e8b75c6836e651) --- contrib/jemalloc/src/malloc_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/jemalloc/src/malloc_io.c b/contrib/jemalloc/src/malloc_io.c index c8802c700310..8ca9dbdb3089 100644 --- a/contrib/jemalloc/src/malloc_io.c +++ b/contrib/jemalloc/src/malloc_io.c @@ -376,7 +376,7 @@ malloc_vsnprintf(char *str, size_t size, const char *format, va_list ap) { } \ } while (0) #define GET_ARG_NUMERIC(val, len) do { \ - switch (len) { \ + switch ((unsigned char)len) { \ case '?': \ val = va_arg(ap, int); \ break; \ From nobody Wed Mar 22 22:28:27 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjmW3qJsz41Nhh; Wed, 22 Mar 2023 22:28: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 4PhjmW3PbRz3hHY; Wed, 22 Mar 2023 22:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZ54yz6NhDphlw7zK7sQr62xdrqHHwKPuQkYCScmy3I=; b=pKAP54W4cqIxDPxGXoCCqscFWNneoLBrk1bnNSsVEgaUeak9S6zlOF98jHumwRZ5AHEbEF Nue6WekgSc8wVEw2T6SzeEXJJkF54AWgIEMKPaydzga20AFO1OD0cOuqD89j0H0rAjqRb5 Ka2JrX3cvf1kQuds3bYqEvXXu6pFtM+syKMKIvf8RJDAPjEMDy5i0DH99SQk7q9FPcvNJ7 CyoYVzjM5NqsdJrnWXBlTG978lwXx4Y5GGPPZlqHWMGq1G6fKQxFMYA9uhiO9Pv259xhZl vupy1UhoKxNm5oHqEG6DN5olLlPbEE3ukGrpyr9LGIiJ9Vbw6ffbkYS04LJ7nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vZ54yz6NhDphlw7zK7sQr62xdrqHHwKPuQkYCScmy3I=; b=i0geYyqCDgpq0V2Klk2hLRE8a2hNMIM+QpHjVWHrYrfrFk/BHmCEqVQQ//wJoOItQgY8pD FjsSc/Xaah3yXokIrQYQM6Xr3KVCK1NQM1ymlWzqaUO1UHMPDvWcWvgRwdm0fu6GT41ZH1 TnWQrKURgvppctqfCiXTBEOw11GkiFqlygIh4LQ28tiAlsDrnv2tdivT9xDiyMDlLX9fb7 xknobZ4EAFgoY9mAsLcI2wVys9JtOzBNehH40DTReupbNBwE+JqkNJgjvuLkc3Llbc5RiS f5GeMqBEzfwLsATICLypBpMDwip7VDgjpHPVLEpSoFZV8HgLM/57sm2uptO0mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524107; a=rsa-sha256; cv=none; b=p2mDU5AF/6fT3veJEw5t+UWkoHtdC5+hBAxZFmqmGtqthhBl6RCuGsvRCmBJir8s9l99dn WdPf9qR9PtnIocK9HtGe8wZXQ+4Un8GG6tZasvfdYQejebeicJ3mp3lX/+5yOfcUYGFqwJ w1nzGkjp4Wu7jI5BFVbCZpSu469TfLnlM4ioUhCikeHUobbWJyhz/OILC2y6F7u8zJjbVx 97xne+7ZPXXRnlGkY55b7BMZ5SAJVc2ae2iQYmDhftayFlAxopzME/o5fIkyBBlEjHiWof YvgiwzGFYxNMUbryfGlkW1cSbw4/gl+gX5ihmaw+vJvZtjzQcnEXJJbjLM22TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhjmW2VKKz1BM4; Wed, 22 Mar 2023 22:28:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSRSC001614; Wed, 22 Mar 2023 22:28:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSRnp001613; Wed, 22 Mar 2023 22:28:27 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:27 GMT Message-Id: <202303222228.32MMSRnp001613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d53f977d5285 - stable/12 - amd64 libc: add missed GNU-stack annotation to memmove/memcpy 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d53f977d5285d4f685af3dd98ae14592e6663d66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d53f977d5285d4f685af3dd98ae14592e6663d66 commit d53f977d5285d4f685af3dd98ae14592e6663d66 Author: Konstantin Belousov AuthorDate: 2022-11-18 02:24:34 +0000 Commit: John Baldwin CommitDate: 2023-03-22 00:03:08 +0000 amd64 libc: add missed GNU-stack annotation to memmove/memcpy Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit ae507c25de5ab327fca6578d2bd015aa4792b20d) --- lib/libc/amd64/string/memmove.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/libc/amd64/string/memmove.S b/lib/libc/amd64/string/memmove.S index fc4baaaa4aaa..e06c0ae4c26b 100644 --- a/lib/libc/amd64/string/memmove.S +++ b/lib/libc/amd64/string/memmove.S @@ -300,3 +300,5 @@ ENTRY(memcpy) MEMMOVE erms=0 overlap=1 begin=MEMMOVE_BEGIN end=MEMMOVE_END END(memcpy) #endif + + .section .note.GNU-stack,"",%progbits From nobody Wed Mar 22 22:28:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjmY0PTdz41P2G; Wed, 22 Mar 2023 22:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhjmX4WLjz3hbW; Wed, 22 Mar 2023 22:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N1OuS7rYAW8xqUMaeSjHZ4F+VED4Kue5wwT4yLYs6bc=; b=iIc99utczJko8aEhwA/VeCQynmrLzW6bg0GsYbwAAmA2SMt+eIH0ozqMRH1rp64Y9p0gO8 gQfXhPC7515VPVflodgdgS5W1wy+oRi91tFlS3ZZ6lrQ4xQF+xsPCGKw8clK2BkUoP4tr6 XK5PgyjheqrnujcoHGR5min+WEjDg6Al3GPg6dX5gCSk5FSFTjX3UGJxsgA4S1sdRvoaMi AT1CPbWY6wN9aQCfLr/ZfzBAQy9FXNDV6iItFN7rOfVV9Q4Jqt0W+Vegu1TwngRXfg6AL/ dVW/sHZo+kI59pJfucFzhLrDn5G2VKKIWb2JjIWttNv9rwkbeGE7WsXbPCpidw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N1OuS7rYAW8xqUMaeSjHZ4F+VED4Kue5wwT4yLYs6bc=; b=guip9GPVbjhKkCIg21grXEa/9Ob6kDT9PkcgLPMZm1XZZAxRqkeUyApAea3shf8scR+EGv Ike9/gIUzJJDH37JAyORWkuMpystPDYyi7eWbsKMJXg7XI1ADTWX360G5SMUq2XbJXAfFk PTuIDjyWAdnSCuffIAyzzXUi8IhAYKxEh/O+rRpVTnLxOM0lBelDUVu4ijaszvFsnvjOzo Xk/Nk1SF5rLSdQR3SbtprGo3Wz3JKjqZQ0jNn2y6klG9KUOAKroXbVyhRFfV8Mn2qwAOTR yv75UhjnagcN8GFFqowfZZUsEBLuXBejpmvrca7i+TrM9TX9DglBq6q9hqHdow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524108; a=rsa-sha256; cv=none; b=CC2Z1lioyw+ldGUQg/foiouw6KhEqm6BngNCB28lbeOEKeFF9ITDneGFalkynAmiGH7kTT jEcMGtKo3mxMZwQ9D8tIhV5MCGYOkmKNYzmQTVMR2rB+PhcKHbePbS9YC2rL9NgWkBlf/k J5RQQlRoJiq67+A7LkMQxC67YP9EcvCDlsyVk1AvTyZfbCDmLBLdsA7nyginHgN7IL4BEj wYfemyI1C7KN5e/1gTuq79OGHZXY7tzU3AooS0VCO9FrUUTGLQ8pqEFEkfBMZrGjllYnym x85fuWa2J8WuWGimf+WoFwPODQvkt0qHWKi2VOG2o0PFCUzaP1doo/eBtw5Gyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhjmX3bWGz1BCc; Wed, 22 Mar 2023 22:28:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSSkJ001633; Wed, 22 Mar 2023 22:28:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSS9T001632; Wed, 22 Mar 2023 22:28:28 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:28 GMT Message-Id: <202303222228.32MMSS9T001632@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e0f29006d199 - stable/12 - libcrypto padlock.so: Link with -z noexecstack for ld.bfd. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: e0f29006d1995b014e7db692ff2d5f6f234c1e94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e0f29006d1995b014e7db692ff2d5f6f234c1e94 commit e0f29006d1995b014e7db692ff2d5f6f234c1e94 Author: John Baldwin AuthorDate: 2022-11-22 16:37:04 +0000 Commit: John Baldwin CommitDate: 2023-03-22 00:11:15 +0000 libcrypto padlock.so: Link with -z noexecstack for ld.bfd. The assembly source files do not contain GNU-stack annotations, so ld.bfd defaults to using an executable stack. (cherry picked from commit 99df55bbb711150e7e3515f5c5a2c4d44654c278) --- secure/lib/libcrypto/engines/padlock/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/secure/lib/libcrypto/engines/padlock/Makefile b/secure/lib/libcrypto/engines/padlock/Makefile index b7b72ac076aa..f53eb0c10b99 100644 --- a/secure/lib/libcrypto/engines/padlock/Makefile +++ b/secure/lib/libcrypto/engines/padlock/Makefile @@ -9,6 +9,8 @@ SRCS+= e_padlock-x86_64.S SRCS+= e_padlock-x86.S .endif +LDFLAGS.bfd+= -Wl,-znoexecstack + .include .PATH: ${.CURDIR:H:H}/${MACHINE_CPUARCH} From nobody Wed Mar 22 22:28:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjmY6Q30z41P6K; Wed, 22 Mar 2023 22:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhjmY5P5sz3hWc; Wed, 22 Mar 2023 22:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZrXsWKGE5Vhv+ZMY5MMUMTRknssctaW/hd8id9R4/w=; b=SdL8vFgcZwu9TxwNecTI9hCVjDXT+c6Im7cQNDb8wAvoAV8DTuwb9i2heC66IRhZ3RCY2W l2FtXd6XjvACeonm8PqLomnv6sN69M8fK/gUY3xf/jYTtsR5utGGgsx1ZaOrAbcmvmRI7x n9psInfFdVf+h57VXH4HWKMRp4yIlLUq7s/UkFtBvBpHMKVdpml+j1KBCGFak0yl/sP/D1 6AgrEfpIFOJXN1qoyGV3saU+e80dGGG3eiv+QakhZuZbOigphkvw48tjkJeQqtc5qZCJAe z/1LIuvBHQ49hOL8MXS0DpkOeZcyiRQ4DPlk//G6McJSoA/5tya0iDzOS+SOTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZrXsWKGE5Vhv+ZMY5MMUMTRknssctaW/hd8id9R4/w=; b=EiUF2/zcD3gALOKiaLHpM/+wrOCvu61uW3JS5Gbbk6LhcdsXCeReX1sp/sXj7uswYlbRj8 5rj/Eq0MhupTkuucRw5CNUjwt8uH9ZixTniVt4ozv1iMDm+Dunm6C3KZ0Ii3T6XY0URRPR EOtHbp0OvqgNDswhFMxz5eixms+q1gSQkJj6HDNr0ebQ4DIVh7rqu+fxhn9CsakVADgiMF AaTBzWLgQKlOWwbb2Q/yB7bcaEBA1KKhZFt2j0fLYSyM91Znc5gQFi38z7PrpH3lXCRpxM luBIUqqBF5SMyqeH3wTIW1V1Ck47fsKzJxYwkXGQCyyKovP6e5TgjFmnpHS8rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524109; a=rsa-sha256; cv=none; b=Gi9o2xAfBspRbmrW9VOp8Czx/iMqKcvPgV/Xbh4Uiqc5c/a9ISFzylpgxJUoYpZKvZBLII 1IED6bqMg3tjZFEK1POrpAoIaSXVp3TWovDR9OAsPsapjZj3Uf7CBvOHeEtqRkjvsiUbaX EuG10ryuWasqmyg6FrxHjV8YM267s5H1qXgPlwRHtWiSkeS+0xvpnzpT3tRG3TxDP2R1sC SePONaYN+aRyQsGLRqZm9agMewF2BntQIBh46G6xLGgaxfik3FOqsQMSVE/X3QEUcG7zZL jd3BVoNL2ylBJcWy8Mqlo9MLOP1SfkRjDs4adm9Uw0pvZo0/BBFY2j1sRwEQCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhjmY4V40z1BM5; Wed, 22 Mar 2023 22:28:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSTE3001655; Wed, 22 Mar 2023 22:28:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSTMm001654; Wed, 22 Mar 2023 22:28:29 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:29 GMT Message-Id: <202303222228.32MMSTMm001654@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0ae8e682d806 - stable/12 - dtrace: avoid gcc9 Walloca-larger-than 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0ae8e682d8063a1cb16bf2de18a10681d3c17411 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ae8e682d8063a1cb16bf2de18a10681d3c17411 commit 0ae8e682d8063a1cb16bf2de18a10681d3c17411 Author: Ryan Libby AuthorDate: 2019-12-21 02:44:13 +0000 Commit: John Baldwin CommitDate: 2023-03-22 02:18:22 +0000 dtrace: avoid gcc9 Walloca-larger-than gcc9 grew a new warning for unbounded allocas, such as the one in dt_options_load. Remove both uses of alloca in dt_options.c. Reviewed by: markj Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D22880 (cherry picked from commit fa19b250bdb7e463b58a8e7628ebea09a44197f3) --- .../opensolaris/lib/libdtrace/common/dt_options.c | 68 +++++++++++++++------- 1 file changed, 47 insertions(+), 21 deletions(-) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c index c99e6007f9da..ce13659f1685 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c @@ -38,9 +38,6 @@ #include #include #include -#ifdef illumos -#include -#endif #include #include @@ -162,26 +159,40 @@ dt_opt_cpp_path(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) static int dt_opt_cpp_opts(dtrace_hdl_t *dtp, const char *arg, uintptr_t option) { - char *buf; + char *buf = NULL; size_t len; const char *opt = (const char *)option; + int ret; - if (opt == NULL || arg == NULL) - return (dt_set_errno(dtp, EDT_BADOPTVAL)); + if (opt == NULL || arg == NULL) { + ret = dt_set_errno(dtp, EDT_BADOPTVAL); + goto out; + } - if (dtp->dt_pcb != NULL) - return (dt_set_errno(dtp, EDT_BADOPTCTX)); + if (dtp->dt_pcb != NULL) { + ret = dt_set_errno(dtp, EDT_BADOPTCTX); + goto out; + } len = strlen(opt) + strlen(arg) + 1; - buf = alloca(len); + if ((buf = dt_alloc(dtp, len)) == NULL) { + ret = dt_set_errno(dtp, EDT_NOMEM); + goto out; + } (void) strcpy(buf, opt); (void) strcat(buf, arg); - if (dt_cpp_add_arg(dtp, buf) == NULL) - return (dt_set_errno(dtp, EDT_NOMEM)); + if (dt_cpp_add_arg(dtp, buf) == NULL) { + ret = dt_set_errno(dtp, EDT_NOMEM); + goto out; + } - return (0); + ret = 0; +out: + if (buf != NULL) + dt_free(dtp, buf); + return (ret); } /*ARGSUSED*/ @@ -885,27 +896,35 @@ dt_options_load(dtrace_hdl_t *dtp) dof_hdr_t hdr, *dof; dof_sec_t *sec; size_t offs; - int i; + int i, ret; /* * To load the option values, we need to ask the kernel to provide its * DOF, which we'll sift through to look for OPTDESC sections. */ + dof = &hdr; bzero(&hdr, sizeof (dof_hdr_t)); hdr.dofh_loadsz = sizeof (dof_hdr_t); #ifdef illumos - if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &hdr) == -1) + if (dt_ioctl(dtp, DTRACEIOC_DOFGET, dof) == -1) #else - dof = &hdr; if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &dof) == -1) #endif - return (dt_set_errno(dtp, errno)); + { + ret = dt_set_errno(dtp, errno); + goto out; + } - if (hdr.dofh_loadsz < sizeof (dof_hdr_t)) - return (dt_set_errno(dtp, EINVAL)); + if (hdr.dofh_loadsz < sizeof (dof_hdr_t)) { + ret = dt_set_errno(dtp, EINVAL); + goto out; + } - dof = alloca(hdr.dofh_loadsz); + if ((dof = dt_alloc(dtp, hdr.dofh_loadsz)) == NULL) { + ret = dt_set_errno(dtp, EDT_NOMEM); + goto out; + } bzero(dof, sizeof (dof_hdr_t)); dof->dofh_loadsz = hdr.dofh_loadsz; @@ -917,7 +936,10 @@ dt_options_load(dtrace_hdl_t *dtp) #else if (dt_ioctl(dtp, DTRACEIOC_DOFGET, &dof) == -1) #endif - return (dt_set_errno(dtp, errno)); + { + ret = dt_set_errno(dtp, errno); + goto out; + } for (i = 0; i < dof->dofh_secnum; i++) { sec = (dof_sec_t *)(uintptr_t)((uintptr_t)dof + @@ -942,7 +964,11 @@ dt_options_load(dtrace_hdl_t *dtp) dtp->dt_options[opt->dofo_option] = opt->dofo_value; } - return (0); + ret = 0; +out: + if (dof != NULL && dof != &hdr) + dt_free(dtp, dof); + return (ret); } typedef struct dt_option { From nobody Wed Mar 22 22:28:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjmZ6z8gz41P45; Wed, 22 Mar 2023 22:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhjmZ67PQz3hXD; Wed, 22 Mar 2023 22:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnOTP/JAdxkmxHR5csJP0CXQWL/2v444mKdQj8eIXew=; b=UHOyONdeTFNojZyWAlc9/z9ylxGGCXq3XtO2ut0YDqohIlOgIN145X/WVYLJzemgbfSPmN XvrsXAu/HLOrK7JVSdYsjmUyO8Ko3N0qWMac1JX0OwiqigcxNPyWh49UaA++KIt5Mqw2nM bSZGeosaK/ZhJ/mOA0W3cnybkvLqKEKV9H6aClgGNvE0JCM3IDUb9R+/2dKbrTlAjUxuGz +OLC02Av4/oFhxVsJRZy2rAioaPclD3Ye9Vo2Vqy0Cafwp/1vPTFG7Z9u8AkDBwk/RXjuL mZfjsgfTIlDPpRaECM5D3THoTdTnb3/gaE9bqB1mfGQaLQibtIyVcDckwS0psQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JnOTP/JAdxkmxHR5csJP0CXQWL/2v444mKdQj8eIXew=; b=sRccZAIld9RGOZgJjRlXuHSKaCAwCdjyBU1ZnZ2PzfaExpR1C+by+5QkmttVJobqwYwpa8 kBJDFR9hTKN1LD55bazPVXEGHr5725Y1BKYSD2pHY7ncHK8OW4EoRZokg6WE7QzJbnhyzo cdA/5mww/FyFI5wdmE345y4RgD+QVhhPVw5PErQHv0op4SW+izkitF62nxB7GiXX5/YvFv Vux+G4L1H0JaMkHLrUYwyOp5AXurrrhmLViue0MPyLisl2/V9ZnQw74Rvw6154hw7eDbww QdnGdBKjHmVJGnjnpaD/KueymnTxeduvoGQNSYC59mdBwMK+8HOQfFtWKKsb+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524110; a=rsa-sha256; cv=none; b=CZ8W8CCBgW+uwtDm/zhuFbkFNA5OB7n6/HTdr9VxI3Q3CpGlZXqh5skQosknTu3zWpM14u 2wnPRN63VUqCxje5b8LrnKyVbKkhrVCE1Maodwpbz2nJwOFos6Du9bxtKOA4ZPJ+e5B23N J1F9ytrFJuN27Ad/zOI4Mf2yCM844WO57TN16lIvspVTaMCFOxRkOtCmmntVXo/r9zOhYP nA+bTVA9cG6F+HlMx5KSaHKSObDNykG5m01Oq9sWrydsouDMHU1vhe0IaWd+mD0nQUoQzr SMqRTkkkosb3Pn+K6qWZ8XsGt5T5Y870pYe3LLb88ZoWRBVFjjBZPibEY0iAYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhjmZ57ylz1B92; Wed, 22 Mar 2023 22:28:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSUrY001682; Wed, 22 Mar 2023 22:28:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSU5e001681; Wed, 22 Mar 2023 22:28:30 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:30 GMT Message-Id: <202303222228.32MMSU5e001681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bc74e50cdf14 - stable/12 - Revert "df: remove the unused fstype var" 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: bc74e50cdf14f85c5b9bf97c3bae6bfcffe58c77 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bc74e50cdf14f85c5b9bf97c3bae6bfcffe58c77 commit bc74e50cdf14f85c5b9bf97c3bae6bfcffe58c77 Author: John Baldwin AuthorDate: 2023-03-22 02:55:00 +0000 Commit: John Baldwin CommitDate: 2023-03-22 02:55:00 +0000 Revert "df: remove the unused fstype var" This reverts commit 647f70e6bf4213f3a892277fcafe2c36d81aa3a5. fstype is used in a call to build_iovec_argf() in this branch, and the reverted commit didn't remove the variable, just its initialization. This is a direct commit to stable/12. Reported by: GCC -Wmaybe-uninitialized --- bin/df/df.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/df/df.c b/bin/df/df.c index 12b6eee0e2cf..fa52eef40098 100644 --- a/bin/df/df.c +++ b/bin/df/df.c @@ -141,6 +141,7 @@ main(int argc, char *argv[]) int iovlen = 0; #endif + fstype = "ufs"; (void)setlocale(LC_ALL, ""); memset(&maxwidths, 0, sizeof(maxwidths)); memset(&totalbuf, 0, sizeof(totalbuf)); @@ -209,6 +210,7 @@ main(int argc, char *argv[]) case 't': if (vfslist_t != NULL) xo_errx(1, "only one -t option may be specified"); + fstype = optarg; vfslist_t = makevfslist(optarg, &skipvfs_t); break; case 'T': From nobody Wed Mar 22 22:28:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmc10tmz41P6P; Wed, 22 Mar 2023 22:28: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 4Phjmc077xz3hpr; Wed, 22 Mar 2023 22:28:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UuRuQxC7MkcKxQOqVv5FQ2qSyosSZCyBFLVze6Pr/ig=; b=AeP/cTdFlPBz/8A0Tv9ZdSEHWWdpb7mvuIMCPaDIqRGukA6/e0Zn+a/SHJJRBoNPcLDaIj Raj4zJyMCIrRg+9LOQSq6uufTNyTXXTJtEd3QcT6ml59zj5u5zddU8mDSlOhmYJbQYaWZd 22aii04ah5P1Ku7P3JwsTSBhfl6/ApqwC6p7l/TvRHbrHifxxmoVC1mI2rK9RgKnwPmV8+ 4+fUKFTsMsjeZtSyN2+o8WAc0NSnN7CIOAV56peXP4daMzTyS8MSjFWZoIGGN+ORzF7H8D jDBF31W350j9fHzLFBM0xIHchAMFK/d+wmfgg/N7ZUrp7hFFwpU8hfEmtBFhaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UuRuQxC7MkcKxQOqVv5FQ2qSyosSZCyBFLVze6Pr/ig=; b=COgsyJU6XctpXBSXrXJmVUySPMLH5pj4uwPPA5pzpmVxYXdowRk4F8HaqaNt+GMl+nUULO F0EYLt/yBNRCLRLoCgmczFj+6x+dxdCcHEPEVUloAvCP2ZGRkF3oYa02Swio9fCO7/cODx RQtSde1LVaFOtkHA4IBB/9zTRKJMbYotnuRIogzM1uEbZ7wX8PUhBC0OMYcqFaNr2vNtvd oh4KiDab+nMc6yKvffhrmii0/sEdr+rvbMPhzlilgUwROVnEvBuH0V04D1GR+Sb6ukj2MI GSRx+ZCZ7ZbTXdeSE2MOljeR84P9lBmJoXjDL18WTp7q5gItGrfji826mVghPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524112; a=rsa-sha256; cv=none; b=tTVsLm2JE+M1A5G7DL2zvFYeg7PKn5Qnp0Gt96lzQq5Pwgbud5Oj/mRGpCUy8aKSbPastT VBFcmOmFQZJtEw+FCE6nEFYKALZmXoXvPdyf/AVcNS/wnYhRAmpZDFxj7KH5bHWzqdzvBX 8zZblBB42Y8bmo8Sk+gxPdZsVnqrShCegWXD2o059wZT5PQBOO2UEONs9YvhyzYSdCc+cv zMO6/RRarsp3LEmGL2n3T7RY8AZ4LWJAqB4uNxg8Hk1OAcFZlLoLCXuxfP/f3kDOy5Q0fh 8zzDC3cieI4KimSp0xw1+HAc+AMWGef1veLzuKzSuisr+/daUup1WsVdg0m2Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmb6L8Yz1BLV; Wed, 22 Mar 2023 22:28:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSV2o001701; Wed, 22 Mar 2023 22:28:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSVCA001700; Wed, 22 Mar 2023 22:28:31 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:31 GMT Message-Id: <202303222228.32MMSVCA001700@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: df3d0c0d0d04 - stable/12 - Declare packed struct ata_params as 2-byte-aligned 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: df3d0c0d0d0440e5fdc3b8fe0696269ca01f6476 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=df3d0c0d0d0440e5fdc3b8fe0696269ca01f6476 commit df3d0c0d0d0440e5fdc3b8fe0696269ca01f6476 Author: Ryan Libby AuthorDate: 2019-12-21 02:44:00 +0000 Commit: John Baldwin CommitDate: 2023-03-22 15:12:16 +0000 Declare packed struct ata_params as 2-byte-aligned This avoids gcc9 warning about unaligned access to the structure when casting to uint16_t pointer type. Submitted by: imp Reviewed by: imp Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D22888 (cherry picked from commit 36947e1f4deacec2a88bba226e9b46efebe8655e) --- sbin/camcontrol/camcontrol.c | 2 +- sys/sys/ata.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index a91aa4779822..63749da3ae1c 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -2374,7 +2374,7 @@ ataidentify(struct cam_device *device, int retry_count, int timeout) if (arglist & CAM_ARG_VERBOSE) { printf("%s%d: Raw identify data:\n", device->device_name, device->dev_unit_num); - dump_data((void*)ident_buf, sizeof(struct ata_params)); + dump_data((uint16_t *)ident_buf, sizeof(struct ata_params)); } if (ident_buf->support.command1 & ATA_SUPPORT_PROTECTED) { diff --git a/sys/sys/ata.h b/sys/sys/ata.h index 6aa1695e564f..0187efaacc54 100644 --- a/sys/sys/ata.h +++ b/sys/sys/ata.h @@ -313,7 +313,7 @@ struct ata_params { /*223*/ u_int16_t transport_minor; u_int16_t reserved224[31]; /*255*/ u_int16_t integrity; -} __packed; +} __packed __aligned(2); /* ATA Dataset Management */ #define ATA_DSM_BLK_SIZE 512 From nobody Wed Mar 22 22:28:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmd39Ryz41P6S; Wed, 22 Mar 2023 22:28: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 4Phjmd14fSz3hmK; Wed, 22 Mar 2023 22:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=paihnChQxKhzwNgWNYcxnD327qbN7hDTMGq5J59LPZQ=; b=xc/8phx5mL0YQ0ccXlhZwtEG0JNr2iY6AF8tyaFrA6ErlOIa2C+kJOS27cqCqsMSHeQQF+ ryGqJ9kg+VAhv5ML1XFt9PKDheLVHGnX5K8/LzXdsHHn2Ldsq3TgbGevkJIslHsBqBnBhE sPLlp1CsBE1EAwmPiMRR7IgHP8XVmzhpX9tgwLKmuHh7S70AXtQJUIyxJLt16izzhuQiG8 CJ1nsGy/bA951xV1Zzs7X5X1gQ953E8K/Sv9+7IDiLeqjl2CzZ40LkeziCEIUlgqQNiNQF dJ9tqpDnH07M+S2maC2NTOM9i4oItTTtJd1njA/UHG32ayrLDkqbNbW7LrwNMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=paihnChQxKhzwNgWNYcxnD327qbN7hDTMGq5J59LPZQ=; b=Jj3bOuaQI1+F4hhTqPU1YvWAxKhdUxzg+x+LBzKPEx5k8ZpD+BhR3c8w8xXYTUKnrDjTUx TFnY4KiHLrCktyHilTGMXU5vy0RKxTBlKovH15OML1fv4ThrOeUvb82G0ceRTp5/cWbBT+ /JB0O9o5t9snVurHMMHen/tfi276oATQa1RVTQZr1zbbEqVqibq1nyZA0zBaWoG8wLhTt7 9ricjmjHiT7f9eRG2Mkn+xAqGLjR+rpjh4BjXFgrwRUYco69v3BTIuYDCyIIV8fyzJMfHm /u/DlROywvcL859HxIwa2ax63TPKVsf9l5WNTYHZUhJbVNXYY0n/b3P5uUcJEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524113; a=rsa-sha256; cv=none; b=tU4XFm1SEnYI//usl//Zd6fOKtt5ARp+YnRFycL1WQOuRrNDAOiVr0Jz465mltepIEkEUt M5QSEEWUMChmrnQXYdx8BnOYrITP5hsR4gz5W+bD/PCwJPAKAYK33NhLHPjleWa0RxFafy XTSZ9UViKs+lESDKyzgZOMfkM89+Nseh5tMGnsz+fqp5WFHWs7UcCuZ9CDW/c09RfVRaYj KeqboIApV7k19OB2qwhVR/cDzit5TkpsPaxtztrUBRWY1qjfNA4Rkr19l2b5eCzpcwtwsL 1iEBiyMuq2I2ng/V914zTVvjCxs/UaIxc4yzwbx5o4XDdcZdbMA8BgAlk/Zk4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmd09P1z19v6; Wed, 22 Mar 2023 22:28:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSW1r001720; Wed, 22 Mar 2023 22:28:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSWSQ001719; Wed, 22 Mar 2023 22:28:32 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:32 GMT Message-Id: <202303222228.32MMSWSQ001719@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fbe7e06a3ce2 - stable/12 - libsa: Add missing GNU-stack annotations to _setjmp.S. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: fbe7e06a3ce279e0d0afd37118a46981b5d25f05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fbe7e06a3ce279e0d0afd37118a46981b5d25f05 commit fbe7e06a3ce279e0d0afd37118a46981b5d25f05 Author: John Baldwin AuthorDate: 2022-11-22 16:36:40 +0000 Commit: John Baldwin CommitDate: 2023-03-22 18:16:20 +0000 libsa: Add missing GNU-stack annotations to _setjmp.S. ld.bfd marks the stack as executable for the crt objects due to the missing annotations which raises a fatal warning starting with version 2.39. (cherry picked from commit 69f6399c3733d717bc3dcefda7fcc031f06cef0d) --- stand/libsa/amd64/_setjmp.S | 2 ++ stand/libsa/i386/_setjmp.S | 2 ++ stand/libsa/mips/_setjmp.S | 2 ++ stand/libsa/powerpc/_setjmp.S | 2 ++ stand/libsa/sparc64/_setjmp.S | 2 ++ 5 files changed, 10 insertions(+) diff --git a/stand/libsa/amd64/_setjmp.S b/stand/libsa/amd64/_setjmp.S index 53ea6e9b5d52..38f27dc1968d 100644 --- a/stand/libsa/amd64/_setjmp.S +++ b/stand/libsa/amd64/_setjmp.S @@ -90,3 +90,5 @@ ENTRY(_longjmp) 1: movq %rcx,0(%rsp) ret END(_longjmp) + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S index 95b0ea8037f5..5766b25816ae 100644 --- a/stand/libsa/i386/_setjmp.S +++ b/stand/libsa/i386/_setjmp.S @@ -75,3 +75,5 @@ ENTRY(_longjmp) 1: movl %ecx,0(%esp) ret END(_longjmp) + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/mips/_setjmp.S b/stand/libsa/mips/_setjmp.S index 972fb2cc1ec8..68a5d8cbf5be 100644 --- a/stand/libsa/mips/_setjmp.S +++ b/stand/libsa/mips/_setjmp.S @@ -105,3 +105,5 @@ botch: jal _C_LABEL(abort) nop END(_longjmp) + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/powerpc/_setjmp.S b/stand/libsa/powerpc/_setjmp.S index 7c7c24b1237c..e5b589cf7269 100644 --- a/stand/libsa/powerpc/_setjmp.S +++ b/stand/libsa/powerpc/_setjmp.S @@ -113,3 +113,5 @@ ASENTRY_NOPROF(_longjmp) /* f14-f31, fpscr */ mr 3, 4 blr + + .section .note.GNU-stack,"",%progbits diff --git a/stand/libsa/sparc64/_setjmp.S b/stand/libsa/sparc64/_setjmp.S index 8df29e6ba750..9927b8364850 100644 --- a/stand/libsa/sparc64/_setjmp.S +++ b/stand/libsa/sparc64/_setjmp.S @@ -92,3 +92,5 @@ ENTRY(_longjmp) retl mov %g1, %o0 END(_longjmp) + + .section .note.GNU-stack,"",%progbits From nobody Wed Mar 22 22:28:34 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmf2jfCz41P6V; Wed, 22 Mar 2023 22:28: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 4Phjmf1zbVz3hrl; Wed, 22 Mar 2023 22:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPNcOUi7CiQxByB7fmWGUE1tlg+z98Agnqrplc/vijg=; b=VBV1U4GAjble0HVKm8O6BZis1ShNxfSXgDFGGT7EyazkKPhlr6+JSKcCzzBNarhqRoRqRE 6ZJQwa+HHHM2/N3KJHaCdeNydTubMPvODxGQeDxsCGKOjRSx5Tm2ma+Nkyso4+FkIvPVHj 6+WmwBwfhtjzyuhI2L3Ixj8RfpC3QLf6fjylTdqlqVyEwayFK0rkSCGyuMaYwR+SGyeOrW 8qSCvoeeXLpMng3wBfE5FnGiO6PodajKyGn6qYtgM5525nD499fq+tdHGw7jHDrWsrbq0Q CQ0xx83RbyFGKL5bKsl604Mo4ajX8R6RlCErZE51nPlc+nLAaxfZqdK6EidZCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BPNcOUi7CiQxByB7fmWGUE1tlg+z98Agnqrplc/vijg=; b=SP3PVHiiwJ+mdTmMVr4xLTjw7qMPXL8e0xIv6AaLDoGqvQ9wE+HsOhP6YTkAQE990pumXJ PC3aTuc5gPULNGrwl8eSGYrXBhFjbHUlaxqrOj4pJGO8E6QYqs4HZuSepA2AvcEGEkK4kB fGL3mLsYkj1VG3DmF9BWuFPWLAJEU6qgzxQLpoOPOj+fB2pG8rVnNj8VrzQ9xFdTL5pIBT npCTR5D2ziLjzw/sfX6A7jcc3CGBlYHlBZQ3k7QIJwLDGCTzIWiMiPMjjYn1LeUEaTtM+T pgnYBjWZuST5Le9V85U++2bUaIAK31UNpWhWGR/GG18j7KAzfKFkvsL+n9k7tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524114; a=rsa-sha256; cv=none; b=mbhZ2Sccem15qxLyNMjRLI9jAx3ZW4c3iNJgBGfU9/ww7Z4Z2A0WYUPkDlKlQDaJHtPJB9 88x/AtzzVZiIhCCFr/vHCIdU4p0c/j677L6IenA3c0KNam8cNFRkOJqvxO1bFOBaCun3wZ lGRBdLUciGJzcsXJL2IwS51LFcnn4WQEPjEZ0nTtA/icC29iSNMsB2rpgYl2cO8CHminr2 fWNGyv4cBFuOSmGV0pKyrGALmiNW65c9fV0RBYFXAuQsmkSDYJXVdPcjiVyISwCQqAr8KI 21h03iEXg0B/b2Rg9PLILUEub7nDIUdTBnWRvWrgKA4vwGexhv96NToi73lbdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmf15cRz1BM6; Wed, 22 Mar 2023 22:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSYVR001739; Wed, 22 Mar 2023 22:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSYxV001738; Wed, 22 Mar 2023 22:28:34 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:34 GMT Message-Id: <202303222228.32MMSYxV001738@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8e7ba6eb44da - stable/12 - stand/efi: Pass --no-dynamic-linker to ld.bfd >= 2.34. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8e7ba6eb44da1c4dc538954c7e1a686aafc72b8b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8e7ba6eb44da1c4dc538954c7e1a686aafc72b8b commit 8e7ba6eb44da1c4dc538954c7e1a686aafc72b8b Author: John Baldwin AuthorDate: 2022-02-02 20:18:43 +0000 Commit: John Baldwin CommitDate: 2023-03-22 18:23:00 +0000 stand/efi: Pass --no-dynamic-linker to ld.bfd >= 2.34. ld.bfd in binutils 2.34+ now reports an error in more cases for custom ldscripts that do not place PHDRs in a LOAD segment. However, EFI binaries are not dynamic binaries which need PHDRs, so pass --no-dynamic-linker to disable this check. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D34124 (cherry picked from commit 8bd5e2f15cc9756e7d6b7feb43ec47f18a38e2bf) --- stand/efi/boot1/Makefile | 3 +++ stand/efi/loader/Makefile | 3 +++ 2 files changed, 6 insertions(+) diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index bf3860f36b5d..a11ad17eeb30 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -66,6 +66,9 @@ FILESMODE_${BOOT1}.efi= ${BINMODE} LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE} LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie +.if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400 +LDFLAGS+= -Wl,--no-dynamic-linker +.endif .if ${MACHINE_CPUARCH} == "aarch64" CFLAGS+= -mgeneral-regs-only diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 993a869ab13e..9f782f158c54 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -85,6 +85,9 @@ LINKS+= ${BINDIR}/${LOADER}.efi ${BINDIR}/loader.efi LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE} LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie +.if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400 +LDFLAGS+= -Wl,--no-dynamic-linker +.endif CLEANFILES+= loader.efi From nobody Wed Mar 22 22:28:35 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmg3Fzkz41Nn7; Wed, 22 Mar 2023 22:28: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 4Phjmg2j1Qz3jBV; Wed, 22 Mar 2023 22:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zX8LZTVMThg/QacnSGSRFJtCb78T4Zz1E9f9N+xs4HY=; b=mCZZaf3hB0N3v+OrgCc8FZmYieFxJiaA4Z0sVuheEMODoYSf4fBEMOWskq36Rn9h45MOSQ QsHZ5RbCafGnhYdGsyuEgJ8Joc7dIkRaR/YkB0ZRiyFpSxSmuprO14P57ztYaQh1qcAqnA LyUCtlIceku7x45lM1XzBruT6f15XElWx8MbUL6dA/GL2HeCUmh7WVH3sWGSgV++FKL6Bo KqAsu+t+aLAEF4w7r7ea4u35N2jOiuvAgHMDN9d+qed64D/mg/gnWcdH90679u7KpVr4PH ScfiI6Gj0YEC6TxLrj21IZYzdXo0as3/DFuLhIiOpjhKsiKmY8o5f7kdSW8jlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zX8LZTVMThg/QacnSGSRFJtCb78T4Zz1E9f9N+xs4HY=; b=PTQosZB72CJgUmvs8ytVs6jAKk3Fmx1Ra0s0QE0OPFzi09HbXBuHOocLib1qlyjjU7CVMq MmqljSwpjDqVrvrpllj10fXW5QTxDZr5I7qNfOddNQum+JAJ3CeGMi5ExPzP15NguMVhAK RbWlNx9jWD0Yd+qSQB3RzbVRAnIQf/JEoyIB6AHrZxSGGWRbbfaDrrCRZawufa341SpAqb urVu1Yj3NCi6mjh5m29U+vs+IVZ3ocg2LHOc1w54fmcOIh48fICfQ3j+Gglq1QBGePvvgR QyvUDFjalB6oNcLP1sKUUVxTnF2ftZufIV5jlG3vAv11L+E34SPyLbSKH12fcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524115; a=rsa-sha256; cv=none; b=M7GP3hZs4yvtBQohI5+RM2R0AiULvl0LmxZPbI4MxQ4U4J0PntS2E8yUrabdEIbtOpoXIp CbbLhBGFptN6KXSHiSpSkI16zU1jupg/aY18VzvxmGn/Xa7Yq337akcD1IoKWohqqWrNuo eeTr7SSRNGjxFJkh5w92xz/446KBk47QHfi1ooas3UEAKf074JfoQFhLvoagheCwpdpO50 3YBpa5JGuy98POjULmHQfMft+M7ZqbHQdQDAb6L94iJ48RMOQ6fDqlLKXbVrxTh6QQAaXR 1uV6PPk7M2NwcYDhicGSferkaThj2BxVz4XNd1K2+YIaRoMO9qbEdIqTESXpaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmg1npjz19wQ; Wed, 22 Mar 2023 22:28:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSZuj001758; Wed, 22 Mar 2023 22:28:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSZgu001757; Wed, 22 Mar 2023 22:28:35 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:35 GMT Message-Id: <202303222228.32MMSZgu001757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 11ab827a1ce4 - stable/12 - top: Remove a duplicate extern declaration for show_args. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 11ab827a1ce4ec10cf16721019d53b94d044afb1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=11ab827a1ce4ec10cf16721019d53b94d044afb1 commit 11ab827a1ce4ec10cf16721019d53b94d044afb1 Author: John Baldwin AuthorDate: 2021-09-15 16:03:17 +0000 Commit: John Baldwin CommitDate: 2023-03-22 18:47:15 +0000 top: Remove a duplicate extern declaration for show_args. This fixes a -Wnested-extern error with GCC 9. There is an existing extern declaration in top.h. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D31937 (cherry picked from commit 4c9cb057bd96bd10278f5ce7a735fff4c08e3c30) --- usr.bin/top/machine.c | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c index d41b3e4f6b74..4f5d5e26ca08 100644 --- a/usr.bin/top/machine.c +++ b/usr.bin/top/machine.c @@ -879,7 +879,6 @@ get_process_info(struct system_info *si, struct process_select *sel, static int cmd_matches(struct kinfo_proc *proc, const char *term) { - extern int show_args; char **args = NULL; if (!term) { From nobody Wed Mar 22 22:28:36 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmh41GTz41P4J; Wed, 22 Mar 2023 22:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmh3Q4Fz3hwl; Wed, 22 Mar 2023 22:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfyKNh8NNc9lN1xC2Bj7Ps27P+hgua3dFjsGDtbd+vg=; b=AblONOiNAxaKGOsAY+uYjb97AWF1+vXsk1FBfPyS5DhS1K2Fm3kAsHxn/1IJCRC4sFMc/F 0bWu/eLhToLjf1OsF5+138TIDyiTp1CODXq4wnTBHbVDmPc3QikgaltBua799EfvDIoVl7 b2iVTuvlkm10mIcGRReSk6hWfHLqGeZysTF0sJjjFLSU42cxHhdqIewVRKYc8kHTF19dLj GPYHWBBn76kJjYebQtAN1GSwPe+aP1f/2HNcS5rlwaaGCCJ2Rtuwkr4YADG6dG7Tp85qhI ORMDB+XJUNWnIW+KL6JsejwaTAXNFI4rHXYMHiafz1lhNHPIhHr6puL82juL6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kfyKNh8NNc9lN1xC2Bj7Ps27P+hgua3dFjsGDtbd+vg=; b=rxorbPhxkQDIPnBWpNiIvS99Ff1rcRqujryIbBlfDFLPfLdrwnnyL5ohtCXDbpdDNCykwc /7vv//WH6fQ9S0EYeg60mOJTWxPiu3mDTfDHBGs0uk9gYcea6Mkjnw88SP4L86Kx+L4MEk mWnoqHI0n2VBOFuWkMo6AcadmkNKqnT0EkUT6EbG/bcvru4vldkTxBCGpiKHvVRpy10SB+ 3rfdscL0auUboUSZPNSoAHE3VQIcKTI17w0GMgxy1IO34Sf1K6CtNofBUb7K1hmYayizfd pCJWMaVlPgrQApZYyBphHLm5H3ar+i71K1jU4s4i1Ex4NwhSr1lqOJt5YQF6vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524116; a=rsa-sha256; cv=none; b=cvul9O8dmPPRphcfuUq5NKofE5pQwHsap7E9PYxtWvdErxvADW7SxoZzrcFuHph+snTs8J NaGGP3KhzBSI1DFSOpZhVXapPwx4ksQuL3Wuur4Iv0UShCqjrV3xh+tcfhwwuRAqcLDyKG YogLAwu0DRg4CE3q8hCyMaQ3BCezLSvLf1uXkNupi6LwX0B1ygRk0pDoCPADighu8DdOf/ PUDuuVguUCLbBkJek2b/qZpk4oJI9RITwm4IienrcP5MZaKrfxVycjPVz5aXqAbWDV9asW 0a6GPF3twwVQyeFcL6WI6afP1bIMCi9I0atOXL715jLWTyn9/rRntpG6exVh1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmh2VGWz1BCd; Wed, 22 Mar 2023 22:28:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSans001786; Wed, 22 Mar 2023 22:28:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSa4f001785; Wed, 22 Mar 2023 22:28:36 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:36 GMT Message-Id: <202303222228.32MMSa4f001785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 51666ee9660e - stable/12 - Disable -Wreturn-type on GCC. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 51666ee9660e12f3e38a43b54fa879c680b0eafa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=51666ee9660e12f3e38a43b54fa879c680b0eafa commit 51666ee9660e12f3e38a43b54fa879c680b0eafa Author: John Baldwin AuthorDate: 2022-02-14 19:48:47 +0000 Commit: John Baldwin CommitDate: 2023-03-22 19:22:23 +0000 Disable -Wreturn-type on GCC. GCC is more pedantic than clang about warning when a function doesn't handle undefined enum values (see GCC bug 87950). Clang's warning gives a more pragmatic coverage and should find any real bugs, so disable the warning for GCC rather than adding __unreachable annotations to appease GCC. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D34147 (cherry picked from commit 2f6a842484675bb8fe9fafd40d90c06f13e02403) --- share/mk/bsd.sys.mk | 6 ++++++ sys/conf/kern.mk | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index f228984719c7..7211b54c1804 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -196,6 +196,12 @@ CWARNFLAGS+= -Wno-error=aggressive-loop-optimizations \ -Wno-error=stringop-truncation .endif +.if ${COMPILER_TYPE} == "gcc" +# GCC produces false positives for functions that switch on an +# enum (GCC bug 87950) +CWARNFLAGS+= -Wno-return-type +.endif + # How to handle FreeBSD custom printf format specifiers. .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600 FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__ diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 67656914dd1d..0f311fba2b23 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -89,7 +89,11 @@ CWARNEXTRA?= -Wno-uninitialized # the few files that are already known to generate cast-qual warnings. NO_WCAST_QUAL= -Wno-cast-qual .endif -.endif + +# GCC produces false positives for functions that switch on an +# enum (GCC bug 87950) +CWARNFLAGS+= -Wno-return-type +.endif # gcc # This warning is utter nonsense CWARNFLAGS+= -Wno-format-zero-length From nobody Wed Mar 22 22:28:37 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmj6mQ7z41P8X; Wed, 22 Mar 2023 22:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmj4QF7z3hyk; Wed, 22 Mar 2023 22:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EKXdUHXKe9bNt58qnjRRrRbczJuZ4w1gJ6Y2wk9xZpI=; b=TmGNHmlL1ufLca7z3ESEQaYfMhx1JMP/8h7EBJuw2ngkaSLtUnhfIMCiI7/t0PCva3mP2w LgECkFt3q2up/z4uZtqtGB6LagmEubp33rVjXMkl1vtpR3UTdpUUtSwtmGnRdaSMwY86/j lhTQcwml3nj/ikEMDR1y/ex8kLnD0SEaZ6YtU0+9OHmt2ezjD1ODhyn+R9jrPjqWWdITxs QYSHS8U33hUd+zKo3dJmYpsAwTiK52uVPz4mgCIII3EznaRl/NBJO85v1ktSMRoSZjgUCe 3GjqKVKnmGh6uDFVaUprnXH5b6by51qJyLeDgGak9t3lyLiANlxMMiGycaf1lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EKXdUHXKe9bNt58qnjRRrRbczJuZ4w1gJ6Y2wk9xZpI=; b=BkT2eouUHJAT6QeXxmdYif3gzhtWi36rXvNQinhIB0j+3vXv7nkXaobPEL8+VuDSh70apU d2CSOWeDUhs/OixkP0/w+oK6T7NJWHz28tZdZyBSMt4vhEsGGwcBjfxZFLkieGa8cN9Ma/ VDXMM3tcRdNNCBVcQ3UupknC9RupSeL3BlHDNGG99MZOlWR1+J5ldyAS/4/+Gnp5Kxf6F/ yzNlcscDRa84sHlwLVlFssSD+8nptfGtX/rScVy6QQWL8IvTVLN6MAT/RdAAHzS6cGhQb4 tplOtoVwYKnvweZQ9MLZrKEwNfv2YZvyIJ8PKfXyo6sD5TOoWHvXQN/mwi9dmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524117; a=rsa-sha256; cv=none; b=X2IY+Yijo9JsPnjn4KPWqxFtcJuCVmq8aoXefLZ5I0tW3VNnk4jOna2frCB5d59K+1dVDn jIB/n60ql8gabmkmjX8Z2hG3shBFYA8dfeN8uUfcHnVMFZaUHTx65/RVC0vO3VwEpmUF60 drFDECUlMLLoihSA7uduVqkl8gnjhQ9PXjfWQSK9svf7pF818WWatpiizOeXgaGLuB8MGe eH5ggwWNozuGWvMdQT/rLgwvUY8kIKoZtFmkJgkwQ0GzCuvrwMS2vNon9LSuRSM5E3pHIT XXwkUk7UZRn8rFuWj4A4ZJbAP+VupbyPgHWPqtqukGDppT/QLbF1Egxy7UCfow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmj3Rgsz1B6w; Wed, 22 Mar 2023 22:28:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSboO001805; Wed, 22 Mar 2023 22:28:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSbA6001804; Wed, 22 Mar 2023 22:28:37 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:37 GMT Message-Id: <202303222228.32MMSbA6001804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5bb908625468 - stable/12 - Fix GCC 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 5bb908625468bfa3b0c49722de2412e009d38bff Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5bb908625468bfa3b0c49722de2412e009d38bff commit 5bb908625468bfa3b0c49722de2412e009d38bff Author: Li-Wen Hsu AuthorDate: 2020-02-13 19:05:19 +0000 Commit: John Baldwin CommitDate: 2023-03-22 19:22:25 +0000 Fix GCC build. Sponsored by: The FreeBSD Foundation (cherry picked from commit 338450436d9d691a18fb94373c58e91aa3fcb374) --- tests/sys/net/randsleep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/net/randsleep.c b/tests/sys/net/randsleep.c index a602d06921e7..8bbad5b7557d 100644 --- a/tests/sys/net/randsleep.c +++ b/tests/sys/net/randsleep.c @@ -37,7 +37,7 @@ #include #include -#define RANDOM_MAX ((1<<31) - 1) +#define RANDOM_MAX (((long)1<<31) - 1) int main(int argc, char** argv){ useconds_t max_usecs, usecs; From nobody Wed Mar 22 22:28:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmk5qfKz41P2c; Wed, 22 Mar 2023 22:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmk4zhhz3j9l; Wed, 22 Mar 2023 22:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyduK/8C2GBcPIDzpbcSaJ0VqBPDSxRLDud4ClVMk+U=; b=mHqNEArxIJ6yAzVFQccMprGW6p84b5yDjlPcqGbExlcJ5D/MuOkttNUgB+6s/Y8MUrgEwg /tlglAFw+Eswd1lH4vKLDrpxOJItXS+MWzI4W+IyzJKy4/087PJI9r2m3nPUMl70vyMpwY DWqeIjgpFJJA6E3S272F2IS+YwIzaO9nkMKITC+mPhaYUV+bM4G8SpIivhrm4QXYhSjbCY edI0lpWRxSPln7AyL8jvtgTjNX9ZWvAISSpfWQCbF/hRwVo4IEhLjbuTGg2EcN2+0QLDWH /Rk7HjgkjRVN8Ft+go9fzzLgie3t5C1h//aYz8XXSllER8zdDUBjIk9ijl1nSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jyduK/8C2GBcPIDzpbcSaJ0VqBPDSxRLDud4ClVMk+U=; b=Sf/+lB39dMd+4d8a4pOkz8CY/aCCRsvKcwXpDTVNFeNQY/2llWnyjs5m032Y+P+lq2PDHJ xAjDrvvK48NsyotYYVOmy+w/Q09/KPdQGgc3evHlAQ7b1hyGXJPusBgwx5vwtIElPvbsbu O1KlQoOZsSB9uSOQoHlZ2KwkWa69Mtui5Yjt2+gENN3wKWgmw5tduKjWDpyFYKIMTJuIkW COWyH2YSOr3kJFtVQaTuTnjBHvhex6vn0bIdduI3Pu+IjTmuL6QVN1dWqWEQTMAn3eTT8y TmjHJM6FI9PBGizEk5RJqH6t4s7Le7zX5vI2VmlMgd2QHqjYFYiyMi2BTtiKvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524118; a=rsa-sha256; cv=none; b=HvEx3YDCoOu0RDNnQ+Fd7SAIpJomPb5jUFlnVRMdDSF92JKoepC+P2ByKspwSQZqJpfQjs gXkdzy8AHWQlVsW2JsDHxg1mEqjqhn44+sMNCiQxVdZX9cDw0mWPbOi6Q5k95cP+GJgZB0 lkSZrfuveemmbFBxqm3sz59EIHTSsK6Hzz15x3IvIEHiHrY0Df9WPKm5thpTgDmIZKuwxA IC/tzuORuchLMfwsP7zWzcloMMVe+jIGQxtBypPbG1AMPtrDK1KFkubZ0Ic9NycYCDtFF9 GhkmbdU9LTwpfLQmx6rsxydsbiLHjisibG9xQEE/wHwvGfzGrbFJG+oYxmAIyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmk44sNz1B93; Wed, 22 Mar 2023 22:28:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSc38001825; Wed, 22 Mar 2023 22:28:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSc6K001824; Wed, 22 Mar 2023 22:28:38 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:38 GMT Message-Id: <202303222228.32MMSc6K001824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: b43c3200a4f2 - stable/12 - Properly fix GCC build in r357867 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b43c3200a4f2f308194f17dcb390cad8f51905e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b43c3200a4f2f308194f17dcb390cad8f51905e1 commit b43c3200a4f2f308194f17dcb390cad8f51905e1 Author: Li-Wen Hsu AuthorDate: 2020-02-14 09:25:29 +0000 Commit: John Baldwin CommitDate: 2023-03-22 19:22:25 +0000 Properly fix GCC build in r357867 Submitted by: kib Sponsored by: The FreeBSD Foundation (cherry picked from commit c27ac74f9cfea08a96087135183ad70a372f735d) --- tests/sys/net/randsleep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/net/randsleep.c b/tests/sys/net/randsleep.c index 8bbad5b7557d..dfff24e90db5 100644 --- a/tests/sys/net/randsleep.c +++ b/tests/sys/net/randsleep.c @@ -37,7 +37,7 @@ #include #include -#define RANDOM_MAX (((long)1<<31) - 1) +#define RANDOM_MAX ((1U<<31) - 1) int main(int argc, char** argv){ useconds_t max_usecs, usecs; From nobody Wed Mar 22 22:28:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjml6qS8z41P6n; Wed, 22 Mar 2023 22:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjml5z7Yz3j2q; Wed, 22 Mar 2023 22:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gHvJSt6Mzx+LaYzlg77YLzBDzk4RkCUUZNojo+csyE=; b=GXdBUcAaIzm5HtHlrJWt/QPUxFlxe1tmHx4Pbgl2j4xxoqvwiulQpkJBZF+OYBWXN4IYW9 N+8jKrYrFBlKZMv1ZVxiZKTPOSv3R05Fe1FIxgHHTdG5vWvk52fcTR8q7vKSgCt2V/XX6l KHgXaSI6I4YUlOXH4ptP6wWUrNa7phzseASclINQ/jvq34xIlh+VbzIq10S1Hfnc3O2Ujr lLBvuPodVaDc4BLpLyOGB2B7EphEQc8e0FcEjXZBpl9yOiuRjuhUvV8gHQ3hMKZqHdMNTB 5I8qW5kSjIXx2RvYzZTJa0R67WrZo+HF2ILRVi5dNGFJMTBj4e/6iMjyFBsbzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524119; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7gHvJSt6Mzx+LaYzlg77YLzBDzk4RkCUUZNojo+csyE=; b=yPRZ9w9eC8DS6VeisW1sbXdg+zDyS5+/1dLITzMRcQZmASJlF0Pg+fyaveG2jQKplprAgh vjWdpDx4MU2LoyY+VBiWPZAT5xofSomlsbNG83FB4+8afhddrxmJdRwNp/+yQLPqquNLHR eCg+LbGdSe+l28FyWxUtaziJ21zQ9669Tdzmk22pdVmtrseV1nONHfOFkZYNTGvK7HevDL 6wjODq3YPCXxxpS97mhpRJFEHaZr3s8Yw9hbmDyE1gwGtDJPHeBTjSGC3uH9aR2MenIxqZ bnBByZIOaExUOgmZ1mrz9zthDoCF/25vYhTptAEHgWwzRTnPlPt5Y2JRRE+XNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524119; a=rsa-sha256; cv=none; b=nFo4iXHjQjjpjiCdUbfCEYrpVrsAFTge9Szd0S7M7T4GJ5YUFbQ1oZUHYlC7j/euMz5laK UlGiE0Jot1Do49mxrF0RSYs+FRJjyWto2xhjy38DMrTM86Qr90n4sIhR/StqdFHPtB7FoD 2+AYxvFhsqGkfEOcluouiq8u7CaJVla/GAI6+6YXqV/vY3I49tzy9xVcgR8TlDSaxYX+3i FQ+adHgbVgSk7dbscqHTAtVc2uQhLIYRhOFWBqmbigSWkr6s4Ealgzy/12gCtSpxPM0kBP tNz8lQtjVPfsU0EIcf6BLA9tJVgMaNd86RtJp2RHkU4aYo1fQUGBGquOvhhSCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjml50rlz1BPF; Wed, 22 Mar 2023 22:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSdNe001844; Wed, 22 Mar 2023 22:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSdiZ001843; Wed, 22 Mar 2023 22:28:39 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:39 GMT Message-Id: <202303222228.32MMSdiZ001843@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fd153a0a4cfc - stable/12 - rtld-elf: link libcompiler_rt on all architectures 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: fd153a0a4cfc180241a8a43e19fbe135cef4868c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fd153a0a4cfc180241a8a43e19fbe135cef4868c commit fd153a0a4cfc180241a8a43e19fbe135cef4868c Author: Ryan Libby AuthorDate: 2020-12-28 08:44:25 +0000 Commit: John Baldwin CommitDate: 2023-03-22 19:22:25 +0000 rtld-elf: link libcompiler_rt on all architectures Statically link rtld-elf with libcompiler_rt on all architectures so that we don't need to try to pick and choose the bits we need from it for each architecture (we now leave that to the linker). Compilers may emit calls to support functions in this library, but because of the use of the linker flag -nostdlib for rtld's special needs, the library is not linked as normal. Previously we had two different solutions. On some architectures, we were able to extract reimplementations of the necessary builtin functions from our special build of libc. On ARM, we just linked libcompiler_rt. This is motivated by the same issue as D26199 and D27665, but should be a simpler solution that will apply to all architectures. Reviewed by: arichardson, kib Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D27736 (cherry picked from commit 63f93c7e11e33149429ddc2831cd1683b2e7f3e1) --- libexec/rtld-elf/Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index a51acf68068a..dfa6d4e6b85e 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -68,14 +68,6 @@ LIBADD= c_nossp_pic LDFLAGS+= -L${LIBCDIR} .endif -.if ${MACHINE_CPUARCH} == "arm" -# Some of the required math functions (div & mod) are implemented in -# libcompiler_rt on ARM. The library also needs to be placed first to be -# correctly linked. As some of the functions are used before we have -# shared libraries. -LIBADD+= compiler_rt -.endif - .if ${MK_SYMVER} == "yes" @@ -103,6 +95,10 @@ beforeinstall: HAS_TESTS= SUBDIR.${MK_TESTS}+= tests +# Some of the required math functions (div & mod) are implemented in +# libcompiler_rt on some architectures. +LIBADD+= compiler_rt + .include ${PROG_FULL}: ${VERSION_MAP} .include From nobody Wed Mar 22 22:28:40 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmn1GNQz41P4V; Wed, 22 Mar 2023 22:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmm6gJpz3jDk; Wed, 22 Mar 2023 22:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tLwjd7orWdmUTK2AKWRDddl9aJzVMkbESqTUHlC91U=; b=WI+34sPg373WtbSrrSygcwg1DOiWhFotu6ycFrVQT43/LkGcS8IpCp+ZZI2vqo/GYh3WDd gYIQ3EMyihXBSRmvTOQHOJJtJbrDtQY6gORo4D5pzqK5BX0eG5qrOLKT0wsW+b18k8Cl4p usBx0T2HcXV/fwDzDWZwSRzSiON+aeu3sZOCnILCjfV2RcuZup3wj7HcyV15yxMfR+5Fav 6noq7pwQZcMicdByn75O3nbnNpHVBGGPIQjnePqSu+gp8vmBPGK3Rr1gx7/mIORZ7qoCW7 jwVv84G9YoHYkwhtJLyXVabw9m34wI7KqThPNKwZS3il4jsIeYtl+EfBNXYtew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5tLwjd7orWdmUTK2AKWRDddl9aJzVMkbESqTUHlC91U=; b=XxCjPrpbVp2pRQRhgp/LPXvLCs0Bq4IoSrbyTPxiBXjZAlfaXgnyKLjiCmkidFPnZZeIvG Lv6Nju1Htu3OtTcxiMyAScsX+w+y91iNRw7ufJKteSo68M2ESe4REtUtnFpiGtKvSkkhXR /Q7qbIuraN+aKR2hqD3PKiKmrrMq4LokE5XnX7+nBOpl6iFgruYz+6zdJGqCDNyS8u5H9X 5DyW6cUlj1TsrSDQLXZ6cBmX9cK4haOGLJ+u+kjgEvhif00rtgsb7TA+wGV0x5QYLzRBni /5su9d14mZTEsaQ9s1HQaaMi623XzV+EtfsPoCYEQn0rSLnv4W/SecBZQaqzyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524120; a=rsa-sha256; cv=none; b=Sw/oSmwwO0iR67J7do6MMn2dSeZoYm0U0xjRsCgNEDAKxG6OCLIPqv31IOvGdjtIcxDTYE GRydUdXwdBlkILs8thvdRimsp0ZMkjrKb621nRjRZxKq6VJxFN09FuV0aduVw9Gk95a1se v+Gll+CulHBJ9xDpLitzG2vjk8XoznHhK0HAog9nMO5cyBM45XuhV7t5AHYOViECLefaiB oqNrd/9y5jJc52XWFAsD9tKY6UdSV+fwfOv//bdk8TK7j5wPBwEWiCROfk1+rqibEgiYc3 ybJwvIwU7jiYYlxdNiizARpgTsYnX0geJPXxdNKKLG5DF7avFmNputrZOZpN/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 4Phjmm5mqYz1B94; Wed, 22 Mar 2023 22:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSeYt001870; Wed, 22 Mar 2023 22:28:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSecW001864; Wed, 22 Mar 2023 22:28:40 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:40 GMT Message-Id: <202303222228.32MMSecW001864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: d86f0502b1ec - stable/12 - Turn off errors for -Wmaybe-uninitialized in GCC 6+. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d86f0502b1ecba11a2cc6d86c7167d872fb471fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=d86f0502b1ecba11a2cc6d86c7167d872fb471fd commit d86f0502b1ecba11a2cc6d86c7167d872fb471fd Author: John Baldwin AuthorDate: 2020-08-04 18:19:29 +0000 Commit: John Baldwin CommitDate: 2023-03-22 19:23:37 +0000 Turn off errors for -Wmaybe-uninitialized in GCC 6+. Recent changes to trigger this warning and seem like a false positive. Differential Revision: https://reviews.freebsd.org/D25726 (cherry picked from commit a02fb76280fd663aa46843423002d605a7bd0796) --- share/mk/bsd.sys.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 7211b54c1804..45f0dcc2c6cf 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -163,6 +163,7 @@ CWARNFLAGS+= -Wno-error=address \ # GCC 6.1.0 .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 60100 CWARNFLAGS+= -Wno-error=empty-body \ + -Wno-error=maybe-uninitialized \ -Wno-error=nonnull-compare \ -Wno-error=shift-negative-value \ -Wno-error=tautological-compare \ From nobody Wed Mar 22 22:28:41 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmp1LW9z41NqV; Wed, 22 Mar 2023 22:28: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 4Phjmp0tkvz3jP7; Wed, 22 Mar 2023 22:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iHNU1XLbZh6FGEqP/YLyuUpw4THqvPFtNwg5X9cqH2Q=; b=pOND4FzK6Oym5bG4YQ/cZ6z/pY4be78z4xBNhFVF4OApq9JeKWKp5MW0/ZBePAg3KZuOdE Mh/GRapOCAYM2/7CnwsZxOuK1E5SyYmTsNbD7+Nm4nOsOVIDF8AXEUT/NR2eYAcu/dQWXm MowRDXAlULuaTI7JkYsw1Usn+Kp5/mBsi6DLYLbL0f5SSZyTXgDX0vCDl36C+RC0LxIl8Z LcTKQq3KdFVuyaA6p+O8gX3UOctpn5ym16VxdgE3PoDOgTLoXu1B6aT3ij7PMk2MNFFEWT TJB2NifbpKMRXaw1KfgozNWUXjQcC0YOAlPOCCobWU87A702J2q2upO8CCUbnw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524122; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iHNU1XLbZh6FGEqP/YLyuUpw4THqvPFtNwg5X9cqH2Q=; b=IXeIqfWjg3bwX7dmG6ljYy21MVQWt91+B2EhQwUKj5sXRc/tWQY3xyvjyfpTfsaKq7v1Od 629cHzs0I4YtGRsDpj3PAlg1lJ9F+titSCYGjCoM5vhyEYM5Yao3sRj61ep0e/7PHyT+d3 yKj/hSulAL8sHX+Yh80mnb0zg483RIWYovsKZp7AJosTuk78RwlLxk9Xwq5c0XdSQZjdgz UkYhxfHLDZdZO06X7SOzSrMJ+ige5dsnB0MXAackJNa5riJkiyxoMJTDp0V+zmZrwvszZq l8z7JzDUaYfHelXxW6q6DAl+hmhHf34FW+FGw9aFj+N5/TikufeRiSFiTR1qcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524122; a=rsa-sha256; cv=none; b=J4zYXkbMfYK+Vwzh51KljYtRya433xujFuZqVPkD2fidoFEkjmVPs+rZxfSPWMvmhxzB4+ S8GmLgpzMuCm50VGPTyj9ZZVOijH81AjThKFn2fa0govyD+h+cWlNXTXMURKXDFkaQM/Wm LvAqWeMc12Us7679iSvTL6/yuud01GHFjf1muAbnkn04EF4pR8JnwtOjyGAYHrwnakRkbt dl7cc5R2pEDyxzjUIygNuzoSZ/bPL6nyM5EHmGtOtDUU7PNTsdkfjLkir/ZJgw6jvjLn26 IsONyOYvgQ9zH2LowMsUYhATdtFF3RlFQAVpa9yv6b/youEjw3kPIT7ZaebPHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmp00Gtz1B95; Wed, 22 Mar 2023 22:28:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSfXV001896; Wed, 22 Mar 2023 22:28:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSfNT001895; Wed, 22 Mar 2023 22:28:41 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:41 GMT Message-Id: <202303222228.32MMSfNT001895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 429d95658672 - stable/12 - Stop adding -Wredundant-decls to CWARNFLAGS. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 429d9565867246e6483d025c2c2f136157b57e66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=429d9565867246e6483d025c2c2f136157b57e66 commit 429d9565867246e6483d025c2c2f136157b57e66 Author: John Baldwin AuthorDate: 2022-02-07 20:47:51 +0000 Commit: John Baldwin CommitDate: 2023-03-22 19:28:59 +0000 Stop adding -Wredundant-decls to CWARNFLAGS. clang doesn't implement it, and Linux doesn't enforce it. As a result, new instances keep cropping up both in FreeBSD's code and in upstream sources from vendors. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D34144 (cherry picked from commit c227269e2f9dc2695d00be9e5a72b5fdeec5712a) --- share/mk/bsd.sys.mk | 2 +- sys/conf/kern.mk | 2 +- sys/conf/kern.pre.mk | 2 +- sys/powerpc/conf/QORIQ64 | 2 +- sys/powerpc/conf/dpaa/DPAA | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index 45f0dcc2c6cf..029af7ae4fd1 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -62,7 +62,7 @@ CWARNFLAGS+= -Wcast-align .endif # !NO_WCAST_ALIGN !NO_WCAST_ALIGN.${COMPILER_TYPE} .endif # WARNS >= 4 .if ${WARNS} >= 6 -CWARNFLAGS+= -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls\ +CWARNFLAGS+= -Wchar-subscripts -Winline -Wnested-externs \ -Wold-style-definition .if !defined(NO_WMISSING_VARIABLE_DECLARATIONS) CWARNFLAGS.clang+= -Wmissing-variable-declarations diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 0f311fba2b23..243419103b22 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -3,7 +3,7 @@ # # Warning flags for compiling the kernel and components of the kernel: # -CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ +CWARNFLAGS?= -Wall -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Wcast-qual \ -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ -Wmissing-include-dirs -fdiagnostics-show-option \ diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 7f0099344d18..f0b314e29307 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -171,7 +171,7 @@ NORMAL_FWO= ${LD} -b binary --no-warn-mismatch -d -warn-common -r \ ZSTD_C= ${CC} -c -DZSTD_HEAPMODE=1 -I$S/contrib/zstd/lib/freebsd ${CFLAGS} -I$S/contrib/zstd/lib -I$S/contrib/zstd/lib/common ${WERROR} -Wno-inline -Wno-missing-prototypes ${PROF} -U__BMI__ ${.IMPSRC} # Common for dtrace / zfs -CDDL_CFLAGS= -DFREEBSD_NAMECACHE -nostdinc -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common -I$S -I$S/cddl/contrib/opensolaris/common ${CFLAGS} -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-redundant-decls -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch -Wno-pointer-arith -Wno-unknown-pragmas +CDDL_CFLAGS= -DFREEBSD_NAMECACHE -nostdinc -I$S/cddl/compat/opensolaris -I$S/cddl/contrib/opensolaris/uts/common -I$S -I$S/cddl/contrib/opensolaris/common ${CFLAGS} -Wno-unknown-pragmas -Wno-missing-prototypes -Wno-undef -Wno-strict-prototypes -Wno-cast-qual -Wno-parentheses -Wno-missing-braces -Wno-uninitialized -Wno-unused -Wno-inline -Wno-switch -Wno-pointer-arith -Wno-unknown-pragmas CDDL_CFLAGS+= -include $S/cddl/compat/opensolaris/sys/debug_compat.h CDDL_C= ${CC} -c ${CDDL_CFLAGS} ${WERROR} ${PROF} ${.IMPSRC} diff --git a/sys/powerpc/conf/QORIQ64 b/sys/powerpc/conf/QORIQ64 index 348150e83d05..02bbb2585647 100644 --- a/sys/powerpc/conf/QORIQ64 +++ b/sys/powerpc/conf/QORIQ64 @@ -14,7 +14,7 @@ machine powerpc powerpc64 include "dpaa/config.dpaa" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WITH_CTF=1 -#makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" +#makeoptions WERROR="-Werror -Wno-format" options FPU_EMU diff --git a/sys/powerpc/conf/dpaa/DPAA b/sys/powerpc/conf/dpaa/DPAA index 315461fb95ac..761dfbd85ba8 100644 --- a/sys/powerpc/conf/dpaa/DPAA +++ b/sys/powerpc/conf/dpaa/DPAA @@ -12,7 +12,7 @@ cpu BOOKE_E500 machine powerpc powerpc #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -#makeoptions WERROR="-Werror -Wno-format -Wno-redundant-decls" +#makeoptions WERROR="-Werror -Wno-format" makeoptions NO_MODULES=yes # Platform support From nobody Wed Mar 22 22:28:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmq2mfKz41NnH; Wed, 22 Mar 2023 22:28: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 4Phjmq20Kwz3jXZ; Wed, 22 Mar 2023 22:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fm12FjmJOWm3WEujI321qVJ1ivPiIigRlBZ8gMhfG0=; b=TUpDCg0XLcgwOPAJiiXS/gW6eK0SMPM9oAsAmiO+23JSDyyo45alecb0kYllEbCwyLDxd2 gmu2Q47NQuqkCwsX2xz506knq0VyxI+nbufXtDariKS60MXWXgtdBeOus+A8hDuSNsdvoL K0DY0Hkb9uuovrKLdeu5yjzp+/PerzFmVotTgLcz3CYMHmSHqlrTXPdwS2AMZhpRT6uU/H hA4Mscoces7rM3JeTBtJ2m+OJyOWXkMLNBNcqv0NeunZskmlbXF8pne/7e8XdGw5/ED9LK MpUPGxVQj6Zievl7R6BXM6xAREI6GYbSqJEVlVrye8jtnWHkXV6x7xYgYT6UMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1fm12FjmJOWm3WEujI321qVJ1ivPiIigRlBZ8gMhfG0=; b=WSpdfyze74mSN80HLhX+VITWpQacdiDDHY/JHoJL46etjfh+/s8sm+y1jH39xwPrJMNr93 phJgNIm7BRIS2NoFm5h2np9XsAjecKrn5HyI/DR9BXuXDNdO4WO0H7f/xaCttZObZTq9kD 3GenDJvHlEeK4928Jq5X141Xxal91DOFO7ki2tMqOZPtNXMhRcKJr0zL+TB2G43U4/PD75 pG6Locy0/2x15H6j3ACb8dv6ZkqKpCUWSA7422YUGwj/fFB6CwyxeQGAb8WtWPYVMgezDy d/c4iqr48ci6pneoMkxvvvIWL6KzkAQD8UxbOXhn9xKcb5iNHzDBaqWEXqCyPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524123; a=rsa-sha256; cv=none; b=flln2lOXman+j0EulLvhMFpYF9PR8MptF5Zj5+68WzNym8YEovmbmsBU2eDv8r6lE5HTlc WoWh5niBWU694g70VCw8nDTFifaHKE0bmyzEQk7xveCDXAO0u4Vk0ruY4kWngLIcY8PpRz q/4ObJLkCnoIX2ive1hN6UqTw588uP1fDx8tCk/EeDwL9RTteZ3yE+6YPDDn2NIcqGBFed O/EPQWhFGIAftE4blXAVNM2KTYbezwe2J5bnSwGbCONLfLDMOYUQ+Qw37rQVN2iUrXG32G QygzQaPmcVLlMMmVchWiLf0NphE7LJf9JEFwdlifCKbSlWTRzFRZj2AgOawvdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmq14llz1BRk; Wed, 22 Mar 2023 22:28:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSh18001917; Wed, 22 Mar 2023 22:28:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMShJm001916; Wed, 22 Mar 2023 22:28:43 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:43 GMT Message-Id: <202303222228.32MMShJm001916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2c91d5899a90 - stable/12 - gcc9: quiet Waddress-of-packed-member for kernel 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2c91d5899a9004bc281063dc6439cd17b05f71b2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2c91d5899a9004bc281063dc6439cd17b05f71b2 commit 2c91d5899a9004bc281063dc6439cd17b05f71b2 Author: Ryan Libby AuthorDate: 2019-12-21 02:43:37 +0000 Commit: John Baldwin CommitDate: 2023-03-22 22:21:11 +0000 gcc9: quiet Waddress-of-packed-member for kernel build This is lame, but it's what we already do for the clang build. We take misaligned pointers into network header structures in many places. Reviewed by: ian Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D22876 (cherry picked from commit 77acc3cfbcfbb2f66c683706e3b9e39d56c000fa) --- sys/conf/kern.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 243419103b22..4a36aae4db94 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -82,6 +82,9 @@ CWARNEXTRA+= -Wno-error=memset-elt-size .if ${COMPILER_VERSION} >= 80000 CWARNEXTRA+= -Wno-error=packed-not-aligned .endif +.if ${COMPILER_VERSION} >= 90100 +CWARNEXTRA+= -Wno-address-of-packed-member +.endif .else # For gcc 4.2, eliminate the too-often-wrong warnings about uninitialized vars. CWARNEXTRA?= -Wno-uninitialized From nobody Wed Mar 22 22:28:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmr4NdYz41P8k; Wed, 22 Mar 2023 22:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmr34f0z3jNL; Wed, 22 Mar 2023 22:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ImSTuCcOcKnpYO//C9w9hL7a6EoCG3/V3wRAoKtf7hU=; b=YQNK74GYZ6qw9+4SLrmwGoHn0SUSYvrM/qOa9x2jUGVkzJ4CPLinjXRXe/g3JWgn8Hwf8T rnJa3rAx7ngUbx5E2dcE4EDNjwj1NE4J1vx1rcO63Mdjed3OnC+F9aTM0KAtyL1DodS/Vj BYPra48TvpCDJrRTYN/xxceKY9zWBeonHLDoAagHnAoF6JBGVdnqMGUoteptTKUVeCgXRe evqUEspds39ntaSOECG9P/95fb4g6uJ/rU27dQ2mc2Z72RHh4QN/rw5rdgsmAILfjDkFU5 lV92FVVGwSbQzZlAe4/JLqcA+6IhGKczDULv5Rms+3TeTccBymfdDzfjuOoeJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ImSTuCcOcKnpYO//C9w9hL7a6EoCG3/V3wRAoKtf7hU=; b=INW/xAit+rKFkjRY4jXuRhikZcZ53nXjRRQam1NRe5VXWGevT/7sMG/YVmSBr6AyaQCfcf SWA2gnNzogI3WRcSKJ2JauMFfQP9mJ1bl7XylH43pKBok3huvIDGWd4PMA4gKZyu7WFzJo cXKV9YdaLNZwwwwfwZxmsZ2VG29R40fkxzy1gJMuDlGyXq3PploO/3gqXrQgutGPHg7Jjk ll+zo7osWMP6UJ8fn/FB0lJqxq8PlzCv7Ggo4eZIyBh/kv8/7n3rEL/jc048HggHhAVbUG kwli/7c03c+Vuu6h6ZqTIKFqJBlWm7/y2aAK4URz4X3oZBexJrCKHMDgdWYToA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524124; a=rsa-sha256; cv=none; b=dXeqa3GStmEzbhCkxXyYtGZfTynlJ7amkMK4kiRwTHSfmIQrTvMfrK1cVxR/aFWQpisVXw cC7DtTmRKFB1syRzKKlgO42sdOgtE1l0XoxxabEZgexQUoNjKHLPUluJeVLJeEgMDeyvsT XnW98XP6KJ14z4Rm7rqJDyr+2sJ3OAbZcljuDVzRW8mrkvDNykj2n8B1S/pXHk1Mk3xMVi 4LNTu+6ZvDGq46/rtXjCxE78OiGg4gWA+uBrSNlv9Rx4YZcc1QYJWknvxJF2kdozSgt9mb nm8UTeAFzDb6OK6JNfY7sf/BnPe0TuHLp6VVROcplnsuG2ii2Ix6SpPU36zJNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmr29MZz1BRl; Wed, 22 Mar 2023 22:28:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSigq001939; Wed, 22 Mar 2023 22:28:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSitn001938; Wed, 22 Mar 2023 22:28:44 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:44 GMT Message-Id: <202303222228.32MMSitn001938@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 9d8607fa3fab - stable/12 - kernel: Disable errors for -Walloca-larger-than for GCC. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9d8607fa3fab125d8df01e4940613beeb0f6cd38 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9d8607fa3fab125d8df01e4940613beeb0f6cd38 commit 9d8607fa3fab125d8df01e4940613beeb0f6cd38 Author: John Baldwin AuthorDate: 2021-09-25 18:24:35 +0000 Commit: John Baldwin CommitDate: 2023-03-22 22:21:30 +0000 kernel: Disable errors for -Walloca-larger-than for GCC. GCC complains about the use of alloca() with variable sizes (for XSAVE state len) in sendsig() for i386. Modern XSAVE state is probably getting a bit large for the i386 kstack, but downgrade the error to a warning. Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D31934 (cherry picked from commit e72c7e2738ca9f5893ba5e5e9dc120dfc82fabfd) --- sys/conf/kern.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index 4a36aae4db94..f1e59f2ce497 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -83,7 +83,8 @@ CWARNEXTRA+= -Wno-error=memset-elt-size CWARNEXTRA+= -Wno-error=packed-not-aligned .endif .if ${COMPILER_VERSION} >= 90100 -CWARNEXTRA+= -Wno-address-of-packed-member +CWARNEXTRA+= -Wno-address-of-packed-member \ + -Wno-error=alloca-larger-than= .endif .else # For gcc 4.2, eliminate the too-often-wrong warnings about uninitialized vars. From nobody Wed Mar 22 22:28:45 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmt67x2z41P0n; Wed, 22 Mar 2023 22:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjms4qSnz3jc6; Wed, 22 Mar 2023 22:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjohVgqPiWvyx8bxB7ILHp1k3caKDgZA0Xm2uyOsSlc=; b=GE1wjTvorDWcVHqeF2jAua2keG5CDnNJr0OBsA9kkiuFIPd6nTHzwwaiD6I6uwSb8eeYNd 7vWL2RxSuq+c6IVsN4rGgy/Sodq8XsVCO893LM7R8sCHcYqAhQfJcWqylsfikHRq3gKJrn zxMsIJ/TVrCndfspjGhq0+mcVi5IX5CfWBYpDob8MA++Kf7wNYI7FRDDWlohQS3DCzjpI6 vdCVwtt6hqAt8IXQJ7uatAY3T7XZBxSebOOwN5OlIpdQEpvBuLT3mYh1PwXJFxuR3RuW+C 2ZFnNjzCrgIqA/Ad/HoDvpPEULSulOl7D4cEdpKaVyEricxMhftRP3J3xdcnsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kjohVgqPiWvyx8bxB7ILHp1k3caKDgZA0Xm2uyOsSlc=; b=TbDPuj4ahPfNvVpN7sWGD79lYQ1sayDu6YVLUnwkz5yP8fMMWp6P6yotT9L/Evj7bWq3WB /4jC4u3WZ5Umi34MmKpXYCpIexEUdquhH/B/CH1EMjKMu3JgQn5JwI2CO8NzOiRyJNH8mH MIhRlfODLpN8wqLK4kl7aIPVCMq/wzMxe4um63EKhBt90BoAKeH/HrqpixtdcMAISxsQMB xFhJhw0jFT6u7z0b1DPFTr6nk8ubT2uRqFUidVcySTUnx19TOxySAwEzIlFYUfUKuplEWD TTcbdGkOX57pdTGSjNIQj16Jfx0DRvLhLZ8c/YgQuyAH5UExDfEQTbVnu8Atsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524125; a=rsa-sha256; cv=none; b=vxzIcTRY/dkrd2bTIvrr5nlhbfF+BHTYvu2sux4YVc5+xCuSe1sGDMmrm0+xl0gT8FBB8Y K1iF6N66Zj65xYNnkJnY3M8kr8ESUHBGxxN78kPlLHaMwvAJQ8deVYtJHSsk2op2+ryS2r 07OaPW0a4Pb6KJaWsWqW9CKlZs6F4UUo6yJygawoXlZ7HZP0A43doAK6yiYqvYASkl/2WR zbqry4fsrLAaf5UlNJO4c1WL1hg/Cd+gXSY8I8S9nONf9RToQqpEhsrUP0PiFDq1hCTXdE XJGbuo6rIqNDbqaYzavaCtSZko0jOk8qPOr+3cSWF5M95pZrOzIH/Som/gu8Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjms35bHz1BCf; Wed, 22 Mar 2023 22:28:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSjND001960; Wed, 22 Mar 2023 22:28:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSjud001959; Wed, 22 Mar 2023 22:28:45 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:45 GMT Message-Id: <202303222228.32MMSjud001959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: f59113f9f672 - stable/12 - smartpqi: Remove stray declaration 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f59113f9f6723480260215bde58a83ee8dc8a366 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f59113f9f6723480260215bde58a83ee8dc8a366 commit f59113f9f6723480260215bde58a83ee8dc8a366 Author: Warner Losh AuthorDate: 2021-06-03 23:44:27 +0000 Commit: John Baldwin CommitDate: 2023-03-22 22:22:53 +0000 smartpqi: Remove stray declaration pqisrc_is_firmware_feature_enabled shouldn't be declared inline in a header, and then static inline in the .c function. Remove this stray declartion from the header. gcc6 complains, but clang does not. Sponsored by: Netflix (cherry picked from commit eae2ef5a010366c673ad912cae23b426ebb9a8a2) --- sys/dev/smartpqi/smartpqi_prototypes.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/smartpqi/smartpqi_prototypes.h b/sys/dev/smartpqi/smartpqi_prototypes.h index 34b10c5941e8..1aa68cf889b9 100644 --- a/sys/dev/smartpqi/smartpqi_prototypes.h +++ b/sys/dev/smartpqi/smartpqi_prototypes.h @@ -37,8 +37,6 @@ void pqisrc_pqi_uninit(pqisrc_softstate_t *); int pqisrc_process_config_table(pqisrc_softstate_t *); int pqisrc_flush_cache(pqisrc_softstate_t *, enum pqisrc_flush_cache_event_type); int pqisrc_wait_for_pqi_reset_completion(pqisrc_softstate_t *); -inline boolean_t pqisrc_is_firmware_feature_enabled(pqisrc_softstate_t *, - struct pqi_conf_table_firmware_features *, uint16_t ); /* pqi_sis.c*/ int pqisrc_sis_init(pqisrc_softstate_t *); From nobody Wed Mar 22 22:28:46 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmt744Mz41P0p; Wed, 22 Mar 2023 22:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmt6MTNz3jQh; Wed, 22 Mar 2023 22:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MO9FkqJd3Fqx4EyffKLbAFDvBefnr/y2cYtQQSuw/LA=; b=nlj9WZmMwlmi1lAadT/eyIRELKFZDzgl/Avb4HSxgMTI6jO5kKmwyr7SkZUW4PtgtZfl7J NEHWq0bzDoF/4rgKae0FqvK0JtY5V0NC3iJMzr5pGyf6Ya8H5DCFNb7m980mYhECNjNQlv 6XwnPTsUurA0IEugAP2ExB7f96NHUYRLCBsQedptiecZkeD74Rz/j0F4y/c/Vica3IFYHV 2M9N4XkbrnOZQEAg6CF2JA7elSd+X/9ELKjHiFrmqNIYUhX3Vf1mne6BOjsu7XhBPy+cfQ M9PIbPnuFoY+Ehey1z2d4DQYw2zs6V/fYM69DNlAuoJP/IprBNQXs6xIPd5/AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MO9FkqJd3Fqx4EyffKLbAFDvBefnr/y2cYtQQSuw/LA=; b=U1V+8ljQm+hjpLAfJIgMkGULLn6i1HASjwFQkLOD4B28eerll2vXCI5O7tecWiJDup+XZe N9XBpOFvX7w3pgYPh0xKXhvJdrezntAuYeio1Sr3Hj1TqOe5qW8Q5o6EHXvyF7dHAuATDw uyu3FM5De5nSVL5/ocT9Q81K0/s9KG0v1KKK0satxAvs65SWNOze1NHEK4MRhVMg4bKK1n IttO23btwBtzH3FFyAeXdGJu+i+XkS1W/2n+xHHxn0H8p/ACX+ChPmi9AIBFLqpRcvmrii rwR3pgF9eIcIxlJMJJLm17peMR5xZ/7u67O+3j0L6xpXen1N4GDgrq6GjNbpmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524126; a=rsa-sha256; cv=none; b=A0giOAxKBFbzY8jVQHC/GAk3SyOvwXIWcXKdoNXxEdsSMS24C2hXPpINyIpFCp0IVYH9Ua 0pPGj1T9FnpthwGmkN7yp20ETLSS94+dPCGy4rbIinVoq2+QJHnPuDqMn6X/eiDBa1RWxa GsPcmjxRpH6fLUo6Lxlsz6RA+n+By58XvJYCdJGjdaZdIG+0iCQ0BfuKnvuoqvb/mOGt6p pGIJWHAbR1uVmPVMgbvg6vRwdCUo2fQ6NeXVBgiB9AGxnb+MJClET4dkv/FjoIikusv0It 7ob2uStD39uGSlsrSG1VBb0AoW14dzlHbxDfjV8cYlMbu1H28j5pUvD9aC3dFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmt4Q5Kz1BRm; Wed, 22 Mar 2023 22:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSku1001980; Wed, 22 Mar 2023 22:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSkHk001979; Wed, 22 Mar 2023 22:28:46 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:46 GMT Message-Id: <202303222228.32MMSkHk001979@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8f88432a1de0 - stable/12 - ofed: quiet gcc -Wint-in-bool-context 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8f88432a1de012706ca04113b05600724fb71a5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8f88432a1de012706ca04113b05600724fb71a5f commit 8f88432a1de012706ca04113b05600724fb71a5f Author: Ryan Libby AuthorDate: 2021-02-24 23:56:16 +0000 Commit: John Baldwin CommitDate: 2023-03-22 22:27:09 +0000 ofed: quiet gcc -Wint-in-bool-context The int in the argument to the ternary triggered -Wint-in-bool-context from gcc. Upstream linux has a larger and more entangled patch, 12f727721eee61b3d19dedb95cb893b2baa9fe41, which doesn't apply cleanly. When we eventually sync that, we can just drop this change. Reviewed by: hselasky, imp, kib MFC after: 3 days Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D28762 (cherry picked from commit bf667f282a7b98e7456d11e1cb46d9707ab8e774) --- sys/ofed/drivers/infiniband/core/uverbs.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/ofed/drivers/infiniband/core/uverbs.h b/sys/ofed/drivers/infiniband/core/uverbs.h index 6c8d9632b0dc..0db0d47cc691 100644 --- a/sys/ofed/drivers/infiniband/core/uverbs.h +++ b/sys/ofed/drivers/infiniband/core/uverbs.h @@ -64,8 +64,10 @@ #define INIT_UDATA_BUF_OR_NULL(udata, ibuf, obuf, ilen, olen) \ do { \ - (udata)->inbuf = (ilen) ? (const void __user *) (ibuf) : NULL; \ - (udata)->outbuf = (olen) ? (void __user *) (obuf) : NULL; \ + (udata)->inbuf = ((ilen) != 0) ? \ + (const void __user *) (ibuf) : NULL; \ + (udata)->outbuf = ((olen) != 0) ? \ + (void __user *) (obuf) : NULL; \ (udata)->inlen = (ilen); \ (udata)->outlen = (olen); \ } while (0) From nobody Wed Mar 22 22:28:47 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjmw1JPYz41Ntn; Wed, 22 Mar 2023 22:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phjmv6sKTz3jcT; Wed, 22 Mar 2023 22:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O7hHZcEo6+Qu41Oc/1c/zIw4grcaNWmwHGLXeHpDdb0=; b=bGfk4rQKDo7BtRU5yntq7Sdrbb/pBXnDrQ3yTYUi/GoKj4y+F7MG8ZuH7Wqyb5GSvOtaAV HltwfDH1HNs0Ob50pnUtwncbXuUNbRZ4GOrtV4xYrRKGIF+QZYt1W5TTtm37gQWHeQEbJo tNQ5mavmYLo/pzVDOfr1W4H1RpkyMXat8icOwfbVKwfq9o0f2ENsRrYAg6bRjhTYs3bzIH 9CvZHOZR5AwgAjct9YxNJ6Jaj4aL1NFn0aqiZkqt0BAny835D9DxDICmKYTGdakmZ34fpH BJ8ncnGGof+Nq8mMN6tsjCJ0rsuHkc0ley7mnqSipC/hz1898PM3sxKoJ2yyUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O7hHZcEo6+Qu41Oc/1c/zIw4grcaNWmwHGLXeHpDdb0=; b=cKBXFxOwygJudVaMlpa2wdnC4Xbw2Tn6BwfIQvSuwMY21lh4kq5WqkoHyXG5YlKL/qkRbp ZFXChWCzIGHFP+Vuxj0Y30MMwsj8ik/YFKsjMqpOAfYrtgSU6xJkA4QhgDk2jl4M4a9M/1 0Oo1SiUcquzolJmHYC5Z+7OSG5Ro6/gzl0hNSg+dYEmTjexugJO4/Elj6tbaSvCTRoF21T 1Hr2vQufndLf1Gv5YIsL/Rr9iyZ5ozhlDzuqZAqekfTMMFn6InoZhWSqiuLTGxGufmVtly vf9iTQ5KWjMrLx/bEFeEiy2GUEZXmn+QTfwZmsZO+ZKp1CrD+lK/72sdg5Fjwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524128; a=rsa-sha256; cv=none; b=b3fK/nUSRiyCnFsmTmkGwIDPpO1KeHZ0edEoT5MsRsobhhCVw03FyoDcDBZjSrywtPIMNw e8snh70P9fslo3/ETOUmjRyDNJcEVOz9iolBTfPydjUGMneTjH3di1bKfXgHQU6Yn0TyeM WdCLnPZADiemQ1WiqHsIbxzdZjjT2paHmva3SSunNqEddzzerhNgvLiyI66ek9ezQKzQSW Fa5bIuRpHI02M/p2Cgky11pbt54jJBJoIazBJSyVDCAZNXlkwSrW/m07VoJ03tghiafF8W h/AwdFG2zDQOWPg/WpVQ3xyWph5Fmur/8F7Wz01RVheB2DrjJDNH0T6sgUJZBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjmv5HdRz1BM7; Wed, 22 Mar 2023 22:28:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMSlNL002007; Wed, 22 Mar 2023 22:28:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMSlxk002006; Wed, 22 Mar 2023 22:28:47 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:28:47 GMT Message-Id: <202303222228.32MMSlxk002006@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bde7b32c7cda - stable/12 - ibcore: Clean up INIT_UDATA() and INIT_UDATA_BUF_OR_NULL() macro usage. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: bde7b32c7cda1c39eb08195e580aeb357750c129 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bde7b32c7cda1c39eb08195e580aeb357750c129 commit bde7b32c7cda1c39eb08195e580aeb357750c129 Author: Hans Petter Selasky AuthorDate: 2021-06-16 13:01:51 +0000 Commit: John Baldwin CommitDate: 2023-03-22 22:27:19 +0000 ibcore: Clean up INIT_UDATA() and INIT_UDATA_BUF_OR_NULL() macro usage. We get a harmless warning about the fact that we use the result of a multiplication as a condition in INIT_UDATA_BUF_OR_NULL(): uverbs_main.c: In function 'ib_uverbs_write': error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context] This avoids the problem by using an inline function in place of the macro. After changing INIT_UDATA_BUF_OR_NULL() to an inline function, do the same change to INIT_UDATA() for consistency. Using an inline function gives us better type safety here among other issues with macros. I'm using u64_to_user_ptr() to convert the user pointer to simplify the logic rather than adding lots of new type casts. Linux commit: 12f727721eee61b3d19dedb95cb893b2baa9fe41 40a203396cc1c239f2e71c47c66ed03097123d2c MFC after: 1 week Reviewed by: kib Sponsored by: Mellanox Technologies // NVIDIA Networking (cherry picked from commit 05f4691919d6d0219795a1ca8ad84dd82d87b1cf) --- sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c | 63 ++++++++++++----------- sys/ofed/drivers/infiniband/core/ib_uverbs_main.c | 7 +-- sys/ofed/drivers/infiniband/core/uverbs.h | 37 +++++++------ 3 files changed, 57 insertions(+), 50 deletions(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c b/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c index 46edd7b28580..dcc73dc5848e 100644 --- a/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c +++ b/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c @@ -339,8 +339,8 @@ ssize_t ib_uverbs_get_context(struct ib_uverbs_file *file, goto err; } - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd, out_len - sizeof resp); ucontext = ib_dev->alloc_ucontext(ib_dev, &udata); @@ -560,8 +560,8 @@ ssize_t ib_uverbs_alloc_pd(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd, out_len - sizeof resp); uobj = kmalloc(sizeof *uobj, GFP_KERNEL); @@ -768,8 +768,8 @@ ssize_t ib_uverbs_open_xrcd(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd, out_len - sizeof resp); mutex_lock(&file->device->xrcd_tree_mutex); @@ -978,8 +978,8 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd, out_len - sizeof resp); if ((cmd.start & ~PAGE_MASK) != (cmd.hca_va & ~PAGE_MASK)) @@ -1085,8 +1085,8 @@ ssize_t ib_uverbs_rereg_mr(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof(cmd))) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof(cmd), - (unsigned long) cmd.response + sizeof(resp), + ib_uverbs_init_udata(&udata, buf + sizeof(cmd), + u64_to_user_ptr(cmd.response + sizeof(resp)), in_len - sizeof(cmd), out_len - sizeof(resp)); if (cmd.flags & ~IB_MR_REREG_SUPPORTED || !cmd.flags) @@ -1225,8 +1225,8 @@ ssize_t ib_uverbs_alloc_mw(struct ib_uverbs_file *file, goto err_free; } - INIT_UDATA(&udata, buf + sizeof(cmd), - (unsigned long)cmd.response + sizeof(resp), + ib_uverbs_init_udata(&udata, buf + sizeof(cmd), + u64_to_user_ptr(cmd.response + sizeof(resp)), in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr), out_len - sizeof(resp)); @@ -1494,10 +1494,11 @@ ssize_t ib_uverbs_create_cq(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof(cmd))) return -EFAULT; - INIT_UDATA(&ucore, buf, (unsigned long)cmd.response, sizeof(cmd), sizeof(resp)); + ib_uverbs_init_udata(&ucore, buf, + u64_to_user_ptr(cmd.response), sizeof(cmd), sizeof(resp)); - INIT_UDATA(&uhw, buf + sizeof(cmd), - (unsigned long)cmd.response + sizeof(resp), + ib_uverbs_init_udata(&uhw, buf + sizeof(cmd), + u64_to_user_ptr(cmd.response + sizeof(resp)), in_len - sizeof(cmd), out_len - sizeof(resp)); memset(&cmd_ex, 0, sizeof(cmd_ex)); @@ -1579,8 +1580,8 @@ ssize_t ib_uverbs_resize_cq(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd, out_len - sizeof resp); cq = idr_read_cq(cmd.cq_handle, file->ucontext, 0); @@ -2050,10 +2051,10 @@ ssize_t ib_uverbs_create_qp(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof(cmd))) return -EFAULT; - INIT_UDATA(&ucore, buf, (unsigned long)cmd.response, sizeof(cmd), - resp_size); - INIT_UDATA(&uhw, buf + sizeof(cmd), - (unsigned long)cmd.response + resp_size, + ib_uverbs_init_udata(&ucore, buf, + u64_to_user_ptr(cmd.response), sizeof(cmd), resp_size); + ib_uverbs_init_udata(&uhw, buf + sizeof(cmd), + u64_to_user_ptr(cmd.response + resp_size), in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr), out_len - resp_size); @@ -2150,8 +2151,8 @@ ssize_t ib_uverbs_open_qp(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd, out_len - sizeof resp); obj = kmalloc(sizeof *obj, GFP_KERNEL); @@ -2354,7 +2355,7 @@ ssize_t ib_uverbs_modify_qp(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd, out_len); attr = kmalloc(sizeof *attr, GFP_KERNEL); @@ -2919,8 +2920,8 @@ ssize_t ib_uverbs_create_ah(struct ib_uverbs_file *file, if (!rdma_is_port_valid(ib_dev, cmd.attr.port_num)) return -EINVAL; - INIT_UDATA(&udata, buf + sizeof(cmd), - (unsigned long)cmd.response + sizeof(resp), + ib_uverbs_init_udata(&udata, buf + sizeof(cmd), + u64_to_user_ptr(cmd.response + sizeof(resp)), in_len - sizeof(cmd), out_len - sizeof(resp)); uobj = kmalloc(sizeof *uobj, GFP_KERNEL); @@ -4045,8 +4046,8 @@ ssize_t ib_uverbs_create_srq(struct ib_uverbs_file *file, xcmd.max_sge = cmd.max_sge; xcmd.srq_limit = cmd.srq_limit; - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd - sizeof(struct ib_uverbs_cmd_hdr), out_len - sizeof resp); @@ -4072,8 +4073,8 @@ ssize_t ib_uverbs_create_xsrq(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, - (unsigned long) cmd.response + sizeof resp, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, + u64_to_user_ptr(cmd.response + sizeof resp), in_len - sizeof cmd - sizeof(struct ib_uverbs_cmd_hdr), out_len - sizeof resp); @@ -4098,7 +4099,7 @@ ssize_t ib_uverbs_modify_srq(struct ib_uverbs_file *file, if (copy_from_user(&cmd, buf, sizeof cmd)) return -EFAULT; - INIT_UDATA(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd, + ib_uverbs_init_udata(&udata, buf + sizeof cmd, NULL, in_len - sizeof cmd, out_len); srq = idr_read_srq(cmd.srq_handle, file->ucontext); diff --git a/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c b/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c index 8aab2ac3ff8d..745c8c6a0f12 100644 --- a/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c +++ b/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c @@ -869,12 +869,13 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, } } - INIT_UDATA_BUF_OR_NULL(&ucore, buf, (unsigned long) ex_hdr.response, + ib_uverbs_init_udata_buf_or_null(&ucore, buf, + u64_to_user_ptr(ex_hdr.response), hdr.in_words * 8, hdr.out_words * 8); - INIT_UDATA_BUF_OR_NULL(&uhw, + ib_uverbs_init_udata_buf_or_null(&uhw, buf + ucore.inlen, - (unsigned long) ex_hdr.response + ucore.outlen, + u64_to_user_ptr(ex_hdr.response + ucore.outlen), ex_hdr.provider_in_words * 8, ex_hdr.provider_out_words * 8); diff --git a/sys/ofed/drivers/infiniband/core/uverbs.h b/sys/ofed/drivers/infiniband/core/uverbs.h index 0db0d47cc691..9f2a519fa259 100644 --- a/sys/ofed/drivers/infiniband/core/uverbs.h +++ b/sys/ofed/drivers/infiniband/core/uverbs.h @@ -54,23 +54,28 @@ #include #include -#define INIT_UDATA(udata, ibuf, obuf, ilen, olen) \ - do { \ - (udata)->inbuf = (const void __user *) (ibuf); \ - (udata)->outbuf = (void __user *) (obuf); \ - (udata)->inlen = (ilen); \ - (udata)->outlen = (olen); \ - } while (0) +static inline void +ib_uverbs_init_udata(struct ib_udata *udata, + const void __user *ibuf, + void __user *obuf, + size_t ilen, size_t olen) +{ + udata->inbuf = ibuf; + udata->outbuf = obuf; + udata->inlen = ilen; + udata->outlen = olen; +} -#define INIT_UDATA_BUF_OR_NULL(udata, ibuf, obuf, ilen, olen) \ - do { \ - (udata)->inbuf = ((ilen) != 0) ? \ - (const void __user *) (ibuf) : NULL; \ - (udata)->outbuf = ((olen) != 0) ? \ - (void __user *) (obuf) : NULL; \ - (udata)->inlen = (ilen); \ - (udata)->outlen = (olen); \ - } while (0) +static inline void +ib_uverbs_init_udata_buf_or_null(struct ib_udata *udata, + const void __user *ibuf, + void __user *obuf, + size_t ilen, size_t olen) +{ + ib_uverbs_init_udata(udata, + ilen ? ibuf : NULL, olen ? obuf : NULL, + ilen, olen); +} /* * Our lifetime rules for these structs are the following: From nobody Wed Mar 22 22:31:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjrC202Pz41PB0; Wed, 22 Mar 2023 22:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhjrC0qLtz3n8Z; Wed, 22 Mar 2023 22:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+oMAYKQ232PHm92XfAqtpM5bVflbxPm3pErt9OkU6mg=; b=M4aeSq3nKKwatl8vhZA5F42NtqqwBSW0+zPDHsNdGDaQx5y0MfMgeDgi9G2yBl5EEw9UG1 tcpbxtkFhAX0DIBL3vcOutNDONRpB9hYSdBPB2b/LH6gQmNN797dS8xIm44ngbVYOJzPx4 +V9nRIxfby2dTCTPiRsQtdHBVC+7v49mPvUSY8EoRFZPjdUVoRj3GZVtLcTDo0ibFvnNW2 xyKLeNGkorG+bQBp/1Pkjz+mdJvJNGGYX6e0mP0gzBhALoEV13lRA0nX2todESjh1++/f9 ZkJNJXmxlBOa6G4FtRhfCHTX1RMa2c20KdaKxreZafb0JOnQJW2xH50LCkBELw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+oMAYKQ232PHm92XfAqtpM5bVflbxPm3pErt9OkU6mg=; b=AcsZZdgAPUDIGtzty1S/VCpLJer4kosoOpeF2LsUgZqVAHy4pvDtSqznI01mcBoQ+Gjsj+ zEsSSRv4CuqhYOP14HEJu+KfQn++CmyvkDh5/5frZncULKcBaFPa0y+h0AhVnNL5BpWGAY jQKAZuTDAHVHYCRt8fROfGo8q8OF8BwkbT7aJQa08by0NSRvO0ykYxRlLU0TeHllovzRqr C10RI362Qe0JdsbtufXj6hx/7eEt9WyJOeVG9q5uPlHnNEOfEsONgCH6xjseNCNgaeP5Za lCLgmeKkxOCrS1UYFYXIXnQW4G2n+da2pSqLuaO5TVYTpSzimh2cGfukB31mmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524299; a=rsa-sha256; cv=none; b=i1A/DaqmmtbGYryG8T8FPgX324BTyrlWXmAJOkest0JX2LWc4vrlioJON0ZSEKKK0/PW8B hlR9/OEyCZUaiu/NCX7ExE3W5TSFY6LSe8seheVsS+o8pwPgGsRuwrIVcspZPzHdpea164 x3FBkOTryiXRfQbrpbwM5/C7XhBHFyJQIvyrQn9aZ9kxALY+bcGYf2g6wO8rB0RpakEmkN HRHmCaWRD+k1W88pQ2Q4kcQ8OfPg2C/qj1rSKJfBIIe9zz+bstcodYdImsZMq5RMMDl59o /RmLQRg9CHFYpeeqk1CtAqkFb8RNPR7bshkh0oGcGtLaxHggLK9eu6iAAHAQsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhjrB6V5Qz1BMl; Wed, 22 Mar 2023 22:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMVcch017222; Wed, 22 Mar 2023 22:31:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMVcHh017221; Wed, 22 Mar 2023 22:31:38 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:31:38 GMT Message-Id: <202303222231.32MMVcHh017221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 4ccd5e64b76b - stable/13 - _endian.h: Include sys/cdefs.h for visibility macros 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4ccd5e64b76bbaa874c50755d17394a7ed195f93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4ccd5e64b76bbaa874c50755d17394a7ed195f93 commit 4ccd5e64b76bbaa874c50755d17394a7ed195f93 Author: Warner Losh AuthorDate: 2023-03-22 02:25:58 +0000 Commit: Warner Losh CommitDate: 2023-03-22 22:30:51 +0000 _endian.h: Include sys/cdefs.h for visibility macros BYTE_ORDER, LITTLE_ENDIAN and BIG_ENDIAN will be required by the forthcoming POSIX Issue 8. In addition, they are provided in the BSD compilation environments. However, depending on the order includes happend, sys/cdefs.h may or may not be included when endian.h is included. Include it here so we can safely test __BSD_VISIBLE. Add visibility when we're compiling in the future for issue 8, but since the date number for issue 8 hasn't been fixed, use strictly greater than the issue 7 date.of 200809. This had the side effect of sometimes (in the traditional BSD compliation environment) #if BYTE_ORDER == LITTLE_ENDIAN and #if BYTE_ORDER == BIG_ENDIAN both being true because none of these were defined. This fixes that. It also fixes including it after but not before. PR: 269249 MFC After: 1d (build related) Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D39176 Sponsored by: Netflix (cherry picked from commit ed52baf51bd142b5e32701842346452a7ebe37a5) --- sys/sys/_endian.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/sys/_endian.h b/sys/sys/_endian.h index 7ac39386e2e1..3b4460472eb6 100644 --- a/sys/sys/_endian.h +++ b/sys/sys/_endian.h @@ -36,6 +36,8 @@ #error "sys/_endian.h should not be included directly" #endif +#include /* visibility macros */ + /* BSD Compatiblity */ #define _BYTE_ORDER __BYTE_ORDER__ @@ -66,10 +68,11 @@ #endif /* - * Deprecated variants that don't have enough underscores to be useful in more - * strict namespaces. + * POSIX Issue 8 will require these for endian.h. Define them there and in the + * traditional BSD compilation environment. Since issue 8 doesn't yet have an + * assigned date, use strictly greater than issue 7's date. */ -#if __BSD_VISIBLE +#if __BSD_VISIBLE || _POSIX_C_SOURCE > 200809 #define LITTLE_ENDIAN _LITTLE_ENDIAN #define BIG_ENDIAN _BIG_ENDIAN #define PDP_ENDIAN _PDP_ENDIAN From nobody Wed Mar 22 22:33:20 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjtB2j5mz41P8Q; Wed, 22 Mar 2023 22:33:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhjtB1x35z3pCn; Wed, 22 Mar 2023 22:33:22 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgShKQvAr/90yqq59dv8nLzNWjb3hnGfyjbzTr47bYM=; b=OpRuqZlmq8fEI2pMjsTK0jgX+JlwjkBhk8v5/2QtoZU+NwRym/OI03xQ9JaD4YMMAW8wUM NQXrNQIFMmwVww/J1fIydaDS1xc1JESBrsmuh7NzBRoU2DRYYBsENVjVhE5dhFjd+F2Phu YJcUkO3E2gaQ4U4+AKrXRYlJ0L7G89YDLyuZuMHAcjB3/G8pnryYrJfNpflrqElqb2sKQ7 miJH1Flr2b2p9ipJEzSkbedXFU5FPzxrGWB7or7NzghYG+r7cUMy513i9fvKMf4wy3XUIZ JCZU7rQiiqfujE+1RFoI1WNb/H792K8b7KaDUFS0bwxobwUj0e3SnF6MCxuRFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524402; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cgShKQvAr/90yqq59dv8nLzNWjb3hnGfyjbzTr47bYM=; b=iU8vwQqP98HgmVb/rUFKYyj3TnRpkEL1r3EGugQDb+ABUB/ycptqYSrAtqJtuD6WyJv+up MnvnOs2cfwBYMTe4wP4hoIHdOi3acp7K1be918pnNimyB5+mNRcIkJeNK0bEclSZgaEJ/k 54fi6dM0EGVwQpaedeF5SCwXDwVBB/twdNiXKmroq4VreBYDzODySs3alufBjRgQYRH4Y3 3x86Clx1uBJJbUcbgibTKXVf7HK2JH5jP1w1MIE/ZwFFURF+36XDgjH8jUtluMJJYcDpVQ Qhe2Ax5+ofOnMNOn7MjttHRZVh50H4naGQWESJ7WV0O/xARyjMEico9CJ0+WmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524402; a=rsa-sha256; cv=none; b=SQ2OivRYnLFDpnkPb6YDnYFKWXzafg0HHQUOIhf1hsOcXmBTF3o3NL1sn1QgSp2e3Deb5g r5Xbn0u/EmxfU5fYYOiRdOKIwzN46jZMi9za3ORYHQ0/LPVF97QBCQCRf/Ha+Anego/E4P DFILRSkidFN42JS3Yx1mQ9Fbko98jDmSKMJH8He6KhwEfKKM155/qUZli3XKkg8ZCF0vP4 nJHSTmq8do8sXuCUWzu3DCL3FfVY1yP1IWBdR/5mhO8jC9ChPErZl9IFnaE39fZ5dZ4eGi 9PFzPu0pcKn8bUZmguZELmAp9u8GpiakdCrP45gsz7fKoFlsd8fBJhdVBGKGOw== Received: from [IPV6:2601:648:8680:16b0:cc93:2ec:c80c:1599] (unknown [IPv6:2601:648:8680:16b0:cc93:2ec:c80c:1599]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Phjt95PKyzHr3; Wed, 22 Mar 2023 22:33:21 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <0df118f0-3285-66f6-dc19-47bd200a06f3@FreeBSD.org> Date: Wed, 22 Mar 2023 15:33:20 -0700 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git: 0d9e9c3d1586 - stable/13 - if_epair: Use ANSI C definition Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202303221633.32MGX0wS024191@gitrepo.freebsd.org> In-Reply-To: <202303221633.32MGX0wS024191@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 3/22/23 9:33 AM, John Baldwin wrote: > The branch stable/13 has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=0d9e9c3d1586934b838a3e83cd912ff9a9c0e5a2 > > commit 0d9e9c3d1586934b838a3e83cd912ff9a9c0e5a2 > Author: Li-Wen Hsu > AuthorDate: 2022-02-15 13:45:22 +0000 > Commit: John Baldwin > CommitDate: 2023-03-22 16:22:49 +0000 > > if_epair: Use ANSI C definition > > This fixes -Werror=strict-prototypes from gcc9 > > Sponsored by: The FreeBSD Foundation > > (cherry picked from commit 7442b6323127a349d5465fa18ce5fe4be0600970) Once the -Wnested-externs removal is MFC'd stable/13 world + GENERIC build with amd64-gcc9 on amd64 after this commit. -- John Baldwin From nobody Wed Mar 22 22:33:48 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phjth6HJ7z41P8T; Wed, 22 Mar 2023 22:33: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 4Phjth5Xf9z3pFZ; Wed, 22 Mar 2023 22:33:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UL0NIngnEKJKaioROT3P39iBMJK0TRjMQx6vN4QwQUQ=; b=OSiR8H6bEQ77IgwurpHIRl9mLlMRppbPoWdNA7svCP5NSp+wzgX2eHuSOty+QrgR379qpm UrwTMwoSN2Bf24IAJv+YJQ2LLUAOAw6lYgxExC2pjWje+J9wNzIfWWLiflY93sNa1ZoVG5 pIJ6SkKTg9ZiJHljvGOdnTqazGyqF6afbZiHvfpWGn/RykPB5lh0KU7kW8ydJ7neWwvfbk p0OYm2Trlvg7zn107jhiNG6igZv+g9jtEMAx7Y4uQSFBp9jJQ1wNlSvlksj09GhAWjrug8 ChIcDMoFVzzHZtHLsFqUmvqK7D4MaIRsygPvt4aLq/Af/sYUsptsOvKyyg/zvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524428; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UL0NIngnEKJKaioROT3P39iBMJK0TRjMQx6vN4QwQUQ=; b=TWEtS11mH1NpI65dZ9kl3hWGZek2E3simO2/RnvNvw5Sn+bzjYp0FYeuXUJSiAX2QENnlD Pr5Lk/WvD9aLb4MHg02wF5/EFL47DuGX8SSk2HP9WCV65K6ahb8/QX9zLuNX3Gzdjz/GGr hUBR+NM7/1pLHhK93rzoZjH0E6VMoBg68V6RQtS9b5vhX03Akg1nJnEPWQnVfdTkwke6Gg xzF/r7xAmssOFGrQi/KCLPmUB/tj/xVOmj7xs3ydJLYr0DNE2Q0q9TaTwTP5+PUk6hplhN cFRM9zMgO6ubzr7eYZWb3DtUqN6Oatzes1MSy+fFEs3wy253fA49eB7KT7jQ1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524428; a=rsa-sha256; cv=none; b=tQm7os5cCp6EQdJhmQlzPLfqid65ONakWFCJ4k0Icfa4d/hMtjfzjpZNXaZK3uW5jMgPOI sAmGTNbc2gcq79KctkiOoZ8sxa3klRV3KcofkvD2A0fHWWCxrqutHk2KydFz2hztturPRh myMCK549MB4t8pls/1e47o5LL61ud3MHMac9JIwgiWYIFeDBR8X6F0ulkqHilLrUjHK5Gb tOl+afN7znylDJyVIp8DVlRJhN13o6KT2xqlLJ7JcoaxgQOf98JgfaKfEMKSjEy66Ok5/v 8fkToPY8v/jIalUFPClIvbd3UwExhWxYkM9KcTuTpXiq2A9ELx5L0DwpOXF2qQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phjth4dN4z1BDF; Wed, 22 Mar 2023 22:33:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32MMXm4R017643; Wed, 22 Mar 2023 22:33:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32MMXmBW017642; Wed, 22 Mar 2023 22:33:48 GMT (envelope-from git) Date: Wed, 22 Mar 2023 22:33:48 GMT Message-Id: <202303222233.32MMXmBW017642@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: e7d9a68e8d38 - stable/13 - Switch to GCC 9 for the GCC tinderbox. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e7d9a68e8d382c3e07ede63039aa46f9747e01b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e7d9a68e8d382c3e07ede63039aa46f9747e01b3 commit e7d9a68e8d382c3e07ede63039aa46f9747e01b3 Author: John Baldwin AuthorDate: 2022-05-20 17:16:18 +0000 Commit: John Baldwin CommitDate: 2023-03-22 22:33:30 +0000 Switch to GCC 9 for the GCC tinderbox. This also adds arm and riscv to the GCC tinderbox. Reviewed by: emaste (older version) Differential Revision: https://reviews.freebsd.org/D26202 (cherry picked from commit 9dfbda254c20cb04dba5038cae4ce6c0d90739ca) --- Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5dac4a3e9ee3..6e62a831a288 100644 --- a/Makefile +++ b/Makefile @@ -533,12 +533,15 @@ TARGET_ARCHES_${target}?= ${target} .endfor .if defined(USE_GCC_TOOLCHAINS) -TOOLCHAINS_amd64= amd64-gcc6 -TOOLCHAINS_arm64= aarch64-gcc6 -TOOLCHAINS_i386= i386-gcc6 -TOOLCHAINS_mips= mips-gcc6 -TOOLCHAINS_powerpc= powerpc-gcc6 powerpc64-gcc6 -TOOLCHAIN_powerpc64= powerpc64-gcc6 +TOOLCHAINS_amd64= amd64-gcc9 +TOOLCHAINS_arm= armv6-gcc9 armv7-gcc9 +TOOLCHAIN_armv7= armv7-gcc9 +TOOLCHAINS_arm64= aarch64-gcc9 +TOOLCHAINS_i386= i386-gcc9 +TOOLCHAINS_mips= mips-gcc9 +TOOLCHAINS_powerpc= powerpc-gcc9 powerpc64-gcc9 +TOOLCHAIN_powerpc64= powerpc64-gcc9 +TOOLCHAINS_riscv= riscv64-gcc9 .endif # If a target is using an external toolchain, set MAKE_PARAMS to enable use From nobody Wed Mar 22 22:36:10 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhjxS41r1z41PbB; Wed, 22 Mar 2023 22:36:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhjxS3904z3phZ; Wed, 22 Mar 2023 22:36:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+GyI35XzdxhOBFoxOpvs5xfOwObnSYgnIKcDkvdZ6uk=; b=Nk3wIxlkt+7QTeksYCbqzbyOcmHaUUxEHrdtIqtQw92yeBHnU6UBqEjWspo4KAgXe6WqwY peu+MF5InS2KjQCUZciuVBCcei77CDFl3mIBsL082c1UOB9C/qecnGuatd0zY0fI32Pgf0 s5QwHG/zuG6mMMu3+yC4EWeYfK8J8mpOINTbBIIytsIp8YBYd81MyiAYrjxIfhNljXWEkl a8uRK29ZDOQAu5xl7DAZ9KdowB155BamFNQGjXkekshtgDUzkjDxIPTtJI/bfZ3SDf6ugv 28VNU4yFPCLouqdiRtdPtjkDFDYD402FXnWVEj0yUzo3RVeTjcSBBQ20b+5tUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679524572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+GyI35XzdxhOBFoxOpvs5xfOwObnSYgnIKcDkvdZ6uk=; b=X0XKv9KrR8EuyaGZnjyAFxRVSQf+FEbtG3L04V1vDGoiBpzjeCuibfsodhiVG5YIGc3EIq 7Z+CjtVfq23+3dlmRcUWuyTz7EBU2ZsjeJe8BHmI947uH5XLHJJl2HUYx7N969/Xwn1/As b7xMFV31alW5xeUWntBdmqhW+M/n/MYiur1rU7dw49xovW1QsGbmMbPkI1aJebMsL9vtHA 4y/4Vj/iRNWc5+uUgfx6FgTCCE5AhNy8PlngpD9yu83W8onnS9qN0GZjMPUaEt0lITh+G9 ysUVBcPzgkfEfvYvAQlAVQoZbuNDG/icgWVCSYn2Ef50vMVLozWep7i6URPuag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679524572; a=rsa-sha256; cv=none; b=gZep+qGF2BCS+SAJDFvDPmiKkQC6fM6v2TwwALP+mvpdZoq+SurJZujbpOCqXNA9Ze6p6K IxDyL53/yKI5eqP36PoIE/aUXeK9VgQJV/RsAJu5VMiZbO2SjKdLJ8IadmmrT3Fd40AH1F tpvgsettTb4bviemhlWCiRtStlnj2vmgWfYtQjg6mVgxxSBWfIj0FcmaK2ZBe93AMz78ZX j/q6xx5RMQdWGyJMa8BnFo/qi9YZmAdUKEvH3UpZXuk2jcDMihivxEiKcF7lWJpim2FAvP ublEQXnf/x8yeUFbbd28VOKLOGY5XiOYUkmVxTVcplg2gRqvaEu3xHE4jxhnIw== Received: from [IPV6:2601:648:8680:16b0:cc93:2ec:c80c:1599] (unknown [IPv6:2601:648:8680:16b0:cc93:2ec:c80c:1599]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PhjxR6g5PzHjw; Wed, 22 Mar 2023 22:36:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <9192203e-7114-6753-30f0-583bb27e18ba@FreeBSD.org> Date: Wed, 22 Mar 2023 15:36:10 -0700 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git: bde7b32c7cda - stable/12 - ibcore: Clean up INIT_UDATA() and INIT_UDATA_BUF_OR_NULL() macro usage. Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202303222228.32MMSlxk002006@gitrepo.freebsd.org> In-Reply-To: <202303222228.32MMSlxk002006@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 3/22/23 3:28 PM, John Baldwin wrote: > The branch stable/12 has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bde7b32c7cda1c39eb08195e580aeb357750c129 > > commit bde7b32c7cda1c39eb08195e580aeb357750c129 > Author: Hans Petter Selasky > AuthorDate: 2021-06-16 13:01:51 +0000 > Commit: John Baldwin > CommitDate: 2023-03-22 22:27:19 +0000 > > ibcore: Clean up INIT_UDATA() and INIT_UDATA_BUF_OR_NULL() macro usage. After this commit and if you apply the patch from https://reviews.freebsd.org/D39197, world + GENERIC builds with GCC 9 on amd64. This doesn't require WITHOUT_CXX as is currently required for stable/13 (due to newer libc++ in stable/13). -- John Baldwin From nobody Thu Mar 23 04:17:52 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhsWh4QF9z40W3r; Thu, 23 Mar 2023 04:17: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 4PhsWh3xMMz3D1h; Thu, 23 Mar 2023 04:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679545072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2KBoehEBPAxicJrJrll25DdFI3QVyWmuBoX9uUEiSg=; b=g5sgymC/6bh0KUiXVwqX+BtTDpKsxYzPRtXGXKoxdwrNRl4BxXEIZ9SFD+63MSnNZODSWZ nCKKCRkw6N32vQ1KeOwsk/rRR/nHUZdlO2N20zItpAxvgGoJrByTlV4kO3l9aHpeZv+utU yKQ0GDvkRFkNZAFyY6EA1W+cDCssAihbwqiU9EiqGxNPraKEmAIj46Yf/2q6pUO1FJLA9i nSxnbcSfl2+5UKSmCj1HkUTIYCxhaEe7j7hBuNNh/+0Xz5drlMfLzM6r4YcmqTk9vkoFG6 a2uI81UcfkkN3fx2MTUmcG306JSNwXSflGBLvi2yAL8tyjmmPtiBjF8b6nIM5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679545072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z2KBoehEBPAxicJrJrll25DdFI3QVyWmuBoX9uUEiSg=; b=b7BVqpw+i4u6rKZN1naXU75yfqCyNvUfAdXQSgbhSMVQjRBy6CMSTrvRG3bGcvlT/sjX1d n3PrU0NxwPie2aXip2xS/ZV9lb/Ym93ZTfVvz2FRAQiKm8YumEJqFepktdM6OCBOlQOrjZ uXCAXnUwZM2WkgqEKNrm1BMO2uns+zcn1VHXwzHjFCGk0BCq1RcHxVClm57pxQMwxR3QxN hrUWJuM0wHLDo60I7mngKekMB+pkbEg4588YAAOJDx/PpbWTDPQ4rHYTisZhMe7Urwg0Bn UPGssIs0e5GTwkPGmqDX7HolWlQL15TqRbnBArlH8OVhA+xLJULiOEsmBkL7Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679545072; a=rsa-sha256; cv=none; b=HgKBtvrR+3TvtjyvYEpEmlpJqBy1REJAG/nBlNDXnyqhHZusv4H1q/mZFUuv1QxrXOCIp5 RXEV+qFX10loTSDoH8yrVh/8tw694NjQyzgGKNROdMcFnpp4EwYDJBlsiHkWCMSkcW5d39 cP8fvs9VXS2qS4ZRsRLaY2duyg4F/guLVLMg3UnWhJm894mt0nK22zZxcd/x7feB3iUlZ8 0daIOvA8vuEtgqYqJQ9zdNP8yhFC7QXZRVTDkJ0eGH9y0BU2xk1ONKXhGPgsgPfSh+7SjR ebTnG7p6Ho66FhlEkTMpLulSbg1/iBBBZGlm3IDoeDMG7cUmwO0zRsS5bsZsBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PhsWh2tPMzMP2; Thu, 23 Mar 2023 04:17:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32N4HqnW076986; Thu, 23 Mar 2023 04:17:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32N4HqDm076985; Thu, 23 Mar 2023 04:17:52 GMT (envelope-from git) Date: Thu, 23 Mar 2023 04:17:52 GMT Message-Id: <202303230417.32N4HqDm076985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2daa63d80d2e - stable/12 - mips: Add device random to two kernel configs. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2daa63d80d2e2f27e1649324f7eaf5658ad1ea7d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2daa63d80d2e2f27e1649324f7eaf5658ad1ea7d commit 2daa63d80d2e2f27e1649324f7eaf5658ad1ea7d Author: John Baldwin AuthorDate: 2023-03-23 04:17:03 +0000 Commit: John Baldwin CommitDate: 2023-03-23 04:17:03 +0000 mips: Add device random to two kernel configs. Otherwise these kernels fail to link. This is a direct commit to stable/12 as device random isn't optional in 13.0 and later. --- sys/mips/conf/PB92 | 2 +- sys/mips/conf/SENTRY5 | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/mips/conf/PB92 b/sys/mips/conf/PB92 index d399874a4709..ab408c23cbbc 100644 --- a/sys/mips/conf/PB92 +++ b/sys/mips/conf/PB92 @@ -134,5 +134,5 @@ device loop device ether #device md #device bpf -#device random +device random #device if_bridge diff --git a/sys/mips/conf/SENTRY5 b/sys/mips/conf/SENTRY5 index 08d7c4b661e5..0e094bf33b3f 100644 --- a/sys/mips/conf/SENTRY5 +++ b/sys/mips/conf/SENTRY5 @@ -89,3 +89,4 @@ device uart device loop device ether device md +device random From nobody Thu Mar 23 04:19:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PhsYc0vP7z40VpT; Thu, 23 Mar 2023 04:19:32 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PhsYb6H1Hz3Ddb; Thu, 23 Mar 2023 04:19:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679545171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xkC5Vogxb1fHMhp+SniksrlM/qHXHLNhpwCkxYbfbmk=; b=AqfRBWxyC4UvzCmhjFEbWdd3noXwVeKxER3MxtFUfsaEgkB7M/kpfTnUKUvMP4jWh4ikdO Q72PGwvnpudTG/03eyIyPfoh9B2YPfNXwhxKxX+OX42JfvWGWMSP+Ph17GYHBv/xvM8DGS jFCH9l74zDibLFSSFf5k5fZ0xR/jhDryFrEr7cgk0FMmYs9pGMqRTZE8erBKTP4gzBSiU6 xhL79kbws87+vCD368DtPI44rgz9pnhHALDYQs4fOmjee8UqMb4UWFHByXOVVI82pSI9Wa up9oRZybRdhraqX1iEjR8NvN+f2oA3xbCPnNQ93fX0vyjP11Ei9jW6a/lwP/vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679545171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xkC5Vogxb1fHMhp+SniksrlM/qHXHLNhpwCkxYbfbmk=; b=KyZE4pqUS8uUu8RVJCHVQ8p+lZ77rh+DkXxVBcNR1GfsAv0psvH4t6a9xb+rnppisR+c9R yqAPNWVUaKP32YmfDsu1X5+EFlXFBFsEM+ZUPnKHC+Pq6l02MMzBXEYq43VbTHtK8nbYY9 6g9kzvm+3Ti3n4Cd18W7QAGz/IJNcC251xXjtXVX7nviobDUt/pKZ3yf9TtveXlmCe1izs hVfNUZp6Pjh3z9bbaoPYZP2fa/LCONjrbziOMiYJ/YHkzp6cKNnskzqO5rsvot/MoeXBn2 o7L2QYCm91YNsJGLuz+QIz79U8nVwbOyNIk8K8FjdRLIDicEf+Cz7BWeyLXVFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679545171; a=rsa-sha256; cv=none; b=H4zBHvT02AIty8lcFyExRjrgyPDvT5dXgr8IzYa2RabFUwdhhMy0lxdlBEF7CoKIZBPKH/ s4ZXV4FMOFAYW6jsvV0ZfPRwqbH79lYGuiOEYyW0Q85pn1h7NSW1ApnElThgayO0HIwBM+ UvDDbZWI8Yc53nU4Co5yp7E9ALU1I43JvwKp8Gb2jiY2aUh0IZtnhGNWqqB61aR04TEgSm wsiDytd2upq/LpffKzamgJQRqcbgQvZmwkO0ZRzwsApWFGhZSL6kZ8SiHvv+APlQ9betXK 2k0VVSmcuoPc5eSQ+R8pJJtHXzpRlymf2koMOiv56fYHh7d/GUQtAO/hwvcYxg== Received: from [IPV6:2601:648:8680:16b0:c80e:64d5:361f:3e6] (unknown [IPv6:2601:648:8680:16b0:c80e:64d5:361f:3e6]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PhsYb1VG8zN3B; Thu, 23 Mar 2023 04:19:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <0ab8dbdd-9da2-a432-a3a3-2c2f008db02f@FreeBSD.org> Date: Wed, 22 Mar 2023 21:19:29 -0700 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Subject: Re: git: 2daa63d80d2e - stable/12 - mips: Add device random to two kernel configs. Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202303230417.32N4HqDm076985@gitrepo.freebsd.org> In-Reply-To: <202303230417.32N4HqDm076985@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 3/22/23 9:17 PM, John Baldwin wrote: > The branch stable/12 has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2daa63d80d2e2f27e1649324f7eaf5658ad1ea7d > > commit 2daa63d80d2e2f27e1649324f7eaf5658ad1ea7d > Author: John Baldwin > AuthorDate: 2023-03-23 04:17:03 +0000 > Commit: John Baldwin > CommitDate: 2023-03-23 04:17:03 +0000 > > mips: Add device random to two kernel configs. > > Otherwise these kernels fail to link. This is a direct commit to > stable/12 as device random isn't optional in 13.0 and later. All the ARM v4/5 kernels fail to compile on stable/12 because clang chokes on CK atomics, but make tinderbox is otherwise clean. -- John Baldwin From nobody Thu Mar 23 06:41:05 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Phwhy1kP6z40wDR; Thu, 23 Mar 2023 06:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Phwhy1HlCz3hvq; Thu, 23 Mar 2023 06:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679553666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mz7NUGbCKVwQ+K+9zASLc47+duxgIVu7b4xiIHDENVk=; b=KP4Sods40XvDxA/86h1B6o32Vl7zB51IA/YSle1s9rLfhar1+MBiXS/eSpBndJS3Ou/zzt 6g40MXw9dh8eb7w/BRN8+hg1dOGYKJ1aP44m2OrcYOg9EYxACqE4v2CVL97jd1PMzRNHmq kk/SZAYfzycRA0nvntSUX7CHjpstVjlZhR0qzvs/kapgszFOJaYMfyS0EK8gobhwrK0yPb wnHF2VO0VpT1BSC6gE7e5IC2hMjUMeyT4zo75ztSfNWDFEYR792jeserAyRCzKXxLxTqmR nxPonQFGHeFmQexb87RpaFES4Juzc9maDmcx27znIRznqsAsXW0vFhfyDOwQ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679553666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mz7NUGbCKVwQ+K+9zASLc47+duxgIVu7b4xiIHDENVk=; b=yLc+KLajG+1Evaycj7zXXdbMLAERiISnBjNdDG8//3YFQgtM4ymTcR3exspPnYJy0JiHpW HX2pLog6ndI3zhPH9RpcHQVqjmeyvXHqqkPNVwjrqjPCkrkLplSzlAvbOB1WAp3Uyc8PvJ eouZp00lzqDbtacP2oGs70nKJDmCAb3sbKKFy1vvvRLPvnGA1L0V0/9XolobzTnWER9qED RXo9XBnVbT8BRQB5UAHxgdeFAv+kcxcNX5+wPLryjQqq7s8gSYfO0do+mVqs2KmmNJK+sV WmFVAvPnhfp+wyKt3voq7bYBUKYDym+mLyKORWOErjrcnlr2qiZV1Syw7sua1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679553666; a=rsa-sha256; cv=none; b=pGHsu8W00OpKigBgs48A01IjK2y5XRtKVMUMtbPjCzg7hf+QaZ8nwcEoq1OcR0Qh+HV+4+ Wd6p61VyPUQrcPcM8PBdLwR50nBB5jnn8C5Pui8S9gyVZbjCJzEAaI9/tvqJFxqCSY7FmI 0do3SV4yks9Zhzme+Nvu5EBVqY4rZXGIRFrpX+NErBaFZr1RflP9DLK9H3XAM2ZbuYTN3l qdY8DY7vqYcDjnNskOPW8qNf6YgJDyvB0EntdOIi59n3ynHRT5HyaNld3TjQFnswi0jvtg CaL6C0N8xdGSBH+TbhX+Dlj6tAwsA8X6P4BzklTZ4BCg6p0UcWz2w7iC0jfliw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Phwhy0PLlzQVm; Thu, 23 Mar 2023 06:41:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32N6f5HJ014566; Thu, 23 Mar 2023 06:41:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32N6f5Eq014565; Thu, 23 Mar 2023 06:41:05 GMT (envelope-from git) Date: Thu, 23 Mar 2023 06:41:05 GMT Message-Id: <202303230641.32N6f5Eq014565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d08ffbd70e72 - releng/13.2 - _endian.h: Include sys/cdefs.h for visibility macros 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d08ffbd70e7245f94af4b103f64c7ecab6da9d7f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d08ffbd70e7245f94af4b103f64c7ecab6da9d7f commit d08ffbd70e7245f94af4b103f64c7ecab6da9d7f Author: Warner Losh AuthorDate: 2023-03-22 02:25:58 +0000 Commit: Warner Losh CommitDate: 2023-03-23 06:39:30 +0000 _endian.h: Include sys/cdefs.h for visibility macros BYTE_ORDER, LITTLE_ENDIAN and BIG_ENDIAN will be required by the forthcoming POSIX Issue 8. In addition, they are provided in the BSD compilation environments. However, depending on the order includes happend, sys/cdefs.h may or may not be included when endian.h is included. Include it here so we can safely test __BSD_VISIBLE. Add visibility when we're compiling in the future for issue 8, but since the date number for issue 8 hasn't been fixed, use strictly greater than the issue 7 date.of 200809. This had the side effect of sometimes (in the traditional BSD compliation environment) #if BYTE_ORDER == LITTLE_ENDIAN and #if BYTE_ORDER == BIG_ENDIAN both being true because none of these were defined. This fixes that. It also fixes including it after but not before. PR: 269249 MFC After: 1d (build related) Reviewed by: kib, emaste Differential Revision: https://reviews.freebsd.org/D39176 Approved by: re@ (gjb) (cherry picked from commit ed52baf51bd142b5e32701842346452a7ebe37a5) (cherry picked from commit 4ccd5e64b76bbaa874c50755d17394a7ed195f93) --- sys/sys/_endian.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/sys/_endian.h b/sys/sys/_endian.h index 7ac39386e2e1..3b4460472eb6 100644 --- a/sys/sys/_endian.h +++ b/sys/sys/_endian.h @@ -36,6 +36,8 @@ #error "sys/_endian.h should not be included directly" #endif +#include /* visibility macros */ + /* BSD Compatiblity */ #define _BYTE_ORDER __BYTE_ORDER__ @@ -66,10 +68,11 @@ #endif /* - * Deprecated variants that don't have enough underscores to be useful in more - * strict namespaces. + * POSIX Issue 8 will require these for endian.h. Define them there and in the + * traditional BSD compilation environment. Since issue 8 doesn't yet have an + * assigned date, use strictly greater than issue 7's date. */ -#if __BSD_VISIBLE +#if __BSD_VISIBLE || _POSIX_C_SOURCE > 200809 #define LITTLE_ENDIAN _LITTLE_ENDIAN #define BIG_ENDIAN _BIG_ENDIAN #define PDP_ENDIAN _PDP_ENDIAN From nobody Thu Mar 23 12:42:21 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4jn3Vjdz41JJY; Thu, 23 Mar 2023 12:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj4jn33gYz4LRj; Thu, 23 Mar 2023 12:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FS/6nR6ZnPAwkxlMIu4A/l/gOn1k8Y7N8Muv7HEowVE=; b=QbP2qxoiF4vGpBnBxXgrRFl3g84AhOyhKylUX6rOJK+9s05i8vgEovZWphLzxUNLrH97tm 1Jw5IAvlbAs3uhWLsyielShm6WB+lv1RmKc8kiu/o5LZDSwDHQokolmo9OtgKFqOkACKKX zlH38uOVL/Qa5MjqKsxwKw3CWmopcSQXTNaAU55HgPf776bfpRHLf2HJVUYAJ9wujqcrgD C1XbV2v9VgeqyAIfWUnPKvKNAYOLZyktX8FVPANF/opn8hlqqkE/HlNMWJITykfI97t9RH K2pTk06B20WUOaRKGVJlnH+2EH7Li7ld5qp7qukEUCldRGYM08MQoJZVCoIjBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FS/6nR6ZnPAwkxlMIu4A/l/gOn1k8Y7N8Muv7HEowVE=; b=VRB4yh+r2yU/rpuqqW9tZMZr0H/jMOtFBk0JkUeJ0Sll4Sd6rf7SHtR07UH/g8qidgEEmq puRMooRwzV0SnxRjBeBU9Uyj5a2Phyb1tgftr6tcnsjF7m8yDrxWFqKWmBN10MtxmaHWxQ +Zg18sl8XdgK1RacjOk3noNFCT9S0JzaBACLULYSRQhmx18JztBF4dPhaZc/kUE1MdPI3P WD+5HuTkgGIxAJEaTklVPY3n6osp918wtqDQ0nn4lvxq12KY47zxzAHFTUeD3Otq51OyCj g5UtYNfSS0jwVfcnc1qRMheSShiw6+t4I7FNp7iBQjjW5RHk84ov5x0vMwn9hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575341; a=rsa-sha256; cv=none; b=x0JsxmlRh+X4G+Mjhu/nyYxYAlbFUz8Y/V/mbaKpmW2qubYtIpa1ltk0523qF34XUqEOP2 w+kYpaHvBTfzJgo2D/wdym13RK/scHgaaJMtgSiDQPDWmSbxtOk+ii1s21rTTPfc/3ru9D uVQfg11XfMFOQ9Jl7cIpi0DHQUBqnKXpM86uUsqauzXOhpltE9qmHH6Vuio3xXi2MUTfC+ c5OSeTouyMWmm6peP7uzAf3Tr//fM/lQKm8o5ZF0MmYTmwzf8i4jxaWn1lBBiVWykoxOkA V3N+/+4kldAC16Q+HZkjsiIgYZZ/GRf8wVhlzZn8At9GqslJhX0v7dmka0NrGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4jn27y9zbjK; Thu, 23 Mar 2023 12:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCgL3V012388; Thu, 23 Mar 2023 12:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCgLlK012387; Thu, 23 Mar 2023 12:42:21 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:42:21 GMT Message-Id: <202303231242.32NCgLlK012387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7bc6ce41d833 - stable/13 - ldd: clarify format options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7bc6ce41d83353efa088942e3f3add38b98c3ada Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7bc6ce41d83353efa088942e3f3add38b98c3ada commit 7bc6ce41d83353efa088942e3f3add38b98c3ada Author: Ed Maste AuthorDate: 2023-03-21 14:14:03 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:41:35 +0000 ldd: clarify format options -f may be specified zero, one, or two times. Make this clear in the usage. Reviewed by: markj, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34733 (cherry picked from commit e9f8723c30fc390f1282f5286d57c090ed9e5925) --- usr.bin/ldd/ldd.1 | 4 ++-- usr.bin/ldd/ldd.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1 index d263eabcf4ff..447b6c752e9f 100644 --- a/usr.bin/ldd/ldd.1 +++ b/usr.bin/ldd/ldd.1 @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd August 28, 2021 +.Dd March 21, 2023 .Dt LDD 1 .Os .Sh NAME @@ -9,7 +9,7 @@ .Sh SYNOPSIS .Nm .Op Fl a -.Op Fl f Ar format +.Op Fl f Ar format Op Fl f Ar format .Ar program ... .Sh DESCRIPTION The diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index 2cd2a4c72324..4f5555e34610 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -260,7 +260,8 @@ static void usage(void) { - fprintf(stderr, "usage: ldd [-a] [-f format] program ...\n"); + fprintf(stderr, + "usage: ldd [-a] [-f format [-f format]] program ...\n"); exit(1); } From nobody Thu Mar 23 12:42:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4jq0NsXz41HyR; Thu, 23 Mar 2023 12:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj4jp3zKDz4Lb0; Thu, 23 Mar 2023 12:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ieMeBj5Z4T5fIxALL4UFYkU12TD9b5aFiSLRP+usRI=; b=v7dan+SnjcQhigkyH8+gRKfU+scMMQ1E5ntSXVJgiBn6PisHuVjAsLhARzYDJBcNKlNccs GQ+hmigwxPADvu04lHH39knWwxhl/pCfnGgYBTq34R/eDseu9sCehBo5pm0KQGwYDqQwrz gWS1p8EDKJMUTqfIJA4L81tu7Mjy+pQz+iISrRYhDF2b5V8U46lHWJuarRAHP13rckRX6Z GxxxMl1S1PmK/tnkDuoXNbsG0P05ybviCLw9tsY+tT0WtRLbwVTOgfeD0iqXoqHh4hNt2U 7mWiV0ZecALBuPYxf3/iDVYx8E+AS9MVI54A1foVjjfW/2ivgiLOwqDeZ8Iz+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ieMeBj5Z4T5fIxALL4UFYkU12TD9b5aFiSLRP+usRI=; b=xadjZv/ZlBQwLEGCpLLqjA2ctjXxwtDPBdndkr5dxg5uOiuuJkkyzAK4/ugzvDb+jwm8Eg D6M1LoZUwH/TXGS8MiaXxVxdjbu0QxEYH7kNCU+JPhv+Ig3iY1jSmGnMtmzQ+IzMZIvEb8 UAXX5aXAO275yMgvov0IVjHWxRLaxe2p08laUrCVGsq/KWvP6zQn2VyW5oqQr8TE5U5FKN T8CU+D22Y6NsG58VSKm/m2Q/XJtP53chU+CUlO0z2eyF9dunRQkKGJIcuMiyWuAzam1J03 ETt354TJlNypVBxNYDGAknau1XIUiSKsNuXRo/2K96DUnXPkkUwoXKH2r38Bgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575342; a=rsa-sha256; cv=none; b=BhDUftQrYt/9zgtNQu/JPz8MSv58BjMrtHkeo/4Zhp7RGZ5dEnbLjAh1mpkAlL2ckp3Br6 Sdl/xWZZyuHE0jylhjJ+m5YV95J+Pzo0Iz3hw1rbkpXqGVYfZ2EfbpUL0ASOybYDFMpZ+2 R2zsUweEU8d+LMrOYjQUD5FxQrxlMWjp4bocjNMOptcMOtuMJ5aJcmfHBhV8y4uBgQN6W8 oWThj8FzwiZcEhzb7xbVXFyic9LJSOguGSwpwyRMmE8YF7gCF9XhtEr/rauRG5tiNbbbXb mpr4cvqCsO5Q/tqEuuqEgX1zXGDAJtpftgX74MXAb/emIMoLIjr7GN/N27/+Pg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4jp34qtzcB1; Thu, 23 Mar 2023 12:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCgMug012407; Thu, 23 Mar 2023 12:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCgMJt012406; Thu, 23 Mar 2023 12:42:22 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:42:22 GMT Message-Id: <202303231242.32NCgMJt012406@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 66f3ac8c661d - stable/13 - gvinum: correct assertions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 66f3ac8c661df02cf7d9e187ea20e66e2e71ec82 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=66f3ac8c661df02cf7d9e187ea20e66e2e71ec82 commit 66f3ac8c661df02cf7d9e187ea20e66e2e71ec82 Author: Ed Maste AuthorDate: 2022-12-12 17:08:39 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:41:35 +0000 gvinum: correct assertions Pointer addresses are always >= 0. Assert that the value is >= 0 instead. PR: 207855, 207856 Reviewed by: imp Reported by: David Binderman Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37677 (cherry picked from commit 87bb53cb538059a3085db1fa4295dde5fcba55fe) --- sys/geom/vinum/geom_vinum_plex.c | 2 +- sys/geom/vinum/geom_vinum_raid5.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c index 3e5b2e3d51a3..f3895f5b80ff 100644 --- a/sys/geom/vinum/geom_vinum_plex.c +++ b/sys/geom/vinum/geom_vinum_plex.c @@ -173,7 +173,7 @@ gv_plex_offset(struct gv_plex *p, off_t boff, off_t bcount, off_t *real_off, return (GV_ERR_ISBUSY); *sdno = stripeno % sdcount; - KASSERT(sdno >= 0, ("gv_plex_offset: sdno < 0")); + KASSERT(*sdno >= 0, ("gv_plex_offset: sdno < 0")); stripestart = (stripeno / sdcount) * p->stripesize; KASSERT(stripestart >= 0, ("gv_plex_offset: stripestart < 0")); diff --git a/sys/geom/vinum/geom_vinum_raid5.c b/sys/geom/vinum/geom_vinum_raid5.c index 2778646467e2..1c30834ec298 100644 --- a/sys/geom/vinum/geom_vinum_raid5.c +++ b/sys/geom/vinum/geom_vinum_raid5.c @@ -605,7 +605,7 @@ gv_raid5_offset(struct gv_plex *p, off_t boff, off_t bcount, off_t *real_off, /* The number of the subdisk containing the parity stripe. */ psd = sdcount - 1 - ( boff / (p->stripesize * (sdcount - 1))) % sdcount; - KASSERT(psdno >= 0, ("gv_raid5_offset: psdno < 0")); + KASSERT(psd >= 0, ("gv_raid5_offset: psdno < 0")); /* Offset of the start address from the start of the stripe. */ stripeoff = boff % (p->stripesize * (sdcount - 1)); @@ -613,7 +613,7 @@ gv_raid5_offset(struct gv_plex *p, off_t boff, off_t bcount, off_t *real_off, /* The number of the subdisk where the stripe resides. */ sd = stripeoff / p->stripesize; - KASSERT(sdno >= 0, ("gv_raid5_offset: sdno < 0")); + KASSERT(sd >= 0, ("gv_raid5_offset: sdno < 0")); /* At or past parity subdisk. */ if (sd >= psd) From nobody Thu Mar 23 12:42:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4jq5VHbz41Jcd; Thu, 23 Mar 2023 12:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj4jq4ySDz4LVy; Thu, 23 Mar 2023 12:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBGsWWlezZsar3cVCyIPVxW4O4lkWpRLYJQQ5IQnAUY=; b=eEfTr9/t1sq6sudTdsmpbzb5SOR6BRMfUWBuklSRxVstT4aS+MZkq5pFI0g6P4TQNesSwC 4/CCHEnAW9otb+SgvLk08xEQBiqaSRvE2q0mTBlSsRuQ0AzKMVb+Ikoz2PwWb3ntZs8bKK nh8GvoeBegYpI3Yhovj3M83AIWMYj5/WGuw/+JWpzWCtAyKYVUjzLYGtJ8o3Cccs1uNyYT w7dZhLRt8E0W1BSewnzw3itmf4if5i5VK71xW6ultdCl9WJxLmoy1Sg5V2/IbTvBhePQ+T NNcJxccwRkW6juZir8cEVxvXgJnhYGjlu6pnHPFvuxvOX7IQNsypafiZ5T464Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aBGsWWlezZsar3cVCyIPVxW4O4lkWpRLYJQQ5IQnAUY=; b=qSocxU8hZQpuBke+XbwAv9cTeHd/qLcQpZ71G4omGgELv2gIBcZck9pRy9OS5nYeASqnBX Q7MhCQE/+VQV0rj63sY7+nBniCvyzWRTa72RJ4Q2YGJJGcuzl0M7LQhY3th+p+M/Pl4GcS ZTmo0LHvOJNbLwscqjdlKg+dHqWLA3MQ/l9vy7rPG4OOh/eZnGSsyvDBeNnv3E61eI/wsc RCz0IAYDBzqaWP3hiJrfMbkLUu9KVgtXeseF9tiar1Pkfzfj4W7W+IBu/TjAspT8izbAwM RtRy5k7sX3eYs9EZmi9coKtjfVSjSAwB5a2eHzigUz0YUt+WfwCrqg9UJQlOwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575343; a=rsa-sha256; cv=none; b=ffvW++CK3pZoilZh0QvMzmALRnG2aOYo1YlS39XZXehflrEafEJz6jUaeRcj8tk3AD30o+ Z5vUJakzQzhf5BoSu8Fw83NUVIa+EtCDtEsLmQYkdVcedDHVXRsDpL9/D9tVDneudDROL1 DRXk4YjwyxY1OJVU5lvJnYbS9fO7/cN9G6yAjiBQfE9gIcSZAqI0fHpoldDDm/HZ773Oss QEECZSjAW3bSPsW34TgHgvSYGFfuX+fYZtw9QUVHz5+IX2M6t3BJuXYIxO4f8RZ2exdZvK abHN2ervU4I9KszZwqogczeWvtN/Hatw+cxhnr8k4n3x/0uu0maZD/U7IEdeeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4jq436pzbjR; Thu, 23 Mar 2023 12:42:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCgNpb012433; Thu, 23 Mar 2023 12:42:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCgN9R012432; Thu, 23 Mar 2023 12:42:23 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:42:23 GMT Message-Id: <202303231242.32NCgN9R012432@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e26552c0d882 - stable/13 - lorder: add deprecation notice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e26552c0d882c8c9fedb7c2c80ccb8a5faa73607 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e26552c0d882c8c9fedb7c2c80ccb8a5faa73607 commit e26552c0d882c8c9fedb7c2c80ccb8a5faa73607 Author: Ed Maste AuthorDate: 2023-03-21 14:20:42 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:41:35 +0000 lorder: add deprecation notice lorder has not been used by the base system since 0e1e341b486c and hasn't really been necessary for a very long time. PR: 259254 [exp-run] Reviewed by: arichardson (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D30080 (cherry picked from commit 68a930d8ee35dd6ecc16254667a07e5be0a6f841) --- usr.bin/lorder/lorder.1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1 index de03b626fc5f..061e2ed75b20 100644 --- a/usr.bin/lorder/lorder.1 +++ b/usr.bin/lorder/lorder.1 @@ -28,12 +28,17 @@ .\" @(#)lorder.1 8.2 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd December 20, 2021 +.Dd March 21, 2023 .Dt LORDER 1 .Os .Sh NAME .Nm lorder .Nd list dependencies for object files +.Sh DEPRECATION NOTICE +.Nm +is obsolete and may not be present in +.Fx 14 +and later. .Sh SYNOPSIS .Nm .Ar From nobody Thu Mar 23 12:50:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4v93B5nz41Jx4; Thu, 23 Mar 2023 12:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj4v847CPz4Mph; Thu, 23 Mar 2023 12:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Nq5Ib9HxGRpa0PaG/56lcqMPp10ugzqYveF/I9MYuA=; b=NQ5aL3NMh3hAqhiC2ta+HllGHN5v2HAzme8ZLEMHeOeQVOA9UeYTo3vbfzwHQg2MUeNCdy HktnWn2CqDwQNJTVAd+Qa76Bxzm2FCGnFn+FtpKrTv4dlybODYypG7ReYBQhGbJLtxz5w/ Yjy/+EuVQNZuSNUPYWm/1Lu/b0mv6s3NVOA/1KlQIkQrTL7cUW9LaiDM/uSJqDVbU6HOqg G1ArMRC/8x1g1Zzw3aVsK4XOzomzcb1d1GLVzbmlXPmujOrHdvBf2GD51CFo5Z9pHqK95N DaDJXsy7Unlg5uO4/BoajMcb6IDpdFkUE+2hvM+rNahLFjHwRY5PlDA7qkqNAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Nq5Ib9HxGRpa0PaG/56lcqMPp10ugzqYveF/I9MYuA=; b=OdIvY8w9r5WJmvob71ogxa+ucnhD34ot8FOeHPeoA1ICCfYJyCpbfxbusOnN+mH0WdBhbQ P5PGXRBXyweZpmbs61IGKAesXeJYPqrU3p5qzc4yafLiEV9rgF1aBfX32EGM+DVqgSZOn6 LAPk+tthNmJUcDFjAIDAFFzE5nfAfdeExt6idjLLL/XYMyGN9I8QsPD2aEYpY2XSCuaXJn aZ80xlk1GWYhik+l8CZwjSX/CnecI8L5W01IYKCPyWaMs3uGBudN5tjBie2DB0Gv1uK0iH gkZXvws14CGMflvIv/yX2IOKIH/7FbC32YT2+f7k2h0rsWOa2qHCZxlI1bipRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575829; a=rsa-sha256; cv=none; b=LWMLG4ZiDUvpRHFDjCJRuif7Bwerm/HxGtfpr4Qr68GXQc58kkV2o/9RdQd/+82H2QrE8a LRipyLccnWTOOe05Nw64DjNnu11NfX+q5bGDGhu4eN+nupqQFzAYryaomlsR0j8pjEPZtx WjSenyZQ/HvcYcxM6YA26uwlnlL1B5LV1xy5mbBHnQz1nrkzG7qXSbKm4vBFJXzwYDdJSb 1J+IBUuvkrfPDIsfWGJxcSS1amNl487MER4dL0xp/5IgmQe8RMN7HW2xQhQEjrnw79+EkB 5RYWl0I3ZZ+wb4eF3p1QkT4YniofIFR+ZE4vVyvMZUXquUAMpP4u19knLvlj1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4v83Cfzzc1D; Thu, 23 Mar 2023 12:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCoSph022910; Thu, 23 Mar 2023 12:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCoSOh022909; Thu, 23 Mar 2023 12:50:28 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:50:28 GMT Message-Id: <202303231250.32NCoSOh022909@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8ebda77aa1de - stable/12 - mergemaster: add deprecation notice to man page List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 8ebda77aa1de531003e6aa123db0a2b35f618cd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8ebda77aa1de531003e6aa123db0a2b35f618cd1 commit 8ebda77aa1de531003e6aa123db0a2b35f618cd1 Author: Ed Maste AuthorDate: 2020-01-22 21:04:03 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:49:43 +0000 mergemaster: add deprecation notice to man page PR: 252417 Reviewed by: bapt, gjb, kevans (all earlier) Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D23327 (cherry picked from commit 398b12691b4f1e7a73afca4c051c182bfcaf9671) (cherry picked from commit ab53efd14237b71c3c0e4e212ada6526ef14402c) --- usr.sbin/mergemaster/mergemaster.8 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index b37b173d3c67..a4f8da0d9c44 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 8, 2018 +.Dd March 2, 2023 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -43,6 +43,17 @@ .Op Fl A Ar Target architecture .Op Fl D Ar /destdir/path .Sh DESCRIPTION +.Bf -symbolic +The +.Nm +utility is deprecated and may not be available in +.Fx 14.0 +or later. +Users are advised to use +.Xr etcupdate 8 +instead. +.Ef +.Pp The .Nm utility is a Bourne shell script which is designed to aid you From nobody Thu Mar 23 12:50:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4vB3C8lz41Jtn; Thu, 23 Mar 2023 12:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj4v952DPz4MrP; Thu, 23 Mar 2023 12:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/pA7MnLEvyEYMq5hmt9lIDVivzNPpTxB1l2H12Rg8Bs=; b=ns1yptR8K/qzSjnTZCS+6rXWAZ8jggVC8s8tARX/YD8vc776klZTLkDc8576c2JhOGttSa rGnMttt98ZzGxnmPz8UKoybAF9BR3cg3VJZGLJiGnH6JoIhTlnBQajDeYgNVQ2LU7MgJG0 WQTxZNOVlgZd1o4bbAuYvSdvOzOIXBBkCzSd8EMoJnG73useu5XKG2naacK4TGsv05eu3k fa++3ME59VLvRQqFDv6EyMCdYb1cFxUEcSisvgglTCkaQLQXNFHMjgjI6AumT1GDQAPwfW v/8m40IOowy6IXuru/PqiTSxtNf+K9Au7dZvWL+oSx58lCVK8imv3cak/WqXkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/pA7MnLEvyEYMq5hmt9lIDVivzNPpTxB1l2H12Rg8Bs=; b=bZKQLiH/o6hMHHhwbkYBlkB5IXSmMfUDrjC3vOVzzBnqB6iXkq9GOYqvi8a3qkjPmoP8d0 lTDlnx0iLHdX46QXEGuZymnEydwUqHhnfju6QjeIViJr2Hjx3FcNRgW2K3Qh5FLP0GeiqL 9LSDNq8K+JU0fllf/99zqOH46LNN0xS0nHneeUvRfLPL5BeDw1X7ftFXEDYNMGS952uRJT /aVS7NuEVNIWjuiUx8VM4s5+3CTmMYDe8fez2NKl5/k7TvCzplrHdUbDRx3kX0+TDDDaVL N51zc/5M9XTLQueXU6PXWlKwLoW3Ev8Q/ZT7+y9xO0kTUcGKtYCV5vTrht3/IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575829; a=rsa-sha256; cv=none; b=Bjmc60uSMplE9mBNaAL6AYC7LreBzoz/XMzjwT3ToN/xZ0iGFiZaUgTOorEcra73A/s2c5 oqBpDVosS5urx9sUUmTkt3XdTA+LdwuMUegtc7gBuzvlhJrA7CMh9SpZaYdHOwG5zWg5VZ HcHxUqXWCjr8/QXNaiY7icU9/Y7taNk0jnK0RQaKnoYng99AI4MHEiVSrHUnVksBKNoaRa UkY+9D+maHyPNlfCTTfoqmD5BAiQfHW6jLvfzGsiwoiJDfSfw1KTXDDCm3Uv8kR877B8uC gQ1rtCpfZkTfrP6b2y0T2x/EU+NM3HeHh4NCln3sxEX8ahmXHbi6K/+vumsnig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4v946vDzbjY; Thu, 23 Mar 2023 12:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCoTWd022935; Thu, 23 Mar 2023 12:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCoTEE022934; Thu, 23 Mar 2023 12:50:29 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:50:29 GMT Message-Id: <202303231250.32NCoTEE022934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: dc3d0ff61575 - stable/12 - etdump: exit on error if section header or entry offset is OOB List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: dc3d0ff61575870614ba3691a0cbbbf8f6ff2065 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=dc3d0ff61575870614ba3691a0cbbbf8f6ff2065 commit dc3d0ff61575870614ba3691a0cbbbf8f6ff2065 Author: Ed Maste AuthorDate: 2022-05-03 20:13:37 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:49:43 +0000 etdump: exit on error if section header or entry offset is OOB PR: 263663 Reported by: Robert Morris Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35868 (cherry picked from commit ddf77ec392717e7eaf278c0f201b561afac97b87) --- usr.bin/etdump/etdump.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c index aedd53a9f6d1..38220c821439 100644 --- a/usr.bin/etdump/etdump.c +++ b/usr.bin/etdump/etdump.c @@ -116,8 +116,8 @@ boot_catalog_valid(char *entry) } static int -dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, - struct outputter *outputter) +dump_section(char *buffer, size_t bufsize, size_t offset, FILE *outfile, + const char *filename, struct outputter *outputter) { boot_catalog_section_header *sh; u_char platform_id; @@ -125,6 +125,8 @@ dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, size_t entry_offset; boot_catalog_section_entry *entry; + if (offset + sizeof(boot_catalog_section_header) > bufsize) + errx(1, "%s: section header out of bounds", filename); sh = (boot_catalog_section_header *)&buffer[offset]; if (outputter->output_section != NULL) { outputter->output_section(outfile, filename, sh); @@ -135,6 +137,10 @@ dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, if (outputter->output_entry != NULL) { for (i = 1; i <= (int)sh->num_section_entries[0]; i++) { entry_offset = offset + i * ET_BOOT_ENTRY_SIZE; + if (entry_offset + sizeof(boot_catalog_section_entry) > + bufsize) + errx(1, "%s: section entry out of bounds", + filename); entry = (boot_catalog_section_entry *)&buffer[entry_offset]; outputter->output_entry(outfile, filename, entry, @@ -195,8 +201,8 @@ dump_eltorito(FILE *iso, const char *filename, FILE *outfile, (uint8_t)entry[0] != ET_SECTION_HEADER_LAST) break; - entry_count = dump_section(buffer, offset, outfile, filename, - outputter); + entry_count = dump_section(buffer, sizeof(buffer), offset, + outfile, filename, outputter); offset += entry_count * ET_BOOT_ENTRY_SIZE; } From nobody Thu Mar 23 12:50:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4vB74zLz41K1r; Thu, 23 Mar 2023 12:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj4vB65ftz4Mtk; Thu, 23 Mar 2023 12:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zIazhYaqEC1QleBM3ZDmBezSvA/lMtjjm/2rMz6cMQM=; b=wtIC9RYpAS9cG9SjE2eCTieyjgGcXszqRSSOIOuF67YCeNbrrHyaPUz61t+AHAx7lvYZSu fb1KM9hywO8QAiJRc9u8mOctvpmFqNFCUWwhwW667vOQBrMoRtUWi/Y+Q76MSfRHhMdNmd QhwxIhImnvh1o2f7lPdxSDpjp+pvubdxvoojepieOsaBBhMo/zlvAo9t1WXqfysTbenUVA Ata31HnqRj4kHKXvoxRkObHt00QJNrmVkJAA4LwPfqfeM5EnGhaujZ1c5qFTd5Mctpj9Le Yw3r/t8MdMPTn2ytxFdlPDJZDbtUb3J/tRcLqdIEtVvLt+QocZr1QyXmLrLOwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575830; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zIazhYaqEC1QleBM3ZDmBezSvA/lMtjjm/2rMz6cMQM=; b=d/HxPwI4erOTA6huYDu728gtJiX5v7de0zxm+LaI3mPSBer7HEus5/wlUFwds9VQSVoCq9 wArXmvtmlouGjLlnMXIrc9Ua+PXaH78uKXKQTT5esnrfZGOBsFCOOrpKtCLEdco2OL1fvk uQJdVxSpshCxlN5tZNsIx+BcEBxsr/fcCAYFjBJW68WiL4ACCqcVIkWHweA9tOm2r2/PH7 BD+oFjqBcHoVFLiXg1ZD7iekz3mFvWhjmNIDgTEYAF9QbsQWdHq+zT/HX9NYPIf/IyBCY3 1Dxl6YzwU9wExOP0ixO8//NOkH/X9O4mLM2KH9UD/Pf/hv/j6HYolbQLVnjISQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575830; a=rsa-sha256; cv=none; b=egQOqa0q0mQL7vZuioGjkBq4plFGr5aAZuPXh8MCqak9c2OTzbIq6A52wOAoMPeSIPkc3s RKEIGOxNxkuA60cCF1Na5INCe8pCsR6hLVfwTc6WRQ2ocjNV+R6p1YFu5S27BGL5awx4xh mapSINaY+/7DVle7mYGkamR+/iPJS3lgXlBFH7FgG93Py4l3Ysapb87mQK+HYYcos7dLlh BEl+fdfqaqgW4stpsfvqA1rS9Ws7xshP2/8gfutGx0nJl2cpjBC2UkWb9PIOByztdTRGsF 51CfBVMDJqLVYouE2R/mw6nszpP7sJt3Qmy/+1qjCTX5i/jkBvLpxoW45w8Djw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4vB546mzcB5; Thu, 23 Mar 2023 12:50:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCoUlK022955; Thu, 23 Mar 2023 12:50:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCoUnO022954; Thu, 23 Mar 2023 12:50:30 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:50:30 GMT Message-Id: <202303231250.32NCoUnO022954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c68dc69680d3 - stable/12 - lorder: add deprecation notice List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c68dc69680d3a4bfe97291df6d72262008f20fa0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c68dc69680d3a4bfe97291df6d72262008f20fa0 commit c68dc69680d3a4bfe97291df6d72262008f20fa0 Author: Ed Maste AuthorDate: 2023-03-21 14:20:42 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:49:43 +0000 lorder: add deprecation notice lorder has not been used by the base system since 0e1e341b486c and hasn't really been necessary for a very long time. PR: 259254 [exp-run] Reviewed by: arichardson (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D30080 (cherry picked from commit 68a930d8ee35dd6ecc16254667a07e5be0a6f841) (cherry picked from commit e26552c0d882c8c9fedb7c2c80ccb8a5faa73607) --- usr.bin/lorder/lorder.1 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.bin/lorder/lorder.1 b/usr.bin/lorder/lorder.1 index de03b626fc5f..061e2ed75b20 100644 --- a/usr.bin/lorder/lorder.1 +++ b/usr.bin/lorder/lorder.1 @@ -28,12 +28,17 @@ .\" @(#)lorder.1 8.2 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd December 20, 2021 +.Dd March 21, 2023 .Dt LORDER 1 .Os .Sh NAME .Nm lorder .Nd list dependencies for object files +.Sh DEPRECATION NOTICE +.Nm +is obsolete and may not be present in +.Fx 14 +and later. .Sh SYNOPSIS .Nm .Ar From nobody Thu Mar 23 12:50:31 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4vD1FMdz41Jlh; Thu, 23 Mar 2023 12:50: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 4Pj4vC727Dz4Mn5; Thu, 23 Mar 2023 12:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=reMVN6/VrR11FFGWw9amkPg/r+Jq8Aw3VX1kLz9r67Q=; b=fvrcHdgFLDA1S3/dqOgfMOrecyOARqpup/wR6SiX0LK+iV5FALCKbFVjr5kvLM+SdZ4h83 7w9xTFqz92Dd5o4tsbLlRaEUQGfOLFMHkT+WCtCQ8rAsygpErz4ffYoCmnoeB6IhpvZ6rE xDNstOFXGZ53CXoKOR50RBhSkXr1yliZPC8VTeo+olFyT7Or6gHg8WYCAGlQbrpzfXC/Rk suWqyC1kfD822EaoCDfd5ci54ekx5LtRGd54GfqAiTuv5MotXSosSB8HtMEqg86iGDmoZo r6/qxs1HC01Z90y8Pl46cKjeAiwXtsKaFkSHcSWpOsA7vklIfhYFqvKLcK71dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575832; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=reMVN6/VrR11FFGWw9amkPg/r+Jq8Aw3VX1kLz9r67Q=; b=MGafbD/gwaGj+eFCdtE7VOdPqAFX7bEJthFlVZck0fJVT6btHA8QOAwG5GAcSGuzYORxP3 +EaSaWS239PHjPBqBv0gbkptdJu9mrmatlIGIWX84V1/l4F1JQPUitSEUxQSKWd9QEF8sM NoVIUzojFpNh6fXo52iLD2kPUb4wydpOD0WQXmVlcNiIRYB4+5QHJNeX6m0pZnpdwK+0Zk wxRc0s14b6+x20aj211tMlE6fg8u64qiqbWSqDuZvWSI23SsFbw96RC9KYvLUpQnpayONQ ia1DByrJLK1GVrS3EHBRdmhy3kwHDpjBwMNUYCGpJIn3dQY08qjiCsaEyTyz8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575832; a=rsa-sha256; cv=none; b=LAomWsOiOLnVrd+YTg2rUBtE5bim0gHeYqzY4+iDg5/pDxbVjaKDJGZ/kIzRWVxGpjylLK DUESvP3GzXf80kcAC7Ff4krUMRH02bAMSfAO6lXHH2rGR66/UDOc6sNMj0KUNhQg10MD43 piZ4ETVkvpa9KE1h7BhvmaqF5tMcHeeS+bna+u8YpI0j8/R5qOC6515h25OD6ieGl1TQRi ftLRZ6ENXY+23JGW6aVc97K7BzxJH9TJlp3w4qccUIUD/oj+5H9VilN8Y4YWNW/16+shuT Tbx26GTxUsPQ2faGn1+y9g4F+PYPXrX0xmD1iBpqx62HyGGBeRoNwwVyfiOJNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4vC61WXzc8w; Thu, 23 Mar 2023 12:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCoVts022974; Thu, 23 Mar 2023 12:50:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCoVx6022973; Thu, 23 Mar 2023 12:50:31 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:50:31 GMT Message-Id: <202303231250.32NCoVx6022973@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 12be1c744e00 - stable/12 - gvinum: correct assertions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 12be1c744e002b96c3b84e816e8ec72455f443bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=12be1c744e002b96c3b84e816e8ec72455f443bf commit 12be1c744e002b96c3b84e816e8ec72455f443bf Author: Ed Maste AuthorDate: 2022-12-12 17:08:39 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:49:43 +0000 gvinum: correct assertions Pointer addresses are always >= 0. Assert that the value is >= 0 instead. PR: 207855, 207856 Reviewed by: imp Reported by: David Binderman Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37677 (cherry picked from commit 87bb53cb538059a3085db1fa4295dde5fcba55fe) (cherry picked from commit 66f3ac8c661df02cf7d9e187ea20e66e2e71ec82) --- sys/geom/vinum/geom_vinum_plex.c | 2 +- sys/geom/vinum/geom_vinum_raid5.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/geom/vinum/geom_vinum_plex.c b/sys/geom/vinum/geom_vinum_plex.c index 4afdb282b821..fc24938bd372 100644 --- a/sys/geom/vinum/geom_vinum_plex.c +++ b/sys/geom/vinum/geom_vinum_plex.c @@ -172,7 +172,7 @@ gv_plex_offset(struct gv_plex *p, off_t boff, off_t bcount, off_t *real_off, return (GV_ERR_ISBUSY); *sdno = stripeno % sdcount; - KASSERT(sdno >= 0, ("gv_plex_offset: sdno < 0")); + KASSERT(*sdno >= 0, ("gv_plex_offset: sdno < 0")); stripestart = (stripeno / sdcount) * p->stripesize; KASSERT(stripestart >= 0, ("gv_plex_offset: stripestart < 0")); diff --git a/sys/geom/vinum/geom_vinum_raid5.c b/sys/geom/vinum/geom_vinum_raid5.c index c21e28ac6a72..0655890e2416 100644 --- a/sys/geom/vinum/geom_vinum_raid5.c +++ b/sys/geom/vinum/geom_vinum_raid5.c @@ -604,7 +604,7 @@ gv_raid5_offset(struct gv_plex *p, off_t boff, off_t bcount, off_t *real_off, /* The number of the subdisk containing the parity stripe. */ psd = sdcount - 1 - ( boff / (p->stripesize * (sdcount - 1))) % sdcount; - KASSERT(psdno >= 0, ("gv_raid5_offset: psdno < 0")); + KASSERT(psd >= 0, ("gv_raid5_offset: psdno < 0")); /* Offset of the start address from the start of the stripe. */ stripeoff = boff % (p->stripesize * (sdcount - 1)); @@ -612,7 +612,7 @@ gv_raid5_offset(struct gv_plex *p, off_t boff, off_t bcount, off_t *real_off, /* The number of the subdisk where the stripe resides. */ sd = stripeoff / p->stripesize; - KASSERT(sdno >= 0, ("gv_raid5_offset: sdno < 0")); + KASSERT(sd >= 0, ("gv_raid5_offset: sdno < 0")); /* At or past parity subdisk. */ if (sd >= psd) From nobody Thu Mar 23 12:50:32 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4vF4qJLz41K1x; Thu, 23 Mar 2023 12:50: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 4Pj4vF0p1Qz4N3D; Thu, 23 Mar 2023 12:50:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uIEOzsdve/0Z9o+003xsT1wwl+hNHZcnxO/O85xWIDk=; b=RkQyv46Wqlqy169rcBdyE2SXaiMplo3kJ1kUc9q73iHjWPk6CA7bA6Q+8oGWZ4xrdy0lTs EtRCwdnoFfrCUr8zjphKShOhPRahqlh6I62ZgrCpyZx02O3NhpOImxmN9OTmKRt2erwXek pKom6jz4VBUz3ul4H8nNTPuSfzXSNSOqPwVuASha1MuXWsMwOYE3ILxAmCs21wr6x6d8aN SnsoDoe8rDi+vK1c1k0n+J+Sb7QO2nSTD7dBbJtXnvNabv71dVO/c92ISGGCnkEvUAtVAV 0ZgHikFDRSHhR7zcX/f4IOmhbn1sxRUb5jlLf5Hv/BK4M7P8Kwq7VI17IEmHIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575833; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uIEOzsdve/0Z9o+003xsT1wwl+hNHZcnxO/O85xWIDk=; b=RCos7Iy8cjpBGSrwHZcPODeGthmYe84+V2YYw2u4QiMB0VV9AApBx7f1ZvZ9A+A3LgUm0+ w+2rh7YtmiiCxemt9OenBNH31Kj8jQW55XUceHn63D86LNfMNnE9jXvxbL/gP+vQHk+3bq d4bYtq3UBfaRFYA+uSqKuDw+f7jXUG3eoOw1wQyfZQ9XROMNZqRVbp1M6FBBL7IsUY1YmK moMIHNCnaR+4/pMjaMGQNfQN3bsdx/ak2gU70AJBJT6tfvaQK9+T7vh+NszO1DTedYj8eL VWF9SUzcu5qbBg4fZwjc7Afws4SNiImfciYQqPjTwVrJI5ybuJPdfFQn5FsIvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575833; a=rsa-sha256; cv=none; b=k4AQ4WUPcpPurC61nuajvvGaK7PNO+Nk/R6PhjDMzH2rzMJ58kxECT0efaILFmbePOXZT0 MT94eL57/S9uqLw+BSRgB12s15AoSObgO/CnZyOxKZpmXVi3UpJsla60jqkrZgEPiyAq6m clTsobruGCFhZp+GDLcUcL4pzg89FnBWOV3Ik+qX+YV6zoxdpA/EENk9Q3o/YW0ds5A8H8 PBt4jLuhPEP2pe0kV8gNPj+iLAlgagHqZ5BIEYLlen2eQWuYLI88s4ZyVjXMLDSSdl4gFS Uwpkj9a5uhhLgmAHPuV77cg3lN4M74p0Md3qfJT03NsJ5U2P9o7JGVyJSadQvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4vD6qL4zcF9; Thu, 23 Mar 2023 12:50:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCoW6v022993; Thu, 23 Mar 2023 12:50:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCoWjB022992; Thu, 23 Mar 2023 12:50:32 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:50:32 GMT Message-Id: <202303231250.32NCoWjB022992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 81338b4213fd - stable/12 - ldd: clarify format options List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 81338b4213fd639bd1dea8e99b8ecd643048669a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=81338b4213fd639bd1dea8e99b8ecd643048669a commit 81338b4213fd639bd1dea8e99b8ecd643048669a Author: Ed Maste AuthorDate: 2023-03-21 14:14:03 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:49:44 +0000 ldd: clarify format options -f may be specified zero, one, or two times. Make this clear in the usage. Reviewed by: markj, kib Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34733 (cherry picked from commit e9f8723c30fc390f1282f5286d57c090ed9e5925) (cherry picked from commit 7bc6ce41d83353efa088942e3f3add38b98c3ada) --- usr.bin/ldd/ldd.1 | 4 ++-- usr.bin/ldd/ldd.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/ldd/ldd.1 b/usr.bin/ldd/ldd.1 index 2a90d5ac537d..882cf6f5b9c3 100644 --- a/usr.bin/ldd/ldd.1 +++ b/usr.bin/ldd/ldd.1 @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd October 23, 2018 +.Dd March 21, 2023 .Dt LDD 1 .Os .Sh NAME @@ -10,7 +10,7 @@ .Nm .Op Fl a .Op Fl v -.Op Fl f Ar format +.Op Fl f Ar format Op Fl f Ar format .Ar program ... .Sh DESCRIPTION The diff --git a/usr.bin/ldd/ldd.c b/usr.bin/ldd/ldd.c index 7db8875ed2e3..50c0b62c52d2 100644 --- a/usr.bin/ldd/ldd.c +++ b/usr.bin/ldd/ldd.c @@ -273,7 +273,8 @@ static void usage(void) { - fprintf(stderr, "usage: ldd [-a] [-v] [-f format] program ...\n"); + fprintf(stderr, + "usage: ldd [-a] [-v] [-f format [-f format]] program ...\n"); exit(1); } From nobody Thu Mar 23 12:53:16 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj4yP1dZQz41JjL; Thu, 23 Mar 2023 12:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj4yP0MQvz4Ppf; Thu, 23 Mar 2023 12:53:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aQWZtwOeMeYgVVAVXFsgJy+ftMgG1THaVsf0U9F0QE=; b=Tt0EGoToLIqcIAJqBL5qZcwVaEZg0DOTAsIT5WLt5cEeQC4OjzHzkhMnnGo4dOQrhEU8EO n/UH6Yzka5dERbx0UyaHeHVu/GI5HwaWMqHyeDFBL1frIyNdPiS91l8F/TkxfQcjZBZ3lp oV+MJISeMLBGhCCeuMCFE5h87NqHFmEfUY+0RpgFrqqh08n/N8YUA1sLR6WirgQMnEpRCf PffUBiVlArKYvphC4s6j5FlvdLtV8kzMIRjefvkZQLEk8sKKxVSTpkqXNyFeDhUoP2cwko vcuTiZGqYVEnebfcFPrPdKrThLROjSfOlABBA8RXq5HclrG7lVyYXJwLJpFV0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679575997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8aQWZtwOeMeYgVVAVXFsgJy+ftMgG1THaVsf0U9F0QE=; b=mkZBbGDLqSYp0oNYOR0TAdhlyad3xLIEmXh2mvak1aAFd9LQr/HMt1fsmLXSYojYKuXsgC xnI9/9IXbDDQ7spO3ifMsv28PYqfWWnAq3LcQl/GZ10QSjMEXAZJ2NA522d44NXK8mwaSu IV9K11VA4FpbiP6Koml7EqcJJ/zt1gKeybhsjWOktfb5P8Jf7DJMr/WysKOSU1ICimeZGQ rv9hxnT+szTGYFOafU3lu4Z0bAYq9mxLN042vh9fSSkq85p2XNcBXU9cSKnIxMVtsPbBxv PQOyfFwoP4LneBM7H8Eqru9hMVpwaTHGM3XZyOIpna/8iA/aEch7XmSQh4zgGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679575997; a=rsa-sha256; cv=none; b=U4hBWQOXJcxUg7PeNwBrl0sTOHgSKrbwXq4dm86wBLvzoRkF4M1nVEa0DYTUHNt0g4uPEj cFvjlz71fCOkFZS7gG2tAkmlAEx68i5msO/b5Fsnv7IzvW5hdGwDmYuMUhR7x4DiqthWTT kY0qfbN9JrUnhxU69XmZJC/y1HnBDgogrgh3gCE8TpFuw/WzbWup1pLwuwAHbgITrACsQ1 Vh3Co7rj5p7gCOBW5/lY0vHd5BgjK+cy/bZclLCEYU/QZbEsqFFNhtJAGVw7JM6+7GXp5g BinzQgEdXQAawBurTiK7sj9KyB1a/oRIugjTF9KE7OjAgHqGxPKYzeeU1RLzeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj4yN6CM5zcfb; Thu, 23 Mar 2023 12:53:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NCrGUO029588; Thu, 23 Mar 2023 12:53:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NCrGNR029587; Thu, 23 Mar 2023 12:53:16 GMT (envelope-from git) Date: Thu, 23 Mar 2023 12:53:16 GMT Message-Id: <202303231253.32NCrGNR029587@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 3976ad45bb06 - stable/13 - etdump: exit on error if section header or entry offset is OOB List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3976ad45bb0646dc2f0a98c138239f1eb84ac0e7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3976ad45bb0646dc2f0a98c138239f1eb84ac0e7 commit 3976ad45bb0646dc2f0a98c138239f1eb84ac0e7 Author: Ed Maste AuthorDate: 2022-05-03 20:13:37 +0000 Commit: Ed Maste CommitDate: 2023-03-23 12:53:04 +0000 etdump: exit on error if section header or entry offset is OOB PR: 263663 Reported by: Robert Morris Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35868 (cherry picked from commit ddf77ec392717e7eaf278c0f201b561afac97b87) --- usr.bin/etdump/etdump.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c index e536aa5e51cb..b234fc9d7ff8 100644 --- a/usr.bin/etdump/etdump.c +++ b/usr.bin/etdump/etdump.c @@ -116,8 +116,8 @@ boot_catalog_valid(char *entry) } static int -dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, - struct outputter *outputter) +dump_section(char *buffer, size_t bufsize, size_t offset, FILE *outfile, + const char *filename, struct outputter *outputter) { boot_catalog_section_header *sh; u_char platform_id; @@ -125,6 +125,8 @@ dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, size_t entry_offset; boot_catalog_section_entry *entry; + if (offset + sizeof(boot_catalog_section_header) > bufsize) + errx(1, "%s: section header out of bounds", filename); sh = (boot_catalog_section_header *)&buffer[offset]; if (outputter->output_section != NULL) { outputter->output_section(outfile, filename, sh); @@ -135,6 +137,10 @@ dump_section(char *buffer, size_t offset, FILE *outfile, const char *filename, if (outputter->output_entry != NULL) { for (i = 1; i <= (int)sh->num_section_entries[0]; i++) { entry_offset = offset + i * ET_BOOT_ENTRY_SIZE; + if (entry_offset + sizeof(boot_catalog_section_entry) > + bufsize) + errx(1, "%s: section entry out of bounds", + filename); entry = (boot_catalog_section_entry *)&buffer[entry_offset]; outputter->output_entry(outfile, filename, entry, @@ -195,8 +201,8 @@ dump_eltorito(FILE *iso, const char *filename, FILE *outfile, (uint8_t)entry[0] != ET_SECTION_HEADER_LAST) break; - entry_count = dump_section(buffer, offset, outfile, filename, - outputter); + entry_count = dump_section(buffer, sizeof(buffer), offset, + outfile, filename, outputter); offset += entry_count * ET_BOOT_ENTRY_SIZE; } From nobody Thu Mar 23 14:31:13 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj77P3sVBz41PdX; Thu, 23 Mar 2023 14:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj77P3QJ7z4Yf6; Thu, 23 Mar 2023 14:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679581873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=itn7v+iNrEiOTPUtS/6TIh6Pz98iaGLYpdzS2fvfvSQ=; b=ryUmYy2qWtcGXqx0qptdS++QDEdCE/q8ZmHQnEcg5v2NjECfaJua+V4Ue70gtFX4UAXmFy cLCt/GLR02yc+AEZ+PekNk2QWutUPFl6Iz2xVcq6p/+MXgP6aZthG/vrqzveiftYBHPvQd Vzm41w8Nuv+aRD54ezLJvan9GulFyZtqjeQY1JAleKlaWW2zt8wjhdhSwsEahNWutPBeO8 NKeR68Znq+p1CKc5GwTqJqikQZZfk+EVoLEZsRMN7PElFiJrlvpil0ooVzI4ZY+nqsTYrY uzaVBoVeC3tcd4JmkUV25yB1W7CELj/uxeGHmtYpnZSPtqY+5RK6+JalK79OYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679581873; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=itn7v+iNrEiOTPUtS/6TIh6Pz98iaGLYpdzS2fvfvSQ=; b=pLaywo43PuTdnFuZCHxk2T7psS/3UzgG/pHW2DykWrv3p2IZTyUQwO6ISXGJ0RJGytQJQd 6xTuVDVwGvNnnAIXaxRl4qcO1TwbInNg1WMPkVYTmInjA8qiIZFGPLTc6S3K7JFreUTps8 0BcmBOjSEiFxhyq5oSViVIR8Y3yrZHeMByGfGUmf/boUxAVjUJrG0IyGKtELUBGZQBxTQz H6juLxV9XOGm6LVEm4kRlImPAciiC6tzaBjr/vNdm/I3zCbqi+x0Fjg/Y/HcofM/NGfCAi W95egrYHbHxENMI6HLkGsuD1ZKC+wibjt1lSEvY+IJ01iYtfXZNMaWwe7+iTtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679581873; a=rsa-sha256; cv=none; b=cWQCI9a2j1RhjtS/lyorFEl7Hp6yEaKZ+hPt4HaI6JZytA/5Rnl+hyYpzR346Xd+L4V8rT IdEYA8Q8Yrl+qa2b2OfWobyslV05Fzo8c7RiajUJYIn0T+3Y4iEK4F8fjnrcR8uDS3vM5P 2y8NUXUdTEeP9iXeLxO6/128Zn4OMmVOy269vRzQ+/JaoNeQH/InmHNLtyACaMGXamSQu6 HE96mOZZ681ty4DCLSVpZ4KFNKDGCMHvBYO47IN+J/D05MnIIS1LhQa4U28X93IfDpA3qt ORCfZ2j5xqDNwvUhE7G/Hkx/Bo5OHBSMv6j1Ba3n+HO4hX3yzYSyrPBHt4qhJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj77P2Tr4zg4X; Thu, 23 Mar 2023 14:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NEVDjj091428; Thu, 23 Mar 2023 14:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NEVDbA091427; Thu, 23 Mar 2023 14:31:13 GMT (envelope-from git) Date: Thu, 23 Mar 2023 14:31:13 GMT Message-Id: <202303231431.32NEVDbA091427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cba3becc2003 - stable/13 - CI: Run pkgbase METALOG lint script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cba3becc2003582d35b16a1784a01176c8facb76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cba3becc2003582d35b16a1784a01176c8facb76 commit cba3becc2003582d35b16a1784a01176c8facb76 Author: Ed Maste AuthorDate: 2022-11-16 21:24:19 +0000 Commit: Ed Maste CommitDate: 2023-03-23 14:30:30 +0000 CI: Run pkgbase METALOG lint script tools/pkgbase/metalog_reader.lua checks for errors in METALOG (for pkgbase staging), such as hard links with differing modes, duplicate entries, etc. Run it as part of the Cirrus-CI job to prevent regressions. Reviewed by: manu, imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37521 (cherry picked from commit 2ed0305bc3f24258b977d640d3399d07c47e1b42) --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 225840166cbc..824ffcda20ca 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -47,6 +47,8 @@ task: - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes buildworld buildkernel" package_script: - su user -c "make CROSS_TOOLCHAIN=${TOOLCHAIN_PKG} WITHOUT_TOOLCHAIN=yes PKG_FORMAT=tar packages" + package_check_script: + - su user -c "/usr/libexec/flua tools/pkgbase/metalog_reader.lua -c /usr/obj/$(pwd -P)/${TARGET}.${TARGET_ARCH}/worldstage/METALOG" test_script: - sh tools/boot/ci-qemu-test.sh post_script: From nobody Thu Mar 23 15:10:26 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj80g2SVRz41SSs; Thu, 23 Mar 2023 15:10: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 4Pj80g1zH7z4bRr; Thu, 23 Mar 2023 15:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mp5YFeCJg8G8pdK+aiRDcLiDkp/qh8DDv+Nrw+LDqI0=; b=p8xULy/T6h/Ls1WjWxsHTke+QgccYq0B2pCUKcisBoULEDILxwlDjhbywCxPtMh1C8O8/B 6kKKpDv7iaFCpewnO0LOBXHHjZyKzzr6uXHIsBUFw2pPtJrtJt1h5lYlW6FFYN9FNeZJWR 6Y1w2xZ+HfvEObj6maeD403DBlBlOHkpNIoGG6b52RQSfjd5NpScOuIQOTMSthiMdGl4fv nih6fx+XpTzaTOlJqrQtzlL3/hJ/GZvpQc6HiHNPYgPj2TSbC5brF0IV8iA4ujqlkuvVcU vSaCkLiB92kjQ/t5I6XZKybotfLHKtRER9xicH95WHXnaNqhNEz8vAMS9F+o1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mp5YFeCJg8G8pdK+aiRDcLiDkp/qh8DDv+Nrw+LDqI0=; b=cTft6zz6l56MftM6HVtTlAgu+NZt146gQEbOERPyrpBfVomNSVmSSxrqRIACXTJV/EhhUs ZExBTY0w3crqc4Hm1RpJyerP6oI93Y62tMba13R9BrApkEF+5MM2vR1BzF8pkDWFDXJbFD JGsD4LCkt0KW2qCk1FvIj/TSKMdrMdRVRbFlJOy9REbDcbHqZpVCFltGQo4iGXMSS9Mwa+ hwZqMjyR11d6qMa1cQZkZsflU94HryeANYAGlssL+vzgLnx/FH+iFG5SL4+eJbmLKbatlu 3U1lAqRqpTBoyYWxTkWjz0CQlEvCU2rAEHRraSGeYSA3DJYgtoYo+0p2Qnkg1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679584227; a=rsa-sha256; cv=none; b=ww21f7ueKCBUdo3X+NqEEZhMbCTMy6/Swix0fyadmhwVGgErPuge4f6FT5auO0cQkQJOjk qjPDsPMhyoIayOwVvcHIMA4ri/TzbMAaXQnIBA3KusiLV+4oiDg4rk2FBDmTNOMsejlqxj 3A4eFLhTNOBCUNSZ/T/hWuGPtmk1m7qikVZItbfCOK/I96Qx44k5IF1vxlUFPFJ8b92Pcp bGj5Bv95c8iqsjgvJ8XVd+YJPC5Gx1tiKaUOzHC+bT9AMm1YTQhHA5KtVDG5qmYRdmFp08 dzLQi/0aY+62jwQC34qSOMqRnUmaoWhZAMrICZgb3kp20GlOUHwboyxcwlamRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj80g0tHhzgV3; Thu, 23 Mar 2023 15:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NFAQPg054114; Thu, 23 Mar 2023 15:10:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NFAQiA054113; Thu, 23 Mar 2023 15:10:26 GMT (envelope-from git) Date: Thu, 23 Mar 2023 15:10:26 GMT Message-Id: <202303231510.32NFAQiA054113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: feb3da25265d - stable/13 - sh: install hard link with same mode as target List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: feb3da25265d519c3353c997cd1fd1bff54267e8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=feb3da25265d519c3353c997cd1fd1bff54267e8 commit feb3da25265d519c3353c997cd1fd1bff54267e8 Author: Ed Maste AuthorDate: 2022-11-23 15:20:49 +0000 Commit: Ed Maste CommitDate: 2023-03-23 14:33:01 +0000 sh: install hard link with same mode as target Previously when using NO_ROOT we recorded a METALOG entry for the /.profile hard link with a different mode than the link target, which is not permitted. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37476 (cherry picked from commit 1dbb9994d4dd44357976daedcac7d280e8327382) --- bin/sh/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/sh/Makefile b/bin/sh/Makefile index b074121d0ecd..c61094b06720 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -68,6 +68,7 @@ SUBDIR.${MK_TESTS}+= tests beforeinstallconfig: rm -f ${DESTDIR}/.profile +LINKMODE=${CONFMODE} afterinstallconfig: ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile From nobody Thu Mar 23 15:10:28 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj80h2t8Pz41SKr; Thu, 23 Mar 2023 15:10: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 4Pj80h2Kkrz4bYB; Thu, 23 Mar 2023 15:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwLScK9/SPiAR63VLLfe3MQAt2FgXZj6kLKtFS+0/84=; b=vdiY1yR4E0Q2EqKPzc9H3Amv/TWCXymTjphXv0ZVpx4grft+Bewi1sPPmwM6y4ujBEtcUH sGJrryLTZQAiomGEdTJLHLBCCnnqcCdJ61/tSIpGcq7vQT6scy/DhGvUYqHk2zJyBvVdGR a6ARUYZ1rSbATXi99ettCP23BXetB7sV2lCcxjIh7g9NhN7KNvysHELnwvEcUJyM5Osuxj Afiknjc5JzpZtiaNRfqKvrmoD/goYN8jjtUdB5OCd6YMleykb/Kg5euoNGXPZkK1zbosIc BJQV3vx6HYMnDmEwNF/7xFidszZyq7cnpW/eUkPeFKVNzWsQJro9UPUR6BTVrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GwLScK9/SPiAR63VLLfe3MQAt2FgXZj6kLKtFS+0/84=; b=JFETz+vcdT2AL9MVm99Pt1ezLch95hhbKOeVhesE3i+pN/KGNn54wtV4FbXkEcUbnGFMyl zfh4rIyrL6dtnFy+79EzLZehniWWNxrQ77KLMrT44DjrYLMF/VXU/hJjt5xkhf6z+0ASxI GAyh0gcH1VO+4e7jbSVsHj/RvoS5ETNRcrAiRniVrOYTwWFn6bdeueLBWYzsByehe7rjVZ u+0HBelVUF3OmcpmDGPjKk0h8l/fIW9mcMXpdUm6mPvfG1MHEVhVr4pv7+IYCX39fvylhM pfYpGm/0q9hDSdt5fqaYgarjOIfMKGgJKhxmZJaGVR3H/LBX1TBwV3QepkJ8dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679584228; a=rsa-sha256; cv=none; b=nLTr7qHv99qiCvITtR586SUVjXxPaCoorGY0XUMLop/o5JMBfRHdssRlJIcUjfNE+LlCDa TYyCdgXGkiU8i4NabxfcpE8S09zDkW1VbQma9/8qa8iGQHHcTlh5CW06YeI9v1cKf9/PZh 7eXB4aR3JD9bJJORpTxwomRW2VVeMryhZXsxtcBKmptED55UjvlyJFAP7f68fw2W64c1Sw do9iTjHZqhyk0LaP4ieLs9e3r85v/3zr52Y+ljHMdqy25+zAxO0JwbRfhMwflYVU4SWxhJ 7WELJnFjMkhYc5oYGYqC+DPBItpn2OGvd72H2GGfBbvUL+wJgvmsYQY5mv/C3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj80h1PjtzgJM; Thu, 23 Mar 2023 15:10:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NFASqc054133; Thu, 23 Mar 2023 15:10:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NFASEA054132; Thu, 23 Mar 2023 15:10:28 GMT (envelope-from git) Date: Thu, 23 Mar 2023 15:10:28 GMT Message-Id: <202303231510.32NFASEA054132@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2dd014ca0c74 - stable/13 - dwatch: install hard links with same mode as target List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2dd014ca0c742b44b8ace4fc42cc2a78b1204c7d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2dd014ca0c742b44b8ace4fc42cc2a78b1204c7d commit 2dd014ca0c742b44b8ace4fc42cc2a78b1204c7d Author: Ed Maste AuthorDate: 2022-11-23 15:44:41 +0000 Commit: Ed Maste CommitDate: 2023-03-23 14:33:01 +0000 dwatch: install hard links with same mode as target Previoulsy when using NO_ROOT we recorded METALOG entries for dwatch hard links with different file modes than their link targets, which is not permitted. Reviewed by: bapt Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37477 (cherry picked from commit 7543a9c0280a0f4262489671936a6e03b9b2c563) --- cddl/usr.sbin/dwatch/libexec/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/cddl/usr.sbin/dwatch/libexec/Makefile b/cddl/usr.sbin/dwatch/libexec/Makefile index 581556eeebd0..40d284ae456f 100644 --- a/cddl/usr.sbin/dwatch/libexec/Makefile +++ b/cddl/usr.sbin/dwatch/libexec/Makefile @@ -22,6 +22,7 @@ FILES= chmod \ vop_rename \ vop_symlink +LINKMODE= ${SHAREMODE} LINKS= ${LIBEXECDIR}/dwatch/chmod ${LIBEXECDIR}/dwatch/fchmodat LINKS+= ${LIBEXECDIR}/dwatch/chmod ${LIBEXECDIR}/dwatch/lchmod LINKS+= ${LIBEXECDIR}/dwatch/io ${LIBEXECDIR}/dwatch/io-done From nobody Thu Mar 23 15:10:29 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj80j3Xvrz41SPf; Thu, 23 Mar 2023 15:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj80j33syz4c14; Thu, 23 Mar 2023 15:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aRNI11Gngf3xgxAP2WYA8zA6/OFBTAHC7J7+leEERJU=; b=c4beNFVCgp7V7L5a84LfYPonZIniF46C4vK3y9neTTVfAhIWjgGGm/H3q4aAwOyDMAMhnq m6kaayjsffwqSotsYdPiHmwmdQ+5zI4vFfSM+Vuq2gtCrBqDTiD0F/uJhKg+HCCyo+8bRX qz4EfWd0sfb+S3j74oF6DOSiPjdw2we57HYFkmmCnnZX71FtM15DMbPtadgN0yDlOj69XK WaW497qQ/dY8wwwQNUzbS9Fjtpgcu9gMmSzrinOVnyz3lb1dA0M7l7vcYJUla/02xbxxqp 8NmnzJXn2VH9QCQlzzH/zsI4nrorZ8RGNXceW9VG4AR6PleEG/lwemWwbVeU4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584229; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aRNI11Gngf3xgxAP2WYA8zA6/OFBTAHC7J7+leEERJU=; b=ji32opYlvcqVpR4kiLxvc2kO3ZRZCluWK6jRcF/wIauOzwlHfcUedZ7z0zdFsbw+fZAxQd gVp4r9uRerrUqSThR+Iofp3uyGoYJwMAbQZMVKVYAmMP1kSkBKCk31jvIPBUFBrqKZjOH1 qQEMyGqJEzPFiwD45SvevwQTV1b5txmOCeHgALBwhetSghejPluqycYbZK+rk86GOtCjy0 FepwjbXxcO+fEnICpWIq2oRTP/zGC8+9xVTNFg8KcbtZRdLGPCiNVbGy7kBx0WX5yEJ0Uh osEnc2/NjecSSDlP2K+UoKXacifG4Zjy2UbZq/tQuqORiak/EZEvhFBbBEgrjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679584229; a=rsa-sha256; cv=none; b=N/RRkawlkW9g3h2GtYdE9gJ7h9UTcRexC8yn+KP93rDYbS8cGNygbRpbX+xR65ldz4IzzR X25Ywxtd5CVxH8flPlDSlfpbuuwKtadK07jO7buzaLHpGNUyEVxVkoFY9def5/TLgCaelL DWksA2Y+BOflTAgKe5qiljXJzvP1J/12f460tcj4YgAUMG2iIkeAKSbHZoijoUYaziKwhG FTp2GRdvRhi9Lm2gmW8YpU7v+kK9Lz8ov34SjjWm6g6boPj9ga+uqWLeVIVK6VoB72sLta rzQR/HD5hjeXkkCZe7boyN/yjW96BP33AlpW1KjKZwGTYRgNRJOCbpu7THTXhQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj80j28ZBzgjp; Thu, 23 Mar 2023 15:10:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NFATIM054152; Thu, 23 Mar 2023 15:10:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NFATJH054151; Thu, 23 Mar 2023 15:10:29 GMT (envelope-from git) Date: Thu, 23 Mar 2023 15:10:29 GMT Message-Id: <202303231510.32NFATJH054151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 6be7ead2acad - stable/13 - pam.d: install hard link with same mode as target List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6be7ead2acada0a4f89e242cda52934a6cb62cba Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=6be7ead2acada0a4f89e242cda52934a6cb62cba commit 6be7ead2acada0a4f89e242cda52934a6cb62cba Author: Ed Maste AuthorDate: 2022-11-23 15:34:58 +0000 Commit: Ed Maste CommitDate: 2023-03-23 14:33:01 +0000 pam.d: install hard link with same mode as target Previously when using NO_ROOT we recorded a METALOG entry for the pam.d/ftp hard link with a different file mode than the link target pam.d/ftpd, which is not permitted. This change is similar to 1dbb9994d4dd for .profile Sponsored by: The FreeBSD Foundation (cherry picked from commit f2865d7d550161bf4058425a6677a839c065bde4) --- lib/libpam/pam.d/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile index 1499f916cb17..2b3f89a39717 100644 --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -30,6 +30,7 @@ CONFGROUPS+= FTP FTP+= ftpd FTPPACKAGE= ftp +LINKMODE= ${CONFMODE} afterinstallconfig: ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd ${DESTDIR}${CONFDIR}/ftp .endif From nobody Thu Mar 23 15:10:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj80k5JfPz41SSx; Thu, 23 Mar 2023 15:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj80k4pV1z4c6m; Thu, 23 Mar 2023 15:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOLuzcyQtFwC+NgWz1IHbyj88n3FKKGSVmTgSveQxfA=; b=Yz4XbaRq20ydZe7TWh4wTD1lhyASRTHD88lyX8LzXakIY7WJEuWYTnpfhTkWjCdWFg4+4C Bqgln3UqSrLxnwgLs5INR4tQUCNILBXYZFLADtGeVa/KKipAWKNnhtg+c2pFDzv/i1B97g mNrbVAI9PO/9U8/kqpGXE5CuQ6LdSiGFl4XIxJWkkSkohaA6+Mf1mFcsEojZDrVeMp5VQn mh1WAX1nepildFO0a6KjsjNXbhIHecNzRr6TiA1p90VsuXfCZzDRNidjPcT/wMPBNPquzy w2WUnk67zA+jd6macfNjVXOV8O+qxQ54uBOkChFvZPkg0j+of8qIpACMyfs43Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eOLuzcyQtFwC+NgWz1IHbyj88n3FKKGSVmTgSveQxfA=; b=e019f42Ju1Hdd1UBcgR8tjl/CZxVGd8zvsMDFedG6gIls38Ga86g9z3td0yE4o1EUgFX8s dKLonmPJspeFbyRQCjgtRdIv6h6oQyPnzD80zbsJsRiDmlJ9CmFTj2xmjkF+JnGe0YKip/ 0mEZcskuUHkirNpuYC63dPsfJf1Bm5f2JT4ZdePgPsmxtL02whK89YPTkb4aJzF6EOieQd DKOIYgf3j44ZD0gVoPXzbXWRAAFIyrxkh1Fy0sRq31SqPz64n3ikPVgdEPs/Ql25sqBo1K Ou9KfNSWQyraI1cy+uW/ug1jKht6rqOUMH9yQyuqG/x9xmoIIfQc0R4YNiVZWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679584230; a=rsa-sha256; cv=none; b=Um+YmzaGkMZ/vhI23B6SADSH/IxbPoEPmRdBvHFAYTkncU1UNfwIipmkHCWPHOMW11iwJd hENHISGBVxH0DKa7yvJTeHjU7vop8cRmLxM70zNLV3YExatCCZvEyTnBsAdgSNZu2AmFSL 1i/ELGF1M/R8ISTfE2OMC15brH+ZY6shVEZkazqwTmcDP7U8fLE9E9HVsLXD5pWBqjYdos J30lYTxCNtV56YIxpgQuO7aZTWud8f4hdEHqW1z7rrrBpOOzSKWEiBvIkCKDtOYTxYY+1r KmRdJpyz4+OfR1YvkiBUkCZTcvTIfBhDdRG+Gm/34TkIlRnaevk6I8rU/70KTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj80k3w9Bzgjq; Thu, 23 Mar 2023 15:10:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NFAUIN054177; Thu, 23 Mar 2023 15:10:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NFAUki054176; Thu, 23 Mar 2023 15:10:30 GMT (envelope-from git) Date: Thu, 23 Mar 2023 15:10:30 GMT Message-Id: <202303231510.32NFAUki054176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: c702ed6eb8d4 - stable/13 - csh: install hard link with same mode as target List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee commit c702ed6eb8d4a45221f57feaebe5a750e5ebf2ee Author: Ed Maste AuthorDate: 2022-11-23 17:14:18 +0000 Commit: Ed Maste CommitDate: 2023-03-23 14:33:01 +0000 csh: install hard link with same mode as target Previously when using NO_ROOT we recorded METALOG entries for the /.cshrc hard link with a different file mode than the link target, which is not permitted. We cannot just set LINKMODE here as it would also apply to the hard link for the tcsh binary. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37499 (cherry picked from commit 67d2aaf078e967bb626cf50c53d679aad71aeaf9) --- bin/csh/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 9aabc047493a..ad1f2011f2cf 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -159,6 +159,9 @@ beforeinstallconfig: rm -f ${DESTDIR}/.cshrc afterinstallconfig: - ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc + # XXX Set link mode explicitly via -m. We cannot use LINKMODE for this + # link, as it would also apply to the tcsh link above. + ${INSTALL_LINK} ${TAG_ARGS} -m ${CONFMODE} ${DESTDIR}/root/.cshrc \ + ${DESTDIR}/.cshrc .include From nobody Thu Mar 23 15:10:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj81H3cWpz41Sk2; Thu, 23 Mar 2023 15:10: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 4Pj81H2zzRz4cwj; Thu, 23 Mar 2023 15:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPggQOmj8Wl31ILh+vk3uXCjOTavPMR1Wn4tQsPJYKs=; b=UHLW1rO7/uhk3P+X8KB/xxxvip4/W//i36KiSltyk1+b3uxxltv9YuSV+0evQtRnaE6Lqw Appm+l1iWUlQs0F7E5wxpJTbhDKgfAy1AflkT1qQsB5ukubh132jLkjF+cITk/CPOPfjnp vad+k81BBR3JEEaQfph/Eg3LcJjNSj+ZlK69QOykrKQ6Y2TPnoux1n5ZBJfr8g2yPERqHH 5A56h+gXS0gK6grF/gD/7RpXtKIgCqgUJyoXYMyzVtXKf7Iqv1EHwrrcFsT8iZPY9hUNs8 RBQYJcsJNvspDEpsABJ1NlGWjkCCRIMH5HNGWE6rrrBkxHMXDnmLL93DTdX3FQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679584259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPggQOmj8Wl31ILh+vk3uXCjOTavPMR1Wn4tQsPJYKs=; b=Ny+NemtxLA/y3O2D48V2IpK/dTdP6X0BViYsOOnS1LhtrxXFjcmeNw4vEewFVdFPRRyxmS aPqm6jdscrsiu8uPZ+cY3OoU2NRXIm9EtGru/jdzFBSayVADeOARn1ZYTcviFNS+pVHeDw hDeaPa9XqY3Z1daPAsl0eBjXLbbRPEFpUE7rGLZ/zI3+j2Thnv7Mmpu3gDacJ8MLv+qnEi VrQ41A4gBIpgojwMxW++ZLETCAMKnKbWxpY45kCpCk8DsXbb0vo+F12T8AGdodFXOxOvEA cRlZq3xBjt4e6VZ2wAlIMjeokGJ5LDroub9Eni16/uIOIZvyAOOtNnUvwPIALw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679584259; a=rsa-sha256; cv=none; b=JZPlEfIdVH07XfnNFhVlDZm0fVVyow2XrHBOmSaY/AZ3I8uPj7Nv1Kb3oj5fGuS70H60G0 CWSouzvpES6v5o7o5DkLpeOjR+TiCGCwx3JS3ij0oFgO/xl8KtaUK6BPgGuFh5WJiLPyGU vFKFa0jE4k0DC+QFsufjNVamnSoT6Q0ZiNGIUiZy0jGYEF+vmDIo9wqY2ImjRbPPbBErN7 QYztHtvjHlmpiHWUlJ5fO0jEY/Hq9t0T6XG7VlNi7dj4jLuVFGfyVC6/juzTPX0T01nLDu pn9FHZUvb/OyWOWXthq/Wfv9YuAY9aMXFbEK6w6/urUqi2iDO4NXutK/bVmecA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj81H206Mzgk0; Thu, 23 Mar 2023 15:10:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NFAxBT055070; Thu, 23 Mar 2023 15:10:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NFAxHh055054; Thu, 23 Mar 2023 15:10:59 GMT (envelope-from git) Date: Thu, 23 Mar 2023 15:10:59 GMT Message-Id: <202303231510.32NFAxHh055054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 39c9fd8f2beb - stable/13 - pkgbase: report errors via metalog reader exit status List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 39c9fd8f2bebe2edfb700d0dd0458089ba687a7e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=39c9fd8f2bebe2edfb700d0dd0458089ba687a7e commit 39c9fd8f2bebe2edfb700d0dd0458089ba687a7e Author: Ed Maste AuthorDate: 2022-11-23 21:40:22 +0000 Commit: Ed Maste CommitDate: 2023-03-23 15:10:47 +0000 pkgbase: report errors via metalog reader exit status Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37482 (cherry picked from commit f93d92f43d984c1d927c7c12d06ae1497d12deea) --- tools/pkgbase/metalog_reader.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index 72cfcf46c95b..3e8cf8461914 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -86,13 +86,14 @@ function main(args) local sess = Analysis_session(filename, verbose, w_notagdirs) + local errors if printall then io.write('--- PACKAGE REPORTS ---\n') io.write(sess.pkg_report_full()) io.write('--- LINTING REPORTS ---\n') - print_lints(sess) + errors = print_lints(sess) elseif checkonly then - print_lints(sess) + errors = print_lints(sess) elseif pkgonly then io.write(sess.pkg_report_simple(dcount, dsize, { fuid and sess.pkg_issetuid or nil, @@ -103,6 +104,10 @@ function main(args) io.stderr:write('This text should not be displayed.') usage() end + + if errors then + return 1 + end end --- @param man boolean @@ -151,6 +156,7 @@ function print_lints(sess) local inodewarn, inodeerr = sess.inode_report() io.write(inodewarn) io.write(inodeerr) + return #duperr > 0 or #inodeerr > 0 end --- @param t table @@ -520,4 +526,4 @@ function Analysis_session(metalog, verbose, w_notagdirs) } end -main(arg) +os.exit(main(arg)) From nobody Thu Mar 23 16:28:22 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pj9kb2Ssgz41XNp; Thu, 23 Mar 2023 16:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pj9kb1zVlz3Fb4; Thu, 23 Mar 2023 16:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679588903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS/90XEmEIX5WCMc+PqgnmVFzGIWkMlyDwbTXbJMTpU=; b=CugfsGh1qaunHTNTdi0giTlhL4oMa47Lrnk7Ik2npa0vqP71vgtMZwYfkYv7m37fdLJd82 lYktI/TkXIOZoWlgJ3GmXkzcEy/F6pAciUl8MeouSfgK2T4Hc85Gvb2v8k28Eqi2Ccdlcl DUQbVdfrYbWfoytmx9de3/IAR3l82MAmoU3rOcpFw3QgiQfqSyNdaEFyBOweOd0gsemxnY o8gbR4lxGnw7Bs7IeBbQmzdAR9HtnUkU/f2DuE+vLOhNT9p3Q+rAoZcmC52wPj+bPqVDjz 3FIwDLqJO/KRSHa/Faczj/KnwXlJnKVN17NMKqx3uNcQLKTREPvlrjFyTBfvng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679588903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lS/90XEmEIX5WCMc+PqgnmVFzGIWkMlyDwbTXbJMTpU=; b=exEkA4UbIQX4AMGNozto2Uls6ZqsorVEKyR8XpDciyXwECJjbnm3J3xNv3rsk+dhonN5kV i0IpNpSGdCb3THf+9zIfOfaJfxB8nvwfsC4vWASQLyerPNMqFabSIjX929rbNgGQq3Hx7d olZTux1DVV9BIO7WVfgMdgzFoQSfEOeeh30jDteK3Ve1GjS7SGo1jk0f/U7DtOuvItMyxy W0KO7tIiHXAsa46dWI7O1kGkNRCn0HkSJlOzsxjzEZmlidWZAjAIaiy2ihxjnRmvIt6h4q nRMYm/ssJbG3012/yydn2LF8bdOhEJuM5K2ArwBaHycI60q/7jD/qwW9hAxcKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679588903; a=rsa-sha256; cv=none; b=TDlwXDKFohw5XBZfuUdoJe+5B8EV3MTHs+Wzr11J1lQrbTn2SygNtoyJQPcVAaJ4lpjgaB DC2kBR+dY53E3kM8ej4JckDQPoaBCSAegqDQLXiptmMveGJHPtXQaSzZQNPl06GzkOb020 6+WuaK+qaIyVfGcUoVeabao2V/3XoRvDLFu2T3lxjWF9mvOm0703ZuCIRWReN0Ul0SCDmb FEh5gywkZruvv1iXpleH/6H0LIiv1qI8beKHmgmUCCDGzMPH1Ka9jPpIRMLVs8tkULNzyl uhm8JQrBAd6/e5cZD1Fmr8fhhULDW7Pd9rP1l7ChzSWoVv6xG9U+751hC4xrzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pj9kb0zD7zjY8; Thu, 23 Mar 2023 16:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NGSMM9076839; Thu, 23 Mar 2023 16:28:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NGSMKZ076837; Thu, 23 Mar 2023 16:28:22 GMT (envelope-from git) Date: Thu, 23 Mar 2023 16:28:22 GMT Message-Id: <202303231628.32NGSMKZ076837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 57c9d3938472 - stable/13 - ktls: Remove the KERN_TLS option from the i386 and amd64 LINT-NOIP kernel configurations. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 57c9d393847286d5828da8c632813e33f004dc29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=57c9d393847286d5828da8c632813e33f004dc29 commit 57c9d393847286d5828da8c632813e33f004dc29 Author: Hans Petter Selasky AuthorDate: 2022-06-11 19:29:42 +0000 Commit: John Baldwin CommitDate: 2023-03-23 16:27:14 +0000 ktls: Remove the KERN_TLS option from the i386 and amd64 LINT-NOIP kernel configurations. Kernel TLS depends on INET or INET6 being enabled. Reported by: bz@ MFC after: 1 week Sponsored by: NVIDIA Networking (cherry picked from commit 9fd0d9b16e93ff2a3bd375a98763dca0150dcee0) --- sys/amd64/conf/LINT-NOIP | 1 + sys/i386/conf/LINT-NOIP | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/amd64/conf/LINT-NOIP b/sys/amd64/conf/LINT-NOIP index bb306691388a..544893cf1332 100644 --- a/sys/amd64/conf/LINT-NOIP +++ b/sys/amd64/conf/LINT-NOIP @@ -6,6 +6,7 @@ makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT=" nooptions INET nooptions INET6 +nooptions KERN_TLS nodevice age nodevice alc nodevice ale diff --git a/sys/i386/conf/LINT-NOIP b/sys/i386/conf/LINT-NOIP index 2f21766eb69e..1c91dae98baa 100644 --- a/sys/i386/conf/LINT-NOIP +++ b/sys/i386/conf/LINT-NOIP @@ -5,6 +5,7 @@ makeoptions MKMODULESENV+="WITHOUT_INET_SUPPORT=" makeoptions MKMODULESENV+="WITHOUT_INET6_SUPPORT=" nooptions INET nooptions INET6 +nooptions KERN_TLS nodevice age nodevice alc nodevice ale From nobody Thu Mar 23 19:59:23 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjGQ547x5z41kSl; Thu, 23 Mar 2023 19:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjGQ52ZzTz3xtH; Thu, 23 Mar 2023 19:59:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679601565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQdu/xMVz+Kdl+BFlwbODr4NtzlzNkKRVzakO0VwaSw=; b=cg0SMjO5wmsUY15pBCHnzo5pKRtwlir3ZOlbLx7PKlzidOo6UPJ4S1W6DBTex6rjN8LU1Y cYupYDR6grtq1PkHssteJmpgOYCBo9P/ccItm8EDEKVN8vMSVG2dCnQ50SK5kT1LhG78Ak Hqpa/LgIhy6ADEX7IZ2+bqiur8IIvveL8Anj6bxEzlJa19TGDGQtuJMVNmJg/9xkoJfj2+ JTozpJbMfJtHdGyGx/ckGqBVoCQD3YklR1vxnmhAAUeym5wZTQlh4tPW1pAWUn0LpzqM4m xeXLt5kX2AMHhpC1QfJ9UlTgUF+5uc/7HJGY96oxGUEGDVvguhzAxH7ojBkHpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679601565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bQdu/xMVz+Kdl+BFlwbODr4NtzlzNkKRVzakO0VwaSw=; b=tXdM7wz8N+PdPt5kk3r5JL0IWNBhBZn8zeV8obpY/EtK98oGfkeCI9X1uwdhfSTjfU4Ht9 li9fVnd9U+SU387aIOSprTN5tl8WlDVl0fcF1RVixuEsmChutP0jb+ytHGuF8VNZzyzX9M KdKw1irj/uRxEj/giU4yucTmptJsvZiftPQ8PY/NvwDwN55JxChyrDD/1htwJns7ZcRzAu L0StO+5RFsQNuBNSO21QiWsatyYD15IsCqG2Tfd91iXUwGVCHM6sNPxSZ8DtXo/h4zytmU Uo42Ibogdk1TFFUuHI7LPetBSSX7oidu7KH9iXO9wcjxoisVvenEqGU9xp7/+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679601565; a=rsa-sha256; cv=none; b=slVHNsOExSLofsKctSVmPG4h0uXis97ORzul4Hg7pkb7IukeIzlIe5izHxwuqHPIbmNMxI wK+izjN0qUhyTVkialCrQ6uVrQjCowHmYJnQc1u6sVS55DL5Be/w/KzshBkZy7h/3xlrw3 fxJezfpZJrI8/cQBaCq5jL23bko4LecsgyN3W/ryUNYLccESH8VTReh4mrSNHFjFeBvrEz PToFZgQ9APH0VNb96fsc+VWlCpSCN2CEAePbibrGSVTNP4+yy7VU2h4WI3uDcozisEgIVx 25gvtPfDa/DmIHIex+4D13OZYmigLCAZwqLwp5buOrzobwdBqn60xIMlPLbkBQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjGQ51dGkzpp9; Thu, 23 Mar 2023 19:59:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NJxNjt021426; Thu, 23 Mar 2023 19:59:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NJxNC9021425; Thu, 23 Mar 2023 19:59:23 GMT (envelope-from git) Date: Thu, 23 Mar 2023 19:59:23 GMT Message-Id: <202303231959.32NJxNC9021425@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 5d83656c09f5 - stable/13 - vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d83656c09f522d6bf4f1050be60f270ddef04af Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5d83656c09f522d6bf4f1050be60f270ddef04af commit 5d83656c09f522d6bf4f1050be60f270ddef04af Author: Mateusz Guzik AuthorDate: 2023-03-23 19:19:48 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-23 19:59:08 +0000 vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups Reported by: Oliver Kiddle PR: 270419 MFC: 3 days (cherry picked from commit c16c4ea6d399332d4a023df6e423be61fdb875a5) --- sys/kern/vfs_cache.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index e87f4a6cda1a..2b07dbbc34f0 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5075,6 +5075,12 @@ cache_fplookup_dot(struct cache_fpl *fpl) int error; MPASS(!seqc_in_modify(fpl->dvp_seqc)); + + if (__predict_false(fpl->dvp->v_type != VDIR)) { + cache_fpl_smr_exit(fpl); + return (cache_fpl_handled_error(fpl, ENOTDIR)); + } + /* * Just re-assign the value. seqc will be checked later for the first * non-dot path component in line and/or before deciding to return the @@ -5137,6 +5143,11 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) return (cache_fpl_partial(fpl)); } + if (__predict_false(dvp->v_type != VDIR)) { + cache_fpl_smr_exit(fpl); + return (cache_fpl_handled_error(fpl, ENOTDIR)); + } + ncp = atomic_load_consume_ptr(&dvp->v_cache_dd); if (ncp == NULL) { return (cache_fpl_aborted(fpl)); From nobody Thu Mar 23 20:22:38 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjGwt42L1z40HFB; Thu, 23 Mar 2023 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjGwt3MYsz424k; Thu, 23 Mar 2023 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679602958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PT0gkJQiEv4bz5IWHbnrOMsMMQbPfx9SHfk1y4CchOM=; b=ocacWef8b9yfBLFuaXkQjpqpByqcVutodf5F4Rn7SWz1JRlVC0DiIRt/qAl3I2zcNTziOO wrRkGIJ0vJVMMBM2rVLwKheftzJCxzS3NStUbTPXlwT1j66w1ZAfjoSwf4svWNTVKAyhAD ky8ebOOiWYkDhnjHsJToPe5YdFYrn5v4/iF0cQBJ0gfHnvbjiM7XXSuPtGfKrXWQYLYa+C ETMwtcNRB9KhvjhThpO91R1lRQhREY+FKRXVCx3PkkK/s+lXr9Q381Kg1VjEhe3vfx0C6Y ZYKx1741OgI2K9AsUYYkdYpnvj43C9Be3w2SZhorrathBdxCV3kH+Lr+RTyJ/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679602958; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PT0gkJQiEv4bz5IWHbnrOMsMMQbPfx9SHfk1y4CchOM=; b=mIRa8x5iN9ZjtPbewOYv9edKltBsC6k15ISmk709VJyQCcJVKdVd0nPO1KER3ngp/wJu0q 5gBDVpFhOswYAI1JNai/E/WR8hvgdRxcuKZ7IiKc4P5RfMuuIJaptM80QOLrXJ4UyhcOrr Qw69cmx1GnSE1Cmi2+MqGlIlarzm+A26WVA50uul3grxDF/Nv+MKlgITQGTfrQP8NpqK/Y 0Wlc0cr+Hjnm4PAsGK0FxFVDM9slPut689b98w3WDhE8VtNtJPTjeXOV9GuFSeVQRm7PEy Tb5t8p42KaQkj/txWucCkyzsVG/M+cyaH7nVrxfNsAYELo3UBCRyJMST3MjG3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679602958; a=rsa-sha256; cv=none; b=a9GiPJoS3ixiI32tC8tx81wetjxShSWVrXr5LXsDrgSjN6XaT4cq3fphJ4iHTIKUjCmz9o ql/dH5UxCdYNonaoBVldwekIPceeSBe1ZjoMLsTWPJ/k+cz1i1KWrKMIthwIBaeG4uc77k f0s6UIGSoem7cZyewGgdey8xkvTfqerdQe8T8ztGMooOX8H3wILKOoqfAfZU4FPZSr9Hmw lx4760PhzHWVU3YEj6l1thCiyYW07wBa8A5Wz8WbH02PsR5E5yLEzM5D4HYkagPuNrFV33 eczk3VVSJH4M07pFOzFhJWpO8WNWedHGGtJXljJqzRib74WbhvN5dvJCrjyrQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjGwt2PXczqKZ; Thu, 23 Mar 2023 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32NKMcwK070627; Thu, 23 Mar 2023 20:22:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32NKMc1l070626; Thu, 23 Mar 2023 20:22:38 GMT (envelope-from git) Date: Thu, 23 Mar 2023 20:22:38 GMT Message-Id: <202303232022.32NKMc1l070626@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: 276e405a50d3 - releng/13.2 - vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 276e405a50d36229df308642b30e6e66372d39f2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=276e405a50d36229df308642b30e6e66372d39f2 commit 276e405a50d36229df308642b30e6e66372d39f2 Author: Mateusz Guzik AuthorDate: 2023-03-23 19:19:48 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-23 20:22:20 +0000 vfs cache: return ENOTDIR for not_a_dir/{.,..} lookups Reported by: Oliver Kiddle PR: 270419 MFC: 3 days Approved by: re (gjb) (cherry picked from commit c16c4ea6d399332d4a023df6e423be61fdb875a5) (cherry picked from commit 5d83656c09f522d6bf4f1050be60f270ddef04af) --- sys/kern/vfs_cache.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index e87f4a6cda1a..2b07dbbc34f0 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -5075,6 +5075,12 @@ cache_fplookup_dot(struct cache_fpl *fpl) int error; MPASS(!seqc_in_modify(fpl->dvp_seqc)); + + if (__predict_false(fpl->dvp->v_type != VDIR)) { + cache_fpl_smr_exit(fpl); + return (cache_fpl_handled_error(fpl, ENOTDIR)); + } + /* * Just re-assign the value. seqc will be checked later for the first * non-dot path component in line and/or before deciding to return the @@ -5137,6 +5143,11 @@ cache_fplookup_dotdot(struct cache_fpl *fpl) return (cache_fpl_partial(fpl)); } + if (__predict_false(dvp->v_type != VDIR)) { + cache_fpl_smr_exit(fpl); + return (cache_fpl_handled_error(fpl, ENOTDIR)); + } + ncp = atomic_load_consume_ptr(&dvp->v_cache_dd); if (ncp == NULL) { return (cache_fpl_aborted(fpl)); From nobody Fri Mar 24 00:49:11 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjNrR4tyVz40pXw; Fri, 24 Mar 2023 00:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjNrR4C1Qz3R96; Fri, 24 Mar 2023 00:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679618951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cQDYAMo4GwKkBrHj50EydNfPazcIhIYy9MATzWy6yA=; b=cSVRqPWm5OpyHpM8SgVt5FqbLNM1doAn+DxOCDoORo5L9S/wtzRYmD3kruZF4oE3049Tr+ GuCJPJR1/mKdOJ+cI3fvEnCCot2GC2h1XwL67nhWe3GstMESgeUselHGEGSRtWpmsPOZ6x NZvrOIT8wXxekXI4hbGNEdMl8sni6raesxDnuO+HAlormvb7EMssNIMV+alhLdAnYk9KNQ 0ic1TMSzUjcBk7xfVcJkuI4EuClDhdrS7T6eENiHyoX7eedvbDBT75Um4U0I48kD5kSyk5 tOlJXe+o4AGq0FBuiGdEb+GAcvjVmnVnl6Ur11RvOGI2o/M51PYDD15QCn7oXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679618951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4cQDYAMo4GwKkBrHj50EydNfPazcIhIYy9MATzWy6yA=; b=I5Kmvp4ULGsIinGpzslEYs6dqXbUFBIuSaTLzNr+9/a18lNl3om23rIf/JRPWEPdR6RhI8 ox08nLx3OdyL/CmDPh5nz9F9s1J3zlcgbvz8jMHZ8ihRygrartvJa1JsmKeXVSvaGKVoJw iPAP3ylxRBpZ+Qy5GYFDEp87VrZ4q43kBygcAztM0b6YlKEPBeSXkR/MCNBoMhTJeAYoG6 20F2a7zr9Ns1usD0iyWf912l69G3bDSjWVcdu/migf1+Vl0Hrr/G941xwyI/3sB0+2+jP6 nuQdxQkYJMliOV5apM/HtkYclPdlQfoTIkw6RpESGJSzJo9Elywd9zz8WH2BKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679618951; a=rsa-sha256; cv=none; b=thuSrWB9lPghfFdHPwKQf8SG+ELMI9ou2cYEOAoVq1gLB9nPh578TMC00YTaElFQsUPVEi LiDomuo2te1q86JwVREyTVOBpsqQCNgiXNNv8DJQ2YSelf4YaY8dJ+Kg6Wh6XlqikieYWD l2Guten+GC99iWfx6GhgXKZgZOHSbFIXhjrlOEmRVz/HhjGDYmsW0PVI/whsm1uKbMyhAI pnAw3vlBLIsAz8XQbQVzCBYWGaWcZjgLofBIc4UL58JGDSM3qTutkWU8RupO8Jme92wXyn B6jsZWL/AligWDCXUIV3VF6SOg54qYsPxf/RZuNrVJ6YsR7eNiFHryP313yJFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjNrR3FhfzxWd; Fri, 24 Mar 2023 00:49:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32O0nBPK097887; Fri, 24 Mar 2023 00:49:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O0nBU3097886; Fri, 24 Mar 2023 00:49:11 GMT (envelope-from git) Date: Fri, 24 Mar 2023 00:49:11 GMT Message-Id: <202303240049.32O0nBU3097886@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: 25b824aa0d26 - releng/13.2 - 13.2: update to RC4 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/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 25b824aa0d26a6aa0073c1c5cc4050276bf1e790 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=25b824aa0d26a6aa0073c1c5cc4050276bf1e790 commit 25b824aa0d26a6aa0073c1c5cc4050276bf1e790 Author: Colin Percival AuthorDate: 2023-03-24 00:48:54 +0000 Commit: Colin Percival CommitDate: 2023-03-24 00:48:54 +0000 13.2: update to RC4 Approved by: re (implicit) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 69dd746101f2..53b153cb207f 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RC3" +BRANCH="RC4" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Mar 24 01:15:39 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjPQz5kr7z40qtg; Fri, 24 Mar 2023 01:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjPQz5Rgyz3kYd; Fri, 24 Mar 2023 01:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679620539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1wAU9Nbg+LwCd5vuhRlTI+4vprHh/nYb2ZalgifUbj8=; b=D4O21jde3se6kV373X2h+PJAuVXRCrpOFHdLagbDl8MFIavzc9pFDGl54y+Tx4UcKi7bhs IAhQP2PLySf/y9v7HUlUeq/ltLZO2D9S42gqVzQq27OpaMFt2qgVC9Im0b7f+u2mF8j1XX wu18CxZ122trmiCrRkkhasa2NZVLiiknOMf0Sle51E0XSd7tn6z53MyLcsPn/5Bl01Pkl4 pzZzhmoeIYzFLrv84HiBQ1FBq+9NE401IA/gVZaXb/v4zqjcaPudGcUa6CbFbhlBvfLwe9 Ck5KrH/w/2YE/mwsm2BYG1HTyapnmQsJtp3ydFwflBuX6J74/TODnDd4GXF8sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679620539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1wAU9Nbg+LwCd5vuhRlTI+4vprHh/nYb2ZalgifUbj8=; b=egZgjto6Ju2Jp8Uu+mjDvW0cfASK+HZzEreFtrv72ZymdgFZaeoF63nYz3UHmgzGCTEs2r l7tUN/TJ89BnFR09Mnw1J+fG9CTuepPVToqh2FEpOROIqJEYfs0Wi1ko+fsbSeb5k4E1Y3 4XEUUcFLJqQfztd1PXdlXqyUT4k5T6pEBLIdLcjMTREO7C6jFHmogVMCdD+yH3Guaz3Fru 3cMYjqfdfghFd/IWNQkKR25HuTSqAkU1PBVARCYB4DBmVlLW3YUOszyvUbf9taHc/2/LFj mfuHPmF2sB9KVi6FAcEeqmtGGxSgqFgZ93rUmBjZLTe8ASqU8jFwnqayoYfi8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679620539; a=rsa-sha256; cv=none; b=xRMxSRt0MmhaJjaUSnXAHpQEwWmQgtLHkUgVFj96Cj0bvHM1qXyyYydnd1HelgvoSle4uK CJHQNDlCVyR1aYw17hJ2fnhQ96xRgw2ze2Nvfcn1UjZtoSo9hIjqzyeH4Y6l2XnzPzAyNa wRD+fsqOIUb1FGxjXIYTMyMvzoP8OUdrERnH6WB9Ui31Ural9BJM3J0dAHbJixAQpkW3qt OnAp6EyYRtmY6HJHKtHTE5rw1rkZQ9U6IHLXjmZ13vd9nSWnwptHn6KcZ7bDfQhOqbRUxC sqGe9sq1M4GtIhPMjw75ZbiQQbYZpCXrf0VaiJLwdmVysaNSnInZFmdO9fVlcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjPQz4VxLzxwM; Fri, 24 Mar 2023 01:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32O1Fdvc047209; Fri, 24 Mar 2023 01:15:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O1Fdcj047208; Fri, 24 Mar 2023 01:15:39 GMT (envelope-from git) Date: Fri, 24 Mar 2023 01:15:39 GMT Message-Id: <202303240115.32O1Fdcj047208@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: 9cb5b954606e - stable/13 - contrib/tzdata: import tzdata 2023a 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/13 X-Git-Reftype: branch X-Git-Commit: 9cb5b954606ec8a49b6127d2f58f7ee37ca0bb9c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=9cb5b954606ec8a49b6127d2f58f7ee37ca0bb9c commit 9cb5b954606ec8a49b6127d2f58f7ee37ca0bb9c Author: Philip Paeps AuthorDate: 2023-03-23 01:33:45 +0000 Commit: Philip Paeps CommitDate: 2023-03-24 01:12:13 +0000 contrib/tzdata: import tzdata 2023a Changes: https://github.com/eggert/tz/blob/2023a/NEWS (cherry picked from commit 259e2ad76d1da961cc34c2903cb5f72f28503eb8) --- contrib/tzdata/CONTRIBUTING | 2 +- contrib/tzdata/Makefile | 53 ++++++++-------- contrib/tzdata/NEWS | 127 +++++++++++++++++++++++++++++++++----- contrib/tzdata/africa | 71 +++++++++++++--------- contrib/tzdata/antarctica | 2 +- contrib/tzdata/asia | 128 ++++++++++++++++++++++++++++++++++++--- contrib/tzdata/australasia | 44 ++++++-------- contrib/tzdata/backward | 1 + contrib/tzdata/backzone | 11 +++- contrib/tzdata/checktab.awk | 5 +- contrib/tzdata/europe | 59 +++++++++--------- contrib/tzdata/leap-seconds.list | 8 +-- contrib/tzdata/leapseconds | 8 +-- contrib/tzdata/leapseconds.awk | 50 +++++++++------ contrib/tzdata/northamerica | 31 +++++----- contrib/tzdata/southamerica | 2 +- contrib/tzdata/theory.html | 66 +++++++++++++------- contrib/tzdata/version | 2 +- contrib/tzdata/zone.tab | 29 +++++---- contrib/tzdata/zone1970.tab | 58 +++++++++--------- 20 files changed, 504 insertions(+), 253 deletions(-) diff --git a/contrib/tzdata/CONTRIBUTING b/contrib/tzdata/CONTRIBUTING index 4c0f56a50265..6d800e4c03a3 100644 --- a/contrib/tzdata/CONTRIBUTING +++ b/contrib/tzdata/CONTRIBUTING @@ -18,7 +18,7 @@ To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach 'myfix.patch' to the email. -For more-elaborate or possibly-controversial changes, +For more-elaborate or possibly controversial changes, such as renaming, adding or removing zones, please read "Theory and pragmatics of the tz code and data" . diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile index afb9d538a203..6edc73cc6ffb 100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/Makefile @@ -35,22 +35,14 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of nonstandard and obsolete -# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules. -# Such a setting uses the rules in a template file to determine -# "spring forward" and "fall back" days and times; the environment -# variable itself specifies UT offsets of standard and daylight saving time. -# +# The POSIXRULES macro controls interpretation of POSIX-like TZ +# settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. -# # Any other value for POSIXRULES is obsolete and should not be relied on, as: # * It does not work correctly in popular implementations such as GNU/Linux. # * It does not work even in tzcode, except for historical timestamps # that precede the last explicit transition in the POSIXRULES file. # Hence it typically does not work for current and future timestamps. -# In short, software should avoid ruleless settings like TZ='EET-2EEST' -# and so should not depend on the value of POSIXRULES. -# # If, despite the above, you want a template for handling these settings, # you can change the line below (after finding the timezone you want in the # one of the $(TDATA) source files, or adding it to a source file). @@ -63,7 +55,7 @@ LOCALTIME= Factory POSIXRULES= - # Also see TZDEFRULESTRING below, which takes effect only -# if the time zone files cannot be accessed. +# if POSIXRULES is '-' or if the template file cannot be accessed. # Installation locations. @@ -211,7 +203,7 @@ LDLIBS= # -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DECL_TIMEGM=0 if does not declare timegm # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_GENERIC=0 if _Generic does not work* +# -DHAVE__GENERIC=0 if _Generic does not work* # -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), # -DHAVE_GETRANDOM=0 to avoid using getrandom # -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), @@ -220,7 +212,7 @@ LDLIBS= # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=0 if does not work* +# -DHAVE_INTTYPES_H=0 if does not work*+ # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz @@ -229,22 +221,24 @@ LDLIBS= # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX # -DHAVE_SETENV=0 if your system lacks the setenv function -# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+ # -DHAVE_STDCKDINT_H=0 if neither nor substitutes like # __builtin_add_overflow work* -# -DHAVE_STDINT_H=0 if does not work* +# -DHAVE_STDINT_H=0 if does not work*+ # -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function -# -DHAVE_STRTOLL=0 if your system lacks the strtoll function +# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+ # -DHAVE_SYMLINK=0 if your system lacks the symlink function # -DHAVE_SYS_STAT_H=0 if does not work* # -DHAVE_TZSET=0 if your system lacks a tzset function # -DHAVE_UNISTD_H=0 if does not work* # -DHAVE_UTMPX_H=0 if does not work* # -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -DPORT_TO_C89 if tzcode should also run on C89 platforms+ # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DSUPPORT_C89 if the tzcode library should support C89 callers+ # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -256,7 +250,13 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions if the time zone files cannot be accessed +# DST transitions for POSIX-style TZ strings lacking them, +# in the usual case where POSIXRULES is '-'. If not specified, +# TZDEFRULESTRING defaults to US rules for future DST transitions. +# This mishandles some past timestamps, as US DST rules have changed. +# It also mishandles settings like TZ='EET-2EEST' for eastern Europe, +# as Europe and US DST rules differ. +# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255) # -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library @@ -273,6 +273,8 @@ LDLIBS= # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking # # * Options marked "*" can be omitted if your compiler is C23 compatible. +# * Options marked "+" are obsolescent and are planned to be removed +# once the code assumes C99 or later. # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ @@ -363,7 +365,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # -DNETBSD_INSPIRED=0 # to the end of the "CFLAGS=" line. Otherwise, the functions # "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the -# time library, and if STD_INSPIRED is also defined the functions +# time library, and if STD_INSPIRED is also defined to nonzero the functions # "posix2time_z" and "time2posix_z" are added as well. # The functions ending in "_z" (or "_rz") are like their unsuffixed # (or suffixed-by-"_r") counterparts, except with an extra first @@ -455,16 +457,13 @@ SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~' SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3) SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' -# These characters are Latin-1, and so are likely to be displayable -# even in editors with limited character sets. -UNUSUAL_OK_LATIN_1 = «°±»½¾× -# This IPA symbol is represented in Unicode as the composition of -# U+0075 and U+032F, and U+032F is not considered alphabetic by some -# grep implementations that do not grok composition. -UNUSUAL_OK_IPA = u̯ +# These non-alphabetic, non-ASCII printable characters are Latin-1, +# and so are likely displayable even in editors like XEmacs 21 +# that have limited display capabilities. +UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷ # Non-ASCII non-letters that OK_CHAR allows, as these characters are # useful in commentary. -UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)$(UNUSUAL_OK_IPA) +UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1) # Put this in a bracket expression to match spaces. s = [:space:] @@ -833,7 +832,7 @@ check_slashed_abbrs: $(TDATA_TO_CHECK) CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } -check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab +check_sorted: backward backzone $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} !/./ {g++}' \ backward | LC_ALL=C sort -cu $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 701e490e4834..cd5cafe3f3c6 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,100 @@ News for the tz database +Release 2023a - 2023-03-22 12:39:33 -0700 + + Briefly: + Egypt now uses DST again, from April through October. + This year Morocco springs forward April 23, not April 30. + Palestine delays the start of DST this year. + Much of Greenland still uses DST from 2024 on. + America/Yellowknife now links to America/Edmonton. + tzselect can now use current time to help infer timezone. + The code now defaults to C99 or later. + Fix use of C23 attributes. + + Changes to future timestamps + + Starting in 2023, Egypt will observe DST from April's last Friday + through October's last Thursday. (Thanks to Ahmad ElDardiry.) + Assume the transition times are 00:00 and 24:00, respectively. + + In 2023 Morocco's spring-forward transition after Ramadan + will occur April 23, not April 30. (Thanks to Milamber.) + Adjust predictions for future years accordingly. This affects + predictions for 2023, 2031, 2038, and later years. + + This year Palestine will delay its spring forward from + March 25 to April 29 due to Ramadan. (Thanks to Heba Hamad.) + Make guesses for future Ramadans too. + + Much of Greenland, represented by America/Nuuk, will continue to + observe DST using European Union rules. When combined with + Greenland's decision not to change the clocks in fall 2023, + America/Nuuk therefore changes from -03/-02 to -02/-01 effective + 2023-10-29 at 01:00 UTC. (Thanks to Thomas M. Steenholdt.) + This change from 2022g doesn't affect timestamps until 2024-03-30, + and doesn't affect tm_isdst until 2023-03-25. + + Changes to past timestamps + + America/Yellowknife has changed from a Zone to a backward + compatibility Link, as it no longer differs from America/Edmonton + since 1970. (Thanks to Almaz Mingaleev.) This affects some + pre-1948 timestamps. The old data are now in 'backzone'. + + Changes to past time zone abbreviations + + When observing Moscow time, Europe/Kirov and Europe/Volgograd now + use the abbreviations MSK/MSD instead of numeric abbreviations, + for consistency with other timezones observing Moscow time. + + Changes to code + + You can now tell tzselect local time, to simplify later choices. + Select the 'time' option in its first prompt. + + You can now compile with -DTZNAME_MAXIMUM=N to limit time zone + abbreviations to N bytes (default 255). The reference runtime + library now rejects POSIX-style TZ strings that contain longer + abbreviations, treating them as UTC. Previously the limit was + platform dependent and abbreviations were silently truncated to + 16 bytes even when the limit was greater than 16. + + The code by default is now designed for C99 or later. To build in + a C89 environment, compile with -DPORT_TO_C89. To support C89 + callers of the tzcode library, compile with -DSUPPORT_C89. The + two new macros are transitional aids planned to be removed in a + future version, when C99 or later will be required. + + The code now builds again on pre-C99 platforms, if you compile + with -DPORT_TO_C89. This fixes a bug introduced in 2022f. + + On C23-compatible platforms tzcode no longer uses syntax like + 'static [[noreturn]] void usage(void);'. Instead, it uses + '[[noreturn]] static void usage(void);' as strict C23 requires. + (Problem reported by Houge Langley.) + + The code's functions now constrain their arguments with the C + 'restrict' keyword consistently with their documentation. + This may allow future optimizations. + + zdump again builds standalone with ckdadd and without setenv, + fixing a bug introduced in 2022g. (Problem reported by panic.) + + leapseconds.awk can now process a leap seconds file that never + expires; this might be useful if leap seconds are discontinued. + + Changes to commentary + + tz-link.html has a new section "Coordinating with governments and + distributors". (Thanks to Neil Fuller for some of the text.) + + To improve tzselect diagnostics, zone1970.tab's comments column is + now limited to countries that have multiple timezones. + + Note that leap seconds are planned to be discontinued by 2035. + + Release 2022g - 2022-11-29 08:58:31 -0800 Briefly: @@ -596,7 +691,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Starting with 2020a, zic -L truncated its output according to the "Expires" directive or "#expires" comment in the leapseconds file. The resulting TZif files omitted daylight saving transitions after - the leap second table expired, which led to far less-accurate + the leap second table expired, which led to far less accurate predictions of times after the expiry. Although future timestamps cannot be converted accurately in the presence of leap seconds, it is more accurate to convert near-future timestamps with a few @@ -616,7 +711,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 zic -L LEAPFILE -r @LO no longer generates an invalid TZif file that omits leap second information for the range LO..B when LO falls between two leap seconds A and B. Instead, it generates a - TZif version 4 file that represents the previously-missing + TZif version 4 file that represents the previously missing information. The TZif reader now allows the leap second table to begin with a @@ -670,7 +765,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Fix a bug with 'zic -r @X' when X is a negative leap second that has a nonnegative correction. Without the fix, the output file was truncated so that X appeared to be a positive leap second. - Fix a similar, even-less-likely bug when truncating at a positive + Fix a similar, even less likely bug when truncating at a positive leap second that has a nonpositive correction. zic -r now reports an error if given rolling leap seconds, as this @@ -691,7 +786,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 fixing a bug introduced in 2014g. zdump -v now outputs timestamps at boundaries of what localtime - and gmtime can represent, instead of the less-useful timestamps + and gmtime can represent, instead of the less useful timestamps one day after the minimum and one day before the maximum. (Thanks to Arthur David Olson for prototype code, and to Manuela Friedrich for debugging help.) @@ -2311,7 +2406,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 names internally. zdump has a new -i option to generate transitions in a - more-compact but still human-readable format. This option is + smaller but still human-readable format. This option is experimental, and the output format may change in future versions. (Thanks to Jon Skeet for suggesting that an option was needed, and thanks to Tim Parenti and Chris Rovick for further comments.) @@ -2333,7 +2428,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 release 2016g, the version number is now something like '2016g-23-g50556e3-dirty' instead of the misleading '2016g'. Tagged releases use the same version number format as before, - e.g., '2016g'. To support the more-accurate version number, its + e.g., '2016g'. To support the more accurate version number, its specification has moved from a line in the Makefile to a new source file 'version'. @@ -2964,7 +3059,7 @@ Release 2014i - 2014-10-21 22:04:57 -0700 Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET - to its more-traditional value MSK on 2014-10-26 at 01:00. + to its more traditional value MSK on 2014-10-26 at 01:00. (Thanks to Alexander Bokovoy for the heads-up about Belarus.) The new abbreviation IDT stands for the pre-1976 use of UT +08 in @@ -3056,7 +3151,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700 Changes affecting build procedure - 'make check' now checks better for properly-sorted data. + 'make check' now checks better for properly sorted data. Changes affecting documentation and commentary @@ -3557,7 +3652,7 @@ Release 2014a - 2014-03-07 23:30:29 -0800 Changes affecting past timestamps - Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00. + Fiji ended DST on 2014-01-19 at 02:00, not the previously scheduled 03:00. (Thanks to Steffen Thorsen.) Ukraine switched from Moscow to Eastern European time on 1990-07-01 @@ -3811,7 +3906,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 Allow POSIX-like TZ strings where the transition time's hour can range from -167 through 167, instead of the POSIX-required 0 through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the - new Fiji rules. This is a more-compact way to represent + new Fiji rules. This is a more compact way to represent far-future timestamps for America/Godthab, America/Santiago, Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem, Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by @@ -3819,7 +3914,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 Allow POSIX-like TZ strings where daylight saving time is in effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western - Argentina Summer Time all year. This supports a more-compact way + Argentina Summer Time all year. This supports a more compact way to represent the 2013d data for America/Argentina/San_Luis. Because of the change for San Luis noted above this change does not affect the current data. (Thanks to Andrew Main (Zefram) for @@ -3908,13 +4003,13 @@ Release 2013e - 2013-09-19 23:50:04 -0700 zdump now outputs "UT" when referring to Universal Time, not "UTC". "UTC" does not make sense for timestamps that predate the introduction - of UTC, whereas "UT", a more-generic term, does. (Thanks to Steve Allen + of UTC, whereas "UT", a more generic term, does. (Thanks to Steve Allen for clarifying UT vs UTC.) Data changes affecting behavior of tzselect and similar programs - Country code BQ is now called the more-common name "Caribbean Netherlands" - rather than the more-official "Bonaire, St Eustatius & Saba". + Country code BQ is now called the more common name "Caribbean Netherlands" + rather than the more official "Bonaire, St Eustatius & Saba". Remove from zone.tab the names America/Montreal, America/Shiprock, and Antarctica/South_Pole, as they are equivalent to existing @@ -4098,7 +4193,7 @@ Release 2013c - 2013-04-19 16:17:40 -0700 Macquarie Island is politically part of Australia, not Antarctica. (Thanks to Tobias Conradi.) - Sort Macquarie more-consistently with other parts of Australia. + Sort Macquarie more consistently with other parts of Australia. (Thanks to Tim Parenti.) @@ -5322,7 +5417,7 @@ Release data1998g - 1998-08-11 03:28:35 -0000 Release data1998f - 1998-07-20 13:50:00 -0000 [tzdata1998f.tar.gz is missing!] - Update the "leapseconds" file to include the newly-announced + Update the "leapseconds" file to include the newly announced insertion at the end of 1998. diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa index cfb9283c045d..6cf4e39c8c45 100644 --- a/contrib/tzdata/africa +++ b/contrib/tzdata/africa @@ -321,6 +321,14 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Mina Samuel (2016-07-04): # Egyptian government took the decision to cancel the DST, +# From Ahmad ElDardiry (2023-03-01): +# Egypt officially announced today that daylight savings will be +# applied from last Friday of April to last Thursday of October. +# From Paul Eggert (2023-03-01): +# Assume transitions are at 00:00 and 24:00 respectively. +# From Amir Adib (2023-03-07): +# https://www.facebook.com/EgyptianCabinet/posts/638829614954129/ + Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -330,6 +338,8 @@ Rule Egypt 2014 only - May 15 24:00 1:00 S Rule Egypt 2014 only - Jun 26 24:00 0 - Rule Egypt 2014 only - Jul 31 24:00 1:00 S Rule Egypt 2014 only - Sep lastThu 24:00 0 - +Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S +Rule Egypt 2023 max - Oct lastThu 24:00 0 - # Zone NAME STDOFF RULES FORMAT [UNTIL] #STDOFF 2:05:08.9 @@ -429,7 +439,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May # President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. # Monrovia: Executive Mansion. # -# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# Use the abbreviation "MMT" before 1972, as the more accurate numeric # abbreviation "-004430" would be one byte over the POSIX limit. # # Zone NAME STDOFF RULES FORMAT [UNTIL] @@ -566,8 +576,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # DST the coming summer... # # Some sources, in French: -# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB -# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- +# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-«-L%E2%80%99heure-d%E2%80%99été-ne-sera-pas-appliquée-cette-année-» +# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-économie-d-énergie-de-l-heure-d-été-ont-été-atteints- # # Our wrap-up: # https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html @@ -698,7 +708,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # More articles in the press # https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 -# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim +# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT+1-a-partir-de-dim # From Petr Machata (2011-03-30): # They have it written in English here: @@ -713,7 +723,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # According to Infomédiaire web site from Morocco (infomediaire.ma), # on March 9, 2012, (in French) Heure légale: # Le Maroc adopte officiellement l'heure d'été -# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 +# http://www.infomediaire.ma/news/maroc/heure-légale-le-maroc-adopte-officiellement-lheure-dété # Governing Council adopted draft decree, that Morocco DST starts on # the last Sunday of March (March 25, 2012) and ends on # last Sunday of September (September 30, 2012) @@ -837,19 +847,28 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # Friday or Saturday (and so the 2 days off are on a weekend), the next time # shift will be the next weekend. # -# From Paul Eggert (2020-05-31): +# From Milamber (2021-03-31, 2022-03-10): +# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 +# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ +# +# From Milamber (2023-03-14, 2023-03-15): +# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m. +# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m. +# https://www.mmsp.gov.ma/fr/actualites/passage-à-l%E2%80%99heure-gmt-à-partir-du-dimanche-19-mars-2023 +# +# From Paul Eggert (2023-03-14): # For now, guess that in the future Morocco will fall back at 03:00 # the last Sunday before Ramadan, and spring forward at 02:00 the -# first Sunday after two days after Ramadan. To implement this, +# first Sunday after one day after Ramadan. To implement this, # transition dates and times for 2019 through 2087 were determined by -# running the following program under GNU Emacs 26.3. (This algorithm +# running the following program under GNU Emacs 28.2. (This algorithm # also produces the correct transition dates for 2016 through 2018, # though the times differ due to Morocco's time zone change in 2018.) # (let ((islamic-year 1440)) # (require 'cal-islam) # (while (< islamic-year 1511) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) # (sunday 0)) # (while (/= sunday (mod (setq a (1- a)) 7))) # (while (/= sunday (mod b 7)) @@ -863,10 +882,6 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) -# -# From Milamber (2021-03-31, 2022-03-10), confirming these predictions: -# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 -# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 - @@ -919,7 +934,7 @@ Rule Morocco 2021 only - May 16 2:00 0 - Rule Morocco 2022 only - Mar 27 3:00 -1:00 - Rule Morocco 2022 only - May 8 2:00 0 - Rule Morocco 2023 only - Mar 19 3:00 -1:00 - -Rule Morocco 2023 only - Apr 30 2:00 0 - +Rule Morocco 2023 only - Apr 23 2:00 0 - Rule Morocco 2024 only - Mar 10 3:00 -1:00 - Rule Morocco 2024 only - Apr 14 2:00 0 - Rule Morocco 2025 only - Feb 23 3:00 -1:00 - @@ -935,7 +950,7 @@ Rule Morocco 2029 only - Feb 18 2:00 0 - Rule Morocco 2029 only - Dec 30 3:00 -1:00 - Rule Morocco 2030 only - Feb 10 2:00 0 - Rule Morocco 2030 only - Dec 22 3:00 -1:00 - -Rule Morocco 2031 only - Feb 2 2:00 0 - +Rule Morocco 2031 only - Jan 26 2:00 0 - Rule Morocco 2031 only - Dec 14 3:00 -1:00 - Rule Morocco 2032 only - Jan 18 2:00 0 - Rule Morocco 2032 only - Nov 28 3:00 -1:00 - @@ -951,7 +966,7 @@ Rule Morocco 2036 only - Nov 23 2:00 0 - Rule Morocco 2037 only - Oct 4 3:00 -1:00 - Rule Morocco 2037 only - Nov 15 2:00 0 - Rule Morocco 2038 only - Sep 26 3:00 -1:00 - -Rule Morocco 2038 only - Nov 7 2:00 0 - +Rule Morocco 2038 only - Oct 31 2:00 0 - Rule Morocco 2039 only - Sep 18 3:00 -1:00 - Rule Morocco 2039 only - Oct 23 2:00 0 - Rule Morocco 2040 only - Sep 2 3:00 -1:00 - @@ -967,7 +982,7 @@ Rule Morocco 2044 only - Aug 28 2:00 0 - Rule Morocco 2045 only - Jul 9 3:00 -1:00 - Rule Morocco 2045 only - Aug 20 2:00 0 - Rule Morocco 2046 only - Jul 1 3:00 -1:00 - -Rule Morocco 2046 only - Aug 12 2:00 0 - +Rule Morocco 2046 only - Aug 5 2:00 0 - Rule Morocco 2047 only - Jun 23 3:00 -1:00 - Rule Morocco 2047 only - Jul 28 2:00 0 - Rule Morocco 2048 only - Jun 7 3:00 -1:00 - @@ -983,7 +998,7 @@ Rule Morocco 2052 only - Jun 2 2:00 0 - Rule Morocco 2053 only - Apr 13 3:00 -1:00 - Rule Morocco 2053 only - May 25 2:00 0 - Rule Morocco 2054 only - Apr 5 3:00 -1:00 - -Rule Morocco 2054 only - May 17 2:00 0 - +Rule Morocco 2054 only - May 10 2:00 0 - Rule Morocco 2055 only - Mar 28 3:00 -1:00 - Rule Morocco 2055 only - May 2 2:00 0 - Rule Morocco 2056 only - Mar 12 3:00 -1:00 - @@ -999,7 +1014,7 @@ Rule Morocco 2060 only - Mar 7 2:00 0 - Rule Morocco 2061 only - Jan 16 3:00 -1:00 - Rule Morocco 2061 only - Feb 27 2:00 0 - Rule Morocco 2062 only - Jan 8 3:00 -1:00 - -Rule Morocco 2062 only - Feb 19 2:00 0 - +Rule Morocco 2062 only - Feb 12 2:00 0 - Rule Morocco 2062 only - Dec 31 3:00 -1:00 - Rule Morocco 2063 only - Feb 4 2:00 0 - Rule Morocco 2063 only - Dec 16 3:00 -1:00 - @@ -1015,7 +1030,7 @@ Rule Morocco 2067 only - Dec 11 2:00 0 - Rule Morocco 2068 only - Oct 21 3:00 -1:00 - Rule Morocco 2068 only - Dec 2 2:00 0 - Rule Morocco 2069 only - Oct 13 3:00 -1:00 - -Rule Morocco 2069 only - Nov 24 2:00 0 - +Rule Morocco 2069 only - Nov 17 2:00 0 - Rule Morocco 2070 only - Oct 5 3:00 -1:00 - Rule Morocco 2070 only - Nov 9 2:00 0 - Rule Morocco 2071 only - Sep 20 3:00 -1:00 - @@ -1031,7 +1046,7 @@ Rule Morocco 2075 only - Sep 15 2:00 0 - Rule Morocco 2076 only - Jul 26 3:00 -1:00 - Rule Morocco 2076 only - Sep 6 2:00 0 - Rule Morocco 2077 only - Jul 18 3:00 -1:00 - -Rule Morocco 2077 only - Aug 29 2:00 0 - +Rule Morocco 2077 only - Aug 22 2:00 0 - Rule Morocco 2078 only - Jul 10 3:00 -1:00 - Rule Morocco 2078 only - Aug 14 2:00 0 - Rule Morocco 2079 only - Jun 25 3:00 -1:00 - @@ -1041,13 +1056,13 @@ Rule Morocco 2080 only - Jul 21 2:00 0 - Rule Morocco 2081 only - Jun 1 3:00 -1:00 - Rule Morocco 2081 only - Jul 13 2:00 0 - Rule Morocco 2082 only - May 24 3:00 -1:00 - -Rule Morocco 2082 only - Jul 5 2:00 0 - +Rule Morocco 2082 only - Jun 28 2:00 0 - Rule Morocco 2083 only - May 16 3:00 -1:00 - Rule Morocco 2083 only - Jun 20 2:00 0 - Rule Morocco 2084 only - Apr 30 3:00 -1:00 - Rule Morocco 2084 only - Jun 11 2:00 0 - Rule Morocco 2085 only - Apr 22 3:00 -1:00 - -Rule Morocco 2085 only - Jun 3 2:00 0 - +Rule Morocco 2085 only - May 27 2:00 0 - Rule Morocco 2086 only - Apr 14 3:00 -1:00 - Rule Morocco 2086 only - May 19 2:00 0 - Rule Morocco 2087 only - Mar 30 3:00 -1:00 - @@ -1190,15 +1205,15 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # From P Chan (2020-12-03): # GMT was adopted as the standard time of Lagos on 1905-07-01. # Lagos Weekly Record, 1905-06-24, p 3 -# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235 +# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446,5221,1931,1235 # says "It is officially notified that on and after the 1st of July 1905 -# Greenwich Mean Solar Time will be adopted thought the Colony and +# Greenwich Mean Solar Time will be adopted throughout the Colony and # Protectorate, and that it will be necessary to put all clocks 13 minutes and # 35 seconds back, recording local mean time." # # It seemed that Lagos returned to LMT on 1908-07-01. # [The Lagos Standard], 1908-07-01, p 5 -# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523 +# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92,3590,3944,2523 # says "Scarcely have the people become accustomed to this new time, when # another official notice has now appeared announcing that from and after the # 1st July next, return will be made to local mean time." @@ -1210,7 +1225,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27 # "On January 1st [1914], a universal standard time for Nigeria was adopted, # viz., half an hour fast on Greenwich mean time, corresponding to the meridian -# 7 [degrees] 30' E. long." +# 7° 30' E. long." # Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos # was the local mean time. On 1st January, 1914, standard time for the whole of # Nigeria was introduced ... Lagos time has been advanced about 16 minutes @@ -1228,7 +1243,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first # reading of this Bill by the Legislative Council of the Colony of Nigeria on # Thursday 1919-08-28: -# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915 +# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261,3408,2994,1915 # "The proposal is that the Globe should be divided into twelve zones East and # West of Greenwich, of one hour each, Nigeria falling into the zone with a # standard of one hour fast on Greenwich Mean Time. Nigeria standard time is diff --git a/contrib/tzdata/antarctica b/contrib/tzdata/antarctica index f02755ae856f..fc603e9996de 100644 --- a/contrib/tzdata/antarctica +++ b/contrib/tzdata/antarctica @@ -292,7 +292,7 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1 # but that he found it more convenient to keep GMT+12 # as supplies for the station were coming from McMurdo Sound, # which was on GMT+12 because New Zealand was on GMT+12 all year -# at that time (1957). (Source: Siple's book 90 Degrees South.) +# at that time (1957). (Source: Siple's book 90° South.) # # From Susan Smith # http://www.cybertours.com/whs/pole10.html diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index 199e6ad6adc3..25592db89e83 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2954,7 +2954,7 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 # 9pm and moving clocks forward by one hour for the next three months. ...." # # http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html -# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4 +# http://www.dailytimes.com.pk/default.asp?page=2008\05\15\story_15-5-2008_pg1_4 # From Arthur David Olson (2008-05-19): # XXX--midnight transitions is a guess; 2008 only is a guess. @@ -3277,7 +3277,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # Some of many sources in Arabic: # http://www.samanews.com/index.php?act=Show&id=122638 # -# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html +# http://safa.ps/details/news/74352/بدء-التوقيت-الصيفي-بالضفة-وغزة-ليلة-الجمعة.html # # Our brief summary: # https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html @@ -3287,7 +3287,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # time from midnight on Friday, March 29, 2013" (translated). # [These are in Arabic and are for Gaza and for Ramallah, respectively.] # http://www.samanews.com/index.php?act=Show&id=154120 -# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html +# http://safa.ps/details/news/99844/رام-الله-بدء-التوقيت-الصيفي-29-الجاري.html # From Steffen Thorsen (2013-09-24): # The Gaza and West Bank are ending DST Thursday at midnight @@ -3385,9 +3385,41 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # (2022-08-31): ... the Saturday before the last Sunday in March and October # at 2:00 AM ,for the years from 2023 to 2026. # (2022-09-05): https://mtit.pna.ps/Site/New/1453 -# -# From Paul Eggert (2022-08-31): -# For now, assume that this rule will also be used after 2026. + +# From Heba Hamad (2023-03-22): +# ... summer time will begin in Palestine from Saturday 04-29-2023, +# 02:00 AM by 60 minutes forward. +# +# From Paul Eggert (2023-03-22): +# For now, guess that spring and fall transitions will normally +# continue to use 2022's rules, that during DST Palestine will switch +# to standard time at 02:00 the last Saturday before Ramadan and back +# to DST at 02:00 the first Saturday after Ramadan, and that +# if the normal spring-forward or fall-back transition occurs during +# Ramadan the former is delayed and the latter advanced. +# To implement this, I predicted Ramadan-oriented transition dates for +# 2023 through 2086 by running the following program under GNU Emacs 28.2, +# with the results integrated by hand into the table below. +# Predictions after 2086 are approximated without Ramadan. +# +# (let ((islamic-year 1444)) +# (require 'cal-islam) +# (while (< islamic-year 1510) +# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (saturday 6)) +# (while (/= saturday (mod (setq a (1- a)) 7))) +# (while (/= saturday (mod b 7)) +# (setq b (1+ b))) +# (setq a (calendar-gregorian-from-absolute a)) +# (setq b (calendar-gregorian-from-absolute b)) +# (insert +# (format +# (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n" +# "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n") +# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) +# (setq islamic-year (+ 1 islamic-year)))) # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -3427,8 +3459,86 @@ Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S Rule Palestine 2020 only - Oct 24 1:00 0 - Rule Palestine 2021 only - Oct 29 1:00 0 - Rule Palestine 2022 only - Mar 27 0:00 1:00 S -Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - -Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - +Rule Palestine 2023 only - Apr 29 2:00 1:00 S +Rule Palestine 2024 only - Apr 13 2:00 1:00 S +Rule Palestine 2025 only - Apr 5 2:00 1:00 S +Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2036 only - Oct 18 2:00 0 - +Rule Palestine 2037 only - Oct 10 2:00 0 - +Rule Palestine 2038 only - Sep 25 2:00 0 - +Rule Palestine 2039 only - Sep 17 2:00 0 - +Rule Palestine 2039 only - Oct 22 2:00 1:00 S +Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - +Rule Palestine 2040 only - Sep 1 2:00 0 - +Rule Palestine 2040 only - Oct 13 2:00 1:00 S +Rule Palestine 2041 only - Aug 24 2:00 0 - +Rule Palestine 2041 only - Sep 28 2:00 1:00 S +Rule Palestine 2042 only - Aug 16 2:00 0 - +Rule Palestine 2042 only - Sep 20 2:00 1:00 S +Rule Palestine 2043 only - Aug 1 2:00 0 - +Rule Palestine 2043 only - Sep 12 2:00 1:00 S +Rule Palestine 2044 only - Jul 23 2:00 0 - +Rule Palestine 2044 only - Aug 27 2:00 1:00 S +Rule Palestine 2045 only - Jul 15 2:00 0 - +Rule Palestine 2045 only - Aug 19 2:00 1:00 S +Rule Palestine 2046 only - Jun 30 2:00 0 - +Rule Palestine 2046 only - Aug 11 2:00 1:00 S +Rule Palestine 2047 only - Jun 22 2:00 0 - +Rule Palestine 2047 only - Jul 27 2:00 1:00 S +Rule Palestine 2048 only - Jun 6 2:00 0 - +Rule Palestine 2048 only - Jul 18 2:00 1:00 S +Rule Palestine 2049 only - May 29 2:00 0 - +Rule Palestine 2049 only - Jul 3 2:00 1:00 S +Rule Palestine 2050 only - May 21 2:00 0 - +Rule Palestine 2050 only - Jun 25 2:00 1:00 S +Rule Palestine 2051 only - May 6 2:00 0 - +Rule Palestine 2051 only - Jun 17 2:00 1:00 S +Rule Palestine 2052 only - Apr 27 2:00 0 - +Rule Palestine 2052 only - Jun 1 2:00 1:00 S +Rule Palestine 2053 only - Apr 12 2:00 0 - +Rule Palestine 2053 only - May 24 2:00 1:00 S +Rule Palestine 2054 only - Apr 4 2:00 0 - +Rule Palestine 2054 only - May 16 2:00 1:00 S +Rule Palestine 2055 only - May 1 2:00 1:00 S +Rule Palestine 2056 only - Apr 22 2:00 1:00 S +Rule Palestine 2057 only - Apr 7 2:00 1:00 S +Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2068 only - Oct 20 2:00 0 - +Rule Palestine 2069 only - Oct 12 2:00 0 - +Rule Palestine 2070 only - Oct 4 2:00 0 - +Rule Palestine 2071 only - Sep 19 2:00 0 - +Rule Palestine 2072 only - Sep 10 2:00 0 - +Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2073 only - Sep 2 2:00 0 - +Rule Palestine 2073 only - Oct 7 2:00 1:00 S +Rule Palestine 2074 only - Aug 18 2:00 0 - +Rule Palestine 2074 only - Sep 29 2:00 1:00 S +Rule Palestine 2075 only - Aug 10 2:00 0 - +Rule Palestine 2075 only - Sep 14 2:00 1:00 S +Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - +Rule Palestine 2076 only - Jul 25 2:00 0 - +Rule Palestine 2076 only - Sep 5 2:00 1:00 S +Rule Palestine 2077 only - Jul 17 2:00 0 - +Rule Palestine 2077 only - Aug 28 2:00 1:00 S +Rule Palestine 2078 only - Jul 9 2:00 0 - +Rule Palestine 2078 only - Aug 13 2:00 1:00 S +Rule Palestine 2079 only - Jun 24 2:00 0 - +Rule Palestine 2079 only - Aug 5 2:00 1:00 S +Rule Palestine 2080 only - Jun 15 2:00 0 - +Rule Palestine 2080 only - Jul 20 2:00 1:00 S +Rule Palestine 2081 only - Jun 7 2:00 0 - +Rule Palestine 2081 only - Jul 12 2:00 1:00 S +Rule Palestine 2082 only - May 23 2:00 0 - +Rule Palestine 2082 only - Jul 4 2:00 1:00 S +Rule Palestine 2083 only - May 15 2:00 0 - +Rule Palestine 2083 only - Jun 19 2:00 1:00 S +Rule Palestine 2084 only - Apr 29 2:00 0 - +Rule Palestine 2084 only - Jun 10 2:00 1:00 S +Rule Palestine 2085 only - Apr 21 2:00 0 - +Rule Palestine 2085 only - Jun 2 2:00 1:00 S +Rule Palestine 2086 only - Apr 13 2:00 0 - +Rule Palestine 2086 only - May 18 2:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -3632,7 +3742,7 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1 # standard time is SLST. # # From Paul Eggert (2016-10-18): -# "SLST" seems to be reasonably recent and rarely-used outside time +# "SLST" seems to be reasonably recent and rarely used outside time # zone nerd sources. I searched Google News and found three uses of # it in the International Business Times of India in February and # March of this year when discussing cricket match times, but nothing diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia index af0410ab9035..0633a30efd8b 100644 --- a/contrib/tzdata/australasia +++ b/contrib/tzdata/australasia @@ -323,7 +323,7 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov # From Steffen Thorsen (2013-01-10): # Fiji will end DST on 2014-01-19 02:00: -# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-(1).aspx # From Ken Rylander (2014-10-20): # DST will start Nov. 2 this year. @@ -723,7 +723,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5 # # Samoa's Daylight Saving Time Act 2009 is available here, but does not # contain any dates: -# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf +# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20(English)%20-%20Final%207-7-091.pdf # From Laupue Raymond Hughes (2010-10-07): # Please see @@ -1808,7 +1808,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # period. It would probably be reasonable to assume Guam use GMT+9 during # that period of time like the surrounding area. -# From Paul Eggert (2018-11-18): +# From Paul Eggert (2023-01-23): # Howse writes (p 153) "The Spaniards, on the other hand, reached the # Philippines and the Ladrones from America," and implies that the Ladrones # (now called the Marianas) kept American date for quite some time. @@ -1821,7 +1821,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # they did as that avoids the need for a separate zone due to our 1970 cutoff. # # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time, -# under the name "Chamorro Standard Time". There is no official abbreviation, +# under the name "Chamorro standard time". There is no official abbreviation, # but Congressman Robert A. Underwood, author of the bill that became law, # wrote in a press release (2000-12-27) that he will seek the use of "ChST". @@ -2199,24 +2199,18 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # an international standard, there are some places on the high seas where the # correct date is ambiguous. -# From Wikipedia (2005-08-31): -# Before 1920, all ships kept local apparent time on the high seas by setting -# their clocks at night or at the morning sight so that, given the ship's -# speed and direction, it would be 12 o'clock when the Sun crossed the ship's -# meridian (12 o'clock = local apparent noon). During 1917, at the -# Anglo-French Conference on Time-keeping at Sea, it was recommended that all -# ships, both military and civilian, should adopt hourly standard time zones -# on the high seas. Whenever a ship was within the territorial waters of any -# nation it would use that nation's standard time. The captain was permitted -# to change his ship's clocks at a time of his choice following his ship's -# entry into another zone time - he often chose midnight. These zones were -# adopted by all major fleets between 1920 and 1925 but not by many -# independent merchant ships until World War II. - -# From Paul Eggert, using references suggested by Oscar van Vlijmen -# (2005-03-20): -# -# The American Practical Navigator (2002) -# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187 -# talks only about the 180-degree meridian with respect to ships in -# international waters; it ignores the international date line. +# From Wikipedia (2023-01-23): +# The nautical time zone system is analogous to the terrestrial time zone +# system for use on high seas. Under the system time changes are required for +# changes of longitude in one-hour steps. The one-hour step corresponds to a +# time zone width of 15° longitude. The 15° gore that is offset from GMT or +# UT1 (not UTC) by twelve hours is bisected by the nautical date line into two +# 7°30' gores that differ from GMT by ±12 hours. A nautical date line is +# implied but not explicitly drawn on time zone maps. It follows the 180th +# meridian except where it is interrupted by territorial waters adjacent to +# land, forming gaps: it is a pole-to-pole dashed line. + +# From Paul Eggert (2023-01-23): +# The American Practical Navigator , +# 2019 edition, merely says that the International Date Line +# "coincides with the 180th meridian over most of its length." diff --git a/contrib/tzdata/backward b/contrib/tzdata/backward index 0ae5d74108e6..421f2ec6b9f8 100644 --- a/contrib/tzdata/backward +++ b/contrib/tzdata/backward @@ -274,6 +274,7 @@ Link America/Argentina/Cordoba America/Rosario Link America/Tijuana America/Santa_Isabel Link America/Denver America/Shiprock Link America/Toronto America/Thunder_Bay +Link America/Edmonton America/Yellowknife Link Pacific/Auckland Antarctica/South_Pole Link Asia/Shanghai Asia/Chongqing Link Asia/Shanghai Asia/Harbin diff --git a/contrib/tzdata/backzone b/contrib/tzdata/backzone index 7803c57d095d..44d81c29e5ae 100644 --- a/contrib/tzdata/backzone +++ b/contrib/tzdata/backzone @@ -169,7 +169,7 @@ Zone Africa/Accra -0:00:52 - LMT 1915 Nov 2 # 12-hour clock starting at our 06:00, so their "8 o'clock" is our # 02:00 or 14:00. Keep this in mind when you ask the time in Amharic. # -# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time +# Shanks & Pottenger write that Ethiopia had six narrowly spaced time # zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in # 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50 # was for Adis Dera. Quite likely the Shanks data entries are wrong @@ -499,7 +499,7 @@ Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad # ever since standard time was introduced, but the information from # McKinnon sounds more authoritative. For now, assume that Atikokan # switched to EST immediately after WWII era daylight saving time -# ended. This matches the old (less-populous) America/Coral_Harbour +# ended. This matches the old (less populous) America/Coral_Harbour # entry since our cutoff date of 1970, so we can move # America/Coral_Harbour to the 'backward' file. @@ -928,6 +928,11 @@ Zone America/Thunder_Bay -5:57:00 - LMT 1895 Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town -4:00 - AST +# Yellowknife, Northwest Territories +Zone America/Yellowknife 0 - -00 1935 # Yellowknife founded? + -7:00 NT_YK M%sT 1980 + -7:00 Canada M%sT + # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11 # (2005-12-05) # @@ -1756,7 +1761,7 @@ Link Pacific/Chuuk Pacific/Yap *** 919 LINES SKIPPED *** From nobody Fri Mar 24 01:16:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjPSR42pgz40rGQ; Fri, 24 Mar 2023 01:16: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 4PjPSR3d1zz3l6t; Fri, 24 Mar 2023 01:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679620615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9kveGHcwh77oWS8cxMZMiDgNZ3tLbkjUtZtJmehHYqA=; b=jTYKdl+28KjKBbKQajCSWjOUqbVYkb1LVGAgD9shMesEglIC26uQwTAVUb2HxGLJNGDU0Y pE0GRgYRw6lJs0gIpKQ1NYkl0F2r8ob2CcdFY5+U4/MP2HpuXLN4JwsnOIL6erTREkQqFL uqkGo38O3Ot4++HClyieePhO2pv5QOHeFb4YusqjsZkeLqwMRlF7aHFcuvZ0FLKJW00APx 80mDBcucAqJeETPg2JEQR09KJGYu4V7cKUMLFKkFJfac2tAq3AJlpHMCMGZnMSSiPzdRUN VmGqsf1NcNYiYpoIAR+t+9DsrgDbtitnPKiUPpgxrvNCfp0aYH0l6kMudSbv9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679620615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9kveGHcwh77oWS8cxMZMiDgNZ3tLbkjUtZtJmehHYqA=; b=EjTJXKY0NEWyAncHqP2GdC/iObTcemA8hn9ZjUgLFfuvix+HfdQFPDheeSpKvmfruIpUyD c+KWE1QS5rYKNV1BVyTmeaCDzFEirW/K4KoTbpcrEDdr6b5H9ZeRu65nMd9REvPFKmgMHH sz0PSjSi3hlvfTbZ55i4tFUDufr7Yk7lgiHjppD398xQhY4cbkPiw7swziMuzZfdvsOjsx QLV+/ACeg/Jwsy+QfpcFfcoCKqbqlPApByN0fujcG9UybhwIXs1MGcnW+Vqs+WxhxiJ7AC s895BvtTpf2sIkbKBDxpP2OxJmhyu5r1jDV2H/RFjvx61IaOTRmCbe68yK413A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679620615; a=rsa-sha256; cv=none; b=BisIvS8gZxP7+T+B/hukku/AZmVt1WF73mrF16yjjxYCytOhH6PVX1Ygs8ZAYFgo8yvH7y 3CWhatfc0eJTCeAGmIv7Hpyz+SQxUbjaRdGFSzcsw/df0EfI2nmfT/QDfncqAuHAFPptPe kDRFgTi1dHG3yugI7S+WqHuMaKoOpmS0K/9ixYjHhLbu7GWOeTrjykLFLb2hTIeBDKNqJy Hui6mFGhkLj8OSQfdGNbtWI9Hq+oGJvaZKo0hxY+ydAJVl/LFu8MSowRE7WxK1ApRWyn2a I2AgkuABSZGm598+1/5JN3/s8YC+K7zRBfFmH3OUdI++ok9MmX30keYV6NhBgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjPSR2fzhzyLd; Fri, 24 Mar 2023 01:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32O1GtGG047355; Fri, 24 Mar 2023 01:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O1GtaY047354; Fri, 24 Mar 2023 01:16:55 GMT (envelope-from git) Date: Fri, 24 Mar 2023 01:16:55 GMT Message-Id: <202303240116.32O1GtaY047354@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: 9845906f02fe - stable/12 - contrib/tzdata: import tzdata 2023a 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/12 X-Git-Reftype: branch X-Git-Commit: 9845906f02fea5a4f573a97a85d376acadef8769 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=9845906f02fea5a4f573a97a85d376acadef8769 commit 9845906f02fea5a4f573a97a85d376acadef8769 Author: Philip Paeps AuthorDate: 2023-03-23 01:33:45 +0000 Commit: Philip Paeps CommitDate: 2023-03-24 01:16:03 +0000 contrib/tzdata: import tzdata 2023a Changes: https://github.com/eggert/tz/blob/2023a/NEWS (cherry picked from commit 259e2ad76d1da961cc34c2903cb5f72f28503eb8) --- contrib/tzdata/CONTRIBUTING | 2 +- contrib/tzdata/Makefile | 53 ++++++++-------- contrib/tzdata/NEWS | 127 +++++++++++++++++++++++++++++++++----- contrib/tzdata/africa | 71 +++++++++++++--------- contrib/tzdata/antarctica | 2 +- contrib/tzdata/asia | 128 ++++++++++++++++++++++++++++++++++++--- contrib/tzdata/australasia | 44 ++++++-------- contrib/tzdata/backward | 1 + contrib/tzdata/backzone | 11 +++- contrib/tzdata/checktab.awk | 5 +- contrib/tzdata/europe | 59 +++++++++--------- contrib/tzdata/leap-seconds.list | 8 +-- contrib/tzdata/leapseconds | 8 +-- contrib/tzdata/leapseconds.awk | 50 +++++++++------ contrib/tzdata/northamerica | 31 +++++----- contrib/tzdata/southamerica | 2 +- contrib/tzdata/theory.html | 66 +++++++++++++------- contrib/tzdata/version | 2 +- contrib/tzdata/zone.tab | 29 +++++---- contrib/tzdata/zone1970.tab | 58 +++++++++--------- 20 files changed, 504 insertions(+), 253 deletions(-) diff --git a/contrib/tzdata/CONTRIBUTING b/contrib/tzdata/CONTRIBUTING index 4c0f56a50265..6d800e4c03a3 100644 --- a/contrib/tzdata/CONTRIBUTING +++ b/contrib/tzdata/CONTRIBUTING @@ -18,7 +18,7 @@ To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach 'myfix.patch' to the email. -For more-elaborate or possibly-controversial changes, +For more-elaborate or possibly controversial changes, such as renaming, adding or removing zones, please read "Theory and pragmatics of the tz code and data" . diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile index afb9d538a203..6edc73cc6ffb 100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/Makefile @@ -35,22 +35,14 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of nonstandard and obsolete -# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules. -# Such a setting uses the rules in a template file to determine -# "spring forward" and "fall back" days and times; the environment -# variable itself specifies UT offsets of standard and daylight saving time. -# +# The POSIXRULES macro controls interpretation of POSIX-like TZ +# settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. -# # Any other value for POSIXRULES is obsolete and should not be relied on, as: # * It does not work correctly in popular implementations such as GNU/Linux. # * It does not work even in tzcode, except for historical timestamps # that precede the last explicit transition in the POSIXRULES file. # Hence it typically does not work for current and future timestamps. -# In short, software should avoid ruleless settings like TZ='EET-2EEST' -# and so should not depend on the value of POSIXRULES. -# # If, despite the above, you want a template for handling these settings, # you can change the line below (after finding the timezone you want in the # one of the $(TDATA) source files, or adding it to a source file). @@ -63,7 +55,7 @@ LOCALTIME= Factory POSIXRULES= - # Also see TZDEFRULESTRING below, which takes effect only -# if the time zone files cannot be accessed. +# if POSIXRULES is '-' or if the template file cannot be accessed. # Installation locations. @@ -211,7 +203,7 @@ LDLIBS= # -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DECL_TIMEGM=0 if does not declare timegm # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_GENERIC=0 if _Generic does not work* +# -DHAVE__GENERIC=0 if _Generic does not work* # -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), # -DHAVE_GETRANDOM=0 to avoid using getrandom # -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), @@ -220,7 +212,7 @@ LDLIBS= # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=0 if does not work* +# -DHAVE_INTTYPES_H=0 if does not work*+ # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz @@ -229,22 +221,24 @@ LDLIBS= # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX # -DHAVE_SETENV=0 if your system lacks the setenv function -# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+ # -DHAVE_STDCKDINT_H=0 if neither nor substitutes like # __builtin_add_overflow work* -# -DHAVE_STDINT_H=0 if does not work* +# -DHAVE_STDINT_H=0 if does not work*+ # -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function -# -DHAVE_STRTOLL=0 if your system lacks the strtoll function +# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+ # -DHAVE_SYMLINK=0 if your system lacks the symlink function # -DHAVE_SYS_STAT_H=0 if does not work* # -DHAVE_TZSET=0 if your system lacks a tzset function # -DHAVE_UNISTD_H=0 if does not work* # -DHAVE_UTMPX_H=0 if does not work* # -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -DPORT_TO_C89 if tzcode should also run on C89 platforms+ # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DSUPPORT_C89 if the tzcode library should support C89 callers+ # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -256,7 +250,13 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions if the time zone files cannot be accessed +# DST transitions for POSIX-style TZ strings lacking them, +# in the usual case where POSIXRULES is '-'. If not specified, +# TZDEFRULESTRING defaults to US rules for future DST transitions. +# This mishandles some past timestamps, as US DST rules have changed. +# It also mishandles settings like TZ='EET-2EEST' for eastern Europe, +# as Europe and US DST rules differ. +# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255) # -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library @@ -273,6 +273,8 @@ LDLIBS= # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking # # * Options marked "*" can be omitted if your compiler is C23 compatible. +# * Options marked "+" are obsolescent and are planned to be removed +# once the code assumes C99 or later. # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ @@ -363,7 +365,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # -DNETBSD_INSPIRED=0 # to the end of the "CFLAGS=" line. Otherwise, the functions # "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the -# time library, and if STD_INSPIRED is also defined the functions +# time library, and if STD_INSPIRED is also defined to nonzero the functions # "posix2time_z" and "time2posix_z" are added as well. # The functions ending in "_z" (or "_rz") are like their unsuffixed # (or suffixed-by-"_r") counterparts, except with an extra first @@ -455,16 +457,13 @@ SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~' SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3) SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' -# These characters are Latin-1, and so are likely to be displayable -# even in editors with limited character sets. -UNUSUAL_OK_LATIN_1 = «°±»½¾× -# This IPA symbol is represented in Unicode as the composition of -# U+0075 and U+032F, and U+032F is not considered alphabetic by some -# grep implementations that do not grok composition. -UNUSUAL_OK_IPA = u̯ +# These non-alphabetic, non-ASCII printable characters are Latin-1, +# and so are likely displayable even in editors like XEmacs 21 +# that have limited display capabilities. +UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷ # Non-ASCII non-letters that OK_CHAR allows, as these characters are # useful in commentary. -UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)$(UNUSUAL_OK_IPA) +UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1) # Put this in a bracket expression to match spaces. s = [:space:] @@ -833,7 +832,7 @@ check_slashed_abbrs: $(TDATA_TO_CHECK) CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } -check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab +check_sorted: backward backzone $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} !/./ {g++}' \ backward | LC_ALL=C sort -cu $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 701e490e4834..cd5cafe3f3c6 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,100 @@ News for the tz database +Release 2023a - 2023-03-22 12:39:33 -0700 + + Briefly: + Egypt now uses DST again, from April through October. + This year Morocco springs forward April 23, not April 30. + Palestine delays the start of DST this year. + Much of Greenland still uses DST from 2024 on. + America/Yellowknife now links to America/Edmonton. + tzselect can now use current time to help infer timezone. + The code now defaults to C99 or later. + Fix use of C23 attributes. + + Changes to future timestamps + + Starting in 2023, Egypt will observe DST from April's last Friday + through October's last Thursday. (Thanks to Ahmad ElDardiry.) + Assume the transition times are 00:00 and 24:00, respectively. + + In 2023 Morocco's spring-forward transition after Ramadan + will occur April 23, not April 30. (Thanks to Milamber.) + Adjust predictions for future years accordingly. This affects + predictions for 2023, 2031, 2038, and later years. + + This year Palestine will delay its spring forward from + March 25 to April 29 due to Ramadan. (Thanks to Heba Hamad.) + Make guesses for future Ramadans too. + + Much of Greenland, represented by America/Nuuk, will continue to + observe DST using European Union rules. When combined with + Greenland's decision not to change the clocks in fall 2023, + America/Nuuk therefore changes from -03/-02 to -02/-01 effective + 2023-10-29 at 01:00 UTC. (Thanks to Thomas M. Steenholdt.) + This change from 2022g doesn't affect timestamps until 2024-03-30, + and doesn't affect tm_isdst until 2023-03-25. + + Changes to past timestamps + + America/Yellowknife has changed from a Zone to a backward + compatibility Link, as it no longer differs from America/Edmonton + since 1970. (Thanks to Almaz Mingaleev.) This affects some + pre-1948 timestamps. The old data are now in 'backzone'. + + Changes to past time zone abbreviations + + When observing Moscow time, Europe/Kirov and Europe/Volgograd now + use the abbreviations MSK/MSD instead of numeric abbreviations, + for consistency with other timezones observing Moscow time. + + Changes to code + + You can now tell tzselect local time, to simplify later choices. + Select the 'time' option in its first prompt. + + You can now compile with -DTZNAME_MAXIMUM=N to limit time zone + abbreviations to N bytes (default 255). The reference runtime + library now rejects POSIX-style TZ strings that contain longer + abbreviations, treating them as UTC. Previously the limit was + platform dependent and abbreviations were silently truncated to + 16 bytes even when the limit was greater than 16. + + The code by default is now designed for C99 or later. To build in + a C89 environment, compile with -DPORT_TO_C89. To support C89 + callers of the tzcode library, compile with -DSUPPORT_C89. The + two new macros are transitional aids planned to be removed in a + future version, when C99 or later will be required. + + The code now builds again on pre-C99 platforms, if you compile + with -DPORT_TO_C89. This fixes a bug introduced in 2022f. + + On C23-compatible platforms tzcode no longer uses syntax like + 'static [[noreturn]] void usage(void);'. Instead, it uses + '[[noreturn]] static void usage(void);' as strict C23 requires. + (Problem reported by Houge Langley.) + + The code's functions now constrain their arguments with the C + 'restrict' keyword consistently with their documentation. + This may allow future optimizations. + + zdump again builds standalone with ckdadd and without setenv, + fixing a bug introduced in 2022g. (Problem reported by panic.) + + leapseconds.awk can now process a leap seconds file that never + expires; this might be useful if leap seconds are discontinued. + + Changes to commentary + + tz-link.html has a new section "Coordinating with governments and + distributors". (Thanks to Neil Fuller for some of the text.) + + To improve tzselect diagnostics, zone1970.tab's comments column is + now limited to countries that have multiple timezones. + + Note that leap seconds are planned to be discontinued by 2035. + + Release 2022g - 2022-11-29 08:58:31 -0800 Briefly: @@ -596,7 +691,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Starting with 2020a, zic -L truncated its output according to the "Expires" directive or "#expires" comment in the leapseconds file. The resulting TZif files omitted daylight saving transitions after - the leap second table expired, which led to far less-accurate + the leap second table expired, which led to far less accurate predictions of times after the expiry. Although future timestamps cannot be converted accurately in the presence of leap seconds, it is more accurate to convert near-future timestamps with a few @@ -616,7 +711,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 zic -L LEAPFILE -r @LO no longer generates an invalid TZif file that omits leap second information for the range LO..B when LO falls between two leap seconds A and B. Instead, it generates a - TZif version 4 file that represents the previously-missing + TZif version 4 file that represents the previously missing information. The TZif reader now allows the leap second table to begin with a @@ -670,7 +765,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Fix a bug with 'zic -r @X' when X is a negative leap second that has a nonnegative correction. Without the fix, the output file was truncated so that X appeared to be a positive leap second. - Fix a similar, even-less-likely bug when truncating at a positive + Fix a similar, even less likely bug when truncating at a positive leap second that has a nonpositive correction. zic -r now reports an error if given rolling leap seconds, as this @@ -691,7 +786,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 fixing a bug introduced in 2014g. zdump -v now outputs timestamps at boundaries of what localtime - and gmtime can represent, instead of the less-useful timestamps + and gmtime can represent, instead of the less useful timestamps one day after the minimum and one day before the maximum. (Thanks to Arthur David Olson for prototype code, and to Manuela Friedrich for debugging help.) @@ -2311,7 +2406,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 names internally. zdump has a new -i option to generate transitions in a - more-compact but still human-readable format. This option is + smaller but still human-readable format. This option is experimental, and the output format may change in future versions. (Thanks to Jon Skeet for suggesting that an option was needed, and thanks to Tim Parenti and Chris Rovick for further comments.) @@ -2333,7 +2428,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 release 2016g, the version number is now something like '2016g-23-g50556e3-dirty' instead of the misleading '2016g'. Tagged releases use the same version number format as before, - e.g., '2016g'. To support the more-accurate version number, its + e.g., '2016g'. To support the more accurate version number, its specification has moved from a line in the Makefile to a new source file 'version'. @@ -2964,7 +3059,7 @@ Release 2014i - 2014-10-21 22:04:57 -0700 Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET - to its more-traditional value MSK on 2014-10-26 at 01:00. + to its more traditional value MSK on 2014-10-26 at 01:00. (Thanks to Alexander Bokovoy for the heads-up about Belarus.) The new abbreviation IDT stands for the pre-1976 use of UT +08 in @@ -3056,7 +3151,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700 Changes affecting build procedure - 'make check' now checks better for properly-sorted data. + 'make check' now checks better for properly sorted data. Changes affecting documentation and commentary @@ -3557,7 +3652,7 @@ Release 2014a - 2014-03-07 23:30:29 -0800 Changes affecting past timestamps - Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00. + Fiji ended DST on 2014-01-19 at 02:00, not the previously scheduled 03:00. (Thanks to Steffen Thorsen.) Ukraine switched from Moscow to Eastern European time on 1990-07-01 @@ -3811,7 +3906,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 Allow POSIX-like TZ strings where the transition time's hour can range from -167 through 167, instead of the POSIX-required 0 through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the - new Fiji rules. This is a more-compact way to represent + new Fiji rules. This is a more compact way to represent far-future timestamps for America/Godthab, America/Santiago, Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem, Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by @@ -3819,7 +3914,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 Allow POSIX-like TZ strings where daylight saving time is in effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western - Argentina Summer Time all year. This supports a more-compact way + Argentina Summer Time all year. This supports a more compact way to represent the 2013d data for America/Argentina/San_Luis. Because of the change for San Luis noted above this change does not affect the current data. (Thanks to Andrew Main (Zefram) for @@ -3908,13 +4003,13 @@ Release 2013e - 2013-09-19 23:50:04 -0700 zdump now outputs "UT" when referring to Universal Time, not "UTC". "UTC" does not make sense for timestamps that predate the introduction - of UTC, whereas "UT", a more-generic term, does. (Thanks to Steve Allen + of UTC, whereas "UT", a more generic term, does. (Thanks to Steve Allen for clarifying UT vs UTC.) Data changes affecting behavior of tzselect and similar programs - Country code BQ is now called the more-common name "Caribbean Netherlands" - rather than the more-official "Bonaire, St Eustatius & Saba". + Country code BQ is now called the more common name "Caribbean Netherlands" + rather than the more official "Bonaire, St Eustatius & Saba". Remove from zone.tab the names America/Montreal, America/Shiprock, and Antarctica/South_Pole, as they are equivalent to existing @@ -4098,7 +4193,7 @@ Release 2013c - 2013-04-19 16:17:40 -0700 Macquarie Island is politically part of Australia, not Antarctica. (Thanks to Tobias Conradi.) - Sort Macquarie more-consistently with other parts of Australia. + Sort Macquarie more consistently with other parts of Australia. (Thanks to Tim Parenti.) @@ -5322,7 +5417,7 @@ Release data1998g - 1998-08-11 03:28:35 -0000 Release data1998f - 1998-07-20 13:50:00 -0000 [tzdata1998f.tar.gz is missing!] - Update the "leapseconds" file to include the newly-announced + Update the "leapseconds" file to include the newly announced insertion at the end of 1998. diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa index cfb9283c045d..6cf4e39c8c45 100644 --- a/contrib/tzdata/africa +++ b/contrib/tzdata/africa @@ -321,6 +321,14 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Mina Samuel (2016-07-04): # Egyptian government took the decision to cancel the DST, +# From Ahmad ElDardiry (2023-03-01): +# Egypt officially announced today that daylight savings will be +# applied from last Friday of April to last Thursday of October. +# From Paul Eggert (2023-03-01): +# Assume transitions are at 00:00 and 24:00 respectively. +# From Amir Adib (2023-03-07): +# https://www.facebook.com/EgyptianCabinet/posts/638829614954129/ + Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -330,6 +338,8 @@ Rule Egypt 2014 only - May 15 24:00 1:00 S Rule Egypt 2014 only - Jun 26 24:00 0 - Rule Egypt 2014 only - Jul 31 24:00 1:00 S Rule Egypt 2014 only - Sep lastThu 24:00 0 - +Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S +Rule Egypt 2023 max - Oct lastThu 24:00 0 - # Zone NAME STDOFF RULES FORMAT [UNTIL] #STDOFF 2:05:08.9 @@ -429,7 +439,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May # President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. # Monrovia: Executive Mansion. # -# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# Use the abbreviation "MMT" before 1972, as the more accurate numeric # abbreviation "-004430" would be one byte over the POSIX limit. # # Zone NAME STDOFF RULES FORMAT [UNTIL] @@ -566,8 +576,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # DST the coming summer... # # Some sources, in French: -# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB -# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- +# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-«-L%E2%80%99heure-d%E2%80%99été-ne-sera-pas-appliquée-cette-année-» +# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-économie-d-énergie-de-l-heure-d-été-ont-été-atteints- # # Our wrap-up: # https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html @@ -698,7 +708,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # More articles in the press # https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 -# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim +# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT+1-a-partir-de-dim # From Petr Machata (2011-03-30): # They have it written in English here: @@ -713,7 +723,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # According to Infomédiaire web site from Morocco (infomediaire.ma), # on March 9, 2012, (in French) Heure légale: # Le Maroc adopte officiellement l'heure d'été -# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 +# http://www.infomediaire.ma/news/maroc/heure-légale-le-maroc-adopte-officiellement-lheure-dété # Governing Council adopted draft decree, that Morocco DST starts on # the last Sunday of March (March 25, 2012) and ends on # last Sunday of September (September 30, 2012) @@ -837,19 +847,28 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # Friday or Saturday (and so the 2 days off are on a weekend), the next time # shift will be the next weekend. # -# From Paul Eggert (2020-05-31): +# From Milamber (2021-03-31, 2022-03-10): +# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 +# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ +# +# From Milamber (2023-03-14, 2023-03-15): +# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m. +# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m. +# https://www.mmsp.gov.ma/fr/actualites/passage-à-l%E2%80%99heure-gmt-à-partir-du-dimanche-19-mars-2023 +# +# From Paul Eggert (2023-03-14): # For now, guess that in the future Morocco will fall back at 03:00 # the last Sunday before Ramadan, and spring forward at 02:00 the -# first Sunday after two days after Ramadan. To implement this, +# first Sunday after one day after Ramadan. To implement this, # transition dates and times for 2019 through 2087 were determined by -# running the following program under GNU Emacs 26.3. (This algorithm +# running the following program under GNU Emacs 28.2. (This algorithm # also produces the correct transition dates for 2016 through 2018, # though the times differ due to Morocco's time zone change in 2018.) # (let ((islamic-year 1440)) # (require 'cal-islam) # (while (< islamic-year 1511) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) # (sunday 0)) # (while (/= sunday (mod (setq a (1- a)) 7))) # (while (/= sunday (mod b 7)) @@ -863,10 +882,6 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) -# -# From Milamber (2021-03-31, 2022-03-10), confirming these predictions: -# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 -# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 - @@ -919,7 +934,7 @@ Rule Morocco 2021 only - May 16 2:00 0 - Rule Morocco 2022 only - Mar 27 3:00 -1:00 - Rule Morocco 2022 only - May 8 2:00 0 - Rule Morocco 2023 only - Mar 19 3:00 -1:00 - -Rule Morocco 2023 only - Apr 30 2:00 0 - +Rule Morocco 2023 only - Apr 23 2:00 0 - Rule Morocco 2024 only - Mar 10 3:00 -1:00 - Rule Morocco 2024 only - Apr 14 2:00 0 - Rule Morocco 2025 only - Feb 23 3:00 -1:00 - @@ -935,7 +950,7 @@ Rule Morocco 2029 only - Feb 18 2:00 0 - Rule Morocco 2029 only - Dec 30 3:00 -1:00 - Rule Morocco 2030 only - Feb 10 2:00 0 - Rule Morocco 2030 only - Dec 22 3:00 -1:00 - -Rule Morocco 2031 only - Feb 2 2:00 0 - +Rule Morocco 2031 only - Jan 26 2:00 0 - Rule Morocco 2031 only - Dec 14 3:00 -1:00 - Rule Morocco 2032 only - Jan 18 2:00 0 - Rule Morocco 2032 only - Nov 28 3:00 -1:00 - @@ -951,7 +966,7 @@ Rule Morocco 2036 only - Nov 23 2:00 0 - Rule Morocco 2037 only - Oct 4 3:00 -1:00 - Rule Morocco 2037 only - Nov 15 2:00 0 - Rule Morocco 2038 only - Sep 26 3:00 -1:00 - -Rule Morocco 2038 only - Nov 7 2:00 0 - +Rule Morocco 2038 only - Oct 31 2:00 0 - Rule Morocco 2039 only - Sep 18 3:00 -1:00 - Rule Morocco 2039 only - Oct 23 2:00 0 - Rule Morocco 2040 only - Sep 2 3:00 -1:00 - @@ -967,7 +982,7 @@ Rule Morocco 2044 only - Aug 28 2:00 0 - Rule Morocco 2045 only - Jul 9 3:00 -1:00 - Rule Morocco 2045 only - Aug 20 2:00 0 - Rule Morocco 2046 only - Jul 1 3:00 -1:00 - -Rule Morocco 2046 only - Aug 12 2:00 0 - +Rule Morocco 2046 only - Aug 5 2:00 0 - Rule Morocco 2047 only - Jun 23 3:00 -1:00 - Rule Morocco 2047 only - Jul 28 2:00 0 - Rule Morocco 2048 only - Jun 7 3:00 -1:00 - @@ -983,7 +998,7 @@ Rule Morocco 2052 only - Jun 2 2:00 0 - Rule Morocco 2053 only - Apr 13 3:00 -1:00 - Rule Morocco 2053 only - May 25 2:00 0 - Rule Morocco 2054 only - Apr 5 3:00 -1:00 - -Rule Morocco 2054 only - May 17 2:00 0 - +Rule Morocco 2054 only - May 10 2:00 0 - Rule Morocco 2055 only - Mar 28 3:00 -1:00 - Rule Morocco 2055 only - May 2 2:00 0 - Rule Morocco 2056 only - Mar 12 3:00 -1:00 - @@ -999,7 +1014,7 @@ Rule Morocco 2060 only - Mar 7 2:00 0 - Rule Morocco 2061 only - Jan 16 3:00 -1:00 - Rule Morocco 2061 only - Feb 27 2:00 0 - Rule Morocco 2062 only - Jan 8 3:00 -1:00 - -Rule Morocco 2062 only - Feb 19 2:00 0 - +Rule Morocco 2062 only - Feb 12 2:00 0 - Rule Morocco 2062 only - Dec 31 3:00 -1:00 - Rule Morocco 2063 only - Feb 4 2:00 0 - Rule Morocco 2063 only - Dec 16 3:00 -1:00 - @@ -1015,7 +1030,7 @@ Rule Morocco 2067 only - Dec 11 2:00 0 - Rule Morocco 2068 only - Oct 21 3:00 -1:00 - Rule Morocco 2068 only - Dec 2 2:00 0 - Rule Morocco 2069 only - Oct 13 3:00 -1:00 - -Rule Morocco 2069 only - Nov 24 2:00 0 - +Rule Morocco 2069 only - Nov 17 2:00 0 - Rule Morocco 2070 only - Oct 5 3:00 -1:00 - Rule Morocco 2070 only - Nov 9 2:00 0 - Rule Morocco 2071 only - Sep 20 3:00 -1:00 - @@ -1031,7 +1046,7 @@ Rule Morocco 2075 only - Sep 15 2:00 0 - Rule Morocco 2076 only - Jul 26 3:00 -1:00 - Rule Morocco 2076 only - Sep 6 2:00 0 - Rule Morocco 2077 only - Jul 18 3:00 -1:00 - -Rule Morocco 2077 only - Aug 29 2:00 0 - +Rule Morocco 2077 only - Aug 22 2:00 0 - Rule Morocco 2078 only - Jul 10 3:00 -1:00 - Rule Morocco 2078 only - Aug 14 2:00 0 - Rule Morocco 2079 only - Jun 25 3:00 -1:00 - @@ -1041,13 +1056,13 @@ Rule Morocco 2080 only - Jul 21 2:00 0 - Rule Morocco 2081 only - Jun 1 3:00 -1:00 - Rule Morocco 2081 only - Jul 13 2:00 0 - Rule Morocco 2082 only - May 24 3:00 -1:00 - -Rule Morocco 2082 only - Jul 5 2:00 0 - +Rule Morocco 2082 only - Jun 28 2:00 0 - Rule Morocco 2083 only - May 16 3:00 -1:00 - Rule Morocco 2083 only - Jun 20 2:00 0 - Rule Morocco 2084 only - Apr 30 3:00 -1:00 - Rule Morocco 2084 only - Jun 11 2:00 0 - Rule Morocco 2085 only - Apr 22 3:00 -1:00 - -Rule Morocco 2085 only - Jun 3 2:00 0 - +Rule Morocco 2085 only - May 27 2:00 0 - Rule Morocco 2086 only - Apr 14 3:00 -1:00 - Rule Morocco 2086 only - May 19 2:00 0 - Rule Morocco 2087 only - Mar 30 3:00 -1:00 - @@ -1190,15 +1205,15 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # From P Chan (2020-12-03): # GMT was adopted as the standard time of Lagos on 1905-07-01. # Lagos Weekly Record, 1905-06-24, p 3 -# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235 +# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446,5221,1931,1235 # says "It is officially notified that on and after the 1st of July 1905 -# Greenwich Mean Solar Time will be adopted thought the Colony and +# Greenwich Mean Solar Time will be adopted throughout the Colony and # Protectorate, and that it will be necessary to put all clocks 13 minutes and # 35 seconds back, recording local mean time." # # It seemed that Lagos returned to LMT on 1908-07-01. # [The Lagos Standard], 1908-07-01, p 5 -# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523 +# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92,3590,3944,2523 # says "Scarcely have the people become accustomed to this new time, when # another official notice has now appeared announcing that from and after the # 1st July next, return will be made to local mean time." @@ -1210,7 +1225,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27 # "On January 1st [1914], a universal standard time for Nigeria was adopted, # viz., half an hour fast on Greenwich mean time, corresponding to the meridian -# 7 [degrees] 30' E. long." +# 7° 30' E. long." # Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos # was the local mean time. On 1st January, 1914, standard time for the whole of # Nigeria was introduced ... Lagos time has been advanced about 16 minutes @@ -1228,7 +1243,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first # reading of this Bill by the Legislative Council of the Colony of Nigeria on # Thursday 1919-08-28: -# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915 +# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261,3408,2994,1915 # "The proposal is that the Globe should be divided into twelve zones East and # West of Greenwich, of one hour each, Nigeria falling into the zone with a # standard of one hour fast on Greenwich Mean Time. Nigeria standard time is diff --git a/contrib/tzdata/antarctica b/contrib/tzdata/antarctica index f02755ae856f..fc603e9996de 100644 --- a/contrib/tzdata/antarctica +++ b/contrib/tzdata/antarctica @@ -292,7 +292,7 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1 # but that he found it more convenient to keep GMT+12 # as supplies for the station were coming from McMurdo Sound, # which was on GMT+12 because New Zealand was on GMT+12 all year -# at that time (1957). (Source: Siple's book 90 Degrees South.) +# at that time (1957). (Source: Siple's book 90° South.) # # From Susan Smith # http://www.cybertours.com/whs/pole10.html diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index 199e6ad6adc3..25592db89e83 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2954,7 +2954,7 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 # 9pm and moving clocks forward by one hour for the next three months. ...." # # http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html -# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4 +# http://www.dailytimes.com.pk/default.asp?page=2008\05\15\story_15-5-2008_pg1_4 # From Arthur David Olson (2008-05-19): # XXX--midnight transitions is a guess; 2008 only is a guess. @@ -3277,7 +3277,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # Some of many sources in Arabic: # http://www.samanews.com/index.php?act=Show&id=122638 # -# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html +# http://safa.ps/details/news/74352/بدء-التوقيت-الصيفي-بالضفة-وغزة-ليلة-الجمعة.html # # Our brief summary: # https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html @@ -3287,7 +3287,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # time from midnight on Friday, March 29, 2013" (translated). # [These are in Arabic and are for Gaza and for Ramallah, respectively.] # http://www.samanews.com/index.php?act=Show&id=154120 -# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html +# http://safa.ps/details/news/99844/رام-الله-بدء-التوقيت-الصيفي-29-الجاري.html # From Steffen Thorsen (2013-09-24): # The Gaza and West Bank are ending DST Thursday at midnight @@ -3385,9 +3385,41 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # (2022-08-31): ... the Saturday before the last Sunday in March and October # at 2:00 AM ,for the years from 2023 to 2026. # (2022-09-05): https://mtit.pna.ps/Site/New/1453 -# -# From Paul Eggert (2022-08-31): -# For now, assume that this rule will also be used after 2026. + +# From Heba Hamad (2023-03-22): +# ... summer time will begin in Palestine from Saturday 04-29-2023, +# 02:00 AM by 60 minutes forward. +# +# From Paul Eggert (2023-03-22): +# For now, guess that spring and fall transitions will normally +# continue to use 2022's rules, that during DST Palestine will switch +# to standard time at 02:00 the last Saturday before Ramadan and back +# to DST at 02:00 the first Saturday after Ramadan, and that +# if the normal spring-forward or fall-back transition occurs during +# Ramadan the former is delayed and the latter advanced. +# To implement this, I predicted Ramadan-oriented transition dates for +# 2023 through 2086 by running the following program under GNU Emacs 28.2, +# with the results integrated by hand into the table below. +# Predictions after 2086 are approximated without Ramadan. +# +# (let ((islamic-year 1444)) +# (require 'cal-islam) +# (while (< islamic-year 1510) +# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (saturday 6)) +# (while (/= saturday (mod (setq a (1- a)) 7))) +# (while (/= saturday (mod b 7)) +# (setq b (1+ b))) +# (setq a (calendar-gregorian-from-absolute a)) +# (setq b (calendar-gregorian-from-absolute b)) +# (insert +# (format +# (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n" +# "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n") +# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) +# (setq islamic-year (+ 1 islamic-year)))) # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -3427,8 +3459,86 @@ Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S Rule Palestine 2020 only - Oct 24 1:00 0 - Rule Palestine 2021 only - Oct 29 1:00 0 - Rule Palestine 2022 only - Mar 27 0:00 1:00 S -Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - -Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - +Rule Palestine 2023 only - Apr 29 2:00 1:00 S +Rule Palestine 2024 only - Apr 13 2:00 1:00 S +Rule Palestine 2025 only - Apr 5 2:00 1:00 S +Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2036 only - Oct 18 2:00 0 - +Rule Palestine 2037 only - Oct 10 2:00 0 - +Rule Palestine 2038 only - Sep 25 2:00 0 - +Rule Palestine 2039 only - Sep 17 2:00 0 - +Rule Palestine 2039 only - Oct 22 2:00 1:00 S +Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - +Rule Palestine 2040 only - Sep 1 2:00 0 - +Rule Palestine 2040 only - Oct 13 2:00 1:00 S +Rule Palestine 2041 only - Aug 24 2:00 0 - +Rule Palestine 2041 only - Sep 28 2:00 1:00 S +Rule Palestine 2042 only - Aug 16 2:00 0 - +Rule Palestine 2042 only - Sep 20 2:00 1:00 S +Rule Palestine 2043 only - Aug 1 2:00 0 - +Rule Palestine 2043 only - Sep 12 2:00 1:00 S +Rule Palestine 2044 only - Jul 23 2:00 0 - +Rule Palestine 2044 only - Aug 27 2:00 1:00 S +Rule Palestine 2045 only - Jul 15 2:00 0 - +Rule Palestine 2045 only - Aug 19 2:00 1:00 S +Rule Palestine 2046 only - Jun 30 2:00 0 - +Rule Palestine 2046 only - Aug 11 2:00 1:00 S +Rule Palestine 2047 only - Jun 22 2:00 0 - +Rule Palestine 2047 only - Jul 27 2:00 1:00 S +Rule Palestine 2048 only - Jun 6 2:00 0 - +Rule Palestine 2048 only - Jul 18 2:00 1:00 S +Rule Palestine 2049 only - May 29 2:00 0 - +Rule Palestine 2049 only - Jul 3 2:00 1:00 S +Rule Palestine 2050 only - May 21 2:00 0 - +Rule Palestine 2050 only - Jun 25 2:00 1:00 S +Rule Palestine 2051 only - May 6 2:00 0 - +Rule Palestine 2051 only - Jun 17 2:00 1:00 S +Rule Palestine 2052 only - Apr 27 2:00 0 - +Rule Palestine 2052 only - Jun 1 2:00 1:00 S +Rule Palestine 2053 only - Apr 12 2:00 0 - +Rule Palestine 2053 only - May 24 2:00 1:00 S +Rule Palestine 2054 only - Apr 4 2:00 0 - +Rule Palestine 2054 only - May 16 2:00 1:00 S +Rule Palestine 2055 only - May 1 2:00 1:00 S +Rule Palestine 2056 only - Apr 22 2:00 1:00 S +Rule Palestine 2057 only - Apr 7 2:00 1:00 S +Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2068 only - Oct 20 2:00 0 - +Rule Palestine 2069 only - Oct 12 2:00 0 - +Rule Palestine 2070 only - Oct 4 2:00 0 - +Rule Palestine 2071 only - Sep 19 2:00 0 - +Rule Palestine 2072 only - Sep 10 2:00 0 - +Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2073 only - Sep 2 2:00 0 - +Rule Palestine 2073 only - Oct 7 2:00 1:00 S +Rule Palestine 2074 only - Aug 18 2:00 0 - +Rule Palestine 2074 only - Sep 29 2:00 1:00 S +Rule Palestine 2075 only - Aug 10 2:00 0 - +Rule Palestine 2075 only - Sep 14 2:00 1:00 S +Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - +Rule Palestine 2076 only - Jul 25 2:00 0 - +Rule Palestine 2076 only - Sep 5 2:00 1:00 S +Rule Palestine 2077 only - Jul 17 2:00 0 - +Rule Palestine 2077 only - Aug 28 2:00 1:00 S +Rule Palestine 2078 only - Jul 9 2:00 0 - +Rule Palestine 2078 only - Aug 13 2:00 1:00 S +Rule Palestine 2079 only - Jun 24 2:00 0 - +Rule Palestine 2079 only - Aug 5 2:00 1:00 S +Rule Palestine 2080 only - Jun 15 2:00 0 - +Rule Palestine 2080 only - Jul 20 2:00 1:00 S +Rule Palestine 2081 only - Jun 7 2:00 0 - +Rule Palestine 2081 only - Jul 12 2:00 1:00 S +Rule Palestine 2082 only - May 23 2:00 0 - +Rule Palestine 2082 only - Jul 4 2:00 1:00 S +Rule Palestine 2083 only - May 15 2:00 0 - +Rule Palestine 2083 only - Jun 19 2:00 1:00 S +Rule Palestine 2084 only - Apr 29 2:00 0 - +Rule Palestine 2084 only - Jun 10 2:00 1:00 S +Rule Palestine 2085 only - Apr 21 2:00 0 - +Rule Palestine 2085 only - Jun 2 2:00 1:00 S +Rule Palestine 2086 only - Apr 13 2:00 0 - +Rule Palestine 2086 only - May 18 2:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -3632,7 +3742,7 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1 # standard time is SLST. # # From Paul Eggert (2016-10-18): -# "SLST" seems to be reasonably recent and rarely-used outside time +# "SLST" seems to be reasonably recent and rarely used outside time # zone nerd sources. I searched Google News and found three uses of # it in the International Business Times of India in February and # March of this year when discussing cricket match times, but nothing diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia index af0410ab9035..0633a30efd8b 100644 --- a/contrib/tzdata/australasia +++ b/contrib/tzdata/australasia @@ -323,7 +323,7 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov # From Steffen Thorsen (2013-01-10): # Fiji will end DST on 2014-01-19 02:00: -# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-(1).aspx # From Ken Rylander (2014-10-20): # DST will start Nov. 2 this year. @@ -723,7 +723,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5 # # Samoa's Daylight Saving Time Act 2009 is available here, but does not # contain any dates: -# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf +# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20(English)%20-%20Final%207-7-091.pdf # From Laupue Raymond Hughes (2010-10-07): # Please see @@ -1808,7 +1808,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # period. It would probably be reasonable to assume Guam use GMT+9 during # that period of time like the surrounding area. -# From Paul Eggert (2018-11-18): +# From Paul Eggert (2023-01-23): # Howse writes (p 153) "The Spaniards, on the other hand, reached the # Philippines and the Ladrones from America," and implies that the Ladrones # (now called the Marianas) kept American date for quite some time. @@ -1821,7 +1821,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # they did as that avoids the need for a separate zone due to our 1970 cutoff. # # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time, -# under the name "Chamorro Standard Time". There is no official abbreviation, +# under the name "Chamorro standard time". There is no official abbreviation, # but Congressman Robert A. Underwood, author of the bill that became law, # wrote in a press release (2000-12-27) that he will seek the use of "ChST". @@ -2199,24 +2199,18 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # an international standard, there are some places on the high seas where the # correct date is ambiguous. -# From Wikipedia (2005-08-31): -# Before 1920, all ships kept local apparent time on the high seas by setting -# their clocks at night or at the morning sight so that, given the ship's -# speed and direction, it would be 12 o'clock when the Sun crossed the ship's -# meridian (12 o'clock = local apparent noon). During 1917, at the -# Anglo-French Conference on Time-keeping at Sea, it was recommended that all -# ships, both military and civilian, should adopt hourly standard time zones -# on the high seas. Whenever a ship was within the territorial waters of any -# nation it would use that nation's standard time. The captain was permitted -# to change his ship's clocks at a time of his choice following his ship's -# entry into another zone time - he often chose midnight. These zones were -# adopted by all major fleets between 1920 and 1925 but not by many -# independent merchant ships until World War II. - -# From Paul Eggert, using references suggested by Oscar van Vlijmen -# (2005-03-20): -# -# The American Practical Navigator (2002) -# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187 -# talks only about the 180-degree meridian with respect to ships in -# international waters; it ignores the international date line. +# From Wikipedia (2023-01-23): +# The nautical time zone system is analogous to the terrestrial time zone +# system for use on high seas. Under the system time changes are required for +# changes of longitude in one-hour steps. The one-hour step corresponds to a +# time zone width of 15° longitude. The 15° gore that is offset from GMT or +# UT1 (not UTC) by twelve hours is bisected by the nautical date line into two +# 7°30' gores that differ from GMT by ±12 hours. A nautical date line is +# implied but not explicitly drawn on time zone maps. It follows the 180th +# meridian except where it is interrupted by territorial waters adjacent to +# land, forming gaps: it is a pole-to-pole dashed line. + +# From Paul Eggert (2023-01-23): +# The American Practical Navigator , +# 2019 edition, merely says that the International Date Line +# "coincides with the 180th meridian over most of its length." diff --git a/contrib/tzdata/backward b/contrib/tzdata/backward index 0ae5d74108e6..421f2ec6b9f8 100644 --- a/contrib/tzdata/backward +++ b/contrib/tzdata/backward @@ -274,6 +274,7 @@ Link America/Argentina/Cordoba America/Rosario Link America/Tijuana America/Santa_Isabel Link America/Denver America/Shiprock Link America/Toronto America/Thunder_Bay +Link America/Edmonton America/Yellowknife Link Pacific/Auckland Antarctica/South_Pole Link Asia/Shanghai Asia/Chongqing Link Asia/Shanghai Asia/Harbin diff --git a/contrib/tzdata/backzone b/contrib/tzdata/backzone index 7803c57d095d..44d81c29e5ae 100644 --- a/contrib/tzdata/backzone +++ b/contrib/tzdata/backzone @@ -169,7 +169,7 @@ Zone Africa/Accra -0:00:52 - LMT 1915 Nov 2 # 12-hour clock starting at our 06:00, so their "8 o'clock" is our # 02:00 or 14:00. Keep this in mind when you ask the time in Amharic. # -# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time +# Shanks & Pottenger write that Ethiopia had six narrowly spaced time # zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in # 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50 # was for Adis Dera. Quite likely the Shanks data entries are wrong @@ -499,7 +499,7 @@ Zone America/Aruba -4:40:24 - LMT 1912 Feb 12 # Oranjestad # ever since standard time was introduced, but the information from # McKinnon sounds more authoritative. For now, assume that Atikokan # switched to EST immediately after WWII era daylight saving time -# ended. This matches the old (less-populous) America/Coral_Harbour +# ended. This matches the old (less populous) America/Coral_Harbour # entry since our cutoff date of 1970, so we can move # America/Coral_Harbour to the 'backward' file. @@ -928,6 +928,11 @@ Zone America/Thunder_Bay -5:57:00 - LMT 1895 Zone America/Tortola -4:18:28 - LMT 1911 Jul # Road Town -4:00 - AST +# Yellowknife, Northwest Territories +Zone America/Yellowknife 0 - -00 1935 # Yellowknife founded? + -7:00 NT_YK M%sT 1980 + -7:00 Canada M%sT + # Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11 # (2005-12-05) # @@ -1756,7 +1761,7 @@ Link Pacific/Chuuk Pacific/Yap *** 919 LINES SKIPPED *** From nobody Fri Mar 24 03:16:06 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjS5y4qTPz40yD9; Fri, 24 Mar 2023 03:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjS5y4PKBz3sqx; Fri, 24 Mar 2023 03:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679627766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aOMczB0Cp8jcoQ9A873oXibyrqijZ/orq+9g2yCPjaA=; b=ZVUNvQAoGGQ9rTcfWdTbECAi+FoY9CY2zhR8WRfZ+Om0DKyAw63UEcA+WKDRobI8mo8lyc 4G2DImHfvmBNrs1V4675eGEGxkDTjPZpBvD4sPGpFdCy2Hso6oRRfy9PbV7DFA/RZaVuGC c7+rzHWiQhIU5LuOEnYUky7YZnArcSKQbpsEE3yLu4tGffs43MKyX9c9r1IitD+Ch9kWvG 43LzmvHU5wbCn6UhuPPM5g5t9TvnuU7iLaiNU8xy1oWPOkbLhOps1GSgok+SeJDFykpDzB tVHyIAQcOEzesZ3+4JtL9HBCKwrFfPKE6rchy/dIPR4v2xPO2qHs2IYld/hHpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679627766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aOMczB0Cp8jcoQ9A873oXibyrqijZ/orq+9g2yCPjaA=; b=cP7YmSPKY33lYJrIod04whbZr5O1XSMKpcKZfP2iwEJjo1kGvl/PMQ7q9xeLZxtIVM0oc/ q7Psj+6KEql9xv21G9puF8FGcAd5ZI7FkLOpJqN8GWDAE8k+VkDHBZo0kUAMoLOwwOmVNq 3OUga9lLdhJLxdOMq2cVhw2wrX61TlIU8TbsxMDMDz5kGWmKCvooGEdui4yikzENnwqY5h GKFVpxX8eygoYwP4bX6opeMnJ1QrKC4DhADlfEuJLkjV0dhfVzNjLoBlbvWEJkSbMoweAI sFfqq6C1YrRMP+69hld1btNMXuUlWGpuNKJ1C+sEsy8Bf6PTQh4pCRiLmDqsTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679627766; a=rsa-sha256; cv=none; b=RSnVdabq5hyuNy4NTC//KivyhfELZ4eB835oBlyviFxFSQoozRGW+YJyrFKX8/DwICMqkM Puo19eNtpd+8TdvNPsm3LeDE99ghVtCvWMAeQp7IkYW0utF/NltRdr7TPDUjY0hnOfJA5c 1zgTWNZVuLHLNME98bDpAijGsVXxVgG9UxOpQtb34Cfam5hZK4QVs9mrOEnhbswilSM0Mm wANPCcrebTjdYag/4CudumvghvopMOWDGdv0VANfldZvdBW4LLpFeipk9jbJhlikGPxQcb rkvc6OiJY4aX8vQpMNclhyZ2cjJ+m2Kd1Xl+v2PZdCYgn4ovFiqcxtVA0OaZXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjS5y3TGYz11yK; Fri, 24 Mar 2023 03:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32O3G6nO044451; Fri, 24 Mar 2023 03:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O3G6n0044450; Fri, 24 Mar 2023 03:16:06 GMT (envelope-from git) Date: Fri, 24 Mar 2023 03:16:06 GMT Message-Id: <202303240316.32O3G6n0044450@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: 70421fd527e3 - stable/13 - mbuf: Fix an offset calculation in m_apply_extpg_one() 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/13 X-Git-Reftype: branch X-Git-Commit: 70421fd527e315bbc4850db2d7e80fc008393bce Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=70421fd527e315bbc4850db2d7e80fc008393bce commit 70421fd527e315bbc4850db2d7e80fc008393bce Author: Mark Johnston AuthorDate: 2021-11-10 21:57:12 +0000 Commit: Mark Johnston CommitDate: 2023-03-24 03:15:45 +0000 mbuf: Fix an offset calculation in m_apply_extpg_one() We were not including the requested starting offset in the page offset. Reviewed by: jhb Fixes: 3c7a01d773ac ("Extend m_apply() to support unmapped mbufs.") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32922 (cherry picked from commit ac2b54441742b3148de72e3b29aa0f00d29bb825) --- sys/kern/uipc_mbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 13c98d0895fa..abe292013d28 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1293,7 +1293,7 @@ m_apply_extpg_one(struct mbuf *m, int off, int len, pglen = m_epg_pagelen(m, i, pgoff); if (off < pglen) { count = min(pglen - off, len); - p = (void *)PHYS_TO_DMAP(m->m_epg_pa[i] + pgoff); + p = (void *)PHYS_TO_DMAP(m->m_epg_pa[i] + pgoff + off); rval = f(arg, p, count); if (rval) return (rval); From nobody Fri Mar 24 06:40:14 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjXdV5B8Kz418nP; Fri, 24 Mar 2023 06:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjXdV4YlLz4Brh; Fri, 24 Mar 2023 06:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679640014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGezSdg3Ntmew6q3uZ99fkP0k+bI/w0cflp/XMtB+ew=; b=MS5+RJ9Alapyzq7z5Gl8nhiTjV9MkYY9YSFOP9V6k1Oh9LWpymYosi63c5Tq6sMFyTlPyW y7FKMPQKZLaj5sk//6IGI6vunRSqf+GkBTbYRj/0obwh78dxdeGdUviKYxoRTrnmDR9BqU xyuQDDC8kRsOilyedUVYXsLHXmKPcqrzgiJGvjgj2mVZ4vr1eg4zMdbcTMABVkTaYlH5Aw gHafiQF2J4OAEHNvILMXdiXlTXUjLjlVRz97zVRDIQkD09l7ISr4ZjTVXR01sd2FgTILca CCA+b90c2BzQNdwhM9g+w96oi3wwPMizM562G25JZyHMqS88V8eXMFDq11nXpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679640014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qGezSdg3Ntmew6q3uZ99fkP0k+bI/w0cflp/XMtB+ew=; b=IPFpqllE3QUPLdxPgeSZDzjwfqJccD0sa7CcnHnXNUUh57Jsl/jbvy7LrjSDAht2dxWmid CqzxCwA6M53UrgTRgdDLTeDFrhCS9TxUp7JfV8suWQGDHiPxVO82kvpcWLkCySN+sndpHi Nq2Tuu7mUKHKVBwqOYFzFkNcbyPMbgTQAdumiD/mEGzjWlI51MuTG6ZP+K1D1Assa1AYX2 BdqBM3pNlejCxiMAelimIXDHo7zKOVsJMdrs5xY0+Aka2jqNVP+FsBBjxiV+aQbUk91PJm zMcGPn9oKkWRa0rXI4I12bt+XvEncOek+uYJOyU8j9XiX5mtWJlXlcMEbkp5Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679640014; a=rsa-sha256; cv=none; b=WMsQ4TUmSVkurukv7YwOStGkDsnoy1lyfxo3f2xAgWCJyxC38hdPKUu7ByrE9/4/CEPtMY mInhCPpDvk2wdI90J7yTjVRhgIZvNsh83NJZl80N4si5Nzi3AhfRHj6aE9Uizp9rWDFmLp mDW+wCt5/RP8SzHA/v81NcIOwR3S/KQM9EcP1drvwNm8sUMUcw/klwEjpMhub8izHxK3Wm JZ+I8WyFwBTKqSvjJUqwofKb1fJJl+mvPk9Yco5Rs8tCFCSt8vBRtO59uydVa+Wb95A9aL VPjrtmhjYz2jAAf2nLkSRD/RsrZmEUg37S59Fv++aLqBDCOJJfV14/kK8DsBLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjXdV3WV1z17PS; Fri, 24 Mar 2023 06:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32O6eEW1080438; Fri, 24 Mar 2023 06:40:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O6eEcB080429; Fri, 24 Mar 2023 06:40:14 GMT (envelope-from git) Date: Fri, 24 Mar 2023 06:40:14 GMT Message-Id: <202303240640.32O6eEcB080429@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: a836dce6d085 - stable/13 - cap_*(2): Document ENOSYS behavior. 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: a836dce6d08507cc556816a68697db36249ada66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=a836dce6d08507cc556816a68697db36249ada66 commit a836dce6d08507cc556816a68697db36249ada66 Author: Xin LI AuthorDate: 2023-03-10 02:10:50 +0000 Commit: Xin LI CommitDate: 2023-03-24 06:39:58 +0000 cap_*(2): Document ENOSYS behavior. Summary: All cap_* system calls would fail when capability mode support is not present. Reviewed by: emaste, pauamma Differential Revision: https://reviews.freebsd.org/D38976 (cherry picked from commit 75798f9b01055261881938326a5c77e55f79c7f7) --- lib/libc/sys/cap_enter.2 | 7 +++---- lib/libc/sys/cap_fcntls_limit.2 | 5 ++++- lib/libc/sys/cap_ioctls_limit.2 | 29 ++++++++++++++--------------- lib/libc/sys/cap_rights_limit.2 | 5 ++++- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lib/libc/sys/cap_enter.2 b/lib/libc/sys/cap_enter.2 index 428e0b0bcd09..56fc78a4b4f2 100644 --- a/lib/libc/sys/cap_enter.2 +++ b/lib/libc/sys/cap_enter.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_ENTER 2 .Os .Sh NAME @@ -113,9 +113,8 @@ system calls will fail if: .Bl -tag -width Er .It Bq Er ENOSYS -The kernel is compiled without: -.Pp -.Cd "options CAPABILITY_MODE" +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .El .Pp The diff --git a/lib/libc/sys/cap_fcntls_limit.2 b/lib/libc/sys/cap_fcntls_limit.2 index b09aebbe78f0..b7b38ba2ab51 100644 --- a/lib/libc/sys/cap_fcntls_limit.2 +++ b/lib/libc/sys/cap_fcntls_limit.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_FCNTLS_LIMIT 2 .Os .Sh NAME @@ -111,6 +111,9 @@ argument is not a valid descriptor. The .Fa fcntlrightsp argument points at an invalid address. +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .El .Sh SEE ALSO .Xr cap_ioctls_limit 2 , diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libc/sys/cap_ioctls_limit.2 index 0cf5ea8ca038..6696434e0bac 100644 --- a/lib/libc/sys/cap_ioctls_limit.2 +++ b/lib/libc/sys/cap_ioctls_limit.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_IOCTLS_LIMIT 2 .Os .Sh NAME @@ -110,8 +110,11 @@ On failure the value .Va -1 is returned and the global variable errno is set to indicate the error. .Sh ERRORS +The .Fn cap_ioctls_limit -succeeds unless: +and +.Fn cap_ioctls_get +system calls will fail if: .Bl -tag -width Er .It Bq Er EBADF The @@ -121,6 +124,15 @@ argument is not a valid descriptor. The .Fa cmds argument points at an invalid address. +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . +.El +.Pp +The +.Fn cap_ioctls_limit +system call may also return the following errors: +.Bl -tag -width Er .It Bq Er EINVAL The .Fa ncmds @@ -132,19 +144,6 @@ would expand the list of allowed .Xr ioctl 2 commands. .El -.Pp -.Fn cap_ioctls_get -succeeds unless: -.Bl -tag -width Er -.It Bq Er EBADF -The -.Fa fd -argument is not a valid descriptor. -.It Bq Er EFAULT -The -.Fa cmds -argument points at invalid address. -.El .Sh SEE ALSO .Xr cap_fcntls_limit 2 , .Xr cap_rights_limit 2 , diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libc/sys/cap_rights_limit.2 index 37f311143a28..f08d5520b66e 100644 --- a/lib/libc/sys/cap_rights_limit.2 +++ b/lib/libc/sys/cap_rights_limit.2 @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_RIGHTS_LIMIT 2 .Os .Sh NAME @@ -120,6 +120,9 @@ argument is not a valid active descriptor. .It Bq Er EINVAL An invalid right has been requested in .Fa rights . +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .It Bq Er ENOTCAPABLE The .Fa rights From nobody Fri Mar 24 06:40:43 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjXf40QhTz419Lx; Fri, 24 Mar 2023 06:40:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjXf375kBz4CqC; Fri, 24 Mar 2023 06: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=1679640044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwJIkobwvYPj03R2VjxUUvKItS4ei5L7QfSj2MN+/XY=; b=DqvyGkaOkyw/2tdfU3ZGjWA0hb9arQFsz9eGh2Fq/C3S4N7/Ch2WNm1G7q2VAn6/tInqcw kfp3ke0akj87l1zHyUnJmM8VnX1YwIrBeZhqIVkQPvwABw73kssvrgmT89zUKmr6WWsvT8 +pb4quntL4PjEnYEZMupMzQY5lBExOfVAOpVoJtGyZNFQGC6KkLgQGXbWzzmNsOheoDcZK zH2fOh9zVn6+Xs2ENDdnxnJGml6pHK6FcQ8hVFoiFaO5FxI1zZQ4uq8ftba9uF42xZ9pz4 LwEME1j53e2QZRCAxZKclRPqzcgjt943m1HwkZa84Z8YI7Gojtgsr3y7Fv0MsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679640044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PwJIkobwvYPj03R2VjxUUvKItS4ei5L7QfSj2MN+/XY=; b=BJMXVTiqmYqcxa9KZfXDfhAlBBl50mF/G3nNvxTHalQ4A6I0kj/3OkRmFKNSJ/jZ+n9bAG N/5kONC+biNpr6hB82oUPqNDtVTfFu0cfXWl+l4PwXU+/milQJ9YD2PmNb4Im7K9ueAKjl KicSubLJGjp7PYRXabFLo8ZyjqjBJ4L8bRE7gBu4jVUU07ZC0DDVoPeLzE1pqqUuFb8R6b Eqj1WSWk1/3DULw5E5+xIj+8wfljkuthGLFPWLtXKAp/qWrUptl/aUb41Fzu3oxy1sfpFT 4x37FXNvXC393/FNXoTM4c/27zvwPNi1lckPzeJ08NHuYTzlE51bfKAxV9jxvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679640044; a=rsa-sha256; cv=none; b=ZdrmjSV4lnliGWnInumVhIjyci4sFvNXeWjQNIjX9axbRc06duF0MeEx7RzXDOlrPVD3M+ dCEgvLGtD9Mwfq2Pd+mLIELsLw2cQVtIoJSx7U0v3gOCmpKIDvbgP9tk01EJUhtuixQc9D QXMYgr2qX2BUIKg4ObVYNcarzUxcWYeVixDjTHkBySS1ASO3RRvvl+3NJDBCMiKAvGeU+y Xa8NEJUnEu05+h9DSjj0NtI+DnLxQN0aRFpfd3+dXY3cHye74G+7lpF2vBy4FdfRhtv+r0 fVTjAqoQaEpwTsch407ZCwGsvLGKIFRMrIu7wysgpVyj9DkW3OeOQDekC9UO3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjXf364Jnz16kx; Fri, 24 Mar 2023 06:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32O6ehQZ083074; Fri, 24 Mar 2023 06:40:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32O6ehgN083073; Fri, 24 Mar 2023 06:40:43 GMT (envelope-from git) Date: Fri, 24 Mar 2023 06:40:43 GMT Message-Id: <202303240640.32O6ehgN083073@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: e68521de19d4 - stable/12 - cap_*(2): Document ENOSYS behavior. 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/12 X-Git-Reftype: branch X-Git-Commit: e68521de19d4661b9ed8a6432039eaf882cfb4c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=e68521de19d4661b9ed8a6432039eaf882cfb4c2 commit e68521de19d4661b9ed8a6432039eaf882cfb4c2 Author: Xin LI AuthorDate: 2023-03-10 02:10:50 +0000 Commit: Xin LI CommitDate: 2023-03-24 06:40:31 +0000 cap_*(2): Document ENOSYS behavior. Summary: All cap_* system calls would fail when capability mode support is not present. Reviewed by: emaste, pauamma Differential Revision: https://reviews.freebsd.org/D38976 (cherry picked from commit 75798f9b01055261881938326a5c77e55f79c7f7) --- lib/libc/sys/cap_enter.2 | 7 +++---- lib/libc/sys/cap_fcntls_limit.2 | 5 ++++- lib/libc/sys/cap_ioctls_limit.2 | 29 ++++++++++++++--------------- lib/libc/sys/cap_rights_limit.2 | 5 ++++- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lib/libc/sys/cap_enter.2 b/lib/libc/sys/cap_enter.2 index 428e0b0bcd09..56fc78a4b4f2 100644 --- a/lib/libc/sys/cap_enter.2 +++ b/lib/libc/sys/cap_enter.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_ENTER 2 .Os .Sh NAME @@ -113,9 +113,8 @@ system calls will fail if: .Bl -tag -width Er .It Bq Er ENOSYS -The kernel is compiled without: -.Pp -.Cd "options CAPABILITY_MODE" +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .El .Pp The diff --git a/lib/libc/sys/cap_fcntls_limit.2 b/lib/libc/sys/cap_fcntls_limit.2 index b09aebbe78f0..b7b38ba2ab51 100644 --- a/lib/libc/sys/cap_fcntls_limit.2 +++ b/lib/libc/sys/cap_fcntls_limit.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_FCNTLS_LIMIT 2 .Os .Sh NAME @@ -111,6 +111,9 @@ argument is not a valid descriptor. The .Fa fcntlrightsp argument points at an invalid address. +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .El .Sh SEE ALSO .Xr cap_ioctls_limit 2 , diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libc/sys/cap_ioctls_limit.2 index 0cf5ea8ca038..6696434e0bac 100644 --- a/lib/libc/sys/cap_ioctls_limit.2 +++ b/lib/libc/sys/cap_ioctls_limit.2 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_IOCTLS_LIMIT 2 .Os .Sh NAME @@ -110,8 +110,11 @@ On failure the value .Va -1 is returned and the global variable errno is set to indicate the error. .Sh ERRORS +The .Fn cap_ioctls_limit -succeeds unless: +and +.Fn cap_ioctls_get +system calls will fail if: .Bl -tag -width Er .It Bq Er EBADF The @@ -121,6 +124,15 @@ argument is not a valid descriptor. The .Fa cmds argument points at an invalid address. +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . +.El +.Pp +The +.Fn cap_ioctls_limit +system call may also return the following errors: +.Bl -tag -width Er .It Bq Er EINVAL The .Fa ncmds @@ -132,19 +144,6 @@ would expand the list of allowed .Xr ioctl 2 commands. .El -.Pp -.Fn cap_ioctls_get -succeeds unless: -.Bl -tag -width Er -.It Bq Er EBADF -The -.Fa fd -argument is not a valid descriptor. -.It Bq Er EFAULT -The -.Fa cmds -argument points at invalid address. -.El .Sh SEE ALSO .Xr cap_fcntls_limit 2 , .Xr cap_rights_limit 2 , diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libc/sys/cap_rights_limit.2 index 37f311143a28..f08d5520b66e 100644 --- a/lib/libc/sys/cap_rights_limit.2 +++ b/lib/libc/sys/cap_rights_limit.2 @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 5, 2020 +.Dd March 9, 2023 .Dt CAP_RIGHTS_LIMIT 2 .Os .Sh NAME @@ -120,6 +120,9 @@ argument is not a valid active descriptor. .It Bq Er EINVAL An invalid right has been requested in .Fa rights . +.It Bq Er ENOSYS +The running kernel was compiled without +.Cd "options CAPABILITY_MODE" . .It Bq Er ENOTCAPABLE The .Fa rights From nobody Fri Mar 24 13:13:55 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjjMm1R1qz41Ydt; Fri, 24 Mar 2023 13:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjjMl697Yz43Jw; Fri, 24 Mar 2023 13:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOQPIQ1Zp/HXYL/fihLWURk7mBEdMCUJq/TtHDbmFN0=; b=f5kpUpbSK8foNaaKjAJ12B9hVo8jtEx36duQu29fadamtovpbSXLYx6QdscbhL+CKdIyYF LCpbyMlGyjSWpG+u0GSigicicei1uXtELZDhaujk63tcIbsWiaK6TepmswxZSo4lqyD9dC YSGXP12DstCRf9Gahz2DXMIGHJaOo9pPRWVaidYXKslMwMBYopDVFubmyX91qVG6bikv4k lSsFTk0+psNY9kQWw3H63zJw7ZlEyUiL3VjDwEVaw2FQ+KCmB5fL2EGB9nC6TaRI+7HcA2 2Xy5ZZNTEVfNpnXIfOpHlwJi0Rd63OWMbF97QVR0WfZOFlTxJoK5HHVQobnh2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jOQPIQ1Zp/HXYL/fihLWURk7mBEdMCUJq/TtHDbmFN0=; b=bG992EfifGffEt3952BvOJFmQCnVBIcrFqI0/WpN25Eh4wsRbrtFR51mWuq+CnpcYck+r9 HDjSkwrIqsOy/lJwU1YoQL/qzPVskxbRrZNHgVvRWgIa9WhKYxar8k3q3k12yh+EpK8hdJ nNtJGEIPPx+CkKoq60zeMRetb0+StEV4smtqdQpXFPzGl1yly1QP1lAHCc1a40Mndsj99U hyOz/4TGSe35xrJgGfH8OpfPK+WtEa1ZMh+2IRTwSJHgeEAizVMcBAflfjMLeKye7Yt4Jg KPYm+Yd6ZMO5PK/kg7juqkirHlM4fmFQdK5w1wez04SAJ5R6+kaEJrP9GCoqYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679663635; a=rsa-sha256; cv=none; b=OKt433w1so12E03a29RhmpLx+kba9h6TyBzPYwkuEZ+llnpozUvDdg4dhIewVlMHMM3NuQ j3gL+inT4pzLAPiQfoaGrSszSY7p02ic0smNOgACFyolaf5/wsY2XdskZhXpxGQKKMhdp+ iSs/DlBd/M9bY+zJJgoKeWl9HQbp7UeMA3PdMazsrbCvdGC2/2t9sT1M1Dx06tq9/N+pq3 OAxY9/T9n/7rw0uls8tP1vk6Mf7rhulvidwXp7Zs3NEKTeNDSGduNX5MNu3TXn1DOJyZag KSImJFZdAOgQ4z4Dot0nRp8I9Y9rhZWPnz5O5OGSDDNHK8B3G4Zw5qkM1q9fVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjjMl5DtgzJVh; Fri, 24 Mar 2023 13:13:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ODDtvv031156; Fri, 24 Mar 2023 13:13:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ODDtBE031155; Fri, 24 Mar 2023 13:13:55 GMT (envelope-from git) Date: Fri, 24 Mar 2023 13:13:55 GMT Message-Id: <202303241313.32ODDtBE031155@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 8f18fd168d04 - stable/13 - arm64: Remove unused typedef 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8f18fd168d04b2c0f18e5337a4a65e923a98c8a1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8f18fd168d04b2c0f18e5337a4a65e923a98c8a1 commit 8f18fd168d04b2c0f18e5337a4a65e923a98c8a1 Author: Warner Losh AuthorDate: 2022-08-24 12:27:01 +0000 Commit: Mitchell Horne CommitDate: 2023-03-24 13:12:39 +0000 arm64: Remove unused typedef We don't use EFI_MEMORY_DESCRIPTOR that's typedef'd here. We use the one from sys/efi.h instead. Remove the clutter here as these two are subtly different (though wind up with the same layout due to alignment rules). Sponsored by: Netflix (cherry picked from commit 211053f952d8ac91dab239f6c4845dd5badd0d95) --- sys/arm64/arm64/machdep.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 6178221032eb..768d02b510b2 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -420,14 +420,6 @@ arm64_get_writable_addr(vm_offset_t addr, vm_offset_t *out) return (false); } -typedef struct { - uint32_t type; - uint64_t phys_start; - uint64_t virt_start; - uint64_t num_pages; - uint64_t attr; -} EFI_MEMORY_DESCRIPTOR; - typedef void (*efi_map_entry_cb)(struct efi_md *); static void From nobody Fri Mar 24 13:13:56 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjjMn2KtJz41Z3r; Fri, 24 Mar 2023 13:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjjMn0DwJz434x; Fri, 24 Mar 2023 13:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkjNJ5mjAjla8hNfUrAZmgCMQn1ol72ers4R7nM/yZQ=; b=QTUCIn43xYe9vF8Rh91mZvXBx4wcYz8/2py1Z/t7RM2G3Y5+F2vwa2dkdF2T2pCbleas47 aeyN9rXQ8jpM9ZquFaiwYoGOzzYT6I38edueSmug14qXwGA+tjF7Wh9eIhrbqyZSNSn1TJ JedavpbTBDnyVV1H2DlUujFOtWZ0gqoZI8j3F+yg61JWfbbZgRXBoj2XSEloQuyIg+Cmfq T5JUsNNa1yX5ho2X4LMglYgrWW/0VH1fimAY++fFnuEf3+KkeCUev2qYUsHhYSpV02zsqs PTY091eshb37M6H5NzwDmwKdMeuMUzSjsK9d18n0Bz+ioadOfp8+UEXueJXFTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MkjNJ5mjAjla8hNfUrAZmgCMQn1ol72ers4R7nM/yZQ=; b=mTk1qv4ufqLBLXzx+lkdB+aOfAfn4y3vA5JNJxoVLDyhlnfel1WFjkqVSBK73MXjY2NuWM /rQsw8uI6VEPl5W53uhInnommyJYyMHUcWVgu30/nGO2lnqa68CZimgoRgJ+JpUFPqEl+0 4lUqhHSnh5jDzvp5voqCF/iQQ2dx1DwN4S+myrsBFhnO1hRIYOwXKVePQntqRhvCYHDELz D31SWSJtoxU7AMbxQjGT/iy2T2s+3giy+d8Hu7h9JwUcvoRU3TKo3unTwfJiFcl+gUwNew CY0GhgFgmi9/vyh/i61bB6+iFj7xs6ZrrLKtFSxi5JHov3XlrWEe8vPGQMWLPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679663637; a=rsa-sha256; cv=none; b=PI2pcAQH9Opm7pu4RxU2ANLFu6hy5CueZSZS4XVo/0o2uFXByLDtXgvdnR1emF5KNbWwM0 emBTEaaZO6/JUC91oUyJdI6qCWCluoUSEKddgDuq/M4s8wFDrLySHeV/LRRqQrwWSDgYVy Lk7rbB9vIWHQ5JAaagQOKguno72taaQiR/zfmLoTanc+espqgUno3eZMda3AYXd1cS8vOe 4rjX7GXeN/zalQG+cB4MqL/RpV5dRJjyVcFlhCCemDY5B0RAn0ILJvGuqmFqYK7dWoXZQn G/kdqRQ94Tk2IDDF4D6V+FPdckyienrHwD0dwdEPDAm5GG6Nf5YdeV4KbjH02Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjjMm68BszKCx; Fri, 24 Mar 2023 13:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ODDuGF031175; Fri, 24 Mar 2023 13:13:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ODDu8H031174; Fri, 24 Mar 2023 13:13:56 GMT (envelope-from git) Date: Fri, 24 Mar 2023 13:13:56 GMT Message-Id: <202303241313.32ODDu8H031174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9521266b82df - stable/13 - arm64/machdep: Add parameter to the EFI table walking code 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9521266b82dfaa82ca4ac56276a049aee5f01ad9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9521266b82dfaa82ca4ac56276a049aee5f01ad9 commit 9521266b82dfaa82ca4ac56276a049aee5f01ad9 Author: Warner Losh AuthorDate: 2022-11-30 23:28:01 +0000 Commit: Mitchell Horne CommitDate: 2023-03-24 13:12:40 +0000 arm64/machdep: Add parameter to the EFI table walking code It would be nice to be able to pass an arbitrary pointer to the callback code. Add one, and pass NULL in all the places that we do that today. As noted by andrew@, we should likely refactor this into MI code and use it here and amd64, but for the future. Sponsored by: Netflix Reviewed by: rpokala Differential Revision: https://reviews.freebsd.org/D37439 (cherry picked from commit 6849950da7d770fa6531b915922799c20e960d42) --- sys/arm64/arm64/machdep.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 768d02b510b2..283ca221d7f3 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -420,10 +420,10 @@ arm64_get_writable_addr(vm_offset_t addr, vm_offset_t *out) return (false); } -typedef void (*efi_map_entry_cb)(struct efi_md *); +typedef void (*efi_map_entry_cb)(struct efi_md *, void *argp); static void -foreach_efi_map_entry(struct efi_map_header *efihdr, efi_map_entry_cb cb) +foreach_efi_map_entry(struct efi_map_header *efihdr, efi_map_entry_cb cb, void *argp) { struct efi_md *map, *p; size_t efisz; @@ -442,12 +442,12 @@ foreach_efi_map_entry(struct efi_map_header *efihdr, efi_map_entry_cb cb) for (i = 0, p = map; i < ndesc; i++, p = efi_next_descriptor(p, efihdr->descriptor_size)) { - cb(p); + cb(p, argp); } } static void -exclude_efi_map_entry(struct efi_md *p) +exclude_efi_map_entry(struct efi_md *p, void *argp __unused) { switch (p->md_type) { @@ -470,11 +470,11 @@ static void exclude_efi_map_entries(struct efi_map_header *efihdr) { - foreach_efi_map_entry(efihdr, exclude_efi_map_entry); + foreach_efi_map_entry(efihdr, exclude_efi_map_entry, NULL); } static void -add_efi_map_entry(struct efi_md *p) +add_efi_map_entry(struct efi_md *p, void *argp __unused) { switch (p->md_type) { @@ -512,12 +512,11 @@ add_efi_map_entry(struct efi_md *p) static void add_efi_map_entries(struct efi_map_header *efihdr) { - - foreach_efi_map_entry(efihdr, add_efi_map_entry); + foreach_efi_map_entry(efihdr, add_efi_map_entry, NULL); } static void -print_efi_map_entry(struct efi_md *p) +print_efi_map_entry(struct efi_md *p, void *argp __unused) { const char *type; static const char *types[] = { @@ -577,7 +576,7 @@ print_efi_map_entries(struct efi_map_header *efihdr) printf("%23s %12s %12s %8s %4s\n", "Type", "Physical", "Virtual", "#Pages", "Attr"); - foreach_efi_map_entry(efihdr, print_efi_map_entry); + foreach_efi_map_entry(efihdr, print_efi_map_entry, NULL); } #ifdef FDT From nobody Fri Mar 24 13:13:57 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjjMp6fLVz41Yl4; Fri, 24 Mar 2023 13:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjjMp0vdfz43Gs; Fri, 24 Mar 2023 13:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bv2ubscWFQd1aGQxlWoEyfwEIBG7KqPoal9CsIKYujY=; b=AmiDLY9mEqoWlKKZ2NKCeW9n+gbEw1pl1nVRvA2EXFSsCVEjZuJtG4mXkaDY9GVnl7iNh2 5wbV9D7IE4buh2OVflDV73VtbDoGJuWkiHVz89wkjiuYEW7mdpNsZgGiGTo0SOTwjeksvA 5vLKUHpWQWubqDxKuZMN1PO6b+eIfyJTq7MsJSkxTPfIjGIoM8+4ccdlTRcO8Er2bOzXdA 1lr4IMuuw7GRC8EUpBRMY10Tkq3k3cSpA+jExCxokJBLVKgZ6MBnQe9SjHViVxXrhwVXuq rETGwsta4l9LHtUB4BhkfZPiyudvQWCxA87PqKZRqcrR6AAxVhyc6rhOTlQXyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bv2ubscWFQd1aGQxlWoEyfwEIBG7KqPoal9CsIKYujY=; b=CZY0tUtZZg5yCyyhiS23b5Cvntmuxn9XnPv9dbD7mXFL2Y7w7IuARqFx06HBGlDVcxWheu ntr+G88HcTmtgMVdqDswvzsyRQBvWPI5E5Z/HBLd2e8CWITGvk0O9E1pIUfBnsCVo6n4Ra z/5P6K2G9bghYPDKugZofMq1oik4o4cAQEIcqfzLPD0wTIV3oMvZVreHneS0fqSUWS7wH2 BrcsAftCwa4RSE6aHOMuja8ZfzMziPoP7FSPn04Nldbk0oiwZcIJYKVODiHtCDUNWJbqX/ 2EiRO+a0Jxm6zyp/WsMO2mM8G+RIcrf6MG2T3Sb84vFvDUHeUuZpk+ZTT2tteA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679663638; a=rsa-sha256; cv=none; b=eCnQpsKk9ByYYvWFoZ2F6E0+yjvVUb/JV6fl4/P6td3BxGVF4BEh1YGOJNygWTGc6lwQzT vQhHOHv4e/nUarIDxsaMXXFVZbs6B9XxPUB7V2Fylvhs3XFZrkIcNyBjZ3BzmS4xlIkHG0 CiM4IfsbfnR5KXn/5vLHR1nhf45MdZMFrvtlBbfQuNjIhFMKfRLf+0pddB+pt4jD9pNyvC xkgysAePZG1zBSxWb/c2t7wY2Lni4117yBf4TDZ3isQFS5wWIaCDux3TJZXzgKsWwecbv+ FJtAE5yfDS5DQgbMQ6v3Tiim8XEITEgDnL0sevPjAdhPZvcr5lmkefSDeQlIzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjjMn6tW2zKNG; Fri, 24 Mar 2023 13:13:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ODDv4Q031194; Fri, 24 Mar 2023 13:13:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ODDv7d031193; Fri, 24 Mar 2023 13:13:57 GMT (envelope-from git) Date: Fri, 24 Mar 2023 13:13:57 GMT Message-Id: <202303241313.32ODDv7d031193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 865b5640f8ef - stable/13 - arm64: limit EFI excluded regions to physical memory types List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 865b5640f8ef3c3a369f13b2c531737b7fb8fec4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=865b5640f8ef3c3a369f13b2c531737b7fb8fec4 commit 865b5640f8ef3c3a369f13b2c531737b7fb8fec4 Author: Mitchell Horne AuthorDate: 2023-03-15 15:26:57 +0000 Commit: Mitchell Horne CommitDate: 2023-03-24 13:12:40 +0000 arm64: limit EFI excluded regions to physical memory types Consolidate add_efi_map_entry() and exclude_efi_map_entry() into a single function, handle_efi_map_entry(), so that the exact set of entry types handled is the same in the addition or exclusion cases. Before, exclude_efi_map_entry() had a 'default' case that would exclude all entry types that were not listed explicitly in the switch statement. Logically, we do not need to exclude a range that could not possibly be added to physmem, and we do not need to exclude bus ranges that are not physical memory, for example EFI_MD_TYPE_IOMEM. Since physmem's ram0 device will reserve bus memory resources for its owned ranges, this was preventing attachment of the watchdog device on the RPI4B. For some reason its region of memory-mapped I/O appeared in the EFI memory map (with the aforementioned EFI_MD_TYPE_IOMEM type). This change fixes the attachment issue, as we prevent the physmem API from messing with this range of bus space. PR: 270044 Reported by: karels, Mark Millard Reviewed by: andrew, karels, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39003 (cherry picked from commit 8937bd37d07c5c75995e01457aec00fb0a05c462) --- sys/arm64/arm64/machdep.c | 71 ++++++++++++++++++++++++++--------------------- 1 file changed, 39 insertions(+), 32 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 283ca221d7f3..68fcf0257232 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -446,36 +446,25 @@ foreach_efi_map_entry(struct efi_map_header *efihdr, efi_map_entry_cb cb, void * } } +/* + * Handle the EFI memory map list. + * + * We will make two passes at this, the first (exclude == false) to populate + * physmem with valid physical memory ranges from recognized map entry types. + * In the second pass we will exclude memory ranges from physmem which must not + * be used for general allocations, either because they are used by runtime + * firmware or otherwise reserved. + * + * Adding the runtime-reserved memory ranges to physmem and excluding them + * later ensures that they are included in the DMAP, but excluded from + * phys_avail[]. + * + * Entry types not explicitly listed here are ignored and not mapped. + */ static void -exclude_efi_map_entry(struct efi_md *p, void *argp __unused) -{ - - switch (p->md_type) { - case EFI_MD_TYPE_CODE: - case EFI_MD_TYPE_DATA: - case EFI_MD_TYPE_BS_CODE: - case EFI_MD_TYPE_BS_DATA: - case EFI_MD_TYPE_FREE: - /* - * We're allowed to use any entry with these types. - */ - break; - default: - physmem_exclude_region(p->md_phys, p->md_pages * EFI_PAGE_SIZE, - EXFLAG_NOALLOC); - } -} - -static void -exclude_efi_map_entries(struct efi_map_header *efihdr) -{ - - foreach_efi_map_entry(efihdr, exclude_efi_map_entry, NULL); -} - -static void -add_efi_map_entry(struct efi_md *p, void *argp __unused) +handle_efi_map_entry(struct efi_md *p, void *argp) { + bool exclude = *(bool *)argp; switch (p->md_type) { case EFI_MD_TYPE_RECLAIM: @@ -487,7 +476,7 @@ add_efi_map_entry(struct efi_md *p, void *argp __unused) /* * Some UEFI implementations put the system table in the * runtime code section. Include it in the DMAP, but will - * be excluded from phys_avail later. + * be excluded from phys_avail. */ case EFI_MD_TYPE_RT_DATA: /* @@ -495,6 +484,12 @@ add_efi_map_entry(struct efi_md *p, void *argp __unused) * region is created to stop it from being added * to phys_avail. */ + if (exclude) { + physmem_exclude_region(p->md_phys, + p->md_pages * EFI_PAGE_SIZE, EXFLAG_NOALLOC); + break; + } + /* FALLTHROUGH */ case EFI_MD_TYPE_CODE: case EFI_MD_TYPE_DATA: case EFI_MD_TYPE_BS_CODE: @@ -503,8 +498,12 @@ add_efi_map_entry(struct efi_md *p, void *argp __unused) /* * We're allowed to use any entry with these types. */ - physmem_hardware_region(p->md_phys, - p->md_pages * EFI_PAGE_SIZE); + if (!exclude) + physmem_hardware_region(p->md_phys, + p->md_pages * EFI_PAGE_SIZE); + break; + default: + /* Other types shall not be handled by physmem. */ break; } } @@ -512,7 +511,15 @@ add_efi_map_entry(struct efi_md *p, void *argp __unused) static void add_efi_map_entries(struct efi_map_header *efihdr) { - foreach_efi_map_entry(efihdr, add_efi_map_entry, NULL); + bool exclude = false; + foreach_efi_map_entry(efihdr, handle_efi_map_entry, &exclude); +} + +static void +exclude_efi_map_entries(struct efi_map_header *efihdr) +{ + bool exclude = true; + foreach_efi_map_entry(efihdr, handle_efi_map_entry, &exclude); } static void From nobody Fri Mar 24 13:13:59 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjjMq4RsWz41Yf1; Fri, 24 Mar 2023 13:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjjMq1Qznz43B8; Fri, 24 Mar 2023 13:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pQyDHixa02yAroudh6Yip1qR5pP68SJtIh6Fdl7UOU8=; b=Kf0zOY9Jtv37/p7CRYEuzE9moU6DrGIVdbtLdkojT4Fwnso+b/hVy/8FC2D/GidF426BOj fS6EYN9yvyGxZPdxd+UsXk6xmPphSjIFPeENEn/YpWE/W5YJ5E6Xk0tgIzjotf2y5o/8jh jmP62Q+LWeljtD5n8nMsilb0xN059C7GtfVmiPkD+McMfq6g8A2CaRXd4CZMya8O9+iIH5 +NcDgfvTC5GXHPFdMh18BpL7o4LPpKFexPfJ0/HSoWwlJ6RXii5H8QnnblE0O/5KbqH1JB nVXid/QVy/V9wXkt+BjRAc+Bf+wY06iJUlHnecYmm9db0iGdqmvLFUuh6Rlegg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pQyDHixa02yAroudh6Yip1qR5pP68SJtIh6Fdl7UOU8=; b=jdToatEZhLs4KGY3/5wpNXZEopXxCXy54vHuZOyhkxaRpFStAuauU/enqyW/Q5ZMKTSEDt Jif9kmx96wsfOFwE4b4/ADaM2lqBUkh2Y5ATqYS7p65Yq5axOYp2GO8Cs7Hj1cRG1aXlON CHkWvIqh4Y3ZcjV1ZtK6kF0RiFJ3Pa+VhTlOQv2ISOe9EBWWUBx9/bL0ELe5tKfpPqDink dOTzDccT9/sI4qH8jKsA/QUlRKDKO6kmGx0cXPix2mtQcIlcL5CLQrtb9yDyXnAapdlkJW 0V+YVdCPu0BDUG0jw1yr/W6Nax+RA0luEd7+sWNBuSl4f+A/RhicQWD/J6CAhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679663639; a=rsa-sha256; cv=none; b=M1adddxEmEr5WeGQ6vro9cgNdy/CmmaG7Vd3ElxXOiNozz+cJfYoxsMN6CIfPLPuIxx0k7 Uf7mhh6ZTobfsu6Lx8FGMBYsr+nHIxgAv1wOd0oE18AuhRvZBd7iA0VxF7pYhwfDPOhOYt jX8G31JmmyS0PzefcB+7boEHWoEgXnNW12IzgtWl889AZvVUrYtEZa81poVUXEO/RdQGgT RT3puLja7yffSEjYpNvHGGIspbe8Gn0L5w0fOt6EcEMumqgPXFE2M/D7KUSR5wQUCdyeOg yacY1dfP7hoFjUsZzfAfe0wEVKkIAnBysbXxSR3w2Z49f+muQ7i2ykRB8V7Y5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjjMq0Y3DzKVc; Fri, 24 Mar 2023 13:13:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ODDxEP031213; Fri, 24 Mar 2023 13:13:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ODDxon031212; Fri, 24 Mar 2023 13:13:59 GMT (envelope-from git) Date: Fri, 24 Mar 2023 13:13:59 GMT Message-Id: <202303241313.32ODDxon031212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: f1a0b6f62382 - stable/13 - vcount.9: remove obsolete man page 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f1a0b6f623825458fc39f22054401e5bb46a9c4d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=f1a0b6f623825458fc39f22054401e5bb46a9c4d commit f1a0b6f623825458fc39f22054401e5bb46a9c4d Author: Mitchell Horne AuthorDate: 2023-03-20 19:49:59 +0000 Commit: Mitchell Horne CommitDate: 2023-03-24 13:12:40 +0000 vcount.9: remove obsolete man page These functions, vcount() and count_dev(), no longer exist in the source tree. Reviewed by: rpokala MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39128 (cherry picked from commit b54391a1f83169f847e5f28e29d1938a154d54e0) --- ObsoleteFiles.inc | 4 +++ share/man/man9/Makefile | 2 -- share/man/man9/vcount.9 | 73 ------------------------------------------------- 3 files changed, 4 insertions(+), 75 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index e6b2140af29d..2ee27ee84dcf 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20230320: vcount.9 removed +OLD_FILES+=usr/share/man/man9/count_dev.9.gz +OLD_FILES+=usr/share/man/man9/vcount.9.gz + # 20230308: machine-id merged into hostid_save OLD_FILES+=etc/rc.d/machine-id diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 4bb9654b3c2f..1020d574c889 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -340,7 +340,6 @@ MAN= accept_filter.9 \ vaccess.9 \ vaccess_acl_nfs4.9 \ vaccess_acl_posix1e.9 \ - vcount.9 \ vflush.9 \ VFS.9 \ vfs_busy.9 \ @@ -2319,7 +2318,6 @@ MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usb_fifo_softc.9 \ usbdi.9 usb_fifo_wakeup.9 .endif -MLINKS+=vcount.9 count_dev.9 MLINKS+=vfsconf.9 vfs_modevent.9 \ vfsconf.9 vfs_register.9 \ vfsconf.9 vfs_unregister.9 diff --git a/share/man/man9/vcount.9 b/share/man/man9/vcount.9 deleted file mode 100644 index 186a350ac56b..000000000000 --- a/share/man/man9/vcount.9 +++ /dev/null @@ -1,73 +0,0 @@ -.\" -*- nroff -*- -.\" -.\" Copyright (c) 2000 Andrew Stevenson -.\" -.\" All rights reserved. -.\" -.\" This program is free software. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -.\" -.\" If this manual page travels to places exotic (like projects other than -.\" FreeBSD) I would love to hear about it. -.\" Andrew -.\" -.\" $FreeBSD$ -.\" -.Dd January 19, 2012 -.Dt VCOUNT 9 -.Os -.Sh NAME -.Nm vcount , -.Nm count_dev -.Nd "get total number of references to a device" -.Sh SYNOPSIS -.In sys/param.h -.In sys/time.h -.In sys/conf.h -.In sys/vnode.h -.Ft int -.Fn vcount "struct vnode *vp" -.Ft int -.Fn count_dev "struct cdev *dev" -.Sh DESCRIPTION -.Fn vcount -is used to get the number of references to a particular device. -It allows for the fact that multiple vnodes may reference the same device. -.Fn count_dev -does the same thing as -.Fn vcount , -but takes a -.Vt "struct cdev" -rather than a -.Vt "struct vnode" -pointer as an argument. -.Sh RETURN VALUES -.Fn vcount -and -.Fn count_dev -both return the number of references to the device. -.Sh SEE ALSO -.Xr VFS 9 , -.Xr vnode 9 -.Sh AUTHORS -This manual page was written by -.An Andrew Stevenson . From nobody Fri Mar 24 13:14:00 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjjMr5K5vz41Yf4; Fri, 24 Mar 2023 13:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjjMr2fbqz43ML; Fri, 24 Mar 2023 13:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UK8ZfhLxejWO2lTy41Si1FXlNhSayCB/wK2c3CTD8os=; b=rvU9uenVL0hAiqy3PG/mPYQjZGiHWHWnnUgaQ6m3vnivbpGN7V1w0gXLUdcCyWwXb8io+d BIZJ2D+eZhbU7kkz33/U9e2l+UKJeXk0LzL5ebhHdFhw9GHVkgN2Txx6Xj2gw+5Yc4fn6r vdEfXqVhg5nsdOQwWa6p5FZD8YtKi2VXYYReWTikWLON2f8mavaQYD9rsEdKchIYvcf52Y rE+8IjNAQRI5GyvLGqHVFF4Yyyixa+yYQ1ot7DIP+lGCROF1Ki4i7vRaQZSn9j6IYEiNft D43nCxJZiWSJCGLlQ4nEFIcxw/5SE+VREwpDbzAnN4XZCzp1/c8gl+R+7cJBmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UK8ZfhLxejWO2lTy41Si1FXlNhSayCB/wK2c3CTD8os=; b=G8zo4CXzJX7ZKAK6S+qn/Mjr8l6AyPfsvWU52JtYH8Rs3WvCeB5U+x7HqgOn/SVdIskbuN fpdzgaf/5CtHKH4+GHFB3YyWebwkCEp7OYdESQqDhveZONh2b2YHDHPjW9hmX77kQKSLpK oi9FZMRKCmrHd8HHBTP84hXPdkuEG8tdvGwOQFB0iGVJViLj2x5x3eOkTqHcMcYFZznntK +nzShiTxa+ZR0mYXvkVVDcDQpraEkpacXyVlS1WJ+69KojdYjvUoLG1XFVOxT5VqljiSvO vX3oMUoCofbFw2aIRWK/DuSRQVmtpVAz17yS7iXS/y9ANZoYMDp365kFNfzUgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679663640; a=rsa-sha256; cv=none; b=OulVgYFAXkEo6D1mfRGw6OpXDp9ToOZjPK+dMk6ykAP1pwYT1nqHAxwcDYXj5e/Pr6F5g1 wIvNBjqa1nv75s2mBliZfWGoCyuwxIboddlMf0HMdcLRQ7ygmXsYr5YCgNwUoPSFQ4fdZX QKBzm3JDPEP/HfKVR3uzBOBMAc93KA62zMh/NZyaumQdG62D2kZy7jRuz99dnOlSIf6YGJ 8maj1ib4Zmhc0POoke93iRNy9icw2B1fNPdasmN9RtY0Yw57IWaw5j62jvCSsmQDYYTeHM d/r2eAAdmoEFnA1cYsejhCdwCnlBhO5/D4n2UG6TwVdtZMF0ohaU9IyDMKigeg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjjMr1VW4zKS6; Fri, 24 Mar 2023 13:14:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ODE0WB031233; Fri, 24 Mar 2023 13:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ODE0fn031232; Fri, 24 Mar 2023 13:14:00 GMT (envelope-from git) Date: Fri, 24 Mar 2023 13:14:00 GMT Message-Id: <202303241314.32ODE0fn031232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: cda81dc7c871 - stable/13 - Cross-reference coretemp(4) and amdtemp(4) 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cda81dc7c871f33a33e1b8b272f7871a6a90a4d6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cda81dc7c871f33a33e1b8b272f7871a6a90a4d6 commit cda81dc7c871f33a33e1b8b272f7871a6a90a4d6 Author: Mitchell Horne AuthorDate: 2023-01-31 16:41:32 +0000 Commit: Mitchell Horne CommitDate: 2023-03-24 13:12:40 +0000 Cross-reference coretemp(4) and amdtemp(4) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 005b7c5790ef913bb8053f890d9653228e577185) --- share/man/man4/amdtemp.4 | 1 + share/man/man4/coretemp.4 | 1 + 2 files changed, 2 insertions(+) diff --git a/share/man/man4/amdtemp.4 b/share/man/man4/amdtemp.4 index 8d1764f7e877..e64192916456 100644 --- a/share/man/man4/amdtemp.4 +++ b/share/man/man4/amdtemp.4 @@ -83,6 +83,7 @@ tunable: Add the given offset to the temperature of the sensor. Default is 0. .Sh SEE ALSO +.Xr coretemp 4 , .Xr loader 8 , .Xr sysctl 8 .Sh HISTORY diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4 index 91a975861a0a..3931b1c5ff04 100644 --- a/share/man/man4/coretemp.4 +++ b/share/man/man4/coretemp.4 @@ -57,6 +57,7 @@ driver reports each core's temperature through a sysctl node in the corresponding CPU device's sysctl tree, named .Va dev.cpu.%d.temperature . .Sh SEE ALSO +.Xr amdtemp 4 , .Xr sysctl 8 .Sh HISTORY The From nobody Fri Mar 24 13:14:01 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjjMs5l3Cz41YlD; Fri, 24 Mar 2023 13:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjjMs3PTVz43J0; Fri, 24 Mar 2023 13:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZOk7i0FVZgUlodn6WNppiBkCehEhBPWD6JReLqpUZI=; b=otqqZ8uX06ZcGdZBml2TbOmUaoRh0JgVO7uiL8/QPxluzgwoF4Zkwhxk+UsMonFNmzmKfF JZs4iMSFsGFukWcQI1LMUHsLxlWkB5L9EhlICTA6erIBbbpnfHhiZeIqTa/Kl34Wr1r+is 6CEFOmCvScTTkDwfVhilElAUIGOs76Ud8d+SAFK3iIGo/PUS66Mc/9Z0QQwKRFQwVLVMIL dIZAQiC0++RjI0qYBVENCE9aQrriXQRHKhsCuReqraZRQIjjXJAmpS28PTvG1fmu0KTN3A jb9KPzalKVJwSGgO987737vKkVDDQ0H3oGSUjeIsmFzBdtaolYN8aRFKpPwosg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679663641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OZOk7i0FVZgUlodn6WNppiBkCehEhBPWD6JReLqpUZI=; b=g9u7zAhqWDvU2tol1EDKuEmDBBkGa28BMYoKpzcnh/zIT5HLVxhmbUTknvqXNl9b7tQb9y RZ/zTbEpidbUdObNslvyHEfVTeM5hMTH/DONT5u9WtjUDfpD29fTsBON0o/BNKRDhtWx1Z yg6nuMGOqR5QDexmuCsfFhRU7G8TgUnQF3rAPeeUjGlP+2MamKUL9lWEz97FdxhLCfwAqF uSLTpg0gcdnyD5uFdV7dwt9CH/d5tNGGZ0EZjQYf+mY+i/AqA5xX4iccWSRbBToXniYrHC TbN0u6KWx74hG+pOgOWF8ikp6TUpQigs21CE7MpznWV7FG7PNH/4ihMe/wO1SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679663641; a=rsa-sha256; cv=none; b=QceH20uFRGMc/i/CReUHFqTn2rI6h4HKyxEeLqYjBDWpXT+hLpneK18sBlsVxwCANNF2jD Gre9qWLG+52jNdrazv8jRi+UjHFGOJEBrySI2dgsmVngDlFa2N3hbpT0CRe80NX22m8jG6 v4xdmxd6L4sDZ0mFi9rBsnEdACPz3h8h8xuFC8G6tNM0aw5OA23jrMvxmdWspM1IILnoYW NxELzMoOVVr/enAUtqIyO+GYx2pE/2AiuxraaBZe/NkXRwjH/iYr/bu407+mE6CFFLYtmr e648ds4tf7liBEGZUyewFHigrmIdKOm5M0u2h6fVZlLMWPcUPyCy/fjzzaPGMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjjMs2Dy4zKCy; Fri, 24 Mar 2023 13:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ODE1N5031259; Fri, 24 Mar 2023 13:14:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ODE1b4031258; Fri, 24 Mar 2023 13:14:01 GMT (envelope-from git) Date: Fri, 24 Mar 2023 13:14:01 GMT Message-Id: <202303241314.32ODE1b4031258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: c9f2ffe5f9c9 - stable/13 - printf(9): add MLINKS for vlog(9) and vprintf(9) 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c9f2ffe5f9c910460a4c9c9f05bca3794b0f07a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c9f2ffe5f9c910460a4c9c9f05bca3794b0f07a5 commit c9f2ffe5f9c910460a4c9c9f05bca3794b0f07a5 Author: Mitchell Horne AuthorDate: 2023-02-12 18:58:50 +0000 Commit: Mitchell Horne CommitDate: 2023-03-24 13:12:40 +0000 printf(9): add MLINKS for vlog(9) and vprintf(9) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 84a44625a50fc548aae43af9e9738c1934b3e611) --- share/man/man9/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 1020d574c889..6aa1bcae3c40 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1811,7 +1811,9 @@ MLINKS+=pmap_resident_count.9 pmap_wired_count.9 MLINKS+=pmap_zero_page.9 pmap_zero_area.9 MLINKS+=printf.9 log.9 \ printf.9 tprintf.9 \ - printf.9 uprintf.9 + printf.9 uprintf.9 \ + printf.9 vlog.9 \ + printf.9 vprintf.9 MLINKS+=priv.9 priv_check.9 \ priv.9 priv_check_cred.9 MLINKS+=prng.9 prng32.9 \ From nobody Fri Mar 24 16:58:30 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PjpLv0sVNz40pLL; Fri, 24 Mar 2023 16:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PjpLv0NpCz4Pl3; Fri, 24 Mar 2023 16:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679677111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2kMQeScycG6Jx77WdBRPeOdaAueJNJkeTsxQuN3H5kQ=; b=jd+8vvXqn/oKtDo9Oh9sMKsVxSNH1J1UHwxVEk1P6jLdHxF/uF8qAXKJPJhwmWbrhHAJU8 XMKgpMCKEhkbwuU+GG0qno5M7mv8SvRwhA5LDjRsa/ZnC+pNHWykQJ38+lX8b0gwm/JjG8 pEfZCisCo4ujM/oULjP4IMaXQ+nw+oHVjB4n/3Scbq2duXZJUBl2T19UbbVnrjxdGpLHY8 BI0w+VKtHVkgsvNDhily+cfTFw8BWTymE6uHIUQWbVIwNlG4fGnZ1Me/Zzlj8HIuBFzY7S 6H4Yoe8Koa9ojLA9vO0ZZ9WNxJD29t7jMvVy75EeHuaZSz1U6Rtx3hgR49M3Ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679677111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2kMQeScycG6Jx77WdBRPeOdaAueJNJkeTsxQuN3H5kQ=; b=WowWA36WMbZUOha/zQ87dpuJiwq6zrlW515/Y3pdKksr980wE7zDM96gaSmN6GR0w8ZSIs c3+6uZMXBRQE57Bw+pT9joqTQWXzeZoXvSPjhzbFz4iwuwp8PAo2xL/LmAe634EsyhaetV WA8kUzJkCtUcL31vc+m1rJs+jzzNckqnKHt8CD+BYThh+HJOduwBDAqC59R4hxPvyQMs2A r1ojTxltgUUXB6kY9EVsWtlH6CfZJVajzs1/xlS07JBgG2z/MoVC/6LAILRDNgUK0onYfJ XZmGkytdboPTv01VPRp9lw6WMm8k0YAQx28p0TUM8KGiCibGntok+09HZ1X2pA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679677111; a=rsa-sha256; cv=none; b=wMC89ngx18Okg5K6IlHB3iFdcChmBPaWPHvXrjJ4RjysfkLlcNLxWx82GTwzxs4NHkTrb+ yTB8hQ3ozLRIXIbduEcoMtGObVionFH+Vl4T++aQIdJhzCyIqaCgmM1XpH3V0rAmeqz8E/ ZIU8N+8MIPrdkhw9qUrHUvkgjrlp71S5tNxnbf8kvfYKuJw7/4kAJaxL60XT8KsBuZwRFS vxc5211tYwXgkFS0FIrJGbK/FYUWiJg3SARyEULvUkqOgmtvBOQP90edYu8IQmbXAZ/Xly HVkoxasGSk/Vmsql79ax/N21/v3HWdxMDM7Nnlhu+rvpgMC7mXkNWRq3LVjdTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PjpLt6Y88zQSc; Fri, 24 Mar 2023 16:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32OGwUQP093547; Fri, 24 Mar 2023 16:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32OGwUe7093546; Fri, 24 Mar 2023 16:58:30 GMT (envelope-from git) Date: Fri, 24 Mar 2023 16:58:30 GMT Message-Id: <202303241658.32OGwUe7093546@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: 3c7ef29e8998 - stable/13 - ping: Avoid magic numbers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3c7ef29e89982ff243b18fce2bac4355028da879 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3c7ef29e89982ff243b18fce2bac4355028da879 commit 3c7ef29e89982ff243b18fce2bac4355028da879 Author: Jose Luis Duran AuthorDate: 2023-03-17 13:24:44 +0000 Commit: Mark Johnston CommitDate: 2023-03-24 16:58:01 +0000 ping: Avoid magic numbers The sizeof(struct ip) is 20. The sizeof(struct in_addr) is 4. No functional change intended. Reviewed by: asomers, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39125 (cherry picked from commit 491263d7a640a85a6be40fd0c0a9397d072f0847) --- sbin/ping/ping.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c index 2fc876e50776..796f29438a70 100644 --- a/sbin/ping/ping.c +++ b/sbin/ping/ping.c @@ -1674,7 +1674,7 @@ pr_iph(struct ip *ip) int hlen; hlen = ip->ip_hl << 2; - cp = (u_char *)ip + 20; /* point to options */ + cp = (u_char *)ip + sizeof(struct ip); /* point to options */ (void)printf("Vr HL TOS Len ID Flg off TTL Pro cks Src Dst\n"); (void)printf(" %1x %1x %02x %04x %04x", @@ -1690,7 +1690,7 @@ pr_iph(struct ip *ip) memcpy(&ina, &ip->ip_dst.s_addr, sizeof ina); (void)printf(" %s ", inet_ntoa(ina)); /* dump any option bytes */ - while (hlen-- > 20) { + while (hlen-- > (int)sizeof(struct ip)) { (void)printf("%02x", *cp++); } (void)putchar('\n'); @@ -1710,7 +1710,7 @@ pr_addr(struct in_addr ina) if (options & F_NUMERIC) return inet_ntoa(ina); - hp = cap_gethostbyaddr(capdns, (char *)&ina, 4, AF_INET); + hp = cap_gethostbyaddr(capdns, (char *)&ina, sizeof(ina), AF_INET); if (hp == NULL) return inet_ntoa(ina); From nobody Fri Mar 24 23:57:02 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pjzdp2F1rz41K8k; Fri, 24 Mar 2023 23:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pjzdp1hCbz3wvV; Fri, 24 Mar 2023 23:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679702222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SX/InM72ID1cjhC7Co2zsFrKYMIVOeROETmG6aNy6nQ=; b=c7sENomvewvD6Ao6qvWd4HPD75rxvJ9bcfYYoVRE9YSdRXBdyVWYgiI9pmb6PODMdMvxci R22m46YRFl6FzBYqwkmJ0kdCHaCn6lWlHEGvZqsyAty/pblvMt67NLny0rZI6RhGwd9LPQ 6t+rHKvb5tGSjWiK3cyIY3JxcyEAUkMev0QuoO2SopG4gnEjwi7ka06amOdCjLJzrqPNV7 3QfkOGWfNWtNKIZNrx2ClTY7HY4Rrj/fI/6mQiHIh++sbhU1XCTBwZa9J+7RvRwA3rp/gD LU1I0XuteIgre16GckwksBRm2Ppvg9eXS+a79StUtj1gB+de19wfLWMaWNgUvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679702222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SX/InM72ID1cjhC7Co2zsFrKYMIVOeROETmG6aNy6nQ=; b=jvB6Op0vokvT43gEqVX+H93osSC4q9GnwTIEXUuGmMn9EgFIo0k9TmOdvGIJ1kw4RKPAOB cutRrRQsdViWznHMoMvtX7uQCS4xEcp/MB8ROMBwwJIUMoQhp9KtkGtypfPNj0iO5PhyQp WUKEcN5TYqrKoHv1UIv3mO4TKAZIsN0hR5J36o4LpyZdAnAz864970g0YAjHbyDVbDPse+ 7CEu59Avt9M+uPlsTEPkR1hB+nKF92YkmnjJx3mRShp5uXFAw8yNFiWEx7WinXQ85xrJTB MovTosnpJK6yrIiQaTKzfcRULg6KfAugEbpIpixq2IK75g+iL5gOAZoMfC3U7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679702222; a=rsa-sha256; cv=none; b=hThupung6LCqqzj8YcdStZIDxTx/gErh7mMCar5tNL2lvwplT6a5JF/ZEiQ0yEF4SQhTw9 MlSkLJ+NWTIGeb/vRYr0BjOEtgb65g1xMWH6aKbY2us5XXEyO4lXeG5mgdM0a0XszA8rcr 7Dqp72g8+vinDpjH+KYllCZSS1elpVbZlr2mmDcZGUOtZNIbGQSJAPzdzqe25p4MfhGT+z 5c12HaOYNQqqT/ttlprKiZ22L7rfiXEvI1Cbl2n9dKIaMuuN4cabtqPph/RtEFe/Ep5Yj5 yxxDozIyycXSu+snrfohFO+P0x3p5vIwGJWhYE1HXoWw9SuTL//WVYykSGciVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pjzdp0lg6zddk; Fri, 24 Mar 2023 23:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32ONv2Ko084732; Fri, 24 Mar 2023 23:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32ONv259084731; Fri, 24 Mar 2023 23:57:02 GMT (envelope-from git) Date: Fri, 24 Mar 2023 23:57:02 GMT Message-Id: <202303242357.32ONv259084731@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: d7ae385428ae - releng/13.2 - mbuf: Fix an offset calculation in m_apply_extpg_one() 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/releng/13.2 X-Git-Reftype: branch X-Git-Commit: d7ae385428ae8df4b5a39f752b389a9375597748 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7ae385428ae8df4b5a39f752b389a9375597748 commit d7ae385428ae8df4b5a39f752b389a9375597748 Author: Mark Johnston AuthorDate: 2021-11-10 21:57:12 +0000 Commit: Mark Johnston CommitDate: 2023-03-24 23:56:47 +0000 mbuf: Fix an offset calculation in m_apply_extpg_one() We were not including the requested starting offset in the page offset. Approved by: re (cperciva) Reviewed by: jhb Fixes: 3c7a01d773ac ("Extend m_apply() to support unmapped mbufs.") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32922 (cherry picked from commit ac2b54441742b3148de72e3b29aa0f00d29bb825) (cherry picked from commit 70421fd527e315bbc4850db2d7e80fc008393bce) --- sys/kern/uipc_mbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 13c98d0895fa..abe292013d28 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -1293,7 +1293,7 @@ m_apply_extpg_one(struct mbuf *m, int off, int len, pglen = m_epg_pagelen(m, i, pgoff); if (off < pglen) { count = min(pglen - off, len); - p = (void *)PHYS_TO_DMAP(m->m_epg_pa[i] + pgoff); + p = (void *)PHYS_TO_DMAP(m->m_epg_pa[i] + pgoff + off); rval = f(arg, p, count); if (rval) return (rval); From nobody Sat Mar 25 11:30:17 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PkH1j5LcFz413v7; Sat, 25 Mar 2023 11:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PkH1j4xVFz3lXf; Sat, 25 Mar 2023 11:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679743817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hQntzN/4bpyeQw2GKxscb+HI/IPBAYsldWRfmLPji0=; b=SVptUTQ0EVkrq0lYLiNZ4g9+c/zMZQBIRWECzxI6lIqA8V/zA1POgGRS4JGtUlogcm5pxd Z1+sXNxamxlQ8mRPvPRed6DUwHrt+AJbLY6F42WbQHqrEK5npfmpakRgQI60Ive3pIMhA8 vGIOPbz4ml6V+hTlfz5nrv2E5H6ftbAMb5BTxc2MogUAfOkUhFPMV2GQ5/T66IuMF1ohPQ vxTeVegDcmblm3zNXd/+jyLREFzEGl9o059hwMdQFchwF9exHB6s8nf96ep4xjzT0sBQY7 xNQd+J7sU+a0b2HEmglKqi4sSXO0KU9uQcUuLIBC7wGqD/y+LABxrKKLmSAngQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679743817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8hQntzN/4bpyeQw2GKxscb+HI/IPBAYsldWRfmLPji0=; b=NhfcQHynObpqNixGO7D5eSoQkZlGxqNpPc6tXWoEkunJij7fCMpVdDjOWLmk5CdP2xhJqv urv16r/wGEo7Hn6/ZcFhduwBTH45M2GZAih+3Jx/n6PcBuxbYsZlIUmMZYGFgawUkmAC3h fwzDsJoi/UWTBma61wFTtl4qAvjzW4tGkqsKUh+YL/TcaXK/3Pyz0XDvAyY15GMLv3xOS3 Anpz3/2mvhPmRaQGx0NDrK63hWlpjVBxTCkfbddjXu/Cl1iV/x3D3k9r1gUuKlZ2HbeFPR E4tV4XusMJwsqtO+5lU4OJgZLb7lfAq7nT5jZffUspMqLwqWDUN13fuae2fXHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679743817; a=rsa-sha256; cv=none; b=GXaQcjiUrXtl/FkEkj8qHabg1JWCrvIDgmD4YswR408wL3kFBVFLALjNEvebvBO2+FfKAE 9Kogw/Mp0M1JBd4Gf7oPmQIp+6joRM+QiJajuqxSA57WsUtruXtL2FKjNYqWArynYOgpcd c/tkesL8956EUtA2qGpapJarDUyJ//+2p8cZGgj044pw8+qfgKYVnl1rfrNxsFabmpakEC A/CRz4FnINPPU0g8y/+1z2NCab1aozSC9mIkih9UPcAgJq4hsTGHC/UrwIcSDipBVFoBj8 GwaKzr348Z8NTu4rjfl47q3rt6JeYiCFv8EjMZqxu83xrBd7F79gQaSsgf/jHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkH1j42HmzxnC; Sat, 25 Mar 2023 11:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32PBUHFT028546; Sat, 25 Mar 2023 11:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PBUHsO028545; Sat, 25 Mar 2023 11:30:17 GMT (envelope-from git) Date: Sat, 25 Mar 2023 11:30:17 GMT Message-Id: <202303251130.32PBUHsO028545@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: 38e0d28fa4e2 - stable/13 - contrib/tzdata: import tzdata 2023b 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/13 X-Git-Reftype: branch X-Git-Commit: 38e0d28fa4e2f98ebb060441f0aeb0536d6fd202 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=38e0d28fa4e2f98ebb060441f0aeb0536d6fd202 commit 38e0d28fa4e2f98ebb060441f0aeb0536d6fd202 Author: Philip Paeps AuthorDate: 2023-03-24 04:45:24 +0000 Commit: Philip Paeps CommitDate: 2023-03-25 11:29:52 +0000 contrib/tzdata: import tzdata 2023b Changes: https://github.com/eggert/tz/blob/2023b/NEWS (cherry picked from commit 2084f6a496cefb5da9dbdabad5aa99342e2fc163) --- contrib/tzdata/NEWS | 11 +++++++++++ contrib/tzdata/asia | 10 +++++++++- contrib/tzdata/version | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index cd5cafe3f3c6..9b235a293962 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,16 @@ News for the tz database +Release 2023b - 2023-03-23 19:50:38 -0700 + + Briefly: + Lebanon delays the start of DST this year. + + Changes to future timestamps + + This year Lebanon springs forward April 20/21 not March 25/26. + (Thanks to Saadallah Itani.) + + Release 2023a - 2023-03-22 12:39:33 -0700 Briefly: diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index 25592db89e83..dd06a5fd21fe 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2691,6 +2691,12 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 # Lebanon +# +# From Saadallah Itani (2023-03-23): +# Lebanon too announced today delay of Spring forward from March 25 to April 20. +# From Paul Eggert (2023-03-23): +# https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S Rule Lebanon 1920 only - Oct 25 0:00 0 - @@ -2713,9 +2719,11 @@ Rule Lebanon 1988 only - Jun 1 0:00 1:00 S Rule Lebanon 1989 only - May 10 0:00 1:00 S Rule Lebanon 1990 1992 - May 1 0:00 1:00 S Rule Lebanon 1992 only - Oct 4 0:00 0 - -Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S +Rule Lebanon 1993 2022 - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - +Rule Lebanon 2023 only - Apr 21 0:00 1:00 S +Rule Lebanon 2024 max - Mar lastSun 0:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT diff --git a/contrib/tzdata/version b/contrib/tzdata/version index 41e28b248330..74a7fa8ae9e6 100644 --- a/contrib/tzdata/version +++ b/contrib/tzdata/version @@ -1 +1 @@ -2023a +2023b From nobody Sat Mar 25 11:30:53 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PkH2Q24dPz413yh; Sat, 25 Mar 2023 11:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PkH2Q1fzRz3lZd; Sat, 25 Mar 2023 11:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679743854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XxJMJJoK09S61iVL+utB9qBn/KhBjDU/2kyb453HHU8=; b=QDCffEvrXRWmAWRAivEaUP0fckXQ7d9xntkeTkea18OfpEjU36GjrPlvGzC5QzOAA5ZlNK wSDLVj4Z7ttUfh1kNGJ9Y/ZopsUKtlIYjvRKf/d2bMeSolfHnJG0wqF2n/JRI25wLI/Lq7 ZcMGPcgSLpi8zFarbCHVIXVDKG8XWm4pSzcgESgBaYWntbhr4Mr6cWSz9kpvpVhf+PedNS mQRnyn3MfIhgry0DaFCuXM7h/z65LtX5FnkuwcCy0ba2jbC0gIB8rcNi18cfTljp0vspzs w+xPSJHbnnTAe6xd5Mnom1UtRvV9vlk6s85jq4L24dQjFBfUW2zwMWELJ1790A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679743854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XxJMJJoK09S61iVL+utB9qBn/KhBjDU/2kyb453HHU8=; b=pzhOX4I/C6zQ9ajUZ8QnEXSQsHUxYvxrJfLAOnzC7isEGNT4Y6Nlt49f4BsNZzt3YqXe3K NIVnr6V1qGYvzRlRrQB2Ht5uHcG+kN89q8oii9rKz+QnUunh7WL/EovIoPk8WCLp/RkA7B k2kJh2CBIdCevoDgKtE5qRF0CIwYwMqz5a4uXu30PDX15r27QOKRX926JWyQKRoVtWnuV2 iQohAmRXbBEoxfAwed+ztFMqK3FTvukUQoHv4xgz/vPUxTalwUGNBSDCt8XzphpZJukTR5 ayO+iYGv2Q8hjs9Hc1/zeMD/XhYlAb+lycTZCKyXWc1LI+tFVbZnY2g9JFngJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679743854; a=rsa-sha256; cv=none; b=xbwdWs22PR3H2hI7pxTN00yN1fkHB9aPDeyCnLxmgF4FGsHi++lwlSt8JkeVFzF0hSEFUW 8XhBm0AO0Rah9yVFy0WvQ7v99J2J33keQEk2FfwoctI/miWJ6LNTldgwKy15sKKF/2VdyZ wegyIY77XUPCTMQ8d5X/FFWwGfIXMJFNXC2sDJkC9lWiNuVl3HDSlU356lwqksDZ+L9d/u AN0DO/WiWKSNIrHLIKnANnOTefu7fcCqMbDb02mPDVI9yBcpRtSsUEc7HcmEj1EjTGYBkJ Bf+GT9K+44T+m/06I43Ka087h8fGcnX9q67kXALm5Oj9NpW3x8KvRgucnWEFnA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkH2Q0k0VzxKt; Sat, 25 Mar 2023 11:30:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32PBUsBH031194; Sat, 25 Mar 2023 11:30:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PBUr0H031193; Sat, 25 Mar 2023 11:30:53 GMT (envelope-from git) Date: Sat, 25 Mar 2023 11:30:53 GMT Message-Id: <202303251130.32PBUr0H031193@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: f0cea48cb780 - stable/12 - contrib/tzdata: import tzdata 2023b 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/12 X-Git-Reftype: branch X-Git-Commit: f0cea48cb780522234370e122fdb837388b97a06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=f0cea48cb780522234370e122fdb837388b97a06 commit f0cea48cb780522234370e122fdb837388b97a06 Author: Philip Paeps AuthorDate: 2023-03-24 04:45:24 +0000 Commit: Philip Paeps CommitDate: 2023-03-25 11:30:40 +0000 contrib/tzdata: import tzdata 2023b Changes: https://github.com/eggert/tz/blob/2023b/NEWS (cherry picked from commit 2084f6a496cefb5da9dbdabad5aa99342e2fc163) --- contrib/tzdata/NEWS | 11 +++++++++++ contrib/tzdata/asia | 10 +++++++++- contrib/tzdata/version | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index cd5cafe3f3c6..9b235a293962 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,16 @@ News for the tz database +Release 2023b - 2023-03-23 19:50:38 -0700 + + Briefly: + Lebanon delays the start of DST this year. + + Changes to future timestamps + + This year Lebanon springs forward April 20/21 not March 25/26. + (Thanks to Saadallah Itani.) + + Release 2023a - 2023-03-22 12:39:33 -0700 Briefly: diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index 25592db89e83..dd06a5fd21fe 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2691,6 +2691,12 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 # Lebanon +# +# From Saadallah Itani (2023-03-23): +# Lebanon too announced today delay of Spring forward from March 25 to April 20. +# From Paul Eggert (2023-03-23): +# https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S Rule Lebanon 1920 only - Oct 25 0:00 0 - @@ -2713,9 +2719,11 @@ Rule Lebanon 1988 only - Jun 1 0:00 1:00 S Rule Lebanon 1989 only - May 10 0:00 1:00 S Rule Lebanon 1990 1992 - May 1 0:00 1:00 S Rule Lebanon 1992 only - Oct 4 0:00 0 - -Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S +Rule Lebanon 1993 2022 - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - +Rule Lebanon 2023 only - Apr 21 0:00 1:00 S +Rule Lebanon 2024 max - Mar lastSun 0:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT diff --git a/contrib/tzdata/version b/contrib/tzdata/version index 41e28b248330..74a7fa8ae9e6 100644 --- a/contrib/tzdata/version +++ b/contrib/tzdata/version @@ -1 +1 @@ -2023a +2023b From nobody Sat Mar 25 17:06:44 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PkQTw6wcVz41Rqg; Sat, 25 Mar 2023 17:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PkQTw60CFz4Hf3; Sat, 25 Mar 2023 17:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679764004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4WaE8Xb4Y4MZNLfrUqVzHW5a6EU5k3kBcQvURNqYvk=; b=HCFjRc/rXxbQRWP6qMeU1V1y2FvEIzMT+A11udaPQ6pBV1NuHUlKEOPvWJzKQpBkk2G4aE m0w+8atXbo9MkckF9A4MBn5nP/FXK/zOr1VGzlR6pnfyjXVtCbbyrnBLutn7SR1mxNdy+p +0julL7/tvOI8BkVdgCnZM+OlHpchukOYMagUrn59p3pR8nQdGLLb/XMzuNAj3u3Qmrc9W vfPpA7ojGOPk400jYaa6l5imCaZ8kcPHpF8GbfXkrSk+qP3uQmI6H6dzTRS8XlBNH3sOfj QRm7Uis9LU+Ju9ilMfpWWqbsmtaN5G5N51rBDLUz9urWjeqv/uDEO4QiaKuviw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679764004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R4WaE8Xb4Y4MZNLfrUqVzHW5a6EU5k3kBcQvURNqYvk=; b=lXPpY+1CkUOwPd+sF5UemwD4hu2It4BoHRbW8x7ujf9lIzB+tN9Q3f3XlVUG2Ce80Z2Bnj YKn2Q2jSnCi7AkCBZa2MVliBfdRrp/HHj2YByNCu6Y97UAjlXJAqcxflZjBdqSw8IUAiXd kkLacVfrX6GpC3jLYVfmUB1n2STKBRIs5q4Bz9XcNC5LJMCPZbnHP1JHy3OaD/N7MZmCFP 7fFvpbEW+tInqvLRzbLgiPYt6wou9fznzJCYxUNFMCLCp2SkhcUCXvhJLCUANiTElkQWf4 YBfWFEtkP4A7o7Ck7bgzhwMVvLgqlx/7KtrfjSg1Tgox+OGQpQVXc56/e1895Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679764004; a=rsa-sha256; cv=none; b=IHegLg/4x44if+PpuILdTeR6kVVGsrVX2DuogUyh94LKsB9ZoBM4A68NvUukUfrGb/rNMg 7XA4Ztg9d0Hrp6DD8D5k12ptmdD6Dk6HHDCXsy9tqEZyYeeEMD9n9nUb60gVbZIii07+EO cOJV76LdYPT1L4qSaPbenYUB403fYuztQK4PyviUrTG4vb+f0ARa3PCB3VPF6+UHyf1B/i HNSAK3ORrDoyJ3LgxTYWbjEdUBcdmMq4r7F4s6n+BMnL3WQTzkTTWVELAheYzpE92PvsOW 4MkfH64rte2wAuitQFbFbO7iFf4iTFaPrhXaB7Jg1/GGpQPLSeVthVcmHop4Eg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkQTw4x66z16RP; Sat, 25 Mar 2023 17:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32PH6iXt078833; Sat, 25 Mar 2023 17:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PH6ioc078832; Sat, 25 Mar 2023 17:06:44 GMT (envelope-from git) Date: Sat, 25 Mar 2023 17:06:44 GMT Message-Id: <202303251706.32PH6ioc078832@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: 82473c73554e - releng/13.2 - contrib/tzdata: import tzdata 2023a and tzdata 2023b 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/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 82473c73554e577703598fe416f24706cef88984 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=82473c73554e577703598fe416f24706cef88984 commit 82473c73554e577703598fe416f24706cef88984 Author: Philip Paeps AuthorDate: 2023-03-23 01:33:45 +0000 Commit: Colin Percival CommitDate: 2023-03-25 17:06:27 +0000 contrib/tzdata: import tzdata 2023a and tzdata 2023b Changes: https://github.com/eggert/tz/blob/2023a/NEWS Changes: https://github.com/eggert/tz/blob/2023b/NEWS (cherry picked from commit 259e2ad76d1da961cc34c2903cb5f72f28503eb8) (cherry picked from commit 9cb5b954606ec8a49b6127d2f58f7ee37ca0bb9c) (cherry picked from commit 2084f6a496cefb5da9dbdabad5aa99342e2fc163) (cherry picked from commit 38e0d28fa4e2f98ebb060441f0aeb0536d6fd202) Approved by: re (cperciva) --- contrib/tzdata/CONTRIBUTING | 2 +- contrib/tzdata/Makefile | 53 ++++++++------- contrib/tzdata/NEWS | 138 ++++++++++++++++++++++++++++++++++----- contrib/tzdata/africa | 71 ++++++++++++-------- contrib/tzdata/antarctica | 2 +- contrib/tzdata/asia | 138 ++++++++++++++++++++++++++++++++++++--- contrib/tzdata/australasia | 44 ++++++------- contrib/tzdata/backward | 1 + contrib/tzdata/backzone | 11 +++- contrib/tzdata/checktab.awk | 5 +- contrib/tzdata/europe | 59 ++++++++--------- contrib/tzdata/leap-seconds.list | 8 +-- contrib/tzdata/leapseconds | 8 +-- contrib/tzdata/leapseconds.awk | 50 ++++++++------ contrib/tzdata/northamerica | 31 +++++---- contrib/tzdata/southamerica | 2 +- contrib/tzdata/theory.html | 66 ++++++++++++------- contrib/tzdata/version | 2 +- contrib/tzdata/zone.tab | 29 ++++---- contrib/tzdata/zone1970.tab | 58 ++++++++-------- 20 files changed, 524 insertions(+), 254 deletions(-) diff --git a/contrib/tzdata/CONTRIBUTING b/contrib/tzdata/CONTRIBUTING index 4c0f56a50265..6d800e4c03a3 100644 --- a/contrib/tzdata/CONTRIBUTING +++ b/contrib/tzdata/CONTRIBUTING @@ -18,7 +18,7 @@ To email small changes, please run a POSIX shell command like 'diff -u old/europe new/europe >myfix.patch', and attach 'myfix.patch' to the email. -For more-elaborate or possibly-controversial changes, +For more-elaborate or possibly controversial changes, such as renaming, adding or removing zones, please read "Theory and pragmatics of the tz code and data" . diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile index afb9d538a203..6edc73cc6ffb 100644 --- a/contrib/tzdata/Makefile +++ b/contrib/tzdata/Makefile @@ -35,22 +35,14 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of nonstandard and obsolete -# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules. -# Such a setting uses the rules in a template file to determine -# "spring forward" and "fall back" days and times; the environment -# variable itself specifies UT offsets of standard and daylight saving time. -# +# The POSIXRULES macro controls interpretation of POSIX-like TZ +# settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. -# # Any other value for POSIXRULES is obsolete and should not be relied on, as: # * It does not work correctly in popular implementations such as GNU/Linux. # * It does not work even in tzcode, except for historical timestamps # that precede the last explicit transition in the POSIXRULES file. # Hence it typically does not work for current and future timestamps. -# In short, software should avoid ruleless settings like TZ='EET-2EEST' -# and so should not depend on the value of POSIXRULES. -# # If, despite the above, you want a template for handling these settings, # you can change the line below (after finding the timezone you want in the # one of the $(TDATA) source files, or adding it to a source file). @@ -63,7 +55,7 @@ LOCALTIME= Factory POSIXRULES= - # Also see TZDEFRULESTRING below, which takes effect only -# if the time zone files cannot be accessed. +# if POSIXRULES is '-' or if the template file cannot be accessed. # Installation locations. @@ -211,7 +203,7 @@ LDLIBS= # -DHAVE_DECL_ENVIRON if declares 'environ' # -DHAVE_DECL_TIMEGM=0 if does not declare timegm # -DHAVE_DIRECT_H if mkdir needs (MS-Windows) -# -DHAVE_GENERIC=0 if _Generic does not work* +# -DHAVE__GENERIC=0 if _Generic does not work* # -DHAVE_GETRANDOM if getrandom works (e.g., GNU/Linux), # -DHAVE_GETRANDOM=0 to avoid using getrandom # -DHAVE_GETTEXT if gettext works (e.g., GNU/Linux, FreeBSD, Solaris), @@ -220,7 +212,7 @@ LDLIBS= # -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares # ctime_r and asctime_r incompatibly with the POSIX standard # (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined). -# -DHAVE_INTTYPES_H=0 if does not work* +# -DHAVE_INTTYPES_H=0 if does not work*+ # -DHAVE_LINK=0 if your system lacks a link function # -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function # -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz @@ -229,22 +221,24 @@ LDLIBS= # -DHAVE_POSIX_DECLS=0 if your system's include files do not declare # functions like 'link' or variables like 'tzname' required by POSIX # -DHAVE_SETENV=0 if your system lacks the setenv function -# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function +# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function+ # -DHAVE_STDCKDINT_H=0 if neither nor substitutes like # __builtin_add_overflow work* -# -DHAVE_STDINT_H=0 if does not work* +# -DHAVE_STDINT_H=0 if does not work*+ # -DHAVE_STRFTIME_L if declares locale_t and strftime_l # -DHAVE_STRDUP=0 if your system lacks the strdup function -# -DHAVE_STRTOLL=0 if your system lacks the strtoll function +# -DHAVE_STRTOLL=0 if your system lacks the strtoll function+ # -DHAVE_SYMLINK=0 if your system lacks the symlink function # -DHAVE_SYS_STAT_H=0 if does not work* # -DHAVE_TZSET=0 if your system lacks a tzset function # -DHAVE_UNISTD_H=0 if does not work* # -DHAVE_UTMPX_H=0 if does not work* # -Dlocale_t=XXX if your system uses XXX instead of locale_t +# -DPORT_TO_C89 if tzcode should also run on C89 platforms+ # -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers # with external linkage, e.g., applications cannot define 'localtime'. # -Dssize_t=long on hosts like MS-Windows that lack ssize_t +# -DSUPPORT_C89 if the tzcode library should support C89 callers+ # -DSUPPRESS_TZDIR to not prepend TZDIR to file names; this has # security implications and is not recommended for general use # -DTHREAD_SAFE to make localtime.c thread-safe, as POSIX requires; @@ -256,7 +250,13 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions if the time zone files cannot be accessed +# DST transitions for POSIX-style TZ strings lacking them, +# in the usual case where POSIXRULES is '-'. If not specified, +# TZDEFRULESTRING defaults to US rules for future DST transitions. +# This mishandles some past timestamps, as US DST rules have changed. +# It also mishandles settings like TZ='EET-2EEST' for eastern Europe, +# as Europe and US DST rules differ. +# -DTZNAME_MAXIMUM=N to limit time zone abbreviations to N bytes (default 255) # -DUNINIT_TRAP if reading uninitialized storage can cause problems # other than simply getting garbage data # -DUSE_LTZ=0 to build zdump with the system time zone library @@ -273,6 +273,8 @@ LDLIBS= # $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking # # * Options marked "*" can be omitted if your compiler is C23 compatible. +# * Options marked "+" are obsolescent and are planned to be removed +# once the code assumes C99 or later. # # Select instrumentation via "make GCC_INSTRUMENT='whatever'". GCC_INSTRUMENT = \ @@ -363,7 +365,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \ # -DNETBSD_INSPIRED=0 # to the end of the "CFLAGS=" line. Otherwise, the functions # "localtime_rz", "mktime_z", "tzalloc", and "tzfree" are added to the -# time library, and if STD_INSPIRED is also defined the functions +# time library, and if STD_INSPIRED is also defined to nonzero the functions # "posix2time_z" and "time2posix_z" are added as well. # The functions ending in "_z" (or "_rz") are like their unsuffixed # (or suffixed-by-"_r") counterparts, except with an extra first @@ -455,16 +457,13 @@ SAFE_CHARSET3= 'abcdefghijklmnopqrstuvwxyz{|}~' SAFE_CHARSET= $(SAFE_CHARSET1)$(SAFE_CHARSET2)$(SAFE_CHARSET3) SAFE_CHAR= '[]'$(SAFE_CHARSET)'-]' -# These characters are Latin-1, and so are likely to be displayable -# even in editors with limited character sets. -UNUSUAL_OK_LATIN_1 = «°±»½¾× -# This IPA symbol is represented in Unicode as the composition of -# U+0075 and U+032F, and U+032F is not considered alphabetic by some -# grep implementations that do not grok composition. -UNUSUAL_OK_IPA = u̯ +# These non-alphabetic, non-ASCII printable characters are Latin-1, +# and so are likely displayable even in editors like XEmacs 21 +# that have limited display capabilities. +UNUSUAL_OK_LATIN_1 = ¡¢£¤¥¦§¨©«¬®¯°±²³´¶·¸¹»¼½¾¿×÷ # Non-ASCII non-letters that OK_CHAR allows, as these characters are # useful in commentary. -UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1)$(UNUSUAL_OK_IPA) +UNUSUAL_OK_CHARSET= $(UNUSUAL_OK_LATIN_1) # Put this in a bracket expression to match spaces. s = [:space:] @@ -833,7 +832,7 @@ check_slashed_abbrs: $(TDATA_TO_CHECK) CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; } -check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab +check_sorted: backward backzone $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} !/./ {g++}' \ backward | LC_ALL=C sort -cu $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS index 701e490e4834..9b235a293962 100644 --- a/contrib/tzdata/NEWS +++ b/contrib/tzdata/NEWS @@ -1,5 +1,111 @@ News for the tz database +Release 2023b - 2023-03-23 19:50:38 -0700 + + Briefly: + Lebanon delays the start of DST this year. + + Changes to future timestamps + + This year Lebanon springs forward April 20/21 not March 25/26. + (Thanks to Saadallah Itani.) + + +Release 2023a - 2023-03-22 12:39:33 -0700 + + Briefly: + Egypt now uses DST again, from April through October. + This year Morocco springs forward April 23, not April 30. + Palestine delays the start of DST this year. + Much of Greenland still uses DST from 2024 on. + America/Yellowknife now links to America/Edmonton. + tzselect can now use current time to help infer timezone. + The code now defaults to C99 or later. + Fix use of C23 attributes. + + Changes to future timestamps + + Starting in 2023, Egypt will observe DST from April's last Friday + through October's last Thursday. (Thanks to Ahmad ElDardiry.) + Assume the transition times are 00:00 and 24:00, respectively. + + In 2023 Morocco's spring-forward transition after Ramadan + will occur April 23, not April 30. (Thanks to Milamber.) + Adjust predictions for future years accordingly. This affects + predictions for 2023, 2031, 2038, and later years. + + This year Palestine will delay its spring forward from + March 25 to April 29 due to Ramadan. (Thanks to Heba Hamad.) + Make guesses for future Ramadans too. + + Much of Greenland, represented by America/Nuuk, will continue to + observe DST using European Union rules. When combined with + Greenland's decision not to change the clocks in fall 2023, + America/Nuuk therefore changes from -03/-02 to -02/-01 effective + 2023-10-29 at 01:00 UTC. (Thanks to Thomas M. Steenholdt.) + This change from 2022g doesn't affect timestamps until 2024-03-30, + and doesn't affect tm_isdst until 2023-03-25. + + Changes to past timestamps + + America/Yellowknife has changed from a Zone to a backward + compatibility Link, as it no longer differs from America/Edmonton + since 1970. (Thanks to Almaz Mingaleev.) This affects some + pre-1948 timestamps. The old data are now in 'backzone'. + + Changes to past time zone abbreviations + + When observing Moscow time, Europe/Kirov and Europe/Volgograd now + use the abbreviations MSK/MSD instead of numeric abbreviations, + for consistency with other timezones observing Moscow time. + + Changes to code + + You can now tell tzselect local time, to simplify later choices. + Select the 'time' option in its first prompt. + + You can now compile with -DTZNAME_MAXIMUM=N to limit time zone + abbreviations to N bytes (default 255). The reference runtime + library now rejects POSIX-style TZ strings that contain longer + abbreviations, treating them as UTC. Previously the limit was + platform dependent and abbreviations were silently truncated to + 16 bytes even when the limit was greater than 16. + + The code by default is now designed for C99 or later. To build in + a C89 environment, compile with -DPORT_TO_C89. To support C89 + callers of the tzcode library, compile with -DSUPPORT_C89. The + two new macros are transitional aids planned to be removed in a + future version, when C99 or later will be required. + + The code now builds again on pre-C99 platforms, if you compile + with -DPORT_TO_C89. This fixes a bug introduced in 2022f. + + On C23-compatible platforms tzcode no longer uses syntax like + 'static [[noreturn]] void usage(void);'. Instead, it uses + '[[noreturn]] static void usage(void);' as strict C23 requires. + (Problem reported by Houge Langley.) + + The code's functions now constrain their arguments with the C + 'restrict' keyword consistently with their documentation. + This may allow future optimizations. + + zdump again builds standalone with ckdadd and without setenv, + fixing a bug introduced in 2022g. (Problem reported by panic.) + + leapseconds.awk can now process a leap seconds file that never + expires; this might be useful if leap seconds are discontinued. + + Changes to commentary + + tz-link.html has a new section "Coordinating with governments and + distributors". (Thanks to Neil Fuller for some of the text.) + + To improve tzselect diagnostics, zone1970.tab's comments column is + now limited to countries that have multiple timezones. + + Note that leap seconds are planned to be discontinued by 2035. + + Release 2022g - 2022-11-29 08:58:31 -0800 Briefly: @@ -596,7 +702,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Starting with 2020a, zic -L truncated its output according to the "Expires" directive or "#expires" comment in the leapseconds file. The resulting TZif files omitted daylight saving transitions after - the leap second table expired, which led to far less-accurate + the leap second table expired, which led to far less accurate predictions of times after the expiry. Although future timestamps cannot be converted accurately in the presence of leap seconds, it is more accurate to convert near-future timestamps with a few @@ -616,7 +722,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 zic -L LEAPFILE -r @LO no longer generates an invalid TZif file that omits leap second information for the range LO..B when LO falls between two leap seconds A and B. Instead, it generates a - TZif version 4 file that represents the previously-missing + TZif version 4 file that represents the previously missing information. The TZif reader now allows the leap second table to begin with a @@ -670,7 +776,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 Fix a bug with 'zic -r @X' when X is a negative leap second that has a nonnegative correction. Without the fix, the output file was truncated so that X appeared to be a positive leap second. - Fix a similar, even-less-likely bug when truncating at a positive + Fix a similar, even less likely bug when truncating at a positive leap second that has a nonpositive correction. zic -r now reports an error if given rolling leap seconds, as this @@ -691,7 +797,7 @@ Release 2021b - 2021-09-24 16:23:00 -0700 fixing a bug introduced in 2014g. zdump -v now outputs timestamps at boundaries of what localtime - and gmtime can represent, instead of the less-useful timestamps + and gmtime can represent, instead of the less useful timestamps one day after the minimum and one day before the maximum. (Thanks to Arthur David Olson for prototype code, and to Manuela Friedrich for debugging help.) @@ -2311,7 +2417,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 names internally. zdump has a new -i option to generate transitions in a - more-compact but still human-readable format. This option is + smaller but still human-readable format. This option is experimental, and the output format may change in future versions. (Thanks to Jon Skeet for suggesting that an option was needed, and thanks to Tim Parenti and Chris Rovick for further comments.) @@ -2333,7 +2439,7 @@ Release 2016g - 2016-09-13 08:56:38 -0700 release 2016g, the version number is now something like '2016g-23-g50556e3-dirty' instead of the misleading '2016g'. Tagged releases use the same version number format as before, - e.g., '2016g'. To support the more-accurate version number, its + e.g., '2016g'. To support the more accurate version number, its specification has moved from a line in the Makefile to a new source file 'version'. @@ -2964,7 +3070,7 @@ Release 2014i - 2014-10-21 22:04:57 -0700 Since Belarus is not changing its clocks even though Moscow is, the time zone abbreviation in Europe/Minsk is changing from FET - to its more-traditional value MSK on 2014-10-26 at 01:00. + to its more traditional value MSK on 2014-10-26 at 01:00. (Thanks to Alexander Bokovoy for the heads-up about Belarus.) The new abbreviation IDT stands for the pre-1976 use of UT +08 in @@ -3056,7 +3162,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700 Changes affecting build procedure - 'make check' now checks better for properly-sorted data. + 'make check' now checks better for properly sorted data. Changes affecting documentation and commentary @@ -3557,7 +3663,7 @@ Release 2014a - 2014-03-07 23:30:29 -0800 Changes affecting past timestamps - Fiji ended DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00. + Fiji ended DST on 2014-01-19 at 02:00, not the previously scheduled 03:00. (Thanks to Steffen Thorsen.) Ukraine switched from Moscow to Eastern European time on 1990-07-01 @@ -3811,7 +3917,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 Allow POSIX-like TZ strings where the transition time's hour can range from -167 through 167, instead of the POSIX-required 0 through 24. E.g., TZ='FJT-12FJST,M10.3.1/146,M1.3.4/75' for the - new Fiji rules. This is a more-compact way to represent + new Fiji rules. This is a more compact way to represent far-future timestamps for America/Godthab, America/Santiago, Antarctica/Palmer, Asia/Gaza, Asia/Hebron, Asia/Jerusalem, Pacific/Easter, and Pacific/Fiji. Other zones are unaffected by @@ -3819,7 +3925,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700 Allow POSIX-like TZ strings where daylight saving time is in effect all year. E.g., TZ='WART4WARST,J1/0,J365/25' for Western - Argentina Summer Time all year. This supports a more-compact way + Argentina Summer Time all year. This supports a more compact way to represent the 2013d data for America/Argentina/San_Luis. Because of the change for San Luis noted above this change does not affect the current data. (Thanks to Andrew Main (Zefram) for @@ -3908,13 +4014,13 @@ Release 2013e - 2013-09-19 23:50:04 -0700 zdump now outputs "UT" when referring to Universal Time, not "UTC". "UTC" does not make sense for timestamps that predate the introduction - of UTC, whereas "UT", a more-generic term, does. (Thanks to Steve Allen + of UTC, whereas "UT", a more generic term, does. (Thanks to Steve Allen for clarifying UT vs UTC.) Data changes affecting behavior of tzselect and similar programs - Country code BQ is now called the more-common name "Caribbean Netherlands" - rather than the more-official "Bonaire, St Eustatius & Saba". + Country code BQ is now called the more common name "Caribbean Netherlands" + rather than the more official "Bonaire, St Eustatius & Saba". Remove from zone.tab the names America/Montreal, America/Shiprock, and Antarctica/South_Pole, as they are equivalent to existing @@ -4098,7 +4204,7 @@ Release 2013c - 2013-04-19 16:17:40 -0700 Macquarie Island is politically part of Australia, not Antarctica. (Thanks to Tobias Conradi.) - Sort Macquarie more-consistently with other parts of Australia. + Sort Macquarie more consistently with other parts of Australia. (Thanks to Tim Parenti.) @@ -5322,7 +5428,7 @@ Release data1998g - 1998-08-11 03:28:35 -0000 Release data1998f - 1998-07-20 13:50:00 -0000 [tzdata1998f.tar.gz is missing!] - Update the "leapseconds" file to include the newly-announced + Update the "leapseconds" file to include the newly announced insertion at the end of 1998. diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa index cfb9283c045d..6cf4e39c8c45 100644 --- a/contrib/tzdata/africa +++ b/contrib/tzdata/africa @@ -321,6 +321,14 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Mina Samuel (2016-07-04): # Egyptian government took the decision to cancel the DST, +# From Ahmad ElDardiry (2023-03-01): +# Egypt officially announced today that daylight savings will be +# applied from last Friday of April to last Thursday of October. +# From Paul Eggert (2023-03-01): +# Assume transitions are at 00:00 and 24:00 respectively. +# From Amir Adib (2023-03-07): +# https://www.facebook.com/EgyptianCabinet/posts/638829614954129/ + Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -330,6 +338,8 @@ Rule Egypt 2014 only - May 15 24:00 1:00 S Rule Egypt 2014 only - Jun 26 24:00 0 - Rule Egypt 2014 only - Jul 31 24:00 1:00 S Rule Egypt 2014 only - Sep lastThu 24:00 0 - +Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S +Rule Egypt 2023 max - Oct lastThu 24:00 0 - # Zone NAME STDOFF RULES FORMAT [UNTIL] #STDOFF 2:05:08.9 @@ -429,7 +439,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May # President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. # Monrovia: Executive Mansion. # -# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# Use the abbreviation "MMT" before 1972, as the more accurate numeric # abbreviation "-004430" would be one byte over the POSIX limit. # # Zone NAME STDOFF RULES FORMAT [UNTIL] @@ -566,8 +576,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # DST the coming summer... # # Some sources, in French: -# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB -# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- +# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-«-L%E2%80%99heure-d%E2%80%99été-ne-sera-pas-appliquée-cette-année-» +# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-économie-d-énergie-de-l-heure-d-été-ont-été-atteints- # # Our wrap-up: # https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html @@ -698,7 +708,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # More articles in the press # https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 -# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim +# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT+1-a-partir-de-dim # From Petr Machata (2011-03-30): # They have it written in English here: @@ -713,7 +723,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # According to Infomédiaire web site from Morocco (infomediaire.ma), # on March 9, 2012, (in French) Heure légale: # Le Maroc adopte officiellement l'heure d'été -# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 +# http://www.infomediaire.ma/news/maroc/heure-légale-le-maroc-adopte-officiellement-lheure-dété # Governing Council adopted draft decree, that Morocco DST starts on # the last Sunday of March (March 25, 2012) and ends on # last Sunday of September (September 30, 2012) @@ -837,19 +847,28 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # Friday or Saturday (and so the 2 days off are on a weekend), the next time # shift will be the next weekend. # -# From Paul Eggert (2020-05-31): +# From Milamber (2021-03-31, 2022-03-10): +# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 +# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ +# +# From Milamber (2023-03-14, 2023-03-15): +# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m. +# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m. +# https://www.mmsp.gov.ma/fr/actualites/passage-à-l%E2%80%99heure-gmt-à-partir-du-dimanche-19-mars-2023 +# +# From Paul Eggert (2023-03-14): # For now, guess that in the future Morocco will fall back at 03:00 # the last Sunday before Ramadan, and spring forward at 02:00 the -# first Sunday after two days after Ramadan. To implement this, +# first Sunday after one day after Ramadan. To implement this, # transition dates and times for 2019 through 2087 were determined by -# running the following program under GNU Emacs 26.3. (This algorithm +# running the following program under GNU Emacs 28.2. (This algorithm # also produces the correct transition dates for 2016 through 2018, # though the times differ due to Morocco's time zone change in 2018.) # (let ((islamic-year 1440)) # (require 'cal-islam) # (while (< islamic-year 1511) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) # (sunday 0)) # (while (/= sunday (mod (setq a (1- a)) 7))) # (while (/= sunday (mod b 7)) @@ -863,10 +882,6 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) -# -# From Milamber (2021-03-31, 2022-03-10), confirming these predictions: -# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 -# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 - @@ -919,7 +934,7 @@ Rule Morocco 2021 only - May 16 2:00 0 - Rule Morocco 2022 only - Mar 27 3:00 -1:00 - Rule Morocco 2022 only - May 8 2:00 0 - Rule Morocco 2023 only - Mar 19 3:00 -1:00 - -Rule Morocco 2023 only - Apr 30 2:00 0 - +Rule Morocco 2023 only - Apr 23 2:00 0 - Rule Morocco 2024 only - Mar 10 3:00 -1:00 - Rule Morocco 2024 only - Apr 14 2:00 0 - Rule Morocco 2025 only - Feb 23 3:00 -1:00 - @@ -935,7 +950,7 @@ Rule Morocco 2029 only - Feb 18 2:00 0 - Rule Morocco 2029 only - Dec 30 3:00 -1:00 - Rule Morocco 2030 only - Feb 10 2:00 0 - Rule Morocco 2030 only - Dec 22 3:00 -1:00 - -Rule Morocco 2031 only - Feb 2 2:00 0 - +Rule Morocco 2031 only - Jan 26 2:00 0 - Rule Morocco 2031 only - Dec 14 3:00 -1:00 - Rule Morocco 2032 only - Jan 18 2:00 0 - Rule Morocco 2032 only - Nov 28 3:00 -1:00 - @@ -951,7 +966,7 @@ Rule Morocco 2036 only - Nov 23 2:00 0 - Rule Morocco 2037 only - Oct 4 3:00 -1:00 - Rule Morocco 2037 only - Nov 15 2:00 0 - Rule Morocco 2038 only - Sep 26 3:00 -1:00 - -Rule Morocco 2038 only - Nov 7 2:00 0 - +Rule Morocco 2038 only - Oct 31 2:00 0 - Rule Morocco 2039 only - Sep 18 3:00 -1:00 - Rule Morocco 2039 only - Oct 23 2:00 0 - Rule Morocco 2040 only - Sep 2 3:00 -1:00 - @@ -967,7 +982,7 @@ Rule Morocco 2044 only - Aug 28 2:00 0 - Rule Morocco 2045 only - Jul 9 3:00 -1:00 - Rule Morocco 2045 only - Aug 20 2:00 0 - Rule Morocco 2046 only - Jul 1 3:00 -1:00 - -Rule Morocco 2046 only - Aug 12 2:00 0 - +Rule Morocco 2046 only - Aug 5 2:00 0 - Rule Morocco 2047 only - Jun 23 3:00 -1:00 - Rule Morocco 2047 only - Jul 28 2:00 0 - Rule Morocco 2048 only - Jun 7 3:00 -1:00 - @@ -983,7 +998,7 @@ Rule Morocco 2052 only - Jun 2 2:00 0 - Rule Morocco 2053 only - Apr 13 3:00 -1:00 - Rule Morocco 2053 only - May 25 2:00 0 - Rule Morocco 2054 only - Apr 5 3:00 -1:00 - -Rule Morocco 2054 only - May 17 2:00 0 - +Rule Morocco 2054 only - May 10 2:00 0 - Rule Morocco 2055 only - Mar 28 3:00 -1:00 - Rule Morocco 2055 only - May 2 2:00 0 - Rule Morocco 2056 only - Mar 12 3:00 -1:00 - @@ -999,7 +1014,7 @@ Rule Morocco 2060 only - Mar 7 2:00 0 - Rule Morocco 2061 only - Jan 16 3:00 -1:00 - Rule Morocco 2061 only - Feb 27 2:00 0 - Rule Morocco 2062 only - Jan 8 3:00 -1:00 - -Rule Morocco 2062 only - Feb 19 2:00 0 - +Rule Morocco 2062 only - Feb 12 2:00 0 - Rule Morocco 2062 only - Dec 31 3:00 -1:00 - Rule Morocco 2063 only - Feb 4 2:00 0 - Rule Morocco 2063 only - Dec 16 3:00 -1:00 - @@ -1015,7 +1030,7 @@ Rule Morocco 2067 only - Dec 11 2:00 0 - Rule Morocco 2068 only - Oct 21 3:00 -1:00 - Rule Morocco 2068 only - Dec 2 2:00 0 - Rule Morocco 2069 only - Oct 13 3:00 -1:00 - -Rule Morocco 2069 only - Nov 24 2:00 0 - +Rule Morocco 2069 only - Nov 17 2:00 0 - Rule Morocco 2070 only - Oct 5 3:00 -1:00 - Rule Morocco 2070 only - Nov 9 2:00 0 - Rule Morocco 2071 only - Sep 20 3:00 -1:00 - @@ -1031,7 +1046,7 @@ Rule Morocco 2075 only - Sep 15 2:00 0 - Rule Morocco 2076 only - Jul 26 3:00 -1:00 - Rule Morocco 2076 only - Sep 6 2:00 0 - Rule Morocco 2077 only - Jul 18 3:00 -1:00 - -Rule Morocco 2077 only - Aug 29 2:00 0 - +Rule Morocco 2077 only - Aug 22 2:00 0 - Rule Morocco 2078 only - Jul 10 3:00 -1:00 - Rule Morocco 2078 only - Aug 14 2:00 0 - Rule Morocco 2079 only - Jun 25 3:00 -1:00 - @@ -1041,13 +1056,13 @@ Rule Morocco 2080 only - Jul 21 2:00 0 - Rule Morocco 2081 only - Jun 1 3:00 -1:00 - Rule Morocco 2081 only - Jul 13 2:00 0 - Rule Morocco 2082 only - May 24 3:00 -1:00 - -Rule Morocco 2082 only - Jul 5 2:00 0 - +Rule Morocco 2082 only - Jun 28 2:00 0 - Rule Morocco 2083 only - May 16 3:00 -1:00 - Rule Morocco 2083 only - Jun 20 2:00 0 - Rule Morocco 2084 only - Apr 30 3:00 -1:00 - Rule Morocco 2084 only - Jun 11 2:00 0 - Rule Morocco 2085 only - Apr 22 3:00 -1:00 - -Rule Morocco 2085 only - Jun 3 2:00 0 - +Rule Morocco 2085 only - May 27 2:00 0 - Rule Morocco 2086 only - Apr 14 3:00 -1:00 - Rule Morocco 2086 only - May 19 2:00 0 - Rule Morocco 2087 only - Mar 30 3:00 -1:00 - @@ -1190,15 +1205,15 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # From P Chan (2020-12-03): # GMT was adopted as the standard time of Lagos on 1905-07-01. # Lagos Weekly Record, 1905-06-24, p 3 -# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235 +# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446,5221,1931,1235 # says "It is officially notified that on and after the 1st of July 1905 -# Greenwich Mean Solar Time will be adopted thought the Colony and +# Greenwich Mean Solar Time will be adopted throughout the Colony and # Protectorate, and that it will be necessary to put all clocks 13 minutes and # 35 seconds back, recording local mean time." # # It seemed that Lagos returned to LMT on 1908-07-01. # [The Lagos Standard], 1908-07-01, p 5 -# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523 +# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92,3590,3944,2523 # says "Scarcely have the people become accustomed to this new time, when # another official notice has now appeared announcing that from and after the # 1st July next, return will be made to local mean time." @@ -1210,7 +1225,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27 # "On January 1st [1914], a universal standard time for Nigeria was adopted, # viz., half an hour fast on Greenwich mean time, corresponding to the meridian -# 7 [degrees] 30' E. long." +# 7° 30' E. long." # Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos # was the local mean time. On 1st January, 1914, standard time for the whole of # Nigeria was introduced ... Lagos time has been advanced about 16 minutes @@ -1228,7 +1243,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first # reading of this Bill by the Legislative Council of the Colony of Nigeria on # Thursday 1919-08-28: -# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915 +# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261,3408,2994,1915 # "The proposal is that the Globe should be divided into twelve zones East and # West of Greenwich, of one hour each, Nigeria falling into the zone with a # standard of one hour fast on Greenwich Mean Time. Nigeria standard time is diff --git a/contrib/tzdata/antarctica b/contrib/tzdata/antarctica index f02755ae856f..fc603e9996de 100644 --- a/contrib/tzdata/antarctica +++ b/contrib/tzdata/antarctica @@ -292,7 +292,7 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1 # but that he found it more convenient to keep GMT+12 # as supplies for the station were coming from McMurdo Sound, # which was on GMT+12 because New Zealand was on GMT+12 all year -# at that time (1957). (Source: Siple's book 90 Degrees South.) +# at that time (1957). (Source: Siple's book 90° South.) # # From Susan Smith # http://www.cybertours.com/whs/pole10.html diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia index 199e6ad6adc3..dd06a5fd21fe 100644 --- a/contrib/tzdata/asia +++ b/contrib/tzdata/asia @@ -2691,6 +2691,12 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 # Lebanon +# +# From Saadallah Itani (2023-03-23): +# Lebanon too announced today delay of Spring forward from March 25 to April 20. +# From Paul Eggert (2023-03-23): +# https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S Rule Lebanon 1920 only - Oct 25 0:00 0 - @@ -2713,9 +2719,11 @@ Rule Lebanon 1988 only - Jun 1 0:00 1:00 S Rule Lebanon 1989 only - May 10 0:00 1:00 S Rule Lebanon 1990 1992 - May 1 0:00 1:00 S Rule Lebanon 1992 only - Oct 4 0:00 0 - -Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S +Rule Lebanon 1993 2022 - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - +Rule Lebanon 2023 only - Apr 21 0:00 1:00 S +Rule Lebanon 2024 max - Mar lastSun 0:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT @@ -2954,7 +2962,7 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 # 9pm and moving clocks forward by one hour for the next three months. ...." # # http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html -# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4 +# http://www.dailytimes.com.pk/default.asp?page=2008\05\15\story_15-5-2008_pg1_4 # From Arthur David Olson (2008-05-19): # XXX--midnight transitions is a guess; 2008 only is a guess. @@ -3277,7 +3285,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # Some of many sources in Arabic: # http://www.samanews.com/index.php?act=Show&id=122638 # -# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html +# http://safa.ps/details/news/74352/بدء-التوقيت-الصيفي-بالضفة-وغزة-ليلة-الجمعة.html # # Our brief summary: # https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html @@ -3287,7 +3295,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # time from midnight on Friday, March 29, 2013" (translated). # [These are in Arabic and are for Gaza and for Ramallah, respectively.] # http://www.samanews.com/index.php?act=Show&id=154120 -# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html +# http://safa.ps/details/news/99844/رام-الله-بدء-التوقيت-الصيفي-29-الجاري.html # From Steffen Thorsen (2013-09-24): # The Gaza and West Bank are ending DST Thursday at midnight @@ -3385,9 +3393,41 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # (2022-08-31): ... the Saturday before the last Sunday in March and October # at 2:00 AM ,for the years from 2023 to 2026. # (2022-09-05): https://mtit.pna.ps/Site/New/1453 -# -# From Paul Eggert (2022-08-31): -# For now, assume that this rule will also be used after 2026. + +# From Heba Hamad (2023-03-22): +# ... summer time will begin in Palestine from Saturday 04-29-2023, +# 02:00 AM by 60 minutes forward. +# +# From Paul Eggert (2023-03-22): +# For now, guess that spring and fall transitions will normally +# continue to use 2022's rules, that during DST Palestine will switch +# to standard time at 02:00 the last Saturday before Ramadan and back +# to DST at 02:00 the first Saturday after Ramadan, and that +# if the normal spring-forward or fall-back transition occurs during +# Ramadan the former is delayed and the latter advanced. +# To implement this, I predicted Ramadan-oriented transition dates for +# 2023 through 2086 by running the following program under GNU Emacs 28.2, +# with the results integrated by hand into the table below. +# Predictions after 2086 are approximated without Ramadan. +# +# (let ((islamic-year 1444)) +# (require 'cal-islam) +# (while (< islamic-year 1510) +# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (saturday 6)) +# (while (/= saturday (mod (setq a (1- a)) 7))) +# (while (/= saturday (mod b 7)) +# (setq b (1+ b))) +# (setq a (calendar-gregorian-from-absolute a)) +# (setq b (calendar-gregorian-from-absolute b)) +# (insert +# (format +# (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n" +# "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n") +# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) +# (setq islamic-year (+ 1 islamic-year)))) # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -3427,8 +3467,86 @@ Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S Rule Palestine 2020 only - Oct 24 1:00 0 - Rule Palestine 2021 only - Oct 29 1:00 0 - Rule Palestine 2022 only - Mar 27 0:00 1:00 S -Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - -Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - +Rule Palestine 2023 only - Apr 29 2:00 1:00 S +Rule Palestine 2024 only - Apr 13 2:00 1:00 S +Rule Palestine 2025 only - Apr 5 2:00 1:00 S +Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2036 only - Oct 18 2:00 0 - +Rule Palestine 2037 only - Oct 10 2:00 0 - +Rule Palestine 2038 only - Sep 25 2:00 0 - +Rule Palestine 2039 only - Sep 17 2:00 0 - +Rule Palestine 2039 only - Oct 22 2:00 1:00 S +Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - +Rule Palestine 2040 only - Sep 1 2:00 0 - +Rule Palestine 2040 only - Oct 13 2:00 1:00 S +Rule Palestine 2041 only - Aug 24 2:00 0 - +Rule Palestine 2041 only - Sep 28 2:00 1:00 S +Rule Palestine 2042 only - Aug 16 2:00 0 - +Rule Palestine 2042 only - Sep 20 2:00 1:00 S +Rule Palestine 2043 only - Aug 1 2:00 0 - +Rule Palestine 2043 only - Sep 12 2:00 1:00 S +Rule Palestine 2044 only - Jul 23 2:00 0 - +Rule Palestine 2044 only - Aug 27 2:00 1:00 S +Rule Palestine 2045 only - Jul 15 2:00 0 - +Rule Palestine 2045 only - Aug 19 2:00 1:00 S +Rule Palestine 2046 only - Jun 30 2:00 0 - +Rule Palestine 2046 only - Aug 11 2:00 1:00 S +Rule Palestine 2047 only - Jun 22 2:00 0 - +Rule Palestine 2047 only - Jul 27 2:00 1:00 S +Rule Palestine 2048 only - Jun 6 2:00 0 - +Rule Palestine 2048 only - Jul 18 2:00 1:00 S +Rule Palestine 2049 only - May 29 2:00 0 - +Rule Palestine 2049 only - Jul 3 2:00 1:00 S +Rule Palestine 2050 only - May 21 2:00 0 - +Rule Palestine 2050 only - Jun 25 2:00 1:00 S +Rule Palestine 2051 only - May 6 2:00 0 - +Rule Palestine 2051 only - Jun 17 2:00 1:00 S +Rule Palestine 2052 only - Apr 27 2:00 0 - +Rule Palestine 2052 only - Jun 1 2:00 1:00 S +Rule Palestine 2053 only - Apr 12 2:00 0 - +Rule Palestine 2053 only - May 24 2:00 1:00 S +Rule Palestine 2054 only - Apr 4 2:00 0 - +Rule Palestine 2054 only - May 16 2:00 1:00 S +Rule Palestine 2055 only - May 1 2:00 1:00 S +Rule Palestine 2056 only - Apr 22 2:00 1:00 S +Rule Palestine 2057 only - Apr 7 2:00 1:00 S +Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2068 only - Oct 20 2:00 0 - +Rule Palestine 2069 only - Oct 12 2:00 0 - +Rule Palestine 2070 only - Oct 4 2:00 0 - +Rule Palestine 2071 only - Sep 19 2:00 0 - +Rule Palestine 2072 only - Sep 10 2:00 0 - +Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2073 only - Sep 2 2:00 0 - +Rule Palestine 2073 only - Oct 7 2:00 1:00 S +Rule Palestine 2074 only - Aug 18 2:00 0 - +Rule Palestine 2074 only - Sep 29 2:00 1:00 S +Rule Palestine 2075 only - Aug 10 2:00 0 - +Rule Palestine 2075 only - Sep 14 2:00 1:00 S +Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - +Rule Palestine 2076 only - Jul 25 2:00 0 - +Rule Palestine 2076 only - Sep 5 2:00 1:00 S +Rule Palestine 2077 only - Jul 17 2:00 0 - +Rule Palestine 2077 only - Aug 28 2:00 1:00 S +Rule Palestine 2078 only - Jul 9 2:00 0 - +Rule Palestine 2078 only - Aug 13 2:00 1:00 S +Rule Palestine 2079 only - Jun 24 2:00 0 - +Rule Palestine 2079 only - Aug 5 2:00 1:00 S +Rule Palestine 2080 only - Jun 15 2:00 0 - +Rule Palestine 2080 only - Jul 20 2:00 1:00 S +Rule Palestine 2081 only - Jun 7 2:00 0 - +Rule Palestine 2081 only - Jul 12 2:00 1:00 S +Rule Palestine 2082 only - May 23 2:00 0 - +Rule Palestine 2082 only - Jul 4 2:00 1:00 S +Rule Palestine 2083 only - May 15 2:00 0 - +Rule Palestine 2083 only - Jun 19 2:00 1:00 S +Rule Palestine 2084 only - Apr 29 2:00 0 - +Rule Palestine 2084 only - Jun 10 2:00 1:00 S +Rule Palestine 2085 only - Apr 21 2:00 0 - +Rule Palestine 2085 only - Jun 2 2:00 1:00 S +Rule Palestine 2086 only - Apr 13 2:00 0 - +Rule Palestine 2086 only - May 18 2:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -3632,7 +3750,7 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1 # standard time is SLST. # # From Paul Eggert (2016-10-18): -# "SLST" seems to be reasonably recent and rarely-used outside time +# "SLST" seems to be reasonably recent and rarely used outside time # zone nerd sources. I searched Google News and found three uses of # it in the International Business Times of India in February and # March of this year when discussing cricket match times, but nothing diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia index af0410ab9035..0633a30efd8b 100644 --- a/contrib/tzdata/australasia +++ b/contrib/tzdata/australasia @@ -323,7 +323,7 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov # From Steffen Thorsen (2013-01-10): # Fiji will end DST on 2014-01-19 02:00: -# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-(1).aspx # From Ken Rylander (2014-10-20): # DST will start Nov. 2 this year. @@ -723,7 +723,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5 # # Samoa's Daylight Saving Time Act 2009 is available here, but does not # contain any dates: -# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf +# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20(English)%20-%20Final%207-7-091.pdf # From Laupue Raymond Hughes (2010-10-07): # Please see @@ -1808,7 +1808,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # period. It would probably be reasonable to assume Guam use GMT+9 during # that period of time like the surrounding area. -# From Paul Eggert (2018-11-18): +# From Paul Eggert (2023-01-23): # Howse writes (p 153) "The Spaniards, on the other hand, reached the # Philippines and the Ladrones from America," and implies that the Ladrones # (now called the Marianas) kept American date for quite some time. @@ -1821,7 +1821,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # they did as that avoids the need for a separate zone due to our 1970 cutoff. # # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time, -# under the name "Chamorro Standard Time". There is no official abbreviation, +# under the name "Chamorro standard time". There is no official abbreviation, # but Congressman Robert A. Underwood, author of the bill that became law, # wrote in a press release (2000-12-27) that he will seek the use of "ChST". @@ -2199,24 +2199,18 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # an international standard, there are some places on the high seas where the # correct date is ambiguous. -# From Wikipedia (2005-08-31): -# Before 1920, all ships kept local apparent time on the high seas by setting -# their clocks at night or at the morning sight so that, given the ship's -# speed and direction, it would be 12 o'clock when the Sun crossed the ship's -# meridian (12 o'clock = local apparent noon). During 1917, at the -# Anglo-French Conference on Time-keeping at Sea, it was recommended that all -# ships, both military and civilian, should adopt hourly standard time zones -# on the high seas. Whenever a ship was within the territorial waters of any -# nation it would use that nation's standard time. The captain was permitted -# to change his ship's clocks at a time of his choice following his ship's -# entry into another zone time - he often chose midnight. These zones were -# adopted by all major fleets between 1920 and 1925 but not by many -# independent merchant ships until World War II. - -# From Paul Eggert, using references suggested by Oscar van Vlijmen -# (2005-03-20): -# -# The American Practical Navigator (2002) -# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187 -# talks only about the 180-degree meridian with respect to ships in -# international waters; it ignores the international date line. +# From Wikipedia (2023-01-23): +# The nautical time zone system is analogous to the terrestrial time zone +# system for use on high seas. Under the system time changes are required for +# changes of longitude in one-hour steps. The one-hour step corresponds to a +# time zone width of 15° longitude. The 15° gore that is offset from GMT or +# UT1 (not UTC) by twelve hours is bisected by the nautical date line into two +# 7°30' gores that differ from GMT by ±12 hours. A nautical date line is +# implied but not explicitly drawn on time zone maps. It follows the 180th +# meridian except where it is interrupted by territorial waters adjacent to +# land, forming gaps: it is a pole-to-pole dashed line. + +# From Paul Eggert (2023-01-23): +# The American Practical Navigator , +# 2019 edition, merely says that the International Date Line +# "coincides with the 180th meridian over most of its length." diff --git a/contrib/tzdata/backward b/contrib/tzdata/backward index 0ae5d74108e6..421f2ec6b9f8 100644 --- a/contrib/tzdata/backward +++ b/contrib/tzdata/backward *** 962 LINES SKIPPED *** From nobody Sat Mar 25 17:06:45 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PkQTy1FFsz41Rmk; Sat, 25 Mar 2023 17:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PkQTx6dp1z4J1g; Sat, 25 Mar 2023 17:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679764006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fc2jG4p09e5mY+AqovujpM55DMhDsJNXiTNczq+DsAE=; b=q4W/M4IT3iN5nMRwxSbORTCQvFYjlGjUmlmA6RofWJAfjn3f+z5tfnzszxe2ZWHHyJraCk DnVTLQ4PCbqDV7hN/cMX0oXchIniZju1ee5fvtmHkkR9BnyebryjU3i+JgrCElVbDXqwat yu/jJyO71OeU8FJ980LkW9I+/JChnF9JZXJpNxs1idi0nKRxb42S5wXPR9LWQ62/yaXt/0 ZroYJkE0Hfg3YtwBBXuYK09Z9QSnJRMCmr7ieE1g+Twictn5wukBKo0ekQcG+R8Nw9Hpe+ B8/I35Ok+R39RWcydyJBphfCuAT0Bu0FdY60kljrL7U97wRipqZWUw7M7LHiag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679764006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Fc2jG4p09e5mY+AqovujpM55DMhDsJNXiTNczq+DsAE=; b=BxE4Pi//ErY30WtYmTsNCT0OC6WeKxrxDiJAF9wCL63ryqpqvZUVH73bbC5/884uS51g7r PYXCp2tT2mCVWNAJU7RVLiHXp8kOr+8OvhxY9bYGU8sJ6qWP0dKkU1c7ElKgwghu8V2Vq0 qUIzAPLHn+xtzbq61pckqWkwSyziVR994hJxxHw7TWhAZJx1dFQx687fIlJGFoGJIMF+t9 Uh14/c+ky2jV5cCU+IcMtfInSBbRKfIDafojaFgfGywYDYf/LLxuYOyyfmDF6DFjNRxSe4 2XqB18GyX/YzXU1FOQWqdK4/qCSZ6w4XF7Vp4Fdwwjfh2ATiIRPUwEKtxgAwjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679764006; a=rsa-sha256; cv=none; b=VIZI8lVydXdA9kRb8EO/BW6wcttAiF1Kct9fNExaiAazOV7i8SrH1mr34u6baSH4P6ed4V 2ZqqFeLJVTpCM0BmMvUkG/XrjXy1vyi5d12GFXIFqTBM3QA7EhL0AMidqC03oaFKyArmAv VfSOk1zNd5XTRr+wA4U0X+nnVFC/omh9bWj5aMYb+g1C1Qk3i/jud5ZT6IIHsDy+PaCXgK N883L75jAovT+UH728wJUiC+3+dPmjUnZ7ch4FALb37mJ0oiaDSdhEAR9DwKfdJ3iJF9tO dxNkPiQpK1lhfp9BgNswN6XOgfGz52NgzL76a1E3YoxIluwvOW2ijJ+yydnCww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PkQTx5YmYz16m9; Sat, 25 Mar 2023 17:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32PH6j5B078852; Sat, 25 Mar 2023 17:06:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32PH6jjE078851; Sat, 25 Mar 2023 17:06:45 GMT (envelope-from git) Date: Sat, 25 Mar 2023 17:06:45 GMT Message-Id: <202303251706.32PH6jjE078851@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: 0386b9bd6cda - releng/13.2 - 13.2: update to RC5 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/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 0386b9bd6cda8dba4defac8197c3deaeb06ff9d7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0386b9bd6cda8dba4defac8197c3deaeb06ff9d7 commit 0386b9bd6cda8dba4defac8197c3deaeb06ff9d7 Author: Colin Percival AuthorDate: 2023-03-25 15:58:19 +0000 Commit: Colin Percival CommitDate: 2023-03-25 17:06:37 +0000 13.2: update to RC5 We're doing one more (hopefully last!) RC but decided against waiting the usual 1 week between RCs. Approved by: re (implicit) --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 53b153cb207f..6348d9174c3b 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -54,7 +54,7 @@ TYPE="FreeBSD" REVISION="13.2" -BRANCH="RC4" +BRANCH="RC5" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi