From nobody Sun May 7 05:33:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QDY4V74zDz49jJr; Sun, 7 May 2023 05: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 4QDY4V6cW6z3w3v; Sun, 7 May 2023 05: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=1683437626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPO181yduNRlx5F3uFEax+6oux0K7e7ivTxQQX39Opo=; b=yfQfPkxZbPyVKxN4Owrbt3EY1dJ2NSKPrjDba/TrUgCauEpoRbU5B0wvzCkzMuJq5CI6t2 T+z4dZzvGuXY4oEgEfjbvUrHybDuRUDsUIxyLBshbOFOW92CxXxEEeQLwlZeQQ0S7554lY 0SruVt6E8ktLsYxNIH56dvp2TGVe1WHteiQVfnUlb9p+Hm4z4wZsf2/cyuFMoUjj3LFAHe RiGFkPLRm3nYbdyMWYTDF452Ue/MDFeDmw5tpPBcube218F/ByFo1ejYtJacJoP1JyNqGZ qTr6LTN13qZXipecPtOZInSE8PusEjZ9zS6Q0BoCb/EBB+IJs62Gi2+IU2WZ9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683437626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XPO181yduNRlx5F3uFEax+6oux0K7e7ivTxQQX39Opo=; b=dnbLsjgfmMQc1Cykr/VAxZKTfnq7IbUAA5w8kA+POxUHPV/6VnXyy0BlWyIpBvDbrL1JIF F0ycxUTJ7/ZnINXiYDSIdrQyimxJFFfHg7aYFfxCBcjvDpqrYZtm3AQ26gkh4JUjuHVWts B99K14VMSEIzxuA1C0dL+2MT5+88ztAOKXgiXirUGVD7AtXoZ1JPJlVdHAcGpB07qYlJ4a yO4mIUDcj+FmnuJSc3VMmfroEVGXqz6BH28HaIP2gJmO9VbfWdEdJzmsH9tQ/dwQOQ7U0P qilY1pXd4CoAbFPzcf6FXDsDCaiantqCdvCYwyMp4Fb1ya+uNDPu7WZK8T0GMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683437626; a=rsa-sha256; cv=none; b=YMkkOWSoAD3cUaIhDETkkQ5nxjcgS0wLqC3VZnAzcQdJNo8PWC/9OJY4SPYfTqZsprqSKG yEScgPAUuhr8IMSmvve2glE+vQFewsppxE28t/loXhwvUXzvG1rgnmlfA5G4WwFzxjmhKs U6Fvg4gSDAmJbsZsj77X0A8o/xpDvzUU1q1B6VLKCdo+xe+tunwKTjFVCrXrG9y6adWD0B kzEXo1tw/lKS4/PZaoAyrStETfyGF/WCe3Kg93mnsiccT7DByY+4IVCTLcl+blPbi7jmSF cDWRL8+2f5oKaSuIctE/7WPuUs8Q/GyRN/pH/AqfWAVqEYqtqCpvjQMFHEWvVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QDY4V5h00z15tk; Sun, 7 May 2023 05: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 3475Xk7f087543; Sun, 7 May 2023 05: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 3475XkbN087542; Sun, 7 May 2023 05:33:46 GMT (envelope-from git) Date: Sun, 7 May 2023 05:33:46 GMT Message-Id: <202305070533.3475XkbN087542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: af8e0a60d960 - main - RELNOTES: fix consistency List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: af8e0a60d960c5cb261e6365a35952b6b85a6a34 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=af8e0a60d960c5cb261e6365a35952b6b85a6a34 commit af8e0a60d960c5cb261e6365a35952b6b85a6a34 Author: Elliott Mitchell AuthorDate: 2023-05-07 05:30:21 +0000 Commit: Warner Losh CommitDate: 2023-05-07 05:32:04 +0000 RELNOTES: fix consistency Colons on the commit ids started being lost at 89d197cc991a and continued subsequent updates. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D39991 --- RELNOTES | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RELNOTES b/RELNOTES index 4d69e2bbc36d..2046e1f3c60f 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,20 +10,20 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. -3416e102c4e9 +3416e102c4e9: Remove TI code from armv7 GENERIC kernel. This code doesn't cope with newer DTS and hasn't in a long time so support for TI armv7 platform (like BeagleBone and Pandaboard) is now removed from GENERIC. -d198b8774d2c +d198b8774d2c: Add a new "fwget" utility. The goal of this utility is to inspect the system for peripherals that needs firmware and install the appropriate packages for them. For now only pci subsystem is supported and only firmwares for Intel and AMD GPUs are known. -896516e54a8c +896516e54a8c: Add a new "syskrb5" mount option for Kerberized NFSv4.1/4.2 mounts. Without this patch, a Kerberized NFSv4.1/4.2 mount must provide a Kerberos credential for the client at mount time. @@ -34,7 +34,7 @@ d198b8774d2c credential is required at mount time. See mount_nfs(8). -330aa8acdec7,ff2f1f691cdb +330aa8acdec7,ff2f1f691cdb: Adds support for the SP4_MACH_CRED case for the NFSv4.1/4.2 ExchangeID operation since the Linux NFSv4.1/4.2 client is now using this for Kerberized mounts. From nobody Sun May 7 09:49:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QDflQ472lz49yVd; Sun, 7 May 2023 09:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QDflQ3cJ6z4Grv; Sun, 7 May 2023 09:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683452962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GnQN02pwub0WrnSwAm3Ih8w97SqAjAojpLceHUgsWe0=; b=BEvoyFFr7JpvhiPUvqWjERxtjEC6L3rXgKQmJl7TeeGJXn5f3PNek9pO4JdfOOXW5NU5+N v4Z/o0HUUHQ1wbYlfaqYk50STIYdYZZofQxJ0aHdeZMdw1SeO3Keiu0wXb442IAWNAGDBv AdAC5k0KxTTvFUWwjJtOW2ehdrVrHze7eRVCop5G4DPM9m5zBiP0rdI9+bQLA9+fGWYqlW S37q4aiYecpvgG+ND2t87BQ3sX14dWqwWSEMoTD1qbwioHARSeOxwq5dWmMloTPqRVenzr WTGZFmKitXoiWyVTjZIrNnmYD/Mtt+64nFEaz5nU4OeVSmdLlfZ+0TI768S7yA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683452962; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GnQN02pwub0WrnSwAm3Ih8w97SqAjAojpLceHUgsWe0=; b=AJhbRS8MNkETVnxlKiaKkFGEoz+bckc3AoYAmCawF/bMFRIYclozg0Pc+P9sMKlvZ3O3Gw AZUpLriTPsZO4VtaeTP8TaDOZqgio79a5w8ZBZDd30yFm6Am1phyZyeac1Ttgn92MC0E6p qy+42q9A3PBDPVoiBQ++fqJTPd5t9mluQsFX1pV+30bs3pRUr4vMYUw1ClLYkPZXFcwHRm aI5eYVu1oBxS9boEOO6oVG7nuARusCR15LrwZ2BkhP92AK0ULZpT0m9c6A7uGJq8pYIvN8 p1weyNSl1GrBupD411JtBX5WerRvKvA3NZc1TFeXx1/KuHsddPrbz3xRLdLENA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683452962; a=rsa-sha256; cv=none; b=enmtA2OrRd0ViD3Egl5XfHI5Du/hvWCym0uUpRGh4bFv55Few1S/ITy3t2HtG2HztyKMzr WW/CxgvGYESgNAF4SwYHEfjBed/POlC7Oiu3TFNttOMae1tQQ8B5sr+QC1ZajMQNvl34+A OHgjc/UbcRTzR9fbAZn0IrMmOwcTRWlAHslckLAymtcg6WIQEz0yEwlRafglEdqYua0EEd Nw4n8ifa+8xD+hQBYF2DuNk5hYT2jRITfI2PDN0abHtz83DQNF8UkOE/XvVX9FEinR1pDN 5Gu+jxJbsRkt42Jf0jYrzQuDcXKgVxYb7p3sxkDy+RA8h+7Qi9xArT+opLfYsQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QDflQ2g20z1CxG; Sun, 7 May 2023 09:49: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 3479nMt1098245; Sun, 7 May 2023 09:49:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3479nMXT098244; Sun, 7 May 2023 09:49:22 GMT (envelope-from git) Date: Sun, 7 May 2023 09:49:22 GMT Message-Id: <202305070949.3479nMXT098244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mariusz Zaborski Subject: git: 95950880ade0 - main - libc: document when the namespace was created List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oshogbo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95950880ade0b850b186aa60fc6606ed0ab30873 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by oshogbo: URL: https://cgit.FreeBSD.org/src/commit/?id=95950880ade0b850b186aa60fc6606ed0ab30873 commit 95950880ade0b850b186aa60fc6606ed0ab30873 Author: Mariusz Zaborski AuthorDate: 2023-05-07 09:45:13 +0000 Commit: Mariusz Zaborski CommitDate: 2023-05-07 09:45:13 +0000 libc: document when the namespace was created Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D39989 --- lib/libc/Versions.def | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/Versions.def b/lib/libc/Versions.def index fea6693cee8a..3d891edf79f5 100644 --- a/lib/libc/Versions.def +++ b/lib/libc/Versions.def @@ -35,6 +35,7 @@ FBSD_1.5 { FBSD_1.6 { } FBSD_1.5; +# This version was first added to 14.0-current. FBSD_1.7 { } FBSD_1.6; From nobody Sun May 7 23:52:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QF1Rk6ncfz49kBt; Sun, 7 May 2023 23:52: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 4QF1Rk6M6lz3v4H; Sun, 7 May 2023 23:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683503522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdGfW0SWaRt6SOn0DLe1PKkn8IYET4pG8xst9zX0raM=; b=k0He7FoRjolE1c4RD7LSKo8bm3NXg28cM/L9Qrminnt2EYegtMDkR+ttI/b3on1GI4W/0B 7R/n4Qzne/fGtNL8v4fNIqNrenHccMeh049qbD2BZSHvvuo4OZHnd3ghBAN/6GoqHfEVRz JR1zSeyRtaZCPD59D+RHk0Jm0fmqYSe/JLzrMam7mvDOQGT5kP5r9vyg1HposzpqbhdjEq 640cBHLNiDyPLHdjFKzxFLfktQddcuA9BeHGzE5hZbyHNoYQNNAlpDs1xfKK0cQYVvO/7F W7Eyfm1XoUzd8RbfCQoZ5ITtmjDQozBytWds17a211Grog2O748MVn8AFEGR7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683503522; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OdGfW0SWaRt6SOn0DLe1PKkn8IYET4pG8xst9zX0raM=; b=TFpdwerTt9jkq+f2TNNi66GWCYydih260MCZPzugsHlr9b41VrKF63gc8+fxial0kUZcxR 03iHwjcVTBGnJowhD8QdI8DR8tfP8KaTS7kUdwVTannEgkKAkiXgtmdvucrttyJ79BiNS5 jgrL9vQO55VpH/VLKq5plt1VknmWnkmeCtverVXOTUvkAkIG3ovq5j28A2JbWPhhkCkXU4 oNf8bk/+hWGFjROgApBgtDYzknyhIhaHiAj/j3Z/GnFRYMLKDaXle/K46oZdjWJkuXZfhb IQ9DuOuDZMo9v3xcNbkT3YucvUqWWaqp23/MLQLYmBgu+cveSMTfMKXa1kXaTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683503522; a=rsa-sha256; cv=none; b=IWc0S2NsgaXbLvcXNa3ekmk+kvxGoSqjEIhwflEbWZU7dEIEMeCJnZgggiEkucKUaq0fKO X9kR+yi5dRIQpzNqP5cSH6W3OHhlgNom3ksbSKjX+twCMV35SC1fJ5sXI/ugUNaNdMf6VP VdXBRxCw2hv2oYX5wcGEyRAdYTHuX9rwypgTleymA9mfBnju7Rzsphem8/wAkiRAQ/Rt4I IqhD1Xr7RWm27VB6IOXbh2yx2U2TIIgn5pL3s6QdJbOJv4AhmXErHzlzWWxaJnyqhXztia IH7WUEWKzPau4yqslmQDUW7FEXE22U0nnPjpX1XKaL1sjUGyXUkLkgViTBxDsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QF1Rk5Px4zddQ; Sun, 7 May 2023 23:52: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 347Nq2gr002858; Sun, 7 May 2023 23:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347Nq2Ft002844; Sun, 7 May 2023 23:52:02 GMT (envelope-from git) Date: Sun, 7 May 2023 23:52:02 GMT Message-Id: <202305072352.347Nq2Ft002844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 080917298512 - main - unionfs: fixes to unionfs_nodeget() error handling List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08091729851294fe302548af3c57c51aa12692fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=08091729851294fe302548af3c57c51aa12692fb commit 08091729851294fe302548af3c57c51aa12692fb Author: Jason A. Harmening AuthorDate: 2023-03-26 01:30:25 +0000 Commit: Jason A. Harmening CommitDate: 2023-05-07 23:30:43 +0000 unionfs: fixes to unionfs_nodeget() error handling If either the lower or upper vnode is found to be doomed after locking it, the newly-created unionfs node won't be associated with it and its lock will be dropped. In that case, clear the uppervp and lowervp locals as necessary to avoid further use of the vnode in unionfs_nodeget(). If the upper vnode is doomed but the lower vnode remains valid, additionally reset the unionfs node's v_vnlock field to point to the lower vnode lock. Reviewed by: kib, markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D39767 --- sys/fs/unionfs/union_subr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 264d37634949..702b10bb6204 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -397,13 +397,15 @@ unionfs_nodeget(struct mount *mp, struct vnode *uppervp, } if (lowervp != NULL && VN_IS_DOOMED(lowervp)) { vput(lowervp); - unp->un_lowervp = NULL; + unp->un_lowervp = lowervp = NULL; } if (uppervp != NULL && VN_IS_DOOMED(uppervp)) { vput(uppervp); - unp->un_uppervp = NULL; + unp->un_uppervp = uppervp = NULL; + if (lowervp != NULLVP) + vp->v_vnlock = lowervp->v_vnlock; } - if (unp->un_lowervp == NULL && unp->un_uppervp == NULL) { + if (lowervp == NULL && uppervp == NULL) { unionfs_nodeget_cleanup(vp, unp); return (ENOENT); } From nobody Sun May 7 23:52:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QF1Rm0X7bz49k92; Sun, 7 May 2023 23:52:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QF1Rl74ZPz3v75; Sun, 7 May 2023 23:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683503524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DJWA12kiud4skPPgnRbUU4HkaDKCOlC46pHRX8+alVQ=; b=L2768W40U/TZh/NITVdS+FkhUEZG/TZIt8v8aSbD648YQTocLwEl2882SNchRdMAt7BHrx mxWR9LXlS5JqEqx+TP91+75RlMRf6eE+hudqDWvmyCgGnreXGVwDmhSzfIsEPRnHCYGied utFdH41n4ym6b5S8NtO6cie6d2NA0CjViyD3gBWBV3aPyFPcX8IU91xzj/eWywCEK7rwGF f44ptTVdnmWZMsWe9c9Afp6idb94F4Nv5GVJxk0o5wIQTv7yOgwsrbXcGy7V9LiZGSHpgv 82fAOYEO/PXFC+FyngQ7JfJOSEzt28qUc1Zh+/WT0xVoczTiZKy8isFgecG6OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683503524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DJWA12kiud4skPPgnRbUU4HkaDKCOlC46pHRX8+alVQ=; b=F6PQDBcNUkCdue23FpmRva/vDIBHYrKoFoQjmRtVRL+lbzHvxkX8yZVb2+RjNmdyAugc5K cVE4n+4U6cRuwYoOkBo4PYQPF7qorI+0ECjDDZTU6uUplUtT7IUzjMWe5MxNgAPDIIVOb4 VrnM62HiDyOdk7ypilCXP30ZW8vrNjtGXp7eR20MaSOeP28J/3z5rxIlCJp9yj7m+T97tM 00LQDG0tVg5cs0mA0NPOvqjmlkIkcB5zZ3ISmNKSVpB6g88IwBujGP24gcxCoQtYgs9WMC shAXJXWsoGRKUiMMqngEuzC8ziTz7gchbvevdZ86VsBPXKhJGGvBFOHBbm2Q7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683503524; a=rsa-sha256; cv=none; b=tlBW0eUeJL8e3CcrIInWdk5PIRp0ZMna6+OyU7RTArb3HMYTZqh920jonoQXSMReJTqi81 WfZNo1VlRKSk7n5buOBgBc25q3WBd1b13kCddRHI8VNQXZW9FZW3Qx4tHpi0WX6iRcs3Pe 0gBNNgJcwv177Osy6DnboJn1Q7iu47rL0+vhLgXgVp76UNG+shrC1EOCcBhK3kHSwVMJzy 4nMV/APp6shNMDJgnk14b+vvp+3eQbVaKDtYJM+EZ8sAz72lO5llUV5trWNWezbkIobJSi dvRPJi54D9WE5YaAZr09Rbj8YRuhrdiSkM/XNCpIsDr+vdR6YCx0mwgBN0cD8A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QF1Rl5txRzdv6; Sun, 7 May 2023 23:52: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 347Nq3si004397; Sun, 7 May 2023 23:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347Nq3sH004385; Sun, 7 May 2023 23:52:03 GMT (envelope-from git) Date: Sun, 7 May 2023 23:52:03 GMT Message-Id: <202305072352.347Nq3sH004385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 0745d837c2e9 - main - unionfs: prevent upperrootvp from being recycled during mount List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0745d837c2e9e37bd069bd7c05c8f9892fba0752 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=0745d837c2e9e37bd069bd7c05c8f9892fba0752 commit 0745d837c2e9e37bd069bd7c05c8f9892fba0752 Author: Jason A. Harmening AuthorDate: 2023-03-26 01:41:33 +0000 Commit: Jason A. Harmening CommitDate: 2023-05-07 23:30:43 +0000 unionfs: prevent upperrootvp from being recycled during mount If upperrootvp is doomed by a concurrent unmount, unionfs_nodeget() may return without a reference or lock on it. unionfs_domount() must prevent the vnode from being recycled for use by a different file until it is finished with the vnode, namely once vfs_register_upper_from_vp() fails. Accomplish this by holding the reference returned by namei() a bit longer. Reviewed by: kib, markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D39767 --- sys/fs/unionfs/union_vfsops.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index 8831397c8c5b..cd6c7bd90655 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -285,8 +285,8 @@ unionfs_domount(struct mount *mp) */ error = unionfs_nodeget(mp, ump->um_uppervp, ump->um_lowervp, NULLVP, &(ump->um_rootvp), NULL); - vrele(upperrootvp); if (error != 0) { + vrele(upperrootvp); free(ump, M_UNIONFSMNT); mp->mnt_data = NULL; return (error); @@ -295,11 +295,24 @@ unionfs_domount(struct mount *mp) KASSERT((ump->um_rootvp->v_vflag & VV_ROOT) != 0, ("%s: rootvp without VV_ROOT", __func__)); + /* + * Do not release the namei() reference on upperrootvp until after + * we attempt to register the upper mounts. A concurrent unmount + * of the upper or lower FS may have caused unionfs_nodeget() to + * create a unionfs node with a NULL upper or lower vp and with + * no reference held on upperrootvp or lowerrootvp. + * vfs_register_upper() should subsequently fail, which is what + * we want, but we must ensure neither underlying vnode can be + * reused until that happens. We assume the caller holds a reference + * to lowerrootvp as it is the mount's covered vnode. + */ lowermp = vfs_register_upper_from_vp(ump->um_lowervp, mp, &ump->um_lower_link); uppermp = vfs_register_upper_from_vp(ump->um_uppervp, mp, &ump->um_upper_link); + vrele(upperrootvp); + if (lowermp == NULL || uppermp == NULL) { if (lowermp != NULL) vfs_unregister_upper(lowermp, &ump->um_lower_link); From nobody Sun May 7 23:52:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QF1Rn1YCRz49k3n; Sun, 7 May 2023 23:52: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 4QF1Rn08sXz3vX8; Sun, 7 May 2023 23:52:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683503525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+2RJ8EIv+sITCEHtj6emD//rHs53IrwOTed0cYdFzvA=; b=A7SwCKGl4DZXoijlV3m1wmVPOLi+v1tFwLlQQC11o4Va3yed4WMAg6UuIBv0Ai+7fVtgr5 JDpNGoA+qfrX1hGlAQrORE0Yi/GgH2oM8Mfr3swAYCG9GCF30XBHnKAZNl4UWf13DYSygQ 1HyrYoFoomFYERA0mbNwroke9oXzFJsnGS+umqyHoLK4mkraQCCAW2jOeQ5EtpISZqwazt EFmvyh2hGrWxjcFnb+QxJQBiQYa2Sohn/WrZSYkADbZX6LNOZXcpqn5QnTfDY6PM4vAprW HexPE1Pc9Uv5l0fsMLXwlLT0c75ebQpc0WFo9H1A1i/AzcwbtNLIc29btrWvVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683503525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+2RJ8EIv+sITCEHtj6emD//rHs53IrwOTed0cYdFzvA=; b=utwd5G6Se5M6IntL8ueXvA7E60rD4LpTduhP+HeQrqMtSq3yLhrxwLURrfxW2lPBCrVBYz DQ06hoXtnri4jPD1msf9ZjMIpproDBBMHFxso8J+96LKq7XyBPVlbE1YNubn6+JHVAjIQh 6H6RZ05rDsLhp3ClvcVxe7//MMepE94F7xS9dNZc+4qJrh1ZhFhviUH7+ySMf//m+COCL/ vbEYMnmBKVnItyM6T8A4/vnfSWm/UnQ4UH1UK3gPj3Jg/Pnbz9P3xjw2DEYSh59keFbdYN aZULxKP9IDa5066eIYT4NEVbd62MSV0dR/kPRDbjD8Qp5qpMRk06F/jxGs7cJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683503525; a=rsa-sha256; cv=none; b=KETO0u4Qlok33/c5i31bGd6xejrur8fLgO3hE9WFIvWgmupfN9QBIiJ5tvu2ss1NzWrqCW Y+aT4/ihmttQwp6IQ8badcm1D/FlLty+4/JUMU2XJP5qbASmhVbemYkjNiVgDl2gL5RfAC 97Z1fs0SI6XX8+p9a6BKTwQBmKXIg3RB081bwIfVDsVerxR7oLLwyUux1MpR0HgZjxYB4B PQ1UXGIQoLPSK2sA3v5eSRHFzrbE9vNWoPB2ex7ycUfPCRlROtzSMR2XNeYFZTpSK4rxlI W9un3UrMk66Qcn+of00m1VpFC+mrq8r0S0qfF3uFjIbNfH5XN+92fHVY6RvGLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QF1Rm6NKGzdxT; Sun, 7 May 2023 23:52: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 347Nq4B0005549; Sun, 7 May 2023 23:52:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 347Nq4YJ005533; Sun, 7 May 2023 23:52:04 GMT (envelope-from git) Date: Sun, 7 May 2023 23:52:04 GMT Message-Id: <202305072352.347Nq4YJ005533@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 356e698011b2 - main - unionfs(): destroy root vnode if upper registration fails List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 356e698011b20ccba9c0a3f211e2a7761490875c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=356e698011b20ccba9c0a3f211e2a7761490875c commit 356e698011b20ccba9c0a3f211e2a7761490875c Author: Jason A. Harmening AuthorDate: 2023-03-26 01:50:55 +0000 Commit: Jason A. Harmening CommitDate: 2023-05-07 23:30:43 +0000 unionfs(): destroy root vnode if upper registration fails If unionfs_domount() fails, the mount path will not call VFS_UNMOUNT() to clean up after it. If this failure happens during upper vnode registration, the unionfs root vnode will already be allocated. vflush() it in order to prevent the vnode from being leaked and the subsequent vfs_mount_destroy() call from getting stuck waiting for the mountpoint reference count to drain. Reviewed by: kib, markj Tested by: pho Differential Revision: https://reviews.freebsd.org/D39767 --- sys/fs/unionfs/union_vfsops.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/fs/unionfs/union_vfsops.c b/sys/fs/unionfs/union_vfsops.c index cd6c7bd90655..9ef239aaad1d 100644 --- a/sys/fs/unionfs/union_vfsops.c +++ b/sys/fs/unionfs/union_vfsops.c @@ -318,6 +318,7 @@ unionfs_domount(struct mount *mp) vfs_unregister_upper(lowermp, &ump->um_lower_link); if (uppermp != NULL) vfs_unregister_upper(uppermp, &ump->um_upper_link); + vflush(mp, 1, FORCECLOSE, curthread); free(ump, M_UNIONFSMNT); mp->mnt_data = NULL; return (ENOENT); From nobody Mon May 8 04:27:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QF7YH2LsDz49JTg; Mon, 8 May 2023 04:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QF7YH1glvz4Lv8; Mon, 8 May 2023 04:27:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683520035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tbp1sWlbfHhYXEDw+EIwbQTCuTuOBLKmpitqAX6yUtU=; b=mS/fEkjUR44xIXdsVrtLWiA+5+2qsQ/jjrm3nHbGZonLRGEYPajQT5ByhDItIJz+kGPrI0 eUwffONUxWpMF8POWTGBFdg16DtpoqHw6+ItA6xiH4Z9jlGIaKzUjTsPo5LMNx4AAWDoFT zKytweTJk9B+GGa6wBEPxxRNNWRdaYDx09lefkbfx0CefP9sr7XcWEFWmWoDWpiu4eK6OD iYO4HzSHVwJOv7pXcYv1IiZUukKo8RbDdrchUyXsWONqeF5Q9RNPCuTUx5AqU16OgY6Icw IRREDntEqMzAVgFcz+HhDSsIuYlriK5v5wPP0n6vMuK6SkbrcccFm0dFMQPgPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683520035; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tbp1sWlbfHhYXEDw+EIwbQTCuTuOBLKmpitqAX6yUtU=; b=TPKNLkV8sINJLD65SzzN1eaA0kaEe1lDNMaasY/t1KIXDGTgZriz5+N/vaQheTWjQuI9L0 sBwlAKSlrayQqJda5eixXaEO+umef/MCiw2nqUD3J7wL8GZKVFfEBEd6mAbMSSaWve9Dw+ J//7J/xmV9Afz/ZZo5ajF+BstGx4vi1j+lK70WJP7vZ+vMcGPGhnHJMd2X1BxIKBWqTibY GBBpBrZdf42/BHHK6INCQLxhqND6SAJtpt75DsNMs6QUcZ/Bx5gllp1C6nNpWP04ljIhLD iezC/I/tT8Fg70qgg6wKh04w8ewnl+0jOtrR+6QLDxkq0oNRg4gif4yLMvDe9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683520035; a=rsa-sha256; cv=none; b=ZcJlgrsZX5cOU8/5ndpG8d1HC4F0ENeebfypuBmPoCAuzyGTBX7N/b3M6/6qSnCJH5eaoi 34SLmFzJypg6Bth/LNUPJ1MkCgDAy5oTeD6TWVLSOzjZPQl9Zskiz0vjUpMydaCzFEWseh vmB/o3M9Z5rVerEvibzhpuwB3KJWpPLPjSF+hnbgh4p0KAjdaI5qD6BdowNnYVSQxguzGs nGwYQaGeh6AxIzvKJTgzZGOGFJ6WECRWDyVbVb6eaomYuxQ6lOhS3R61d/ba5c+EmwfVa/ 9G40EyRRFaJqRWSE57fLc/P1rI08AkgwoZackl7mloaDksZauCPOeUu2lolv/Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QF7YH0cdczmgb; Mon, 8 May 2023 04:27: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 3484RExM053353; Mon, 8 May 2023 04:27:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3484RE70053352; Mon, 8 May 2023 04:27:14 GMT (envelope-from git) Date: Mon, 8 May 2023 04:27:14 GMT Message-Id: <202305080427.3484RE70053352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4e2ddfba507f - main - ciss: Fix typo List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e2ddfba507f045ed83ae5a7beb5ec6b8eb897c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4e2ddfba507f045ed83ae5a7beb5ec6b8eb897c5 commit 4e2ddfba507f045ed83ae5a7beb5ec6b8eb897c5 Author: Warner Losh AuthorDate: 2023-05-08 04:25:01 +0000 Commit: Warner Losh CommitDate: 2023-05-08 04:25:01 +0000 ciss: Fix typo Although unused, fixed type in CISS_BOARD_UNKNOWN #define. Submitted by: Peter Eriksson (a trivial part of D25155) --- sys/dev/ciss/ciss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c index 0a0d29f382a1..af460f8fcff2 100644 --- a/sys/dev/ciss/ciss.c +++ b/sys/dev/ciss/ciss.c @@ -279,7 +279,7 @@ TUNABLE_INT("hw.ciss.force_interrupt", &ciss_force_interrupt); * stick with matching against subvendor/subdevice, and thus have to * be updated for every new CISS adapter that appears. */ -#define CISS_BOARD_UNKNWON 0 +#define CISS_BOARD_UNKNOWN 0 #define CISS_BOARD_SA5 1 #define CISS_BOARD_SA5B 2 #define CISS_BOARD_NOMSI (1<<4) From nobody Mon May 8 04:30:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QF7d06GN0z49JZj; Mon, 8 May 2023 04:30: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 4QF7d05lHbz4MTL; Mon, 8 May 2023 04:30:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683520228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kgXIMhUJzKHn3ZJyISDAWrZcxdaPD1mF/iS/Ff47mvs=; b=lGV6DV3VdkfbSsOyNW+mOaK95eUg81dIHhWhAXKw+ktKs1rSr6xRq4S09t6o4a1h8DZUht z1T5Za2VC6F3ppvvHK/ighi1oLQUl4MMo+HSAciEQxZI5hYJjYKcM3MsA00sIyVyhMIQiu vLlXpMnW9aaPsZmO5NGZZ++6ZUNZp9D1E5u05UthI9EYm3Jol3eZm3yroU+94FtXD25W2P x+n8MGCPmYy96y4AMQ1xKdtgny3mAgaU4owHKRqcIvJUiB3rTyhlRH1+lGyx0BJWYflHsk rrDJrDM1i2ISZA7rrc23U4otMNgxH70DKVlU4adxZSe3+5XDFJuQP3cz3Gbcsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683520228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kgXIMhUJzKHn3ZJyISDAWrZcxdaPD1mF/iS/Ff47mvs=; b=hJuW4Odl30z2xli/k+G3sjmzgtNWnjzA2G0u+2LtrxDtka9+z8QkThtnAn6hAaTpnMDIJX s+sogaeU7Gbbp56tziAXYGeNUe8AXZowfI4Vk5QrsVljH/N7ao+q1fXiZHH+Fwv7uNFyE7 B3WTUfBOXrRnm41588aKk2DHBURgsLzKxyRxUpF5Pmj7FvC9HYWHYmjR1m/2M4Ont73T2q CDi10xDC6uRzXDPj8Exehc6BspGBpq06lLKZAQxYs48eXfRyPCjz5oebj6m3w5/853UiEr zPLcFNjZtoabqvv/3ApkMaNOgLBa15O4ifjchidh2vDMmZQoEM+Im59bJByK1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683520228; a=rsa-sha256; cv=none; b=foSwvcK4ygvMgZyGmULw78KHLaQandmxnbDqQbUO3BErHHHqRBzG0N152Q8cvZPoeQFT45 +lrxbn9qy03xTOxXrEvwKFtJ1K65B0L0tWcGAT4ajLIbxn94ENJvGCli0BF48zegVbvD/W zLG3bbX6ZB94namyDEunDOY/gvDcK/6GqRNv6teSy8faXLFXh1OmqbHcehn9DVw1sN4K8N Zfmh3xT1r5GJ9WTOQg7STDxkIdntoiAgG9UIPgv9d3jcrrwTR6t3j2u7FVkd0vtQgi1ARi 7YCdqxS7K58X3vFvSLZSyyKE2MVb2YHKAOESjfnnG4XnLmWl7osfUlwW1T2ByA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QF7d04hVlzlqX; Mon, 8 May 2023 04:30: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 3484USXB062235; Mon, 8 May 2023 04:30:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3484USwb062234; Mon, 8 May 2023 04:30:28 GMT (envelope-from git) Date: Mon, 8 May 2023 04:30:28 GMT Message-Id: <202305080430.3484USwb062234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: be68c895c8de - main - MAINTAINERS: Add myself to stand List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be68c895c8de3a46474933fc115df3c73b0301c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=be68c895c8de3a46474933fc115df3c73b0301c3 commit be68c895c8de3a46474933fc115df3c73b0301c3 Author: Warner Losh AuthorDate: 2023-05-08 04:28:16 +0000 Commit: Warner Losh CommitDate: 2023-05-08 04:30:10 +0000 MAINTAINERS: Add myself to stand People email me when the boot loader breaks anyway, so ask to be included in reviews. And ask strongly since I've had to deal with too many major breakages lately, distruting other things I need to do. Sponsored by: Netflix --- .github/CODEOWNERS | 1 + MAINTAINERS | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0d9aed6b5f3b..bd735363716e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -60,6 +60,7 @@ /sbin/mount_fusefs @asomers /secure/usr.bin/openssl/ @juikim /share/mk @bsdimp @bapt @bdrewery @emaste +/stand @bsdimp /stand/lua @kevans91 /sys/amd64/pci @bsdimp @bsdjhb /sys/amd64/vmm/ @bsdjhb @grehan-freebsd diff --git a/MAINTAINERS b/MAINTAINERS index 04232b7a26e3..809a5d70c775 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -97,6 +97,7 @@ share/mk/*.test.mk imp,bapt,bdrewery, Pre-commit review requested. emaste,ngie,sjg,#test stand/forth dteske Pre-commit review requested. stand/lua kevans Pre-commit review requested +stand imp Pre-commit review strongly requested. sys/compat/linuxkpi hselasky If in doubt, ask. zeising, johalun pre-commit review requested via #x11 phabricator group. From nobody Mon May 8 05:14:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QF8cM02pNz49LrN; Mon, 8 May 2023 05:14: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 4QF8cL6TLMz3C6s; Mon, 8 May 2023 05:14:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683522898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBazED9IqGAq+YutJPSQ5ckksVflcnUq5uhTmSRZ+Ac=; b=V+cTNJufqK6cdJ8YKP1Us/35+lOYQqSrKjHJ9j8m5TnBKle+Yg189+9LU7UMe9gm+84V5z g0QK3BLVbFZimJ77T1IXlePdHODanQEFUomsGCj1nWtIVXMnO6/rHFAwMbsgEGStxKuPit bIp1Zat4aJ1jUS9buGbcpH3NjgbM0Frxd0Iwfhagsr1LRRdMIc0X1/yHSkH7w8bnR7Xw3q ZFcQTZMmpU0kVQSoN1PauVFEo+1vtx2SgedWO3ICLfax4gO7wh+cVVuj/aYvfRtpHPSigw Q2KHaHvgwPQ77uWWaAEgVKt70VvnzPeKbS7y/Vv/lQlyqocv4eC6+hf3PmsyXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683522898; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBazED9IqGAq+YutJPSQ5ckksVflcnUq5uhTmSRZ+Ac=; b=ZLV7vNvX40aEjv1CMHYZkfg9TR8PcoifiOg/tNGVW2gvXFOtEHvBbhZ5oSlR8qZrH/2/Gk lVRgYkM9Md/q61FxTqIAUSxHhgpd8WouAPuidxA0PkU18z6pHiCl+xv/l3eZdA7WQInsx4 RGjPkBGsmNf3jx2K8kWSZruLOCdtnvFkangNPLa1JaK2o50aFYCRrTyU+zUf1u7flO1Oiw xYSsFDUUaTlycbFhD7iTL2WXy5UyOD+jx4SMtXPnVzCYEU/xfO4neMunWSsuB57Y3djH1R qw3giQcHHNEgkUuS81hV4lVBitn8/tCqIUWI+6WcGb4rHrsbz1VQPq9ZzjRqVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683522898; a=rsa-sha256; cv=none; b=MfRDNIa+f5IW6YlJ6H09iuY+Gt2Gn7VAk6RNthyeYnRUz+zUAroAvdRwN0XqJyjdC6GrSF 8oGzhCAGf1lvwal5hXg/9jKrQjFHi5qhtqab0GUAPPUsBR+nXWPo1nCpki1iceVwu7Mn/8 A5J2ETeyk87R66HPPOdeWRPWUfro+S+vLM9u5WYcy72jOW5oMMPurG0/C+gKa7/qGcZuJv tw4n/wHNBJMvDCy4lpVdIb4IgqNDxcZNsbOmOOtx1DYdS9hNFBb07K3zPgB68nq2cHwBxP 8nAzLI1+CYxkt3BleohmMHBrC9MjaP6OX5ZHv5SnucFBNk48qtKd4NxvW56vNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QF8cL5V6JznPd; Mon, 8 May 2023 05:14: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 3485EweA036545; Mon, 8 May 2023 05:14:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3485EwX9036544; Mon, 8 May 2023 05:14:58 GMT (envelope-from git) Date: Mon, 8 May 2023 05:14:58 GMT Message-Id: <202305080514.3485EwX9036544@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f710a4de92c1 - main - twe: Add deprecation notice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f710a4de92c142fddde636e3610d525bc237ff6d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f710a4de92c142fddde636e3610d525bc237ff6d commit f710a4de92c142fddde636e3610d525bc237ff6d Author: Warner Losh AuthorDate: 2023-05-08 05:14:12 +0000 Commit: Warner Losh CommitDate: 2023-05-08 05:14:12 +0000 twe: Add deprecation notice This was flagged for removal in 14 over a year ago. Add deprecation to man page. MFC After: 3 days --- share/man/man4/twe.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/share/man/man4/twe.4 b/share/man/man4/twe.4 index 9f2eadfb2662..520e4b0a20af 100644 --- a/share/man/man4/twe.4 +++ b/share/man/man4/twe.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 15, 2004 +.Dd May 7, 2023 .Dt TWE 4 .Os .Sh NAME @@ -45,6 +45,11 @@ module at boot time, place the following line in .Bd -literal -offset indent twe_load="YES" .Ed +.Sh DEPRECATION NOTICE +The +.Nm +driver is not present in +.Fx 14.0 . .Sh DESCRIPTION The .Nm From nobody Mon May 8 08:05:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFDP14Knrz49YLM; Mon, 8 May 2023 08:05: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 4QFDP13qsbz3j36; Mon, 8 May 2023 08:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683533125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nyUwxcNBySNgsyYKTYpvi3ssb3mJn9hcWy9rjE0Tjg0=; b=YvxtnRQvHm4gIkqedxQUynWlttkESPHB2pSjj0QyVCD/FBsJyMXhN29Zvnv8OhFseNHfHS du2bfh07f++Lwt+QOyUSurkJmbEZm4+2sm7gvMyqp7/5XQMVVodq7itv4TRB5Awf81B1wA 6jIReZZArql4pPqfNVB1y/E7YozjN6nD3sde+3LP97HiNuak7Klv8QDmEI80JV/WEbYFWQ 4sqquMSbQdaMp9S7mHiLfiDEVMvXVYp2gwo0Px4BndVTkWzYHk9Ju5hc1X64BE2eBjDeTt 4ub75KdrVY/UoYRa3qcGa7XJiNFKS/PkSnH43eIkHjkbcFWseoif8r7m6x4Mew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683533125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nyUwxcNBySNgsyYKTYpvi3ssb3mJn9hcWy9rjE0Tjg0=; b=u49mg3VSYDnduhuZIVA5jf1zbFcTxgGPLEoiRqak6y6eIuXE1DoLVolw5+9JqZW8/IK9Jf T6A51SymXgjPrmGmhN2HnXhW/m9RQJIfOPOpB0g7KKJGScoX5+3X0v4dJQTfRGiV8O1Ln0 dEbmO6SINT9NaVv3/yjKr0uDjBT9SovCdvjWerg9TT2utD8WS74Aw/oJpb3lfR2Zr/Sd4n W/SL46A9EcvakRmRD9VQwEntuj85M8THhuWNu+HxBb3zmMsXtMcPdUAodxzzT8Uh0avPsz lhF2F7omx5JyBZGO63frqzd3eZNs278dUFZU59jLhxhZiJYuJpOYy+sn+fXqiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683533125; a=rsa-sha256; cv=none; b=ILTz6RzG1jpxsBtPxxXaSllku7fpEsS6TWCYwFFb2U9snFQYUhSJ6penGN5owHvC/aF3Be EVMFw54GwRvutKDEPuCnhbLo2pSi/wL8GuKJBz7bqoQAKhb4A0n/kAtwgE2DLlnb6s3SHO B3z1E/h0Wgq62C808Zw8+WTf3kZ8wRaI6/4tAvMuUvu/LIhrge6WyXYqn0OFf0ispQ0Lcm H2/hKOQPovz2qw9sgAoqsK/JivaSHR32+/iA60npjcj1vae9xQqrERJuvytnJwgCcX7xwy C+1ThbSqG0tDjskKGeY9N9al5xgmxTSOBhxKZKyvfgB+9eMFY+45IwaholcxIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFDP12n6fzslQ; Mon, 8 May 2023 08:05:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34885Pa8017964; Mon, 8 May 2023 08:05:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34885P8c017963; Mon, 8 May 2023 08:05:25 GMT (envelope-from git) Date: Mon, 8 May 2023 08:05:25 GMT Message-Id: <202305080805.34885P8c017963@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 4849767cb16a - main - md5: Improve compatibility. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4849767cb16a4dbd4d1b923db25d34029c09e7b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4849767cb16a4dbd4d1b923db25d34029c09e7b0 commit 4849767cb16a4dbd4d1b923db25d34029c09e7b0 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-08 06:56:09 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-08 06:56:22 +0000 md5: Improve compatibility. * Overhaul the GNU compatibility mode to more closely emulate what the GNU tools do. * Add a Perl compatibility mode which emulates the shasum tool that ships with Perl. This is currently not installed. * Overhaul the tests. Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D39446 --- ObsoleteFiles.inc | 73 ++++ sbin/md5/Makefile | 6 + sbin/md5/md5.1 | 313 +++++++++++---- sbin/md5/md5.c | 665 ++++++++++++++++++++++++-------- sbin/md5/tests/1.inp | 0 sbin/md5/tests/1.sha512-p.chk | 1 - sbin/md5/tests/1.sha512sum-p.chk | 1 - sbin/md5/tests/2.inp | 1 - sbin/md5/tests/2.sha512-p.chk | 1 - sbin/md5/tests/2.sha512sum-p.chk | 1 - sbin/md5/tests/3.inp | 1 - sbin/md5/tests/3.sha512-p.chk | 1 - sbin/md5/tests/3.sha512sum-p.chk | 1 - sbin/md5/tests/4.inp | 1 - sbin/md5/tests/4.sha512-p.chk | 1 - sbin/md5/tests/4.sha512sum-p.chk | 1 - sbin/md5/tests/5.inp | 1 - sbin/md5/tests/5.sha512-p.chk | 1 - sbin/md5/tests/5.sha512sum-p.chk | 1 - sbin/md5/tests/6.inp | 1 - sbin/md5/tests/6.sha512-p.chk | 1 - sbin/md5/tests/6.sha512sum-p.chk | 1 - sbin/md5/tests/7.inp | 1 - sbin/md5/tests/7.sha512-p.chk | 1 - sbin/md5/tests/7.sha512sum-p.chk | 1 - sbin/md5/tests/8.inp | 1 - sbin/md5/tests/8.sha512-p.chk | 1 - sbin/md5/tests/8.sha512sum-p.chk | 1 - sbin/md5/tests/Makefile | 35 -- sbin/md5/tests/bsd-c-test.SH | 23 -- sbin/md5/tests/bsd-p-test.SH | 24 -- sbin/md5/tests/bsd-s-test.SH | 30 -- sbin/md5/tests/coreutils-c-test.SH | 21 - sbin/md5/tests/md5.digest | 8 - sbin/md5/tests/md5_test.sh | 346 +++++++++++++++-- sbin/md5/tests/md5sum.digest | 8 - sbin/md5/tests/rmd160.digest | 8 - sbin/md5/tests/rmd160sum.digest | 8 - sbin/md5/tests/self-test.SH | 8 - sbin/md5/tests/self-test.md5.chk | 9 - sbin/md5/tests/self-test.rmd160.chk | 9 - sbin/md5/tests/self-test.sh_inp | 8 - sbin/md5/tests/self-test.sha1.chk | 9 - sbin/md5/tests/self-test.sha224.chk | 9 - sbin/md5/tests/self-test.sha256.chk | 9 - sbin/md5/tests/self-test.sha384.chk | 9 - sbin/md5/tests/self-test.sha512.chk | 9 - sbin/md5/tests/self-test.sha512t224.chk | 9 - sbin/md5/tests/self-test.sha512t256.chk | 9 - sbin/md5/tests/self-test.skein1024.chk | 9 - sbin/md5/tests/self-test.skein256.chk | 9 - sbin/md5/tests/self-test.skein512.chk | 9 - sbin/md5/tests/sha1.digest | 8 - sbin/md5/tests/sha1sum.digest | 8 - sbin/md5/tests/sha224.digest | 8 - sbin/md5/tests/sha224sum.digest | 8 - sbin/md5/tests/sha256.digest | 8 - sbin/md5/tests/sha256sum.digest | 8 - sbin/md5/tests/sha384.digest | 8 - sbin/md5/tests/sha384sum.digest | 8 - sbin/md5/tests/sha512.digest | 8 - sbin/md5/tests/sha512sum.digest | 8 - sbin/md5/tests/sha512t224.digest | 8 - sbin/md5/tests/sha512t224sum.digest | 8 - sbin/md5/tests/sha512t256.digest | 8 - sbin/md5/tests/sha512t256sum.digest | 8 - sbin/md5/tests/skein1024.digest | 8 - sbin/md5/tests/skein1024sum.digest | 8 - sbin/md5/tests/skein256.digest | 8 - sbin/md5/tests/skein256sum.digest | 8 - sbin/md5/tests/skein512.digest | 8 - sbin/md5/tests/skein512sum.digest | 8 - sbin/md5/tests/sum_a.in | 1 - sbin/md5/tests/sum_b.in | 1 - sbin/md5/tests/sum_c.in | 1 - sbin/md5/tests/sum_sums.digest | 3 - 76 files changed, 1134 insertions(+), 747 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index ede2871455ae..97881f40ac59 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -52,6 +52,79 @@ # xargs -n1 | sort | uniq -d; # done +# 20230505: md5 tests are now self-contained +OLD_FILES+=usr/tests/sbin/md5/1.inp +OLD_FILES+=usr/tests/sbin/md5/1.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/1.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/2.inp +OLD_FILES+=usr/tests/sbin/md5/2.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/2.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/3.inp +OLD_FILES+=usr/tests/sbin/md5/3.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/3.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/4.inp +OLD_FILES+=usr/tests/sbin/md5/4.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/4.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/5.inp +OLD_FILES+=usr/tests/sbin/md5/5.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/5.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/6.inp +OLD_FILES+=usr/tests/sbin/md5/6.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/6.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/7.inp +OLD_FILES+=usr/tests/sbin/md5/7.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/7.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/8.inp +OLD_FILES+=usr/tests/sbin/md5/8.sha512-p.chk +OLD_FILES+=usr/tests/sbin/md5/8.sha512sum-p.chk +OLD_FILES+=usr/tests/sbin/md5/algorithms.txt +OLD_FILES+=usr/tests/sbin/md5/bsd-c-test +OLD_FILES+=usr/tests/sbin/md5/bsd-p-test +OLD_FILES+=usr/tests/sbin/md5/bsd-s-test +OLD_FILES+=usr/tests/sbin/md5/coreutils-c-test +OLD_FILES+=usr/tests/sbin/md5/md5.digest +OLD_FILES+=usr/tests/sbin/md5/md5sum.digest +OLD_FILES+=usr/tests/sbin/md5/rmd160.digest +OLD_FILES+=usr/tests/sbin/md5/rmd160sum.digest +OLD_FILES+=usr/tests/sbin/md5/self-test +OLD_FILES+=usr/tests/sbin/md5/self-test.md5.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.rmd160.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.sh_inp +OLD_FILES+=usr/tests/sbin/md5/self-test.sha1.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.sha224.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.sha256.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.sha384.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.sha512.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.sha512t224.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.sha512t256.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.skein1024.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.skein256.chk +OLD_FILES+=usr/tests/sbin/md5/self-test.skein512.chk +OLD_FILES+=usr/tests/sbin/md5/sha1.digest +OLD_FILES+=usr/tests/sbin/md5/sha1sum.digest +OLD_FILES+=usr/tests/sbin/md5/sha224.digest +OLD_FILES+=usr/tests/sbin/md5/sha224sum.digest +OLD_FILES+=usr/tests/sbin/md5/sha256.digest +OLD_FILES+=usr/tests/sbin/md5/sha256sum.digest +OLD_FILES+=usr/tests/sbin/md5/sha384.digest +OLD_FILES+=usr/tests/sbin/md5/sha384sum.digest +OLD_FILES+=usr/tests/sbin/md5/sha512.digest +OLD_FILES+=usr/tests/sbin/md5/sha512sum.digest +OLD_FILES+=usr/tests/sbin/md5/sha512t224.digest +OLD_FILES+=usr/tests/sbin/md5/sha512t224sum.digest +OLD_FILES+=usr/tests/sbin/md5/sha512t256.digest +OLD_FILES+=usr/tests/sbin/md5/sha512t256sum.digest +OLD_FILES+=usr/tests/sbin/md5/skein1024.digest +OLD_FILES+=usr/tests/sbin/md5/skein1024sum.digest +OLD_FILES+=usr/tests/sbin/md5/skein256.digest +OLD_FILES+=usr/tests/sbin/md5/skein256sum.digest +OLD_FILES+=usr/tests/sbin/md5/skein512.digest +OLD_FILES+=usr/tests/sbin/md5/skein512sum.digest +OLD_FILES+=usr/tests/sbin/md5/sum_a.in +OLD_FILES+=usr/tests/sbin/md5/sum_b.in +OLD_FILES+=usr/tests/sbin/md5/sum_c.in +OLD_FILES+=usr/tests/sbin/md5/sum_sums.digest + # 20230420: portsnap.8 removed OLD_FILES+=etc/portsnap.conf OLD_FILES+=usr/libexec/make_index diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile index 6bda75437275..c9faec285aea 100644 --- a/sbin/md5/Makefile +++ b/sbin/md5/Makefile @@ -52,6 +52,12 @@ MLINKS= md5.1 md5sum.1 \ md5.1 skein1024.1 \ md5.1 skein1024sum.1 +# md5 can also emulate the shasum script that comes with Perl, except +# that, in bits input mode, it can only handle input lengths that are +# a multiple of 8 (see manual page). +#LINKS+= ${BINDIR}/md5 ${BINDIR}/shasum +#MLINKS+= md5.1 shasum.1 + LIBADD= md .ifndef(BOOTSTRAPPING) diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1 index ba654e131c3c..bd619587e7a9 100644 --- a/sbin/md5/md5.1 +++ b/sbin/md5/md5.1 @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd February 6, 2023 +.Dd April 12, 2023 .Dt MD5 1 .Os .Sh NAME @@ -8,7 +8,8 @@ .Nm rmd160 , skein256 , skein512 , skein1024 , .Nm md5sum , sha1sum , sha224sum , sha256sum , sha384sum , .Nm sha512sum , sha512t224sum , sha512t256sum , -.Nm rmd160sum , skein256sum , skein512sum , skein1024sum +.Nm rmd160sum , skein256sum , skein512sum , skein1024sum , +.Nm shasum .Nd calculate a message-digest fingerprint (checksum) for a file .Sh SYNOPSIS .Nm @@ -18,12 +19,40 @@ .Op Ar .Pp .Nm md5sum -.Op Fl pqrtx -.Op Fl c Ar file -.Op Fl s Ar string +.Op Fl bctwz +.Op Fl -binary +.Op Fl -check +.Op Fl -help +.Op Fl -ignore-missing +.Op Fl -quiet +.Op Fl -status +.Op Fl -strict +.Op Fl -tag +.Op Fl -text +.Op Fl -version +.Op Fl -warn +.Op Fl -zero .Op Ar .Pp (All other hashes have the same options and usage.) +.Pp +.Nm shasum +.Op Fl 0bchqstUvw +.Op Fl -01 +.Op Fl a | -algorithm Ar alg +.Op Fl -binary +.Op Fl -check +.Op Fl -help +.Op Fl -ignore-missing +.Op Fl -quiet +.Op Fl -status +.Op Fl -strict +.Op Fl -tag +.Op Fl -text +.Op Fl -UNIVERSAL +.Op Fl -version +.Op Fl -warn +.Op Ar .Sh DESCRIPTION The .Nm md5 , sha1 , sha224 , sha256 , sha384 , sha512 , sha512t224 , sha512t256 , @@ -36,15 +65,21 @@ output a or .Dq message digest of the input. +.Pp The .Nm md5sum , sha1sum , sha224sum , sha256sum , sha384sum , sha512sum , .Nm sha512t224sum , sha512t256sum , rmd160sum , skein256sum , skein512sum , and .Nm skein1024sum -utilities do the same, but default to the reversed format of -the -.Fl r -flag. +utilities do the same, but with command-line options and an output +format that match those of their similary named GNU utilities. +.Pp +The +.Nm shasum +utility does the same, but with command-line options and an output +format that match those of the similarly named utility that ships with +Perl. +.Pp It is conjectured that it is computationally infeasible to produce two messages having the same message digest, or to produce any message having a given prespecified target message digest. @@ -75,73 +110,171 @@ to 224 bits. .Pp It is recommended that all new applications use SHA-512 or SKEIN-512 instead of one of the other hash functions. -.Pp -The following options may be used in any combination and must -precede any files named on the command line. -The hexadecimal checksum of each file listed on the command line is printed -after the options are processed. +.Ss BSD OPTIONS +The following options are available in BSD mode, i.e. when the program +is invoked with a name that does not end in +.Dq sum : .Bl -tag -width indent -.It Fl b -Make the -.Nm -sum -programs separate hash and digest with a blank followed by an asterisk instead -of by 2 blank characters for full compatibility with the output generated by the -coreutils versions of these programs. -.It Fl c Ar string -If the program was called with a name that does not end in -.Nm sum , -compare the digest of the file against this string. +.It Fl c Ar string , Fl -check= Ns Ar string +Compare the digest of the file against this string. If combined with the .Fl q +or +.Fl -quiet option, the calculated digest is printed in addition to the exit status being set. .Pq Note that this option is not yet useful if multiple files are specified. -.It Fl c Ar file -If the program was called with a name that does end in -.Nm sum , -the file passed as argument must contain digest lines generated by the same -digest algorithm with or without the -.Fl r -option -.Pq i.e., in either classical BSD format or in GNU coreutils format . -A line with the file name followed by a colon -.Dq ":" -and either OK or FAILED is written for each well-formed line in the digest file. -If applicable, the number of failed comparisons and the number of lines that were -skipped since they were not well-formed are printed at the end. -The -.Fl q -option can be used to quiesce the output unless there are mismatched entries in -the digest. -.Pp -.It Fl s Ar string -Print a checksum of the given -.Ar string . -.It Fl p +.It Fl p , -passthrough Echo stdin to stdout and append the checksum to stdout. -.It Fl q +.It Fl q , -quiet Quiet mode \(em only the checksum is printed out. Overrides the .Fl r +or +.Fl -reverse option. -.It Fl r +.It Fl r , -reverse Reverses the format of the output. This helps with visual diffs. Does nothing when combined with the .Fl ptx options. -.It Fl t +.It Fl s Ar string , Fl -string= Ns Ar string +Print a checksum of the given +.Ar string . +.It Fl t , Fl -time-trial Run a built-in time trial. For the .Nm -sum versions, this is a nop for compatibility with coreutils. -.It Fl x +.It Fl x , Fl -self-test Run a built-in test script. .El +.Ss GNU OPTIONS +The following options are available in GNU mode, i.e. when the program +is invoked with a name that ends in +.Dq sum : +.Bl -tag -width indent +.It Fl b , Fl -binary +Read files in binary mode. +.It Fl c , Fl -check +The file passed as arguments must contain digest lines generated by the same +digest algorithm in either classical BSD format or in GNU coreutils format. +A line with the file name followed by a colon +.Dq ":" +and either OK or FAILED is written for each well-formed line in the digest file. +If applicable, the number of failed comparisons and the number of lines that were +skipped since they were not well-formed are printed at the end. +The +.Fl -quiet +option can be used to quiesce the output unless there are mismatched entries in +the digest. +.It Fl -help +Print a usage message and exit. +.It Fl -ignore-missing +When verifying checksums, ignore files for which checksums are given +but which aren't found on disk. +.It Fl -quiet +When verifying checksums, do not print anything unless the +verification fails. +.It Fl -status +When verifying checksums, do not print anything at all. +The exit code will reflect whether verification succeeded. +.It Fl -strict +When verifying checksums, fail if the input is malformed. +.It Fl -tag +Produce BSD-style output. +.It Fl t , Fl -text +Read files in text mode. +This is the default. +Note that this implementation does not differentiate between binary +and text mode. +.It Fl -version +Print version information and exit. +.It Fl w , Fl -warn +When verifying checksums, warn about malformed input. +.It Fl z , Fl -zero +Terminate output lines with NUL rather than with newline. +.El +.Ss PERL OPTIONS +The following options are available in Perl mode, i.e. when the program +is invoked with the name +.Dq shasum : +.Bl -tag -width indent +.It Fl 0 , Fl -01 +Read files in bits mode: ASCII +.Sq 0 +and +.Sq 1 +characters correspond to 0 and 1 bits, respectively, and all other +characters are ignored. +See +.Sx BUGS . +.It Fl a Ar alg , Fl -algorithm Ar alg +Use the specified algorithm: +.Dq 1 +for SHA-1 (default), +.Dq xxx +for +.Va xxx Ns -bit +SHA-2 (e.g. +.Dq 256 +for SHA-256) +or +.Dq xxxyyy +for +.Va xxx Ns -bit +SHA-2 truncated to +.Va yyy +bits (e.g. +.Dq 512224 +for SHA-512/224). +.It Fl b , Fl -binary +Read files in binary mode. +.It Fl c , Fl -check +The file passed as arguments must contain digest lines generated by the same +digest algorithm in either classical BSD format or in GNU coreutils format. +A line with the file name followed by a colon +.Dq ":" +and either OK or FAILED is written for each well-formed line in the digest file. +If applicable, the number of failed comparisons and the number of lines that were +skipped since they were not well-formed are printed at the end. +The +.Fl -quiet +option can be used to quiesce the output unless there are mismatched entries in +the digest. +.It Fl -help +Print a usage message and exit. +.It Fl -ignore-missing +When verifying checksums, ignore files for which checksums are given +but which aren't found on disk. +.It Fl -quiet +When verifying checksums, do not print anything unless the +verification fails. +.It Fl -status +When verifying checksums, do not print anything at all. +The exit code will reflect whether verification succeeded. +.It Fl -strict +When verifying checksums, fail if the input is malformed. +.It Fl -tag +Produce BSD-style output. +.It Fl t , Fl -text +Read files in text mode. +This is the default. +Note that this implementation does not differentiate between binary +and text mode. +.It Fl U , Fl -UNIVERSAL +Read files in universal mode: any CR-LF pair, as well as any CR not +followed by LF, is translated to LF before the digest is computed. +.It Fl -version +Print version information and exit. +.It Fl w , Fl -warn +When verifying checksums, warn about malformed input. +.El .Sh EXIT STATUS The -.Nm md5 , sha1 , sha224 , sha256 , sha512 , sha512t256 , rmd160 , -.Nm skein256 , skein512 , +.Nm md5 , sha1 , sha224 , sha256 , sha512 , sha512t224 , sha512t256 , +.Nm rmd160 , skein256 , skein512 , and .Nm skein1024 utilities exit 0 on success, @@ -149,6 +282,16 @@ utilities exit 0 on success, and 2 if at least one file does not have the same hash as the .Fl c option. +.Pp +The +.Nm md5sum , sha1sum , sha224sum , sha256sum , sha512sum , +.Nm sha512t224sum , sha512t256sum , +.Nm rmd160 , skein256 , skein512 , skein1024 +and +.Nm shasum +utilities exit 0 on success and 1 if at least one of the input files +could not be read or, when verifying checksums, does not have the +expected checksum. .Sh EXAMPLES Calculate the MD5 checksum of the string .Dq Hello . @@ -169,11 +312,22 @@ Calculate the checksum of multiple files reversing the output: $ md5 -r /boot/loader.conf /etc/rc.conf ada5f60f23af88ff95b8091d6d67bef6 /boot/loader.conf d80bf36c332dc0fdc479366ec3fa44cd /etc/rc.conf -.Pd -The -.Nm -sum -variants put 2 blank characters between hash and file name for full compatibility -with the coreutils versions of these commands. +.Ed +.Pp +This is almost but not quite identical to the output from GNU mode: +.Bd -literal -offset indent +$ md5sum /boot/loader.conf /etc/rc.conf +ada5f60f23af88ff95b8091d6d67bef6 /boot/loader.conf +d80bf36c332dc0fdc479366ec3fa44cd /etc/rc.conf +.Ed +.Pp +Note the two spaces between hash and file name. +If binary mode is requested, they are instead separated by a space and +an asterisk: +.Bd -literal -offset indent +$ md5sum -b /boot/loader.conf /etc/rc.conf +ada5f60f23af88ff95b8091d6d67bef6 */boot/loader.conf +d80bf36c332dc0fdc479366ec3fa44cd */etc/rc.conf .Ed .Pp Write the digest for @@ -197,9 +351,7 @@ $ md5 -c randomstring /boot/loader.conf MD5 (/boot/loader.conf) = ada5f60f23af88ff95b8091d6d67bef6 [ Failed ] .Ed .Pp -If invoked with a name ending in -.Nm -sum -the +In GNU mode, the .Fl c option does not compare against a hash string passed as parameter. Instead, it expects a digest file, as created under the name @@ -212,11 +364,12 @@ $ md5 -c digest /boot/loader.conf /boot/loader.conf: OK .Ed .Pp -The digest file may contain any number of lines in the format generated with or without the -.Fl r -option -.Pq i.e., in either classical BSD format or in GNU coreutils format . -If a hash value does not match the file, FAILED is printed instead of OK. +The digest file may contain any number of lines in the format +generated in either BSD or GNU mode. +If a hash value does not match the file, +.Dq FAILED +is printed instead of +.Dq OK . .Sh SEE ALSO .Xr cksum 1 , .Xr md5 3 , @@ -252,13 +405,29 @@ Secure Hash Standard (SHS): The RIPEMD-160 page: .Pa https://homes.esat.kuleuven.be/~bosselae/ripemd160.html .Sh BUGS -All of the utilities that end in -.Sq sum -are intended to be compatible with the GNU coreutils programs. -However, the long option functionality is not provided. +In bits mode, the original +.Nm shasum +script is capable of processing inputs of arbitrary length. +This implementation is not, and will issue an error if the input +length is not a multiple of eight bits. .Sh ACKNOWLEDGMENTS -This program is placed in the public domain for free general use by -RSA Data Security. +.An -nosplit +This utility was originally derived from a program which was placed in +the public domain for free general use by RSA Data Security. .Pp -Support for SHA-1 and RIPEMD-160 has been added by +Support for SHA-1 and RIPEMD-160 was added by .An Oliver Eikemeier Aq Mt eik@FreeBSD.org . +.Pp +Support for SHA-2 was added by +.An Colin Percival Aq Mt cperciva@FreeBSD.org +and +.An Allan Jude Aq Mt allanjude@FreeBSD.org . +.Pp +Support for SKEIN was added by +.An Allan Jude Aq Mt allanjude@FreeBSD.org . +.Pp +Compatibility with GNU coreutils was added by +.An Warner Losh Aq Mt imp@FreeBSD.org +and much expanded by +.An Dag-Erling Sm\(/orgrav Aq Mt des@FreeBSD.org , +who also added Perl compatibility. diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 6bc1a780df86..98cfb37110d5 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -21,11 +21,13 @@ __FBSDID("$FreeBSD$"); #include -#include #include +#include +#include #include #include +#include #include #include #include @@ -54,16 +56,20 @@ __FBSDID("$FreeBSD$"); #define TEST_BLOCK_COUNT 100000 #define MDTESTCOUNT 8 -static int bflag; -static int cflag; -static int pflag; -static int qflag; -static int rflag; -static int sflag; -static int skip; +static char *progname; + +static bool cflag; +static bool pflag; +static bool qflag; +static bool sflag; +static bool wflag; +static bool strict; +static bool skip; +static bool ignoreMissing; static char* checkAgainst; static int checksFailed; -static int failed; +static bool failed; +static int endl = '\n'; typedef void (DIGEST_Init)(void *); typedef void (DIGEST_Update)(void *, const unsigned char *, size_t); @@ -84,21 +90,22 @@ extern const char *SKEIN1024_TestOutput[MDTESTCOUNT]; typedef struct Algorithm_t { const char *progname; + const char *perlname; const char *name; const char *(*TestOutput)[MDTESTCOUNT]; DIGEST_Init *Init; DIGEST_Update *Update; DIGEST_End *End; char *(*Data)(const void *, unsigned int, char *); - char *(*Fd)(int, char *); } Algorithm_t; static void MD5_Update(MD5_CTX *, const unsigned char *, size_t); -static void MDOutput(const Algorithm_t *, char *, char **); +static char *MDInput(const Algorithm_t *, FILE *, char *, bool); +static void MDOutput(const Algorithm_t *, char *, const char *); static void MDTimeTrial(const Algorithm_t *); static void MDTestSuite(const Algorithm_t *); -static char *MDFilter(const Algorithm_t *, char*, int); static void usage(const Algorithm_t *); +static void version(void); typedef union { MD5_CTX md5; @@ -121,47 +128,155 @@ typedef union { /* algorithm function table */ static const struct Algorithm_t Algorithm[] = { - { "md5", "MD5", &MD5TestOutput, (DIGEST_Init*)&MD5Init, + { "md5", NULL, "MD5", + &MD5TestOutput, (DIGEST_Init*)&MD5Init, (DIGEST_Update*)&MD5_Update, (DIGEST_End*)&MD5End, - &MD5Data, &MD5Fd }, - { "sha1", "SHA1", &SHA1_TestOutput, (DIGEST_Init*)&SHA1_Init, + &MD5Data }, + { "sha1", "1", "SHA1", + &SHA1_TestOutput, (DIGEST_Init*)&SHA1_Init, (DIGEST_Update*)&SHA1_Update, (DIGEST_End*)&SHA1_End, - &SHA1_Data, &SHA1_Fd }, - { "sha224", "SHA224", &SHA224_TestOutput, (DIGEST_Init*)&SHA224_Init, + &SHA1_Data }, + { "sha224", "224", "SHA224", + &SHA224_TestOutput, (DIGEST_Init*)&SHA224_Init, (DIGEST_Update*)&SHA224_Update, (DIGEST_End*)&SHA224_End, - &SHA224_Data, &SHA224_Fd }, - { "sha256", "SHA256", &SHA256_TestOutput, (DIGEST_Init*)&SHA256_Init, + &SHA224_Data }, + { "sha256", "256", "SHA256", + &SHA256_TestOutput, (DIGEST_Init*)&SHA256_Init, (DIGEST_Update*)&SHA256_Update, (DIGEST_End*)&SHA256_End, - &SHA256_Data, &SHA256_Fd }, - { "sha384", "SHA384", &SHA384_TestOutput, (DIGEST_Init*)&SHA384_Init, + &SHA256_Data }, + { "sha384", "384", "SHA384", + &SHA384_TestOutput, (DIGEST_Init*)&SHA384_Init, (DIGEST_Update*)&SHA384_Update, (DIGEST_End*)&SHA384_End, - &SHA384_Data, &SHA384_Fd }, - { "sha512", "SHA512", &SHA512_TestOutput, (DIGEST_Init*)&SHA512_Init, + &SHA384_Data }, + { "sha512", "512", "SHA512", + &SHA512_TestOutput, (DIGEST_Init*)&SHA512_Init, (DIGEST_Update*)&SHA512_Update, (DIGEST_End*)&SHA512_End, - &SHA512_Data, &SHA512_Fd }, - { "sha512t224", "SHA512t224", &SHA512t224_TestOutput, (DIGEST_Init*)&SHA512_224_Init, + &SHA512_Data }, + { "sha512t224", "512224", "SHA512t224", + &SHA512t224_TestOutput, (DIGEST_Init*)&SHA512_224_Init, (DIGEST_Update*)&SHA512_224_Update, (DIGEST_End*)&SHA512_224_End, - &SHA512_224_Data, &SHA512_224_Fd }, - { "sha512t256", "SHA512t256", &SHA512t256_TestOutput, (DIGEST_Init*)&SHA512_256_Init, + &SHA512_224_Data }, + { "sha512t256", "512256", "SHA512t256", + &SHA512t256_TestOutput, (DIGEST_Init*)&SHA512_256_Init, (DIGEST_Update*)&SHA512_256_Update, (DIGEST_End*)&SHA512_256_End, - &SHA512_256_Data, &SHA512_256_Fd }, - { "rmd160", "RMD160", &RIPEMD160_TestOutput, + &SHA512_256_Data }, + { "rmd160", NULL, "RMD160", + &RIPEMD160_TestOutput, (DIGEST_Init*)&RIPEMD160_Init, (DIGEST_Update*)&RIPEMD160_Update, - (DIGEST_End*)&RIPEMD160_End, &RIPEMD160_Data, &RIPEMD160_Fd }, - { "skein256", "Skein256", &SKEIN256_TestOutput, + (DIGEST_End*)&RIPEMD160_End, &RIPEMD160_Data }, + { "skein256", NULL, "Skein256", + &SKEIN256_TestOutput, (DIGEST_Init*)&SKEIN256_Init, (DIGEST_Update*)&SKEIN256_Update, - (DIGEST_End*)&SKEIN256_End, &SKEIN256_Data, &SKEIN256_Fd }, - { "skein512", "Skein512", &SKEIN512_TestOutput, + (DIGEST_End*)&SKEIN256_End, &SKEIN256_Data }, + { "skein512", NULL, "Skein512", + &SKEIN512_TestOutput, (DIGEST_Init*)&SKEIN512_Init, (DIGEST_Update*)&SKEIN512_Update, - (DIGEST_End*)&SKEIN512_End, &SKEIN512_Data, &SKEIN512_Fd }, - { "skein1024", "Skein1024", &SKEIN1024_TestOutput, + (DIGEST_End*)&SKEIN512_End, &SKEIN512_Data }, + { "skein1024", NULL, "Skein1024", + &SKEIN1024_TestOutput, (DIGEST_Init*)&SKEIN1024_Init, (DIGEST_Update*)&SKEIN1024_Update, - (DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data, &SKEIN1024_Fd } + (DIGEST_End*)&SKEIN1024_End, &SKEIN1024_Data }, + { } }; -static unsigned digest; -static unsigned malformed; -static bool gnu_emu = false; +static int digest = -1; +static unsigned int malformed; + +static enum mode { + mode_bsd, + mode_gnu, + mode_perl, +} mode = mode_bsd; + +static enum input_mode { + input_binary = '*', + input_text = ' ', + input_universal = 'U', + input_bits = '^', +} input_mode = input_binary; + +static enum output_mode { + output_bare, + output_tagged, + output_reverse, + output_gnu, +} output_mode = output_tagged; + +enum optval { + opt_end = -1, + /* ensure we don't collide with shortopts */ + opt_dummy = CHAR_MAX, + /* BSD options */ + opt_check, + opt_passthrough, + opt_quiet, + opt_reverse, + opt_string, + opt_time_trial, + opt_self_test, + /* GNU options */ + opt_binary, + opt_help, + opt_ignore_missing, + opt_status, + opt_strict, + opt_tag, + opt_text, + opt_warn, + opt_version, + opt_zero, + /* Perl options */ + opt_algorithm, + opt_bits, + opt_universal, +}; + +static const struct option bsd_longopts[] = { + { "check", required_argument, 0, opt_check }, + { "passthrough", no_argument, 0, opt_passthrough }, + { "quiet", no_argument, 0, opt_quiet }, + { "reverse", no_argument, 0, opt_reverse }, + { "string", required_argument, 0, opt_string }, + { "time-trial", no_argument, 0, opt_time_trial }, + { "self-test", no_argument, 0, opt_self_test }, + { } +}; +static const char *bsd_shortopts = "bc:pqrs:tx"; + +static const struct option gnu_longopts[] = { + { "binary", no_argument, 0, opt_binary }, + { "check", no_argument, 0, opt_check }, + { "help", no_argument, 0, opt_help }, + { "ignore-missing", no_argument, 0, opt_ignore_missing }, + { "quiet", no_argument, 0, opt_quiet }, + { "status", no_argument, 0, opt_status }, + { "strict", no_argument, 0, opt_strict }, + { "tag", no_argument, 0, opt_tag }, + { "text", no_argument, 0, opt_text }, + { "version", no_argument, 0, opt_version }, + { "warn", no_argument, 0, opt_warn }, + { "zero", no_argument, 0, opt_zero }, + { } +}; +static const char *gnu_shortopts = "bctwz"; + +static const struct option perl_longopts[] = { + { "algorithm", required_argument, 0, opt_algorithm }, + { "check", required_argument, 0, opt_check }, + { "help", no_argument, 0, opt_help }, + { "ignore-missing", no_argument, 0, opt_ignore_missing }, + { "quiet", no_argument, 0, opt_quiet }, + { "status", no_argument, 0, opt_status }, + { "strict", no_argument, 0, opt_strict }, + { "tag", no_argument, 0, opt_tag }, + { "text", no_argument, 0, opt_text }, + { "UNIVERSAL", no_argument, 0, opt_universal }, + { "version", no_argument, 0, opt_version }, + { "warn", no_argument, 0, opt_warn }, + { "01", no_argument, 0, opt_bits }, + { } +}; +static const char *perl_shortopts = "0a:bchqstUvw"; static void MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len) @@ -177,60 +292,70 @@ struct chksumrec { static struct chksumrec *head = NULL; static struct chksumrec **next = &head; +static unsigned int numrecs; #define PADDING 7 /* extra padding for "SHA512t256 (...) = ...\n" style */ #define CHKFILELINELEN (HEX_DIGEST_LENGTH + MAXPATHLEN + PADDING) -static int gnu_check(const char *checksumsfile) +static void +gnu_check(const char *checksumsfile) { FILE *inp; - char linebuf[CHKFILELINELEN]; - int linelen; + char *linebuf = NULL; + size_t linecap; + ssize_t linelen; int lineno; char *filename; char *hashstr; struct chksumrec *rec; const char *digestname; - int digestnamelen; - int hashstrlen; + size_t digestnamelen; + size_t hashstrlen; - if ((inp = fopen(checksumsfile, "r")) == NULL) + if (strcmp(checksumsfile, "-") == 0) + inp = stdin; + else if ((inp = fopen(checksumsfile, "r")) == NULL) err(1, "%s", checksumsfile); digestname = Algorithm[digest].name; digestnamelen = strlen(digestname); hashstrlen = strlen(*(Algorithm[digest].TestOutput[0])); - lineno = 1; - while (fgets(linebuf, sizeof(linebuf), inp) != NULL) { - linelen = strlen(linebuf) - 1; - if (linelen <= 0) - break; - if (linebuf[linelen] != '\n') - errx(1, "malformed input line %d (len=%d)", lineno, linelen); + lineno = 0; + linecap = CHKFILELINELEN; + while ((linelen = getline(&linebuf, &linecap, inp)) > 0) { + lineno++; + while (linelen > 0 && linebuf[linelen - 1] == '\n') + linelen--; linebuf[linelen] = '\0'; filename = linebuf + digestnamelen + 2; hashstr = linebuf + linelen - hashstrlen; /* * supported formats: * BSD: (): - * GNU: [ *] + * GNU: [ *U^] */ - if (linelen >= digestnamelen + hashstrlen + 6 && + if ((size_t)linelen >= digestnamelen + hashstrlen + 6 && strncmp(linebuf, digestname, digestnamelen) == 0 && strncmp(filename - 2, " (", 2) == 0 && - strncmp(hashstr - 4, ") = ", 4) == 0) { + strncmp(hashstr - 4, ") = ", 4) == 0 && + strspn(hashstr, "0123456789ABCDEFabcdef") == hashstrlen) { *(hashstr - 4) = '\0'; - } else if (linelen >= hashstrlen + 3 && + } else if ((size_t)linelen >= hashstrlen + 3 && + strspn(linebuf, "0123456789ABCDEFabcdef") == hashstrlen && linebuf[hashstrlen] == ' ') { linebuf[hashstrlen] = '\0'; hashstr = linebuf; filename = linebuf + hashstrlen + 1; - if (*filename == ' ' || *filename == '*') - filename++; } else { + if (wflag) { + warnx("%s: %d: improperly formatted " + "%s checksum line", + checksumsfile, lineno, + mode == mode_perl ? "SHA" : digestname); + } malformed++; continue; } - rec = malloc(sizeof (*rec)); + rec = malloc(sizeof(*rec)); if (rec == NULL) errx(1, "malloc failed"); rec->chksum = strdup(hashstr); @@ -240,10 +365,10 @@ static int gnu_check(const char *checksumsfile) rec->next = NULL; *next = rec; next = &rec->next; - lineno++; + numrecs++; } - fclose(inp); - return (lineno - 1); + if (inp != stdin) + fclose(inp); } /* Main driver. @@ -261,18 +386,19 @@ main(int argc, char *argv[]) #ifdef HAVE_CAPSICUM cap_rights_t rights; #endif - int ch, fd; - char *p, *string; + const struct option *longopts; *** 1830 LINES SKIPPED *** From nobody Mon May 8 12:08:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFKnR2Ph8z49qbB; Mon, 8 May 2023 12:08:27 +0000 (UTC) (envelope-from schakrabarti@microsoft.com) Received: from HK2P15301CU002.outbound.protection.outlook.com (mail-eastasiaazlp170100000.outbound.protection.outlook.com [IPv6:2a01:111:f403:c400::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFKnQ18j1z4940; Mon, 8 May 2023 12:08:26 +0000 (UTC) (envelope-from schakrabarti@microsoft.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=microsoft.com header.s=selector2 header.b=Ca9xqPD6; spf=pass (mx1.freebsd.org: domain of schakrabarti@microsoft.com designates 2a01:111:f403:c400:: as permitted sender) smtp.mailfrom=schakrabarti@microsoft.com; dmarc=pass (policy=reject) header.from=microsoft.com; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O9hl9gvRgKowsWVHMt3UDPFuKwBA6KmOYdjw+MsFC4EM2zZM/ZaV1iQVyAAJpCXbD7RJKk3lIn4EDLKBV9/0GPbFEyHxeXQzQOHOIbB+/oofn4BcbZ+a9WNwDvWqPwrEV/o0Iib7ATYOa7Q0mhmD4k0Q4T8sqVLWGU3/eiiuOdoBdfCN6f0ZySByrzuZ6F9sh50i2P9faHah2krjc8hSm/B6z9VrQrpdyrhZCml94h8KSdDFn8GUsMYeAHN6TyEg2yT0oo05tPg8uTZJnbFNv+XI0D6GOnW70GQABQ/PRA6mxj2YaKAPZRHiQQxcy/p7rHncJBHNSozEtTU+CRpa8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eP7ove1JBMZAmtI6/iHdiYRh4Vc734jx7UH1wQm3QM4=; b=JZqJIEBEz00MNUnxtsHfrX6G46VjllMnr3yPQlkrnpj1QRHmobS3RAp9W4Lhpi2/xkE6JoXGtzFaEvZMgmnLxh3M0pyI45gTsudUQXLz4l44kw/ucP0z1BcGue81w7ozRzoXB6nv2DxceCCuiOF5VvrXOY+AbsYVEONaTTDmLWdV8xmirAV1uVZfAtuJQrqb2p3P/8WR9MocAXMYxVRNA15PJqqgO/tQt80L5w/9WeStxhZgr/WOIhbTgJtAgFLj7e4lpFBFb6eMhL8+yd/gpQVZjtKUaUaOpmd15D76841Jk2sBYQ59TuhIkm2WAiN+RGUwEEQ6EoGfWEAXrs86EA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eP7ove1JBMZAmtI6/iHdiYRh4Vc734jx7UH1wQm3QM4=; b=Ca9xqPD6uizCR4lHRHnz2z8rtjvTduiQejSSymnjsHWym8gitTiVPQg/4A7HUt4N1CnHOHADaJFrpSSEO4Rp9Tjp9P1hX/3mMNaK3l3c+Zt4V9Jx7lqBlp6yFaQIlGzxNXpQDkiyF3/50ZYS3FJo1GGgaipaTxueZPjVB6QSfXI= Received: from PSAP153MB0536.APCP153.PROD.OUTLOOK.COM (2603:1096:301:75::14) by PSAP153MB0406.APCP153.PROD.OUTLOOK.COM (2603:1096:301:3d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.3; Mon, 8 May 2023 12:08:19 +0000 Received: from PSAP153MB0536.APCP153.PROD.OUTLOOK.COM ([fe80::3636:5810:fb12:6d71]) by PSAP153MB0536.APCP153.PROD.OUTLOOK.COM ([fe80::3636:5810:fb12:6d71%7]) with mapi id 15.20.6411.003; Mon, 8 May 2023 12:08:19 +0000 From: Souradeep Chakrabarti To: Kyle Evans CC: Wei Hu , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: RE: [EXTERNAL] Re: git: 9729f076e4d9 - main - arm64: Hyper-V: enablement for ARM64 in Hyper-V (Part 3, final) Thread-Topic: [EXTERNAL] Re: git: 9729f076e4d9 - main - arm64: Hyper-V: enablement for ARM64 in Hyper-V (Part 3, final) Thread-Index: AQHZcn/2gVTtqNix60WeYnOdZN2tzq86cNIwgAE7PnCAAPQkAIABB3EggABvAkCAABKbsIAALsCAgBIMgiA= Date: Mon, 8 May 2023 12:08:19 +0000 Message-ID: References: <202210271354.29RDsUoH077155@gitrepo.freebsd.org> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=da1b4288-5546-4c98-b688-15fc2da9db4d;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2023-05-08T12:01:01Z;MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PSAP153MB0536:EE_|PSAP153MB0406:EE_ x-ms-office365-filtering-correlation-id: 6759e88e-0666-48fc-c4ea-08db4fbce95b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: E2530wprNVe2fLOrwmkWlV7GFijoH5Z0C5xyl6zIqFiv9FEAJdoDBc1Hl7mp2AccDlD54KyfBPayrLcQL3XfE1jH1DJTi0zfhU0vJzPbWfFolngj6UDNF3Hun5rItWZQvNuk3UnLebc2Vzks5gcQil+xU2vgrhhPBhrtrExeOfD3nGx88l9XVhmoIiIbIQGX6dQMGes6sNa6jZiOdtuGFsCRJmdUbj8Z4D6xS2UHRLjLqWsxBr+Wun6YnJGjS+6jAUw5cFbJDacqEXDmw3KaSRNt4WMhIUTq1QCHEdPdUSL8BYgp6UT8Aa5EpaY6PUVn+dnn6mhNCiBcGYpNCGvFpmaeaZPFvfhIcYoNZ3YzfondfGzRisUuorkp1wcGVc+jO1mdOXaFpregLhhMVWkgu+GB0AjFIa8VIq41tEwQKrABc6UaHitb3DLwkKl0iKd5PWuh1Y/V+s/5CxC1RjIyxzwL2n5fLxE0+Z+sPWmzPQVN41FIGeuolxZ5h1F8KINCOsmQDKJWd4A1nk3u2KET086vfofe6EEgZGqZ0TTzPebAXuKSX9Cl3TdBk5FLDSd7c6OmoaUcGu85F9C2qZKC+DGcKTmkgGEejAvt227MZ/m0xdCuyxNVDc4D3VA/Rfht5RybC7vanfAY9vPEAddlGEXPVN+I35NFb0xNl3l8p6M= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PSAP153MB0536.APCP153.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(4636009)(39860400002)(136003)(366004)(346002)(376002)(396003)(451199021)(83380400001)(450100002)(7696005)(478600001)(10290500003)(71200400001)(54906003)(9686003)(6506007)(186003)(8990500004)(2906002)(38100700002)(33656002)(52536014)(786003)(76116006)(64756008)(6916009)(82960400001)(66946007)(66446008)(66476007)(122000001)(4326008)(82950400001)(66556008)(41300700001)(8936002)(8676002)(38070700005)(86362001)(5660300002)(55016003)(316002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?B?VW55V1M3ZUFxd3BCWkJ4YTR5akdzY3NpV0c4ZnVvdzdjZlhIRi9WS3hzZGVR?= =?utf-8?B?c3JoazN6K1E0S2VKenV2MzFpOGptZWt2Szc2dEtVb3dzWEhJeVQvaDNzSGZu?= =?utf-8?B?c1cxbTh5dXlmNkl3Y0x1a29lZ1pPMTR5bmY0ZnRIa0VKc1pHYlFwcVdHV2tO?= =?utf-8?B?YlBjZHViaE1UeUdPMFBockZGay9sSXJzYmRHZ01uSjZySXpmWDNNODU1ckhP?= =?utf-8?B?ZkRkbkc3YVdGVzdiV09JRFo1TzV6SjJKMHlncURvSTFwcGljenhvS1BPSWsy?= =?utf-8?B?VlhSRlg5YW5odTV2SEVFWjcrN3I2S2Ura3NJd0NDT1Rod2tOeFhORmY1MTFS?= =?utf-8?B?c0owU2x6ZHFFY2VHNHgrWDZMa29ka2p6ZTc3ZjFqTml2ZWdHb25QQTM1QTAw?= =?utf-8?B?bHh5eEhIV1F6bTVScm40aDBOc1EwSHdEcW15MGtpVmlLbUttSTNLeTM5UTBI?= =?utf-8?B?OXFJMzNCeTFJQmhwSkxGSUZDbGQ2RnRyaHJCaW5uZUtuWEthZjdVNElFUUtU?= =?utf-8?B?cmVsVzd6OThOM2J4eU5ZdENmMmtkRFNtNEtGRk1PdWhMNThkem82Z0NaL3Ey?= =?utf-8?B?ekNnNDArdmM3SUtMT3ZWbHRYMWhySDRyeDVDS2I0T29WN3JYdTFKcUtiSjJu?= =?utf-8?B?cXdHeUt0Z1BXS0hxbnBNOFZ5cTV3T0tBTHR4MW5pTWR6TC8ySmxVd0pWUnd6?= =?utf-8?B?YklHVHNLSnUvbjJUR29hTW55QlZ6biswYkpwaFhsbEovNEZDZGNYNFVJTFhs?= =?utf-8?B?cmt1R3NtSklnQU1TMjlIVzVnZndmbnJSTTBWM0RBbEJWajRoby9ZNmxsR01E?= =?utf-8?B?Q0wyOFRSSjFUeWNML3FaOUhRSGIrTWswSC9OOVhmYlRrY3JsVUI2MWtSY1ZQ?= =?utf-8?B?Q05XcGw1TUt0K2xvM1h6RVMyenFZcTdaS2E2MlIzMnNKN3B5MHNNQ3NRVHgy?= =?utf-8?B?RmJuVzFUdndOaVR1eE51VFJ2RHBlUDQ1RUw3bUlhY1hDSnVXT1JwN2I4L0M0?= =?utf-8?B?dE9ESmt5TFVuM1NGZjJlMXMxdXB6YVo1TlZKQ0UvZzJLdlJmL3YzUjNDS3Qx?= =?utf-8?B?aW5qNVhFOGlIS0V5QUU4L2w4c0cwWXFmK3lGdFcwdm1HWk5IUVk3dXJmS3Z3?= =?utf-8?B?Z1R2NmNWeXB2cmNVU3VPSXM2NW5hSDNmSUtFeXNSUmZENjBOanUvSmtXN0d0?= =?utf-8?B?Z0xwc3l6QzZjMDF3MTBPS3lnRXlIWUtDRDdKd2lJZ0RTMngxZ2YzR1F4eWVs?= =?utf-8?B?K2NMcW4wNFdpb0ZScmJ0QmlDY0ltdVErTXZhVGRyeSt0T3ppNEd1SGtYQ0Er?= =?utf-8?B?YmU5ajExNUZrOFdNOVd4dk5JS28rbnVvMkdZVkxLajFIR0hQZTRLb1pvOThH?= =?utf-8?B?V0l2dU9FL09hYVExVW91S0pTeENGbzZtNDdjS3NzU1JUSDZpQ3lhUURHd2RX?= =?utf-8?B?MXhjTzBIdzVQU2JrRHR0TVJBSWxaYXdnL0I5b2p0NFpCVGkwTUlDKzJYem03?= =?utf-8?B?NFVid2JndnZIamtIMVFqTWc5NUJMVWsvSmowc2FNdmRqcDIxT1phWVhCQnVh?= =?utf-8?B?UnNtUk5ONWtseUNYM3ZTTDVYcURRQ2lyYXJJVFU0MXJpZnJaSmRpek43ZWxp?= =?utf-8?B?eWZFRXRSelNZazcrNHlXT2tEOE9sd1JqV0F3YWtlaE5keFFuRTB2elc1KzJF?= =?utf-8?B?b1R4UzhmcE9Qd05ZNHJtY0FGKzAyY01uaGRGT25CaG9FM3JDZDZOeDhmajdR?= =?utf-8?B?ajF1VkpCdmtIWVd1U1dnY3lIVTVPd2NxelBQb3pjeWkrWVBKci9YSExUZGov?= =?utf-8?B?bEJiRWRsQlZPOVNMcVVBOExJR2txUk03R2l5RXFlUWRiY1h4cUFodzFPc1FE?= =?utf-8?B?OUtkSmdnTFZRRzdSZllIZzluODBQdjIrS3V1OUlvRFJNUmtsYWJWb3VlNTUr?= =?utf-8?B?aldBVUUrekFIVWdwZytqV3NWQXBOb2ZCWVZ0Y2R5ZSsyeEo3S0lSQnoxc1lG?= =?utf-8?B?Zmt3cTBNK1M3NU9ZY2RDMFJiMXF3ODhLc1Nha1V1VG5ubUJzMkl5Y1NzK1Fm?= =?utf-8?B?ZVM2TXp6YllqZjBXQ1RRTVFRMU5tOHZMVkVOK0xZWENYYUlEcHJnTEZsNkhZ?= =?utf-8?Q?tz7WPAhsV3lTf7LEep/i2PqNa?= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PSAP153MB0536.APCP153.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6759e88e-0666-48fc-c4ea-08db4fbce95b X-MS-Exchange-CrossTenant-originalarrivaltime: 08 May 2023 12:08:19.0244 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: /BLFS6wASH4CoJ8HIACZCWYEoW9s+OlQL4FGghE1E8+0lPsCrYRbn9MtWNHay9428yeti7MR64vS7PZgQXmkOGeIzxdTFo2f5odoSEZY804= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAP153MB0406 X-Spamd-Result: default: False [-8.70 / 15.00]; WHITELIST_SPF_DKIM(-3.00)[microsoft.com:d:+,microsoft.com:s:+]; DWL_DNSWL_LOW(-1.00)[microsoft.com:dkim]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.80)[-0.796]; DMARC_POLICY_ALLOW(-0.50)[microsoft.com,reject]; R_SPF_ALLOW(-0.20)[+ip6:2a01:111:f403:c000::/51]; R_DKIM_ALLOW(-0.20)[microsoft.com:s=selector2]; MIME_BASE64_TEXT(0.10)[]; MIME_GOOD(-0.10)[text/plain]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; ASN(0.00)[asn:8075, ipnet:2a01:111:f000::/36, country:US]; RCVD_COUNT_THREE(0.00)[3]; RCPT_COUNT_FIVE(0.00)[5]; FROM_HAS_DN(0.00)[]; DKIM_TRACE(0.00)[microsoft.com:+]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[] X-Rspamd-Queue-Id: 4QFKnQ18j1z4940 X-Spamd-Bar: -------- X-ThisMailContainsUnwantedMimeParts: N DQoNCg0KPi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+RnJvbTogS3lsZSBFdmFucyA8a2V2 YW5zQGZyZWVic2Qub3JnPg0KPlNlbnQ6IFRodXJzZGF5LCBBcHJpbCAyNywgMjAyMyA1OjU0IEFN DQo+VG86IFNvdXJhZGVlcCBDaGFrcmFiYXJ0aSA8c2NoYWtyYWJhcnRpQG1pY3Jvc29mdC5jb20+ DQo+Q2M6IFdlaSBIdSA8d2h1QGZyZWVic2Qub3JnPjsgc3JjLWNvbW1pdHRlcnNAZnJlZWJzZC5v cmc7IGRldi1jb21taXRzLXNyYy0NCj5hbGxAZnJlZWJzZC5vcmc7IGRldi1jb21taXRzLXNyYy1t YWluQGZyZWVic2Qub3JnDQo+U3ViamVjdDogUmU6IFtFWFRFUk5BTF0gUmU6IGdpdDogOTcyOWYw NzZlNGQ5IC0gbWFpbiAtIGFybTY0OiBIeXBlci1WOg0KPmVuYWJsZW1lbnQgZm9yIEFSTTY0IGlu IEh5cGVyLVYgKFBhcnQgMywgZmluYWwpDQo+DQo+T24gV2VkLCBBcHIgMjYsIDIwMjMgYXQgNDoz N+KAr1BNIFNvdXJhZGVlcCBDaGFrcmFiYXJ0aQ0KPjxzY2hha3JhYmFydGlAbWljcm9zb2Z0LmNv bT4gd3JvdGU6DQo+Pg0KPj4NCj4+DQo+Pg0KPj4gPi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0t DQo+PiA+RnJvbTogU291cmFkZWVwIENoYWtyYWJhcnRpDQo+PiA+U2VudDogVGh1cnNkYXksIEFw cmlsIDI3LCAyMDIzIDI6MDEgQU0NCj4+ID5UbzogJ0t5bGUgRXZhbnMnIDxrZXZhbnNAZnJlZWJz ZC5vcmc+DQo+PiA+Q2M6ICdXZWkgSHUnIDx3aHVAZnJlZWJzZC5vcmc+OyAnc3JjLWNvbW1pdHRl cnNAZnJlZWJzZC5vcmcnIDxzcmMtDQo+PiA+Y29tbWl0dGVyc0BmcmVlYnNkLm9yZz47ICdkZXYt Y29tbWl0cy1zcmMtYWxsQGZyZWVic2Qub3JnJw0KPj4gPjxkZXYtY29tbWl0cy1zcmMtIGFsbEBm cmVlYnNkLm9yZz47DQo+PiA+J2Rldi1jb21taXRzLXNyYy1tYWluQGZyZWVic2Qub3JnJyA8ZGV2 LWNvbW1pdHMtc3JjLQ0KPj4gPm1haW5AZnJlZWJzZC5vcmc+DQo+PiA+U3ViamVjdDogUkU6IFtF WFRFUk5BTF0gUmU6IGdpdDogOTcyOWYwNzZlNGQ5IC0gbWFpbiAtIGFybTY0OiBIeXBlci1WOg0K Pj4gPmVuYWJsZW1lbnQgZm9yIEFSTTY0IGluIEh5cGVyLVYgKFBhcnQgMywgZmluYWwpDQo+PiA+ DQo+PiA+DQo+PiA+DQo+PiA+DQo+PiA+Pi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+PiA+ PkZyb206IFNvdXJhZGVlcCBDaGFrcmFiYXJ0aQ0KPj4gPj5TZW50OiBXZWRuZXNkYXksIEFwcmls IDI2LCAyMDIzIDc6MjYgUE0NCj4+ID4+VG86IEt5bGUgRXZhbnMgPGtldmFuc0BmcmVlYnNkLm9y Zz4NCj4+ID4+Q2M6IFdlaSBIdSA8d2h1QGZyZWVic2Qub3JnPjsgc3JjLWNvbW1pdHRlcnNAZnJl ZWJzZC5vcmc7DQo+PiA+PmRldi1jb21taXRzLXNyYy0gYWxsQGZyZWVic2Qub3JnOyBkZXYtY29t bWl0cy1zcmMtbWFpbkBmcmVlYnNkLm9yZw0KPj4gPj5TdWJqZWN0OiBSRTogW0VYVEVSTkFMXSBS ZTogZ2l0OiA5NzI5ZjA3NmU0ZDkgLSBtYWluIC0gYXJtNjQ6IEh5cGVyLVY6DQo+PiA+PmVuYWJs ZW1lbnQgZm9yIEFSTTY0IGluIEh5cGVyLVYgKFBhcnQgMywgZmluYWwpDQo+PiA+Pg0KPj4gPj4N Cj4+ID4+DQo+PiA+Pg0KPj4gPj4+LS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4+ID4+PkZy b206IEt5bGUgRXZhbnMgPGtldmFuc0BmcmVlYnNkLm9yZz4NCj4+ID4+PlNlbnQ6IFdlZG5lc2Rh eSwgQXByaWwgMjYsIDIwMjMgMzozOSBBTQ0KPj4gPj4+VG86IFNvdXJhZGVlcCBDaGFrcmFiYXJ0 aSA8c2NoYWtyYWJhcnRpQG1pY3Jvc29mdC5jb20+DQo+PiA+Pj5DYzogS3lsZSBFdmFucyA8a2V2 YW5zQGZyZWVic2Qub3JnPjsgV2VpIEh1IDx3aHVAZnJlZWJzZC5vcmc+OyBzcmMtDQo+PiA+Pj5j b21taXR0ZXJzQGZyZWVic2Qub3JnOyBkZXYtY29tbWl0cy1zcmMtYWxsQGZyZWVic2Qub3JnOw0K Pj4gPj4+ZGV2LWNvbW1pdHMtc3JjLSBtYWluQGZyZWVic2Qub3JnDQo+PiA+Pj5TdWJqZWN0OiBS ZTogW0VYVEVSTkFMXSBSZTogZ2l0OiA5NzI5ZjA3NmU0ZDkgLSBtYWluIC0gYXJtNjQ6IEh5cGVy LVY6DQo+PiA+Pj5lbmFibGVtZW50IGZvciBBUk02NCBpbiBIeXBlci1WIChQYXJ0IDMsIGZpbmFs KQ0KPj4gWy4uLiBzbmlwIC4uLl0NCj4+ID4+PkhpLA0KPj4gPj4+DQo+PiA+Pj5UaGF0IHNlZW1z IG9kZC4gV2hhdCBoYXBwZW5zIGlmIHlvdSBidW1wIHRoZSBTWVNJTklUIHVwIHRvDQo+PiA+Pj5T SV9TVUJfU01QDQo+PiA+Pj4rIDEsIFNJX09SREVSX0ZJUlNUPyBXZSBkb24ndCBrbm93IGZvciBh IGZhY3QgdGhhdCBhbGwgQVBzIGFyZQ0KPj4gPj4+KyByZWFkeQ0KPj4gPj4+Zm9yIHNjaGVkdWxp bmcgdW50aWwgYWZ0ZXIgc21wX2FmdGVyX2lkbGVfcnVubmFibGUoKSwgd2hpY2ggaXMgYWxzbw0K Pj4gPj4+YXQgU0lfT1JERVJfQU5ZDQo+PiA+Pj4tLSBtYXliZSB0aGVyZSdzIGp1c3Qgc29tZXRo aW5nIGdvaW5nIGhvcnJpYmx5IHdyb25nLg0KPj4gPj4+VGhhdCB3b3VsZCBwZXJoYXBzIGV4cGxh aW4gd2h5IGl0J3MgZmluZSBvbiBhIHNpbmdsZSBwcm9jZXNzb3INCj4+ID4+PnN5c3RlbSwgd2hp Y2ggd29uJ3QgZG8gYW55dGhpbmcgdXNlZnVsIChhdCBsZWFzdCBpbiBsYXRlciBwYXJ0cyBvZg0K PlNJX1NVQl9TTVApLg0KPj4gPj5bU291cmFkZWVwXQ0KPj4gPj5JbiBBUk02NCBTTVAoVk0gd2l0 aCB0d28gY3B1KSwgIHN0b3J2c2MgYXR0YWNoIGlzIGhhcHBlbmluZyB0d28NCj4+ID4+dGltZXMg Zm9yIHNpbmdsZSBzY3NpIGNvbnRyb2xsZXIuDQo+PiA+PkJ1dCBmb3IgaW50ZWwgc2ltaWxhciBW TSAodHdvIGNwdSksIGl0IGlzIGhhcHBlbmluZyBvbmNlLg0KPj4gPj5Gb3IgdGhlIGR1bW15L2Zh a2Ugc3RvcnZzYyBpbiBhcm02NCwgd2UgYXJlIGdldHRpbmcgc3R1Y2sgYXQgZGV2aWNlX2F0dGFj aC4NCj4+ID4+DQo+PiA+PkRldGFpbHM6DQo+PiA+Pg0KPj4gPj52bWJ1c19zY2FuX2RvbmUoKSwg bm90IGdldHRpbmcgaW52b2tlZCBiZWNhdXNlIHZtYnVzX2FkZF9jaGlsZCgpIGlzDQo+PiA+Pm5v dCBjb21wbGV0ZSBmb3IgYSBjaGFubmVsIDE1LCBiZWNhdXNlIG9mIHdoaWNoIHZtYnVzX2RldnRx IGlzDQo+PiA+PmhhdmluZyBvbmUgdGFzayBwZW5kaW5nLg0KPj4gPj4NCj4+ID4+Tm93DQo+PiA+ PkJ5IHBhc3NpbmcgTk1JIGluIHRoZSBodW5nIHN5c3RlbSwgYWZ0ZXIgZXhhbWluaW5nIGFsbCB0 aHJlYWRzOg0KPj4gPj4NCj4+ID4+c2NoZWRfc3dpdGNoKCkgYXQgc2NoZWRfc3dpdGNoKzB4NGRj DQo+PiA+Pm1pX3N3aXRjaCgpIGF0IG1pX3N3aXRjaCsweDE5NA0KPj4gPj5zbGVlcHFfc3dpdGNo KCkgYXQgc2xlZXBxX3N3aXRjaCsweGZjDQo+PiA+Pl9jdl93YWl0KCkgYXQgX2N2X3dhaXQrMHgx NjANCj4+ID4+X3NlbWFfd2FpdCgpIGF0IF9zZW1hX3dhaXQrMHg1MA0KPj4gPj5zdG9ydnNjX2F0 dGFjaCgpIGF0IHN0b3J2c2NfYXR0YWNoKzB4NjEwDQo+PiA+PmRldmljZV9hdHRhY2goKSBhdCBk ZXZpY2VfYXR0YWNoKzB4M2Y4DQo+PiA+PmRldmljZV9wcm9iZV9hbmRfYXR0YWNoKCkgYXQgZGV2 aWNlX3Byb2JlX2FuZF9hdHRhY2grMHg3Yw0KPj4gPj52bWJ1c19hZGRfY2hpbGQoKSBhdCB2bWJ1 c19hZGRfY2hpbGQrMHg2NA0KPj4gPj4NCj4+ID4+Tm93ICwNCj4+ID4+DQo+PiA+Pkl0IGlzIHN0 dWNrIGF0IHdhaXRpbmcgb24gc2VtYV93YWl0KCkgb24gcmVxdWVzdC0+c3luY2hfc2VtYSBpbg0K Pj4gPj5odl9zdG9ydnNjX2NoYW5uZWxfaW5pdCgpIGJlY2F1c2UNCj4+ID4+c2VtYV9wb3N0KCkg b24gcmVxdWVzdC0+c3luY2hfc2VtYSBpcyBub3QgZ2V0dGluZyBpbnZva2VkLiBXaGljaCB1bmxv Y2tzIGl0Lg0KPj4gPj5UaGlzIGlzIGJlY2F1c2Ugd2UgYXJlIHdhaXRpbmcgb24gc2VtYV93YWl0 IG9uIHN5bmNoX3NlbWENCj4+ID4+aHZfc3RvcnZzY19jaGFubmVsX2luaXQoKSwgZm9yIHN0b3J2 c2MxICwgYnV0IHRoZXJlIGlzIG5vIHN0b3J2c2MxDQo+PiA+PmRldmljZS4gU28gbm90IGdldHRp bmcgYSBjYWxsYmFjayBjYWxsZWQgZm9yIHN0b3J2c2MxLg0KPj4gPj4NCj4+ID4+RnJvbSBBUk02 NCBkZWJ1ZyBsb2c6DQo+PiA+PklmIHlvdSBzZWUgYXQgbGluZSA1NDUgYWdhaW4gU0NJIGRldmlj ZSBnb3QgZGV0ZWN0ZWQuDQo+PiA+Pg0KPj4gPj4gICAgICBMaW5lICAzNzA6IHN0b3J2c2MwOiBF bmxpZ2h0ZW5lZCBTQ1NJIGRldmljZSBkZXRlY3RlZA0KPj4gPj4gICAgICBMaW5lICAzNzE6IHN0 b3J2c2MwOiA8SHlwZXItViBTQ1NJPiBvbiB2bWJ1czANCj4+ID4+ICAgICAgTGluZSAgNDA2OiAo cHJvYmUwOnN0b3J2c2MwOjA6MDowKTogc3RvcnZzYyBzY3NpX3N0YXR1cyA9IDIsIHNyYl9zdGF0 dXMgPSA2DQo+PiA+PiAgICAgIExpbmUgIDQyMTogPE1zZnQgVmlydHVhbCBEaXNrIDEuMD4gRml4 ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBTQ1NJIGRldmljZQ0KPj4gPj4gICAgICBMaW5lICA0MzY6 IGRhMDogPE1zZnQgVmlydHVhbCBEaXNrIDEuMD4gRml4ZWQgRGlyZWN0IEFjY2VzcyBTUEMtMyBT Q1NJIGRldmljZQ0KPj4gPj4gICAgICBMaW5lICA0NDM6IHBhc3MxOiA8TXNmdCBWaXJ0dWFsIERW RC1ST00gMS4wPiBSZW1vdmFibGUgQ0QtUk9NDQo+PiA+PlNQQy0zIFNDU0kgZGV2aWNlDQo+PiA+ PiAgICAgIExpbmUgIDQ0NzogY2QwOiA8TXNmdCBWaXJ0dWFsIERWRC1ST00gMS4wPiBSZW1vdmFi bGUgQ0QtUk9NDQo+PiA+PlNQQy0zDQo+PiA+U0NTSQ0KPj4gPj5kZXZpY2UNCj4+ID4+ICAgICAg TGluZSAgNTQ1OiBzdG9ydnNjMTogRW5saWdodGVuZWQgU0NTSSBkZXZpY2UgZGV0ZWN0ZWQNCj4+ ID4+ICAgICAgTGluZSAgNTQ3OiBzdG9ydnNjMTogRW5saWdodGVuZWQgU0NTSSBkZXZpY2UgZGV0 ZWN0ZWQNCj4+ID4+ICAgICAgTGluZSAgNTQ5OiBzdG9ydnNjMTogPEh5cGVyLVYNCj4+ID4+U0NT ST5odl9zdG9ydnNjX29uX2NoYW5uZWxfY2FsbGJhY2sgaXMgY2FsbGVkDQo+PiA+Pg0KPj4gPj5G cm9tIExvZzoNCj4+ID4+DQo+PiA+PnVua25vd246IGRldmljZV9hZGRfY2hpbGQgZm9yIGNoYW4x NQ0KPj4gPj5zdG9ydnNjMTogRW5saWdodGVuZWQgU0NTSSBkZXZpY2UgZGV0ZWN0ZWQNCj4+ID4+ c3RvcnZzYzE6IEVubGlnaHRlbmVkIFNDU0kgZGV2aWNlIGRldGVjdGVkDQo+PiA+PnN0b3J2c2Mx OiA8SHlwZXItViBTQ1NJPiBvbiB2bWJ1czANCj4+ID4+c3RvcnZzYyByaW5nYnVmZmVyIHNpemU6 IDI2MjE0NCwgbWF4X2lvOiA1MTINCj4+ID4+c3RvcnZzYzE6IGNoYW4xNSBhc3NpZ25lZCB0byBj cHUxIFt2Y3B1MV0NCj4+ID4+aG4wOiBsaW5rIHN0YXRlIGNoYW5nZWQgdG8gVVANCj4+ID4+dm1i dXMwOiB2bWJ1c19jaGFubXNnX2hhbmRsZSB0eXBlIDB4YQ0KPj4gPj5zdG9ydnNjMTogZ3BhZGxf Y29ubihjaGFuMTUpIHN1Y2NlZWRlZA0KPj4gPj52bWJ1czA6IHZtYnVzX2NoYW5tc2dfaGFuZGxl IHR5cGUgMHg2DQo+PiA+PnN0b3J2c2MxOiBjaGFuMTUgb3BlbmVkDQo+PiA+PndhaXRpbmcgb24g c2VtYSB3YWl0IHN5bmNoX3NlbWEgaHZfc3RvcnZzY19jaGFubmVsX2luaXQNCj4+ID5bU291cmFk ZWVwXSBUaGUgZml4IGlzIHdvcmtpbmcsIHRoZSB0ZXN0IGJlZCBoYWQgYW4gaXNzdWUsIGFmdGVy DQo+PiA+Zml4aW5nIHRoYXQgdGhlIGZpeCBpcyB3b3JraW5nLg0KPj4gPkkgd2lsbCBzaGFyZSB0 aGUgZml4IGJ5IHRoaXMgd2Vlay4NCj4+IFtTb3VyYWRlZXBdIFNtYWxsIHVwZGF0ZSwgdGhlIHBy b2JsZW0gaGFwcGVucyBvbmx5IGlmIHRoZXJlIGlzIGFuDQo+PiBleHRyYSBTQ1NJIGNvbnRyb2xs ZXIgb24gdGhlIHN5c3RlbS4gVGhlbiBpdCBmYWlscyB0byBhdHRhY2ggc3RvcnZzYyBmb3IgdGhh dCBTQ1NJLg0KPj4NCj4NCj5FeGNlbGxlbnQhIEtub3dpbmcgbm93IHdoYXQgY29uZmlndXJhdGlv biBjYXVzZXMgaXQ7IGRvZXMgaXQgcmVwcm9kdWNlIG9uIHg4NiBhcw0KPndlbGwgd2l0aCBhbiBl eHRyYSBTQ1NJIGNvbnRyb2xsZXI/IEknZCBleHBlY3Qgc28sIGJ1dCBtYXliZQ0KW1NvdXJhZGVl cF0gSW4geDg2IHRoaXMgcHJvYmxlbSBpcyBub3Qgc2Vlbi4NCkFmdGVyIGRvaW5nIG1vcmUgZGV0 YWlsZWQgZGVidWdnaW5nLCBsb29rcyBsaWtlIHRoZSBpbnRlcnJ1cHQgY29taW5nIHRvIENQVTEN CmFyZSBub3QgZ2V0dGluZyBoYW5kbGVkIG9yIENQVTEgbm90IGdldHRpbmcgdGhlIGludGVycnVw dCBpbiBJUlEgMTgsLCB3aGljaCBpcyB1c2VkIGJ5DQpIeXBlci1WIHRvIG5vdGlmeSBndWVzdCBv biBpbmNvbWluZyBtZXNzYWdlIG9uIGFueSBjaGFubmVsLg0KSSBjaGVja2VkIHZtc3RhdCAtSSwg YW5kIGl0IHNlZW1zIHZtYnVzIHVzaW5nIGdpYzAsIHAyIGluIGFtcjY0Lg0KDQpJdCBsb29rcyB0 byBtZSwgdm1idXMgaW50ciBoYW5kbGVyIG5vdCBnZXR0aW5nIGNhbGxlZCBmb3IgQ1BVMSBpZiBJ UlEgaXMgY29taW5nIHRvIENQVTENCmlycSAxOC4NCg0KRG8gd2UgaGF2ZSBhbnl0aGluZyBpbiBG cmVlQlNEIGFybTY0IHRvIGVuYWJsZSBhbiBJUlEgaW4gZXZlcnkgQ1BVPw0KDQojIHZtc3RhdCAt aQ0KaW50ZXJydXB0ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg dG90YWwgICAgICAgcmF0ZQ0KZ2ljMCxwMjogdm1idXMwICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDM4MjAgICAgICAgICA0OQ0KZ2ljMCxwNDotcmljX3RpbWVyMCAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDI2NDMgICAgICAgICAzNA0KZ2ljMCxzMTog dWFydDAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDI5OTAgICAgICAg ICAzOA0KY3B1MDphc3QgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDEgICAgICAgICAgMA0KY3B1MTphc3QgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDQgICAgICAgICAgMA0KY3B1MDpwcmVlbXB0ICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDM5MTMgICAgICAgICA1MA0KY3B1MTpw cmVlbXB0ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDQ4OTAgICAg ICAgICA2Mg0KY3B1MDpyZW5kZXp2b3VzICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDIgICAgICAgICAgMA0KY3B1MTpyZW5kZXp2b3VzICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDQgICAgICAgICAgMA0KY3B1MDpoYXJkY2xvY2sgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEgICAgICAgICAgMA0KVG90 YWwgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMTgyNjgg ICAgICAgIDIzMg0KPm5vdC0NCj4NCj5UaGFua3MsDQo+DQo+S3lsZSBFdmFucw0K From nobody Mon May 8 13:55:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFN8V2lP5z49xSy; Mon, 8 May 2023 13:55: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 4QFN8T6hhYz4PcS; Mon, 8 May 2023 13:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683554105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsjAuZMwaEBTySkdx71NEdZBIN8QSqn6F6tFiRYkdso=; b=Ldosrkise+ahqLf4SHZku/nqwpuGSUVUXLmy2HhCfnrbDWXLfz44GkfaGwvsdZcxs3igF2 TAvIsqqKEGgVwwZL/k5wbqltccz3Kpdec5ePrm0OztZnEv4aK0EdxqtOEoEwDnfrqk1f+1 hZLsb5tf4zVcKwIILXnvCdpGB3/+8O7VZKfN08L1xVbn7YFZHvA+WlGTprsTVeJ7i/eZOz f6foJP8wycS+wC6GS5//tjlzHyIEj75ILkVIujBWAxiuQG79J41g02JMlJRZTbvMYqjZpM jvqwEcn7SUgAaWiUfEtKEveel6r8uX8wGo4x+eHE9ixHetY7gqNrSEDBuLgAsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683554105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AsjAuZMwaEBTySkdx71NEdZBIN8QSqn6F6tFiRYkdso=; b=BdJFKx/QvouaY0iLTjwn5gx7vwqBlQvDq5CgYVHbxm8fKtenYmg0GDmBx/XvG8MlfUKG7k delG1H2H4kLYb5i3xHgh3LxQAU/rk/LMdq8LmFmqiwzlqtUvGILTVFYMA3hWJ0bSkfqolC XJQ2zukvORz+wd1PZavVvKr9ybPnCFBkqNZbvNfPZWQ9fvkaWvW/nVZ8aSHpWvxfpcdkSw Dqom/3X5x8MLKYT2Eu5t+Nnr9ondGu8xTUCx2fKq5uAN+zKrfl4MIlC1TBX6HF8uRPFJA8 ie3926Nhof78e1Let//Z147XROvWLPk2z3B73ARVA81P9q49wDj7/4DFTt1h/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683554105; a=rsa-sha256; cv=none; b=MOlUQ1pUmScOU/Sx2s+s0/7YIiHC2ckhspqBdNXNdf7+WpfgccSWEhtuf/FNlpTTCZK+L2 AupyuemJObIJ+Iu6uT/sqPNIL9rcsvpP21jmadqIEQhNr+nlY1nz7mK963vY9HG/Fm6L3q HJeZYys3DsFvfDh94wNI45FKSFLtDytMfcs2WxcwJobLFy1T0LRZLJgTS8GFzM+lG3T/r3 kWbtUQ05McOsOnQbjwgdBfA8vzILBqwRMHAUvo4ep5AKXIqvS9KYhPbKvfQxfnNY/ZtOif HK5GMdzgXyorJmBb4h/lIKHr2uIyqxzc+X1LcPJ5ey0Ql4bhLZbImzwheagXFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFN8T5JX5z139k; Mon, 8 May 2023 13:55:05 +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 348Dt52l095221; Mon, 8 May 2023 13:55:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348Dt52G095220; Mon, 8 May 2023 13:55:05 GMT (envelope-from git) Date: Mon, 8 May 2023 13:55:05 GMT Message-Id: <202305081355.348Dt52G095220@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 1e37655ec389 - main - vt(4): document enable_altgr List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e37655ec3897ad4e71980009eb606d8ac679fb4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=1e37655ec3897ad4e71980009eb606d8ac679fb4 commit 1e37655ec3897ad4e71980009eb606d8ac679fb4 Author: Yuri Pankov AuthorDate: 2023-05-08 13:51:43 +0000 Commit: Yuri Pankov CommitDate: 2023-05-08 13:51:43 +0000 vt(4): document enable_altgr Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D39997 --- share/man/man4/vt.4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/share/man/man4/vt.4 b/share/man/man4/vt.4 index 65d8bc05f7a4..b314b4dec914 100644 --- a/share/man/man4/vt.4 +++ b/share/man/man4/vt.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 21, 2022 +.Dd May 8, 2023 .Dt "VT" 4 .Os .Sh NAME @@ -58,6 +58,7 @@ In .Cd kern.vt.kbd_reboot=1 .Cd kern.vt.kbd_debug=1 .Cd kern.vt.kbd_panic=0 +.Cd kern.vt.enable_altgr=0 .Cd kern.vt.enable_bell=1 .Sh DESCRIPTION The @@ -274,6 +275,8 @@ and can also be changed at runtime with the .Xr sysctl 8 command. .Bl -tag -width indent +.It Va kern.vt.enable_altgr +Enable AltGr key (do not assume right Alt key as Alt). .It Va kern.vt.kbd_halt Enable halt keyboard combination. .It Va kern.vt.kbd_poweroff From nobody Mon May 8 14:01:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFNHV3Yplz49xG8; Mon, 8 May 2023 14:01: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 4QFNHV33d6z4Pyc; Mon, 8 May 2023 14:01:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683554470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vvCFCdNuSw0qztod1iLHbIrhq3b/drbG6GgsKUXbKc=; b=sILTcdAlVC1UDJf0TfDPCnBjc8ZImq7saH54nQdEa82UMgue5U+/z5xd3kEmzBKMUN83O8 jExy6nTuZ7j32JWwUI+kxbJwSkEE1v0mFE++XRCINOnwfUI2QDJTVuTPs9f9xrqDWBgb5N oG/FUZnQ7crmJmseEA+uqtyUcfhyV4A2j8SeCT61VcpdQ56THXhZBouoJRZhMequdSKrzf RAJy8Dxdv6ePIrrvw76lGslfN6lDf0VbBNfPVHi41RmjNxq/MgrbLRRGdMwcXKHtvxfPw+ FCBzDcM+Rm0AxkAI9WzU4r8avp9NxRMRL24z5iV54tPfqlCDa0PfDxSyQEamtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683554470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vvCFCdNuSw0qztod1iLHbIrhq3b/drbG6GgsKUXbKc=; b=Zke+93iBCihKRRn/ImzCWpAvqp42OZCnlZiDes9s0wALahY98dLVRgevCg33nktgj2osZ0 DNIp36KhUZ0w4mmOQIJuc1oJrsZQE5T1wsVx+WxscS/n5y9/F81X5tnH8amvaDtJ92QykP 1yx50ZTJ1m1mZfPgsWc27ZoNbd8Jakmkvl6c75ob+8wC4BomYKsiPffcuj8Vq0ECkcWkmZ cNpXdcs33o9lK2K5MoVSmfhXL3/SaoJ/GvmgtYeNCMTJMK1baiTnCcALGtAClZmLm4eVG0 h+uF/t/T9bK1LzyoXGeqOdqyTCZPDUNKbvoCrlmE46fOpEnTg68KhIfdTmAdKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683554470; a=rsa-sha256; cv=none; b=w88XbkxGCa/I+f8yViApML/Wye50VS7CwqhOM+n0BOAFQ17pR1l9QqEcsjYG+4EgzOh6e/ sEHjEebDkYXkk0zwwlF+Q269IWC6nj2mIWVJVHFwpDE5W9qWRdTJ8MjrmqOePzWqpQ6WQJ tFCFtOL5JD8ZUtBoEQyk+Y/4cyDNZljXeqqaakjC4XDxuEOS3aaie+IRma7aSnqSL/y4Iz W7roRTbqEkiyjcmCsO8qCC2sApN3i3D4KtOgkX4azyzYUcTZtcrCKwnlrZM/exFCtDT9Dd X89nMoie3lTO6qtg2k45ADvonFYJGmq6hSOTvNMcxL2S4gI/yeJmi9jVKwXXqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFNHV28Pjz130m; Mon, 8 May 2023 14:01: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 348E1ArG008191; Mon, 8 May 2023 14:01:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348E1AOZ008190; Mon, 8 May 2023 14:01:10 GMT (envelope-from git) Date: Mon, 8 May 2023 14:01:10 GMT Message-Id: <202305081401.348E1AOZ008190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 9f60b8ce6085 - main - arm64/disassem.c: Add detection of xzr and sp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f60b8ce6085049c3886c3e2eb8d4034cef56627 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9f60b8ce6085049c3886c3e2eb8d4034cef56627 commit 9f60b8ce6085049c3886c3e2eb8d4034cef56627 Author: Mykola Hohsadze AuthorDate: 2023-05-08 13:39:09 +0000 Commit: Mitchell Horne CommitDate: 2023-05-08 13:59:35 +0000 arm64/disassem.c: Add detection of xzr and sp Added support to distinguish between XZR/WZR and SP/WSP registers. Add new OP_ flags to indicate if the instruction allows the use of SP for a given register field. "wSP" and "SP" are removed from w_reg and x_reg, and helper functions are introduced for this purpose of detecting the correct name of the x31 register. mhorne: While here, adjust some whitespace issues from a previous commit. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39862 --- sys/arm64/arm64/disassem.c | 142 +++++++++++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 55 deletions(-) diff --git a/sys/arm64/arm64/disassem.c b/sys/arm64/arm64/disassem.c index 0f7b040e7b06..9db4ea040d37 100644 --- a/sys/arm64/arm64/disassem.c +++ b/sys/arm64/arm64/disassem.c @@ -49,19 +49,23 @@ __FBSDID("$FreeBSD$"); #define OP_MULT_4 (1UL << 2) /* Multiply immediate by 4 */ #define OP_SF32 (1UL << 3) /* Force 32-bit access */ #define OP_SF_INV (1UL << 6) /* SF is inverted (1 means 32 bit access) */ +#define OP_RD_SP (1UL << 7) /* Use sp for RD otherwise xzr */ +#define OP_RT_SP (1UL << 8) /* Use sp for RT otherwise xzr */ +#define OP_RN_SP (1UL << 9) /* Use sp for RN otherwise xzr */ +#define OP_RM_SP (1UL << 10) /* Use sp for RM otherwise xzr */ static const char *w_reg[] = { "w0", "w1", "w2", "w3", "w4", "w5", "w6", "w7", "w8", "w9", "w10", "w11", "w12", "w13", "w14", "w15", "w16", "w17", "w18", "w19", "w20", "w21", "w22", "w23", - "w24", "w25", "w26", "w27", "w28", "w29", "w30", "wSP", + "w24", "w25", "w26", "w27", "w28", "w29", "w30" }; static const char *x_reg[] = { "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23", - "x24", "x25", "x26", "x27", "x28", "x29", "LR", "SP", + "x24", "x25", "x26", "x27", "x28", "x29", "LR" }; static const char *shift_2[] = { @@ -142,69 +146,76 @@ struct arm64_insn { */ static struct arm64_insn arm64_i[] = { { "add", "SF(1)|0001011|SHIFT(2)|0|RM(5)|IMM(6)|RN(5)|RD(5)", - TYPE_01, 0 }, + TYPE_01, 0 }, /* add shifted register */ { "mov", "SF(1)|001000100000000000000|RN(5)|RD(5)", - TYPE_01, 0 }, + TYPE_01, OP_RD_SP | OP_RN_SP }, /* mov (to/from sp) */ { "add", "SF(1)|0010001|SHIFT(2)|IMM(12)|RN(5)|RD(5)", - TYPE_01, 0 }, + TYPE_01, OP_RD_SP | OP_RN_SP }, /* add immediate */ { "ldr", "1|SF(1)|111000010|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT }, /* ldr immediate post/pre index */ + TYPE_02, OP_SIGN_EXT | OP_RN_SP }, /* ldr immediate post/pre index */ { "ldr", "1|SF(1)|11100101|IMM(12)|RN(5)|RT(5)", - TYPE_02, 0 }, /* ldr immediate unsigned */ + TYPE_02, OP_RN_SP }, /* ldr immediate unsigned */ { "ldr", "1|SF(1)|111000011|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, 0 }, /* ldr register */ + TYPE_02, OP_RN_SP }, /* ldr register */ { "ldr", "0|SF(1)|011000|IMM(19)|RT(5)", TYPE_03, OP_SIGN_EXT | OP_LITERAL | OP_MULT_4 }, /* ldr literal */ { "ldrb", "00|111000010|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF32 }, /* ldrb immediate post/pre index */ + TYPE_02, OP_SIGN_EXT | OP_SF32 | OP_RN_SP }, + /* ldrb immediate post/pre index */ { "ldrb", "00|11100101|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* ldrb immediate unsigned */ + TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrb immediate unsigned */ { "ldrb", "00|111000011|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* ldrb register */ + TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrb register */ { "ldrh", "01|111000010|IMM(9)|OPTION(2)|RN(5)|RT(5)", TYPE_02, - OP_SIGN_EXT | OP_SF32 }, /* ldrh immediate post/pre index */ + OP_SIGN_EXT | OP_SF32 | OP_RN_SP }, /* ldrh immediate post/pre index */ { "ldrh", "01|11100101|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* ldrh immediate unsigned */ + TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrh immediate unsigned */ { "ldrh", "01|111000011|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* ldrh register */ + TYPE_02, OP_SF32 | OP_RN_SP }, /* ldrh register */ { "ldrsb", "001110001|SF(1)|0|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF_INV }, /* ldrsb immediate post/pre index */ + TYPE_02, OP_SIGN_EXT | OP_SF_INV | OP_RN_SP }, + /* ldrsb immediate post/pre index */ { "ldrsb", "001110011|SF(1)|IMM(12)|RN(5)|RT(5)",\ - TYPE_02, OP_SF_INV}, /* ldrsb immediate unsigned */ + TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsb immediate unsigned */ { "ldrsb", "001110001|SF(1)|1|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF_INV }, /* ldrsb register */ + TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsb register */ { "ldrsh", "011110001|SF(1)|0|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF_INV }, /* ldrsh immediate post/pre index */ + TYPE_02, OP_SIGN_EXT | OP_SF_INV | OP_RN_SP }, + /* ldrsh immediate post/pre index */ { "ldrsh", "011110011|SF(1)|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF_INV}, /* ldrsh immediate unsigned */ + TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsh immediate unsigned */ { "ldrsh", "011110001|SF(1)|1|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF_INV }, /* ldrsh register */ + TYPE_02, OP_SF_INV | OP_RN_SP }, /* ldrsh register */ { "ldrsw", "10111000100|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT }, /* ldrsw immediate post/pre index */ + TYPE_02, OP_SIGN_EXT | OP_RN_SP }, /* ldrsw immediate post/pre index */ { "ldrsw", "1011100110|IMM(12)|RN(5)|RT(5)", - TYPE_02, 0 }, /* ldrsw immediate unsigned */ + TYPE_02, OP_RN_SP }, /* ldrsw immediate unsigned */ { "ldrsw", "10111000101|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, 0 }, /* ldrsw register */ + TYPE_02, OP_RN_SP }, /* ldrsw register */ { "ldrsw", "10011000|IMM(19)|RT(5)", - TYPE_03, OP_SIGN_EXT | OP_LITERAL | OP_MULT_4 }, /* ldr literal */ - { "str", "1|SF(1)|111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT }, /* str immediate post/pre index */ - { "str", "1|SF(1)|11100100|IMM(12)|RN(5)|RT(5)", - TYPE_02, 0 }, /* str immediate unsigned */ - { "str", "1|SF(1)|111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, 0 }, /* str register */ - { "strb", "00111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SIGN_EXT | OP_SF32 }, /* strb immediate post/pre index */ - { "strb", "0011100100|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* strb immediate unsigned */ - { "strb", "00111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* strb register */ - { "strh", "01111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", - TYPE_02, OP_SF32 | OP_SIGN_EXT }, /* strh immediate post/pre index */ - { "strh", "0111100100|IMM(12)|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* immediate unsigned */ - { "strh", "01111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", - TYPE_02, OP_SF32 }, /* strh register */ + TYPE_03, OP_SIGN_EXT | OP_LITERAL | OP_MULT_4 }, /* ldrsw literal */ + { "str", "1|SF(1)|111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", + TYPE_02, OP_SIGN_EXT | OP_RN_SP }, /* str immediate post/pre index */ + { "str", "1|SF(1)|11100100|IMM(12)|RN(5)|RT(5)", + TYPE_02, OP_RN_SP }, /* str immediate unsigned */ + { "str", "1|SF(1)|111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", + TYPE_02, OP_RN_SP }, /* str register */ + { "strb", "00111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", + TYPE_02, OP_SIGN_EXT | OP_SF32 | OP_RN_SP }, + /* strb immediate post/pre index */ + { "strb", "0011100100|IMM(12)|RN(5)|RT(5)", + TYPE_02, OP_SF32 | OP_RN_SP }, /* strb immediate unsigned */ + { "strb", "00111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", + TYPE_02, OP_SF32 | OP_RN_SP }, /* strb register */ + { "strh", "01111000000|IMM(9)|OPTION(2)|RN(5)|RT(5)", + TYPE_02, OP_SF32 | OP_SIGN_EXT | OP_RN_SP }, + /* strh immediate post/pre index */ + { "strh", "0111100100|IMM(12)|RN(5)|RT(5)", + TYPE_02, OP_SF32 | OP_RN_SP }, + /* strh immediate unsigned */ + { "strh", "01111000001|RM(5)|OPTION(3)|SCALE(1)|10|RN(5)|RT(5)", + TYPE_02, OP_SF32 | OP_RN_SP }, + /* strh register */ { NULL, NULL } }; @@ -354,13 +365,27 @@ arm64_disasm_read_token_sign_ext(struct arm64_insn *insn, u_int opcode, } static const char * -arm64_reg(int b64, int num) +arm64_w_reg(int num, int wsp) { + if (num == 31) + return (wsp != 0 ? "wsp" : "wzr"); + return (w_reg[num]); +} - if (b64 != 0) - return (x_reg[num]); +static const char * +arm64_x_reg(int num, int sp) +{ + if (num == 31) + return (sp != 0 ? "sp" : "xzr"); + return (x_reg[num]); +} - return (w_reg[num]); +static const char * +arm64_reg(int b64, int num, int sp) +{ + if (b64 != 0) + return (arm64_x_reg(num, sp)); + return (arm64_w_reg(num, sp)); } vm_offset_t @@ -377,6 +402,8 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) int inside; /* Print exclamation mark if pre-incremented */ int pre; + /* Indicate if x31 register should be printed as sp or xzr */ + int rm_sp, rt_sp, rd_sp, rn_sp; /* Initialize defaults, all are 0 except SF indicating 64bit access */ shift = rd = rm = rn = imm = idx = option = amount = scale = 0; @@ -416,6 +443,11 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) if (i_ptr->special_ops & OP_MULT_4) imm <<= 2; + rm_sp = i_ptr->special_ops & OP_RM_SP; + rt_sp = i_ptr->special_ops & OP_RT_SP; + rd_sp = i_ptr->special_ops & OP_RD_SP; + rn_sp = i_ptr->special_ops & OP_RN_SP; + /* Print opcode by type */ switch (i_ptr->type) { case TYPE_01: @@ -438,12 +470,12 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) arm64_disasm_read_token(i_ptr, insn, "SHIFT", &shift); rm_absent = arm64_disasm_read_token(i_ptr, insn, "RM", &rm); - di->di_printf("%s\t%s, %s", i_ptr->name, arm64_reg(sf, rd), - arm64_reg(sf, rn)); + di->di_printf("%s\t%s, %s", i_ptr->name, + arm64_reg(sf, rd, rd_sp), arm64_reg(sf, rn, rn_sp)); /* If RM is present use it, otherwise use immediate notation */ if (rm_absent == 0) { - di->di_printf(", %s", arm64_reg(sf, rm)); + di->di_printf(", %s", arm64_reg(sf, rm, rm_sp)); if (imm != 0) di->di_printf(", %s #%d", shift_2[shift], imm); } else { @@ -502,14 +534,14 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) } di->di_printf("%s\t%s, ", i_ptr->name, - arm64_reg(sf, rt)); + arm64_reg(sf, rt, rt_sp)); if (inside != 0) { - di->di_printf("[%s", arm64_reg(1, rn)); + di->di_printf("[%s", arm64_reg(1, rn, rn_sp)); if (imm != 0) di->di_printf(", #%d", imm); di->di_printf("]"); } else { - di->di_printf("[%s]", arm64_reg(1, rn)); + di->di_printf("[%s]", arm64_reg(1, rn, rn_sp)); if (imm != 0) di->di_printf(", #%d", imm); } @@ -518,8 +550,8 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) } else { /* Last bit of option field determines 32/64 bit offset */ di->di_printf("%s\t%s, [%s, %s", i_ptr->name, - arm64_reg(sf, rt), arm64_reg(1, rn), - arm64_reg(option & 1, rm)); + arm64_reg(sf, rt, rt_sp), arm64_reg(1, rn, rn_sp), + arm64_reg(option & 1, rm, rm_sp)); if (scale == 0) amount = 0; @@ -564,7 +596,7 @@ disasm(const struct disasm_interface *di, vm_offset_t loc, int altfmt) goto undefined; } - di->di_printf("%s\t%s, ", i_ptr->name, arm64_reg(sf, rt)); + di->di_printf("%s\t%s, ", i_ptr->name, arm64_reg(sf, rt, rt_sp)); if (i_ptr->special_ops & OP_LITERAL) di->di_printf("0x%lx", loc + imm); else From nobody Mon May 8 16:13:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFRDf4mGsz4B4sv; Mon, 8 May 2023 16:13: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 4QFRDf40k1z3Qbm; Mon, 8 May 2023 16:13:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683562434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oBnfjOlyIo/4w8RnJKeF2CjJYVcbAzG9H0O23qkCefQ=; b=iiCsoaY+j1ZroLHuOTsJ80T4fV5dlK6Q3Lm2UxCqlpbNE3iRPVaMgtHByUFW22v2GOk5aX 8bM+of5EQJiiSsle2sTxhoXt7vCLTNnEXxEkQ2Ip568sSc4MEWIudzV2EB+4Urx+sIG5Cy mTiqCuth1+eCcOBLYeSwjxMPhCS/1R9F3GVHstH1lqDcBO0NiPKOvFyArYSc2xHcuLI+Yo J6/12QTtz0ixi8ENCn3k9b80Pre3hSfau6tno3j1145RgPI/wiWAihEUv4zRjIw+zvgVRJ RIoh7QGTSgU6WaKGr67mFIaeXTYRMsE97m3FWBpEcQ2V/pxHr2i5+zXEMgXrwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683562434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oBnfjOlyIo/4w8RnJKeF2CjJYVcbAzG9H0O23qkCefQ=; b=ks0tzxF0wfgevmezZDpgkj24i4W6nrdVwjZr2nXR5cDkNn1QVQpOFLPWxhAnv8Bxetb4sV lgt2PlVXWSG1wvRbulfqDX8mmRrlqrL38/ywrc1775cyQb1xc0tuu65/i/L8xwFFMwi/4N q0it4EaGeWAuIRkULYKG611cyqHoxtJ7wXwOYcccVZfjVetphSR6gv8jmFIkdLViEXaWxD 2llcUdnId6+A7fX+NsLreXHS2HRCD/bYEyltQ+ICgZletQGKLSnlmBPkxmuToOsKhDmRSV pFXDtZVCCp95FiScpWHB6yWG3Hi+v+lbR8k9omWwisRn88+aA8AxCgsrNSsorw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683562434; a=rsa-sha256; cv=none; b=FaOLiEZk3lmQFWuJBZJ8CIYyaUzogzg00dq8567l+Efx4BrPC9/YP0D21FGTuIsQNtfCIX 5wez4azjYFPT4xZxPgKdSQBG/NUeMfA6zxRFPJYWaNP7a488EZsbX33XU9a8lxo5jRJ2E7 ACtR01JYGDWsJ6o6hI54S2ln3MNQ7b0eZ+1ODB3tx5gyl+SwiWd5VL+aVQZsK0leRYOkGl UaO3atRTeIiQUzGdel48gY+UlLGveEoVWYp2azher8FyOKRbdE8ulCyvEEeBWvi6Tlb1fT zzuPddHzMeXfMzzBfACh5o6nARg44jnfcSKNRBTp6j02CKaHZYXDZ1tCXESqPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFRDf33X3z168X; Mon, 8 May 2023 16:13: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 348GDs3N026070; Mon, 8 May 2023 16:13:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348GDsYw026069; Mon, 8 May 2023 16:13:54 GMT (envelope-from git) Date: Mon, 8 May 2023 16:13:54 GMT Message-Id: <202305081613.348GDsYw026069@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f7ee28e75582 - main - if_ovpn: notify userspace when we've used half of the sequence numbers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7ee28e755820375d5f441e19c1f1376a200e834 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f7ee28e755820375d5f441e19c1f1376a200e834 commit f7ee28e755820375d5f441e19c1f1376a200e834 Author: Kristof Provost AuthorDate: 2023-05-08 14:41:48 +0000 Commit: Kristof Provost CommitDate: 2023-05-08 14:43:25 +0000 if_ovpn: notify userspace when we've used half of the sequence numbers OpenVPN uses the sequence number (as well as a userspace supplied nonce) to build the IV. This means we should avoid re-using sequence numbers. However, userspace doesn't know how many packets we've sent (and thus what sequence number we're up to). Notify userspace when we've used half of the available sequence numbers to tell it that it's time for a key renegotiaton. Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D39570 --- sys/net/if_ovpn.c | 33 ++++++++++++++++++++++++++++++--- sys/net/if_ovpn.h | 1 + 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index bf07d23f0235..22723bfc34bb 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -93,6 +93,8 @@ struct ovpn_kkey_dir { * strictly higher than this. */ uint32_t rx_seq; + uint32_t tx_seq; + /* Seen packets, relative to rx_seq. bit(0) will always be 0. */ uint64_t rx_window; }; @@ -147,7 +149,6 @@ struct ovpn_kpeer { struct in6_addr vpn6; struct ovpn_kkey keys[2]; - uint32_t tx_seq; enum ovpn_del_reason del_reason; struct ovpn_keepalive keepalive; @@ -215,6 +216,7 @@ static RB_GENERATE(ovpn_kpeers, ovpn_kpeer, tree, ovpn_peer_compare); #define OVPN_OP_DATA_V2 0x09 #define OVPN_OP_SHIFT 3 +#define OVPN_SEQ_ROTATE 0x80000000 VNET_DEFINE_STATIC(struct if_clone *, ovpn_cloner); #define V_ovpn_cloner VNET(ovpn_cloner) @@ -428,6 +430,28 @@ ovpn_notify_del_peer(struct ovpn_softc *sc, struct ovpn_kpeer *peer) } } +static void +ovpn_notify_key_rotation(struct ovpn_softc *sc, struct ovpn_kpeer *peer) +{ + struct ovpn_notification *n; + + n = malloc(sizeof(*n), M_OVPN, M_NOWAIT | M_ZERO); + if (n == NULL) + return; + + n->peerid = peer->peerid; + n->type = OVPN_NOTIF_ROTATE_KEY; + + if (buf_ring_enqueue(sc->notifring, n) != 0) { + free(n, M_OVPN); + } else if (sc->so != NULL) { + /* Wake up userspace */ + sc->so->so_error = EAGAIN; + sorwakeup(sc->so); + sowwakeup(sc->so); + } +} + static void ovpn_peer_release_ref(struct ovpn_kpeer *peer, bool locked) { @@ -523,7 +547,6 @@ ovpn_new_peer(struct ifnet *ifp, const nvlist_t *nvl) peer = malloc(sizeof(*peer), M_OVPN, M_WAITOK | M_ZERO); peer->peerid = peerid; peer->sc = sc; - peer->tx_seq = 1; peer->refcount = 1; peer->last_active = uma_zalloc_pcpu(pcpu_zone_4, M_WAITOK | M_ZERO); COUNTER_ARRAY_ALLOC(peer->counters, OVPN_PEER_COUNTER_SIZE, M_WAITOK); @@ -738,6 +761,7 @@ ovpn_create_kkey_dir(struct ovpn_kkey_dir **kdirp, kdir->cipher = cipher; kdir->keylen = keylen; + kdir->tx_seq = 1; memcpy(kdir->key, key, keylen); kdir->noncelen = ivlen; memcpy(kdir->nonce, iv, ivlen); @@ -1849,7 +1873,10 @@ ovpn_transmit_to_peer(struct ifnet *ifp, struct mbuf *m, ohdr->opcode |= key->peerid; ohdr->opcode = htonl(ohdr->opcode); - seq = atomic_fetchadd_32(&peer->tx_seq, 1); + seq = atomic_fetchadd_32(&peer->keys[OVPN_KEY_SLOT_PRIMARY].encrypt->tx_seq, 1); + if (seq == OVPN_SEQ_ROTATE) + ovpn_notify_key_rotation(sc, peer); + seq = htonl(seq); ohdr->seq = seq; diff --git a/sys/net/if_ovpn.h b/sys/net/if_ovpn.h index 1c0299940c3e..45fd0696a4ed 100644 --- a/sys/net/if_ovpn.h +++ b/sys/net/if_ovpn.h @@ -36,6 +36,7 @@ enum ovpn_notif_type { OVPN_NOTIF_DEL_PEER, + OVPN_NOTIF_ROTATE_KEY, }; enum ovpn_del_reason { From nobody Mon May 8 16:13:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFRDg6CZlz4B4nV; Mon, 8 May 2023 16:13: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 4QFRDg5N2Jz3QyG; Mon, 8 May 2023 16: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=1683562435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jcDvwqAVZgAEg43Ufs9TV3BLPctQiAp78s8Vw5ivqPI=; b=ommAqPajxkyl5fEQSyocyNG+2vTYEcJUT0hwIIR4+4zVDduhNKu7QapW1qOC0F9CqyV1iv jp4DmZQUGq8V52+2MR32ITFEP/U1jL4lv3ZladJRueC41ItgginLxojggTQi9c8FHxU2RO 1tsyZKlzBGFCbTIa8/oP8aXLDNZMqDZ3vJwLfZC0fTchYNNGvgpfk0BuK4+S0/fOuqfR+a ehDFv2CJWvqqaV/Ltnq0twv1E4MyT2KDXVEXxfY49/0CXK2aWhusC6P+QtupIeJZeUONnz VaiJtEdGZGQuixgz6/wG1QerCamf3U2BqavvnpTUChtXDGUlBqmbc0leZUuLqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683562435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jcDvwqAVZgAEg43Ufs9TV3BLPctQiAp78s8Vw5ivqPI=; b=jaJKgGBlrv3U15mIPbfaVNE8rnQqIHUyseSbbTGLlCxwMNSPMQ967vuBtQKB/uq8UaCntt H59SDOW4hjFqoeTnc6bDTKsiaib6k44mK3Zm3kQyqsZFzyBnQfj3EsXk2CJdp2RmG5rXC+ T8P9WL4Z4bTacYh6NzQR/BMkF370xxx+Pr+lH5DLr7QY4ELCPTaPm+ebzrSTxIfYLVKmoO pBNouaPMtIIoo4PkD/uteOBIOmUusQixUlepyngd6fkbjtMTsJ7+PnDiFSTBbiRzCbOf6Q 9s1mxKSc8ZOaTcQ5N+ikK6wiSkZzCGk9p+xJtGJerAgSNIvY0ZRGs/vstLPvmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683562435; a=rsa-sha256; cv=none; b=d032giZ+N4nuI5wTHQuF32q9um44rNlDqyUCn2lCkFj/fCSc0b71HtXTtH9FFDCJ/0ytj/ rd6RXmw2uKHaVw2J4luxdsrsDwkt3LRtNtbKh+5+OPv+Jn5aHTPjkz6yTOZgF8DH9lnB6l TIE33oJcgSN4d4dZP/DtuqZrzgVduBMdpFYjSkHREAV/CdnIJKWtpj6baYPLuOzeru24xK 9uT5q6yWKIRQiP2KyuM0EVHlzTLNE+BfScKDarWsUzsNLyNTZxFBUaH2y6LY+34gdRATK0 TRk3o2qfIj+SMVSmZO6nUjC2je3f8SV8JNMHD/lhSBDc0ECiqUT9KZauoL24mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFRDg3xvvz16LC; Mon, 8 May 2023 16: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 348GDtfY026095; Mon, 8 May 2023 16: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 348GDtgw026094; Mon, 8 May 2023 16:13:55 GMT (envelope-from git) Date: Mon, 8 May 2023 16:13:55 GMT Message-Id: <202305081613.348GDtgw026094@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: f76df4718d27 - main - if_ovpn tests: fix route_to test case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f76df4718d27f512a7f02cccc12b9b10cf6ad13a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f76df4718d27f512a7f02cccc12b9b10cf6ad13a commit f76df4718d27f512a7f02cccc12b9b10cf6ad13a Author: Kristof Provost AuthorDate: 2023-05-08 15:44:47 +0000 Commit: Kristof Provost CommitDate: 2023-05-08 15:44:47 +0000 if_ovpn tests: fix route_to test case * Move the .254 address to the tunnel device so we reply through the tunnel. * Remove the network route to 'break' routing, which we then 'fix' with pf's route-to, which is the functionality we wanted to test in the first place. Reported by: markj Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/net/if_ovpn/if_ovpn.sh | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tests/sys/net/if_ovpn/if_ovpn.sh b/tests/sys/net/if_ovpn/if_ovpn.sh index 51d21b826e72..5500dd9f1f41 100644 --- a/tests/sys/net/if_ovpn/if_ovpn.sh +++ b/tests/sys/net/if_ovpn/if_ovpn.sh @@ -91,6 +91,8 @@ atf_test_case "4in4" "cleanup" # Give the tunnel time to come up sleep 10 + atf_check -s exit:0 -o ignore jexec b ping -c 1 198.51.100.1 + echo 'foo' | jexec b nc -u -w 2 192.0.2.1 1194 atf_check -s exit:0 -o ignore jexec b ping -c 3 198.51.100.1 } @@ -702,7 +704,6 @@ route_to_body() vnet_mkjail a ${l}a jexec a ifconfig ${l}a 192.0.2.1/24 up - jexec a ifconfig ${l}a inet alias 198.51.100.254/24 vnet_mkjail b ${l}b ${n}a jexec b ifconfig ${l}b 192.0.2.2/24 up jexec b ifconfig ${n}a up @@ -751,26 +752,23 @@ route_to_body() # Give the tunnel time to come up sleep 10 + jexec a ifconfig ovpn0 inet alias 198.51.100.254/24 # Check the tunnel - atf_check -s exit:0 -o ignore jexec b ping -c 1 198.51.100.1 - atf_check -s exit:0 -o ignore jexec b ping -c 1 198.51.100.254 + atf_check -s exit:0 -o ignore jexec b ping -c 1 -S 198.51.100.2 198.51.100.1 + atf_check -s exit:0 -o ignore jexec b ping -c 1 -S 198.51.100.2 198.51.100.254 + + # Break our route to .254 so that we need a route-to to make things work. + jexec b ifconfig ${n}a 203.0.113.1/24 up + jexec b route add 198.51.100.254 -interface ${n}a - # Break our routes so that we need a route-to to make things work. - jexec b ifconfig ${n}a 198.51.100.3/24 - atf_check -s exit:2 -o ignore jexec b ping -c 1 -t 1 -S 198.51.100.2 198.51.100.254 + # Make sure it's broken. + atf_check -s exit:2 -o ignore jexec b ping -c 1 -S 198.51.100.2 198.51.100.254 jexec b pfctl -e pft_set_rules b \ "pass out route-to (tun0 198.51.100.1) proto icmp from 198.51.100.2 " atf_check -s exit:0 -o ignore jexec b ping -c 3 -S 198.51.100.2 198.51.100.254 - - # And this keeps working even if we don't have a route to 198.51.100.0/24 via if_ovpn - jexec b route del -net 198.51.100.0/24 - jexec b route add -net 198.51.100.0/24 -interface ${n}a - pft_set_rules b \ - "pass out route-to (tun0 198.51.100.3) proto icmp from 198.51.100.2 " - atf_check -s exit:0 -o ignore jexec b ping -c 3 -S 198.51.100.2 198.51.100.254 } route_to_cleanup() From nobody Mon May 8 18:26:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFVB03m8fz4BCkr; Mon, 8 May 2023 18:26: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 4QFVB03D7Jz3v24; Mon, 8 May 2023 18:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683570408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n92w5vnJGpSnck1YLcJDtXdHh7DyWoKAHJCIgL9SgOQ=; b=rfMiPkSelHYVkZmrEXiYH6tFk7LoB90WMczQscvHN8lGi2pT1X4NkKbCl4nmhfWx+C2DtK t9yih8+rcEKFdfli/IH5QJXbyFSpze/57HfqEIndMsbMcsQCBNfKzMRGHAQtHRNgnKuFn9 wrhr/F+utPySSKVcJ2aNtcXAjge0EMx5tsok+pkS2bMiIXpYS8tta5oV2/tMdp+1xIK3je mcoTV7iwqWY7myJrEr6T5XN46959FB3JPuzDN912I4R9C9G5aN+eqDUaoF2pP14sAs34i5 jQCt/2alXaAeIVs9j8f6UJ0a05KQt9skGVXbArhwTfYUdfkKrWv2JcG/Vey07g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683570408; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n92w5vnJGpSnck1YLcJDtXdHh7DyWoKAHJCIgL9SgOQ=; b=uWorvd6NKWPbQsUwN1atEHyIeR5CJQ5YKVowHRRlVKd2q1R4BeRukxnUqcWNqbZk/0kalq nCknaFdUYaX2+zLDvnmI6caJuFxVzyxATy2hKpo+TRuqW0lKpwvwH98kjEsfyrEdpcXfpl 8AD6ZOa+2fLrewUQeEZdyERUUMK29oMcKTq2USbW7JBa5r2kphBur//FwGQzhQPIWuHTDz v+PybL1qpVXInrN8L/N6UytE29tTrjmDJSUkLQNoUEMbp07yA2L+XX+KNXbaKI4lRK7DI0 PkyfKW25LZWiKM86A1kULWvDFluXDIU+gggqAoOX/B6fvYgCGh1A92H0LkbRUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683570408; a=rsa-sha256; cv=none; b=ZAz3bCLmzG7JztuQHjo4/iDdI9q9Oyws/ZjLJuT/2oB1haLuxvZtIal1AoephnsgiAXQRz qYfum42n1bXLBG7IgLwJygUe0earJhtIVxUAW3be9/YYB+xgch2aBhDhVoYqQzjSNGSvkB VuvDEyvz6CQUYErRfxNiv1lOC6Nk8En8YtgZg0Fo4cSDzXbYbaN2rRSsCK4QBogT6AZs45 ZO+Q3U+ISX2jLVAzaK8xdT07lpy8Y7S9bh2bp8w2fu+KhN8rV81F8VjUvMPfZrXgzUgPUd 0jzVHebWiCoUHN4y/4n3JYwx/BXlubCCgXzXfvEaabsoNZK9mVgnEVoTNeo+Og== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFVB02GNhz19ym; Mon, 8 May 2023 18:26: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 348IQmmq040109; Mon, 8 May 2023 18:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348IQm9N040108; Mon, 8 May 2023 18:26:48 GMT (envelope-from git) Date: Mon, 8 May 2023 18:26:48 GMT Message-Id: <202305081826.348IQm9N040108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76887e84be975698b14699d7d0dfb157d73e9990 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=76887e84be975698b14699d7d0dfb157d73e9990 commit 76887e84be975698b14699d7d0dfb157d73e9990 Author: Ed Maste AuthorDate: 2023-05-02 20:57:12 +0000 Commit: Ed Maste CommitDate: 2023-05-08 18:25:15 +0000 cpuset: increase userland maximum size to 1024 Hardware with more than 256 CPU cores is now available and will become increasingly common. Bump CPU_MAXSIZE (used for userland cpuset_t sizing) to 1024 to define the ABI for FreeBSD 14. PR: 269572, 271213 [exp-run] Reviewed by: mjg, jhb Relnotes: yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39941 --- sys/sys/_cpuset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h index b75ee595da3c..676f9855f384 100644 --- a/sys/sys/_cpuset.h +++ b/sys/sys/_cpuset.h @@ -40,7 +40,7 @@ #define CPU_SETSIZE MAXCPU #endif -#define CPU_MAXSIZE 256 +#define CPU_MAXSIZE 1024 #ifndef CPU_SETSIZE #define CPU_SETSIZE CPU_MAXSIZE From nobody Mon May 8 19:45:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFWxJ2Twdz4BHxl; Mon, 8 May 2023 19:45: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 4QFWxJ21D1z461B; Mon, 8 May 2023 19:45:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683575156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s78UOqfUO3x0X/kOFnfMGF775L1xNtgyXqLw7xRsg9M=; b=fNHhXFGXmy0X/U5YfcaU6V4kgoNjdCRWm/H2nRFceYV/+LerQtjiX45+aTVrNqmEc/Ueno +E6e82HuUISKMIMs3r0dR4ic0cbRU39b2QVAHbc15+RWZPLaM8KsJ/Wbun01dqzcsiiGW7 9ddcmPa+0t3lS/sW/B+DFWVKO+gGjrT18xogTvBkOkkw6NS71oThtnlpgwnpYjrhXm8Zlu YghC87cU+k6Vs0feQqCp3fSY60zuGAN8EPSKUBw571uYIlcvmtz75CYJmplPKr8LKoM4iO eiV3mkjzNuBs+/D4ASmieurDrlciCuJxL3iUItoVgnP5lHujMSS9vr2S6GnTjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683575156; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s78UOqfUO3x0X/kOFnfMGF775L1xNtgyXqLw7xRsg9M=; b=M+d/e6xN9VfWY1baBOei2YltI2P4XsB7e3Uzmy5MRjBL9GdEY7+b5MbtnrjV5sxTqL/3Bj 1OTyhrsDrP8BaeqUR7nqMJ4mqh7gUHiTO2SEg5ooT/0PHRPth1xzDSwXDG7LzpShkqQYYi l3qcFFxAlKhCgq5aOiuf5D4nh/3sdvcvgwIB8R0+rXI+lO1do9/OgJdxou+AoV1nmUdvke D6cEO/7djPCcyibADnS9peSie0jBINKSTAOKeHZxnq93b6WmjqDlh8B5yq2TpEEMqwGWRH gGjftePbp8oSAZs+ARwVB4LCclmnVdRbYz11MLNUB3rKRVe1kpH3jy/XpsC7Ng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683575156; a=rsa-sha256; cv=none; b=i6Bixs0RieyOODxp60FaYZmA7tBfweBcDcouGHH9Yt0nmnDZtOdui3q1ixpo+dU1tFYdTd JDQJX2RRBMwzM5rUHnd1JbM2pbKIEfjcqW/usMIm2mjgvGqeEVcBZNeo1msTWo/z5UoWfm EosxuHdCAHfaM/jm8xtBnSxFFMBaOsA5dfbii94842R2864Dqc21WMgRmgNaPoyWA6LUaS BH7mFhewrWHsFptbnc6OpzZaR+lgQbgbLBJdnB5zxP9OgIWGITyKh6qjImdvP6vWcOPFaq 4fDWPqMjS9OV6b9i4ZFqkDa9lxCRNJsGOLwngjMOmu8Af//fep6sOrrLrjVvlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFWxJ14Nnz1D4c; Mon, 8 May 2023 19:45: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 348JjuGf072012; Mon, 8 May 2023 19:45:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348Jjuha072011; Mon, 8 May 2023 19:45:56 GMT (envelope-from git) Date: Mon, 8 May 2023 19:45:56 GMT Message-Id: <202305081945.348Jjuha072011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9c6f3dfda6dd - main - bhyve: specify OpenSSL 1.1 API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c6f3dfda6dd77772c669e3a235b451c9eb467eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9c6f3dfda6dd77772c669e3a235b451c9eb467eb commit 9c6f3dfda6dd77772c669e3a235b451c9eb467eb Author: Ed Maste AuthorDate: 2023-05-08 12:09:26 +0000 Commit: Ed Maste CommitDate: 2023-05-08 18:32:27 +0000 bhyve: specify OpenSSL 1.1 API OPENSSL_API_COMPAT can be used to specify the OpenSSL API version in use for the purpose of hiding deprecated interfaces and enabling the appropriate deprecation notices. This change is a NFC while we're still using OpenSSL 1.1.1 but will avoid deprecation warnings upon the switch to OpenSSL 3.0. A future change can then switch bhyve to use OpenSSL 3.0 APIs. Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39998 --- usr.sbin/bhyve/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 9741d5f66ac1..65a32d2fb0b9 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -111,6 +111,7 @@ LIBADD+= netgraph CFLAGS+=-DNO_OPENSSL .else LIBADD+= crypto +CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L .endif CFLAGS+= -I${BHYVE_SYSDIR}/sys/dev/e1000 From nobody Mon May 8 22:50:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFc1t4gD3z49DnJ; Mon, 8 May 2023 22:50: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 4QFc1t3xWzz4Rtg; Mon, 8 May 2023 22:50:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683586210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06d0QrzdTdelx1cHwc1ZizYRjVIIpk4fVVrcHp4tAuA=; b=gNXFNIDbek8GK6XU/r0xlFPKA+gBZZHFPW3Km/rCw95RlrwQoDfWm7WabNykFkAXqo6Dnn Rb/qLifw2DojukejiTLh8JlDpt47n6eMkF2RmltJJRv+SMabKyN2WSGGZiy1ZBg1z093kK 965plALH6mrzaOlQDlBLfUfVZs7+sO9jXtWr+B+9rj4OS8DTe9bbwt2eXTZu5qdiJ6siim qc4gx9jOukotFl6jvN9xKly6gawMOGbX0AKcG3bDl/s3M/gVSJKj02F6oA++IjmJPWOtoM rQOcXidrFiUi6//8oQU8v2Qj3gxstbnjjz34DSv4WBLSy8B9APErvSTbu/Q5sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683586210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=06d0QrzdTdelx1cHwc1ZizYRjVIIpk4fVVrcHp4tAuA=; b=COlURYbQBDU475eotzSDGc4M7A+mdflg57Oh8yqdzGU3n7wvgmN2sfjoMQqoLNhdB7eMJ7 OI90+zK9TJ2CpCrj78rz8OD4Bv1S0RVnQEItECmLEkQVpY+Q0C7imxs49bH8FW3VLzFI7N JIo1211fcStGovkR91Gs+Hb8g3kspX23gVGaUEysH9VVBhe2EMSznKYzqI8QLJKC+XQKFs EJzzxfKVpn+FX3cPbHIXFsCSMkTBU9e3x3CcfgBlDHKKXcNg/pyrBpxwtPMXns4tIN3KrM mkpdmi0GiRZFZaMXr690Vf/2JoDTz5ouRRbNlZ+j/kFrWpartKcjJ5LKBUSZ1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683586210; a=rsa-sha256; cv=none; b=ZMw4hpj/50vxf52PqE8Nyot19cWZkGW2sQb0XXbDfDypHvGdZECLHA81B874b65djttjoc y9E+AaPIGFcxwGihlEmtjcUaGGJjJqocAbxINnNBxnVY4ahhFDR24y+flFz25bojczZm/K aiqiwbvdbDTm2uwmZStBztY9hcrjv+hvdf0alYHJJ/kk6AJFyeWq0EQM/aCTqN+17y7Y9P JUXB/edz9VgtQKooPdtDYY8QpdvLfq7GfTCECFB3wC9sL2jRKhq2eQNjrSXmalYBMz/Was 5cvYIRbOBcdrDofODTXfFefpz0OuDhj6nYrND1dc4/7A640CInexpODV3F7NYg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFc1t30h5z1Hkn; Mon, 8 May 2023 22:50: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 348MoAIr073623; Mon, 8 May 2023 22:50:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 348MoA1i073617; Mon, 8 May 2023 22:50:10 GMT (envelope-from git) Date: Mon, 8 May 2023 22:50:10 GMT Message-Id: <202305082250.348MoA1i073617@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 7adea6dbed35 - main - calendar: cleanup obsolete directories List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7adea6dbed35061e6175b7da69a47073916b3c25 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=7adea6dbed35061e6175b7da69a47073916b3c25 commit 7adea6dbed35061e6175b7da69a47073916b3c25 Author: Yuri Pankov AuthorDate: 2023-05-08 22:43:12 +0000 Commit: Yuri Pankov CommitDate: 2023-05-08 22:43:12 +0000 calendar: cleanup obsolete directories Follow 5282ada06bb and don't reinstall obsolete directories. --- etc/mtree/BSD.usr.dist | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 9a6ede64fa73..a0aabf0d35b1 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -197,26 +197,6 @@ .. .. calendar - de_AT.ISO_8859-15 - .. - de_DE.ISO8859-1 - .. - fr_FR.ISO8859-1 - .. - hr_HR.ISO8859-2 - .. - hu_HU.ISO8859-2 - .. - pt_BR.ISO8859-1 - .. - pt_BR.UTF-8 - .. - ru_RU.KOI8-R - .. - ru_RU.UTF-8 - .. - uk_UA.KOI8-U - .. .. certs trusted tags=package=caroot From nobody Tue May 9 03:47:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFkdM5DFDz49Z1y; Tue, 9 May 2023 03:47: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 4QFkdM4F9Nz3J0d; Tue, 9 May 2023 03:47:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683604071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xn2dZVmrwfZtRGE1coDGTusoLAcDp+IedSZlS/maMz8=; b=MLOfpyMuhC+aYTK84rm/YyU1qROaqlFe9fWiwe2Y90OWVYlOYeXwO12HFSyLAi5djfhhm8 XQ3BP9PKoxoedN89QSuB9JJvivqX+QXbDZmgD+qTylXAe3WRUzhEthzItyPLglBT51z/ql LKQZhXbwZImXVdz7iAjLge+DjhDO14fslThtU/vWnhAywGiVSqHCuqDw42aJrDbYxSGlNf hVXudsE/VMtrxmPUX4cHEvlyCW98TD+9e5Dt5EVT2FZ0vCqwjKVpI/Bk5MgbaTZxTBuJkF hSlezLEGxNQOum8rxZKGtLdZ1uXRNbgQByEbIV2c2JDMJrSQA/picfwlWz8ETg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683604071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xn2dZVmrwfZtRGE1coDGTusoLAcDp+IedSZlS/maMz8=; b=FK94PpYaAwjgnYHJjH6SKqRVZwusdtqdn/ZVGk2ubJ9cfQWR+TRcqbxxH4qr5cza5m13BN e5XvOh7IfawowtXenSBe/E9I/FhN1cY9H77nULQbssQFAi2klXXTfGX55UZ/S/bQeLcH0Z Hzr2CI78TmHI34qJTa05HO51MRqhMbZ5WDmTrvJU+MB9ZTVVnmoFRtr8kKsExqqSvMR6IT r4zDCU4f7tb6zUn1tKBqxB8psEI8AT/8Bv7aLmGXZcaRRHyqO6XWn+zHbmgsRdFjIKYN2D plLFIEuQKjusOrwLXz5broYNMU+DhkNpYhTOnltw7b3dQrpAYeWr2BNzFRV28Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683604071; a=rsa-sha256; cv=none; b=AtnHRT0+BUFSjtA3kEyOlnDK9GO45J1cR6kDFeHUamHyEvGMLxTkzLStIQZ1n8fHJ2VZAm KAy0PpJnQutZmAnA2OEif+h09O/Ai7CYf03zIKFA94neG9p5oEsqRVxvicSYbyFPgSIOEr NoYK42O88GamsbcWwih4lC+cWubBkrq4UsOPGXQXJxRQscFZtbtnOSCPJJXIubfAmU7Zwz kaoyMpPuyUkEKAS0wvwIPr5zhArqKubJKEaPYHK+i1NzJE4TtrnC8f/dsARiVB6bJ5JJ5i aAVtPaemt7duKljqjV6K7QSJEI7jkTuKAARx3/eFTSjQpjlq/J8FtA70OTB+tw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFkdM3G1lz1RWc; Tue, 9 May 2023 03:47: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 3493lpWg062884; Tue, 9 May 2023 03:47:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3493lpxM062883; Tue, 9 May 2023 03:47:51 GMT (envelope-from git) Date: Tue, 9 May 2023 03:47:51 GMT Message-Id: <202305090347.3493lpxM062883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 20c61a7c518b - main - acl(3): improve discoverability of acl_get_perm_np(3) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20c61a7c518b9c2f451118913e10a1525ad0b578 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=20c61a7c518b9c2f451118913e10a1525ad0b578 commit 20c61a7c518b9c2f451118913e10a1525ad0b578 Author: Kyle Evans AuthorDate: 2023-05-09 03:45:12 +0000 Commit: Kyle Evans CommitDate: 2023-05-09 03:45:12 +0000 acl(3): improve discoverability of acl_get_perm_np(3) - Mention it in acl(3) as an available function, xref - Mention it in acl_get_permset(3), as acl_get_perm_np(3) is a natural follow-up to acl_get_permset(3) Sponsored by: Klara, Inc. --- lib/libc/posix1e/acl.3 | 7 ++++++- lib/libc/posix1e/acl_get_permset.3 | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3 index 2c7ebd63ad4e..33b4ad0f7620 100644 --- a/lib/libc/posix1e/acl.3 +++ b/lib/libc/posix1e/acl.3 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 30, 2014 +.Dd May 8, 2023 .Dt ACL 3 .Os .Sh NAME @@ -158,6 +158,10 @@ and may be used to retrieve an ACL type from an ACL entry. This function is described in .Xr acl_get_flagset_np 3 , and may be used to retrieve a flagset from an ACL entry. +.It Fn acl_get_perm_np +This function is described in +.Xr acl_get_perm_np 3 , +and may be used to check if a permission is set in a permset. .It Fn acl_get_permset This function is described in .Xr acl_get_permset 3 , @@ -257,6 +261,7 @@ library. .Xr acl_get_brand_np 3 , .Xr acl_get_entry_type_np 3 , .Xr acl_get_flagset_np 3 , +.Xr acl_get_perm_np 3 , .Xr acl_get_permset 3 , .Xr acl_get_qualifier 3 , .Xr acl_get_tag_type 3 , diff --git a/lib/libc/posix1e/acl_get_permset.3 b/lib/libc/posix1e/acl_get_permset.3 index 064f71ce45bc..5971583b28fc 100644 --- a/lib/libc/posix1e/acl_get_permset.3 +++ b/lib/libc/posix1e/acl_get_permset.3 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 10, 2001 +.Dd May 8, 2023 .Dt ACL_GET_PERMSET 3 .Os .Sh NAME @@ -65,6 +65,7 @@ is not a valid descriptor for an ACL entry. .Xr acl_add_perm 3 , .Xr acl_clear_perms 3 , .Xr acl_delete_perm 3 , +.Xr acl_get_perm_np 3 , .Xr acl_set_permset 3 , .Xr posix1e 3 .Sh STANDARDS From nobody Tue May 9 06:34:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFpKj5V6sz49n1X; Tue, 9 May 2023 06:34:33 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFpKj4cfZz3nl6; Tue, 9 May 2023 06:34:33 +0000 (UTC) (envelope-from lwhsu@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683614073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PCS9gtBwEOeuJh8HbT8kK1VB9ef2nWzDeekQk5E6Cn0=; b=hrSd/EzLW9oX8UJRa0YU6d3u+1Hmv2OiWju+camzsB91cl4BzmoyVjWupuW42JZ5iXXa7/ gmVeVvmMnmidAOer3cMrn/t2DQ0IRul/OUAhwA0W3n+/wTqLHCchoFkBz71GVDMwRMLdn/ guAiXrv3+/bapNMLkZHfSrCDPHCQ1f6HX/LWzu2AAVZUekQ6HrJXf66RuQxFc6Q4aD9dzA vC6zy+fPRVKH5Yn0AQD++P1gs+5R52mpMLSYYxlXwqHVPh/sBpbNMK0BUPGXcUnI8OZPy0 7GQ/2fa6AvmTF/Ett8RtwPwcgA3yhJeUGgtpkM8W2AUimzMpEMmOJwz4iMz7Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683614073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PCS9gtBwEOeuJh8HbT8kK1VB9ef2nWzDeekQk5E6Cn0=; b=v3VdGcIMRgOtpt4tcRi+o4WodWKWgoJ7+czzVAoD21EhWn8U/lCHRh8ui2gJbJ8f0KCUi7 mTULLxDDpjbWy11DDgdna8+qzCgCsTKdl5rGj3wZEmDKvKRJlEBamAmvOeTtXFGHa5zvlt 2q4CqSDakLrR1WzKLYNaGEdjRhissXLE5t/Vjboy9DZ1eV0zdNtZl0QUFpmW25fOMALoUj 0ho79Nl5V+hg2nloyDZMRMebCnVf0X3PwKXjgfT9gBJ46qmQjTg48C9tyv3YTEBpNMCphd k+vVLb5wuG15lIqvLyM5L4Rfwh414ZQKrc56XwqR2m94lZ9aiZHe6OKwGtxoFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683614073; a=rsa-sha256; cv=none; b=PhuUJGzHNnw2pxu//x42EcsOhY6hEbFQTR8whkZ8SRrp/mo7Bq6i5a86qTAJJh11TSvOVo cMP9c3VrvcbL28btqLaSnUhz1du80mqHmh5lRg/q123eX+CQH6o+1HIWpv2qo788i1c749 4HEbhoYr2UrmLRM4skQsd+CMUymVHXUp6OAOnjgwQEbwgsWWdqVd5MHtI/9yn8CpuG3yY/ MKw0YDjGszWva1+zRMpdaJKdK4l2iF8gELlWOweD/jjjivUy1R8YoDwoBtLVY3LPDRFPaL ML1OY9w7BJgQrvHZaQKnp/oL9HlEMX+YhKpzHPKsHUNMAd2IWVpvIjIJtAgDrQ== Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QFpKj3Xp2z1C0W; Tue, 9 May 2023 06:34:33 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-24e24b0193fso4077943a91.2; Mon, 08 May 2023 23:34:33 -0700 (PDT) X-Gm-Message-State: AC+VfDyalKr2BcjwChw6KFRJC9O0KRnr0CV14qQ6U4Ei1BfE2fU3ymIH JmdNc8uyVlNa6zHm0mE2L1G339pkuTSUnWwTUHg= X-Google-Smtp-Source: ACHHUZ6oIqPk+t+baWhn01UcYmMdTNXP15nOyeVAdKZ2WOZ1AgsWQ9ZgCCqRQZBG/3jLoOZjQQXvdlqb0sGxUzMEfBc= X-Received: by 2002:a17:90a:f3d5:b0:24d:fb8f:6c16 with SMTP id ha21-20020a17090af3d500b0024dfb8f6c16mr13215987pjb.16.1683614071891; Mon, 08 May 2023 23:34:31 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202305080805.34885P8c017963@gitrepo.freebsd.org> In-Reply-To: <202305080805.34885P8c017963@gitrepo.freebsd.org> From: Li-Wen Hsu Date: Tue, 9 May 2023 14:34:18 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 4849767cb16a - main - md5: Improve compatibility. To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Mon, May 8, 2023 at 4:05=E2=80=AFPM Dag-Erling Sm=C3=B8rgrav wrote: > > The branch main has been updated by des: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D4849767cb16a4dbd4d1b923db2= 5d34029c09e7b0 > > commit 4849767cb16a4dbd4d1b923db25d34029c09e7b0 > Author: Dag-Erling Sm=C3=B8rgrav > AuthorDate: 2023-05-08 06:56:09 +0000 > Commit: Dag-Erling Sm=C3=B8rgrav > CommitDate: 2023-05-08 06:56:22 +0000 > > md5: Improve compatibility. > > * Overhaul the GNU compatibility mode to more closely emulate what th= e GNU tools do. > > * Add a Perl compatibility mode which emulates the shasum tool that s= hips with Perl. This is currently not installed. > > * Overhaul the tests. > > Sponsored by: Klara, Inc. > Reviewed by: kevans > Differential Revision: https://reviews.freebsd.org/D39446 gcc12 reports: /workspace/src/sbin/md5/md5.c: In function 'MDInput': /workspace/src/sbin/md5/md5.c:737:17: error: comparison of unsigned expression in '< 0' is always false [-Werror=3Dtype-limits] 737 | if (len < 0) { | ^ (From https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc12_build/950/console= ) Not sure if this can be changed to `len <=3D 0`, or just remove this part. Can you check it? Thanks! Best, Li-Wen From nobody Tue May 9 06:41:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFpTn5Zdqz49mwg; Tue, 9 May 2023 06:41: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 4QFpTn54hKz3pk6; Tue, 9 May 2023 06:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683614493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QBm3gu1KuBE/Ib5Yph/F1EhNKEwVEGJfi2gcqHTx4H0=; b=odafM4qfBTbxyK9PWn9PSLt9K+TsXpCnO5LT255YZpMtZ8E8h2YrndJ9123VkJcUD32Nff UjUmK+fVbHolm4RnphxcOWgQZnqyoHdVg/Yl3Ck78/3bua2WfReGoe30urZCCSV+P4FYUV GoS8Ts6Cgp/F/dK9gOl7D+IicfYMnjlTzIeHel5EkDSVnPEZ7WwbNFhMkXwHSZA8+gor4C lf2wBQWdP/NvYzFyavcytGi6tXGBDlOP491DJHHZ3CwwlfNGVWEs8JTrHH7YilSCN6nsp6 AY+xHF50rGvLKKK0KNHzTJbwr2WSeiXcAlTdAI6Fxmdt5XUI9UJrqwvAeyU4pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683614493; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QBm3gu1KuBE/Ib5Yph/F1EhNKEwVEGJfi2gcqHTx4H0=; b=thUqQX9LhCccbdIVi6LsuIU0J3xlYXqIbpTpSfY6pDkW3WOHOwy1h3VzuGqRtYaBj3BHRA HU4EOUJaEJCp15THd/Rlbc5QddzPXAP+/ZUwPCnXf/u61ilfQ7OlYpBYpH0csRkkp+OQbo Bhkw63bByxBk8o63ikZAJpLuNN+yTm2YK17iMUbRpZkHiY7/kiEP+8HSLvKanEtNLx028P cds0wvcxZA0vcnlwJA+odnzo3LC+ZtVh/NZqrlG1bioc+f90BnlJ36bfLyYOfeMx5F7NTd XBW2TPbuIEPNgXRnjuz/lXXoy8LXdL+a4CabcOX2Lr1gRTM7bZb2EZIeNybbOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683614493; a=rsa-sha256; cv=none; b=Uyvn0FUvswyVLdpYHYs+JZeRlO4ICl2Opku1RENXR4Vz0iF0ynkgO8osvlkhS5M3s0reTu OomwfbG5ICu9zaQCIvBqUiTQmx1/In3cOufN7aN8DmR6mWDqevW9yHF/TcHU01LEkBjDbM QMtDykJ/qtY4K/4WM9go4yxamN5Fdoz4sWjq2wHIl20OvIIWLPPCYtChBAVfPylCrnhdHG Rf2B/yqnrFWovwBvUdOjBPpUP4IBGdKPLq+IT4n4RbNiTEVgkWNkJsuBt0rW9Vnh9iNkpr B710WqXOZzeNqZivzhxcPH24dRzzw4rNwZQPlLX5byvxYPablEqMMYT0k8NMZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFpTn49XtzHHT; Tue, 9 May 2023 06:41: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 3496fXO8056238; Tue, 9 May 2023 06:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3496fXBd056237; Tue, 9 May 2023 06:41:33 GMT (envelope-from git) Date: Tue, 9 May 2023 06:41:33 GMT Message-Id: <202305090641.3496fXBd056237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 20d8d9809a8c - main - Revert "uart(4): add Sunrise Point UART controllers" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20d8d9809a8c0a3ddd1d0156e77ec53a1ed95747 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=20d8d9809a8c0a3ddd1d0156e77ec53a1ed95747 commit 20d8d9809a8c0a3ddd1d0156e77ec53a1ed95747 Author: Kyle Evans AuthorDate: 2023-05-09 06:38:32 +0000 Commit: Kyle Evans CommitDate: 2023-05-09 06:38:32 +0000 Revert "uart(4): add Sunrise Point UART controllers" This reverts commit d1b6271118188dd25a18f2372ab1d3004335ea3c. I've received multiple reports of machines failing to boot with this hardware; back it out for now until we can fix it. PR: 271147 MFC after: Morning coffee --- sys/dev/uart/uart_bus_pci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c index 6344f89c2248..2ac91e09221d 100644 --- a/sys/dev/uart/uart_bus_pci.c +++ b/sys/dev/uart/uart_bus_pci.c @@ -182,8 +182,6 @@ static const struct pci_id pci_ns8250_ids[] = { { 0x8086, 0x8d3d, 0xffff, 0, "Intel Corporation C610/X99 series chipset KT Controller", 0x10 }, { 0x8086, 0x9c3d, 0xffff, 0, "Intel Lynx Point-LP HECI KT", 0x10 }, -{ 0x8086, 0x9d27, 0xffff, 0, "Intel Sunrise Point Controller 0", 0x10, 0, 2 }, -{ 0x8086, 0x9d66, 0xffff, 0, "Intel Sunrise Point Controller 2", 0x10, 0, 2 }, { 0x8086, 0xa13d, 0xffff, 0, "100 Series/C230 Series Chipset Family KT Redirection", 0x10 | PCI_NO_MSI }, From nobody Tue May 9 06:59:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFptW2cYMz49nyZ; Tue, 9 May 2023 06:59:31 +0000 (UTC) (envelope-from corvink@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 4QFptW26X3z3rfT; Tue, 9 May 2023 06:59:31 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683615571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8//1O07rSwfpQ/A7k66DEr+80OsgNNESBVk0skr9rko=; b=u/4APYYKL5psVTcNa27UFm4Dji28n0sSmGHkMQKC8EtQAxcdApHjkZnpZSi1v+fuMTh1RH 7QGyHZEGKpUMNxhea+drIdiIaQP3wGNfQ5tP/yNkdVWrbNvYGbM7FLvhOeogDDvrd1+TjY 9IJ2GLAifQW1AoxvzGE1G9M6B+ZYTwZQrjf6zIfUncytL+i4RyCTDHoC5cVimP205YIIl0 QGdq8LlGB8l+vFW0LBpDEkyAp2lOLLVSGrxh26E1rtjpU9NpGOY2arm954oorc81YUO9Cd M1TuaAAB5AOeeTNJIAUPTER99tsPhOaZTm45mYuNRKytzAn3/4h6lhhRkwjsLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683615571; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=8//1O07rSwfpQ/A7k66DEr+80OsgNNESBVk0skr9rko=; b=FSC4t8IjBrkwW77aZZytL2m5laKv3ZmK/ACUzQAH513RGi2IdxUgnb4NL2XWJfDnM3HU+F GEDEfge0qv/09OoSqv40gnlHow/l4pQu19heLoX444Bkh0duLy/obkXjloNtx/VMe4OLR9 +iGt1OnVdmUc3m2R9uUt2wIcx9BgDX/Dpq2ADUSJ/m/IMHLAg17++5hBrXYYgIL/3muwCR 0nak+IV8ARvqU/qGKj2H07zIc6mSPpGWioAXUIhO0lYadbkfKSqA7OP++hka4ALu09Dm2I ut3iCymV9WTiOtulRqEPykx+v072h6E3YeLSftDV+/EpQaHGXYu0mpguZNg9cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683615571; a=rsa-sha256; cv=none; b=vVn7slp+6O92DjjuEoYHzZpYm52frA6rX+cFX5Vyz0M/FQpMe++XZ5o4JXC5Gw11vDg1Rc EC0sB4HYWyt2BAdWOrWEkUDm2WQgNyIrUTzLQB2x5Wnd0R5FN3F5wpHQoBhaNg0pXfIPfC lZmTdCgToj6D9W036XL5oTg++5cVXLaIvmwQh+akvuaKLVMWyk6L2H5tapGYLJh8gQkX36 XfFJQcLsnQkcr959SeYMNC6MmyDEcITioBL1BUrmocfKqPToPXmXP1J4D6jG6y9L3u5Mk9 xFyFgFWa4L8wm91VAKtTbhCJXPElOGdWf/oT8pcjxMd1f9YT4fnXP8wP8KYUUg== Received: from [IPv6:2001:9e8:da68:a900:1652:753a:5d26:8439] (unknown [IPv6:2001:9e8:da68:a900:1652:753a:5d26:8439]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: corvink) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QFptV4CJrz1BLd; Tue, 9 May 2023 06:59:30 +0000 (UTC) (envelope-from corvink@FreeBSD.org) Message-ID: <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> Subject: Re: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 From: Corvin =?ISO-8859-1?Q?K=F6hne?= To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Date: Tue, 09 May 2023 08:59:28 +0200 In-Reply-To: <202305081826.348IQm9N040108@gitrepo.freebsd.org> References: <202305081826.348IQm9N040108@gitrepo.freebsd.org> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-kcwxKmyzM0SEFdLTDQlR" User-Agent: Evolution 3.46.4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N --=-kcwxKmyzM0SEFdLTDQlR Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2023-05-08 at 18:26 +0000, Ed Maste wrote: > The branch main has been updated by emaste: >=20 > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D76887e84be975698b14699d7d0dfb15= 7d73e9990 >=20 > commit 76887e84be975698b14699d7d0dfb157d73e9990 > Author:=C2=A0=C2=A0=C2=A0=C2=A0 Ed Maste > AuthorDate: 2023-05-02 20:57:12 +0000 > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Ed Maste > CommitDate: 2023-05-08 18:25:15 +0000 >=20 > =C2=A0=C2=A0=C2=A0 cpuset: increase userland maximum size to 1024 > =C2=A0=C2=A0=C2=A0=20 > =C2=A0=C2=A0=C2=A0 Hardware with more than 256 CPU cores is now available= and will > become > =C2=A0=C2=A0=C2=A0 increasingly common.=C2=A0 Bump CPU_MAXSIZE (used for = userland > cpuset_t > =C2=A0=C2=A0=C2=A0 sizing) to 1024 to define the ABI for FreeBSD 14. > =C2=A0=C2=A0=C2=A0=20 > =C2=A0=C2=A0=C2=A0 PR:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 269572, 271213 [exp-run] > =C2=A0=C2=A0=C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0 mjg, jhb > =C2=A0=C2=A0=C2=A0 Relnotes:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 yes > =C2=A0=C2=A0=C2=A0 Sponsored by:=C2=A0=C2=A0 The FreeBSD Foundation > =C2=A0=C2=A0=C2=A0 Differential Revision: https://reviews.freebsd.org/D39= 941 > --- > =C2=A0sys/sys/_cpuset.h | 2 +- > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h > index b75ee595da3c..676f9855f384 100644 > --- a/sys/sys/_cpuset.h > +++ b/sys/sys/_cpuset.h > @@ -40,7 +40,7 @@ > =C2=A0#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETSIZE= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MAXCPU > =C2=A0#endif > =C2=A0 > -#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0256 > +#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A01024 > =C2=A0 > =C2=A0#ifndef=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETSIZE > =C2=A0#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETSIZE= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE Hi Ed, this somehow breaks bhyve on my system. It immediately exits with "vm_run error -1" on startup. --=20 Kind regards, Corvin --=-kcwxKmyzM0SEFdLTDQlR Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgvRSla3m2t/H2U9G2FTaVjFeAmoFAmRZ71AACgkQ2FTaVjFe Amq05A//WpPiVNciNqz1p2d/4UCyAgywFr/s3J5bbdC/YW7GMCSR+3yg5cBzJK4H EZi0mOqo2JHJnr56Sk6Iy1Z751eDMGuGLO44KQ+Z+3Jl6KlwbWZ9Q9b0Y5hfJJG/ 4DYTkUD0iHRDPzuru/76rZKmCkf/+BzblSeW71a7E+y/Wi80spJhEEAF+57FpGea aWL2JUrRnM5GYIitqNYL+3cQEE7jpm/xKcqG5iGZaaULUOmFt+dBoF4qqjDI2VOA PgJ4Dq6irlo7Hn8oII1FY2BYTKowg9Tm9NZyh8yYsb4D4MhpO0s57d28y6A2rYGq BSrLBUE/uCZ55PDYibBR1PXfI4gp0Wxd+KxTBSOdDUU+osDmoiqtUsqbdYqG10qq 3BWT90aaWinv7SHyR/icxL0K4Sn/cstEXxfo4X+u1/7dbL7yqYTeSwKL0rwGmvCX LiSHWJH8Cqtuc8wmuVHcit07VpdQM1C2BDkyCMZucWJxpIwKXlUDV1vfYUH0/4q+ Y9mj80v0cznhN5TX5agtv9rxFAufhrYL7X+rLVcpq/EAvy8v5p/NBUkbBG5q56dK EGgqRIOxzKhKFWewSm9P6hWnPuKujSdg+yjIEK5bwbubW43jWf+QaWmrPtOgihij yoC369GKZVvN0RizLOBfeWB0Qp1H1VoCIh7ZM4rcn/HdXKDgkYs= =WlKT -----END PGP SIGNATURE----- --=-kcwxKmyzM0SEFdLTDQlR-- From nobody Tue May 9 07:43:27 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFqsF6qD5z49rbN; Tue, 9 May 2023 07:43:29 +0000 (UTC) (envelope-from corvink@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 4QFqsF5wdtz3vlS; Tue, 9 May 2023 07:43:29 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683618209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nM2ANZYEqYogpQlIsVR/EkQ++AQ1i+Lbmil30ljx5F0=; b=hbQ3vLwJi7uX5NFHgdMSfzep8NHZxdMvg4oL/ajT6IIVwTAivZ18IbnnPjUnrszuXz3gBY dEmPOT6OPp7YweWjGk4khkk+ml2a5jFPpwgY4SHR51E42kg93Zx+qMim0eqkN2rkVwOZg6 JFmBSBRryvgYorOOZ9t22RlwMMxz0qdd80cRqffE+oXwR9XKo5cYT04+8BeJEhS9o1zuKO 3+mD51IcCv/osQ6Loe2VHGWSa1I3I2D/5+eWUayqfkD55ZAVxGYl/7/KkZAypvhz2I/qL3 rPS6LnC+s8aB4VMPAJLCdk2cmhvBelhUBN3QEeZIP3KOcmPhh7ujMHrgWuBt8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683618209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nM2ANZYEqYogpQlIsVR/EkQ++AQ1i+Lbmil30ljx5F0=; b=ElPJuIv1ZzojcTVX4peAivj1ITCl5wgQj4Jnr5LTXlLjeheCqRxAaLlLcq9s8UyKrciHcX P3BjMJ9boNiExUyoAeUNPrs+gGmOgQLF9TIrSQsrrVVwuG9gZkrIJLTcDHH13J/YGj3zFE a6aCwi97XcODUKCh0OGa/+2vRM4is23Q8Fvg1HScPkaH2TLlKa9YK5ykV4rc+tNYYLac1T 7v7Y1jPOMvX1ozZLd8ZUP0I8uOwAQLQdUAuwnB36r9AZemlLj1pjTo37IrV6LuhbWs3DRQ IKpKmPMgTqemdNG+EwwXKmupl42e4cs6GiSKoRulTABqsEgeR6D67ow4mv+F4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683618209; a=rsa-sha256; cv=none; b=J/zRYYX8NQIJndoTb5dyl++nV8ClVUUClawRjFlzLPpouXuueI5mHPHatuiYhKOLNUAizu bXJaCNDD3dSdum1fLOzedfyoSqd/UKJqnqES2c47fmo3ms7rcy9BGiS+iwUva7R0hCHNfR LNxwo1DnENCFK0YPRsUkqLdCFSrrCcgWFGjLq7Nq/zXc8RGv7A54lqzXIoOoihHFTMDq96 5GozqtFXU2qR6K2olSmzovahSnbkfvsrMcOInk2CMAgCqzb7tXPE7fHja4+FuYcwgam1qo WpouO0723wusyF1P0S5XhpGycmFUVswgMnioa93HoYb+nsLiLZTnY6mZ85mbjQ== Received: from [IPv6:2001:9e8:da68:a900:1652:753a:5d26:8439] (unknown [IPv6:2001:9e8:da68:a900:1652:753a:5d26:8439]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: corvink) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QFqsF0t1Xz1Chp; Tue, 9 May 2023 07:43:29 +0000 (UTC) (envelope-from corvink@FreeBSD.org) Message-ID: <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> Subject: Re: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 From: Corvin =?ISO-8859-1?Q?K=F6hne?= To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Date: Tue, 09 May 2023 09:43:27 +0200 In-Reply-To: <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> References: <202305081826.348IQm9N040108@gitrepo.freebsd.org> <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-hjvjSbrLLmF/T5yNE9Cx" User-Agent: Evolution 3.46.4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N --=-hjvjSbrLLmF/T5yNE9Cx Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2023-05-09 at 08:59 +0200, Corvin K=C3=B6hne wrote: > On Mon, 2023-05-08 at 18:26 +0000, Ed Maste wrote: > > The branch main has been updated by emaste: > >=20 > > URL: > > https://cgit.FreeBSD.org/src/commit/?id=3D76887e84be975698b14699d7d0dfb= 157d73e9990 > >=20 > > commit 76887e84be975698b14699d7d0dfb157d73e9990 > > Author:=C2=A0=C2=A0=C2=A0=C2=A0 Ed Maste > > AuthorDate: 2023-05-02 20:57:12 +0000 > > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Ed Maste > > CommitDate: 2023-05-08 18:25:15 +0000 > >=20 > > =C2=A0=C2=A0=C2=A0 cpuset: increase userland maximum size to 1024 > > =C2=A0=C2=A0=C2=A0=20 > > =C2=A0=C2=A0=C2=A0 Hardware with more than 256 CPU cores is now availab= le and will > > become > > =C2=A0=C2=A0=C2=A0 increasingly common.=C2=A0 Bump CPU_MAXSIZE (used fo= r userland > > cpuset_t > > =C2=A0=C2=A0=C2=A0 sizing) to 1024 to define the ABI for FreeBSD 14. > > =C2=A0=C2=A0=C2=A0=20 > > =C2=A0=C2=A0=C2=A0 PR:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 269572, 271213 [exp-run] > > =C2=A0=C2=A0=C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0 mjg, jhb > > =C2=A0=C2=A0=C2=A0 Relnotes:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 yes > > =C2=A0=C2=A0=C2=A0 Sponsored by:=C2=A0=C2=A0 The FreeBSD Foundation > > =C2=A0=C2=A0=C2=A0 Differential Revision: https://reviews.freebsd.org/D= 39941 > > --- > > =C2=A0sys/sys/_cpuset.h | 2 +- > > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) > >=20 > > diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h > > index b75ee595da3c..676f9855f384 100644 > > --- a/sys/sys/_cpuset.h > > +++ b/sys/sys/_cpuset.h > > @@ -40,7 +40,7 @@ > > =C2=A0#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETSIZ= E=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MAXCPU > > =C2=A0#endif > > =C2=A0 > > -#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0256 > > +#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A01024 > > =C2=A0 > > =C2=A0#ifndef=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETSIZ= E > > =C2=A0#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETSIZ= E=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE >=20 > Hi Ed, >=20 > this somehow breaks bhyve on my system. It immediately exits with > "vm_run error -1" on startup. >=20 >=20 Setting MAXCPU [1] to 1024 as well, solves the issue. Not sure if it's a regression of your commit or a bhyve bug. [1] https://github.com/freebsd/freebsd-src/blob/20d8d9809a8c0a3ddd1d0156e77ec53= a1ed95747/sys/amd64/include/param.h#L68 --=20 Kind regards, Corvin --=-hjvjSbrLLmF/T5yNE9Cx Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgvRSla3m2t/H2U9G2FTaVjFeAmoFAmRZ+Z8ACgkQ2FTaVjFe AmpXDw//RmtEeG1ABYr0cB2YtkfNQ/KyNZEt3VserTF07bBh5c7YHe2EVaiLeO2P vKMLquiaKenGs7XnlMtCF3wBOg3bA2ohpLnK9Vmq9wEYnISDiixmZNm//3zaNCE2 WPg52219MadO+It5zlR57WxX9pywfnroFirfscaglowrAYPRAFGooM0WKpPZwIym 5FFlrUoFWFwBnD/fo/MiOEFWJ7l8hChUXyiwZhnktovHtLheOn9fc+iENYV0EHGp 1JTT6nd8KSHJac2SRFfSA8SlO9vwNVyEk4rPC7chKfraJrX3F92P2VR4JIwunm4C wOiCg0FEtgyspcD5Db1dfqI7OgP0VakACzQuUuCWUv3enzsX6V7M4DmC9wPa9E5B CGobxy+XDzo5dVCWW6+rZmPWOsoFyu5AGSx38oqDgjBvJQ7qplG3ScqqdRKxbAOP J81EILuQmgXFZ1suD6mvYCPaQ7e6MMqhMGH/oG8sx8+CRbcBZxvmSbZiC+2ibUPM X5bTuj0lh9xrI1Ps7/xkBpprMPEJw8fY/usBLTsTZdLsRBp7dZ9YjHTGK+keDXWm uMNtWl8Nyv+yeb+LRrfupBpE5YMZJFSIWh2vsd/0B+Z+OFLFTPteXM0bIIJNR/8r +BPRNpF4ysZ7H4mKuEFDvizLq6l4gUOwdDHKfu5U6oLiQjI+4aU= =3yGb -----END PGP SIGNATURE----- --=-hjvjSbrLLmF/T5yNE9Cx-- From nobody Tue May 9 08:02:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFrHF59mRz49sKv; Tue, 9 May 2023 08:02: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 4QFrHF4Tsyz3x7R; Tue, 9 May 2023 08:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683619353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dNDF1mWTjMl6gRf1hPgMJdEV7Dyz9cvjA6eYjoY721E=; b=nnfsGIDDv8Lk+ElYEJb+H6KAe9VRzx96s0vHdld/1rG+XfxlD0kaIcXxyhYA7GrWV2xwN8 Sj5KPqhA/s6cv7yuHiyPBqU9phiF19mRi5RdXprgJAzeWYcz4Y2oLmgtUxfNEnutuVjQw5 HjyhtFRFLN24h738jxpQJl8lNDzGwvWHxpWG7qBVSSMg7Be8AeZJ9yANRNmZQ9TRx19NPn OFjuKEVYtzuhva3ymg8NqRrxCeQsL9pSfnpgv2HymZ+fRzrqM2hL0KGmLGGxO9a3LDZzYo EXnnXPDS14fRhnbdXDqnBlNYs6S9O6uXkt81Lys9P22hfUSNmsXjFe4zEMsSEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683619353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dNDF1mWTjMl6gRf1hPgMJdEV7Dyz9cvjA6eYjoY721E=; b=N/9+NgFuD2LnEHUxwkgkqJXSL+jHGsSbnT/89/ahftYZIpcCReEvYzt4+6npn0zPq8+1zx N7j3YYCYeK7Y/HaZkTkcBshGtVT1LdwEX42lMr7pok8M6TNhRn1eCe6Dno4oFw9lQfNTcn b/G+wg9KovWJmvvFZzfhGnvL6WAgs6ixVVGe+5pBF53iSpOkVCxq2fDk/hGd1R/IFG2fYI ZhaHLpQApFxZtD5s3taZxU9oXPFXsetnf81wrLABer2UdXnyYdKwFqqLY5Wt5CPiQajhdq kjU9Q3bG+mibvyeg2gsf8DDpokPSuDOgKQ+L7EAdMNerDcyWUComqTdnwtQoFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683619353; a=rsa-sha256; cv=none; b=yhs1VeuyyIN3oUo9V7ZwQ/3xu99ZRBbHiqz0+OPM6gZV7JAKx6Lk096tAdyQFdy6+4MCZu DS6IszbiopIQyv6pdgWE95wEEkjwBpRdzpgXhBe4WT1voziomwNFlKtEtrgEoFIgB2MQsU +m9578T6g3TKNg1Tq8TGfmk5mThlGILng79k9nD0HOXzc7zlEhd49uC9zsqVW/uaJlBY4y YViLDaIizLM8Nc/lWGslpKcFJOabkW7Ur//4SY4bgQQBaHbEe8+k/qJDjfP1SMhCUcAomv OBRkgoutuRXsUyXSGU6cQpEAGAInl1lRfe4rqIIS8W6jIrQ97ih5Brupl6HDiA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFrHF3XmqzKmP; Tue, 9 May 2023 08:02: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 34982Xva089977; Tue, 9 May 2023 08:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34982XdJ089976; Tue, 9 May 2023 08:02:33 GMT (envelope-from git) Date: Tue, 9 May 2023 08:02:33 GMT Message-Id: <202305090802.34982XdJ089976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: b0cf48305f7f - main - em(4): update sysctl list, mention iflib(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b0cf48305f7fcd6b134b1bae8597ad432e80f2e1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=b0cf48305f7fcd6b134b1bae8597ad432e80f2e1 commit b0cf48305f7fcd6b134b1bae8597ad432e80f2e1 Author: Yuri Pankov AuthorDate: 2023-05-09 08:00:32 +0000 Commit: Yuri Pankov CommitDate: 2023-05-09 08:00:32 +0000 em(4): update sysctl list, mention iflib(4) Some of the settings, e.g. disabling/enabling msix, are now handled as generic iflib variables; mention iflib explicitly in tunables section (in addition to SEE ALSO). Reviewed by: cc, gbe (manpages) Differential Revision: https://reviews.freebsd.org/D39999 --- share/man/man4/em.4 | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/share/man/man4/em.4 b/share/man/man4/em.4 index a1fa22c2d0d3..c4395a89699b 100644 --- a/share/man/man4/em.4 +++ b/share/man/man4/em.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 30, 2019 +.Dd May 8, 2023 .Dt EM 4 .Os .Sh NAME @@ -215,6 +215,9 @@ Tunables can be set at the .Xr loader 8 prompt before booting the kernel or stored in .Xr loader.conf 5 . +See +.Xr iflib 4 +for per-instance variables. .Bl -tag -width indent .It Va hw.em.disable_crc_stripping Disable or enable hardware stripping of CRC field. @@ -224,27 +227,12 @@ Default 0 (enabled). .It Va hw.em.eee_setting Disable or enable Energy Efficient Ethernet. Default 1 (disabled). -.It Va hw.em.msix -Enable or disable MSI-X style interrupts. -Default 1 (enabled). .It Va hw.em.smart_pwr_down Enable or disable smart power down features on newer adapters. Default 0 (disabled). .It Va hw.em.sbp Show bad packets when in promiscuous mode. Default 0 (off). -.It Va hw.em.rxd -Number of receive descriptors allocated by the driver. -The default value is 1024 for adapters newer than 82547, -and 256 for older ones. -The 82542 and 82543-based adapters can handle up to 256 descriptors, -while others can have up to 4096. -.It Va hw.em.txd -Number of transmit descriptors allocated by the driver. -The default value is 1024 for adapters newer than 82547, -and 256 for older ones. -The 82542 and 82543-based adapters can handle up to 256 descriptors, -while others can have up to 4096. .It Va hw.em.rx_int_delay This value delays the generation of receive interrupts in units of 1.024 microseconds. @@ -264,6 +252,12 @@ If .Va hw.em.tx_int_delay is non-zero, this tunable limits the maximum delay in which a transmit interrupt is generated. +.It Va hw.em.max_interrupt_rate +Maximum interrupts per second. +The default value is 8000. +.It Va hw.em.rx_process_limit +Maximum number of received packets to process at a time, -1 means unlimited. +The default value is 100. .El .Sh FILES .Bl -tag -width /dev/led/em* From nobody Tue May 9 08:05:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFrLF60pgz49sfG; Tue, 9 May 2023 08:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFrLF5Tfnz3y2t; Tue, 9 May 2023 08:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683619509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8DGHrCdAcKnXsaoj0LFOd3u5lq4bzX47VYW6/BQ2pA=; b=hrAnoJLEtJoGhl5HUxxBFL9+jZdzDLVxhA/HxR7KSCTRonijavy/mDAEFZO8X8GMFbGjRi S/qxYvdInKAcLbofy5py1WiqXzOTKXNxAMWeFbwkv1jrgwijh2KMiIvSW/3z2IfFqmjvwu o2Ch3zeIt/Z215ExrjH0IHRzt3mOnPGyLVR+42P/yAx0jK/Pb3kNOWra00lesAlBLAFlhH Zi1o1ndYu+3mZ4gLwpmP4Wvh2ACMeuuGkmNF6x8Ydd6riDXf4GsU6AUxc9oQQ7iy3u3Xvu HjrWSVR7aaf0XxqdH6DxeWx/pR1+dCA9R16A2LsDLPQjKND49xRcZdsMXzSt3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683619509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M8DGHrCdAcKnXsaoj0LFOd3u5lq4bzX47VYW6/BQ2pA=; b=rGsw7jVK7r2fm/Ntnm7fkvsv0EpX9H8Rd5wdSwPdAnySxAC5u8P51TbtpfElhG4miQNRwl FwX3MRPd/J5E2gCCSjDP0NC1G2qZuf2W4d+KX8VPwMT9S3NXzlC20W6EOpmU1AdpE7NEI0 RLo0b/1WJHE2ojrEfMEMZ+tEBiVby4ZNLpgNzU+UV7kengIjfUjCpYT0kSwDiUL3K6zR8b Ch+1AcD6yJEYmS/chVOn6z+8TeEoqMDr8qVmRzsGaPffGUfbx31+9/z/c6cZiWOSeod/PR uhRXFT0/kOh636oRppwJ2tzXj4H4Iv5HJCDZIqwSDOMzbFK6sh3tsF2I9udssQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683619509; a=rsa-sha256; cv=none; b=bVNJNZ2+edRTNOeRmU9jB65xozOFjVS+AEn9HFQq4XjBBzpvRO2LZYsoF04VKORwCyQ9/h D23u9th5GnEkBWIcdmrJvHT0VcfpgVhrBIP2qGGVocgvB2Rx1OV59DvTmRGHLdLynjWUgh D4W30amLIKudMG+QCDIhM3+EVapKwtzihYxTuL7mLvNRYBXxWwpgKafxfKymzZsQ8kVibY BzP6KGlVntZaQS38RZTH/sCvFkvvzK1fzQF+2Ha7QR/gGQhFJpEHWiV3SkhRwHXr2FPojd ewylEQeFysBos56VJt1+Uhb8s7xOyHw6y0RlX0X/AleR+fVkjCchy80MtqxN+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 4QFrLF4GtJzKWr; Tue, 9 May 2023 08:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3498590k090480; Tue, 9 May 2023 08:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349859JE090479; Tue, 9 May 2023 08:05:09 GMT (envelope-from git) Date: Tue, 9 May 2023 08:05:09 GMT Message-Id: <202305090805.349859JE090479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: fefac543590d - main - bhyve: fix vCPU single-stepping on VMX List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fefac543590db4e1461235b7c936f46026d0f318 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=fefac543590db4e1461235b7c936f46026d0f318 commit fefac543590db4e1461235b7c936f46026d0f318 Author: Bojan Novković AuthorDate: 2023-05-09 07:02:04 +0000 Commit: Corvin Köhne CommitDate: 2023-05-09 08:04:55 +0000 bhyve: fix vCPU single-stepping on VMX This patch fixes virtual machine single stepping on VMX hosts. Currently, when using bhyve's gdb stub, each attempt at single-stepping a vCPU lands in a timer interrupt. The current single-stepping mechanism uses the Monitor Trap Flag feature to cause VMEXIT after a single instruction is executed. Unfortunately, the SDM states that MTF causes VMEXITs for the next instruction that gets executed, which is often not what the person using the debugger expects. [1] This patch adds a new VM capability that masks interrupts on a vCPU by blocking interrupt injection and modifies the gdb stub to use the newly added capability while single-stepping a vCPU. [1] Intel SDM 26.5.2 Vol. 3C Reviewed by: corvink, jbh MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39949 --- sys/amd64/include/vmm.h | 1 + sys/amd64/vmm/intel/vmx.c | 7 +++++++ usr.sbin/bhyve/gdb.c | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index c3d1aa4f3866..a328404a89d5 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -497,6 +497,7 @@ enum vm_cap_type { VM_CAP_RDPID, VM_CAP_RDTSCP, VM_CAP_IPI_EXIT, + VM_CAP_MASK_HWINTR, VM_CAP_MAX }; diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 8b8f8fe6cb25..69391f5b77de 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -1439,6 +1439,10 @@ vmx_inject_interrupts(struct vmx_vcpu *vcpu, struct vlapic *vlapic, uint64_t rflags, entryinfo; uint32_t gi, info; + if (vcpu->cap.set & (1 << VM_CAP_MASK_HWINTR)) { + return; + } + if (vcpu->state.nextrip != guestrip) { gi = vmcs_read(VMCS_GUEST_INTERRUPTIBILITY); if (gi & HWINTR_BLOCKING) { @@ -3634,6 +3638,9 @@ vmx_setcap(void *vcpui, int type, int val) vlapic = vm_lapic(vcpu->vcpu); vlapic->ipi_exit = val; break; + case VM_CAP_MASK_HWINTR: + retval = 0; + break; default: break; } diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 9e50602e92be..7a2c5aec0d86 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -801,6 +801,9 @@ gdb_cpu_resume(struct vcpu *vcpu) if (vs->stepping) { error = vm_set_capability(vcpu, VM_CAP_MTRAP_EXIT, 1); assert(error == 0); + + error = vm_set_capability(vcpu, VM_CAP_MASK_HWINTR, 1); + assert(error == 0); } } @@ -853,6 +856,8 @@ gdb_cpu_mtrap(struct vcpu *vcpu) vs->stepping = false; vs->stepped = true; vm_set_capability(vcpu, VM_CAP_MTRAP_EXIT, 0); + vm_set_capability(vcpu, VM_CAP_MASK_HWINTR, 0); + while (vs->stepped) { if (stopped_vcpu == -1) { debug("$vCPU %d reporting step\n", vcpuid); From nobody Tue May 9 08:32:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFry35Rfsz49v3s; Tue, 9 May 2023 08:32: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 4QFry34n4Xz44C7; Tue, 9 May 2023 08:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683621163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DKqlmGdwPBNg8wDE5RB9q7lJ5JNcPyorxJYadNdQ9aA=; b=F3lZsdEiXP0UIk8YdILdIMcoGEPFSD7xreijXzClr5R/rqOdQ2jngCoYGofhG4bzl+wp4f TE2oTZ7LPpb7dOgsJklgejBV0vI+9Xt9yIE95jGbemkMQxRu13un9zsySsFL+BdhTZGLzg 3Q6k8jnmhfjIOvDMjf6nzjRnZFyCvkqV2TnMOL9aJVffIPDAfSEj9Y2hkmyA79uqQEA7CC BMZpx7DqUVEO34ZkUwSsQSkoUkb5p1/lKl3MOLZeRY1QPKjnfMQTZYHViPIQmm3V66r5l7 hbNf5JLklc1RiVnyFhrcdPYjODeybja4iGmTzbZ05CBRYoaMN4XxCEJb4hOwGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683621163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DKqlmGdwPBNg8wDE5RB9q7lJ5JNcPyorxJYadNdQ9aA=; b=vf3QXMpwYskY80e/BaTSwhT0D9PBQAnfEbHXB9wmbju16vReCn9z1MpuLknyp70OOQ4F/n FAxg5NkO0EOsDiZGjoQEHms/FeLyvCuK2yeYJILWR04VaxqQMqWel7yIxJf+gH1Ogri5Ia 3ipu4eChGeLwu0spx0uL7hqv0W7NWTflXzV4/PiDvELx4cKjQjacjZxOv01rJXNjvKlAe4 aPL4LVe+0aSGLxd3Lh1yRqOwCKnBK7jLITGTLSvDnu02x0c1d1t/IAAPqpaRfsMkQLN6c/ 3p2mZiqxAxhhn1e3AOBjIPSHYXuQ7389i6K/VbKa/JkmzKoJEdb7vpSLs3Y5IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683621163; a=rsa-sha256; cv=none; b=LrlO2IF7RkD1FaT1ewqmM9Mcnr4DmNuu6CCbGnj9nCECIApT1miC2mmmcM2hFFI0jMlQvY T4YTgO6zVv8/++eVsXY9dI14x1F57tMq0N1CUH06ft/AvhaaYSjcjhrnSAFgncsk8Xg5M/ TGAvNAiw3b02QqbVFhuUKrUad2Q0N0+yvuL/CdhTt15HtQACZ+BCC73aS3juA6aQSl1iz2 Rl1acD3SaW1VPV2tlUk4Uhn2H7rUcWJtePjFUraflsCslooyUhM025Sl0qfdD50CLcRrYi yBOdt+EWIxGJJ9Gf1vIgOBuRIeCm+tFBkN/2BrTTkhF2IuHd1vV7D5izYthCHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFry33rFSzLkT; Tue, 9 May 2023 08:32: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 3498Whh6039159; Tue, 9 May 2023 08:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3498WhvJ039158; Tue, 9 May 2023 08:32:43 GMT (envelope-from git) Date: Tue, 9 May 2023 08:32:43 GMT Message-Id: <202305090832.3498WhvJ039158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: c543e09f1f8e - main - bhyve: save/restore pir_desc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c543e09f1f8ef98f201f7dd3f34ae023d61dfa83 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=c543e09f1f8ef98f201f7dd3f34ae023d61dfa83 commit c543e09f1f8ef98f201f7dd3f34ae023d61dfa83 Author: Vitaliy Gusev AuthorDate: 2023-05-09 08:27:29 +0000 Commit: Corvin Köhne CommitDate: 2023-05-09 08:31:27 +0000 bhyve: save/restore pir_desc Failing to preserve pir_desc can result in pending interrupts being lost on resume leading to a hung VM. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D35447 --- sys/amd64/vmm/intel/vmx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 69391f5b77de..ec54273caaaa 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -4179,6 +4179,9 @@ vmx_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) SNAPSHOT_BUF_OR_LEAVE(vcpu->guest_msrs, sizeof(vcpu->guest_msrs), meta, err, done); + SNAPSHOT_BUF_OR_LEAVE(vcpu->pir_desc, + sizeof(*vcpu->pir_desc), meta, err, done); + vmxctx = &vcpu->ctx; SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rdi, meta, err, done); SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rsi, meta, err, done); From nobody Tue May 9 09:38:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFtQp6KhQz49yN0; Tue, 9 May 2023 09:39:14 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "Telekom Security ServerID OV Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFtQn25Gxz47vX; Tue, 9 May 2023 09:39:13 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1683625151; i=garyj@gmx.de; bh=EcMjjtN8Wwf8VR8wq6aYemDcZWOIxTJs+3R9boefynE=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References: Reply-To; b=ANT5CzdTC0e0EcfPhGounFLyUBM23/nhHEK2i5/fLsauRhXYEIEXmWA8QNxcU4CQt 9cNKP08ueYtX+uV+sQuXDree/bv8KdXF7J2ijtFKqUmF1+KRmyx5K+yiXu5tJY5J8h VMFdKh5uZC/+UQ3YgqGxURZwDZWXrH6lQAIqbX6oyV4GttQ3DVHe3ekkH9eSW8d2Eu qda7gPa8G8sK6ObP5lDwNKHhoDJLpRz+nnjpPq3FLYZT2UICI8KPXFc/3bLWlEuKSh k5rGwoxOfzczrkSEf7aGU64tZozAFqH1gM7KZu3w2RWJyXlGL6c96qDU2++sgGEGJt DF50wXOAVVSbw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([91.59.238.143]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1Mlw7V-1qeDOu1gzz-00j44B; Tue, 09 May 2023 11:39:11 +0200 Date: Tue, 9 May 2023 09:38:48 +0000 From: Gary Jennejohn To: Corvin =?ISO-8859-1?B?S/ZobmU=?= Cc: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 Message-ID: <20230509113848.5c9529e1@ernst.home> In-Reply-To: <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> References: <202305081826.348IQm9N040108@gitrepo.freebsd.org> <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:saRTlKOjdniS77AgDoa46KwKPWNPyWXTmfAYT378KALJ5LetQ2V qcMQRjiZpLyIXGK+27TUhB8veGBgWRZAba0K9t+GyySFKzJhjM3t7M+o/+MY8dac7ma4gq7 gTF7GgOS6bDCFM3zs2mBR9h9aKIv7VqMjV56ccGUA3vpEyH9ER0nme49iu6xqt8/6qESkrD riXnh83Peuk0GePwOG2eA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:noIltLbYZDU=;8CeYrT9GE6EapoUunIvHyrsVvsU 7NHM3lNb4q+GvjLkvG/IfWWGE7rZw9YQFx8UzN1vVMZxB19U4seKd8BHaJW64s+2YEE0sTxCt VBAD/W3zvKbm8QSWjy5VYwx1AVPbgC4mTBvlFMZcSdLehiTMvXrCmUuZj2b5ISXgt+n9lWNB6 K9b+HYWE4U0r/NbArjUbKHApnFppd2ts0xAOpwsZ1OVJI/TL4sgPo2MIuDNmnbSt63KUPsn32 4E4Sei3QJf8ugw4h4yZCyRpMsyteDan3aUR8Q1Wu7v2N0C7b78NSY9Dw6qyTKaosixv/dFOM1 Y9T9KTMitXXoyN4PPKeHrRL2PLDEHQeFZs1txDMkyQNJ1esgnQJe7hwrECiyVrKvYT3pekQ8+ UFENCd9cFPuq4Rb5HF2jNmnauKLeeb/vbYk6uVGtLVueXbEPzbHcW9Bx2MfYzi1IbLO5MjqB+ 8GZn1glixtNjZ+SbVCDgioX6Xybi2sQNOaf3rxkxRYvHR8tJikbiykNjHentMYbjbHw3cwvNd 1UQtilN6EdYtC3AZMyLRDjJQCu3AVYR1xW9EgXmInB4ncQ51TICfWUXYOUgAYn6QOHMyZyQl9 HvzCJU2Aw1yKUF2/fGJngDBcGAB5ffQuhqRgDOLx38E9qLV9ZyM5Xa2z+ZP8PFW4zNUqXlUvg HYGKVHFWUxZsw33slZzR7rbs+LA7Sg0QnPp7aGpPoSB/brkIGSkUuIGPQoJAe9ETx0QkGJfMO AZVHcIAZbKNECAYR8z8kdAsmD1dQ2e7IsngVobrz6WLhpLIrp5kowmleDvKixDHqSOH/PwxWO dgakx92T0y+TmJTlKhWVbv/m0jA2EmjZVlHCDiIGzPmT/W8Ea8dJWf4qmJvSheSYvY86l90FD wHrn/qv7eifHyBceA5bkI5E8LrSXEar/DGj5fkDZHI5InDeN3q6JL4uBJktQns0hVliOa8IQc FuHmPQ== X-Rspamd-Queue-Id: 4QFtQn25Gxz47vX X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Tue, 09 May 2023 09:43:27 +0200 Corvin K=F6hne wrote: > On Tue, 2023-05-09 at 08:59 +0200, Corvin K=F6hne wrote: > > On Mon, 2023-05-08 at 18:26 +0000, Ed Maste wrote: > > > The branch main has been updated by emaste: > > > > > > URL: > > > https://cgit.FreeBSD.org/src/commit/?id=3D76887e84be975698b14699d7d0= dfb157d73e9990 > > > > > > commit 76887e84be975698b14699d7d0dfb157d73e9990 > > > Author:=A0=A0=A0=A0 Ed Maste > > > AuthorDate: 2023-05-02 20:57:12 +0000 > > > Commit:=A0=A0=A0=A0 Ed Maste > > > CommitDate: 2023-05-08 18:25:15 +0000 > > > > > > =A0=A0=A0 cpuset: increase userland maximum size to 1024 > > > =A0=A0=A0 > > > =A0=A0=A0 Hardware with more than 256 CPU cores is now available and= will > > > become > > > =A0=A0=A0 increasingly common.=A0 Bump CPU_MAXSIZE (used for userlan= d > > > cpuset_t > > > =A0=A0=A0 sizing) to 1024 to define the ABI for FreeBSD 14. > > > =A0=A0=A0 > > > =A0=A0=A0 PR:=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 269572, 271213 [ex= p-run] > > > =A0=A0=A0 Reviewed by:=A0=A0=A0 mjg, jhb > > > =A0=A0=A0 Relnotes:=A0=A0=A0=A0=A0=A0 yes > > > =A0=A0=A0 Sponsored by:=A0=A0 The FreeBSD Foundation > > > =A0=A0=A0 Differential Revision: https://reviews.freebsd.org/D39941 > > > --- > > > =A0sys/sys/_cpuset.h | 2 +- > > > =A01 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h > > > index b75ee595da3c..676f9855f384 100644 > > > --- a/sys/sys/_cpuset.h > > > +++ b/sys/sys/_cpuset.h > > > @@ -40,7 +40,7 @@ > > > =A0#define=A0=A0=A0=A0=A0=A0=A0=A0CPU_SETSIZE=A0=A0=A0=A0=A0MAXCPU > > > =A0#endif > > > =A0 > > > -#define=A0=A0=A0=A0=A0=A0=A0=A0CPU_MAXSIZE=A0=A0=A0=A0=A0256 > > > +#define=A0=A0=A0=A0=A0=A0=A0=A0CPU_MAXSIZE=A0=A0=A0=A0=A01024 > > > =A0 > > > =A0#ifndef=A0=A0=A0=A0=A0=A0=A0=A0CPU_SETSIZE > > > =A0#define=A0=A0=A0=A0=A0=A0=A0=A0CPU_SETSIZE=A0=A0=A0=A0=A0CPU_MAXS= IZE > > > > Hi Ed, > > > > this somehow breaks bhyve on my system. It immediately exits with > > "vm_run error -1" on startup. > > > > > > Setting MAXCPU [1] to 1024 as well, solves the issue. Not sure if it's > a regression of your commit or a bhyve bug. > > [1] > https://github.com/freebsd/freebsd-src/blob/20d8d9809a8c0a3ddd1d0156e77e= c53a1ed95747/sys/amd64/include/param.h#L68 > Unfortunately, not a viable solution for users who set MAXCPU in their kernel configuration file. =2D- Gary Jennejohn From nobody Tue May 9 09:40:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFtS604RPz49yS1; Tue, 9 May 2023 09:40:22 +0000 (UTC) (envelope-from corvink@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 4QFtS56Chjz4875; Tue, 9 May 2023 09:40:21 +0000 (UTC) (envelope-from corvink@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683625221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ej42SqORyGSDjaxJ0NzPQa4GJ1oOLw0k0UJ5+7HVoCo=; b=VAbzXjK644dH35pQ3PpJj/CJ3CTrNDc3kok+iXIKed3JB+p+UEhO5wfNqmyy+SVW6uduhs w5kAqrZtZ9Yd9gFwxnSA9pHXKRon/UU2olNb6++Xu16DH8rjoH0u0bHzAFiJsGW3yszGkC DYtBrsLo3NzR7XcDD142c6Dmaid8YlmsKPV0ql+VxaKs6WHR0QQybVbBS1E90SYuJwlT6P +G/IdBzC7OK+CqXNKikYQZcKDxK5y1HFvCIGSZhBr/AeRHWKAKPqw9XyinOJPAxpLcTgDs pPuihoRSCGa0Sh1oiKO90pvPF+hxzmj87k2T2XCLjoivqdo7ImbXCcCr1xbX8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683625221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Ej42SqORyGSDjaxJ0NzPQa4GJ1oOLw0k0UJ5+7HVoCo=; b=T2cvBrJWRNaMlVwdNCuaakIUJlKN7s3VdAavF0THZEKuruZSqu56K2ZBiDnfaji3YFv/S1 uYQ7Z8QdHEWcM/j4Mkl3VOH+N/7NerSUCGctiWy7eyTRWhGgWOV5WNq4bCFb9P/ND6W6g4 rZH3j5cwMKaUW1gFBAPJdzw9JHqn9ZD20ClP4z22EYjnGNdYwdbFx/93kxRlzU17aAPr+f LM6UYDepu4mGEizmM2kmvsGRCCeh2d33NvGXwVkdjji01m81O8zCTFXA5ma1JwL0BGWknO A0UvFtQI8wgI1HMNOWfzZodtdUKI7b40cARMaP0ydteRR7+N6SvDcNmdJHPWxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683625221; a=rsa-sha256; cv=none; b=WvWgwWfMRNbmcUV63geGlzLyKuAIQlXCkL2yS+oPw4f97nguHnPQ5+Gg4071o92bclfpqs SwCzh0pE4UMWk1TwtqERGYkSW3edeoBq5v/MKFg46LsfVlHrRaJSv4DTN42u748BQVLa+/ okK5kY61rY27ujg8dFVGkt1mTmvN7w8NUtZvX59+DrUK6yJtS6c/KxkTnPjm1gLPoExdAC SeyoVU8snhyoQT+dhdf1u445PKi2uxo58ychNH2QE0xJLTdfbYBd2WbyHfERvGBnzFd26u G//TkpCG3yHyGzj5DPO5tC5BXMJMElBATs0h3yY5b+sSW/dro4v2h5fEFBi0aw== Received: from [IPv6:2001:9e8:da68:a900:1652:753a:5d26:8439] (unknown [IPv6:2001:9e8:da68:a900:1652:753a:5d26:8439]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: corvink) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QFtS513S7zFkY; Tue, 9 May 2023 09:40:21 +0000 (UTC) (envelope-from corvink@FreeBSD.org) Message-ID: <692e003e4b684c093b16048a4e12cc2dd8fc1fe0.camel@FreeBSD.org> Subject: Re: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 From: Corvin =?ISO-8859-1?Q?K=F6hne?= To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Date: Tue, 09 May 2023 11:40:19 +0200 In-Reply-To: <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> References: <202305081826.348IQm9N040108@gitrepo.freebsd.org> <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> Content-Type: multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="=-5GKFb5d4tJu3UV9BqS7A" User-Agent: Evolution 3.46.4 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N --=-5GKFb5d4tJu3UV9BqS7A Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, 2023-05-09 at 09:43 +0200, Corvin K=C3=B6hne wrote: > On Tue, 2023-05-09 at 08:59 +0200, Corvin K=C3=B6hne wrote: > > On Mon, 2023-05-08 at 18:26 +0000, Ed Maste wrote: > > > The branch main has been updated by emaste: > > >=20 > > > URL: > > > https://cgit.FreeBSD.org/src/commit/?id=3D76887e84be975698b14699d7d0d= fb157d73e9990 > > >=20 > > > commit 76887e84be975698b14699d7d0dfb157d73e9990 > > > Author:=C2=A0=C2=A0=C2=A0=C2=A0 Ed Maste > > > AuthorDate: 2023-05-02 20:57:12 +0000 > > > Commit:=C2=A0=C2=A0=C2=A0=C2=A0 Ed Maste > > > CommitDate: 2023-05-08 18:25:15 +0000 > > >=20 > > > =C2=A0=C2=A0=C2=A0 cpuset: increase userland maximum size to 1024 > > > =C2=A0=C2=A0=C2=A0=20 > > > =C2=A0=C2=A0=C2=A0 Hardware with more than 256 CPU cores is now avail= able and > > > will > > > become > > > =C2=A0=C2=A0=C2=A0 increasingly common.=C2=A0 Bump CPU_MAXSIZE (used = for userland > > > cpuset_t > > > =C2=A0=C2=A0=C2=A0 sizing) to 1024 to define the ABI for FreeBSD 14. > > > =C2=A0=C2=A0=C2=A0=20 > > > =C2=A0=C2=A0=C2=A0 PR:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 269572, 271213 [exp-run] > > > =C2=A0=C2=A0=C2=A0 Reviewed by:=C2=A0=C2=A0=C2=A0 mjg, jhb > > > =C2=A0=C2=A0=C2=A0 Relnotes:=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 yes > > > =C2=A0=C2=A0=C2=A0 Sponsored by:=C2=A0=C2=A0 The FreeBSD Foundation > > > =C2=A0=C2=A0=C2=A0 Differential Revision: https://reviews.freebsd.org= /D39941 > > > --- > > > =C2=A0sys/sys/_cpuset.h | 2 +- > > > =C2=A01 file changed, 1 insertion(+), 1 deletion(-) > > >=20 > > > diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h > > > index b75ee595da3c..676f9855f384 100644 > > > --- a/sys/sys/_cpuset.h > > > +++ b/sys/sys/_cpuset.h > > > @@ -40,7 +40,7 @@ > > > =C2=A0#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETS= IZE=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MAXCPU > > > =C2=A0#endif > > > =C2=A0 > > > -#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0256 > > > +#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A01024 > > > =C2=A0 > > > =C2=A0#ifndef=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETS= IZE > > > =C2=A0#define=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_SETS= IZE=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0CPU_MAXSIZE > >=20 > > Hi Ed, > >=20 > > this somehow breaks bhyve on my system. It immediately exits with > > "vm_run error -1" on startup. > >=20 > >=20 >=20 > Setting MAXCPU [1] to 1024 as well, solves the issue. Not sure if > it's > a regression of your commit or a bhyve bug. >=20 > [1] > https://github.com/freebsd/freebsd-src/blob/20d8d9809a8c0a3ddd1d0156e77ec= 53a1ed95747/sys/amd64/include/param.h#L68 >=20 >=20 vmm kernel module and bhyve userland are sharing a cpuset_t. So, this commit introduces a mismatch in the ioctl signature of VM_RUN. Any advice how to fix this properly, would be appreciated. [1] https://github.com/freebsd/freebsd-src/blob/c543e09f1f8ef98f201f7dd3f34ae02= 3d61dfa83/sys/amd64/include/vmm.h#L759 --=20 Kind regards, Corvin --=-5GKFb5d4tJu3UV9BqS7A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEgvRSla3m2t/H2U9G2FTaVjFeAmoFAmRaFQMACgkQ2FTaVjFe AmqSgRAAsc9eC27fDMjNs3xavwGN8NNEcoR+hq8MKa8R3NqHflO73aEBcqks5K03 twvPUgr/1VehMWEN7ELssIZydEsVguFVExyUy5JdlObd8LvDIfpKeHTGh1falhXS 7uHuuaBfQb6YCQi1/+6ow9iGoQPMNmdYVaEHMwAec+Iy4lqxPlCgOQPv6YC0lGZ2 PZe8nNt3OJlMr+GsJyK/vj74a0dj9eHOWG/OL+scGN7Zgs0jwsvITIOwZyblcdx4 +a3ZLUZpj9RkbmEVc3oQzMfryJgfaGcPsWkx2XEUmt9JFcilVYeMMZ9CQJWmcyyA iqqeYaVySEaI2OiZ3qpYjGGwASoRWHcBwZMEBWxOkvjaMQr9oPeEDCgj8iFGWb5J 82LTSdq7tsSqD/7IgmqwTAU8eee8kDT4+z2b1STUzqeExGA4Mm+FqVAMN7PPmPTe cErJDXENWCVmz9QDESSu/bgVySrvI9F3JWEs3+rhfstDIAdQ6Wd3wxOa0O3IoLUV Wj3e7coVKjsVEtnyQAaLIkmNK6Izjp731ApE5D8v7eLntjdvLE8C2dZ4N2MrYc+B Ev5muvmF1kf7OwiVqkp4OF47PHTDDot44FYs4JhG74WUB1oZ1Jp6XZAwFX/tc4uW 5ynB/vLL0xx9j+DbZBSr097QnJ0c6MZWpwxfr40hKi/9EGLoiNk= =oifI -----END PGP SIGNATURE----- --=-5GKFb5d4tJu3UV9BqS7A-- From nobody Tue May 9 09:52:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFtkJ36rZz49yj0; Tue, 9 May 2023 09:52:40 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oa1-x2f.google.com (mail-oa1-x2f.google.com [IPv6:2001:4860:4864:20::2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFtkJ1Sxhz4CX7; Tue, 9 May 2023 09:52:40 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oa1-x2f.google.com with SMTP id 586e51a60fabf-192adab8f0eso4636309fac.2; Tue, 09 May 2023 02:52:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683625959; x=1686217959; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=5bc8ARlxx8E0BoFt1K+B7b788oz0m9SuSri+x7BfJ4k=; b=bPzWW+cmq6qEurLSBC/7Gh63dSrw1Hs5OPaa/TpTOp6kXepVPbxV2csBmsFP5N/req 88ioCLAwXWeYh28KS09+YHNO2wl7v8iuRkgYcRK8ATRiHRaW9f4qlQs4ZD5Opcszx/Or 0Qc3FY00y3ENRPML9Vsy8VSDS78m3INo2UXWBGdqBWW+9Jdg0jsT8L9s/wDfYjxMI0yb Ok5giLyrF64S2wYDJ5s2R3oh54UAmx7ogD9FxdaaF87OZ+6ML2h9Tj91pMa0m74kUyEH kySNJuFe2ea9Fku7r3c4PCgdGrQJoqZjUtA5u8kHOLVoz2Yy7dr3z6DTRv5cT6bbZZz8 mnbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683625959; x=1686217959; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5bc8ARlxx8E0BoFt1K+B7b788oz0m9SuSri+x7BfJ4k=; b=ZZXfg0pp/6rKVjJNg/O+qRgf8xtDAMdilX+dzRsvBv9nHBcNvNyscDgpB1fUOCbR9h qCYUi12QSvaTLjH6qdDxJAO9XbIBHccHVKKgUDt44CFEPJaLjb2tVIJ75g0OIJz47dZZ t81N2A4VrC3b7/nCzWdkHjI46cWnCLsMawnDd0AcsAkRxYuSVcbJwYeWhwur4K/TdQFr Qs1nss9HQqbt/poh49I+Uz3aYVfPU1hwP0rOAmtbgQ5LGgCJ4mtXgHcKZT8kpGoE2RvC iy+mFKgIrlqX5QBSY0AONyqIKyF11W/mvH7QLJBbFSOrEgP/d/SSpQr/0SPCtAv0J9vE Vhcw== X-Gm-Message-State: AC+VfDxTp+qbcQrbnOvHRxRAbGo3b1c6RpWxv2QaDPorCoQAGprll071 oJu6vg/CPZOjiPtecr2Q6qigmjbNkM5RgGP5oTy0bXZN X-Google-Smtp-Source: ACHHUZ72vKQm9w9KAOEe4WvzMukopSp+EPJUIo01wgedt81Col5nTHx8B+lTYy7wL1yltJYMUrtBavdHotGiY7VF4eM= X-Received: by 2002:a05:6870:c793:b0:192:52b4:8489 with SMTP id dy19-20020a056870c79300b0019252b48489mr6670227oab.21.1683625958942; Tue, 09 May 2023 02:52:38 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:ac9:7101:0:b0:4d4:94b:7266 with HTTP; Tue, 9 May 2023 02:52:38 -0700 (PDT) In-Reply-To: <692e003e4b684c093b16048a4e12cc2dd8fc1fe0.camel@FreeBSD.org> References: <202305081826.348IQm9N040108@gitrepo.freebsd.org> <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> <692e003e4b684c093b16048a4e12cc2dd8fc1fe0.camel@FreeBSD.org> From: Mateusz Guzik Date: Tue, 9 May 2023 11:52:38 +0200 Message-ID: Subject: Re: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 To: =?UTF-8?Q?Corvin_K=C3=B6hne?= Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QFtkJ1Sxhz4CX7 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2001:4860:4864::/48, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 5/9/23, Corvin K=C3=B6hne wrote: > On Tue, 2023-05-09 at 09:43 +0200, Corvin K=C3=B6hne wrote: >> On Tue, 2023-05-09 at 08:59 +0200, Corvin K=C3=B6hne wrote: >> > On Mon, 2023-05-08 at 18:26 +0000, Ed Maste wrote: >> > > The branch main has been updated by emaste: >> > > >> > > URL: >> > > https://cgit.FreeBSD.org/src/commit/?id=3D76887e84be975698b14699d7d0= dfb157d73e9990 >> > > >> > > commit 76887e84be975698b14699d7d0dfb157d73e9990 >> > > Author: Ed Maste >> > > AuthorDate: 2023-05-02 20:57:12 +0000 >> > > Commit: Ed Maste >> > > CommitDate: 2023-05-08 18:25:15 +0000 >> > > >> > > cpuset: increase userland maximum size to 1024 >> > > >> > > Hardware with more than 256 CPU cores is now available and >> > > will >> > > become >> > > increasingly common. Bump CPU_MAXSIZE (used for userland >> > > cpuset_t >> > > sizing) to 1024 to define the ABI for FreeBSD 14. >> > > >> > > PR: 269572, 271213 [exp-run] >> > > Reviewed by: mjg, jhb >> > > Relnotes: yes >> > > Sponsored by: The FreeBSD Foundation >> > > Differential Revision: https://reviews.freebsd.org/D39941 >> > > --- >> > > sys/sys/_cpuset.h | 2 +- >> > > 1 file changed, 1 insertion(+), 1 deletion(-) >> > > >> > > diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h >> > > index b75ee595da3c..676f9855f384 100644 >> > > --- a/sys/sys/_cpuset.h >> > > +++ b/sys/sys/_cpuset.h >> > > @@ -40,7 +40,7 @@ >> > > #define CPU_SETSIZE MAXCPU >> > > #endif >> > > >> > > -#define CPU_MAXSIZE 256 >> > > +#define CPU_MAXSIZE 1024 >> > > >> > > #ifndef CPU_SETSIZE >> > > #define CPU_SETSIZE CPU_MAXSIZE >> > >> > Hi Ed, >> > >> > this somehow breaks bhyve on my system. It immediately exits with >> > "vm_run error -1" on startup. >> > >> > >> >> Setting MAXCPU [1] to 1024 as well, solves the issue. Not sure if >> it's >> a regression of your commit or a bhyve bug. >> >> [1] >> https://github.com/freebsd/freebsd-src/blob/20d8d9809a8c0a3ddd1d0156e77e= c53a1ed95747/sys/amd64/include/param.h#L68 >> >> > > vmm kernel module and bhyve userland are sharing a cpuset_t. So, this > commit introduces a mismatch in the ioctl signature of VM_RUN. Any > advice how to fix this properly, would be appreciated. > > [1] > https://github.com/freebsd/freebsd-src/blob/c543e09f1f8ef98f201f7dd3f34ae= 023d61dfa83/sys/amd64/include/vmm.h#L759 > > > On one hand this really should not be a part of the abi (you could have a pointer to cpuset and a a var stating the size). On the other hand, i suspect the least problematic long term solution is to introduce usercpuset_t (or whatever the name) and have a conversion func on import. This would still mean you need a kernel and user variant of the vm_exit struct. --=20 Mateusz Guzik From nobody Tue May 9 13:40:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFzn03Lp0z4BCXW; Tue, 9 May 2023 13:40:20 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFzn003lKz3H6s; Tue, 9 May 2023 13:40:20 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2ac8ee9cf7aso45688581fa.2; Tue, 09 May 2023 06:40:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683639618; x=1686231618; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IALsMxUbOk8JC7YnfU2HkmMi8NS5Pp/6dRLP326EnFc=; b=Ky7t9PHuztbaQ1S/CRrKlgOYB0C3wb9ZuW6yFwBKdr6QvVfSeFJbsWd1pgepV0Z4CX W0fgRgs3UfStKbCIan9tkzNXDipmj9gccx6pgJNy1MEy2Yk5tvmthVTKuM9ZWZE5lMAC FeTQ8MytdmrA0ffKZVF1ugozJgKYvXr8vpZzMbG6Q/cjsd/UAjwaOwZP8zApA7o3tZ1e jhByYFtQz72WitANrRVi59ef08vb3k/H9MBrnPeezRiZ00fglAn4W28pXt5F7VqN+HjY q3azjJt/Oeca6yQZDjZTz6aqK4N+/LhYm0GbwEYANYmVk+OMYCzaBDT8Bq6bh27izY12 X51w== X-Gm-Message-State: AC+VfDwocbdK1ub7BDuZYt1SPWykF5t8Z1LjbdjJF62SG9qP+oxbE0yF FpgiRjV/+nZydqmfx+9iyCdVIFs3VDCoqJq6yVlfN2v6wxQ= X-Google-Smtp-Source: ACHHUZ747Hv6jGzbIebSDk/tRvCwFwXhFE8rtOrjw6VMr8YRNv4aEas0nx1NwSPCwPtxrqyb5tsu7mMj1SH8rW6mBEs= X-Received: by 2002:a2e:3c07:0:b0:29a:9b26:4e25 with SMTP id j7-20020a2e3c07000000b0029a9b264e25mr840596lja.6.1683639617890; Tue, 09 May 2023 06:40:17 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202305081826.348IQm9N040108@gitrepo.freebsd.org> <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> <692e003e4b684c093b16048a4e12cc2dd8fc1fe0.camel@FreeBSD.org> In-Reply-To: From: Ed Maste Date: Tue, 9 May 2023 09:40:07 -0400 Message-ID: Subject: Re: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 To: Mateusz Guzik Cc: =?UTF-8?Q?Corvin_K=C3=B6hne?= , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4QFzn003lKz3H6s X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > > vmm kernel module and bhyve userland are sharing a cpuset_t. So, this > > commit introduces a mismatch in the ioctl signature of VM_RUN. Any > > advice how to fix this properly, would be appreciated. > > > > [1] > > https://github.com/freebsd/freebsd-src/blob/c543e09f1f8ef98f201f7dd3f34ae023d61dfa83/sys/amd64/include/vmm.h#L759 > > On one hand this really should not be a part of the abi (you could > have a pointer to cpuset and a a var stating the size). > > On the other hand, i suspect the least problematic long term solution > is to introduce usercpuset_t (or whatever the name) and have a > conversion func on import. This would still mean you need a kernel and > user variant of the vm_exit struct. Sorry about the breakage. I originally planned to bump both MAXCPU and cpuset_t size to 1024 in one commit, but split them in part to find unintended dependencies. I can revert the change for now and recommit it after one of the above is done. From nobody Tue May 9 13:46:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QFzvt6Msmz4BD2Q; Tue, 9 May 2023 13:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QFzvt5qv2z3Hm3; Tue, 9 May 2023 13:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683639978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRZP7/LdIiIaba2QuU6jLJSdUoQcX0glQhAIA0s5bks=; b=TPP7l4sNOS8V1h4CMQcFa/aVKgZK8BaQznhzHWHco9LOHswDA9iG7NbnxZ5VFIR7RcZqwm ZaMsMpGNBcrSm6yopZMspEitKUHcgqBU/d+7lxwEoFaGg/jMNEn9wQObq4yVGjDurmUOcE Nch+/Ir9DzDf8xwl5BshSqMWANVlJp01/X0DX+3rvifcMVoNLVV3tVaNXy4vadd25dOpkA 3/tC3pWRO0IkTNZ4sLEKL2bYC4zSeXhhlu8GGmOM8VeZ3q5lTbJNV2UCoQ3VPMT4iqCHwC OfuxaW+hfM6B0cwwoT/DnnTWzYyD0HELtzJrRdHCL2l6BMl/Gh8Lw04R34OCmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683639978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HRZP7/LdIiIaba2QuU6jLJSdUoQcX0glQhAIA0s5bks=; b=l/iSY1FL57YLVEl6QgOVPjFtlaUyn3HBJ5zbZkfIlfKN8huPfErhvcZf3U6x5jhCUZlct1 xJm2oCN4OS4paPWze0zzVg3+fVTCrX07UZz9FMvYR3h2xi6/3O1Ix1VIOebPsZshGxMrgH ACRbJ4inFVZrg9PoFfQ/yBSXPTMiGFgGJ5gXGg6jOEBClO6RORvJGY4DD6wB36OUkLgIa2 /VDRdudwU5Uzew9nNHE9inIJMG0CTiInEOB2O4bXk5f7OcV6aMYA13njhQyqMCaaYDJYPb 23WUfAQo1gMk/uulNeIr1vAnCkwlsrRRuX+YC659xX/WrRHsTTEiqQzGyUjG+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683639978; a=rsa-sha256; cv=none; b=p+EWFe1Eq6kwGjUKZW754fJaUGZH0eZBAzMP6xsTF/DtVPmQuJ3SLtDykcyHADY+UQOQXX XNJw/WjbnoPosIxqFqUnEwOqeVHlvuZ4pAG/KuVbWaa7hCO+5Txv9AG2pyQ9xlAH2mRKWH 99hrPsIfZIODYKAW1R2utdemtSzNHLTczv8zuJFxCCaOYzvDb2G9pc0ZX55/wwk0IKh7l1 AEp7oQrjYVJjERVOSVcho57pBwGQ1FSobXjLrs/OWJBYw0/78994xrwgYC7gxRziaseN7S mzxV+ANn5M8EUXX42OzNCpsYFu9CqNIhgNqFaI90yzioVwdUgQXtqDr4rGQNvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QFzvt4v6szVFS; Tue, 9 May 2023 13:46: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 349DkIEc049195; Tue, 9 May 2023 13:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349DkI41049193; Tue, 9 May 2023 13:46:18 GMT (envelope-from git) Date: Tue, 9 May 2023 13:46:18 GMT Message-Id: <202305091346.349DkI41049193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 469c325a49dc - main - libfido2: specify OpenSSL 1.1 API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 469c325a49dc5a522fed21e2ee8ff91e5c6e5c64 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=469c325a49dc5a522fed21e2ee8ff91e5c6e5c64 commit 469c325a49dc5a522fed21e2ee8ff91e5c6e5c64 Author: Ed Maste AuthorDate: 2023-05-09 12:44:23 +0000 Commit: Ed Maste CommitDate: 2023-05-09 13:46:09 +0000 libfido2: specify OpenSSL 1.1 API OPENSSL_API_COMPAT can be used to specify the OpenSSL API version in use for the purpose of hiding deprecated interfaces and enabling the appropriate deprecation notices. This change is a NFC while we're still using OpenSSL 1.1.1 but will avoid deprecation warnings upon the switch to OpenSSL 3.0. A future libfido2 update may switch to use OpenSSL 3.0 APIs. Sponsored by: The FreeBSD Foundation --- lib/libfido2/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libfido2/Makefile b/lib/libfido2/Makefile index a9e1c526d45d..86ac1153f384 100644 --- a/lib/libfido2/Makefile +++ b/lib/libfido2/Makefile @@ -64,6 +64,7 @@ CFLAGS+= -DHAVE_SYS_RANDOM_H CFLAGS+= -DHAVE_TIMESPECSUB CFLAGS+= -DHAVE_TIMINGSAFE_BCMP CFLAGS+= -DHAVE_UNISTD_H +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L CFLAGS+= -DTLS=__thread CFLAGS+= -D_FIDO_MAJOR=1 CFLAGS+= -D_FIDO_MINOR=10 From nobody Tue May 9 13:56:38 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG07w6Kwmz4BDDc; Tue, 9 May 2023 13:56:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG07w5mRDz3Ldw; Tue, 9 May 2023 13:56:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683640604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kb/tIDqFnIXrGBHAtaGBRGQXDT/4uNnbC3V2DKMZRWw=; b=N7HhxKkw904In8EiCipyiFQKxlCdhPwtJjxPjThdTkzh5PKBo8EXlWSKYCOAqPHufxV7Gb Zzo6hctiXpTSuODjy53gjXeA0CCc3HvyDgrj30+6SZd78r9yvjO8deUjje4WJp8lqzzGrw ZIVOlObRbgTg1IoCIt2hmRZM57GfBF9DGQKO7sAGEMRfFAhkM8x5N9iStr93VHtiCLqRiD PibSQLL+CUrYgm9GI4TuQfdPZeozECpqgmR2CtGLjXsC7qcVM/dH8jLApYUDsdAMKvseXx EgF1u6P3YFu2JjzGsOOseuVepkKmWHPxssMsKrbETh+1YFcr17EaJWmrfogOxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683640604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=kb/tIDqFnIXrGBHAtaGBRGQXDT/4uNnbC3V2DKMZRWw=; b=BZxmDxCevkU1mpsr+aVVs0mcWyKHnIBxcWgSwCwEYaHyvudvEntJ4i295rqoUXEF7cBvS1 HSwQSKbFoVtcIEKLz9B0qRRT8MSkN4c3KvHISdSVZzjcMPJPw7/TtvfZgt75Ho5/CZstRg 0Im8cTE+5IB3jl+rcnoDUMH2AprEqvOaa9xu128EYjZzk5rhJI8hNp4krNLM+HZds4guPF osK2pbxGJj70bLYolS2Ey1hHPfYDu4X0SeURSET3zmC+CLrkA884BW8oz6/h1q5IE1JEOh 6HBgiIVdUCrZKsB4Pgsi1HqgfAhh4NLeqABdShKnA18S5HFDou8oJb0iGKAJNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683640604; a=rsa-sha256; cv=none; b=qFeSOY71Y0TlgJ1EHLfh4fyzg+47NqbL8a8sXXUPdK+19b7MKgnnZ4eE05VitMqjbNQZsB k+rVSYIkUlQ3wpBZ63L+fjiBWfBzFvF99IMYlr3UjTsTmbG8WlOHlpLs7K5PGRQgCNOh/e 3ZrZyNotU8vZXVoxHLkJs1vew0YYaRP3mJ8Tyj/o2RClyCIlhH7sJ2bSGSNCU4LaUKkFNG 1BGJgSzo8Ech3t9KGhgl+MXjesZ7lM4yUEurIDpJgAUukDh+ymgiu+iwCQRKhUA8FeHm/t ALw1MTDNhk9FkjTO5g2N6Z2lLxEFvBTCcmag1C/OuQZPtcaYGHv3AyBs8Y4opA== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QG07w46MMzMJw; Tue, 9 May 2023 13:56:44 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 4C4318D4A156; Tue, 9 May 2023 13:56:42 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id A903B5C3A831; Tue, 9 May 2023 13:56:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id RflykyYN-AUI; Tue, 9 May 2023 13:56:39 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id AF2CB5C3A82F; Tue, 9 May 2023 13:56:39 +0000 (UTC) Date: Tue, 9 May 2023 13:56:38 +0000 (UTC) From: "Bjoern A. Zeeb" To: Emmanuel Vadot cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d198b8774d2c - main - fwget: Introduce new utility In-Reply-To: <202305010633.3416XRFq013077@gitrepo.freebsd.org> Message-ID: References: <202305010633.3416XRFq013077@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-ThisMailContainsUnwantedMimeParts: N On Mon, 1 May 2023, Emmanuel Vadot wrote: > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d198b8774d2cfb6f140893e1c6236af9e97d1497 > > commit d198b8774d2cfb6f140893e1c6236af9e97d1497 > Author: Emmanuel Vadot > AuthorDate: 2023-04-26 05:46:20 +0000 > Commit: Emmanuel Vadot > CommitDate: 2023-05-01 06:32:59 +0000 > > fwget: Introduce new utility > > This script's goal is to check the system for peripherals that needs > firmware and install the needed packages for them. > For now it only support pci subsystem and only video classes for AMD > and Intel GPUs. > > Reviewed by: bapt > Sponsored by: Beckhoff Automation GmbH & Co. KG > Differential Revision: https://reviews.freebsd.org/D39825 ... > diff --git a/usr.sbin/fwget/pci/pci_video_intel b/usr.sbin/fwget/pci/pci_video_intel > new file mode 100644 > index 000000000000..9a20abcdb17a > --- /dev/null > +++ b/usr.sbin/fwget/pci/pci_video_intel ... > +pci_video_intel() > +{ > + case "$1" in Based on % pkg search gpu-firmware-intel gpu-firmware-intel-kmod-alderlake-20230210_1 Firmware modules for alderlake Intel GPUs gpu-firmware-intel-kmod-broxton-20230210_1 Firmware modules for broxton Intel GPUs gpu-firmware-intel-kmod-cannonlake-20230210_1 Firmware modules for cannonlake Intel GPUs gpu-firmware-intel-kmod-dg1-20230210_1 Firmware modules for dg1 Intel GPUs gpu-firmware-intel-kmod-elkhartlake-20230210_1 Firmware modules for elkhartlake Intel GPUs gpu-firmware-intel-kmod-geminilake-20230210_1 Firmware modules for geminilake Intel GPUs gpu-firmware-intel-kmod-icelake-20230210_1 Firmware modules for icelake Intel GPUs gpu-firmware-intel-kmod-kabylake-20230210_1 Firmware modules for kabylake Intel GPUs gpu-firmware-intel-kmod-rocketlake-20230210_1 Firmware modules for rocketlake Intel GPUs gpu-firmware-intel-kmod-skylake-20230210_1 Firmware modules for skylake Intel GPUs gpu-firmware-intel-kmod-tigerlake-20230210_1 Firmware modules for tigerlake Intel GPUs I think a few of them are missing the "-kmod" miiddle bit: diff --git a/usr.sbin/fwget/pci/pci_video_intel b/usr.sbin/fwget/pci/pci_video_intel index 9a20abcdb17a..3d37a430c3d2 100644 --- a/usr.sbin/fwget/pci/pci_video_intel +++ b/usr.sbin/fwget/pci/pci_video_intel @@ -45,31 +45,31 @@ pci_video_intel() ;; # Cannonlake 0x5a*) - echo "gpu-firmware-intel-cannonlake" + echo "gpu-firmware-intel-kmod-cannonlake" ;; # Icelake 0x8a*) - echo "gpu-firmware-intel-icelake" + echo "gpu-firmware-intel-kmod-icelake" ;; # Elkhartlake/Jasperlake 0x45*|0x4e*) - echo "gpu-firmware-intel-elkhartlake" + echo "gpu-firmware-intel-kmod-elkhartlake" ;; # Tigerlake 0x9a*) - echo "gpu-firmware-intel-tigerlake" + echo "gpu-firmware-intel-kmod-tigerlake" ;; # Rocketlake (Uses tigerlake GuC/HuC firmware) 0x4c*) - echo "gpu-firmware-intel-rocketlake gpu-firmware-intel-tigerlake" + echo "gpu-firmware-intel-kmod-rocketlake gpu-firmware-intel-kmod-tigerlake" ;; # DG1 0x49*) - echo "gpu-firmware-intel-dg1" + echo "gpu-firmware-intel-kmod-dg1" ;; # Alderlake (Uses tigerlake GuC/HuC firmware) 0x46*) - echo "gpu-firmware-intel-alderlake gpu-firmware-intel-tigerlake" + echo "gpu-firmware-intel-kmod-alderlake gpu-firmware-intel-kmod-tigerlake" ;; *) log "No package found for device $1" -- Bjoern A. Zeeb r15:7 From nobody Tue May 9 14:04:23 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG0Jm1bkBz4BDx1; Tue, 9 May 2023 14:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG0Jm133pz3Pmd; Tue, 9 May 2023 14:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683641064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKk3MUdWT5sqwoEqkw/+E95cTQ3JcvDPUw9PFIzBzRc=; b=El1kKviy8orv/bIEoz004AQGAAyXB2NglwEeluRAY5GfGCWzVg+8mawPoVDvxjIoogLjyL A205bIX1HciGDzi4wKSX+n9iwlm1LyFMw4s6COFkPUvd0aWGh/0bLmdFpFJ6CD8YLDFZdD MZWr9WsLSRhMON7ZVr5VaJ6b+qL98EXt2LwRtWSpWSXc9uzWoABX4pZey0PUG3oyxH4sU1 Ghcdp8TO0nLo//JC0ZqDbiAh1DAdtlldaT8cgl7l6fiSaOENqeJJ9DLgL3Oezcq5lQjEui ReKdgXHm2oNtOlpUijOVgnEglQCpI+sNJtzO/uGS7M51LIgOQQLQCONDvtBhGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683641064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKk3MUdWT5sqwoEqkw/+E95cTQ3JcvDPUw9PFIzBzRc=; b=lJBiQYw72cHMHs+GruUiFzm5EGqro9L+u+R0p6/clu0ABgMRQLPRtP7moqq1khSkJXWpqB yge87fna0FhJcTcwjIfLU43DOQWYwGBgwGzOIlUbazPsYNqY179JViB6ReK52YRToN1CjX fGhFT0qxdyEnqR/SaW6jFxQq+i/qTvdLb8+qMAvu0WLgOZoVo6e9WzAOELLa7oUcBX/45D fVuuIQwr2PUHv8FIiYIb59IR9FJ/cmjHqbMIf8kkPPxzWCWmMk7XLBeBk7mugnQcTGtXPC egmRLClxmqqngt+/GDge3743/DXR0+rrx+l+le9ajlEGcKze10+KWgSxMfRQ2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683641064; a=rsa-sha256; cv=none; b=WnhebCmkaBq71zUkkwykzvJe+Q7uBzSD8DOrFhMea7XiXpW3jndjHNck6siDrTJqnEBBjE GXL8y5lXaJBs/hEFYgeVQNWp+i5LtFfmJBAuzyOYBBKut+fHsnuMOcpGv0jglST9ULp3Y9 ETRzphCTEa7bzxXsHCzp/TvuLDsGSIul9456ZN8vTrIfdbAyAG20n73JgNkSa8qQNo3O5Y zP+wmPkLKm6xGfUU9c7PvCw17UOIPzegz9J9CtkUqwpvWcJeT12iHIPSZRfQsVrkdvl/JL oAd0qBzbDMLnzFdBET1sXVZRuchf8pKRIMG5MLx1ZLclBzCotmmpuGt0+EX5OA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG0Jm06yFzWCx; Tue, 9 May 2023 14:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 349E4NUr083203; Tue, 9 May 2023 14:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E4Nq0083202; Tue, 9 May 2023 14:04:23 GMT (envelope-from git) Date: Tue, 9 May 2023 14:04:23 GMT Message-Id: <202305091404.349E4Nq0083202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: d7f39ec19fef - main - fwget: Fix a few kmod name List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7f39ec19fefb94fd8fd47608ec874c19f0fcb3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=d7f39ec19fefb94fd8fd47608ec874c19f0fcb3f commit d7f39ec19fefb94fd8fd47608ec874c19f0fcb3f Author: Emmanuel Vadot AuthorDate: 2023-05-09 14:02:03 +0000 Commit: Emmanuel Vadot CommitDate: 2023-05-09 14:02:03 +0000 fwget: Fix a few kmod name The -kmod part was forgot in a few names for Intel firmware. Fixes: d198b8774d2c ("fwget: Introduce new utility") Reported by: bz Sponsored by: Beckhoff Automation GmbH & Co. KG --- usr.sbin/fwget/pci/pci_video_intel | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/usr.sbin/fwget/pci/pci_video_intel b/usr.sbin/fwget/pci/pci_video_intel index 9a20abcdb17a..3d37a430c3d2 100644 --- a/usr.sbin/fwget/pci/pci_video_intel +++ b/usr.sbin/fwget/pci/pci_video_intel @@ -45,31 +45,31 @@ pci_video_intel() ;; # Cannonlake 0x5a*) - echo "gpu-firmware-intel-cannonlake" + echo "gpu-firmware-intel-kmod-cannonlake" ;; # Icelake 0x8a*) - echo "gpu-firmware-intel-icelake" + echo "gpu-firmware-intel-kmod-icelake" ;; # Elkhartlake/Jasperlake 0x45*|0x4e*) - echo "gpu-firmware-intel-elkhartlake" + echo "gpu-firmware-intel-kmod-elkhartlake" ;; # Tigerlake 0x9a*) - echo "gpu-firmware-intel-tigerlake" + echo "gpu-firmware-intel-kmod-tigerlake" ;; # Rocketlake (Uses tigerlake GuC/HuC firmware) 0x4c*) - echo "gpu-firmware-intel-rocketlake gpu-firmware-intel-tigerlake" + echo "gpu-firmware-intel-kmod-rocketlake gpu-firmware-intel-kmod-tigerlake" ;; # DG1 0x49*) - echo "gpu-firmware-intel-dg1" + echo "gpu-firmware-intel-kmod-dg1" ;; # Alderlake (Uses tigerlake GuC/HuC firmware) 0x46*) - echo "gpu-firmware-intel-alderlake gpu-firmware-intel-tigerlake" + echo "gpu-firmware-intel-kmod-alderlake gpu-firmware-intel-kmod-tigerlake" ;; *) log "No package found for device $1" From nobody Tue May 9 14:04:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG0Jn4fFyz4BF2M; Tue, 9 May 2023 14:04: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 4QG0Jn28hjz3Q2k; Tue, 9 May 2023 14:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683641065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CeqCBcVddL0aKnJGC4LtQplxbLe3T4nKxgKRuhXD4Xk=; b=JI4YkPNiCLmZEyu/KlPNlD6H1xIWf82oo+M7kn2V6/+mIlZR3oIFpxMPK5Q25NmyYKm6e7 U7sJBsdulunyHqZMn3HMiJR6aqqUSa011hB/JQ7dzkn5hQGQSQ272ZXk7MFCozYNmOkMun LUSiq7mg76xIaP6rrvjp0ihg3j+lNfIYY1ZUhsIFUrBuIa3WeibKX0ndZnADxRcVW6CuzB 4wZUekf2NPWHSdBT7TdTzGiXCWj8VMwXN05nJ3Npvp9y/iGeKp3v/fKGdAJX7wGezJY/mo kKwaDz2oulSqC0hLFvm4cdOU7RDz3WNuv/fiCnmexOaa/ivX5coK7k74Bn6ykQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683641065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CeqCBcVddL0aKnJGC4LtQplxbLe3T4nKxgKRuhXD4Xk=; b=Zbiw3FXrkCJZTgll7Dpezfp0VAnKf3iYNcQLqBPekeBhqJjSG0zExlzY9dme0i7Nrei9oF S7XAJjZcxcJrBG0ivOOcE5n1DwIHhGplaCF/ERpxQZbsGaJSMUlYZiMPZ+Dd2R6qeTCL+k wzIJTPby7+DlPbzowy4CRO8u5HGmcB1cIXx9CGPCiKYMoaz58jPTeNJ9ZsLhrJHizKgNPG 5vKYopwthkepu4MpWGPDbomljE5VgQyOytbGjrRg/hMnOu8qUai2clGpAZKP2e7KN/NQq6 can+juU9jztf4Uqf9MpkU4RaZHME/e7Al1dv/7dbiJ5yC0KOB0YMvLtsgoBFcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683641065; a=rsa-sha256; cv=none; b=TOvwa0FOsHccukBYQQKYV3qWF1BI0/NowDN3nznMWOSKmfx6iU/3SYdj6gRKeG/hrIhmvp J2CAeWz1n0W2IT1sVIwU3hH2VDPWU9tbXdOw1J04PmTNW5Q/wGlbCD9Tqk8nMHLD3Ff7Gx 0os9E3ckz3bJTOwaVhjyDYcmP9PTVptHbT86x1lF86ZJK340u2sGr2jpkH8UUB0NeAzHbK ZgdohjOXSFw5rSXeJ87PEPPXs4H1V28UFKeHgqDMvw0o0fWQ6Ow5IYG05zWfrUBgAsBcdc jlY2onB9Zm+nIKD/2q3hphvK74QvSKC/xLoxz3fLXOgP+tZOEvQSreB4uUltvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG0Jn12sLzWXp; Tue, 9 May 2023 14:04:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 349E4PnX083222; Tue, 9 May 2023 14:04:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349E4PvU083221; Tue, 9 May 2023 14:04:25 GMT (envelope-from git) Date: Tue, 9 May 2023 14:04:25 GMT Message-Id: <202305091404.349E4PvU083221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 611503c64aed - main - fwget: Use BSD-2-Clause instead of BSD-2-Clause-FreeBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 611503c64aedc3876682237a42e3fdaab7f382d5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=611503c64aedc3876682237a42e3fdaab7f382d5 commit 611503c64aedc3876682237a42e3fdaab7f382d5 Author: Emmanuel Vadot AuthorDate: 2023-05-09 14:03:39 +0000 Commit: Emmanuel Vadot CommitDate: 2023-05-09 14:03:39 +0000 fwget: Use BSD-2-Clause instead of BSD-2-Clause-FreeBSD Reported by: bz Sponsored by: Beckhoff Automation GmbH & Co. KG --- usr.sbin/fwget/fwget.sh | 2 +- usr.sbin/fwget/pci/pci | 2 +- usr.sbin/fwget/pci/pci_video_amd | 2 +- usr.sbin/fwget/pci/pci_video_intel | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.sbin/fwget/fwget.sh b/usr.sbin/fwget/fwget.sh index cd5ee7a7048c..63ed020a437c 100644 --- a/usr.sbin/fwget/fwget.sh +++ b/usr.sbin/fwget/fwget.sh @@ -1,7 +1,7 @@ #!/bin/sh #- -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Beckhoff Automation GmbH & Co. KG # diff --git a/usr.sbin/fwget/pci/pci b/usr.sbin/fwget/pci/pci index f97cb97d16fe..b30aae4fadb8 100644 --- a/usr.sbin/fwget/pci/pci +++ b/usr.sbin/fwget/pci/pci @@ -1,5 +1,5 @@ #- -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Beckhoff Automation GmbH & Co. KG # diff --git a/usr.sbin/fwget/pci/pci_video_amd b/usr.sbin/fwget/pci/pci_video_amd index 79f79d4958db..4afb44ed787e 100644 --- a/usr.sbin/fwget/pci/pci_video_amd +++ b/usr.sbin/fwget/pci/pci_video_amd @@ -1,5 +1,5 @@ #- -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Beckhoff Automation GmbH & Co. KG # diff --git a/usr.sbin/fwget/pci/pci_video_intel b/usr.sbin/fwget/pci/pci_video_intel index 3d37a430c3d2..8dc8b9aee2bd 100644 --- a/usr.sbin/fwget/pci/pci_video_intel +++ b/usr.sbin/fwget/pci/pci_video_intel @@ -1,5 +1,5 @@ #- -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Beckhoff Automation GmbH & Co. KG # From nobody Tue May 9 14:25:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG0n74SPgz4BFQN; Tue, 9 May 2023 14:25: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 4QG0n72XX2z3hmv; Tue, 9 May 2023 14:25:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683642331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZY+o6yRhWdG6cM6X7ValPn/9uRy3sDiXEUO6F9FKtmw=; b=kN4y/0OwbBiPuTCmVKKHdrC4SpyR8YT7Rbco7Uq3Nt4uUIxENWp4z+fhULvcDp84ezHzLB QdFwZM1BIO5r1rZD6EW3Zr3rF9Ktb/I0G3F51VVCt6ro1brhX6frkzELnRMkoRngzJwDFV 0LLBNOgYNEYdXkw3YkGzvBtnjeJq0GKE47FR6xxQlljaQ5tc1AhztlyMJgtuW+dlB199s9 pNTwOo4qldaV/f/1MxJFMZuQBw0J26LTnyDEAXwaurq2bbIU/cjCxO66L557garqyILoJz A786u6FC7jwbAXF/RICiG7BWWauiizEmItIUKieV0WraYc0HMNdcXo4uCFfUGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683642331; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZY+o6yRhWdG6cM6X7ValPn/9uRy3sDiXEUO6F9FKtmw=; b=h6Xpc9NShoiMC1sDv46DaGEleHfDqoJcXGQUPzFYWdEJwwKKA3I7i66KTVGXcZPwl0i1s6 ZiYfF7DBZKTqLGTssaFtq9R+R25d7unIyS7PtuKTirswAZVlO+vOirAtjRiIZk2SMctzNm i+bHXO9ISI+q19E/qgRDlelGqw6TL8pbJetJcBUERXaygqbeJ4n3n5Aht5Exq78B/VKTqA rguGnUrpJKkN2iMdtI1MO0KenCq/h4QSsW9JxarjWMHRY9P100f/HNYxiaaovPx5shD1WC bw3h/4zGhGeXFIMqpaGtsT3cYaFe2UF8YNFEN6JeUQvxwvzkeYlsiW1uw562OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683642331; a=rsa-sha256; cv=none; b=LVQDNL3GmxZ46Mj0X+FpOItKKS1ggN/4aBFkEj9+S9zaKIYod6A01sNg/dXuM8pRwoiwYv wuZ4Q60pC1j3FysgjsaMkW0/6nqobRjfUDpDIfw94HSOM/ldYbCjQy5iG4PlztptS0Lkzx po8q4yCfTQMLUGMg8N9wJcIUbhKKP8TDNL3WgK99xZgs7vGqUQklsBJUVJWO1OL+i8Dn3I QAI8tQmn4v8G1svBF3JZOClwR8zKZjBEuirrcnhbd7RlxDIUkyn6ZTdGeMotUmZ9CuAMyf n+fjSYMbbPBrQRi+FHeNO7yg8tbLJc0jk309nIjLtyq0RXKZ2DLK88aQ+ZLhlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG0n71cg9zW2x; Tue, 9 May 2023 14:25: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 349EPVsx015374; Tue, 9 May 2023 14:25:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349EPVW3015373; Tue, 9 May 2023 14:25:31 GMT (envelope-from git) Date: Tue, 9 May 2023 14:25:31 GMT Message-Id: <202305091425.349EPVW3015373@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 794f5122bb0c - main - geom.8: Fix typos and wordsmith List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 794f5122bb0c9bad1c3dfedbf373a728b6689297 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=794f5122bb0c9bad1c3dfedbf373a728b6689297 commit 794f5122bb0c9bad1c3dfedbf373a728b6689297 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-05-09 13:46:00 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-05-09 14:20:13 +0000 geom.8: Fix typos and wordsmith MFC after: 3 days --- sbin/geom/core/geom.8 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sbin/geom/core/geom.8 b/sbin/geom/core/geom.8 index 199055de76a6..a38a436ed57f 100644 --- a/sbin/geom/core/geom.8 +++ b/sbin/geom/core/geom.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 12, 2022 +.Dd May 9, 2023 .Dt GEOM 8 .Os .Sh NAME @@ -127,8 +127,9 @@ When a class-specific shared library exists, a direct utility should also be available under the name of .Nm g Ns Ar class . .Pp -Currently available classes which are aware of -.Nm : +Currently, classes aware of +.Nm +are: .Pp .Bl -bullet -offset indent -compact .It @@ -184,7 +185,10 @@ The following example shows how to set up a stripe on three disks for automatic configuration: .Bd -literal -offset indent geom stripe label -v -s 65536 data /dev/da0 /dev/da1 /dev/da2 +.Ed +.Pp or: +.Bd -literal -offset indent gstripe label -v -s 65536 data /dev/da0 /dev/da1 /dev/da2 .Ed .Pp From nobody Tue May 9 14:33:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG0yX0Ng9z4BGD7; Tue, 9 May 2023 14:33:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG0yW71lFz3jcD; Tue, 9 May 2023 14:33:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683642820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qhNzNLL7fOIZ4DFXe6fhjx0o8bpC8uydtHaHZohV1jY=; b=P4q3XGcUnKTyBSfvnx44xXNuWurXBSoxknwKCvw78Z1oovY4gNBCPdGYGWp8HDGuQBZ7Sv zPX3Rgpwi3VAK0t0jXrPB5z8kS0pgzrs0Mvp0oPXZpGZoZBNSRhxyztpB/oebsjfrrnovo CAERP7BP3X9JSCXmbRulW36u/5Fmbus7zMOlpDu6Wd8/E1q101tbkCfB5XuV8nJfHBM9oo NypsbC0+x9632qfCKsK5Eq+e9EcHzzNG+b/aGZqYSgqx83cr2OcyNzBtvwrqxh/M/25kdy nbhde3rWFohcXZ215bE99EghOeCQo5OZvR8bCL92vbpvbNkmN6unnz/7DrtiGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683642820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qhNzNLL7fOIZ4DFXe6fhjx0o8bpC8uydtHaHZohV1jY=; b=N6F454DN0w68GpvY2LdsVQXI7SaS5jGQE48Ot8RCbbb8TLE/cswrIghFWmHbh8sV7HYw5k +N6dat6XlZZ90/ynSne5WYFtkIXFo4og4IJmCr0OBwOJ3Z819+e+GozROafHdxP2k0w+AY jZmeM3iTLy9JgRqF7bUgOLUVi3HyR+tXqrRavyM4hR19ziVOZB94b49uYUoRaXPNitshaJ NPAAFOzI+IaDk/li9aXM1hWABrLlCjazCByjkRPeyNTgy0XBjRlGOraACKv+hRGgb7eFiJ rnXnLXHYItMDOqWXoeUReckeqz+Nz/TZdETMjHeXjTLlaSD2de0varksosDJBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683642820; a=rsa-sha256; cv=none; b=rDP/2uWcPKkOEP457P0rslmNyFNfGsOgcEO9V6eg8ltNdGChTlsdEv7uYJMVejiRYeS8la UjuJc3ZuYEdDewOxe6qMB+UO6C7ughSqpZAvNoQIVIXUb5mlBk1bmqwNMgijjJyYTaPfQx DZ42soh1wK8MaZhh25AyvBPeokZHN5fFiMWphOrqqOCh7IjmVXbHGuXyrDEZPgVcGY0xf0 KQjAUhBQuoeP09JbXRcrzbe4+epMm51TsqdnNvTh9ML4W1o5VsKyasb3fsT+5tSebsnmuh iz1Z2eUKT/Rqv29sS4xwGq5H/x9W6q0Uqc8ASs0/ytbOkWrDyKpB+UGEVlDoQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG0yW66jDzXDd; Tue, 9 May 2023 14:33: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 349EXdK3032465; Tue, 9 May 2023 14:33:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349EXdwi032464; Tue, 9 May 2023 14:33:39 GMT (envelope-from git) Date: Tue, 9 May 2023 14:33:39 GMT Message-Id: <202305091433.349EXdwi032464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: de9bed030f47 - main - efiwake(8): add man page List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de9bed030f4726a1bed062fcc5453ff4c74f0047 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=de9bed030f4726a1bed062fcc5453ff4c74f0047 commit de9bed030f4726a1bed062fcc5453ff4c74f0047 Author: Johannes Totz AuthorDate: 2023-05-09 13:42:19 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 14:33:18 +0000 efiwake(8): add man page Reviewed by: christos, grahamperrin, kib Differential revision: https://reviews.freebsd.org/D39961 --- usr.sbin/efiwake/Makefile | 2 +- usr.sbin/efiwake/efiwake.8 | 99 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/usr.sbin/efiwake/Makefile b/usr.sbin/efiwake/Makefile index ed2292f8a3ac..ff7c8c0f57e4 100644 --- a/usr.sbin/efiwake/Makefile +++ b/usr.sbin/efiwake/Makefile @@ -3,7 +3,7 @@ PACKAGE= efi-tools PROG= efiwake -MAN= +MAN= efiwake.8 SRCS= efiwake.c diff --git a/usr.sbin/efiwake/efiwake.8 b/usr.sbin/efiwake/efiwake.8 new file mode 100644 index 000000000000..10ebc68a9d33 --- /dev/null +++ b/usr.sbin/efiwake/efiwake.8 @@ -0,0 +1,99 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" +.\" Copyright (c) 2023 Johannes Totz +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd May 9, 2023 +.Dt EFIWAKE 8 +.Os +.Sh NAME +.Nm efiwake +.Nd manipulate the EFI wake timer +.Sh SYNOPSIS +.Nm +.Nm +.Fl d +.Nm +.Fl e Ar yyyy-mm-ddThh:mm:ss +.Sh DESCRIPTION +.Nm +reports the current value of, disables or enables the EFI wake timer that can +wake your machine from S3 sleep at a given time. +.Pp +If invoked without arguments, the current EFI time and the current value of the +wake timer will be printed, followed by an +.Em enabled +status and a +.Em pending +status. +EFI time is supposed to be in UTC. +Note that it can be out of sync with kernel time. +The pending status tells whether the wake timer fired recently; it is cleared +upon reading. +.Pp +If invoked with the +.Sy -d +option, the wake timer is reset and disabled. +.Pp +If invoked with the +.Sy -e +option, the wake timer is set to the given time and date. +If the date or time is invalid, an error is returned. +.Pp +The current EFI time is always printed. +.Sh EXAMPLES +Without arguments: +.Bd -literal -offset indent +# efiwake +Current EFI time: 2023-05-04T15:30:45 +EFI wake time: 2023-05-04T10:00:00; enabled=0, pending=1 +.Ed +.Pp +Disabling and resetting the wake timer: +.Bd -literal -offset indent +# efiwake -d +Current EFI time: 2023-05-04T15:32:16 +EFI wake time: 2023-05-04T15:32:16; enabled=0, pending=0 +.Ed +.Pp +Enabling the wake timer with a valid date: +.Bd -literal -offset indent +# efiwake -e 2023-05-04T15:35:00 +Current EFI time: 2023-05-04T15:34:05 +EFI wake time: 2023-05-04T15:35:00; enabled=1, pending=0 +.Ed +.Pp +Trying to enable with an invalid date (there is no 31st of April): +.Bd -literal -offset indent +# efiwake -e 2023-04-31T15:35:00 +Current EFI time: 2023-05-04T15:35:25 +efiwake: cannot enable EFI wake time: Invalid argument +.Ed +.Sh AUTHORS +.An -nosplit +The tool and manual page were written by +.An Johannes Totz Aq Mt jo@bruelltuete.com . +.Sh BUGS +The quality of EFI implementations differs widely. +Corruption of the wake-up date has been observed on real hardware. From nobody Tue May 9 15:00:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG1Y72HF5z4BHnQ; Tue, 9 May 2023 15:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG1Y71mHqz3mR6; Tue, 9 May 2023 15:00:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683644411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9cgohhpbANKuViVa7abQ0CCOmlbgMWvPdfY0anmDP6c=; b=Pf+azUJAxSB6XdgCHeNkUV7Do2TRHgLDMoGlpcbntNYc6s5+6dk+nRvrSwVFdelERhhmaH O5dwQoTwqrF92SIp1xkDmZcDwP3Qalff+wcxqLZ176AEGtGbvmJAjCIPW3BxyZNWQIJ1fe 1iSFlhLwAalytF7rLzgaA6A4l1hLRufqCx8tBvlbjFExz3GaN4T82Atv2Ey/LAi5Q4Zw/O XEuwHdZ2adMARbdvw4g7QtloJFRZdAwga5G9KHLixyf0KEHmNHA7N/5t615zEzf55IqUPc KDWHEAhNZYDvPuW02I0aXFpOKnAC6w/V5yYiDf6JB8X333uOrbGTtl0qGI1QjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683644411; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9cgohhpbANKuViVa7abQ0CCOmlbgMWvPdfY0anmDP6c=; b=NoLc0tV2qWzPsdBIrCt0i+iPY9+nZLht80bx+hhWonb6hk05NrNU+NTXomUU1VLy2RrS4e YSgnd4h5KOvKb9Lref+7gh86/5mRVqP2KDUKrt0M0/9nB4WX+KciqOco7h6mNyqv8BQcN7 WPTozVkvscym9LVvHNv2p/98G+bvB8l8Wo5ekElwzgQ75Ynm9lXX11duyCfXttGdHNASOu kXiEO26o+FJ0jk3lwIzOErQT6lD07x1wLFTlD+sWtee74AVz3EU7LbcdqtBg3UQATMp/qp JYWzp0JqnA2Sg8D6U78yRM/F9+N3yXi6xSIb47tUtHLJt8lCY1J0IWEOqMcACg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683644411; a=rsa-sha256; cv=none; b=oFGR2R0CHpusdX6TrFCRLbmMeyP4Jt5A2mgwnI1P6+crbcUeCiinWiZctkFEU4aWDcEeIH 5NqNltjeO1Fk6Re13dwtx9Pz4lO9oksA7fR27dK2ppDTtvqKWzLynQV9lF2HOd/BI6UO3R Kv/HtnJ2J+VkOHc117VZItSKfXek/ARbZy/41pZZhzD7mGpJq4dmndvbE/qxlmrPrFAocF K/TrR6LqNFi4uIrl5XuGF64ZYHxXIP81uU7Q9bgiQUjtEYDNMZMeK6xYTDzePYaychHRVc A8ShYtf0wc52mJQZkP5ql/F3trMLPaxokoTNNLxkAznS5tToVYamyxVp+Oy4lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG1Y70s2lzXDB; Tue, 9 May 2023 15:00: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 349F0BBs070674; Tue, 9 May 2023 15:00:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349F0BY5070665; Tue, 9 May 2023 15:00:11 GMT (envelope-from git) Date: Tue, 9 May 2023 15:00:11 GMT Message-Id: <202305091500.349F0BY5070665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: ba9c815d3076 - main - netlink: use consistent variable lifetime in the default snl(3) parsers. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba9c815d3076f5a13ab6f9ec3f6d534e7774e83b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=ba9c815d3076f5a13ab6f9ec3f6d534e7774e83b commit ba9c815d3076f5a13ab6f9ec3f6d534e7774e83b Author: Alexander V. Chernikov AuthorDate: 2023-05-09 14:45:57 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-09 14:45:57 +0000 netlink: use consistent variable lifetime in the default snl(3) parsers. Currently, parsers use original strings/nla pointers instead of duplicating them. These pointers refer to the temporary packet buffer, which can be silently rewritten when the next message is read. Instead, duplicate all string/nla attributes using snl_allocz(3) to give control over variable lifetime to the user. MFC after: 2 weeks --- sys/netlink/netlink_snl.h | 45 +++++++++++++++++++++++++++++++++ sys/netlink/netlink_snl_route_parsers.h | 16 ++++++------ 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 822cec9b4dc4..83892c156273 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -606,6 +606,23 @@ snl_attr_copy_string(struct snl_state *ss, struct nlattr *nla, return (false); } +static inline bool +snl_attr_dup_string(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) +{ + size_t maxlen = NLA_DATA_LEN(nla); + + if (strnlen((char *)NLA_DATA(nla), maxlen) < maxlen) { + char *buf = snl_allocz(ss, maxlen); + if (buf == NULL) + return (false); + memcpy(buf, NLA_DATA(nla), maxlen); + *((char **)target) = buf; + return (true); + } + return (false); +} + static inline bool snl_attr_get_nested(struct snl_state *ss, struct nlattr *nla, const void *arg, void *target) { @@ -623,6 +640,20 @@ snl_attr_get_nla(struct snl_state *ss __unused, struct nlattr *nla, return (true); } +static inline bool +snl_attr_dup_nla(struct snl_state *ss __unused, struct nlattr *nla, + const void *arg __unused, void *target) +{ + void *ptr = snl_allocz(ss, nla->nla_len); + + if (ptr != NULL) { + memcpy(ptr, nla, nla->nla_len); + *((void **)target) = ptr; + return (true); + } + return (false); +} + static inline bool snl_attr_copy_struct(struct snl_state *ss, struct nlattr *nla, const void *arg __unused, void *target) @@ -637,6 +668,20 @@ snl_attr_copy_struct(struct snl_state *ss, struct nlattr *nla, return (false); } +static inline bool +snl_attr_dup_struct(struct snl_state *ss, struct nlattr *nla, + const void *arg __unused, void *target) +{ + void *ptr = snl_allocz(ss, NLA_DATA_LEN(nla)); + + if (ptr != NULL) { + memcpy(ptr, NLA_DATA(nla), NLA_DATA_LEN(nla)); + *((void **)target) = ptr; + return (true); + } + return (false); +} + static inline void snl_field_get_uint8(struct snl_state *ss __unused, void *src, void *target) { diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index 94dc20861c3f..1afbe3feeeb9 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -177,13 +177,13 @@ struct snl_parsed_link { #define _IN(_field) offsetof(struct ifinfomsg, _field) #define _OUT(_field) offsetof(struct snl_parsed_link, _field) static const struct snl_attr_parser _nla_p_link[] = { - { .type = IFLA_ADDRESS, .off = _OUT(ifla_address), .cb = snl_attr_get_nla }, - { .type = IFLA_BROADCAST, .off = _OUT(ifla_broadcast), .cb = snl_attr_get_nla }, - { .type = IFLA_IFNAME, .off = _OUT(ifla_ifname), .cb = snl_attr_get_string }, + { .type = IFLA_ADDRESS, .off = _OUT(ifla_address), .cb = snl_attr_dup_nla }, + { .type = IFLA_BROADCAST, .off = _OUT(ifla_broadcast), .cb = snl_attr_dup_nla }, + { .type = IFLA_IFNAME, .off = _OUT(ifla_ifname), .cb = snl_attr_dup_string }, { .type = IFLA_MTU, .off = _OUT(ifla_mtu), .cb = snl_attr_get_uint32 }, { .type = IFLA_OPERSTATE, .off = _OUT(ifla_operstate), .cb = snl_attr_get_uint8 }, - { .type = IFLA_IFALIAS, .off = _OUT(ifla_ifalias), .cb = snl_attr_get_string }, - { .type = IFLA_STATS64, .off = _OUT(ifla_stats64), .cb = snl_attr_copy_struct }, + { .type = IFLA_IFALIAS, .off = _OUT(ifla_ifalias), .cb = snl_attr_dup_string }, + { .type = IFLA_STATS64, .off = _OUT(ifla_stats64), .cb = snl_attr_dup_struct }, { .type = IFLA_PROMISCUITY, .off = _OUT(ifla_promiscuity), .cb = snl_attr_get_uint32 }, { .type = IFLA_CARRIER, .off = _OUT(ifla_carrier), .cb = snl_attr_get_uint8 }, }; @@ -208,7 +208,7 @@ struct snl_parsed_link_simple { #define _IN(_field) offsetof(struct ifinfomsg, _field) #define _OUT(_field) offsetof(struct snl_parsed_link_simple, _field) static struct snl_attr_parser _nla_p_link_s[] = { - { .type = IFLA_IFNAME, .off = _OUT(ifla_ifname), .cb = snl_attr_get_string }, + { .type = IFLA_IFNAME, .off = _OUT(ifla_ifname), .cb = snl_attr_dup_string }, { .type = IFLA_MTU, .off = _OUT(ifla_mtu), .cb = snl_attr_get_uint32 }, }; static struct snl_field_parser _fp_p_link_s[] = { @@ -240,7 +240,7 @@ SNL_DECLARE_ATTR_PARSER(_neigh_fbsd_parser, _nla_p_neigh_fbsd); static struct snl_attr_parser _nla_p_neigh_s[] = { { .type = NDA_DST, .off = _OUT(nda_dst), .cb = snl_attr_get_ip }, - { .type = NDA_LLADDR , .off = _OUT(nda_lladdr), .cb = snl_attr_get_nla }, + { .type = NDA_LLADDR , .off = _OUT(nda_lladdr), .cb = snl_attr_dup_nla }, { .type = NDA_PROBES, .off = _OUT(nda_probes), .cb = snl_attr_get_uint32 }, { .type = NDA_IFINDEX, .off = _OUT(nda_ifindex), .cb = snl_attr_get_uint32 }, { .type = NDA_FREEBSD, .arg = &_neigh_fbsd_parser, .cb = snl_attr_get_nested }, @@ -270,7 +270,7 @@ struct snl_parsed_addr { static struct snl_attr_parser _nla_p_addr_s[] = { { .type = IFA_ADDRESS, .off = _OUT(ifa_address), .cb = snl_attr_get_ip }, { .type = IFA_LOCAL, .off = _OUT(ifa_local), .cb = snl_attr_get_ip }, - { .type = IFA_LABEL, .off = _OUT(ifa_label), .cb = snl_attr_get_string }, + { .type = IFA_LABEL, .off = _OUT(ifa_label), .cb = snl_attr_dup_string }, { .type = IFA_BROADCAST, .off = _OUT(ifa_broadcast), .cb = snl_attr_get_ip }, }; static struct snl_field_parser _fp_p_addr_s[] = { From nobody Tue May 9 15:00:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG1Y855Wzz4BHZG; Tue, 9 May 2023 15:00: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 4QG1Y82djLz3mDJ; Tue, 9 May 2023 15:00:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683644412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZkLIyODHBCbYuSBaNz153+PCriI7Cjiv2GCq0X3AxY=; b=QTbiOwPIJ5s8PTnMyyt20eBCXM34zEI0OAeITQxlEMqGYLONlXtZKR5NVnkB9Z2T0r3esi gYFEscNJBbvrROx3SoqOADRDU0u/5dcrORIEjUC8sRmfazq/PirKbpQUL1rInct3WD8spi QnwjLzu1T7bfoEgZLk0zVdOHRBv/dx+qAxRFv9yC+G3eCzx0nlii/ygmtf3fnQNIXYWa2i wVbVyazDLEAK5JB1x/Iam+xj33g0anoAXXcvgggvpjzw1YM75eJazPcHMqWqCfqt1gXwy8 Hley3wSld0mQfwOz9LlB6oF37avzQ02a+I9kq7ELW9seGpuN49ACQWcwuKnlzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683644412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gZkLIyODHBCbYuSBaNz153+PCriI7Cjiv2GCq0X3AxY=; b=f7VhADGHmMbfjy8rWx2YG9Al8Z5/0KqOa0qrjWRQvIzV+sJqQBpKSzHJqa9cu/N5g7Emo4 Pmjleu37X5mbEIA5kpr5HeGNdO7wIaq+ICQXNPmM1EhxcuvuJGeqzEY0StxFpZxbSPKYfI L5KX0B531wHP69Sw2Bd/d82noNPm4MuQKV4qQyBI3NiEasz5o8Q61VZ8SkDVrGgf0+/hwL VTidIh/3nnozbhZ4rjViHhgm6XJVcHWFmc9Cjrs65A2KZprOU6I8xaVjoYeYFHDYyk2qy1 NgZheVHeNhiEut06rFwPOX2AxKE1rsqbeIPfZEvqe+DFssBZFLauS2uPr6WCwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683644412; a=rsa-sha256; cv=none; b=hisyMpIT6UjnFBb8GwwbdR1ATRwl6VraorL106XXBF8pFkNIgrYlyUC6lPNBcePTXXx/Fw Md7uZhpAqMOtdkWl38H2Wenl/0ZXXXi32qJUV5ET/nz5kTJzlCW21cqiP3m4BGD+ultmSb 2lQdVNNLo9WnLiQiOLa8qoBcsOMXssp8sgPfIT3+NzxcAqUQFwuEgrhKrzl+ri8YFU5ryr Y72bPu3q+nY/r/gllFaZOZuYE/ysi1J9T+gpHFwICV3FgDsx1JzHNaojOBT46rPgtSBiWf +FMwEPj5nQyQpa9RRg+uIoJIwMbewn1rDfcOw84dhQ7iwFbh7PK8S1/j9kptig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG1Y81gqmzXDC; Tue, 9 May 2023 15:00: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 349F0CJb071336; Tue, 9 May 2023 15:00:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349F0CvC071330; Tue, 9 May 2023 15:00:12 GMT (envelope-from git) Date: Tue, 9 May 2023 15:00:12 GMT Message-Id: <202305091500.349F0CvC071330@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 88bd9ef618d6 - main - netlink: automatically fill sin6_scope_id in the default snl(3) parsers. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88bd9ef618d62171fa9e192f2c3c91e9becdc555 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=88bd9ef618d62171fa9e192f2c3c91e9becdc555 commit 88bd9ef618d62171fa9e192f2c3c91e9becdc555 Author: Alexander V. Chernikov AuthorDate: 2023-05-09 14:55:47 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-09 14:55:47 +0000 netlink: automatically fill sin6_scope_id in the default snl(3) parsers. Add the optional post-parse hook to the snl(3) parser declaration. Use this hook to automatically add the interface indexes to the link-local sockaddrs. MFC after: 2 weeks --- sys/netlink/netlink_snl.h | 12 +++++- sys/netlink/netlink_snl_route_parsers.h | 73 +++++++++++++++++++++++++++++---- 2 files changed, 76 insertions(+), 9 deletions(-) diff --git a/sys/netlink/netlink_snl.h b/sys/netlink/netlink_snl.h index 83892c156273..1bf8a9cf07c8 100644 --- a/sys/netlink/netlink_snl.h +++ b/sys/netlink/netlink_snl.h @@ -146,23 +146,30 @@ struct snl_attr_parser { }; }; +typedef bool snl_parse_post_f(struct snl_state *ss, void *target); + struct snl_hdr_parser { int hdr_off; /* aligned header size */ int fp_size; int np_size; const struct snl_field_parser *fp; /* array of header field parsers */ const struct snl_attr_parser *np; /* array of attribute parsers */ + snl_parse_post_f *cb_post; /* post-parse callback */ }; -#define SNL_DECLARE_PARSER(_name, _t, _fp, _np) \ +#define SNL_DECLARE_PARSER_EXT(_name, _t, _fp, _np, _cb) \ static const struct snl_hdr_parser _name = { \ .hdr_off = sizeof(_t), \ .fp = &((_fp)[0]), \ .np = &((_np)[0]), \ .fp_size = NL_ARRAY_LEN(_fp), \ .np_size = NL_ARRAY_LEN(_np), \ + .cb_post = _cb, \ } +#define SNL_DECLARE_PARSER(_name, _t, _fp, _np) \ + SNL_DECLARE_PARSER_EXT(_name, _t, _fp, _np, NULL) + #define SNL_DECLARE_ATTR_PARSER(_name, _np) \ static const struct snl_hdr_parser _name = { \ .np = &((_np)[0]), \ @@ -471,6 +478,9 @@ snl_parse_header(struct snl_state *ss, void *hdr, int len, bool result = snl_parse_attrs_raw(ss, nla_head, len - parser->hdr_off, parser->np, parser->np_size, target); + if (result && parser->cb_post != NULL) + result = parser->cb_post(ss, target); + return (result); } diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index 1afbe3feeeb9..6332f9f9e0d9 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -33,6 +33,17 @@ /* TODO: this file should be generated automatically */ +static inline void +finalize_sockaddr(struct sockaddr *sa, uint32_t ifindex) +{ + if (sa != NULL && sa->sa_family == AF_INET6) { + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; + + if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) + sin6->sin6_scope_id = ifindex; + } +} + /* RTM_ROUTE message parser */ struct rta_mpath_nh { @@ -63,9 +74,18 @@ static const struct snl_field_parser _fp_p_mp_nh[] = { { .off_in = _IN(rtnh_hops), .off_out = _OUT(rtnh_weight), .cb = snl_field_get_uint8 }, { .off_in = _IN(rtnh_ifindex), .off_out = _OUT(ifindex), .cb = snl_field_get_uint32 }, }; + +static inline bool +_cb_p_mp_nh(struct snl_state *ss, void *_target) +{ + struct rta_mpath_nh *target = _target; + + finalize_sockaddr(target->gw, target->ifindex); + return (true); +} #undef _IN #undef _OUT -SNL_DECLARE_PARSER(_mpath_nh_parser, struct rtnexthop, _fp_p_mp_nh, _nla_p_mp_nh); +SNL_DECLARE_PARSER_EXT(_mpath_nh_parser, struct rtnexthop, _fp_p_mp_nh, _nla_p_mp_nh, _cb_p_mp_nh); struct rta_mpath { int num_nhops; @@ -153,9 +173,19 @@ static const struct snl_field_parser _fp_p_route[] = { {.off_in = _IN(rtm_protocol), .off_out = _OUT(rtm_protocol), .cb = snl_field_get_uint8 }, {.off_in = _IN(rtm_dst_len), .off_out = _OUT(rtm_dst_len), .cb = snl_field_get_uint8 }, }; + +static inline bool +_cb_p_route(struct snl_state *ss, void *_target) +{ + struct snl_parsed_route *target = _target; + + finalize_sockaddr(target->rta_dst, target->rta_oif); + finalize_sockaddr(target->rta_gw, target->rta_oif); + return (true); +} #undef _IN #undef _OUT -SNL_DECLARE_PARSER(snl_rtm_route_parser, struct rtmsg, _fp_p_route, _nla_p_route); +SNL_DECLARE_PARSER_EXT(snl_rtm_route_parser, struct rtmsg, _fp_p_route, _nla_p_route, _cb_p_route); /* RTM_LINK message parser */ struct snl_parsed_link { @@ -251,9 +281,18 @@ static struct snl_field_parser _fp_p_neigh_s[] = { {.off_in = _IN(ndm_state), .off_out = _OUT(ndm_state), .cb = snl_field_get_uint16 }, {.off_in = _IN(ndm_ifindex), .off_out = _OUT(nda_ifindex), .cb = snl_field_get_uint32 }, }; + +static inline bool +_cb_p_neigh(struct snl_state *ss, void *_target) +{ + struct snl_parsed_neigh *target = _target; + + finalize_sockaddr(target->nda_dst, target->nda_ifindex); + return (true); +} #undef _IN #undef _OUT -SNL_DECLARE_PARSER(snl_rtm_neigh_parser, struct ndmsg, _fp_p_neigh_s, _nla_p_neigh_s); +SNL_DECLARE_PARSER_EXT(snl_rtm_neigh_parser, struct ndmsg, _fp_p_neigh_s, _nla_p_neigh_s, _cb_p_neigh); struct snl_parsed_addr { uint8_t ifa_family; @@ -267,21 +306,30 @@ struct snl_parsed_addr { #define _IN(_field) offsetof(struct ifaddrmsg, _field) #define _OUT(_field) offsetof(struct snl_parsed_addr, _field) -static struct snl_attr_parser _nla_p_addr_s[] = { +static const struct snl_attr_parser _nla_p_addr_s[] = { { .type = IFA_ADDRESS, .off = _OUT(ifa_address), .cb = snl_attr_get_ip }, { .type = IFA_LOCAL, .off = _OUT(ifa_local), .cb = snl_attr_get_ip }, { .type = IFA_LABEL, .off = _OUT(ifa_label), .cb = snl_attr_dup_string }, { .type = IFA_BROADCAST, .off = _OUT(ifa_broadcast), .cb = snl_attr_get_ip }, }; -static struct snl_field_parser _fp_p_addr_s[] = { +static const struct snl_field_parser _fp_p_addr_s[] = { {.off_in = _IN(ifa_family), .off_out = _OUT(ifa_family), .cb = snl_field_get_uint8 }, {.off_in = _IN(ifa_prefixlen), .off_out = _OUT(ifa_prefixlen), .cb = snl_field_get_uint8 }, {.off_in = _IN(ifa_index), .off_out = _OUT(ifa_index), .cb = snl_field_get_uint32 }, }; + +static inline bool +_cb_p_addr(struct snl_state *ss, void *_target) +{ + struct snl_parsed_addr *target = _target; + + finalize_sockaddr(target->ifa_address, target->ifa_index); + finalize_sockaddr(target->ifa_local, target->ifa_index); + return (true); +} #undef _IN #undef _OUT -SNL_DECLARE_PARSER(snl_rtm_addr_parser, struct ifaddrmsg, _fp_p_addr_s, _nla_p_addr_s); - +SNL_DECLARE_PARSER_EXT(snl_rtm_addr_parser, struct ifaddrmsg, _fp_p_addr_s, _nla_p_addr_s, _cb_p_addr); struct snl_parsed_nhop { uint32_t nha_id; @@ -320,9 +368,18 @@ static const struct snl_attr_parser _nla_p_nh[] = { { .type = NHA_GATEWAY, .off = _OUT(nha_gw), .cb = snl_attr_get_ip }, { .type = NHA_FREEBSD, .arg = &_nh_fbsd_parser, .cb = snl_attr_get_nested }, }; + +static inline bool +_cb_p_nh(struct snl_state *ss, void *_target) +{ + struct snl_parsed_nhop *target = _target; + + finalize_sockaddr(target->nha_gw, target->nha_oif); + return (true); +} #undef _IN #undef _OUT -SNL_DECLARE_PARSER(snl_nhmsg_parser, struct nhmsg, _fp_p_nh, _nla_p_nh); +SNL_DECLARE_PARSER_EXT(snl_nhmsg_parser, struct nhmsg, _fp_p_nh, _nla_p_nh, _cb_p_nh); static const struct snl_hdr_parser *snl_all_route_parsers[] = { &_metrics_mp_nh_parser, &_mpath_nh_parser, &_metrics_parser, &snl_rtm_route_parser, From nobody Tue May 9 15:00:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG1Y948mrz4BHfg; Tue, 9 May 2023 15:00: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 4QG1Y93SLBz3mM5; Tue, 9 May 2023 15:00:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683644413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEBgcIUmnBTd/U7k6MykBx0cqOwsaCNnYsgPuEHr458=; b=qG4VJvetS860mBeAmdCZctM5lP6IVPOlL5cXs1crFqnARSK/M/ddHVdgf/aY0jEqgdIO60 I59xf6INnSMTeNrqTX2N4ZEABGzLioiuD3KXHkRFIk3GT8xDmAanaOiiT0XbrJ+HTQ/sEN HD5oW0LP56V0qlXvVtAyLNi5jaK4X2wzikAEqxTxuJfA65rKFkwkcLW817cEsKvDwnidYm pa7XA9v8BIwbHExIX6S/zMPr+185/cqMEoXlmuzODdIoDLP5JOPQdS66BT8bZzihHqKhso Ic5boUgIuBiz0ow9jHk273SjIMVBvXDKgPwXu/lqdvHX7WfcLv9vNb+FbOumSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683644413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AEBgcIUmnBTd/U7k6MykBx0cqOwsaCNnYsgPuEHr458=; b=Ujb5E5xpIkUuNHznrbZCIhjjjdnXQbxezXLY0ZhPJD7CkkzyORHkUgCnsDhiWKgAYmP4Mj syAAD/G8iAXxjQ5utO3eOKJmGlhOuFiSz5GQeKVBfdG/yChHX9DOJCO+RME79lazz4blbk XlKotbztVlWzBjwDHGr8Ii1MkhYVUuOXy5j3zM5G2VNSTL2LYrO9uaZYUmpDWYH8G/xlk7 0Q9sKDPywF4Caq/llUrV1wDAdTxDU3IxCow8qtUNDCVHFxq+SqDgsFdDgxhieTx1nL+htQ 12pa4KICF48WMN+NgcZvxWFpZawFV3+T93B3gr20FEwhWkNggV1ECN8v5K8yLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683644413; a=rsa-sha256; cv=none; b=B7MfZkbpQVTwMZzzTE0NZOYeHNc7cW4OQ83hCkCMv9ykGG7rIa0j6++A9fH1Zhv2vgeZQI jm/EydcTjEMh9/27VueqNyiLExcNEWwaPkiiFzCpOwfi/ibDqPRWcsQid7Quin2JznUyrb dHtTXDv/Iw8As9AZ1HQyVTMilLL2rJn+7/O/Ky1jIyCJKrrLLd3C8wWdVkLgdZYedKjR+P xoJR9A53JGzNJ5Nq8rWvLVsKYnKKk//6X3BKCng3a+Q69yMsIN0oANZZlMlhMskJmWSFq+ kbD6QpYkGMALdqffpn24CgdZnc0vOFU/deGEcR1U1VX93Zbtk7yU4411vH1GoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG1Y927vKzX00; Tue, 9 May 2023 15:00: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 349F0DMH071948; Tue, 9 May 2023 15:00:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349F0D7O071945; Tue, 9 May 2023 15:00:13 GMT (envelope-from git) Date: Tue, 9 May 2023 15:00:13 GMT Message-Id: <202305091500.349F0D7O071945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 04dacd5691fb - main - netlink: temporary skip snl(3) capped test. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04dacd5691fb3de5fddd0868836c5a7ff9888370 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=04dacd5691fb3de5fddd0868836c5a7ff9888370 commit 04dacd5691fb3de5fddd0868836c5a7ff9888370 Author: Alexander V. Chernikov AuthorDate: 2023-05-09 14:59:41 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-09 14:59:41 +0000 netlink: temporary skip snl(3) capped test. --- tests/sys/netlink/test_snl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/sys/netlink/test_snl.c b/tests/sys/netlink/test_snl.c index 8c6d72f6893b..bd607efa82fc 100644 --- a/tests/sys/netlink/test_snl.c +++ b/tests/sys/netlink/test_snl.c @@ -60,6 +60,8 @@ ATF_TC_BODY(snl_parse_errmsg_capped, tc) if (!snl_init(&ss, NETLINK_ROUTE)) atf_tc_fail("snl_init() failed"); + atf_tc_skip("does not work"); + int optval = 1; ATF_CHECK(setsockopt(ss.fd, SOL_NETLINK, NETLINK_CAP_ACK, &optval, sizeof(optval)) == 0); From nobody Tue May 9 15:27:05 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2892KlFz4BK7K; Tue, 9 May 2023 15:27: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 4QG2891pJFz3qGf; Tue, 9 May 2023 15:27:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oE08hTHCtnR6Tr7ZHxmq6YceXHb0IzHxQci7Pclvr/c=; b=e6L0jS5Th/ZIIGECPo5xuAXSsnbvJ1YFjOUhRXJFaF4G4EJUIUMPxZyiLD3L30pj7V+Y6T 7ij5Ij2jGIukdgevJogwjhxsV8gC3MdzRn4IfY5x/jOo8s/1oSmoNkGsB6MxOesNuyNlgr G7XM0hEQ9Mp6NPkWUcrD/BwFAjRgqreqEcz5/G4SfLF0S8Dvfx8q1278PA5lIkYIO1ahhw sa99IYqRSqMJV0cq8aTycTOECV3zN3Ik18nZsbdVJ9xqhs/4u/64BInashjwc5nWQNw9t/ gqv8L8/RddeY0vjQYNPRxzu7NulUOw25WL5845t017ezXYV/vhtSEVbl6myr6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646025; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oE08hTHCtnR6Tr7ZHxmq6YceXHb0IzHxQci7Pclvr/c=; b=AqN7v0BYOpLjY9XZBqb3wfr0HehlrcLftafk1v8+emmnIj20puGbFS0HeHt/ukhDzbJkPg bpLuJjz1dmoo6jyBsXrCTZ2AYd7oJg9rB8i6SSRdToYg2tGfM2rkWt5l5MNcFpycurVp6H 0HXhRnBqUDKe4IF1zvmi9FQ/zpd5FfQD05PhWLqaHEMS/AfRY91rx4a/t39Rm2P8vZRPub zOpCmTTP6K3A5TSMR/e/BcI90XNkQxjE/6QL7S++1PohhEgaocsID26DUcWQ3F+Q4YDkV9 BQd9O5aiyYMsXJzC7IXX1ycdUJKvAY45xv3xufYhFIQVFMgB2yRTOMvI3jwbyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646025; a=rsa-sha256; cv=none; b=rrWEKn49JhkudXXyvaFRzmhh5SFx0SRLDqGcFdtVMRitMQ54aNIgJHkbdCVNELsMZs7ulB VQgDNjLxDVDiUAHTrhH1230gsmjOUezO7/YosyDXOpUZsOPVEcKhpPzV8uXLn81lnrqy+l qdGa6HDID5C1xN6PrxGTL0E8nkAf5OWgVLBsU9gT1rPznKmICX9d2uim4QR9ZKSDou9Q/u tHRvVjoz0NLmobnBaib2iKWWtN+pov4P60MapyVtaYnih+Hb9pA4CC7ukWwWOfSEuuR1LS E5z1kPYoCk3Lp+SU8NdLA1mSVWoGuo2u6AZ3ACXCod/ZaqCCwOSxGcCB+hgJpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2890vgyzXwf; Tue, 9 May 2023 15:27:05 +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 349FR5lw014868; Tue, 9 May 2023 15:27:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FR5xV014867; Tue, 9 May 2023 15:27:05 GMT (envelope-from git) Date: Tue, 9 May 2023 15:27:05 GMT Message-Id: <202305091527.349FR5xV014867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: e8e7e1462e0c - main - netlink: fix compiler warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8e7e1462e0cf9021b1e5656b9414955b5799860 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=e8e7e1462e0cf9021b1e5656b9414955b5799860 commit e8e7e1462e0cf9021b1e5656b9414955b5799860 Author: Alexander V. Chernikov AuthorDate: 2023-05-09 15:26:16 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-09 15:26:16 +0000 netlink: fix compiler warnings --- sys/netlink/netlink_snl_route_parsers.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index 6332f9f9e0d9..504b9c8737df 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -37,7 +37,7 @@ static inline void finalize_sockaddr(struct sockaddr *sa, uint32_t ifindex) { if (sa != NULL && sa->sa_family == AF_INET6) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sa; + struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)(void *)sa; if (IN6_IS_ADDR_LINKLOCAL(&sin6->sin6_addr)) sin6->sin6_scope_id = ifindex; @@ -76,7 +76,7 @@ static const struct snl_field_parser _fp_p_mp_nh[] = { }; static inline bool -_cb_p_mp_nh(struct snl_state *ss, void *_target) +_cb_p_mp_nh(struct snl_state *ss __unused, void *_target) { struct rta_mpath_nh *target = _target; @@ -175,7 +175,7 @@ static const struct snl_field_parser _fp_p_route[] = { }; static inline bool -_cb_p_route(struct snl_state *ss, void *_target) +_cb_p_route(struct snl_state *ss __unused, void *_target) { struct snl_parsed_route *target = _target; @@ -283,7 +283,7 @@ static struct snl_field_parser _fp_p_neigh_s[] = { }; static inline bool -_cb_p_neigh(struct snl_state *ss, void *_target) +_cb_p_neigh(struct snl_state *ss __unused, void *_target) { struct snl_parsed_neigh *target = _target; @@ -319,7 +319,7 @@ static const struct snl_field_parser _fp_p_addr_s[] = { }; static inline bool -_cb_p_addr(struct snl_state *ss, void *_target) +_cb_p_addr(struct snl_state *ss __unused, void *_target) { struct snl_parsed_addr *target = _target; @@ -370,7 +370,7 @@ static const struct snl_attr_parser _nla_p_nh[] = { }; static inline bool -_cb_p_nh(struct snl_state *ss, void *_target) +_cb_p_nh(struct snl_state *ss __unused, void *_target) { struct snl_parsed_nhop *target = _target; From nobody Tue May 9 15:30:14 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2Cp4gmyz4BKBk; Tue, 9 May 2023 15:30: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 4QG2Cp43y2z3r7T; Tue, 9 May 2023 15:30:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hr+JxeoyJyW5P1E35NKrsX/eJZuCLqhFdcpnUBZpD+0=; b=NmCheqN/VHeoh+zxwJE5jBEpRng287zyklpRYWcJmCGNxdDDxynJ9aZE1Z4Tth/JKEP0mr afizymAQ+4sjHPDlMbbDcMsSpGibQyjC8yC1BlXbK19iZawet9pk/J9hS9ja+yo75QvIPZ RitroL0y9oPoi+c1Id3/PxjWnt54s7GRcCQHLPUNqcQ2oaywKx9iO3FrO8Glip55llYS0r ++Rtd+Fs0UL1g40emdItpJuOOaDyHqAeVX9fleevFIQUzkB8za+Eh5Vy5IJqStxHuuC3Uh YAKi58vLF9hCKAqX5hO5uWQkk/YxOA+o09sDoK7hvAf3mtJ8mO4E83KKPlkYvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Hr+JxeoyJyW5P1E35NKrsX/eJZuCLqhFdcpnUBZpD+0=; b=QNy/uPRAuppn64PowC5ZUaeWOBcVnBjeyEyoQkTwhBG9l/0O9aRcDLANPApgzNQQNFJRYu bDobXC+OVoDm+1QMnUI34OufrUnb6iAV7Ub3fZLw5ZsdN46WEwVsRBeY3VMiotiPnKZJYX 1ZGh4AaLBnxuIsUks7iK8yil8Jk8PW9ld/q7PHsYL3eeCwZKh+tDtegXsyg1tISuwH2xcX z75nWgOS9Wft8g6nqfe3YToSPGrguKNJtL0ycCBxXRzvety1hLEAGwURastnxqy4ixkUtT ZyQfidd2EyEhn3ai9CE+is1zilfce/WkPoaekm2ujTCtJnB3ul/bu6JydsaUpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646214; a=rsa-sha256; cv=none; b=jTGVC2Ux5Q1ZASv8KgbpdGsLZkUDYOZtyKONrqmHJMf9RBCB4lPkODBXTcvpub1udd7Wfk 0pI0zg4g3E1KX24wnsBTQCpBm0WKKmchEcUot9yWU5G8RSF1h3D7F10hRjkpRGDFJS1I23 SF8wWHmF34kMtCysdy43G3GMzKsNcCojGh7FAlH6mO8hIFjvC60v5M2bfXcH/bj/0SCUBP SyBhDDzpsBzxGesR+54J203bDsD1nWCoxMjc/e6mUDnkVvYdJhgrvpSRSLOpSR3EJIKwdK JBDpkPY5WK89aIyJ4+LI+RIxqKuwA5U/ifych5E/78139l9g98UEdTS1nniHBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2Cp38pnzXwg; Tue, 9 May 2023 15:30: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 349FUExx021857; Tue, 9 May 2023 15:30:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FUEWo021847; Tue, 9 May 2023 15:30:14 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:14 GMT Message-Id: <202305091530.349FUEWo021847@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ccc6b87b3825 - main - quiesce_cpus(): do not overallocate generation array List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccc6b87b3825a235991d978e43d29431e012461f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ccc6b87b3825a235991d978e43d29431e012461f commit ccc6b87b3825a235991d978e43d29431e012461f Author: Konstantin Belousov AuthorDate: 2023-05-05 20:21:38 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 quiesce_cpus(): do not overallocate generation array Also switch to mallocarray(). Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39981 --- sys/kern/subr_smp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 656c945fe8c2..745b1554371e 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -975,7 +975,8 @@ quiesce_cpus(cpuset_t map, const char *wmesg, int prio) error = 0; if ((prio & PDROP) == 0) { - gen = malloc(sizeof(u_int) * MAXCPU, M_TEMP, M_WAITOK); + gen = mallocarray(sizeof(u_int), mp_maxid + 1, M_TEMP, + M_WAITOK); for (cpu = 0; cpu <= mp_maxid; cpu++) { if (!CPU_ISSET(cpu, &map) || CPU_ABSENT(cpu)) continue; From nobody Tue May 9 15:30:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2Cq5hpmz4BKDP; Tue, 9 May 2023 15:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG2Cq59Fvz3r80; Tue, 9 May 2023 15:30:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=93fZcNsltL2VswSpjQT05wCAA3WI5pVjNfiIkwUU4AY=; b=pIMYy8kJSht7RCiIeYj0VxTn2kshCtD0LiIkkF5+MTV/0AgATpo80sVCCxMuMGRrXCiJEm J0iM4cSQ8gcg3q8up7LXkaZyEvKE4qdqIGdN9R/JFd1cOYhDjNHRr7mPti5v7hIkoiItYc aip3okrmKIYwT2y5jm+vZ8ZOri9GYzi3NFjGnL6Pq9rFYx16sYZuCdJkh64tvv2iI8BhMX QjriNq4Zz+7x7wigkhBP3mvvO8o8s/6sPALT10kGBTA/1qPTFUGbCZYrJK0zJvF/ZUJJE8 fiaFm4IQB0OUewvTuiPYA7vIOX9+widg4wKWepYqfzx4ziDAV20W+pgh58j2Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=93fZcNsltL2VswSpjQT05wCAA3WI5pVjNfiIkwUU4AY=; b=UWjUQeG9jnJfXF4FdrixR3OER0M4MF1WPu8vOaa590kz26gJc4m5hqfaA9bndXq0D6+PJA vh71ujOkeIp3v31XTDdtVoY+XiSmkLQ7PAl0moEYP7Vb2iOlWUCPGmAsobFYviKllDqyxn nVcaGvq/EylUIOjvac9+S9S397TEOauCEbfFAmvH9hZVYI5KNQCc+k3WEBLyFtqS1YGb6z pXvVIwT6jEf1jMF+2xiztLzGfPSb2ntiUAVZat94ON/XjIZcZWfm7qpcMwlUcLm3tQqzSn tmjJNTaXU/kFiwIWWxD9kDcqBh/U36oBWXB13HCXZ2GGwVoYZcRowX8yJnPscA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646215; a=rsa-sha256; cv=none; b=Ov/ZxOq8vSKSq6tTZDRaRxUpaYF4+qxS1xb6FCFDNGOL8DxTk8aK6VZwybBfG5j0F/Pcn7 Jb1qLrjbLxyGIS62ONtw5wWkBPDXR/xYshW+9g7YX7PputbfW6MPIDMrgCdBkQLTHh6uSs ZDZQSdK48Jyp4aIOGlvJdHmd9TlNh4tFDWsB3N/Zsj3jU6Flhxijwfd2eoONDJri4UdjgF /LBjGfSAabtqal0RtTYyQQPIu2C09RHstaQIcQtwGK0H3QEwrjdjhwf9LtsJh3k5IBosae DkhzisjGApk5W7PLE2Egs61WcFFdXL61mulVdax7UxRc8UCiVNhd0tnP8xdx5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2Cq3vTDzYPw; Tue, 9 May 2023 15:30: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 349FUFFN022500; Tue, 9 May 2023 15:30:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FUFnb022497; Tue, 9 May 2023 15:30:15 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:15 GMT Message-Id: <202305091530.349FUFnb022497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 9801e7c275f6 - main - smp_topo: dynamically allocate group array List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9801e7c275f6ec42a44b98a2e2e1a8ac4674a096 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=9801e7c275f6ec42a44b98a2e2e1a8ac4674a096 commit 9801e7c275f6ec42a44b98a2e2e1a8ac4674a096 Author: Konstantin Belousov AuthorDate: 2023-05-05 20:24:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 smp_topo: dynamically allocate group array Limit its size to mp_maxid + 1 times MAX_CACHE_LEVELS instead MAXCPU. Allocate the array on a first call into smp_topo(9) functions, where the mp_maxid is already known. Make the array private to smp_topo_alloc(), assuming that the callers that allocate top-level group do it once. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39981 --- sys/kern/subr_smp.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 745b1554371e..df82d948afb0 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -630,8 +630,6 @@ smp_rendezvous(void (* setup_func)(void *), smp_rendezvous_cpus(all_cpus, setup_func, action_func, teardown_func, arg); } -static struct cpu_group group[MAXCPU * MAX_CACHE_LEVELS + 1]; - static void smp_topo_fill(struct cpu_group *cg) { @@ -713,9 +711,14 @@ smp_topo(void) struct cpu_group * smp_topo_alloc(u_int count) { + static struct cpu_group *group = NULL; static u_int index; u_int curr; + if (group == NULL) { + group = mallocarray((mp_maxid + 1) * MAX_CACHE_LEVELS + 1, + sizeof(*group), M_DEVBUF, M_WAITOK | M_ZERO); + } curr = index; index += count; return (&group[curr]); @@ -726,7 +729,7 @@ smp_topo_none(void) { struct cpu_group *top; - top = &group[0]; + top = smp_topo_alloc(1); top->cg_parent = NULL; top->cg_child = NULL; top->cg_mask = all_cpus; @@ -780,9 +783,9 @@ smp_topo_1level(int share, int count, int flags) int i; cpu = 0; - top = &group[0]; + top = smp_topo_alloc(1); packages = mp_ncpus / count; - top->cg_child = child = &group[1]; + top->cg_child = child = top + 1; top->cg_level = CG_SHARE_NONE; for (i = 0; i < packages; i++, child++) cpu = smp_topo_addleaf(top, child, share, count, flags, cpu); @@ -801,8 +804,8 @@ smp_topo_2level(int l2share, int l2count, int l1share, int l1count, int j; cpu = 0; - top = &group[0]; - l2g = &group[1]; + top = smp_topo_alloc(1); + l2g = top + 1; top->cg_child = l2g; top->cg_level = CG_SHARE_NONE; top->cg_children = mp_ncpus / (l2count * l1count); From nobody Tue May 9 15:30:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2Cr5yzlz4BKDS; Tue, 9 May 2023 15:30: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 4QG2Cr5W4Yz3r6k; Tue, 9 May 2023 15:30:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TE7Nif//ACSyTarcNaCOn/N2dl1iM2cQex4/2hWZ6fY=; b=Da9wQAoAbBplFb0PRFPrwiN4kDTXlatZDW7sKc2nfKJ1IU85+8fmiITdFkFZnnWVuewKO8 HJdv9rKoJRIHPylkqaoYmqomOAhtDyl27HAx01Vl+6/D01zBBU9zxCHrvA/Ew2M97Lnb0P c/teVU+aFQZuMjNbtM8hS2++SXbx6GBgv5sZl6ImfZu1kduCyhwGeGa0EMF9TWzEqXE7v9 RpmpKWqi3lgdFTuMnIXsICvi1K4hrhWpqku/VkyNxtYRZOfDjszVGQSc3wIFzqt/v65gg5 5jHBlANWrfhi/zblcIhqkmwMYQR8elzyFTxSa4ffX0QBfNu5MDMmvcWnkJwh+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TE7Nif//ACSyTarcNaCOn/N2dl1iM2cQex4/2hWZ6fY=; b=MTeBzOIMnjfQAhchlcyF48lAwYK9b1Z+1a1qUAnl7pDVSvKnC2a53bPohqH99iNsj23lKv ya8fo1qkd2hjvEe5SLkhAOUkf095GUCBiydtifoc46K4t2L3bEbaOjICAH7aTYaZdfv9tW tQirIFYRX6Sn7tqmnITdPK+DCTAD+ZU3XtoxV7ZlwqGg/BaGdL5GIMNsM+S8pRTCTn8A4H K5azzeHS9aI4hgBW0Pq5RKbVKhrOCX4HtS7fvDRcGpUSplWaaMsRhcELULgBASLG922x67 6VpSWL1pprnzXftqaeOMPoFbcdk52leyUPW63+CMZl4dPcx2EpWJO0qfgzSYHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646216; a=rsa-sha256; cv=none; b=RfzbOzt82qXVwgRk5fgl7TlbsIrEYEK9EUmT9eQFABkG2C4oRxSKtKMoNl1L4eNiF/hr+Y bG7cKSJnSDpGuXn26u8vVnqiTjBt8fVZN7kOfwu+084bP3MdF2Zc2AShQnUUUBrg5Jk5wQ iQCr5qUUuPWwwyEWvexj0oHsIvCNeF5QCFArq9gQhtD1+7CMsu6Dx0inUEcSilgoXG/Tgq h6QAiC4cpQg4a7YMCwCuafMT1/W5uFNciSbbkXoXtK6plIwwTYIhpWr4BnSsNbOrYhGy+v sIfQgAMLc8ZxuqOYwt0q5LC+SdAK6bEhenBEmhPQOWrKOqN7Qdm+ZFhJn4guPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2Cr4VGrzY9w; Tue, 9 May 2023 15:30: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 349FUG1x023139; Tue, 9 May 2023 15:30:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FUGud023137; Tue, 9 May 2023 15:30:16 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:16 GMT Message-Id: <202305091530.349FUGud023137@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: d0f67f97579f - main - smp_topo(): make it idempotent List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0f67f97579f7b2febf29264b1874a95056dec06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d0f67f97579f7b2febf29264b1874a95056dec06 commit d0f67f97579f7b2febf29264b1874a95056dec06 Author: Konstantin Belousov AuthorDate: 2023-05-07 18:37:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 smp_topo(): make it idempotent If more than one call to the function occurs, it currently allocates the same amount from the group[] array, eventually leading to the memory corruption. Noted and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39981 --- sys/kern/subr_smp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index df82d948afb0..5a9aeb5ab04a 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -645,7 +645,14 @@ struct cpu_group * smp_topo(void) { char cpusetbuf[CPUSETBUFSIZ], cpusetbuf2[CPUSETBUFSIZ]; - struct cpu_group *top; + static struct cpu_group *top = NULL; + + /* + * The first call to smp_topo() is guaranteed to occur + * during the kernel boot while we are still single-threaded. + */ + if (top != NULL) + return (top); /* * Check for a fake topology request for debugging purposes. From nobody Tue May 9 15:30:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2Cs6sk5z4BKGj; Tue, 9 May 2023 15: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 4QG2Cs641Bz3rNW; Tue, 9 May 2023 15: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=1683646217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ToYRS+eJ0x5jnwp9jO9WAHYPNf4l8vLxxKjpmF27PFY=; b=cdXvRa9gjAUb8sXbxm6z/CL3/MjHzfCrlfzQCZIe8jzbwORTggV1MHDdTRog55N8+BjSr6 gbuubCr8Vs0qOZoS4z8UNNWl7vpcdGgwtl0TJZap5zlpjk44qeEa70XNlbMTxgu7o5TBDG ZUIm/+kV+cqXL9hQpH6KMz1o06BOVan/vRr+De4RmOGhsCzLhR07zMeyAt+z+RitWaDCDy mPYkMQOFn1HDwImTQwD9IlUx0Pv0LLm+dfdNRlJc/tfZ2KWQAZdZVIOjMG+ka9oQOK6iIl LS1/oDliZpelXjGnJs8iQXqJGSeNKScbU9a3lgGZszvyCHp8cIOFU3l5mzVY/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646217; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ToYRS+eJ0x5jnwp9jO9WAHYPNf4l8vLxxKjpmF27PFY=; b=c39t4lscu5jYn51trheQn1MMhy9d00sGB6gkhPoZExLOidhd5yCCkuUyWBIkTp4I8CfwoL Gp4o24ZGPa0aGKh6jTKGxnSm531QMXP7qZAdgNFbxwkQpDry+ahbpPirf8Y6UgoNIzplTZ cK2hC4JVH8JL5Ml3NmWs4xlQkWZhxdBWK3dGS1RV9qLwFWclm+Gs+eVs+ODsvtcF+DXNK0 9PaVfXqiATeTnyMEWB93BqZZ3HqaIFoDKbW8wxbJCCy5uaH4+EUX7jCz/Il5B5bYz9GJjD N3Xh+hfTeeNKmBiKvoDuldAL/YN3GOD2b6vE7eo/bqws/2TO2z9Ksx4CjARACA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646217; a=rsa-sha256; cv=none; b=j0ULDQu3IoL5GcHIWIcLOnRrMmVmIx3TyNEPYmqrQaOum5DMmWqaxF102sGeFVUBH1rU3V 5ET5fPuX0dAp2LYMntVUQJA4I5RGxjc9B/4MnmXxhM7EDGHt1aRsSEvRDRjYsQDR7Oy1oe TS/0/cxOEN/yvnnW776nEU3N11OOVGoIeomFxvYbuHWE9Qj3zh4mzPTPgj9OZV4vv32nVG JavWahVR4YJvqeWwvn3RVmvezOoEVIHru0QZdThW8RQHmxJaR3mgquIHNpTygQRBRBM5go J0Pg4Q6vDlPW7cUv0/eJSRz3Q0grCHU3oE5lW9unDCxmaBLFcDcbUPR0UUlpIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2Cs52VqzYPx; Tue, 9 May 2023 15: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 349FUHiw023734; Tue, 9 May 2023 15: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 349FUHXO023728; Tue, 9 May 2023 15:30:17 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:17 GMT Message-Id: <202305091530.349FUHXO023728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 361c8f75a618 - main - smp_topo(): correct allocation sizes for trivial topologies List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 361c8f75a61832d9aa3dd4c589a0220f3467466f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=361c8f75a61832d9aa3dd4c589a0220f3467466f commit 361c8f75a61832d9aa3dd4c589a0220f3467466f Author: Konstantin Belousov AuthorDate: 2023-05-09 15:08:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 smp_topo(): correct allocation sizes for trivial topologies This patch should not modify the correctness, only the clarity. Requested and reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39981 --- sys/kern/subr_smp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index 5a9aeb5ab04a..5a1013dad65f 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -790,8 +790,8 @@ smp_topo_1level(int share, int count, int flags) int i; cpu = 0; - top = smp_topo_alloc(1); packages = mp_ncpus / count; + top = smp_topo_alloc(1 + packages); top->cg_child = child = top + 1; top->cg_level = CG_SHARE_NONE; for (i = 0; i < packages; i++, child++) @@ -811,7 +811,8 @@ smp_topo_2level(int l2share, int l2count, int l1share, int l1count, int j; cpu = 0; - top = smp_topo_alloc(1); + top = smp_topo_alloc(1 + mp_ncpus / (l2count * l1count) + + mp_ncpus / l1count); l2g = top + 1; top->cg_child = l2g; top->cg_level = CG_SHARE_NONE; From nobody Tue May 9 15:30:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2Cv0xy1z4BKPm; Tue, 9 May 2023 15:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG2Ct6Zy1z3rV2; Tue, 9 May 2023 15:30:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAPcF0POx3i9guGKDhyu5Q5y57hXh4iTnMrS5Wz57J4=; b=YPP5RaRktRzfmby05oN14ncsuJ0rWUt9XHKl0ZACZMZw2x27LDxJihv6TPn4PVqsUn9nSI SPkaTw/Hg8IB7VX7d0heQeMnZcXoE2FghE1hIVdLjRijaghJTYbYJN61hfhLa6OHcHweTT m1pCCd9VEl+GYHMKl5fMgpjcyvE7TU5fkvaejCQZw4EgfDL8qTa9Mf0d7stuI+t83pPzbf g5KUB1MNzUyXFiNt+DmDREnkSsW/AtN1UuNXJgtefxrB3hbiAbyO8sw7AbqhU++THDNApB zEpbG9Yq6PbanGpbww1pPzCZLgnlaNDxyANkRTejIVrJtxViUwdTcqJl4nwNrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HAPcF0POx3i9guGKDhyu5Q5y57hXh4iTnMrS5Wz57J4=; b=jvg1eHQpByQMmrKTbdfaX+zvO1k6jPtJZXEx7HFTLMJGI7Orr5XBH9GgyqDqBxQEZEAtU8 27ExBerIaEMewQNxBQCoFd84ZJmO/Is1tc2B3DR9+I2qIBH6tNO63EOV7pnQhtNr2p78i1 JKCbNRQy91r3uZY6K5T8rzVCRNJUrmRxqooolznIcleGROPXZ6jGJgxq3UHRsySFFwFLhF ipUxR/JOtmdYTNQwJzMdHnqraGTraW4OoEVZ/ji2ZuRQyVHd1dL0avT4QfuMeFMsYRNauM 2EdTufjYXnbX9qT49Qp9fdxsV5Dng3k21S9Bnne5B2ATy7KmX4F+EU3Jo2MJvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646218; a=rsa-sha256; cv=none; b=pTIjxmw0i1eIZVYCXkOJrm0sdilwO1DIPo7NrN9yCnoBGvrhB4x/uRzqabBhFF14wRbpA2 UnXtnTgb4B9aw8AfVwRsuCpVhzg+GpuF4aH8c2qBJZsIVhIV5EVSsT0uBJ/eWoOH8j+gyy 5oI4uF9IiETkKwReOEqICsS83zCo1Q/WzOkAdakr9uHybxq+EXJuYvq871aXqoMr8rgOTz Xw+NH3O8NSk/PX++LhiYmztAtvxZVYmaFyRbBhPaGjlyTA/OH9Kyz3ZEyv/8T6IMtDC0SD FbOP+ccJhL1odQ/WbRbyrF9i7cyyDdjvIJTZ/XtZImCckHmV4uvxRG3KCOEitg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2Ct5hCszY83; Tue, 9 May 2023 15:30: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 349FUIlQ023869; Tue, 9 May 2023 15:30:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FUI4B023868; Tue, 9 May 2023 15:30:18 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:18 GMT Message-Id: <202305091530.349FUI4B023868@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bba6249ae984 - main - amd64 MINIMAL config: remove statements about UFS module List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bba6249ae9848b97d351ce04061c06d5e8ad8f9d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bba6249ae9848b97d351ce04061c06d5e8ad8f9d commit bba6249ae9848b97d351ce04061c06d5e8ad8f9d Author: Konstantin Belousov AuthorDate: 2023-05-06 20:01:45 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 amd64 MINIMAL config: remove statements about UFS module All UFS options work for ufs.ko. Reviewed by: emaste, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39990 --- sys/amd64/conf/MINIMAL | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 7a3a6a61df8d..8a17bf50a6ec 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -6,8 +6,6 @@ # modules. # # Exceptions: -# o While UFS is buildable as a module, the current module lacks -# some features (ACL, GJOURNAL) that GENERIC includes. # o (non-loaded) random is included due to uncertainty... # o Many networking things are included # From nobody Tue May 9 15:30:19 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2Cw1rsFz4BKK9; Tue, 9 May 2023 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG2Cw0SXtz3rVP; Tue, 9 May 2023 15:30:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DolbXOYKwZ18I5aMjP60Kv0AffzEQzRBLLSguZBkxN8=; b=p8WwFBRkGMDCjVLcwJGBrC0RzI4uKMR9oolZ926nPoCa2saW5qFwOZV66m6VvJvFemfB1A H2z08BlegJ4OS/OszdT8fk2Z9cfjBWdp31y9/Zaq/yA+x3Dl10yL3HwYvY3r+h5dwKnpke I3BIo3VGE5Kv8RhCSBc/chI2mPiFSNE29g5Pfz6qqTwGA1s5bEQcnuua+cwDfoyznGnF4K QYNOjhW/JdLcl+itYcYaLCWFtwXHl959pas7IMvf9txHIhWrY89b2mJB+tOgJnA4gEHbEm JaSoSpSiAVnsJIyEuzmCMMQgxnWz/nkPgYkpNHUMELGSaV8lnXRzNg2QMyUw/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DolbXOYKwZ18I5aMjP60Kv0AffzEQzRBLLSguZBkxN8=; b=S3vRQ/4kDHerpULqmhTIqKm+UmkVZkm/DJadupxvGxXdlgdDPShSQCEz2lZO30kHjAUx/T RnJdx4WGw/1dlBQiFO3NR+h+r0P6YziYHOWNLpeGRPcXjtU7aW2j8pxZzRXBKWNjHiiQH7 lUCQSxTGJg/5kQ2CEYOVQnlH4OFhT1wFuQApFWJvpgHyO2G12gf0XgV6r+JBbeUUgIi6HL SfMGoGQJo63oO+tdAIubUBTSki5vZcL5TqvxzHOJQB47EJYq7MzYllnBPMUQJWX9wZHVk+ CuJq0htevW8k9M9XennUMxs0bQlMkRDZdywhO07CH8CdaZ+N2Pidf3Qq1F3Knw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646220; a=rsa-sha256; cv=none; b=hpQ1aC4aumrsdeI7164nI2mGcul7a21UgF4KwRQUnX1a+I3qKWqkaF/HuRfVLvIztpiBZg H0l8s9w5x7dxsIPiQRObniBI8AQwOWGIUgYMGJeRBUR4RU7/dbv5/1jGynWYcSfEzWRKrj jH3gN4exRdbVbiayAni4858zYqlzf9Rx/dfz722lT+qj+Dbe4Y/f0QlYX7gCGePJuHihYn 0UoQUcTgKEvt0DCvw1cmIelRy+VyRvIv7FDY67q7Urp1Wb7RAqzE7ZoKZpmss3EmyMZCKf ghOywaS8VRTkHxwewVrwO7BU+qZtYqivlcndV8Hj0/BxQf5LeTveO5SFjw3aFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2Cv6f0VzXwh; Tue, 9 May 2023 15:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 349FUJrw023888; Tue, 9 May 2023 15:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FUJjI023887; Tue, 9 May 2023 15:30:19 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:19 GMT Message-Id: <202305091530.349FUJjI023887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0c1c5e36ebbb - main - amd64 MINIMAL: remove UFS from compiled-in list List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c1c5e36ebbb7e30a5e57a044a20ea2c4f7cf793 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0c1c5e36ebbb7e30a5e57a044a20ea2c4f7cf793 commit 0c1c5e36ebbb7e30a5e57a044a20ea2c4f7cf793 Author: Konstantin Belousov AuthorDate: 2023-05-06 20:02:34 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 amd64 MINIMAL: remove UFS from compiled-in list Reviewed by: emaste, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39990 --- sys/amd64/conf/MINIMAL | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 8a17bf50a6ec..574892980a8e 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -41,7 +41,6 @@ options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_OFFLOAD # TCP offload options SCTP_SUPPORT # Allow kldload of SCTP -options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories From nobody Tue May 9 15:30:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG2Cx29Fsz4BKPw; Tue, 9 May 2023 15:30: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 4QG2Cx1c15z3rcX; Tue, 9 May 2023 15:30:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=stWaltvwtwpAGkNACeYQVZLeJ402uF5jKTLFU5zwRrY=; b=p+p555ruKAtgoIqfAN1hNn8UtmKtRnSPaQ5g6iRYOr9jQjM/mVNeAEtb2nn8mG8uUUvzOD AgZnTMD3Gxp9+E37t/OnQSgQAC3CiaV4H0LQMdIfPfIw2nf/3glf/60Uvk9jNCu5m9jYB/ GSRSo9e8iyrm+y55XqA6HAON/Dry/KnrGBFNUOnuvVasw0auWGXSW6ZLrxHoih1arHuR7b MQvMpa7sQ1yRdkcEf9vK5jv7sFR6yOMx2xGHAXk3HSBZjp2oiXkdIrxd4/01vGxsExEh/q yAf2RL4bRNNjoBLs857obXk3VOLn3NuBKTnuYc3MaGpF8gcricqsTf4RjkMYhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683646221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=stWaltvwtwpAGkNACeYQVZLeJ402uF5jKTLFU5zwRrY=; b=n/Fwbih4gNCOaFUFScQp0zKHpQF8dDC+hziJBBJgltoQ8vJVaSbjuiAImcr2SxGUdyvRf6 ckCj61r1ZM2Nqw4XGIqrvk7x/5VU77ZCkghqfPBFEBvJtO4+6wesBdMFeJKrQkpjy5IqVS nl2Psp1cK3PgWHQ1TSKY7NVcy4/Oqgmq4sSCwObc1g6xwA5X7RtTYuMJ/hFHE5cu7o+XFa ftkWDk9YiFebqBrgQCYuD751oLSDsQR+pVp/mSK7wM3uCb4hqSgt5CvgOqoGBfmh4ABo1j zEDqwONExIhlIH7jLAn1GFQkWK15TEFMtmpaljEUUOZto40+n5pAzjXE9ws7dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683646221; a=rsa-sha256; cv=none; b=K1CrDZp9kkFBDW7LboYU+FZfYEgrNs7Rgq4xWsBC64rBJOOqsFGnNDTGhbHcemaGAI/462 UdeoItwnpDZ2gyYMMUnF/TmInWTfjq2vDN/Q1XKFnnckv+BBqtp5nJ5J4yGydV+oajVz/c K85fcI8tEzaYipH5AwtnPzegJNrj9QmLhScmT+DkbmSPcWqgZsfOK2qRdKwNggjniPYIqF vBxLfHIChC/BKcqZH77o2wYaeiXwA2UbccUi0aBv4LJBbODzUR0UbcCYP1Vv0GCWrvXbUu ZYjr9+e6DD6QwkRteDZ3aLPx+yvckoIWUODbwBcUYboKMwyze9JzLz4UOgIIgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG2Cx0hmnzY9x; Tue, 9 May 2023 15:30: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 349FULxa023908; Tue, 9 May 2023 15:30:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349FULQX023907; Tue, 9 May 2023 15:30:21 GMT (envelope-from git) Date: Tue, 9 May 2023 15:30:21 GMT Message-Id: <202305091530.349FULQX023907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: bf864c3ed583 - main - amd64 MINIMAL: SysV IPC syscalls are loadable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf864c3ed5830785cbc4dcc8b832c14fdc7110e4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bf864c3ed5830785cbc4dcc8b832c14fdc7110e4 commit bf864c3ed5830785cbc4dcc8b832c14fdc7110e4 Author: Konstantin Belousov AuthorDate: 2023-05-06 20:03:07 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-09 15:30:07 +0000 amd64 MINIMAL: SysV IPC syscalls are loadable Reviewed by: emaste, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D39990 --- sys/amd64/conf/MINIMAL | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index 574892980a8e..b69706f97690 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -61,9 +61,6 @@ options COMPAT_FREEBSD13 # Compatible with FreeBSD13 options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options STACK # stack(9) support -options SYSVSHM # SYSV-style shared memory -options SYSVMSG # SYSV-style message queues -options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options KBD_INSTALL_CDEV # install a CDEV entry in /dev From nobody Tue May 9 16:48:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG3yb15vWz4BPB7; Tue, 9 May 2023 16:48: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 4QG3yb0Zp6z431C; Tue, 9 May 2023 16:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683650935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxwqtQV/8FR27/a6zrBTtvFhHasPRGboiKhjBn+swBE=; b=EMHH1L87IYz4ourMiEm9bPobR+UJYPQBRAtMbOhIee6vgUmi1Yq6WSB1sXvZ1g/+INLkjf fxwnJ6IgNnSgW+PoiHi2YBVszTj3TzUWSbdQAxUUj5z/fCGeJ9fxOLzD/gC3BZBU5WiSY2 +d4FDmu53QskCn07KTWBbY/w8tMkVoBERNNvoQ4waMPXMYm80YKW3O5Pc3bUMzQoDALOgk BGGprvuBL1Qu8rEoVOUmBUoxq9Ex4w5Tel4qlRx6P77MzVV43KLSGwAOLkSznQ8yVm7y5I 63zMFxx0tHIGpgmPp89LDFj4IUTVFennS24lE38gs1aOLFCdHKw0IaCY9/dn/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683650935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FxwqtQV/8FR27/a6zrBTtvFhHasPRGboiKhjBn+swBE=; b=I3fiQEXymATWQbWcC3TdikN6YZ+6FKcsu8bdjyBErVGL8DLAfuEJCGe6rNh2uj010qVlGZ bGysTxBv4jy7NfMLlHY3SCzO98/lEht8NPxebCmAdZNt3Lkqs+30bEjUqXJReWrB4EYqR/ JL3BqdNz7ZW9ZKYjkVpEDXLwcBSLeU83wTOR6i1ve1chzxl26DLpn0OK3A4yE5h4f6FxCP pUd8xKCIEFAP0sPcgmTxNwCQk2oU1hNI2wmYNWknZc/dxNDidE5dl0EW1fu0QprOnJnZlF WQgMqMpkb58k4SMgDSwfuUQfq8ComDRWc3Gx7l5Xl3Q/ohEt/HtyrV4Q2xW1hA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683650935; a=rsa-sha256; cv=none; b=eY5wiFDntgHKloTQzNQmxoWgRdxa/hcmcCBgMUQtKDXovEgBlu/LiinOH3qvAT7polzaBI gbD518hwlUwB/QPp6u0kIEScW6RoLNAw1D5pZakQeBJMOn2qt0rk/tnEFOMidpp0BlSpsK Q6vfO4YtUe7rjx1r8/pkWhlGi4/aAf6TCwkyT7o15Aht8453USbK4QJiX4AG5BtmYYTGFz tlDG/F4AT3pQX+ZfGq0EJycnFfcZ2iKjMfZMrX5Snn+gqhAIXjAmzzoRD49YIrI8U3JqSi EokDi3+5L5gRf7zVjPxmZNKJqTiU1J6dF5j7NiLniVVXTHP++8r68gY7CmOhwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG3yZ6nM0zbVM; Tue, 9 May 2023 16:48: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 349GmsdS046289; Tue, 9 May 2023 16:48:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349GmsOs046288; Tue, 9 May 2023 16:48:54 GMT (envelope-from git) Date: Tue, 9 May 2023 16:48:54 GMT Message-Id: <202305091648.349GmsOs046288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jonathan T. Looney" Subject: git: 8a16fb47303e - main - locks: fix two potential overflows in the lock delay code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jtl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a16fb47303ef4bfc773b52a920e0b223f8e9c20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jtl: URL: https://cgit.FreeBSD.org/src/commit/?id=8a16fb47303ef4bfc773b52a920e0b223f8e9c20 commit 8a16fb47303ef4bfc773b52a920e0b223f8e9c20 Author: Jonathan T. Looney AuthorDate: 2023-05-09 16:20:49 +0000 Commit: Jonathan T. Looney CommitDate: 2023-05-09 16:20:49 +0000 locks: fix two potential overflows in the lock delay code With large numbers of CPUs, the calculation of the maximum lock delay could overflow, leading to an unexpectedly low delay. In fact, the maximum delay would calculate to 0 on systems with between 128 and 255 cores (inclusive). Also, when calculating the new delay in lock_delay(), the delay would overflow if the old delay was >= 32,768. This commit fixes these two overflows. It also updates the maximum delay from 32,678 to SHRT_MAX. Reviewed by: gallatin, jhb, mjg Fixes: 6b8dd26e7c5f ("locks: convert delay times to u_short") MFC after: 2 weeks Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39372 --- sys/kern/subr_lock.c | 8 +++----- sys/sys/lock.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c index 1061ed5f5d03..05ce8b73b086 100644 --- a/sys/kern/subr_lock.c +++ b/sys/kern/subr_lock.c @@ -121,14 +121,14 @@ void lock_delay(struct lock_delay_arg *la) { struct lock_delay_config *lc = la->config; - u_short i; + u_int i; for (i = la->delay; i > 0; i--) cpu_spinwait(); la->spin_cnt += la->delay; la->delay <<= 1; - if (__predict_false(la->delay > lc->max)) + if (__predict_false(la->delay > (u_int)lc->max)) la->delay = lc->max; } @@ -148,9 +148,7 @@ lock_delay_default_init(struct lock_delay_config *lc) { lc->base = 1; - lc->max = lock_roundup_2(mp_ncpus) * 256; - if (lc->max > 32678) - lc->max = 32678; + lc->max = min(lock_roundup_2(mp_ncpus) * 256, SHRT_MAX); } struct lock_delay_config __read_frequently locks_delay; diff --git a/sys/sys/lock.h b/sys/sys/lock.h index 4031f20946c0..ce66a8ffebba 100644 --- a/sys/sys/lock.h +++ b/sys/sys/lock.h @@ -182,7 +182,7 @@ extern u_short locks_delay_loops; struct lock_delay_arg { struct lock_delay_config *config; - u_short delay; + u_int delay; u_int spin_cnt; }; From nobody Tue May 9 17:05:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG4KK4wG6z49CR1; Tue, 9 May 2023 17:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG4KK42Sfz452G; Tue, 9 May 2023 17:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683651909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZQhRoVTebKhAxnSMR6VhcaFiuUys9RtTFm+JY5sTS0=; b=DYrKT7A/wm/PIUC6/2X4yc8zEXVoxvEwW1RxrZj1Aef9AUwSfPJ61SfUEFipI2CiclpTUO P+S+6qJ70G5zlIsWmNxYDqofgLinzsucjmkHFuzAQm8wCF+KuFXHyiW049IHTrcvIB+mkj SoJBbTAyIlZrbHKOhhS/rme2JBnSAih2GF3DOjNFfLoGLEvhWeWSlHcgw0iOBnwomj7+2J W+DYb9Pz31Su0cWxkr5Ve0cGhuiRNtwHD57fkkGiBowrzOfNwe8h637niVRyei0Pk4ndfN 7xMxky5g7agAAzHhxT2OXErYaLNd523VhSTmnbgKKF9LEdNHKmMTKH6XSFobcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683651909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kZQhRoVTebKhAxnSMR6VhcaFiuUys9RtTFm+JY5sTS0=; b=F5DTvkPi78MCedZB45gsOd7g9poItxFQSPtUGPV16rj07RiCYZzVG24suihZI2EuWzl8PB ewIjXtYYFdXZed+OxtmLN1YEbn/jXAO/gbJGDr4utqOmfLDHWxISQrK/eUVAI+E5tqQLAR n9w5UUuawZuPOWoHD9UPWrZ4w8oWtW2ncoaamhFufyIoMOM/ehvrVtm8nVhwxYkxejOA1Z ZL9QGW2SDt62k0GkWFKivp6vaLRzted5ZWxogWVJSug2dgQPlg2/TGK8Kc1qw4ZZ4GV7xZ izTm65cTwy4uR2Kbqua7gfheciyjwpKIeeYrJCPSzB5wjAv6OmfNXYb/OkpncQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683651909; a=rsa-sha256; cv=none; b=qTpBecoyT8F6wgLh1hgZBEKyNo1gbPekyqvRhWGMGbCMhYrLjE7Lws6rVP9SHsq3TTnw3l ZEQGBRTWtNzPUxm3zo2zYlBS8R2QfZoPcQznzf3LrRWt9yb4G0leotw4l6TKnKImTIGNPb Vp2xV1iYFoCLnEamPfVeS24jJiZ65tdGQiry86k3PAJoeqBRJDV1PAzyOa9Sti8ziP9vnJ +uXmR/v7kQxuQPX7+SYAi87OBBeUUOQLZ0GNuwBCynF87EPg6OmuAyt5WvifMqO6Alk7Xe oOEtWS+y62YZRIkON/iigXGRBcvPk4xW5gCNkYYRGZbgS2bWAA9OkVEJUyX7KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG4KK35cBzbt4; Tue, 9 May 2023 17:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 349H59jN080003; Tue, 9 May 2023 17:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349H59t9080002; Tue, 9 May 2023 17:05:09 GMT (envelope-from git) Date: Tue, 9 May 2023 17:05:09 GMT Message-Id: <202305091705.349H59t9080002@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ea6dd3d1d451 - main - Revert "cpuset: increase userland maximum size to 1024" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ea6dd3d1d4519c2798f7417c826afd6739b84383 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ea6dd3d1d4519c2798f7417c826afd6739b84383 commit ea6dd3d1d4519c2798f7417c826afd6739b84383 Author: Ed Maste AuthorDate: 2023-05-09 13:40:27 +0000 Commit: Ed Maste CommitDate: 2023-05-09 17:05:00 +0000 Revert "cpuset: increase userland maximum size to 1024" This reverts commit 76887e84be975698b14699d7d0dfb157d73e9990. struct vm_exit currently requires that cpuset_t be identical in userland and kernel. This will be recommitted after these are decoupled. PR: 271330, 269572 Reported by: corvink Sponsored by: The FreeBSD Foundation --- sys/sys/_cpuset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h index 676f9855f384..b75ee595da3c 100644 --- a/sys/sys/_cpuset.h +++ b/sys/sys/_cpuset.h @@ -40,7 +40,7 @@ #define CPU_SETSIZE MAXCPU #endif -#define CPU_MAXSIZE 1024 +#define CPU_MAXSIZE 256 #ifndef CPU_SETSIZE #define CPU_SETSIZE CPU_MAXSIZE From nobody Tue May 9 17:11:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG4TB6b11z49Chw; Tue, 9 May 2023 17:11: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 4QG4TB5mLxz47Lb; Tue, 9 May 2023 17:11:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683652318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=17Y2DXTRLtW6F6898Iz7nQrr/9t/mo1IoSNgH37lz9Q=; b=IEKCK9ot1gxMFe2eBXwb7hWYiMASf5x6+IpTFLsvZ8dtEUerxolFM4aJDkHJI0B0T242bb S2UNRrHHFvj3ra5q/l75efFLs3fkp+UVLjrcXqHE8E/7ncC+zsI31ehGtxhlJ8QsBXKHO0 MLzaj8T6H5IUFyw/cX5sNCtHLfD37PJYy3k+KCfQuFJS8BfgBqNJS8+l0/NNB4KXIuw/9k l+lJsZCQrtIAZATubeuRLQctotDA6p9LNLvx+zfDunmUYq3BaGKCUF2XasacFmsxchQdE/ vkl1UsSqQtMo5XbEd7gHl2XN3Roi4O4aT8j7OgyE8da5+HeV1FJQnVEJL0DzQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683652318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=17Y2DXTRLtW6F6898Iz7nQrr/9t/mo1IoSNgH37lz9Q=; b=LdggTYk5frcyYtjH/2498aSewMtVefiDk755RReFP5FIzFMBvT48CJWhw2O2+UoLmNW0WM +yhT/9ouf3JaVocvH/an+/Jf+3Hx4D6TS039mnwQ32TbZZRWyDmkdP5lOL8/lQ+YHkF6rQ KwKlbUegkjy2LsSwJ8TCohQgVx3+DDfFX3IKg9suOjWuesSL+vQJ2w/5Fsg4n2U1TmwmeL rrh4GM4Rone3CYYbGZoB6iDWwFTs++Jr11CQHajXM1vq8POJWNE8vbWFrOIaSZQqbCQ0Dz Eld0r69FVvYRmypNvdCid2byz0w4xcUm6n756303Awowjwa+dDr4OrqQ0p7+Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683652318; a=rsa-sha256; cv=none; b=yIfVFhc83Bms27LWBnf4bWBbGFl/GrxaJTdwxVyIKqLaZpDbfqFfadF2fxqv79Zw2zS8D9 VfDMTJE6uKxCZHeKH0josybJzui8F/Uh/3rvblTAaUm1I71LLK0dp9SlgahcHNvZKsmRja P3z3/bEmXU/kGQZygFf5naa5YooRJ1xitSySntCXWFCpTIYKfKQ/Oucl33ttFLFjEcXC1L hZ1Vyq0qInJpg7vbubiFuoZyX2sPiU4P2fFsy9azQKvQdY85Pm88o/O8QmThGEhKPoVAFv c6Uaa1YSfe4XZA1lN1BIWybrPUp+wxBCOXR/c/MIUqNoe6eufUdMrXstnZzsJQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG4TB4qGTzbsF; Tue, 9 May 2023 17:11: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 349HBwEn095718; Tue, 9 May 2023 17:11:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349HBwCs095717; Tue, 9 May 2023 17:11:58 GMT (envelope-from git) Date: Tue, 9 May 2023 17:11:58 GMT Message-Id: <202305091711.349HBwCs095717@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 8b0dafdb2f18 - main - vm: implement vm_page_reclaim_contig_domain_ext() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b0dafdb2f18b9bdc464a4ddbcfd749c3d3875f1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=8b0dafdb2f18b9bdc464a4ddbcfd749c3d3875f1 commit 8b0dafdb2f18b9bdc464a4ddbcfd749c3d3875f1 Author: Andrew Gallatin AuthorDate: 2023-05-08 13:25:40 +0000 Commit: Andrew Gallatin CommitDate: 2023-05-09 17:09:34 +0000 vm: implement vm_page_reclaim_contig_domain_ext() Implement vm_page_reclaim_contig_domain_ext() to reclaim multiple contiguous regions at once. This makes it more efficient for users that need multiple contiguous regions to reclaim those regions efficiently. This is needed because callers like ktls may need to reclaim many contiguous regions, and each scan of physical memory can take multiple seconds on a large memory machine (order of 100GB of RMA). Rather than modifying the core algorithm, I extended vm_page_reclaim_contig_domain() to take a "desired_runs" argument to allow the caller to request that it reclaim more than just a single run. There is no functional change intended for all existing callers. The first user for this interface is the ktls code (https://reviews.freebsd.org/D39421). By reclaiming multiple runs, ktls goes from consuming hours of CPU to refill its buffer zone to just seconds or minutes. Differential Revision: https://reviews.freebsd.org/D39739 Sponsored by: Netflix Reviewed by: alc, jhb, markj --- sys/vm/vm_page.c | 69 +++++++++++++++++++++++++++++++++++++++++++------------- sys/vm/vm_page.h | 3 +++ 2 files changed, 56 insertions(+), 16 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 90413f235ec0..4b967a94aa1f 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -2995,9 +2995,7 @@ unlock: #define NRUNS 16 -CTASSERT(powerof2(NRUNS)); - -#define RUN_INDEX(count) ((count) & (NRUNS - 1)) +#define RUN_INDEX(count, nruns) ((count) % (nruns)) #define MIN_RECLAIM 8 @@ -3025,19 +3023,42 @@ CTASSERT(powerof2(NRUNS)); * must be a power of two. */ bool -vm_page_reclaim_contig_domain(int domain, int req, u_long npages, - vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary) +vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, + vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary, + int desired_runs) { struct vm_domain *vmd; vm_paddr_t curr_low; - vm_page_t m_run, m_runs[NRUNS]; + vm_page_t m_run, _m_runs[NRUNS], *m_runs; u_long count, minalign, reclaimed; - int error, i, options, req_class; + int error, i, min_reclaim, nruns, options, req_class; + bool ret; KASSERT(npages > 0, ("npages is 0")); KASSERT(powerof2(alignment), ("alignment is not a power of 2")); KASSERT(powerof2(boundary), ("boundary is not a power of 2")); + ret = false; + + /* + * If the caller wants to reclaim multiple runs, try to allocate + * space to store the runs. If that fails, fall back to the old + * behavior of just reclaiming MIN_RECLAIM pages. + */ + if (desired_runs > 1) + m_runs = malloc((NRUNS + desired_runs) * sizeof(*m_runs), + M_TEMP, M_NOWAIT); + else + m_runs = NULL; + + if (m_runs == NULL) { + m_runs = _m_runs; + nruns = NRUNS; + } else { + nruns = NRUNS + desired_runs - 1; + } + min_reclaim = MAX(desired_runs * npages, MIN_RECLAIM); + /* * The caller will attempt an allocation after some runs have been * reclaimed and added to the vm_phys buddy lists. Due to limitations @@ -3066,7 +3087,7 @@ vm_page_reclaim_contig_domain(int domain, int req, u_long npages, if (count < npages + vmd->vmd_free_reserved || (count < npages + vmd->vmd_interrupt_free_min && req_class == VM_ALLOC_SYSTEM) || (count < npages && req_class == VM_ALLOC_INTERRUPT)) - return (false); + goto done; /* * Scan up to three times, relaxing the restrictions ("options") on @@ -3085,27 +3106,29 @@ vm_page_reclaim_contig_domain(int domain, int req, u_long npages, if (m_run == NULL) break; curr_low = VM_PAGE_TO_PHYS(m_run) + ptoa(npages); - m_runs[RUN_INDEX(count)] = m_run; + m_runs[RUN_INDEX(count, nruns)] = m_run; count++; } /* * Reclaim the highest runs in LIFO (descending) order until * the number of reclaimed pages, "reclaimed", is at least - * MIN_RECLAIM. Reset "reclaimed" each time because each + * "min_reclaim". Reset "reclaimed" each time because each * reclamation is idempotent, and runs will (likely) recur * from one scan to the next as restrictions are relaxed. */ reclaimed = 0; - for (i = 0; count > 0 && i < NRUNS; i++) { + for (i = 0; count > 0 && i < nruns; i++) { count--; - m_run = m_runs[RUN_INDEX(count)]; + m_run = m_runs[RUN_INDEX(count, nruns)]; error = vm_page_reclaim_run(req_class, domain, npages, m_run, high); if (error == 0) { reclaimed += npages; - if (reclaimed >= MIN_RECLAIM) - return (true); + if (reclaimed >= min_reclaim) { + ret = true; + goto done; + } } } @@ -3117,9 +3140,23 @@ vm_page_reclaim_contig_domain(int domain, int req, u_long npages, options = VPSC_NOSUPER; else if (options == VPSC_NOSUPER) options = VPSC_ANY; - else if (options == VPSC_ANY) - return (reclaimed != 0); + else if (options == VPSC_ANY) { + ret = reclaimed != 0; + goto done; + } } +done: + if (m_runs != _m_runs) + free(m_runs, M_TEMP); + return (ret); +} + +bool +vm_page_reclaim_contig_domain(int domain, int req, u_long npages, + vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary) +{ + return (vm_page_reclaim_contig_domain_ext(domain, req, npages, low, high, + alignment, boundary, 1)); } bool diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 9563f4ac714c..824a853fb0f7 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -668,6 +668,9 @@ bool vm_page_reclaim_contig(int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary); bool vm_page_reclaim_contig_domain(int domain, int req, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary); +bool vm_page_reclaim_contig_domain_ext(int domain, int req, u_long npages, + vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary, + int desired_runs); void vm_page_reference(vm_page_t m); #define VPR_TRYFREE 0x01 #define VPR_NOREUSE 0x02 From nobody Tue May 9 17:11:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG4TD0KXHz49CZ2; Tue, 9 May 2023 17:12: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 4QG4TC6kFYz477y; Tue, 9 May 2023 17:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683652319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OAmTcsN1Ps6C6XItTFjIavOeF7cjrL4EVaqVROI7Du8=; b=ijDl/zOSJDSxmtmC2zyRkJYCotCiyYWZrdFoWwkh8/vlIzJk7qJ24FIyX4+Of4Zb3bfMyD Mde03vMtbWroj5B/s4CJOSdIOiuQBBgBxy37LOpkhjoyRskVYUUkW/Pj0YQg6HmMRz5Sms fM3P7IwTUHXAfAUE1VCn8xd8I0Sd9mYr1/e0OpLb+2Ld9n042RlobiVPPQCVsd3/BSGkNb nc1prmMns4oowObzV/4ewU5UQVjnDNN+8bo557fNWHeqNG4qqLMXmUDtF8AiLjcFdG9LH4 /Gu+7ya4/HxepF+7gMI6R6f+HJNtfFUw8UtsiL7CtXtXOjEiise/1A6vCPMO0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683652319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OAmTcsN1Ps6C6XItTFjIavOeF7cjrL4EVaqVROI7Du8=; b=k8OArDsScHvUbA3nG23FBCwc5bqXN5Nrv5TAzpMP/57bhc1DYY/uvyi04LmUx7FXd7o7KI AQ1nIDrXYZmAUQHAL0oahSiKgVcUHROxZr3I/hIhVfrLZbIs3xX5w18390rCNVD4gXSR4/ UimpTv49gUjluRAbYCNyAFCCNJCh3yHlb6ZbWfB7B71Q5RTl0zkprIMB+EY8wfj8B7h+5J PQJDKT/+n7RVTdrAmnu04zISOv+6kJlnGw/wtXfqq0xLQOzHD0IIVzkFsXDi8F3P3hx7Wv 1Cl+1ySskpxYMLVQrqKPvujJKK6GlLtesv491KS13fQpEtwcMxxKgbWurrXp6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683652319; a=rsa-sha256; cv=none; b=Dhcra0cE6fZWkD896ydYHFtVQwo7s7eIWniDU5reKCq83p266Dga2yTswJX2mlMRGTIU4o Xb3J6oGpvietg+UWamUcDNVlARvoLndHZ52POIOLUCIuQviRHLJFTjqCof2qOLyx8Vivaz swNyIuB1UfID5NDpaxPoUrK0exlA7e2HLWIbfvslgP0IL1N1gRPp5snC8yemH2tQCl+sB7 I3pQPcdHiGthkMtqxVOsPABgQAg5I2yVKawKhhGl2XTTS1tC+EzsN0BOKJckHa/K/KhrCi OVHBlAGpops57a049Ctmv+37V0uTjEPJ373wjdxmvjrMqi4EJiALCyOAYLJmZQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG4TC5kcKzbsG; Tue, 9 May 2023 17:11: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 349HBx61095737; Tue, 9 May 2023 17:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349HBx7h095736; Tue, 9 May 2023 17:11:59 GMT (envelope-from git) Date: Tue, 9 May 2023 17:11:59 GMT Message-Id: <202305091711.349HBx7h095736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: 198558523361 - main - ktls: re-work alloc thread List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 198558523361a654409b6d3f8d63c12ba3f72ae5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=198558523361a654409b6d3f8d63c12ba3f72ae5 commit 198558523361a654409b6d3f8d63c12ba3f72ae5 Author: Andrew Gallatin AuthorDate: 2023-05-08 13:38:59 +0000 Commit: Andrew Gallatin CommitDate: 2023-05-09 17:09:34 +0000 ktls: re-work alloc thread When the ktls_buffer zone needs to expand, it may fail due to a lack of physically contiguous memory. We tried to rectify that by introducing an alloc thread to provide a context where it is harmless to sleep, and letting that thread repopulate the ktls_buffer zone. However, it turns out that M_WAITOK is not enough, and we must call vm_page_reclaim_contig_domain() to reclaim contig memory. Worse, M_WAITOK results in the allocation essentially busy-looping around vm_domain_alloc_fail() returning EAGIN, causing vm_page_alloc_noobj_contig_domain() to loop and resulting in the alloc thread consuming 100% CPU. To fix this, we change the alloc thread to call vm_page_reclaim_contig_domain_ext() In order to prevent the busy loop around vm_domain_alloc_fail(), we must change the uma_zalloc flags to M_NORECLAIM | M_NOWAIT. However, once that is done, these allocations become no different than the allocations done in the critical path in ktls_buffer_alloc(), so its best to just eliminate them. Since we're no longer doing allocations but just calling vm_page_reclaim_contig_domain_ext(), the name has changed to the ktls reclaim thread. Reviewed by: jhb, markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39421 --- sys/kern/uipc_ktls.c | 82 ++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 48 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 4639355b1558..1e892dde9022 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -88,9 +88,9 @@ struct ktls_wq { int lastallocfail; } __aligned(CACHE_LINE_SIZE); -struct ktls_alloc_thread { +struct ktls_reclaim_thread { uint64_t wakeups; - uint64_t allocs; + uint64_t reclaims; struct thread *td; int running; }; @@ -98,7 +98,7 @@ struct ktls_alloc_thread { struct ktls_domain_info { int count; int cpu[MAXCPU]; - struct ktls_alloc_thread alloc_td; + struct ktls_reclaim_thread reclaim_td; }; struct ktls_domain_info ktls_domains[MAXMEMDOM]; @@ -154,10 +154,10 @@ SYSCTL_BOOL(_kern_ipc_tls, OID_AUTO, sw_buffer_cache, CTLFLAG_RDTUN, &ktls_sw_buffer_cache, 1, "Enable caching of output buffers for SW encryption"); -static int ktls_max_alloc = 128; -SYSCTL_INT(_kern_ipc_tls, OID_AUTO, max_alloc, CTLFLAG_RWTUN, - &ktls_max_alloc, 128, - "Max number of 16k buffers to allocate in thread context"); +static int ktls_max_reclaim = 1024; +SYSCTL_INT(_kern_ipc_tls, OID_AUTO, max_reclaim, CTLFLAG_RWTUN, + &ktls_max_reclaim, 128, + "Max number of 16k buffers to reclaim in thread context"); static COUNTER_U64_DEFINE_EARLY(ktls_tasks_active); SYSCTL_COUNTER_U64(_kern_ipc_tls, OID_AUTO, tasks_active, CTLFLAG_RD, @@ -303,7 +303,7 @@ static MALLOC_DEFINE(M_KTLS, "ktls", "Kernel TLS"); static void ktls_reset_receive_tag(void *context, int pending); static void ktls_reset_send_tag(void *context, int pending); static void ktls_work_thread(void *ctx); -static void ktls_alloc_thread(void *ctx); +static void ktls_reclaim_thread(void *ctx); static u_int ktls_get_cpu(struct socket *so) @@ -454,12 +454,12 @@ ktls_init(void) continue; if (CPU_EMPTY(&cpuset_domain[domain])) continue; - error = kproc_kthread_add(ktls_alloc_thread, + error = kproc_kthread_add(ktls_reclaim_thread, &ktls_domains[domain], &ktls_proc, - &ktls_domains[domain].alloc_td.td, - 0, 0, "KTLS", "alloc_%d", domain); + &ktls_domains[domain].reclaim_td.td, + 0, 0, "KTLS", "reclaim_%d", domain); if (error) { - printf("Can't add KTLS alloc thread %d error %d\n", + printf("Can't add KTLS reclaim thread %d error %d\n", domain, error); return (error); } @@ -2702,9 +2702,9 @@ ktls_buffer_alloc(struct ktls_wq *wq, struct mbuf *m) * see an old value of running == true. */ if (!VM_DOMAIN_EMPTY(domain)) { - running = atomic_load_int(&ktls_domains[domain].alloc_td.running); + running = atomic_load_int(&ktls_domains[domain].reclaim_td.running); if (!running) - wakeup(&ktls_domains[domain].alloc_td); + wakeup(&ktls_domains[domain].reclaim_td); } } return (buf); @@ -3121,65 +3121,51 @@ ktls_bind_domain(int domain) } static void -ktls_alloc_thread(void *ctx) +ktls_reclaim_thread(void *ctx) { struct ktls_domain_info *ktls_domain = ctx; - struct ktls_alloc_thread *sc = &ktls_domain->alloc_td; - void **buf; + struct ktls_reclaim_thread *sc = &ktls_domain->reclaim_td; struct sysctl_oid *oid; char name[80]; - int domain, error, i, nbufs; + int error, domain; domain = ktls_domain - ktls_domains; if (bootverbose) - printf("Starting KTLS alloc thread for domain %d\n", domain); + printf("Starting KTLS reclaim thread for domain %d\n", domain); error = ktls_bind_domain(domain); if (error) - printf("Unable to bind KTLS alloc thread for domain %d: error %d\n", + printf("Unable to bind KTLS reclaim thread for domain %d: error %d\n", domain, error); snprintf(name, sizeof(name), "domain%d", domain); oid = SYSCTL_ADD_NODE(NULL, SYSCTL_STATIC_CHILDREN(_kern_ipc_tls), OID_AUTO, name, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, ""); - SYSCTL_ADD_U64(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, "allocs", - CTLFLAG_RD, &sc->allocs, 0, "buffers allocated"); + SYSCTL_ADD_U64(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, "reclaims", + CTLFLAG_RD, &sc->reclaims, 0, "buffers reclaimed"); SYSCTL_ADD_U64(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, "wakeups", CTLFLAG_RD, &sc->wakeups, 0, "thread wakeups"); SYSCTL_ADD_INT(NULL, SYSCTL_CHILDREN(oid), OID_AUTO, "running", CTLFLAG_RD, &sc->running, 0, "thread running"); - buf = NULL; - nbufs = 0; for (;;) { atomic_store_int(&sc->running, 0); tsleep(sc, PZERO | PNOLOCK, "-", 0); atomic_store_int(&sc->running, 1); sc->wakeups++; - if (nbufs != ktls_max_alloc) { - free(buf, M_KTLS); - nbufs = atomic_load_int(&ktls_max_alloc); - buf = malloc(sizeof(void *) * nbufs, M_KTLS, - M_WAITOK | M_ZERO); - } /* - * Below we allocate nbufs with different allocation - * flags than we use when allocating normally during - * encryption in the ktls worker thread. We specify - * M_NORECLAIM in the worker thread. However, we omit - * that flag here and add M_WAITOK so that the VM - * system is permitted to perform expensive work to - * defragment memory. We do this here, as it does not - * matter if this thread blocks. If we block a ktls - * worker thread, we risk developing backlogs of - * buffers to be encrypted, leading to surges of - * traffic and potential NIC output drops. + * Below we attempt to reclaim ktls_max_reclaim + * buffers using vm_page_reclaim_contig_domain_ext(). + * We do this here, as this function can take several + * seconds to scan all of memory and it does not + * matter if this thread pauses for a while. If we + * block a ktls worker thread, we risk developing + * backlogs of buffers to be encrypted, leading to + * surges of traffic and potential NIC output drops. */ - for (i = 0; i < nbufs; i++) { - buf[i] = uma_zalloc(ktls_buffer_zone, M_WAITOK); - sc->allocs++; - } - for (i = 0; i < nbufs; i++) { - uma_zfree(ktls_buffer_zone, buf[i]); - buf[i] = NULL; + if (!vm_page_reclaim_contig_domain_ext(domain, VM_ALLOC_NORMAL, + atop(ktls_maxlen), 0, ~0ul, PAGE_SIZE, 0, ktls_max_reclaim)) { + vm_wait_domain(domain); + } else { + sc->reclaims += ktls_max_reclaim; } } } From nobody Tue May 9 20:09:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG8Pg0BJ8z49R1Q; Tue, 9 May 2023 20:09: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 4QG8Pf6t96z3DRl; Tue, 9 May 2023 20:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683662951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzDsaLVr+EeM4f3Z1l4fbhTep7lnitwQv75BpT3fw4Y=; b=p4GJP8yo13yVRkSe9LXKEtOHmL7R/yxI8PwcWDdxHaLwAMppZcEBPgaV4LHWAJUjIfYxjO d1cT3vuY19gwo9GiC+L4aDspxlA9fd1vFzUPX9h9+jjFSAaMv7LtNtzcUJSAqpIE9+tYY5 eSSEDCQty1cfUdOID2Bl/VZxh5lFzkN6pBFSAFb7KRA/bQuLssPcIWvcHSDKedd6OhvCmp QFc1dCmzFkQI3rCdivSdO+iTc0W0TrHz8t6zKy8A454cuhRzzim0W9I1ofyvFtGp1QY8Uu VlSDANcdylOnYzL41GyNl3exsDpuNquJjkF/UXWuGTMHmQp5BuxyDrBe7iPDmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683662951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pzDsaLVr+EeM4f3Z1l4fbhTep7lnitwQv75BpT3fw4Y=; b=vxe/pNtl3PW+pzXnD+L5F2V95+o9k+WDIudq58CzwkB5sQqMZuQCVqxMCNuKHy2ft4ZKwi H+GRmcFwlXspSzgK3ur4h9+y9Q6SZCupmF7lrMc0aHKtWi8DpWyJJSktacseRSQiPyLEhT yzQ6VyCedVz1/KXJuEV/4dBNACBK3YZja6r59jIh5BVlEJpe1iXfXZ//X0naOyTnit0ids zcdB7/dwccZl+4zPls+tNJhwj1UHFdKx/xeUbbheUDcGeDzzag18OWAnVAu9ld9YAbnC4m jq/MBjparp153Qn9K6TNAWdBaOClMGj7/+cKwcE4k958pZHG8vxLCQqBnXEJFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683662951; a=rsa-sha256; cv=none; b=Ip5dpzuTB3w8AWgDHiTkEe7oWHKEJ4U/46LWRn9B2zV1/N6pOyfOpkEY3mw7532YQCk5te aXP8r4DnCGb9nXmhDR+M7CFZ1fmSg9A6XsWsBIZ9su6k//kE3FwOo2Q+TR8YFkMtdUS5FZ OoViKAkrh3LGApo76Ojj7GOXLuYBdlHOfWZliU0bP9HhZn3ptI4HJsfJkGzqyH0QCXXK3j 8WafU/TIrOxntXq+/m5LBKeV2OPR7GQdi+nrxMav9my5LNQrYKHK7dkrOG6jTj/CNnjleI 8nOHymA0zUN5I+EGTfMw9Lrfl90UuJY3VfunW7hZ+MSoM8nNeaGn6P4h75MjjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG8Pf5yNczhBK; Tue, 9 May 2023 20:09: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 349K9AU5077031; Tue, 9 May 2023 20:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349K9AtK077030; Tue, 9 May 2023 20:09:10 GMT (envelope-from git) Date: Tue, 9 May 2023 20:09:10 GMT Message-Id: <202305092009.349K9AtK077030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: b3fe5d932264 - main - Fix off-by-one error in fsck_ffs(8) chkrange() block-number check. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b3fe5d932264445cbf9a1c4eab01afb6179b499b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=b3fe5d932264445cbf9a1c4eab01afb6179b499b commit b3fe5d932264445cbf9a1c4eab01afb6179b499b Author: Kirk McKusick AuthorDate: 2023-05-09 20:08:10 +0000 Commit: Kirk McKusick CommitDate: 2023-05-09 20:08:10 +0000 Fix off-by-one error in fsck_ffs(8) chkrange() block-number check. On an amd64-CURRENT machine with an i-node that refers to a block number that is one too large will cause a core dump, due to writing beyond the end of blockmap[] and corrupting the next heap block, which happens to contain a struct inoinfo in inphash[]. Note that valgrind catches the blockmap[] access. Reported by: Robert Morris PR: 271289 MFC after: 1 week Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/inode.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 04891447254e..00a60157138c 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -381,8 +381,8 @@ chkrange(ufs2_daddr_t blk, int cnt) { int c; - if (cnt <= 0 || blk <= 0 || blk > maxfsblock || - cnt - 1 > maxfsblock - blk) { + if (cnt <= 0 || blk <= 0 || blk >= maxfsblock || + cnt > maxfsblock - blk) { if (debug) printf("out of range: blk %ld, offset %i, size %d\n", (long)blk, (int)fragnum(&sblock, blk), cnt); From nobody Tue May 9 21:16:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QG9vD5Lssz49WKc; Tue, 9 May 2023 21:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QG9vD4bzfz3KXW; Tue, 9 May 2023 21:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683666984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GfG3zPEkC4hJPw0Zg8XQdtvGcw51ub48ABmU99CibjI=; b=MAkidCuBU2gvaaviCqPwP4u2ZlFjcWD2jUeDvkFDeVhq0hNdity1c93gAptDe6T+//MhP5 Wgbw30ByC7o6OQX6bNs7HDFrNaZQfXlj6MTZzb+NA5F/c0MYx1eAFqk+997b8maCK4cJsB fbquzWAYVxLqRT23ik7r1tPPGv+jLMDTseeIK0MCj/ZsZFDaouDEpDJrhevAdIwZ+C13zE pNSayHSDx0f4uO8RoP354oq2yr0iytAOYowbcsdI5yw9k7U6kDAP7qk1jTGH9ioX4gzf+Q yL92uCU01jU39TxIlf6eKcwiIY02XOdSsg4DCpSmRcw+ZDnW6ay2n2Rz3UThUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683666984; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GfG3zPEkC4hJPw0Zg8XQdtvGcw51ub48ABmU99CibjI=; b=iLEazwhzDsr5sQJlvmZE1IhJLZRW5rDMm+VOidzHImCOfDd821FgeIW8q4sh2QN/ynB/h1 VQJ3S2KUWZYVd71BZdYdCK+CYnMOwTu3981PwVxTjbsXepLxNo6ulo7fMFirHsGYK5fsB7 5bVqHa/wbNFe0Vz6GYj42ltXXPolsVpqPDtiY4jUOZR5M0bLQ21O0Yx8VLJ/waxlTwThmY vnkn8JRA3s6f2+jQ9YezGzW5z3XyiF/5jq6eGt9M7pSdc8JvcbkWUq95ieAcaSYPCJliBr priPyvR10D+UH0CK2CRk5LtVvDiT6wWmSaiVmLU4NEKi71/i1Uz/wQpXuyRJ3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683666984; a=rsa-sha256; cv=none; b=xR9b6caQD4QFb3moIG91baaHqaRc4Dsahbrsx0ObkuTLJKLBWHykYnTALZ4t+cbBITKR05 ySJQceAs6Qsu8dDCBwunTtlKG8enU/IHs4t6k/Ym9X+gn1aM8tyzmpHTKyEuBNhu6DuHR7 DcljMDsvkIIw5wmiihSQI9U7zHw8Tqpn3MNeXGx9Ww+Gs5izmb0Kga/R9RGPEF+51SPVha X81SckAmexBAfM6V7YIuA+RBASNXv4+upVWg/7I41GkTQFb+GKH2uxpaQxCvigbL9OHSNT yr1dUbXvTPLcHMvpgthK+8ZRoTQOXaKEbnm1cfCvyRVn+4S/GmCPfxbg+e1xjA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QG9vD3hZSzk73; Tue, 9 May 2023 21:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 349LGO9B091564; Tue, 9 May 2023 21:16:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349LGOKG091562; Tue, 9 May 2023 21:16:24 GMT (envelope-from git) Date: Tue, 9 May 2023 21:16:24 GMT Message-Id: <202305092116.349LGOKG091562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: f5f1b9a9828a - main - Cirrus-CI: add gcc12 automatic task on primary GitHub mirror List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f5f1b9a9828a4fdf5b0ba51b291e0e1e7ac7b55f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f1b9a9828a4fdf5b0ba51b291e0e1e7ac7b55f commit f5f1b9a9828a4fdf5b0ba51b291e0e1e7ac7b55f Author: Ed Maste AuthorDate: 2023-05-09 18:26:47 +0000 Commit: Ed Maste CommitDate: 2023-05-09 21:13:44 +0000 Cirrus-CI: add gcc12 automatic task on primary GitHub mirror We want to get GCC coverage via Cirrus-CI, but don't want to trigger excessive runs across all forks and branches. Create a duplicate gcc12 task to run automatically for freebsd/freebsd-src. Reviewed by: jhb Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index f560e9476bc8..9d97ca74e75b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -26,12 +26,18 @@ task: TARGET: arm64 TARGET_ARCH: aarch64 TOOLCHAIN_PKG: llvm15 - - name: World and kernel gcc12 amd64 build and boot smoke test + - name: World and kernel gcc12 amd64 build and boot smoke test (manual) trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 TOOLCHAIN_PKG: amd64-gcc12 + - name: World and kernel gcc12 amd64 build and boot smoke test (FreeBSD repo) + only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN_PKG: amd64-gcc12 timeout_in: 120m install_script: - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} git-lite From nobody Tue May 9 22:33:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGCcs0ZDxz49c6B; Tue, 9 May 2023 22:34:05 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGCcr00cNz3QFK; Tue, 9 May 2023 22:34:04 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.208.180 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=none Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2ad819ab8a9so40341891fa.0; Tue, 09 May 2023 15:34:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683671642; x=1686263642; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=iV85VqET0k6R3AJPVLxN5WnYeCA5fVQDAgrgfaqcSDk=; b=AcIFZQ6auE3L9l2HUBE5uk1NC7ocltwXuUXCVfjBK9ovzpiXGC0xG/XMzX5aTUP5B0 Z1OjaVEbEoFBExmTbyLbbtkjP0dWfK8GKm7xWXkjj/5Loax9sFMQgKkuyMr9JPaRMpuJ Lg0kRFfx7YeLrvJxKpoApNpR5seJ3yNasDjKY8QyJ0lmDd9jN3HeWL51E8cDMF0/wb7x 1QRhrRrXo9vLJZk3Njo8Y1PEGzkB4GE0hI7UzOJ/wzsgYIAdaGe87worFlcejx/63d7I sKJJ+KzPTKa4Eva1tx9Tbn2gA7pI3/R1P8x9yvRXgLxnh+vFFdRiSjoBtHdFfhxTW6Hi 7c6g== X-Gm-Message-State: AC+VfDwsTID2ZtF7YLmbd8Y27ngVkxb0w6goy4hbI9kyqBIshC5lFYaD iq9N9sPwlmHqCixxSFIY5ElPnWHaViDdhQqmmMYbKBxaBj4= X-Google-Smtp-Source: ACHHUZ4sa/7UJ71gsXLJnL+60+TYBkvAeu7/qnreb8WctY8QcPgQp5/VweWufkQNlxZb088ZKiPLX4bWxlpsB8CW0RQ= X-Received: by 2002:a2e:9245:0:b0:2a7:78c3:a3ee with SMTP id v5-20020a2e9245000000b002a778c3a3eemr1155724ljg.45.1683671641702; Tue, 09 May 2023 15:34:01 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202305092116.349LGOKG091562@gitrepo.freebsd.org> In-Reply-To: <202305092116.349LGOKG091562@gitrepo.freebsd.org> From: Ed Maste Date: Tue, 9 May 2023 18:33:50 -0400 Message-ID: Subject: Re: git: f5f1b9a9828a - main - Cirrus-CI: add gcc12 automatic task on primary GitHub mirror To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [1.05 / 15.00]; NEURAL_SPAM_LONG(0.98)[0.983]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_SPAM_SHORT(0.10)[0.102]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_MEDIUM(-0.04)[-0.036]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.180:from]; MIME_TRACE(0.00)[0:+]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.180:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FREEFALL_USER(0.00)[carpeddiem]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_NONE(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Queue-Id: 4QGCcr00cNz3QFK X-Spamd-Bar: + X-ThisMailContainsUnwantedMimeParts: N On Tue, 9 May 2023 at 17:16, Ed Maste wrote: > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=f5f1b9a9828a4fdf5b0ba51b291e0e1e7ac7b55f > > commit f5f1b9a9828a4fdf5b0ba51b291e0e1e7ac7b55f > Author: Ed Maste > AuthorDate: 2023-05-09 18:26:47 +0000 > Commit: Ed Maste > CommitDate: 2023-05-09 21:13:44 +0000 > > Cirrus-CI: add gcc12 automatic task on primary GitHub mirror > > We want to get GCC coverage via Cirrus-CI, but don't want to trigger > excessive runs across all forks and branches. Create a duplicate gcc12 > task to run automatically for freebsd/freebsd-src. > > Reviewed by: jhb > Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40027 From nobody Tue May 9 23:30:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGDtJ3DbCz49gxH; Tue, 9 May 2023 23:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGDtJ2fw3z3lVr; Tue, 9 May 2023 23:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683675048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Er8DarG2VkObAQv+aLCLK52xGN3kFqk/rfZKziZb28o=; b=Nox1Aa3D1ovHW53f/3oqQ48XqLbWc6RQBY3HRyQOtUVmzo/i4TL3vjq7XhubPY8mNoaM0o VvyuYcbKdtRjambM0r/TpOGjcpTomqkfiwZe7+5BDQrqAbM8UvGiUva5hYMSGv3JryzKAj cP3XBgLgMbcWUCPZ5l9t5O4cZ8xfDYO3Ub+WxNRStGBHWvSMGqBHIfL6+8P9RVxlq8HePz Ow15gpJuegsN0syPoZxsOC/Sa2btPE9R7YT2Qzqf3xPEQtyT6qU407f3le7WvEy3JhJQry MxQ1bl3bLLGwprLigSWwakNhE90gsPAmLgHdoYOW575mgOK2TrJXj5LJ0PgtsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683675048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Er8DarG2VkObAQv+aLCLK52xGN3kFqk/rfZKziZb28o=; b=Y937eBB5EOyYCLH4A/mErpHxycYOfZqKIaKwc6TQgz7IWMPjH2K7H2hAeKuFgmHRaK6Pxc jhU/b5Agn9xIQpLEBj4Zahe97nubXdKJ4iN/haoPhNjrWgCBXZ5BghnmuiwNr+DuGy266H 9uDBhtMqPngElTiA0LlmWvP5EV4cSj8e589ZCS+QbCxLHtjVZ7Lizh9rs0K29JIO6dQD4f S6CMct5Mx83BOxQwBn3UbrkY7xHfZUM8Gdgoajye9q0zDveQe9oL8vAYZ+M+7i2qcWkZIh FQerDLqbLekQKzU/YLKboZlllCpxvNdtKyjgS43C7OXAhMc3F8OPiixUVOJx7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683675048; a=rsa-sha256; cv=none; b=I5FSn82td01nWNlriWVZOZWyf/c4+fdC2XgYD5OV4zjpDPewKfCCP5sv3vdRO+Xs3iAWa5 OBiKHzSoGUwagbmAsoikSAl58DfzKgjO61u84Wncltxc6DyF138eUmS4k5tczBWdg8BJsJ fu6yXxNofQBQHDagrAXqaf0H+HsgwUgJsW05NsnUE+LNJuQ/xhIscDIpNv/2yqUtmnGQv9 ZgNVAqa9EQ+ENHRCgJ8csoI8bSXd25BW00uYbKBAD88t9hdLJA5pwlhjNN+qZx1J0rGg9X q3ZPktaeDufzNWFVHBkjeCPArmhM1pFIK/58GwOd6DUyZn/xsTNq6RUG6aQ8Yw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGDtJ1kQWzn24; Tue, 9 May 2023 23:30: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 349NUmkR014378; Tue, 9 May 2023 23:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349NUmsX014377; Tue, 9 May 2023 23:30:48 GMT (envelope-from git) Date: Tue, 9 May 2023 23:30:48 GMT Message-Id: <202305092330.349NUmsX014377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c55b7e522629 - main - freebsd-update: Fix merging already-updated files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c55b7e522629cb78adeb54bd9964304481d55eab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c55b7e522629cb78adeb54bd9964304481d55eab commit c55b7e522629cb78adeb54bd9964304481d55eab Author: Colin Percival AuthorDate: 2023-05-05 03:00:58 +0000 Commit: Colin Percival CommitDate: 2023-05-09 23:28:09 +0000 freebsd-update: Fix merging already-updated files When performing an "upgrade" (moving between FreeBSD releases, as opposed to "update" which merely applies security/errata updates to the installed release) FreeBSD Update: 1. Generates a list of "files needing to be merged", namely those files which don't match the version installed in the "old" release and have paths matching the MergeChanges configuration directive (by default, /boot/device.hints and everything under /etc/). and later on, 2. Compares the currently-installed files to the versions in the "new" release, removing index entries for files which "don't need to be updated because they're not changing". Unfortunately if a file falls into both of these categories -- that is to say, if a file in /etc/ is the same as the version in the new release and not the same as the version in the old release -- the resulting "merge" step saw that the file was no longer listed as being part of the new release, resulting in the file being deleted. For the first 18 years of FreeBSD Update's existence, this never happened, since $FreeBSD$ tags resulted in "new release" files always being different from any files systems would already have installed. This commit fixes this behaviour by only placing a file into the "files needing to be merged" list if it does not match the version in the old release *or* the version in the new release. Reported by: des Reviewed by: delphij (earlier version), des, emaste MFC after: 7 days X-EN-Candidate: yes Differential Revision: https://reviews.freebsd.org/D39973 --- usr.sbin/freebsd-update/freebsd-update.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh index 03eefee75bbd..cbc153fc1af2 100644 --- a/usr.sbin/freebsd-update/freebsd-update.sh +++ b/usr.sbin/freebsd-update/freebsd-update.sh @@ -1677,11 +1677,12 @@ fetch_inspect_system () { echo "done." } -# For any paths matching ${MERGECHANGES}, compare $1 and $2 and find any -# files which differ; generate $3 containing these paths and the old hashes. +# For any paths matching ${MERGECHANGES}, compare $2 against $1 and $3 and +# find any files with values unique to $2; generate $4 containing these paths +# and their corresponding hashes from $1. fetch_filter_mergechanges () { # Pull out the paths and hashes of the files matching ${MERGECHANGES}. - for F in $1 $2; do + for F in $1 $2 $3; do for X in ${MERGECHANGES}; do grep -E "^${X}" ${F} done | @@ -1689,9 +1690,10 @@ fetch_filter_mergechanges () { sort > ${F}-values done - # Any line in $2-values which doesn't appear in $1-values and is a - # file means that we should list the path in $3. - comm -13 $1-values $2-values | + # Any line in $2-values which doesn't appear in $1-values or $3-values + # and is a file means that we should list the path in $3. + sort $1-values $3-values | + comm -13 - $2-values | fgrep '|f|' | cut -f 1 -d '|' > $2-paths @@ -1703,10 +1705,10 @@ fetch_filter_mergechanges () { while read X; do look "${X}|" $1-values | head -1 - done < $2-paths > $3 + done < $2-paths > $4 # Clean up - rm $1-values $2-values $2-paths + rm $1-values $2-values $3-values $2-paths } # For any paths matching ${UPDATEIFUNMODIFIED}, remove lines from $[123] @@ -2711,7 +2713,7 @@ upgrade_run () { # Based on ${MERGECHANGES}, generate a file tomerge-old with the # paths and hashes of old versions of files to merge. - fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT tomerge-old + fetch_filter_mergechanges INDEX-OLD INDEX-PRESENT INDEX-NEW tomerge-old # Based on ${UPDATEIFUNMODIFIED}, remove lines from INDEX-* which # correspond to lines in INDEX-PRESENT with hashes not appearing From nobody Wed May 10 00:20:37 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGFzn4rZzz49lNX; Wed, 10 May 2023 00:20: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 4QGFzn4R2mz3pCV; Wed, 10 May 2023 00:20:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683678037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=037Mpi3xixoe5hy6pJdKvniNh0laAD8pj5gc2z1jSXQ=; b=bMX0zvbAuuVpEuRlZ0wLyyfIvqVEcSZFw557fK1Ksq72FDDqFFlSuXPa+MCEiY/PED2RoL +6a7tiENux8+qcwZR5APJLbQOfaZEAURcUMWmmQ+hZN2KYcvNqM4YcfK0TpssPrXAPaloy 6yfN9ENeBJlgrJgWoArlrHrM+CbBlmiR9LnAsiTPnv7HcX1a6LQSxZRp+qVri/QQAVk3Fq 7j5P3bDdvgmpR6O0GrYvlhDNGs44hitppXKhtKHMEljNhZhhdyDSyjW40vk6N8Jx3Q4srR 3aEbeA2wAjicPeJqrfcob0pGtXNM0mDYeuI88m4udPNIpKD22Yy8dtiXtM4OyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683678037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=037Mpi3xixoe5hy6pJdKvniNh0laAD8pj5gc2z1jSXQ=; b=Sjzy89dfW6DWSfsMnXpfiXLBb1aPG7o0tBP/BQEn4YNoGciFJ6v9N22po5tglYzSHrBzBH NjK+Hc21hbyJosKvQw5oc63hlXrBEBtMu0Xfgt/vdjklAemMdcbtWalXiSp2Y1emBSPRgJ RfNLe+NOZwGB1Dudtn55ua4OtrBl3T84BcU6x+O5ZEIa39pPPK1jXFs6GzeTW2M9jeWClN dxXSSOdtvGj2UY1/2741m+DUQuDmv7acs7LgOvK/YXdFEP2iRdjZENIk0uhFvUlVm9za// FXWYg3NjWx7lFjFqUap0qPp7yfLWt7LYFPcaaER4gR0QsPhq2eqXdZCQw/lGbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683678037; a=rsa-sha256; cv=none; b=aZ4Y5BOHLHsRgDF4MG5GapCKN9JPK+Juk/iQFU88iQIfiBZMjT7yjS764eNhuIFWOyBgMU vnslU8MUgIpD4IBfl4gzvE7GgJL0LaKFfZOLIXMU+KJiNehptAwra7FbxiEUHXpdIotwfF xMsHrlJkv0dTpkhApKY9DI9QtUfd73SU01w3qWkpcOrgRwDkC5dWTQnBtRKMxxFlDqGP9f NAM4xW9OsZfBpYnzCtCAdmDwJvbEwuHRewi8TOFYasn9SZ7nY6b3ia7w+8flvZDKcbnSDv B1rpxp2CVO1M/hYb2QGRd9EPhFq3RidiUOh4M7pAoBa6SIDaAWZaseXDsaiTQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGFzn3W4Zzp7v; Wed, 10 May 2023 00:20: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 34A0KbKX097795; Wed, 10 May 2023 00:20:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A0Kbd0097794; Wed, 10 May 2023 00:20:37 GMT (envelope-from git) Date: Wed, 10 May 2023 00:20:37 GMT Message-Id: <202305100020.34A0Kbd0097794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e32fecd0c2c3 - main - loader: install help files only once List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e32fecd0c2c3ee37c47ee100f169e7eb0282a873 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e32fecd0c2c3ee37c47ee100f169e7eb0282a873 commit e32fecd0c2c3ee37c47ee100f169e7eb0282a873 Author: Ed Maste AuthorDate: 2023-05-05 17:43:33 +0000 Commit: Ed Maste CommitDate: 2023-05-10 00:18:19 +0000 loader: install help files only once Every file should be installed exactly once by `make installworld`. This is especially important for pkgbase. Loader help files were being installed by each loader variant (e.g., the simp, lua, and 4th EFI loaders). Add a (slightly hacky) mechanism to skip installing help files for all but one variant. PR: 271178 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40021 --- stand/efi/loader_4th/Makefile | 1 + stand/efi/loader_lua/Makefile | 1 + stand/i386/loader_4th/Makefile | 1 + stand/i386/loader_lua/Makefile | 1 + stand/loader.mk | 2 ++ stand/userboot/userboot_4th/Makefile | 1 + stand/userboot/userboot_lua/Makefile | 1 + 7 files changed, 8 insertions(+) diff --git a/stand/efi/loader_4th/Makefile b/stand/efi/loader_4th/Makefile index 3659f7efe673..a85fcdbb70b9 100644 --- a/stand/efi/loader_4th/Makefile +++ b/stand/efi/loader_4th/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=4th +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/efi/loader_lua/Makefile b/stand/efi/loader_lua/Makefile index 3a4268440cf6..3766588015ad 100644 --- a/stand/efi/loader_lua/Makefile +++ b/stand/efi/loader_lua/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=lua +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/i386/loader_4th/Makefile b/stand/i386/loader_4th/Makefile index 3659f7efe673..a85fcdbb70b9 100644 --- a/stand/i386/loader_4th/Makefile +++ b/stand/i386/loader_4th/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=4th +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/i386/loader_lua/Makefile b/stand/i386/loader_lua/Makefile index 3a4268440cf6..3766588015ad 100644 --- a/stand/i386/loader_lua/Makefile +++ b/stand/i386/loader_lua/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=lua +INSTALL_LOADER_HELP_FILE=no .include "../loader/Makefile" diff --git a/stand/loader.mk b/stand/loader.mk index b30e9f4e66b7..2048fec750e4 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -171,8 +171,10 @@ CFLAGS+= -DELF_VERBOSE HELP_FILES+= ${LDRSRC}/help.common CFLAGS+= -DHELP_FILENAME=\"${HELP_FILENAME}\" +.if ${INSTALL_LOADER_HELP_FILE:Uyes} == "yes" CLEANFILES+= ${HELP_FILENAME} FILES+= ${HELP_FILENAME} +.endif ${HELP_FILENAME}: ${HELP_FILES} cat ${HELP_FILES} | awk -f ${LDRSRC}/merge_help.awk > ${.TARGET} diff --git a/stand/userboot/userboot_4th/Makefile b/stand/userboot/userboot_4th/Makefile index a96efa8a52ba..b4b4b895e29b 100644 --- a/stand/userboot/userboot_4th/Makefile +++ b/stand/userboot/userboot_4th/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=4th +INSTALL_LOADER_HELP_FILE=no .include "../userboot/Makefile" diff --git a/stand/userboot/userboot_lua/Makefile b/stand/userboot/userboot_lua/Makefile index d5b95c53641b..bba0f4a3fd71 100644 --- a/stand/userboot/userboot_lua/Makefile +++ b/stand/userboot/userboot_lua/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ LOADER_INTERP=lua +INSTALL_LOADER_HELP_FILE=no .include "../userboot/Makefile" From nobody Wed May 10 01:10:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGH5N26Mdz49p0h; Wed, 10 May 2023 01:10: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 4QGH5N0sv2z3rCR; Wed, 10 May 2023 01:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ab6wqkiVMB42VlN04Ql+02H2zE3t8Aax+zqvwIYAbM=; b=gB/Iqs4lm9efmKxiREDZt/LPjHBtgWpZGIQNn0oeL414jQSW+9by0q27yM/kpt4quxTzLO mBxU8DPJSQYTxiuPot8EtNBR8hP6f7xEiRyCU6jLqhR2dEHfyuVD/CUy+ek9+unGpV+QqT KmNTcSqK9xtvzZM/2e9CVmdBY+xTZqxFHqbPMCx21GowMLEsTB3UsC6q/FtoKStl2oSjjU 60QmXjDKPcHvo7X3yK7YQUhI2Tf/dMkJIJtknqIk1IFOX4X2AstT5kfjV3FNeaNndqCD82 kEXiuaJjkJLK6kCsRI8zgxSwkBchi0VY8/kXESPiM9ljUoKUKbc4z2+Frjuidg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Ab6wqkiVMB42VlN04Ql+02H2zE3t8Aax+zqvwIYAbM=; b=S0JC0wDHGE42I6SyrrBleNeGsxxiSj8pHOVNf3wU00YOAyIq+GXU4p1zCXmFaUAQGSIb4q Yv4Flqhyj+L1Ti8UiZNWXW9dJxgq7ouq45+YojRy0n4dcwMqWQ8PTHPTDA7u0aGZi8J2sa vErJ/JhvFDH/Micbm7v7hHY7eJwhSHDDK19CrEexAAjz2+P+c+9VRIfbEVXBkNDDFYOoEs GW3SGwET81aEoLM149NrRh60+yiQWLQ+gZV9wA+6e5qxIyE2XTeTbu/vzSm+VMzaeQMZVe 6Wkp9SX8LKc1QogC5kkRpVvRgjeW8Qgl2u8luUnoHtVbZa/mzXHX1pwsBmZHTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683681032; a=rsa-sha256; cv=none; b=YKheF5UZZy/LFrsfC6NAfVjk6HoqPoMTAOOJ6oEkDAr37bzpDmjtlRPsPW/2GCQ1l3GsX6 z4bdPPDT7oBOM4sdjlaeaPRfSrmBdhczDira6z02MSTnsP6rezN+aAGgfEm5ura64lwMzv VIdUIGiNH0PoMe0Oj5pqrMU1Zhoos3jwBTyyVmRWYc9Yhyf1mwuwX/cTqdYUX1zss/biIe ehe/keujLtXzn0MiXBWhIMunK1vFOznQ2CCm1t2X9c0ZtcUgl6eNvNOVly02W7AYZS8TG+ eusZBJHX7X/JsqTCHCXNWfDge1Ob64iLnYYN/p/+2+sRHmpOn1p//qE1mJ5rTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGH5M74kDzqxR; Wed, 10 May 2023 01:10: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 34A1AV9l078845; Wed, 10 May 2023 01:10:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A1AVEP078844; Wed, 10 May 2023 01:10:31 GMT (envelope-from git) Date: Wed, 10 May 2023 01:10:31 GMT Message-Id: <202305100110.34A1AVEP078844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b6271cc0d0cd - main - includes: avoid installing if_wg.h twice List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6271cc0d0cd6e4f9592ac88b3892c3931e5f25d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b6271cc0d0cd6e4f9592ac88b3892c3931e5f25d commit b6271cc0d0cd6e4f9592ac88b3892c3931e5f25d Author: Ed Maste AuthorDate: 2023-05-10 00:28:44 +0000 Commit: Ed Maste CommitDate: 2023-05-10 01:09:39 +0000 includes: avoid installing if_wg.h twice if_wg.h was installed via dev/wg in LSUBDIRS and also explicitly. We want to install only wg/if_wg.h not the other headers, so add dev/wg to the skip list in the copies and symlinks targets. PR: 271266 Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40031 --- include/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Makefile b/include/Makefile index 20d735394d9d..eba2675e1d1f 100644 --- a/include/Makefile +++ b/include/Makefile @@ -357,7 +357,7 @@ copies: .PHONY .META cd ${SDESTDIR}${INCLUDEDIR}; find ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto \ machine machine/pc ${_MARCHS} -maxdepth 1 -mindepth 1 -type l \ -name "*.h" -print -delete || true -.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec} ${LSUBSUBDIRS} +.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec:Ndev/wg} ${LSUBSUBDIRS} cd ${SRCTOP}/sys; \ ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${SDESTDIR}${INCLUDEDIR}/$i @@ -393,7 +393,7 @@ symlinks: .PHONY .META cd ${SRCTOP}; ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} \ $$(printf '../../../%s ' sys/$i/*.h) ${SDESTDIR}${INCLUDEDIR}/$i .endfor -.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec} +.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec:Ndev/wg} cd ${SRCTOP}; ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} \ $$(printf '../../../../%s ' sys/$i/*.h) ${SDESTDIR}${INCLUDEDIR}/$i .endfor From nobody Wed May 10 01:10:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGH5P3bgfz49p0m; Wed, 10 May 2023 01:10: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 4QGH5P2gVqz3rZk; Wed, 10 May 2023 01:10:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MNs48xCHF+7a2OhTuAF+rimqrGKwTVTjAGCOwuk3QkM=; b=GYnYvRPaZTpqCvYuZUH1IsEQ5i9Gf4BmW4m7WSdvJvnI9YsNzBoBaXE/UmOEq4x+62t/Hx +NrudZiaO/ZHiRQmZBnNmDv74ato1PtLBjZ1nK7Inv9TQT49RfEgQlWrncNK76Pf29xTZq ONC8lksBJdztLt7FvnSYI2KqNHj4DIQklYAxrEj33jpWS3UP3QL4Nua069UR/2L67Bemrv 14M9blRLzFFni60Vzbd9a0HB0GBMaCTc4No4fWaqhZl/dZqBMIC8mnMg/IUHZ4CK38ke2k j6MyT0+LWIc5WcZNI8PDLdH06XzW/LgdLXoLYrlpJL5vM05xzdoERac1/KGZ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681033; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MNs48xCHF+7a2OhTuAF+rimqrGKwTVTjAGCOwuk3QkM=; b=ZTGu9fP6Txqba3LK6aFApLtwt8jLiGq5vdUD1Y6/ncId16ueuyKBJWF2ExhOX8Dr+chuHf bcXuBKGv2YBPab0tCWuo/ADwt6+j/JY0EvwzTQvveIJDu77tAJtUOp39lZm7Wcb+lIjIpX xcFjvBjmxd0VKTkjxPPb7UvKO0eUnupN5v6Oi0fADBDiGcvoTBjTdym7mrf9GLPxtgwHqJ kyXOF6Hw3Yn4khn0ULNAlyZ0V9sklzN/w8sHJ1oV/nUgf8cr50ckQwjqK/pYsWNimJgrzS YYPhbe+cP6Ys7JhQw7P7me8y6+MGjtpZhitusHZ0aGnQnuSsrZxM52ZFcxPomA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683681033; a=rsa-sha256; cv=none; b=uiUL68sEyX8n8/L44Z2n4Nri3qQvja4iDFrUtSR49/2w484iFEi0Z6+OALnG+nb9Fd+QKv POPm81OqxKxMVhWFVwhfQZn6NaJn+/fuzvgzXFYMi0jpBCOO8cMPE+eVcUtZESMY8DEjaI zzIRhbY5xS5lMJSNSUE5AVy8qaDwu8KI0HMGM6Dm7+9i88Ttt+MewNHsCmTWBjgJGABAxP 8ODbVcluk1A8vTr595dBM2qronge51k4xfFi5jauP2qfMmeBITgvBO4Yi3PrQw7dm7y4pp tcxkU/wMrRYBUvQMVwamHuBFuCl26WOksA7Y5oFPzE0zfsa4ruins0SPeQByeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGH5P0dlgzqYq; Wed, 10 May 2023 01:10: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 34A1AXYu078870; Wed, 10 May 2023 01:10:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A1AXpw078869; Wed, 10 May 2023 01:10:33 GMT (envelope-from git) Date: Wed, 10 May 2023 01:10:33 GMT Message-Id: <202305100110.34A1AXpw078869@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0e04dd3b66c0 - main - pkgbase: report error if files are installed multiple times List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e04dd3b66c053422b90c387f7bbd82a0921bda0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e04dd3b66c053422b90c387f7bbd82a0921bda0 commit 0e04dd3b66c053422b90c387f7bbd82a0921bda0 Author: Ed Maste AuthorDate: 2023-05-05 17:44:39 +0000 Commit: Ed Maste CommitDate: 2023-05-10 01:10:03 +0000 pkgbase: report error if files are installed multiple times Files installed by `make installworld` should be installed only once. PR: 244596 Sponsored by: The FreeBSD Foundation --- tools/pkgbase/metalog_reader.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index 9cc5fd727923..a718a1167ac7 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -401,8 +401,7 @@ function Analysis_session(metalog, verbose, w_notagdirs) warn[#warn+1] = 'warning: ' .. dupmsg .. '\n' end else - -- XXX downgrade to warning until instances in the tree are fixed (PR271178) - warn[#warn+1] = 'error: ' .. dupmsg .. '\n' + errs[#errs+1] = 'error: ' .. dupmsg .. '\n' end elseif not metalogrows_all_equal(rows, false, true) then -- same filename (possibly different tags), different metadata, an error From nobody Wed May 10 09:26:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGV5y0yTcz49cqn; Wed, 10 May 2023 09:26: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 4QGV5y0RMHz4T22; Wed, 10 May 2023 09:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16ZQ6VF3Uv9jDGjw3A/r6ZornZIkfB1yS890sUL1fvY=; b=PjTt4+cA5Nnm5xX+WQlnzzFgFZLdGdYKPK85PETHuK0Ii7YdSmzpVCCaXDFN2IAuNrEQav hWOD4ywe6kKP29hhEW2IqeKlewXP4wLZGW4fzjchyl+XPGs1RJTVpYKfb/2+DQ2pZGqlQh VR5T5pBpZXppLjooMXjbjGP+ZjhAmYjQJSOlLkUqSBQvFn6+Xgcr3/t5vZFiRnqMv+OZdO EZX6Q/7Wo6tyBN6PJoH2b0WKcB2Ve1uCqOKg72tUMvGZWvZGZ3gw+3yQZlwbvhhnVA9Q1i B6WxLZB+YK8xA8ql9yKu30Lfs5u32n5RoGI2Ifa+2YVlGayd/EvD6rSgg+xVxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=16ZQ6VF3Uv9jDGjw3A/r6ZornZIkfB1yS890sUL1fvY=; b=i/J9a9mVBKQ2pSJYg8c+grgsgHr32lZR2y3V6YX6a+7mj/dTsUI2t54YnVIJ40haIma9XB 6KoEpJH7WpGq7rRH/90us8FInyywrLYc4SN7LUDJu1+Rk+upHk5TAGvwKT2s5+0z+IqVXM 7z44GRD2F9HOE/GL/2ib9vazGZ8xFi68SzqqRwMJXiGVcEQnyagPCU/bxXKdM+TVfuZAgF E286zD0yU9E6R2UO+ofeIhA6EwStex8HAs12LrvvIyyhyApyo1jjHbAPIDeds5g12SQyeR h8MQQRcQVzD7HPecvDAbE4WxAWRynAuGWJis0lUxH4+L1TR54UYHeH+XbdogFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683710806; a=rsa-sha256; cv=none; b=lK3WTAS2KPM2f1wn/QNPH/k1Dadh1VN+6COfruAfym5aHsxgKYHM06a0W1Dl8l+zy4Q1pS uhvlkVRAVkEi6fdrBPFs4l9Ew2ydlTOgYlPia7l2eShmHriswIn+RN26vFiB6TcDHuq7Np cftUcvPsoY7hxUP2GLwNB1weVrxTMhGAnJQn+W0gm0y76AZ4scJZ/KGxOav/H0xpDpK1h2 yjk4L9FryJzMd9mpe8bkFYwgNDBV8Q/7/Ct0CRdaxC97rUf/GBP7TI1wbJMmSbIsVWleAB hj+jyOZdYXDb/txbI+gD0wWRx50WvkxJwPuEl2XROxsM+v9ZjO0F+3kK2tC/qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGV5x6ZyGz14nG; Wed, 10 May 2023 09:26: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 34A9QjKn092799; Wed, 10 May 2023 09:26:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9Qj7T092798; Wed, 10 May 2023 09:26:45 GMT (envelope-from git) Date: Wed, 10 May 2023 09:26:45 GMT Message-Id: <202305100926.34A9Qj7T092798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: f1ceb05a469f - main - md5: Fix input error check. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 commit f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-09 17:59:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 09:25:21 +0000 md5: Fix input error check. Fixes: 4849767cb16a MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: tsoome, kevans, lwhsu Differential Revision: https://reviews.freebsd.org/D40017 --- sbin/md5/md5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 98cfb37110d5..bca6a98fc32c 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -686,7 +686,7 @@ MDInput(const Algorithm_t *alg, FILE *f, char *buf, bool tee) switch (input_mode) { case input_binary: case input_text: - if (tee && fwrite(block, 1, len, stdout) != (size_t)len) + if (tee && fwrite(block, 1, len, stdout) != len) err(1, "stdout"); alg->Update(&context, block, len); break; @@ -734,7 +734,7 @@ MDInput(const Algorithm_t *alg, FILE *f, char *buf, bool tee) break; } } - if (len < 0) { + if (ferror(f)) { alg->End(&context, buf); return (NULL); } From nobody Wed May 10 09:26:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGV5z1l3Qz49clJ; Wed, 10 May 2023 09:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGV5z1FrCz4StR; Wed, 10 May 2023 09:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2PyQozv9nb0p1lBfUsYg45ZGj04GLnwAQtTdeGoxSo=; b=UJttPZk3MrQlRwus3djNyi978RVFXGZ+TfLz/H4FGuJu77yYj/zAnlSoeUopW+Mtn2oyQx EcXPnFk47wSLgVr9amduzWzkq4tZcH20iXEMwmajZG5F/SeLZib0nhMZy4qexQ078H/RS7 D77Pecq1INYI7albSM7dVzkY/o8pZm6/E76M99hUQppJz4bBL84nglK+KyvsnN/l5wHGe5 mrsw21gBtXLtwGYo6rIwSSHaaNOUljSEkg407vG7E9fS+yoqDR53xn5feANvOzGNHka6yk f/fgD12qPOwwiQLLbbp+5pXNjH6cWrbzhQ//oGm89Wgy1yXJoUJe1yvDfFXgYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v2PyQozv9nb0p1lBfUsYg45ZGj04GLnwAQtTdeGoxSo=; b=mu9VUJ3cLK0jhnbuNSHGD3Exnmc0Dm8K+h73S3l3E50ndA5YvTSBSvYaV+ehXQZAhMuDVz yT7sZaKI7AJH30THMknxNqMnYONIg6wX8SzWKpeQbBLvxRb0c8hbO9TTHNWYEl4LjNe3tM 7z7i2p3p5eN0k6Emp36qn4QFqSEAkgToNB2rXmvyQrqPRIKoS4UNuQa9r7L7nQU5VnsRrs 6r7pYeo9Lg5UAtGC3qDoGS/o8ef0Fc3pKa7hi9RC4u/19+N+bUI6yhcy4I3LzEvQhm9/vq aTTCYxHoEp5jE6gynpVEDz7Da3CegsbnWSeDw3jWkw8ZiNB4y4ZZAaIVbSJb5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683710807; a=rsa-sha256; cv=none; b=iQxlgI3nCUfKb3MqCd5qrKf0CUxH0TFKIRgVh+tJHNj1xcjYWy7gL16DYqGobQGa9iUjy1 VtdEC9IPxMAPUlF5fNmrKAhbNGqsdS/ZtsGJsaztFEHFUYjUaomfRUyaLLOX6iRtc2DKF7 97X+XLCoQ4QOVD216ulW/EMeozPfQQa/EljJ38xKHzD9wlMa+wFgAajoGSZyXllz5+3e/T Ggh1N1LLTLjYGceqDaYaPwVbjCwSfuqr35cgaU8YO+YF1OWgmmhmovvAqLdcy2pq/7Kxrr xAQJxbWOpYGe/qrcG2QecT8N9z9XVQIbjLerKBAhnqn5ZLG1iA90bW1SQnz/2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGV5z0M7Lz14nH; Wed, 10 May 2023 09:26: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 34A9Qk1Z092823; Wed, 10 May 2023 09:26:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9QkKr092822; Wed, 10 May 2023 09:26:46 GMT (envelope-from git) Date: Wed, 10 May 2023 09:26:46 GMT Message-Id: <202305100926.34A9QkKr092822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 90eaf4b2f98f - main - md5: Include for __FreeBSD_version. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90eaf4b2f98f2678b3dc707f9781a887eee94b1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=90eaf4b2f98f2678b3dc707f9781a887eee94b1a commit 90eaf4b2f98f2678b3dc707f9781a887eee94b1a Author: Dag-Erling Smørgrav AuthorDate: 2023-05-09 17:59:19 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 09:25:21 +0000 md5: Include for __FreeBSD_version. It is usually provided by , but not when bootstrapping. Fixes: 4849767cb16a MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: yuripv, kevans Differential Revision: https://reviews.freebsd.org/D40018 --- sbin/md5/md5.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index bca6a98fc32c..b11fc6971735 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From nobody Wed May 10 09:26:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGV602g7Nz49cfs; Wed, 10 May 2023 09:26: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 4QGV602Bd9z4T59; Wed, 10 May 2023 09:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOz36Ei3fnKfTLOOhsh9pjAwSooJceTL2a26CwFoxdw=; b=s57h6wFucTYTudOOcPsNghTi/0qegDY3H7npfMzBHdkM11rHgF52bClu/0ECeK0aG01L0e HWkr3DxjQkgPu9ddOXC7SakuY5iYvrolcJdsEHXVtqqvIWyMQgKdDS8NfCdKclKWukMMBO arSUrnaU7Vy8iORHVyyqCoKGkm+mh0+U8woR5YHhWF4WuiBpaj7JVU7qsshqYwt4Lah9QR lA+urgWbQRQ9kBKYqr1MWLo7Fkp3NYWhPD2x6Zvxeoej2NSGcxz4hsDk7kB9fBvwzRVE4B H5zJ9RxBmRURcyD80uWKWQ0hcr5c4GLJQnwAN/spnq7EjR015th6Kob3rMdIrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kOz36Ei3fnKfTLOOhsh9pjAwSooJceTL2a26CwFoxdw=; b=RpMrhd0bpjzXob8hHzdI8rRSnuNN9HtNiu0GF4Cw2VlwMYv+5Wy4JxMA0nzhrvcjySMcJr N9Nr1TqCRUE+wKUp/fIjkbqgNTL2VQEWDyPlx4V7Xg9vXOmf/esmzATI7IZ/UpwvZH7OyF tffOOa8iZ7CJubXYn/0e7va3dp0OoSCHwJmchXM1206g/dDk6xVocPwIvyGC1O2tbpZ/1j vjfBYUy7OU3eGMdH3KhZQizIGofAPGPCgVTtQZ6xpMedD93TepJ0aZel383J6SV8seM+eB da4dsqaO3xhc2q2f5BDyBTS6p9JanFhiZvQ4ylg6gZNCfcEkVaaduIf6t0RwvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683710808; a=rsa-sha256; cv=none; b=n+giIyFpWvbnTqKhlL0rkK0WoP60ReFqiyd2+0s9ERsPQNYLJDJPeU++kmN7W9kLxLjPWF zr4OX58NeJpmoA+d8DjCXI2c58aw37wkBKnPVjonKdIdg8t0btyjS8IRhjP15vdgUaVQu4 o1uZHuXM3IC417Q/EQoECNtgRn24zF/xr9QYIrFUYhC7FnoR1tsAwYM7+9DzBqpuJemGAS 8cuARFcBnpZn51QFEB6ej3kobjrSpynXhE7ZOdtHl105QfhLz76BrHCqPS8AY9LQngX5Ys VweNqo4zidCPvLDCTZuWXrIzjyvUg3/K47K6ivj21slEig9yQfKI41JDRBuDWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGV601Gxdz14Ss; Wed, 10 May 2023 09:26: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 34A9QmZm092847; Wed, 10 May 2023 09:26:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9Qm1B092846; Wed, 10 May 2023 09:26:48 GMT (envelope-from git) Date: Wed, 10 May 2023 09:26:48 GMT Message-Id: <202305100926.34A9Qm1B092846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: facc213643f8 - main - md5: Don't increment a bool. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: facc213643f80bbdb0ebd76f5b26de84d95b9e1a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=facc213643f80bbdb0ebd76f5b26de84d95b9e1a commit facc213643f80bbdb0ebd76f5b26de84d95b9e1a Author: Dag-Erling Smørgrav AuthorDate: 2023-05-09 17:59:27 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 09:25:21 +0000 md5: Don't increment a bool. Fixes: 4849767cb16a MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D40020 --- sbin/md5/md5.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index b11fc6971735..202cc830d4ed 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -662,7 +662,7 @@ main(int argc, char *argv[]) } if (failed) return (1); - if (checksFailed != 0) + if (checksFailed > 0) return (2); return (0); @@ -759,7 +759,7 @@ MDOutput(const Algorithm_t *alg, char *p, const char *name) if (p == NULL) { warn("%s", name); - failed++; + failed = true; } else if (cflag && mode != mode_bsd) { checkfailed = strcasecmp(checkAgainst, p) != 0; if (!sflag && (!qflag || checkfailed)) @@ -1001,7 +1001,7 @@ MDTestSuite(const Algorithm_t *alg) printf(" - verified correct\n"); } else { printf(" - INCORRECT RESULT!\n"); - failed++; + failed = true; } } } From nobody Wed May 10 09:57:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGVnp2b7Mz49fV7; Wed, 10 May 2023 09:57: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 4QGVnp22Yvz4WL7; Wed, 10 May 2023 09:57:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bp9N9wX4qeiTGsQYa7siDR1ukx9FKiUn04P7Lqn+o68=; b=BZrRJLd/ZJUKFGM+xgXav7KTLZM85B7zFn2/AYscSkeKQlRLrGPJN8nbAg11av8yk+D8KF pk4J+ImlseCHaOijCnDcRdCGsv9rk9XGOrzABzkGyTIvwzeOHERd5eXryaA+dL7QObXCoF +bgC73m5cDYpEO/jDTlj3a69rY8f3eTjRVbBh+G/xD0bh2oDveBu2IXrgJh4qxy3X60Yae JoQ4/Qeb/xY5pd4VgVGw5HN/1vaK/Fz1a/tvOFh9VsaT+VEisId836KfZXvsZacEak0CGJ HxQV/x/5udQWbxc8qLA8dGUh2bY+AW7oWSAhUdGNaUcLU6DDE/nXRlcT4R17zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bp9N9wX4qeiTGsQYa7siDR1ukx9FKiUn04P7Lqn+o68=; b=pR8EAeD103tpm7ePTHyL6tr6qJbCL2qtZ6AlzMBSxnxITb5T4FoVVCXrubDAkRa6cVDOAY HMv1MdCDMN8lbWHVUiZgxIXY4UUaunMTSEoz21QUKm34D40d9MQFltOKnSZaUOyGCQGOns lfYBFhbOVV8S2sNhRseb3e2T4y8HN4a5oQ1IfbssnREDpqXGw51BtTwtEPfs/GFjVQVGRh uoHEV0EQcsWJWkJ2/K20UrKLczshXprEKi631esGPEQMflJ71wf/EEfZH0JTfsimISpKRi l9+wY4CHSgyw7ohnO7Zzws2V+10AK6bpbWUlBrNP0bZ2IZrBIdLCdfW/DTqLkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683712670; a=rsa-sha256; cv=none; b=Gym9EViDCPWprmhGgILNkdaBkGlXP92zEThxgQEsW8exa9MchgXRGte14uzLxeXNyG0Wx1 OGn9m/DF7ooxQgtukkw8hv5rDgffzVCpLqMfqAfsmrfwHsmu+9eaCE+xku7N44moxdq0aS 6mt6EF3EmGkW65sENOLtExBeEbEb3J9JmzvzCIi0YYsxH4RKeoZOnN4nztZHYY55Qcl2oW ZDtEzW3QLN0Lxgaw0cOLGtK5mpUr8VfaSVFwVHJzK1mkrfdMy/sewFKvVRCnunRjZKC5Vv 4w4zog3U4m4gCxkDCgapj5/+a2WqEPYHCWjw42+6MBkncMnvGiqAbQUw6EfZYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGVnp0w6jz159K; Wed, 10 May 2023 09:57: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 34A9vn8o041719; Wed, 10 May 2023 09:57:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9vng5041718; Wed, 10 May 2023 09:57:49 GMT (envelope-from git) Date: Wed, 10 May 2023 09:57:49 GMT Message-Id: <202305100957.34A9vng5041718@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 122487801670 - main - netlink: export carp VHID when dumping interface addresses. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1224878016704f3e5a6b6953f3caed3e7840cefd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=1224878016704f3e5a6b6953f3caed3e7840cefd commit 1224878016704f3e5a6b6953f3caed3e7840cefd Author: Alexander V. Chernikov AuthorDate: 2023-05-10 08:44:47 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-10 09:57:01 +0000 netlink: export carp VHID when dumping interface addresses. MFC after: 2 weeks --- sys/netlink/netlink_snl_route_parsers.h | 9 ++++++++- sys/netlink/route/iface.c | 12 ++++++++++++ sys/netlink/route/ifaddrs.h | 10 +++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index 504b9c8737df..e50ad717e17f 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -302,15 +302,22 @@ struct snl_parsed_addr { struct sockaddr *ifa_address; struct sockaddr *ifa_broadcast; char *ifa_label; + uint32_t ifaf_vhid; }; #define _IN(_field) offsetof(struct ifaddrmsg, _field) #define _OUT(_field) offsetof(struct snl_parsed_addr, _field) +static const struct snl_attr_parser _nla_p_addr_fbsd[] = { + { .type = IFAF_VHID, .off = _OUT(ifaf_vhid), .cb = snl_attr_get_uint32 }, +}; +SNL_DECLARE_ATTR_PARSER(_addr_fbsd_parser, _nla_p_addr_fbsd); + static const struct snl_attr_parser _nla_p_addr_s[] = { { .type = IFA_ADDRESS, .off = _OUT(ifa_address), .cb = snl_attr_get_ip }, { .type = IFA_LOCAL, .off = _OUT(ifa_local), .cb = snl_attr_get_ip }, { .type = IFA_LABEL, .off = _OUT(ifa_label), .cb = snl_attr_dup_string }, { .type = IFA_BROADCAST, .off = _OUT(ifa_broadcast), .cb = snl_attr_get_ip }, + { .type = IFA_FREEBSD, .arg = &_addr_fbsd_parser, .cb = snl_attr_get_nested }, }; static const struct snl_field_parser _fp_p_addr_s[] = { {.off_in = _IN(ifa_family), .off_out = _OUT(ifa_family), .cb = snl_field_get_uint8 }, @@ -385,7 +392,7 @@ static const struct snl_hdr_parser *snl_all_route_parsers[] = { &_metrics_mp_nh_parser, &_mpath_nh_parser, &_metrics_parser, &snl_rtm_route_parser, &snl_rtm_link_parser, &snl_rtm_link_parser_simple, &_neigh_fbsd_parser, &snl_rtm_neigh_parser, - &snl_rtm_addr_parser, &_nh_fbsd_parser, &snl_nhmsg_parser, + &_addr_fbsd_parser, &snl_rtm_addr_parser, &_nh_fbsd_parser, &snl_nhmsg_parser, }; #endif diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index 816d6ff8632e..cc76410550f4 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -79,6 +79,9 @@ static SLIST_HEAD(, nl_cloner) nl_cloners = SLIST_HEAD_INITIALIZER(nl_cloners); static struct sx rtnl_cloner_lock; SX_SYSINIT(rtnl_cloner_lock, &rtnl_cloner_lock, "rtnl cloner lock"); +/* These are external hooks for CARP. */ +extern int (*carp_get_vhid_p)(struct ifaddr *); + /* * RTM_GETLINK request * sendto(3, {{len=32, type=RTM_GETLINK, flags=NLM_F_REQUEST|NLM_F_DUMP, seq=1641940952, pid=0}, @@ -795,6 +798,15 @@ dump_iface_addr(struct nl_writer *nw, struct ifnet *ifp, struct ifaddr *ifa, uint32_t val = 0; // ifa->ifa_flags; nlattr_add_u32(nw, IFA_FLAGS, val); + /* Store FreeBSD-specific attributes */ + int off = nlattr_add_nested(nw, IFA_FREEBSD); + if (off != 0) { + if (ifa->ifa_carp != NULL && carp_get_vhid_p != NULL) { + uint32_t vhid = (uint32_t)(*carp_get_vhid_p)(ifa); + nlattr_add_u32(nw, IFAF_VHID, vhid); + } + nlattr_set_len(nw, off); + } if (nlmsg_end(nw)) return (true); diff --git a/sys/netlink/route/ifaddrs.h b/sys/netlink/route/ifaddrs.h index 7ada8f22bf7b..cbf23fe54197 100644 --- a/sys/netlink/route/ifaddrs.h +++ b/sys/netlink/route/ifaddrs.h @@ -60,9 +60,17 @@ enum { IFA_FLAGS = 8, /* not supported */ IFA_RT_PRIORITY = 9, /* not supported */ IFA_TARGET_NETNSID = 10, /* not supported */ + IFA_FREEBSD = 11, /* nested, FreeBSD-specific */ __IFA_MAX, }; -#define IFA_MAX (__IFA_MAX - 1) +#define IFA_MAX (__IFA_MAX - 1) + +enum { + IFAF_UNSPEC, + IFAF_VHID = 1, /* u32: carp vhid */ + __IFAF_MAX, +}; +#define IFAF_MAX (__IFAF_MAX - 1) /* IFA_FLAGS attribute flags */ #define IFA_F_SECONDARY 0x0001 From nobody Wed May 10 09:57:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGVnq4XJhz49fVG; Wed, 10 May 2023 09:57: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 4QGVnq26dyz4WWc; Wed, 10 May 2023 09:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5D+LEL8AzfYlN4gWjrHrhvEGSrg7e1dYwG5R2NQwtwM=; b=U4ZXh8DrjjzfK+dna1f+qXlUI1vK0GA7MEfrvlPUemddtd17JjDLIQB631YeE+GTbSWFjB WUKTiy97i7Jlo2bxp6VDtMFr5Lmcgz8XkGDhDJghyeU1y9zIUrNsULqRbAf5LtNeFpOOB7 7EPZ3X+rkqhb442wvl33ESYnNWtoB03WhYcErdzYcOeIxa+4ijKZv1fTGCqaKTgOGYzFP3 s3o3waFxKQnEM9aL1RJOveflYrgc2xBEKGX0IlP0OfWlSZYgX1LQf7BbiVMt/WiTvW2RoF sxqRsuv/iURa1DoLWiEPPz51Hs+Y8D9hnv2qKoGFhuPFkeWGHfd+g3E6TOb5Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712671; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5D+LEL8AzfYlN4gWjrHrhvEGSrg7e1dYwG5R2NQwtwM=; b=w6PqCM+YahjdK1BeEiImcA8NHiRYQGSPh8h1bcdjAjTpp7A2y/Xm6BCvEVxB5XS+u/kHba 8UTIbWKuGGxGEhJVcvhzj3ZaO1Wx87YpjiC5Wt7I8AmwIEtgZpQ/2AB+X+WB4XdNRyN9co LqOWobTJgRMCisK/gerjdL+liIZloL/zBd8ZJAtmGWwr8okSVVr2pQoGcToRzEU/+1u+PL Y2V7hXRgH7bjB12isMMq8NwZbY64u8qmsnN7cyHyBwDbyAHP11UQL3UGOy2r0P8kwynuri qu35aKCYoV1iIkP0Ta7EOxlJkfSNllnexKYnXsneb4cBJOmEMMYkKiquqnOfbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683712671; a=rsa-sha256; cv=none; b=Py2+H66by5jSn8/M0Wzqbmk/Zm8LlEj0ooYLSqkU9UXSDL5jjPUqQX+IrtwxqAFVpGaB+o N3Ep5wy0SI0l27eWHBUqaVxFYUD4mO6/OLK3w2GBpv09M9Gce6+5/yv21YXY47VR8sUKpa AsiHamap6aqbp8nu8FUgFxq6cjQUSctpYSSrviOBSSW3zOu54Td2aCfdM2lViGt1LIm9lh 4Bt+5wj354yOIaDV/AK8aq4Tpdtewn+LL5U6PoKJbwt8JX18D36yjgzCe28S4JQIlG0zd4 r3NbYuh/uS8tTRlSifbA+MTXIh9QZLILdR0u2db/hByjTWNWrLljwQl/5gteUA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGVnq11s8z159L; Wed, 10 May 2023 09:57: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 34A9vpxv041738; Wed, 10 May 2023 09:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9vpqT041737; Wed, 10 May 2023 09:57:51 GMT (envelope-from git) Date: Wed, 10 May 2023 09:57:51 GMT Message-Id: <202305100957.34A9vpqT041737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 30d0fc6f3391 - main - netlink: export more IPv6 ifa info List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30d0fc6f339132990da7989bb102b01338b0d749 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=30d0fc6f339132990da7989bb102b01338b0d749 commit 30d0fc6f339132990da7989bb102b01338b0d749 Author: Alexander V. Chernikov AuthorDate: 2023-05-10 08:52:31 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-10 09:57:01 +0000 netlink: export more IPv6 ifa info * Fill in IFA_CACHEINFO with prefix lifetime data * Map IPv6 IN6_IFF_ flags to Netlink IFA_F_ flags * Store original ia6_flags in the FreeBSD-specific IFAF_FLAGS field MFC after: 2 weeks --- sys/netlink/netlink_snl_route_parsers.h | 4 ++ sys/netlink/route/iface.c | 68 ++++++++++++++++++++++++++++++++- sys/netlink/route/ifaddrs.h | 9 +++-- 3 files changed, 75 insertions(+), 6 deletions(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index e50ad717e17f..a4877a4d7939 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -302,13 +302,16 @@ struct snl_parsed_addr { struct sockaddr *ifa_address; struct sockaddr *ifa_broadcast; char *ifa_label; + struct ifa_cacheinfo *ifa_cacheinfo; uint32_t ifaf_vhid; + uint32_t ifaf_flags; }; #define _IN(_field) offsetof(struct ifaddrmsg, _field) #define _OUT(_field) offsetof(struct snl_parsed_addr, _field) static const struct snl_attr_parser _nla_p_addr_fbsd[] = { { .type = IFAF_VHID, .off = _OUT(ifaf_vhid), .cb = snl_attr_get_uint32 }, + { .type = IFAF_FLAGS, .off = _OUT(ifaf_flags), .cb = snl_attr_get_uint32 }, }; SNL_DECLARE_ATTR_PARSER(_addr_fbsd_parser, _nla_p_addr_fbsd); @@ -317,6 +320,7 @@ static const struct snl_attr_parser _nla_p_addr_s[] = { { .type = IFA_LOCAL, .off = _OUT(ifa_local), .cb = snl_attr_get_ip }, { .type = IFA_LABEL, .off = _OUT(ifa_label), .cb = snl_attr_dup_string }, { .type = IFA_BROADCAST, .off = _OUT(ifa_broadcast), .cb = snl_attr_get_ip }, + { .type = IFA_CACHEINFO, .off = _OUT(ifa_cacheinfo), .cb = snl_attr_dup_struct }, { .type = IFA_FREEBSD, .arg = &_addr_fbsd_parser, .cb = snl_attr_get_nested }, }; static const struct snl_field_parser _fp_p_addr_s[] = { diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index cc76410550f4..edcf8b635f50 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -749,6 +750,52 @@ get_sa_plen(const struct sockaddr *sa) return (0); } +#ifdef INET6 +static uint32_t +in6_flags_to_nl(uint32_t flags) +{ + uint32_t nl_flags = 0; + + if (flags & IN6_IFF_TEMPORARY) + nl_flags |= IFA_F_TEMPORARY; + if (flags & IN6_IFF_NODAD) + nl_flags |= IFA_F_NODAD; + if (flags & IN6_IFF_DEPRECATED) + nl_flags |= IFA_F_DEPRECATED; + if (flags & IN6_IFF_TENTATIVE) + nl_flags |= IFA_F_TENTATIVE; + if ((flags & (IN6_IFF_AUTOCONF|IN6_IFF_TEMPORARY)) == 0) + flags |= IFA_F_PERMANENT; + if (flags & IN6_IFF_DUPLICATED) + flags |= IFA_F_DADFAILED; + return (nl_flags); +} + +static void +export_cache_info6(struct nl_writer *nw, const struct in6_ifaddr *ia) +{ + struct ifa_cacheinfo ci = { + .cstamp = ia->ia6_createtime * 1000, + .tstamp = ia->ia6_updatetime * 1000, + .ifa_prefered = ia->ia6_lifetime.ia6t_pltime, + .ifa_valid = ia->ia6_lifetime.ia6t_vltime, + }; + + nlattr_add(nw, IFA_CACHEINFO, sizeof(ci), &ci); +} +#endif + +static void +export_cache_info(struct nl_writer *nw, struct ifaddr *ifa) +{ + switch (ifa->ifa_addr->sa_family) { +#ifdef INET6 + case AF_INET6: + export_cache_info6(nw, (struct in6_ifaddr *)ifa); + break; +#endif + } +} /* * {'attrs': [('IFA_ADDRESS', '12.0.0.1'), @@ -796,8 +843,17 @@ dump_iface_addr(struct nl_writer *nw, struct ifnet *ifp, struct ifaddr *ifa, nlattr_add_string(nw, IFA_LABEL, if_name(ifp)); - uint32_t val = 0; // ifa->ifa_flags; - nlattr_add_u32(nw, IFA_FLAGS, val); + uint32_t nl_ifa_flags = 0; +#ifdef INET6 + if (sa->sa_family == AF_INET6) { + struct in6_ifaddr *ia = (struct in6_ifaddr *)ifa; + nl_ifa_flags = in6_flags_to_nl(ia->ia6_flags); + } +#endif + nlattr_add_u32(nw, IFA_FLAGS, nl_ifa_flags); + + export_cache_info(nw, ifa); + /* Store FreeBSD-specific attributes */ int off = nlattr_add_nested(nw, IFA_FREEBSD); if (off != 0) { @@ -805,6 +861,14 @@ dump_iface_addr(struct nl_writer *nw, struct ifnet *ifp, struct ifaddr *ifa, uint32_t vhid = (uint32_t)(*carp_get_vhid_p)(ifa); nlattr_add_u32(nw, IFAF_VHID, vhid); } +#ifdef INET6 + if (sa->sa_family == AF_INET6) { + uint32_t ifa_flags = ((struct in6_ifaddr *)ifa)->ia6_flags; + + nlattr_add_u32(nw, IFAF_FLAGS, ifa_flags); + } +#endif + nlattr_set_len(nw, off); } diff --git a/sys/netlink/route/ifaddrs.h b/sys/netlink/route/ifaddrs.h index cbf23fe54197..4122e2c3793c 100644 --- a/sys/netlink/route/ifaddrs.h +++ b/sys/netlink/route/ifaddrs.h @@ -68,6 +68,7 @@ enum { enum { IFAF_UNSPEC, IFAF_VHID = 1, /* u32: carp vhid */ + IFAF_FLAGS = 2, /* u32: FreeBSD-specific ifa flags */ __IFAF_MAX, }; #define IFAF_MAX (__IFAF_MAX - 1) @@ -89,10 +90,10 @@ enum { /* IFA_CACHEINFO value */ struct ifa_cacheinfo { - uint32_t ifa_prefered; - uint32_t ifa_valid; - uint32_t cstamp; - uint32_t tstamp; + uint32_t ifa_prefered; /* seconds till the end of the prefix considered preferred */ + uint32_t ifa_valid; /* seconds till the end of the prefix considered valid */ + uint32_t cstamp; /* creation time in 1ms intervals from the boot time */ + uint32_t tstamp; /* update time in 1ms intervals from the boot time */ }; #endif From nobody Wed May 10 09:57:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGVnr3VL4z49fZF; Wed, 10 May 2023 09:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGVnr2zHzz4WPC; Wed, 10 May 2023 09:57:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1Bs/FClPTRwHnnUMh2UPhB7iqgvw58kWF+2fOtXulg=; b=x+qVlYjfn4qkLNL/jmCI1O9jvzwDUcpUufxNF5DpiphCVuzl4/I0mIt5F11EH5dsQGL4ne nzJTDaizHygzIvOAaibyaztRyQ2Z0lZgqcDe7iSPSZgKo9sgdLx0+9cDGU1m+TXixMqk78 bZQC5tg/PRaFacgP2msGkLcFj4XQBFpsQpqvu6kX27LLok8XLFI+DcOrh6pYlnYuoZCpg5 /igYr6aA/XFQ2fTE2aSPbQOF73vLrCoZjqob4xOQ1VIZopSriKn8Wo3Qmn4O9dAqX6vH9/ iaqCPxo5j2IYf7rCLLZUe85VmkKDawjFa15N4ICKYxDOGaT+RZ5YuTac/ozqAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683712672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1Bs/FClPTRwHnnUMh2UPhB7iqgvw58kWF+2fOtXulg=; b=Qe7vSMUidqPrt0AOhK/lxVFKG5mPC/EtiYAhewWb7HS1J0nZn03vPZ6mCWjai5zxepOIOM 5NDQAUsEDX6SgvopIE0zVA8vLe7UGRu35Y4HMDCHbDmxDhDvA2DrehhAJAQ1VPLSM771tu esxrz20cX+GOM2K4r3uSA5UgL7Nei8xc3+dSH1bc6OAxF3Ci/Uwme6eNk19A+251gxtQF/ 1LfjUTEL8wPKxqiM9CTW+dTcr35Fv9PQWlxBOllhg+MuGFnrHr3uSqmXLh7WuLia2JDBgv nEwg7tSRqe2rSz08QW5SkDhnV68Bi4AJiiMyJnggP2HF0FtrTMF/04/7ajNM3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683712672; a=rsa-sha256; cv=none; b=ynkTE+/b1zjk9TrFzW8U9YVtNDux/PevDSrNgn4MYQLqa9YMbkhPQg8+xMfa5ts1a39I5Y 2kGSE7XKRAR+CNAw02sEAroFqHqTbosCtoWStBVFNOpKRnyDCTosLdOj6OJsv31wE6g2Ep 9XYhMnXHanRUCTIGnX9kBkhyHer5v5HwduHDuBdJj3RHH/X8/AeYVJZf4msorrEgWfb6uz xzFK0b2mIiXElZUmyRknqr9HzlElfsOCd702i45/gRsjZMA1oiIrjCs3/VVNN/yhKUNsCS DSmZn+QZLJpuBqBMzTl2ysTkAwWIzfXpLcFNXeIJPvI98tiLq8I2LZywzLOqwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGVnr1twDz14yX; Wed, 10 May 2023 09:57: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 34A9vqBF041764; Wed, 10 May 2023 09:57:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9vqV8041763; Wed, 10 May 2023 09:57:52 GMT (envelope-from git) Date: Wed, 10 May 2023 09:57:52 GMT Message-Id: <202305100957.34A9vqV8041763@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 3c851dc19bbd - main - netlink: provide original interface lladdr in the interface dump. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c851dc19bbde2056a9367cc43e935f9a35925a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=3c851dc19bbde2056a9367cc43e935f9a35925a4 commit 3c851dc19bbde2056a9367cc43e935f9a35925a4 Author: Alexander V. Chernikov AuthorDate: 2023-05-10 09:49:34 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-10 09:57:01 +0000 netlink: provide original interface lladdr in the interface dump. * Store lladdr in the FreeBSD-specific IFLAF_ORIG_HWADDR attr * Do not export empty IFLA_ADDRESS for interfaces w/o lladdrs. MFC after: 2 weeks --- sys/netlink/netlink_snl_route_parsers.h | 9 ++++++++- sys/netlink/route/iface.c | 25 +++++++++++++++++++++++-- sys/netlink/route/interface.h | 9 +++++++++ 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/sys/netlink/netlink_snl_route_parsers.h b/sys/netlink/netlink_snl_route_parsers.h index a4877a4d7939..75ba6d461731 100644 --- a/sys/netlink/netlink_snl_route_parsers.h +++ b/sys/netlink/netlink_snl_route_parsers.h @@ -202,10 +202,16 @@ struct snl_parsed_link { char *ifla_ifalias; uint32_t ifla_promiscuity; struct rtnl_link_stats64 *ifla_stats64; + struct nlattr *iflaf_orig_hwaddr; }; #define _IN(_field) offsetof(struct ifinfomsg, _field) #define _OUT(_field) offsetof(struct snl_parsed_link, _field) +static const struct snl_attr_parser _nla_p_link_fbsd[] = { + { .type = IFLAF_ORIG_HWADDR, .off = _OUT(iflaf_orig_hwaddr), .cb = snl_attr_dup_nla }, +}; +SNL_DECLARE_ATTR_PARSER(_link_fbsd_parser, _nla_p_link_fbsd); + static const struct snl_attr_parser _nla_p_link[] = { { .type = IFLA_ADDRESS, .off = _OUT(ifla_address), .cb = snl_attr_dup_nla }, { .type = IFLA_BROADCAST, .off = _OUT(ifla_broadcast), .cb = snl_attr_dup_nla }, @@ -216,6 +222,7 @@ static const struct snl_attr_parser _nla_p_link[] = { { .type = IFLA_STATS64, .off = _OUT(ifla_stats64), .cb = snl_attr_dup_struct }, { .type = IFLA_PROMISCUITY, .off = _OUT(ifla_promiscuity), .cb = snl_attr_get_uint32 }, { .type = IFLA_CARRIER, .off = _OUT(ifla_carrier), .cb = snl_attr_get_uint8 }, + { .type = IFLA_FREEBSD, .arg = &_link_fbsd_parser, .cb = snl_attr_get_nested }, }; static const struct snl_field_parser _fp_p_link[] = { {.off_in = _IN(ifi_index), .off_out = _OUT(ifi_index), .cb = snl_field_get_uint32 }, @@ -394,7 +401,7 @@ SNL_DECLARE_PARSER_EXT(snl_nhmsg_parser, struct nhmsg, _fp_p_nh, _nla_p_nh, _cb_ static const struct snl_hdr_parser *snl_all_route_parsers[] = { &_metrics_mp_nh_parser, &_mpath_nh_parser, &_metrics_parser, &snl_rtm_route_parser, - &snl_rtm_link_parser, &snl_rtm_link_parser_simple, + &_link_fbsd_parser, &snl_rtm_link_parser, &snl_rtm_link_parser_simple, &_neigh_fbsd_parser, &snl_rtm_neigh_parser, &_addr_fbsd_parser, &snl_rtm_addr_parser, &_nh_fbsd_parser, &snl_nhmsg_parser, }; diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index edcf8b635f50..aaed11e637a2 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -194,6 +194,17 @@ get_operstate(struct ifnet *ifp, struct if_state *pstate) } } +static void +get_hwaddr(struct nl_writer *nw, struct ifnet *ifp) +{ + struct ifreq ifr = {}; + + if (if_gethwaddr(ifp, &ifr) == 0) { + nlattr_add(nw, IFLAF_ORIG_HWADDR, if_getaddrlen(ifp), + ifr.ifr_addr.sa_data); + } +} + static unsigned ifp_flags_to_netlink(const struct ifnet *ifp) { @@ -281,8 +292,10 @@ dump_iface(struct nl_writer *nw, struct ifnet *ifp, const struct nlmsghdr *hdr, nlattr_add_u8(nw, IFLA_PROTO_DOWN, val); nlattr_add_u8(nw, IFLA_LINKMODE, val); */ - if ((ifp->if_addr != NULL)) { - dump_sa(nw, IFLA_ADDRESS, ifp->if_addr->ifa_addr); + if (if_getaddrlen(ifp) != 0) { + struct ifaddr *ifa = if_getifaddr(ifp); + + dump_sa(nw, IFLA_ADDRESS, ifa->ifa_addr); } if ((ifp->if_broadcastaddr != NULL)) { @@ -300,6 +313,14 @@ dump_iface(struct nl_writer *nw, struct ifnet *ifp, const struct nlmsghdr *hdr, if (ifp->if_description != NULL) nlattr_add_string(nw, IFLA_IFALIAS, ifp->if_description); + /* Store FreeBSD-specific attributes */ + int off = nlattr_add_nested(nw, IFLA_FREEBSD); + if (off != 0) { + get_hwaddr(nw, ifp); + + nlattr_set_len(nw, off); + } + get_stats(nw, ifp); uint32_t val = (ifp->if_flags & IFF_PROMISC) != 0; diff --git a/sys/netlink/route/interface.h b/sys/netlink/route/interface.h index ec0e1e246a07..c78a0be60a21 100644 --- a/sys/netlink/route/interface.h +++ b/sys/netlink/route/interface.h @@ -142,10 +142,19 @@ enum { IFLA_DEVLINK_PORT, IFLA_GSO_IPV4_MAX_SIZE, IFLA_GRO_IPV4_MAX_SIZE, + IFLA_FREEBSD, __IFLA_MAX }; #define IFLA_MAX (__IFLA_MAX - 1) +enum { + IFLAF_UNSPEC = 0, + IFLAF_ORIG_IFNAME = 1, /* string, original interface name at creation */ + IFLAF_ORIG_HWADDR = 2, /* binary, original hardware address */ + __IFLAF_MAX +}; +#define IFLAF_MAX (__IFLAF_MAX - 1) + /* * Attributes that can be used as filters: * IFLA_IFNAME, IFLA_GROUP, IFLA_ALT_IFNAME From nobody Wed May 10 10:42:41 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGWnY6htcz49k1F; Wed, 10 May 2023 10:42: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 4QGWnY5wwlz4b1T; Wed, 10 May 2023 10:42:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683715361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=abKD5IvRK5lPO6vDTAmXV72a7tNmd4daWHVkb1AoZZY=; b=Mtwgm6Gn+CaHXL7HJodcW5YZ9/6PhbhhZgLTm51BT/1wwx/REkiVscPwe/YIIJF/OLCRA+ C28aJ9MW6fA8ShkgM8II42zYANOO5fhel/JBMws2WESqCYz8Ms2FmCDjJ1okYLB1VMGZkr z8L7v6NGRM/w7UJDaT0vn9KU7dfOrQJF7jZtQhxiiZ58jXrFdOMQPTifx/reX7htvTNinf 0RoZDFuXgRrFTaNVTy83twb6bTZijWiFnrEcjXR2OW/H0WNJVR6SwyPVRmjLQnnfOL325i eJAItwp8gsaR1VOz3ANLTobGTpouXcF6XhqPC1i3L+4uGoHt5gxZXC1EO6k2oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683715361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=abKD5IvRK5lPO6vDTAmXV72a7tNmd4daWHVkb1AoZZY=; b=AlJd0W9kDQsVWWVqpTCjmLiQeQIfd2u1DWu0n1m4LXcgERS2UuhxgYsZ+0sGm61gNMtMVn ga1IElMEHjtAIMFddc2PuHRCvykEjle7nbBdN1ERL6DeqibzG+p0dzTkIrQT0uKnbkp8qf T4xyECDWM4bxX5IUck87AXIcQIrh+IxGyWAgvDrfdrIJfwhiueocLcd7q2Oxq+2okBqVZD qO96yx//qx5XisLHCh4eaCB5DHS3/ReMvecP7ZvEVUwbTGiIvnWkBlkja6+Cazc+w7vakc ggkxi3AWmBic9rmtSXwp/304/8F4lTBQTO8FwSGIODh5Oi8dii/9o38eNN8CKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683715361; a=rsa-sha256; cv=none; b=IOtUrx9WMOr1/VcLkUVG+xTz0Hc4DfDn+V1YmiqjkhYasYiAbOxU4bsNLIf0f8PRadG5DB F8QAspaJXO08QlXsqWGu9zuI+p7jUi5kvQqgQfYWo/cFQVXE0aWjjJP0A4xlgHCf9WZzly /VrxgJXoly/x3snJ4rhvF4Kjod1Ul+eMyzWJhrBKSGJAJH4Xbp8tsrBZ2mO/IctR+iMZP+ N+GOorQ7fW2Laj7FyTIHwLRNfOo+H8ZD7WKMgdPjDUu3ggPUCu++I+MaSZkFqAt6LOLg6n QqsRGNY35QPEciLT1xMi57X/p80+QtyaVLP4e4LqJl0h7bvANayPGqyVfEr2hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGWnY4yF3z16HR; Wed, 10 May 2023 10:42: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 34AAgfsq024480; Wed, 10 May 2023 10:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34AAgf5O024479; Wed, 10 May 2023 10:42:41 GMT (envelope-from git) Date: Wed, 10 May 2023 10:42:41 GMT Message-Id: <202305101042.34AAgf5O024479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 982cd5ae8ef6 - main - ifconfig: split argument parsing and actual execution logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 982cd5ae8ef6541fffcb4251a5a2ab59d706df10 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=982cd5ae8ef6541fffcb4251a5a2ab59d706df10 commit 982cd5ae8ef6541fffcb4251a5a2ab59d706df10 Author: Alexander V. Chernikov AuthorDate: 2023-05-10 09:58:56 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-10 10:39:12 +0000 ifconfig: split argument parsing and actual execution logic Reduce the amount of global variables by creating the dedicated ifconfig_args structure and use it as a context-passing variable. Simplify the code by moving all argument preparation code a separate function. Reviewed by: kp (previous version) Differential Revision: https://reviews.freebsd.org/D39932 MFC after: 2 weeks --- sbin/ifconfig/ifconfig.c | 148 ++++++++++++++++++++++++++--------------------- sbin/ifconfig/ifconfig.h | 21 ++++++- sbin/ifconfig/ifmedia.c | 2 +- 3 files changed, 103 insertions(+), 68 deletions(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 462d543125c4..88c720223c32 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -98,10 +98,10 @@ int doalias; int clearaddr; int newaddr = 1; int verbose; -int noload; int printifname = 0; -int supmedia = 0; +struct ifconfig_args args; + int printkeys = 0; /* Print keying material for interfaces. */ int exit_code = 0; @@ -112,7 +112,7 @@ static bool group_member(const char *ifname, const char *match, const char *nomatch); static int ifconfig(int argc, char *const *argv, int iscreate, const struct afswtch *afp); -static void status(const struct afswtch *afp, const struct sockaddr_dl *sdl, +static void status(struct ifconfig_args *args, const struct sockaddr_dl *sdl, struct ifaddrs *ifa); static void tunnel_status(int s); static _Noreturn void usage(void); @@ -403,26 +403,21 @@ void printifnamemaybe() printf("%s\n", name); } +static void list_interfaces(struct ifconfig_args *args); + int main(int argc, char *argv[]) { - int c, all, namesonly, downonly, uponly; + int c; const struct afswtch *afp = NULL; int ifindex; - struct ifaddrs *ifap, *sifap, *ifa; - struct ifreq paifr; - const struct sockaddr_dl *sdl; - char options[1024], *cp, *envformat, *namecp = NULL; - struct ifa_queue q = TAILQ_HEAD_INITIALIZER(q); - struct ifa_order_elt *cur, *tmp; - const char *ifname, *matchgroup, *nogroup; + char options[1024], *envformat; + const char *ifname; struct option *p; size_t iflen; int flags; - all = downonly = uponly = namesonly = noload = verbose = 0; f_inet = f_inet6 = f_ether = f_addr = NULL; - matchgroup = nogroup = NULL; lifh = ifconfig_open(); if (lifh == NULL) @@ -445,10 +440,10 @@ main(int argc, char *argv[]) while ((c = getopt(argc, argv, options)) != -1) { switch (c) { case 'a': /* scan all interfaces */ - all++; + args.all = true; break; case 'd': /* restrict scan to "down" interfaces */ - downonly++; + args.downonly = true; break; case 'f': if (optarg == NULL) @@ -456,33 +451,33 @@ main(int argc, char *argv[]) setformat(optarg); break; case 'G': - if (optarg == NULL || all == 0) + if (optarg == NULL || args.all == 0) usage(); - nogroup = optarg; + args.nogroup = optarg; break; case 'k': - printkeys++; + args.printkeys = true; break; case 'l': /* scan interface names only */ - namesonly++; + args.namesonly++; break; case 'm': /* show media choices in status */ - supmedia = 1; + args.supmedia = true; break; case 'n': /* suppress module loading */ - noload++; + args.noload = true; break; case 'u': /* restrict scan to "up" interfaces */ - uponly++; + args.uponly = true; break; case 'v': - verbose++; + args.verbose++; break; case 'g': - if (all) { + if (args.all) { if (optarg == NULL) usage(); - matchgroup = optarg; + args.matchgroup = optarg; break; } /* FALLTHROUGH */ @@ -500,20 +495,24 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + /* Sync global variables */ + printkeys = args.printkeys; + verbose = args.verbose; + /* -l cannot be used with -a or -m */ - if (namesonly && (all || supmedia)) + if (args.namesonly && (args.all || args.supmedia)) usage(); /* nonsense.. */ - if (uponly && downonly) + if (args.uponly && args.downonly) usage(); /* no arguments is equivalent to '-a' */ - if (!namesonly && argc < 1) - all = 1; + if (!args.namesonly && argc < 1) + args.all = 1; /* -a and -l allow an address family arg to limit the output */ - if (all || namesonly) { + if (args.all || args.namesonly) { if (argc > 1) usage(); @@ -538,7 +537,7 @@ main(int argc, char *argv[]) argc--, argv++; /* check and maybe load support for this interface */ - ifmaybeload(ifname); + ifmaybeload(&args, ifname); ifindex = if_nametoindex(ifname); if (ifindex == 0) { @@ -606,17 +605,38 @@ main(int argc, char *argv[]) } else { flags = getifflags(name, -1, false); if (!(((flags & IFF_CANTCONFIG) != 0) || - (downonly && (flags & IFF_UP) != 0) || - (uponly && (flags & IFF_UP) == 0))) + (args.downonly && (flags & IFF_UP) != 0) || + (args.uponly && (flags & IFF_UP) == 0))) ifconfig(argc, argv, 0, afp); } goto done; } + args.argc = argc; + args.argv = argv; + + list_interfaces(&args); + +done: + freeformat(); + ifconfig_close(lifh); + exit(exit_code); +} + +static void +list_interfaces(struct ifconfig_args *args) +{ + struct ifa_queue q = TAILQ_HEAD_INITIALIZER(q); + struct ifaddrs *ifap, *sifap, *ifa; + struct ifa_order_elt *cur, *tmp; + char *namecp = NULL; + int ifindex; + size_t iflen; + if (getifaddrs(&ifap) != 0) err(EXIT_FAILURE, "getifaddrs"); - cp = NULL; + char *cp = NULL; if (calcorders(ifap, &q) != 0) err(EXIT_FAILURE, "calcorders"); @@ -628,7 +648,10 @@ main(int argc, char *argv[]) ifindex = 0; for (ifa = sifap; ifa; ifa = ifa->ifa_next) { - memset(&paifr, 0, sizeof(paifr)); + struct ifreq paifr = {}; + const struct sockaddr_dl *sdl; + const char *ifname; + strlcpy(paifr.ifr_name, ifa->ifa_name, sizeof(paifr.ifr_name)); if (sizeof(paifr.ifr_addr) >= ifa->ifa_addr->sa_len) { memcpy(&paifr.ifr_addr, ifa->ifa_addr, @@ -641,7 +664,7 @@ main(int argc, char *argv[]) sdl = (const struct sockaddr_dl *) ifa->ifa_addr; else sdl = NULL; - if (cp != NULL && strcmp(cp, ifa->ifa_name) == 0 && !namesonly) + if (cp != NULL && strcmp(cp, ifa->ifa_name) == 0 && !args->namesonly) continue; iflen = strlcpy(name, ifa->ifa_name, sizeof(name)); if (iflen >= sizeof(name)) { @@ -653,21 +676,21 @@ main(int argc, char *argv[]) if ((ifa->ifa_flags & IFF_CANTCONFIG) != 0) continue; - if (downonly && (ifa->ifa_flags & IFF_UP) != 0) + if (args->downonly && (ifa->ifa_flags & IFF_UP) != 0) continue; - if (uponly && (ifa->ifa_flags & IFF_UP) == 0) + if (args->uponly && (ifa->ifa_flags & IFF_UP) == 0) continue; - if (!group_member(ifa->ifa_name, matchgroup, nogroup)) + if (!group_member(ifa->ifa_name, args->matchgroup, args->nogroup)) continue; /* * Are we just listing the interfaces? */ - if (namesonly) { + if (args->namesonly) { if (namecp == cp) continue; - if (afp != NULL) { + if (args->afp != NULL) { /* special case for "ether" address family */ - if (!strcmp(afp->af_name, "ether")) { + if (!strcmp(args->afp->af_name, "ether")) { if (sdl == NULL || (sdl->sdl_type != IFT_ETHER && sdl->sdl_type != IFT_L2VLAN && @@ -676,7 +699,7 @@ main(int argc, char *argv[]) continue; } else { if (ifa->ifa_addr->sa_family - != afp->af_af) + != args->afp->af_af) continue; } } @@ -689,19 +712,14 @@ main(int argc, char *argv[]) } ifindex++; - if (argc > 0) - ifconfig(argc, argv, 0, afp); + if (args->argc > 0) + ifconfig(args->argc, args->argv, 0, args->afp); else - status(afp, sdl, ifa); + status(args, sdl, ifa); } - if (namesonly) + if (args->namesonly) printf("\n"); freeifaddrs(ifap); - -done: - freeformat(); - ifconfig_close(lifh); - exit(exit_code); } /* @@ -1421,7 +1439,7 @@ unsetifdescr(const char *val, int value, int s, const struct afswtch *afp) * specified, show only it; otherwise, show them all. */ static void -status(const struct afswtch *afp, const struct sockaddr_dl *sdl, +status(struct ifconfig_args *args, const struct sockaddr_dl *sdl, struct ifaddrs *ifa) { struct ifaddrs *ift; @@ -1432,13 +1450,13 @@ status(const struct afswtch *afp, const struct sockaddr_dl *sdl, int allfamilies, s, type; bool first, val; - if (afp == NULL) { + if (args->afp == NULL) { allfamilies = 1; ifr.ifr_addr.sa_family = AF_LOCAL; } else { allfamilies = 0; ifr.ifr_addr.sa_family = - afp->af_af == AF_LINK ? AF_LOCAL : afp->af_af; + args->afp->af_af == AF_LINK ? AF_LOCAL : args->afp->af_af; } strlcpy(ifr.ifr_name, name, sizeof(ifr.ifr_name)); @@ -1503,7 +1521,7 @@ status(const struct afswtch *afp, const struct sockaddr_dl *sdl, } } } - if (supmedia) { + if (args->supmedia) { printf("\tcapabilities"); cookie = NULL; for (first = true;; first = false) { @@ -1526,7 +1544,7 @@ status(const struct afswtch *afp, const struct sockaddr_dl *sdl, } else if (ifr.ifr_curcap != 0) { printb("\toptions", ifr.ifr_curcap, IFCAPBITS); putchar('\n'); - if (supmedia && ifr.ifr_reqcap != 0) { + if (args->supmedia && ifr.ifr_reqcap != 0) { printb("\tcapabilities", ifr.ifr_reqcap, IFCAPBITS); putchar('\n'); @@ -1546,8 +1564,8 @@ status(const struct afswtch *afp, const struct sockaddr_dl *sdl, p = af_getbyfamily(ift->ifa_addr->sa_family); if (p != NULL && p->af_status != NULL) p->af_status(s, ift); - } else if (afp->af_af == ift->ifa_addr->sa_family) - afp->af_status(s, ift); + } else if (args->afp->af_af == ift->ifa_addr->sa_family) + args->afp->af_status(s, ift); } #if 0 if (allfamilies || afp->af_af == AF_LINK) { @@ -1568,15 +1586,15 @@ status(const struct afswtch *afp, const struct sockaddr_dl *sdl, #endif if (allfamilies) af_other_status(s); - else if (afp->af_other_status != NULL) - afp->af_other_status(s); + else if (args->afp->af_other_status != NULL) + args->afp->af_other_status(s); strlcpy(ifs.ifs_name, name, sizeof ifs.ifs_name); if (ioctl(s, SIOCGIFSTATUS, &ifs) == 0) printf("%s", ifs.ascii); - if (verbose > 0) - sfp_status(s, &ifr, verbose); + if (args->verbose > 0) + sfp_status(s, &ifr, args->verbose); close(s); return; @@ -1653,7 +1671,7 @@ print_vhid(const struct ifaddrs *ifa, const char *s) } void -ifmaybeload(const char *name) +ifmaybeload(struct ifconfig_args *args, const char *name) { #define MOD_PREFIX_LEN 3 /* "if_" */ struct module_stat mstat; @@ -1664,7 +1682,7 @@ ifmaybeload(const char *name) bool found; /* loading suppressed by the user */ - if (noload) + if (args->noload) return; /* trim the interface number off the end */ diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index 26f68d67cec2..e1cd8a628f9a 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -39,6 +39,7 @@ #pragma once #include +#include #define __constructor __attribute__((constructor)) @@ -182,6 +183,22 @@ struct afswtch { }; void af_register(struct afswtch *); +struct ifconfig_args { + bool all; /* Match everything */ + bool downonly; /* Down-only items */ + bool uponly; /* Up-only items */ + bool namesonly; /* Output only names */ + bool noload; /* Do not load relevant kernel modules */ + bool supmedia; /* Supported media */ + bool printkeys; /* Print security keys */ + int verbose; /* verbosity level */ + int argc; + char **argv; + const char *matchgroup; /* Group name to match */ + const char *nogroup; /* Group name to exclude */ + const struct afswtch *afp; /* AF we're operating on */ +}; + struct option { const char *opt; const char *opt_usage; @@ -194,12 +211,12 @@ extern ifconfig_handle_t *lifh; extern struct ifreq ifr; extern char name[IFNAMSIZ]; /* name of interface */ extern int allmedia; -extern int supmedia; extern int printkeys; extern int newaddr; extern int verbose; extern int printifname; extern int exit_code; +extern struct ifconfig_args args; void setifcap(const char *, int value, int s, const struct afswtch *); void setifcapnv(const char *vname, const char *arg, int s, @@ -208,7 +225,7 @@ void setifcapnv(const char *vname, const char *arg, int s, void Perror(const char *cmd); void printb(const char *s, unsigned value, const char *bits); -void ifmaybeload(const char *name); +void ifmaybeload(struct ifconfig_args *args, const char *name); typedef int clone_match_func(const char *); typedef void clone_callback_func(int, struct ifreq *); diff --git a/sbin/ifconfig/ifmedia.c b/sbin/ifconfig/ifmedia.c index aacf34a13248..3014d19b00ff 100644 --- a/sbin/ifconfig/ifmedia.c +++ b/sbin/ifconfig/ifmedia.c @@ -144,7 +144,7 @@ media_status(int s) putchar('\n'); } - if (supmedia) { + if (args.supmedia) { printf("\tsupported media:\n"); for (size_t i = 0; i < ifmr->ifm_count; ++i) { printf("\t\t"); From nobody Wed May 10 12:06:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGYfj5DNbz49pDH; Wed, 10 May 2023 12:06: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 4QGYfj4kGZz3HXH; Wed, 10 May 2023 12:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683720413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Nu5v920j0+qtyx31i9zjwVGXgHLTC0urS2AlDq/JSs=; b=Wh9PjKhzvzu/FCDwAstfKP+IZoWXKyls7X2E/xqCY1Fu0G4z9R+P4Kd3ghg9FEpwGKzZv6 o1XNJ/qR0BRPTDGyspvygyY07pvO7blgmWQppinFD9589puC59rwo/3tQypoCgjkHuS4xr C5MP7gNcvdTGyNs2RDjZ7XtqHIs1mhQHVkW1viTbhNQk9d27lUUghIqNdbLXCYDWsOzeFD ZwAHtmv+jHSEVXXd0Gkc4jIKTce2MaDvlZIT7iMnneoPhsqo1FpU+V9WPgefnjdLrnH4O/ nWJ6YbaCRUAO0jbzgX/ZMsbhzX3I6gtsvdDzGZs8BXqsMWwhuh3DnSktk8HbLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683720413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Nu5v920j0+qtyx31i9zjwVGXgHLTC0urS2AlDq/JSs=; b=mnehwjjFPQTMVQ1q9ZitKP30qsz/Yt8fTx5jEQ7mDrFsWgCU+8UW/oy5dZpfZW9kcG3cQH 2giJNHjBYGGQpUc+t1vl0ZrzdbdVMEOb8ESlIGsI+4mEV1owRYWMCFV589eCvDXCAbdZsf 4N2HYmNykiYmF3AodBIqBBMu+arkNgayZaNH4+HzIvllHsQ9b5f1Nz6wmA92nSx+jXMCLx zLe6OKAfpCq6nwDooXoFSghU7Nt5IWItbDP4FTBy9/RiAK7/S/DpSQunyepPbLgxZIBIKE UBjr0U9z+kxbPhwEHFZFGN5tHLPuWq2fj+i9wpBQlLBzUScGYgAYxHE5rP18Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683720413; a=rsa-sha256; cv=none; b=SOcu0Lko5z/alqYiavY7fq2aLxZ6jHO3gChIWjHf2As8X5HEMRBqweBaldTh24anZesVix XAQdvYnQOqq3/pQUMq26N5++VGi+3SEwS2LUkGpERTKxXSHw8zqz+VzKIFoJUGwKgIYN/4 q5cwP9d+9AlZXOYNAyv+TYaoBZhg9MlMuZ44TxJq4WGh4i4P6Q36g3PMlpGCrbUG0sv7qK sq5NI9UImrJ4l32uhyd4TjbWSTzC4haI1Qaiqf6GzKbvXg3VM+6EjRgP1I+NrMPN5sxtoe HEhvnU6tOsw7ONYtw7X/++trN9DYNZn0+Mcjs6Iu4+SnrrOd2M1G0jjtgI9w3Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGYfj3gTCz18gY; Wed, 10 May 2023 12:06: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 34AC6rFo056960; Wed, 10 May 2023 12:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34AC6r1L056959; Wed, 10 May 2023 12:06:53 GMT (envelope-from git) Date: Wed, 10 May 2023 12:06:53 GMT Message-Id: <202305101206.34AC6r1L056959@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2b8c4137d497 - main - arm64: fix stack unwinding past exception handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b8c4137d49762587c946a67840df0bfd1ee2f2f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2b8c4137d49762587c946a67840df0bfd1ee2f2f commit 2b8c4137d49762587c946a67840df0bfd1ee2f2f Author: Zachary Leaf AuthorDate: 2023-05-09 16:04:44 +0000 Commit: Andrew Turner CommitDate: 2023-05-10 11:54:54 +0000 arm64: fix stack unwinding past exception handlers Commit 281402e0a563 ("arm64: Shave off two instructions in exceptions") removed the instruction that set the frame pointer (x29) as it appeared to be unused. The frame pointer is used in arm64/db_trace.c:db_stack_trace_cmd() when unwinding state, and hence still needs to be set. Add back the instruction to save_registers to properly update frame pointer. Reported by: andrew Sponsored by: Arm Ltd --- sys/arm64/arm64/exception.S | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index c82b8307ab17..a568d1264b53 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$"); .endm .macro save_registers el + add x29, sp, #(TF_SIZE) .if \el == 0 #if defined(PERTHREAD_SSP) /* Load the SSP canary to sp_el0 */ From nobody Wed May 10 12:22:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGZ1C742Mz49qBv; Wed, 10 May 2023 12:22: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 4QGZ1C6TrHz3JmB; Wed, 10 May 2023 12:22:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683721375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z+g/qwugVcR/ezNEtG9Pl8d3h96kzwu4vTmGlrbSQ0I=; b=aK+TaU6cW9Fm4N33Pnv50/qPdx6M98DhInUTz6T7EeToraEyn6QBnbUeS0Kd5aYMw++oW0 Y0wCEZ+9nULQDVWjKE2vQX3AMLv/lHBk2Or1TqverIqxOU9v5jAbAy7eIwm9x0kTD83avM 3vFxkpsb8ydoKGNvnbgsjMu9/ddjpImq/fv4W1D4UMah/8+LocqDmvqZG4lfFar52sTMyQ nvox5sx+omlN6bFuOwSk2UpLu8Ti+IPBYXPU0/whEe2d9JTX1uQitREfg2WK5LWYwza1ml EqRoYS7v4uAYt1wS4rwdAgKs5g4sRB7BxotGmUlmccWGFWuAV8OziBASaLH0rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683721375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z+g/qwugVcR/ezNEtG9Pl8d3h96kzwu4vTmGlrbSQ0I=; b=r9H9bPwjrFocIG8yo3spPtcsMY+QQHiLH/BEozbkwwHg/B8wo53E8oxx9vDoZIvQDjLWmd KwtPlnwfS7KVPj30xcejyuaD6UbUaD3dMlsY1/eVK4Mkrt/DU8bdJFvpKsFgYk6t9x3qJ/ yJ03uKjq3TlfM0OMLdaRTWNT6vAbmIZNatLzo9jelSAmtk2X+qYKpnYAPIJha2TtHLZjfh Sarm8ZnoYrbEPccmImrVh94sl3AcGYhXEoszbIryJL3JyotOMYokY4FQWkiOzJ6rR/gQcn qgcgjuMXvf0LgaJMHa/ej8JbTTwFdWB/cF65wxDdyGvTWd1tmlUSpSF3TheKKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683721375; a=rsa-sha256; cv=none; b=eZvqHlFwrpfNbBPCdBjkhR/lW/PKv3qIr9+33pWFuPtC+UgYtieGAlYSQ+4Yao8Q52kJ5P k4JmzIPiZN+ThiGPCsYg6HGVEzvprnmIngvxGnihjn4tUgwNJknUUPZRrePTJdscafZ/bu SGQM5OKbnlsR4xteD2hwsNOn+NBCpE464+PXX+aFOuyxbgeUpprRvV+VaAwntTpLuYz/bo YOiVFpdbAiOeSD6+VTHK+S64Sv/bnvHHWFsI1v3dvFSBCwz9jMDKtK/pCcsiC2E1c3Vh33 idoiQONfvMv4G/nLTb3OZ195jqSvtr2NZyfDka1sxy/KGqjldENAjEfhsZrE1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGZ1C5XT1z18hb; Wed, 10 May 2023 12:22: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 34ACMtYL089676; Wed, 10 May 2023 12:22:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ACMtCj089675; Wed, 10 May 2023 12:22:55 GMT (envelope-from git) Date: Wed, 10 May 2023 12:22:55 GMT Message-Id: <202305101222.34ACMtCj089675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: a3cb80bc6363 - main - ifconfig: fix interface selection after 982cd5ae8ef6. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3cb80bc63632064a3bb47a873ccdd0f1f1d51a9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a3cb80bc63632064a3bb47a873ccdd0f1f1d51a9 commit a3cb80bc63632064a3bb47a873ccdd0f1f1d51a9 Author: Alexander V. Chernikov AuthorDate: 2023-05-10 12:06:10 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-10 12:22:39 +0000 ifconfig: fix interface selection after 982cd5ae8ef6. --- sbin/ifconfig/ifconfig.c | 29 +++++++++++++---------------- sbin/ifconfig/ifconfig.h | 1 + 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 88c720223c32..5456587c13ef 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -412,7 +412,6 @@ main(int argc, char *argv[]) const struct afswtch *afp = NULL; int ifindex; char options[1024], *envformat; - const char *ifname; struct option *p; size_t iflen; int flags; @@ -516,7 +515,6 @@ main(int argc, char *argv[]) if (argc > 1) usage(); - ifname = NULL; ifindex = 0; if (argc == 1) { afp = af_getbyname(*argv); @@ -533,13 +531,13 @@ main(int argc, char *argv[]) if (argc < 1) usage(); - ifname = *argv; + args.ifname = *argv; argc--, argv++; /* check and maybe load support for this interface */ - ifmaybeload(&args, ifname); + ifmaybeload(&args, args.ifname); - ifindex = if_nametoindex(ifname); + ifindex = if_nametoindex(args.ifname); if (ifindex == 0) { /* * NOTE: We must special-case the `create' command @@ -548,10 +546,10 @@ main(int argc, char *argv[]) */ if (argc > 0 && (strcmp(argv[0], "create") == 0 || strcmp(argv[0], "plumb") == 0)) { - iflen = strlcpy(name, ifname, sizeof(name)); + iflen = strlcpy(name, args.ifname, sizeof(name)); if (iflen >= sizeof(name)) errx(1, "%s: cloning name too long", - ifname); + args.ifname); ifconfig(argc, argv, 1, NULL); exit(exit_code); } @@ -562,15 +560,15 @@ main(int argc, char *argv[]) * to find the interface as it lives in another vnet. */ if (argc > 0 && (strcmp(argv[0], "-vnet") == 0)) { - iflen = strlcpy(name, ifname, sizeof(name)); + iflen = strlcpy(name, args.ifname, sizeof(name)); if (iflen >= sizeof(name)) errx(1, "%s: interface name too long", - ifname); + args.ifname); ifconfig(argc, argv, 0, NULL); exit(exit_code); } #endif - errx(1, "interface %s does not exist", ifname); + errx(1, "interface %s does not exist", args.ifname); } else { /* * Do not allow use `create` command as hostname if @@ -580,7 +578,7 @@ main(int argc, char *argv[]) strcmp(argv[0], "plumb") == 0)) { if (argc == 1) errx(1, "interface %s already exists", - ifname); + args.ifname); argc--, argv++; } } @@ -598,10 +596,10 @@ main(int argc, char *argv[]) * which doesn't require building, sorting, and searching the entire * system address list */ - if ((argc > 0) && (ifname != NULL)) { - iflen = strlcpy(name, ifname, sizeof(name)); + if ((argc > 0) && (args.ifname != NULL)) { + iflen = strlcpy(name, args.ifname, sizeof(name)); if (iflen >= sizeof(name)) { - warnx("%s: interface name too long, skipping", ifname); + warnx("%s: interface name too long, skipping", args.ifname); } else { flags = getifflags(name, -1, false); if (!(((flags & IFF_CANTCONFIG) != 0) || @@ -650,7 +648,6 @@ list_interfaces(struct ifconfig_args *args) for (ifa = sifap; ifa; ifa = ifa->ifa_next) { struct ifreq paifr = {}; const struct sockaddr_dl *sdl; - const char *ifname; strlcpy(paifr.ifr_name, ifa->ifa_name, sizeof(paifr.ifr_name)); if (sizeof(paifr.ifr_addr) >= ifa->ifa_addr->sa_len) { @@ -658,7 +655,7 @@ list_interfaces(struct ifconfig_args *args) ifa->ifa_addr->sa_len); } - if (ifname != NULL && strcmp(ifname, ifa->ifa_name) != 0) + if (args->ifname != NULL && strcmp(args->ifname, ifa->ifa_name) != 0) continue; if (ifa->ifa_addr->sa_family == AF_LINK) sdl = (const struct sockaddr_dl *) ifa->ifa_addr; diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h index e1cd8a628f9a..b58b577f4328 100644 --- a/sbin/ifconfig/ifconfig.h +++ b/sbin/ifconfig/ifconfig.h @@ -194,6 +194,7 @@ struct ifconfig_args { int verbose; /* verbosity level */ int argc; char **argv; + const char *ifname; /* Requested interface name */ const char *matchgroup; /* Group name to match */ const char *nogroup; /* Group name to exclude */ const struct afswtch *afp; /* AF we're operating on */ From nobody Wed May 10 12:41:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGZQG2Pthz49r9S; Wed, 10 May 2023 12:41: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 4QGZQG1yTgz3KRX; Wed, 10 May 2023 12:41:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683722470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZcUPrtcHfFAqUxh2W72cUnSeBmT5I8FgvrigJw6CoA=; b=YYVc88wAqCMfEyKLns9PLoDmg51dvoIdh/iCMACZDNOUpiO6o4FgRloLsSmSse5bT40xe3 o9Uzs9o8hGKB0BdzCFzxxEj2LY5iYbsrasyZOWGGXaH5b/qggAALRj6aDZqZOwbmCDm1Np tXhqW9fSfRPnr+ymNHIzj0LLjQ/qUMcutWxtrHK8oSUZ8dFdAf2EpYsbHk8FfsVQB3ysZT XwZmrAA18ZNr2Zi/CBj5IacnW725Xh7LKHrvIG9M/AkasHWjrgJGTC2gmHueYxkdA0vWP7 dvMsNX+3MRrrCvsmDTrQ/nI0fhJgz5SqjTELswSVKgV3zbmXOvsCodPXzxGdNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683722470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hZcUPrtcHfFAqUxh2W72cUnSeBmT5I8FgvrigJw6CoA=; b=gqGelvtWRgYBc9OY+qZoIU8W6JLDznl8y/8oS1jsPrOzQrOJhBmKMfIYhkrCdnQ6jffRe8 D1KV1ucFcd/7GGYbmSVgFhqkgjLKcwOKO5CL0X19T5VZxfYm3xU0ncYq392jf5dh2zog1n 49a5x0MilMFlqt7wivU/7k0phguszKGkzGUhtrm4Br8hD4UNhz77wjQgrM4oxAZ5OCnhkf nihizjKdB0A+UcqLU1T1MAtR0QqqFRYXkMcGGvPBxkm317Q/kivwcZv4/ouWBRFJ17R1aJ CVd25IFaE1JbEEa4OhOpAuy5ByMDx4WRKc4BteU/H72QhBKwRxklHkISZBknKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683722470; a=rsa-sha256; cv=none; b=IRf767CdaNTCU3bKyeOoi6sGzwHRhP6VVKJ0mk7hJqD0gLTeY9GmmiXYluNetYZYG/b/bc HwUwqDUl1slwGcUjWppVni8g2n9mOdoUTWRD17zcJFpFByN5eOstrB5gmpkEzvk5fwhYup rQcyaQkPymM3TlHjFC/5jVDN7TkVuGDo1dRySABpaMfuPR2E/jFa2K41LxJwiy72n6pzaB Jich2lL/N3pjRIXSd3o7sHt/aPU45ij+428VxsuOGXpJxaOw4Add9FLf8KLrdljnkmWQi+ FWVEtQCi5uMYfw+AL5u5nfplbKDLz4ZfiCP34FFzwO5fVBJvtSQR/WW8w6Di1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGZQG11P3z19LL; Wed, 10 May 2023 12:41: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 34ACfAr0015855; Wed, 10 May 2023 12:41:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ACfAma015854; Wed, 10 May 2023 12:41:10 GMT (envelope-from git) Date: Wed, 10 May 2023 12:41:10 GMT Message-Id: <202305101241.34ACfAma015854@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 444b9aa78c60 - main - ifconfig: fix family selection after 982cd5ae8ef6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 444b9aa78c6083d249b70669480d385bd58fd7fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=444b9aa78c6083d249b70669480d385bd58fd7fd commit 444b9aa78c6083d249b70669480d385bd58fd7fd Author: Alexander V. Chernikov AuthorDate: 2023-05-10 12:40:51 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-05-10 12:40:51 +0000 ifconfig: fix family selection after 982cd5ae8ef6 --- sbin/ifconfig/ifconfig.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 5456587c13ef..957a8fd7fb98 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -610,6 +610,7 @@ main(int argc, char *argv[]) goto done; } + args.afp = afp; args.argc = argc; args.argv = argv; From nobody Wed May 10 13:27:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbSB60MVz49tyM; Wed, 10 May 2023 13:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGbSB57rhz3Q9Q; Wed, 10 May 2023 13:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPHRis6luCLix5IYVr29++ibszKp7khtrr5X0s+sJBE=; b=BYBQR3jmF5kNJ8nj68mgheA7e3dsvuGChGHSPDAmOjeia6P/zyLZ5fW1NCzWoaMyJCoECk vk8pQVbvtxclvtdvtCqNOCMqCUZrAMUdR/2n0vUs9M3MUV9j3Afo2inO2C/KCMJYRPqnAf k0LzwaqVx3I1VaM6+f8ibPbcUFtr1FeYWZV+56N3Dgy9eg+h5mcKBKaTOqoWnQMlx1TWmo GlhIjqYYdMhZv4EtTTZdPS2WbZoN/1CtSgEh0chkMe3t1Pwqr6pYx8aGbrPlaF/D5/tUnr 4jOvIYL1KQMojmsVNsZ7p1MEFs10YiBDDLmY2x0uqYa2vDKsPZ7tUaqoYtuRQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPHRis6luCLix5IYVr29++ibszKp7khtrr5X0s+sJBE=; b=pMk2XRr/ba1Z3FC1ZS98wICuixil0gaCnjqJm0QnAOTFBHEKAdaCw+R6E54UIDj4rydMDg 6365BHkelkGI29K/ACXUNdJ6+pgjR7hMFHBzeSxj3U4Hyj7fFMKLYSTg6K3XURCvwE601V wZkQty4neh+8/eK7nliluAZAZllktIDDV0y1h0jC9KY3SLXcsj+9OceyhKbMfdjqVn+xEY JtqbInJb5XQZ23tmgYTVxAY1wJA38I9JFZP8MsbHhyXtN/9KAobBfF091vINQIVMDsRwph nnsw1p9PM74Duf80BbG3zaQuze/ptRxNvy5JM8LX/tIvNNzVy5jcA/yMkLJ4Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683725274; a=rsa-sha256; cv=none; b=W+4DxNm1q3YxiXQGna+Hyn62KCIrBmgyjlAt6XItxZ6IWpruAPExxtzSFb9pHAErJCPH3E Y86LGLwjBhNBKrmRZgCrLJYLUE3BBihnZP4cvqdGoLkPb76uDN+Sr+omThGVKWNOahy3/n DXxQv5UeXZZZBrfZ/EeyvBclkVQLa1lUIm7YrFMsUUK6n6fo0ODQWaBxEmIQI2kVSFroO8 Lun0VIePgwlzjDJAC5J0tgHYnW7X/gT4MXjWWZ4+Ofsfc5Ivffr+GZzFR+pOhQ7qmjjAcW bXMeLNF/aXIImoeaqQMTlLdAXG2Hge4VQwsG5zAu1pwzWANzRkuGaeQ5Cn4sHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGbSB4BzTz1BnW; Wed, 10 May 2023 13:27: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 34ADRsDI088465; Wed, 10 May 2023 13:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADRsNa088464; Wed, 10 May 2023 13:27:54 GMT (envelope-from git) Date: Wed, 10 May 2023 13:27:54 GMT Message-Id: <202305101327.34ADRsNa088464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: c3b611e153e0 - main - hier(7): drop list of /usr/include subdirectories List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3b611e153e0480a354559f82fe5dc4c455bad4e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=c3b611e153e0480a354559f82fe5dc4c455bad4e commit c3b611e153e0480a354559f82fe5dc4c455bad4e Author: Mitchell Horne AuthorDate: 2023-05-10 12:52:47 +0000 Commit: Mitchell Horne CommitDate: 2023-05-10 13:17:41 +0000 hier(7): drop list of /usr/include subdirectories It is nice to have, however, the location of this information means that it will naturally be missed by developers adding or removing directories to the layout, so it trends out-of-date and it is out-of-date. The target audience for hier(7) is users and administrators. It is not expected to be a place that programmers should go to learn about the purposes of the different C headers provided by FreeBSD. Program authors needing FreeBSD-specific interfaces or libraries (#include , for instance) will either be following a more detailed man page, or consulting the header contents directly. Folks targeting standardized headers (#include ) will not need hier(7) to tell them where those headers are under /usr/include. In other words, this is more detail than necessary for this document. I'd go as far as to say that many of the existing entries in this list do little more than parrot the name of the directory. With all this in mind, let's drop the maintenance burden. Reviewed by: imp, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40000 --- share/man/man7/hier.7 | 143 -------------------------------------------------- 1 file changed, 143 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index bb00923118c1..ef6785150af8 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -215,149 +215,6 @@ and .It Pa include/ standard C include files .Pp -.Bl -tag -width "kerberos5/" -compact -.It Pa arpa/ -C include files for Internet service protocols -.It Pa bsnmp/ -C include files for the SNMP daemon -.It Pa c++/ -C++ include files -.It Pa cam/ -C include files for the Common Access Methods Layer -.Bl -tag -width "kerberos5/" -compact -.It Pa scsi/ -SCSI device on top of CAM -.El -.It Pa dev/ -C include files for programming various -.Fx -devices -.Bl -tag -width "kerberos5/" -compact -.It Pa ic/ -various header files describing driver- and bus-independent -hardware circuits -.It Pa ofw/ -Open Firmware support -.It Pa pbio/ -8255 PPI cards; -see -.Xr pbio 4 -.It Pa ppbus/ -parallel port bus; -see -.Xr ppbus 4 -.It Pa usb/ -USB subsystem -.El -.It Pa fs/ -.Bl -tag -width "kerberos5/" -compact -.It Pa fdescfs/ -per-process file descriptors file system -.It Pa msdosfs/ -MS-DOS file system -.It Pa nfs/ -C include files for NFS (Network File System) version 2, 3 and 4 -.It Pa nullfs/ -loopback file system -.It Pa procfs/ -process file system -.It Pa smbfs/ -SMB/CIFS file system -.It Pa udf/ -UDF file system -.It Pa unionfs -union file system -.El -.It Pa geom/ -GEOM framework -.Bl -tag -width "kerberos5/" -compact -.It Pa concat/ -CONCAT GEOM class -.It Pa gate/ -GATE GEOM class -.It Pa mirror/ -MIRROR GEOM class -.It Pa nop/ -NOP GEOM class -.It Pa raid3/ -RAID3 GEOM class -.It Pa stripe/ -STRIPE GEOM class -.El -.It Pa libmilter/ -C include files for libmilter, -the -.Xr sendmail 8 -mail filter API -.It Pa machine/ -machine-specific C include files -.It Pa net/ -miscellaneous network C include files -.Bl -tag -width Fl -compact -.It Pa altq/ -C include files for alternate packet queuing; see -.Xr altq 4 -.El -.It Pa net80211/ -C include files for 802.11 wireless networking; -see -.Xr net80211 4 -.It Pa netinet/ -C include files for Internet standard protocols; -see -.Xr inet 4 -.It Pa netinet6/ -C include files for Internet protocol version 6; -see -.Xr inet6 4 -.It Pa netipsec/ -kernel key-management service; -see -.Xr ipsec 4 -.It Pa netsmb/ -SMB/CIFS requester -.It Pa nfs/ -C include files for NFS (Network File System) version 2 and 3 (legacy) -.It Pa openssl/ -OpenSSL (Cryptography/SSL toolkit) headers -.It Pa protocols/ -C include files for Berkeley service protocols -.It Pa rpc/ -remote procedure calls; -see -.Xr rpc 3 -.It Pa rpcsvc/ -definition of RPC service structures; see -.Xr rpc 3 -.It Pa security/ -PAM; see -.Xr pam 3 -.It Pa sys/ -system C include files (kernel data structures) -.\" .It Pa tcl/ -.\" Tcl language; -.\" see -.\" .Xr Tcl n -.\" .Bl -tag -width "kerberos5/" -compact -.\" .It Pa generic/ -.\" ??? -.\" .It Pa unix/ -.\" ??? -.\" .El -.It Pa ufs/ -C include files for UFS (The U-word File System) -.Bl -tag -width "kerberos5/" -compact -.It Pa ffs/ -Fast file system -.It Pa ufs/ -UFS file system -.El -.It Pa vm/ -virtual memory; -see -.Xr vmstat 8 -.El -.Pp .It Pa lib/ shared and archive .Xr ar 1 Ns -type From nobody Wed May 10 13:27:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbSC75m2z49v3Z; Wed, 10 May 2023 13:27: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 4QGbSC63Xqz3QNW; Wed, 10 May 2023 13:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVolqmNO6DT4Uzj7XcEFPV841tg4/fVxqBdhC4fMQHw=; b=lqZwyc18f5L8y7IPA1gqQCJeHopUI7VBUljKT8lZ1OQxWSoxFPPFLJ2S0dy0aZgPxWzbkJ BiMIVOh+hFm09CpDTstdSpGO6kgVTI5+Ui20ZkzpVHoyt77fFhxnFwddI5KMYVyWGzWdW1 BAnY+EYc3Emhc2cer2d5/P0GfptWkXN/BVwAoJUTxLFWG/PnBhB39qlKjeLt+QStoFIq19 byU3oq50sE6IpTpJNieJ1I9Db7SJsGrTby2wiMM9Ki2oDzfF7q8XrULaggVU8HFG/J3suZ CuxW4G9D9qXWzXUh8YdZEqXVvIkFUo0gM3XZLPEN3IjJhBXhLquB9PN1M4z/jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dVolqmNO6DT4Uzj7XcEFPV841tg4/fVxqBdhC4fMQHw=; b=RaqF3PQfT+1vOfggBI738/v4UcTRd6slVeRD89BXVCVhfqay6bhhyC9x2b2weqNpgJAqaw FH9jIREp0ZNKVex2OruV55iy4gRMFRZyE0K5LTp3p3ilq4NoM3G5rQfw2l/bWSquQBbCBm me4iwu1RjScvpl/TlkLyTo7uJS5oRkHUTSWZJ3QSI0zjkWpxVTgRRCv5xY7O8N7AnXKaFZ xipTERypoSVzg4WUzhaHOstbsQFeGFC2S4w3FiLjFxotkugn3YTRZd9TqaET99m5et6xOW bcl4O5umWg7uassDgVOF9ywd2MK5Uqq71Ehy+IXTTn/z6cryVEBxZp6DwWNHNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683725275; a=rsa-sha256; cv=none; b=pYHdMBQ2U0z/NZme2UqiWCI/7V3q0aCda0JIMEhUNA7kUBw9MYwDqbfTJS5N2ES5WPwoV+ eLv7de2wNUzwN6mfvLTeEFZlvbeDcS7xK/OTKe551MX14/Jfr5Km3ltXAVsgfsigmbh+/M dnmAs5zRyOUQa3e1oyozgn97MsTv4FF9y5VlUFhQ2uhEIa1hKgmARYoD5mJ9W0pSwIH7LD VAvQzTRwWQKiqmZapPOEJHd+31SfNAUAuEAXh4qth8TOtSgpeHpU4JxdQWpNqQUeS3MslM Sg3L8ecxzDWDppILc2H1fmlhUaDtHcskpRD11mfVmKBaKN5BZ6Wl+q23/7xweg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGbSC54Smz1BQP; Wed, 10 May 2023 13:27: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 34ADRt0u088491; Wed, 10 May 2023 13:27:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADRtFF088490; Wed, 10 May 2023 13:27:55 GMT (envelope-from git) Date: Wed, 10 May 2023 13:27:55 GMT Message-Id: <202305101327.34ADRtFF088490@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 1bc55f58393f - main - hier(7): drop list of /usr/share/doc subdirectories List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bc55f58393ffd9714ebfd1ad4e9555cff76e8f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=1bc55f58393ffd9714ebfd1ad4e9555cff76e8f6 commit 1bc55f58393ffd9714ebfd1ad4e9555cff76e8f6 Author: Mitchell Horne AuthorDate: 2023-05-10 12:53:40 +0000 Commit: Mitchell Horne CommitDate: 2023-05-10 13:18:21 +0000 hier(7): drop list of /usr/share/doc subdirectories Several entries are outdated, several new ones are missing. I do not think there is much value added in maintaining this. Reviewed by: imp, emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40001 --- share/man/man7/hier.7 | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index ef6785150af8..ff11289436a1 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -324,39 +324,7 @@ terms, proper names, and jargon words from Webster's Second International .El .It Pa doc/ -miscellaneous documentation; -source for most of the printed -.Bx -manuals (available -from the USENIX association) -.Bl -tag -width Fl -compact -.It Pa FAQ/ -Frequently Asked Questions -.It Pa IPv6/ -implementation notes for IPv6 -.It Pa es/ -Spanish translations of documents in /usr/share/doc -.It Pa handbook/ -.Fx -Handbook -.It Pa ja/ -Japanese translations of documents in /usr/share/doc -.It Pa legal/ -License files for vendor supplied firmware files -.It Pa ncurses/ -HTML documents pertaining to ncurses; -see -.Xr ncurses 3 -.It Pa ntp/ -HTML documents pertaining to the Network Time Protocol -.It Pa ru/ -Russian translations of documents in /usr/share/doc -.It Pa tutorials/ -.Fx -tutorials -.It Pa zh/ -Chinese translations of documents in /usr/share/doc -.El +miscellaneous documentation .It Pa examples/ various examples for users and programmers .It Pa firmware/ From nobody Wed May 10 13:27:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbSF0z6Zz49tnB; Wed, 10 May 2023 13:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGbSF0KZgz3QQv; Wed, 10 May 2023 13:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNSgBu6KElfWUNOYTfCduiNoT/qs9peUtJVF3FhmzP4=; b=ubf3bWKiwYmRJm1LfI2beZrf5jJitr395GB3nMSjDo3FnlYy73SbL9rrEuinRIvTaKoPST CPVauPqOakbnJANVLQFjC4wp7Bs76XqjsEAXfhEh06ZL3A5bsZ9ekqSTDPSWy9+V2cBWqy fSUs+vVreV7G6VHppg66q5lH1y7qvzM9dMKuL4jr7P3K49QrSuaYIFS7yjySioOtf7a4YA BFTlxfgDugTQG+HP2ReMTDnWdXCeTYQSWi/rFI2DaLb+9uirvqLG3PvSkK29rot8e+HUAS X/1Rp1DMgcTCDk0uohgR9nW5Qbby4Uno+9CRfbEVMHTD4ryt9zoMExgs4PTM7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725277; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNSgBu6KElfWUNOYTfCduiNoT/qs9peUtJVF3FhmzP4=; b=Bqj8JI7m8WysOOs1QfVd+LoWXU6aHx3Mh5XG47XOMBsc1SJmw2CU9WkPgxI5pUyYakFuwS l2oI3fYp0pvYdYqxEweu2QiD9tvgXUFSoVhbyv5Fak6z7jKIWdbh87yOfs8ZgHjksuPu4H uVERgUHnmy174kEd9exwnKLj6XOJrcAR6D0YgBkudd9P9CJljThvDBZ/Jc180XmNtn/lzl mYRpFz57KIcBxIbeddW96TnQMWBfQHtbuwxfcZgqdTJAMaaetnhwV5vkr3vB4RXORLYU6i tCCUlYVuBc6PJAaXP+lZr7iZ3BB0HfHNhBDa1VxcoJNynjkL7/ZpS0UOrIXlMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683725277; a=rsa-sha256; cv=none; b=YtHo9gkIloe+3a1nLjAi693sfgWcLeOEEP/YL8PYQ4fXjSYOflyI7NQnEOrcADDHTWIymV eGZOev5KuO+Qv146lLwu39UhdxClpqgxnaRUlyOQxFoXB/gNduGzXzxB8dC2+Sf6CBpkZA kHu7slVIMVPJKGnsdNnclgjTLXCUupeZJIBVn0uyDMSWupZ/KCYS1j6nwMYAzi0Q1vPTdR 6uXxVyXT4/dAtdpFl0egSmlDqnGaF94ob2OF66CWyRNEQ7tuueqsV/htIdI8bba8j+xN7I +iYUL+MSGiRNmldoMcoOjBWLzHLVB58Xo3cj0uSKM1rkVl2HObqFnYWw+x+dFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGbSD6GLyz1BhX; Wed, 10 May 2023 13:27: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 34ADRu3l088511; Wed, 10 May 2023 13:27:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADRu0P088510; Wed, 10 May 2023 13:27:56 GMT (envelope-from git) Date: Wed, 10 May 2023 13:27:56 GMT Message-Id: <202305101327.34ADRu0P088510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36db6b04962a01ff7b21592def02d4c570dac939 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d4c570dac939 commit 36db6b04962a01ff7b21592def02d4c570dac939 Author: Mitchell Horne AuthorDate: 2023-05-10 12:53:56 +0000 Commit: Mitchell Horne CommitDate: 2023-05-10 13:25:17 +0000 hier(7): document /home/ and /usr/home/ Reviewed by: imp MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40002 --- share/man/man7/hier.7 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index ff11289436a1..b6759dd6e65b 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -90,6 +90,10 @@ file descriptor files; see .Xr \&fd 4 .El +.It Pa /home/ +user HOME directories. +This is a symlink to +.Pa /usr/home/ .It Pa /etc/ system configuration files and scripts .Pp @@ -214,6 +218,12 @@ and .Xr bsdinstall 8 .It Pa include/ standard C include files +.It Pa home/ +users' HOME directories; +the layout is not standardized, but a typical interactive user +.Dv beastie +might receive their own directory under +.Pa /usr/home/beastie .Pp .It Pa lib/ shared and archive From nobody Wed May 10 13:27:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbSG1Bp6z49tpt; Wed, 10 May 2023 13:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGbSG0hswz3QXC; Wed, 10 May 2023 13:27:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2A8ix+QTLhraZIpzoINy+1FsJHwK4VHeG17bKeIo6U=; b=vhxFCgJb45OG3xaYDJm7YHCYxuf3Bn+9JNmTuQj4Sl0vMoUOk+NuzIELaOI34sQ+stzmf2 ctrtVAl/rH1l4ZM6SVPYkUCuQ6I8rHwDu+BsZIOV4IaWIdAoFKxGZY+m3/eRXCJns2Lvbt 7uuuXBZYaX1lIVpLkWXLCqoFQQC+uTaYsJYRUsxZ7PWKY9B0wJ0rU3Li+aBD5uh3VTwGXv wCQj66dF8tjDtbk5J+HVKjbmvdAeyLN/W9yqjR4U8Y02dFeqxr8v9NYNclqXmRkqmsBAof C8aQj93pIScYbQu9ee9X3Gu8OwRvO38WzubQFUrsNnAHRUovDl/w4W9fPjeesg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683725278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u2A8ix+QTLhraZIpzoINy+1FsJHwK4VHeG17bKeIo6U=; b=rMOu5Y+DvvyChQZq/d0bxQSrnRCscSjDd+75kScgapkfV03sAKzD2yop1U7jYEvKHZ/xoB 0MXLBL78kciR3Kev9/T25v13A7IB+Jffp4bYJzSgvg6kAwZtMk+a8k4U+4t55G6RRCWUXn O6AGC6pGkPSfzqMR9D5m/AUtkOByg4ZTZt9gmHMuVrbgRMqnYcMwaqY3TX3kEif2bBBn4I cNAjn8+isRkz7UxrNKZdcjF+Dlu0kD+8dO2/OKvVL79RrmX4/fed3ipM6HDfP5d9Sh0Ei4 J885Du/75w4mNSYvJC8PBypM0d/VyHZfP2L5WKEO5/wKJt8Ah5EpcX0oGfb8PA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683725278; a=rsa-sha256; cv=none; b=ggB4ddX0nsFMxdCIDqzEbKZ9/zfE9hF4r3txmdb+K/9tISuNNuoHdo7ByU/1cR2AYA2eHC uiAhzBlu52YwYFeGEeGwC+ABxar1+nB7bvZp7NISdmIUnuWDi0k3Pp5qcyFEoxImLuFCom PeAPd9Ld7+YsKI2svYZvHAmidNA/TIXaBSdcArm1T/5WaDaIVF7ZUCpEiBe2mvPJew20Ml FGlli6qF4JL2Go4Qwqilqf8B43FtNiGc41F2DQk+Td/r0pRMqFf5wncNkOq4fI+2CHfvZA ZDThssvjaYvqPIreWR5itUzmAdTZKrSmEIPK6zEB4jpZb0gCc3KSlmxHWz5ogw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGbSF6wGCz1BZj; Wed, 10 May 2023 13:27: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 34ADRv9c088530; Wed, 10 May 2023 13:27:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADRvHB088529; Wed, 10 May 2023 13:27:57 GMT (envelope-from git) Date: Wed, 10 May 2023 13:27:57 GMT Message-Id: <202305101327.34ADRvHB088529@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 031049cf3262 - main - hier(7): fix a couple mandoc warnings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 031049cf3262ec5981cebc35d9b70623177a84bd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=031049cf3262ec5981cebc35d9b70623177a84bd commit 031049cf3262ec5981cebc35d9b70623177a84bd Author: Mitchell Horne AuthorDate: 2023-05-10 13:26:35 +0000 Commit: Mitchell Horne CommitDate: 2023-05-10 13:26:35 +0000 hier(7): fix a couple mandoc warnings These references are rendered correctly without the zero-width space. MFC after: 1 week Sponsored by: The FreeBSD Foundation --- share/man/man7/hier.7 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index b6759dd6e65b..e91bc2d5d193 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -88,7 +88,7 @@ device special files managed by .It Pa fd/ file descriptor files; see -.Xr \&fd 4 +.Xr fd 4 .El .It Pa /home/ user HOME directories. @@ -502,7 +502,7 @@ see .It Pa at/ timed command scheduling files; see -.Xr \&at 1 +.Xr at 1 .Pp .Bl -tag -width Fl -compact .It Pa jobs/ @@ -580,7 +580,7 @@ see temporary home of files preserved after an accidental death of an editor; see -.Xr \&ex 1 +.Xr ex 1 .It Pa quotas/ file system quota information files .It Pa run/ From nobody Wed May 10 13:46:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbsN6FQhz49w0D; Wed, 10 May 2023 13:46: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 4QGbsN5kvjz3kVJ; Wed, 10 May 2023 13:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PQZ0iWFfyzcqjeZrcGg176xcKSP42qJGZhISK2wlD2Q=; b=Eb9ZArqIqISTdCI2HkErrnmyj49sVUNi3mkYBio1nWpBIGr1UuFoiJyL0JPPFYGQ+uixc6 z4gX/lrH5aBPAqf/mSYPr1Wdvo8HxtT95IEX9MT8xK9e0OGkaL8Lj7N66Udgv7unAHkKb2 cexU+0suUWTgf8/oqusKOmyoKMsCQ1/gTMbwLkwtU1SkoAs0DFlkrGQCCHTybqtBM6X1cF /ixIg+3avn1H7Eu4P3hTZwH2t09YxM5ma+pMIZ07IElpoqzjkBqKNt81uha5dtRk/VTyiq a624ZtiY9269LbuVf5ya9PuF1ChoQCA/4Gl74vQSfpQ8Q7wNxQbE6UJlmhyuJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PQZ0iWFfyzcqjeZrcGg176xcKSP42qJGZhISK2wlD2Q=; b=AIJMlW3F7jcY3xCYhTRyHrXMZgOnT/fGwP2pqOLDFgO1lWtJyGZlIv2zKeB7wvPVuYQMoA b8swF5ypeMNLKYm6ATQxEIS3jjnIeJaecuoNGBmvzVQeHucmccUN3svkJkFCH6cTwUQX7C 48e6nF2HFgO1RCiA+CLGy6q4uZfve0OSvTWv4VG1OEYW7nJlyNRBc06/RpJxasObF9m8Ce tPNDo3wuPw106NqyoQKRAf7zrHTXWMMixqFUte5sYWiExlqA3qfcNCT35Oqja8qQ2P57fS PpFo2eo/U2cKB7JgEmLvIMrq4YFCN6TMy9M8gCzU7hylXmrIpFQLo70se5ysow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683726376; a=rsa-sha256; cv=none; b=J3Uy4lKHQ82hDI5zpQCJRgGw7ZM3YwcNZnmPzUfwh5p4Hbe74pCzaleWbRg5oqbbCv+OEx 51aSi82smvcHXNYl/yxcGG7lX1kZG2MOi7/hakcltqnpY38Goi9/JEj+6vdJXnW0eHCJuZ 9CzkLwabiDppUls+N0rPvtSAcd7O+VHXVL0C6TmYyWhocYlRePGQq1mSmldbq9gsZIimhQ HM4qF0ULURfsoZuTrmEiFVsz6HWhkXG2FM8o/ZosevYuntLaE3dbQ3mhuXmw0pBVLFG5V0 QOMM1vwzy6AsaWnfzySOcj55AOJFfKJV4+iJwRA09WyHAvWZWR5mUDXgJVXY0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGbsN4p9tz1Bs2; Wed, 10 May 2023 13:46: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 34ADkGqA021307; Wed, 10 May 2023 13:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADkGig021306; Wed, 10 May 2023 13:46:16 GMT (envelope-from git) Date: Wed, 10 May 2023 13:46:16 GMT Message-Id: <202305101346.34ADkGig021306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 00de65aaed3a - main - md5: Add missing references to sha384. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00de65aaed3a4d7601b160ba6771b876eaf91d36 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=00de65aaed3a4d7601b160ba6771b876eaf91d36 commit 00de65aaed3a4d7601b160ba6771b876eaf91d36 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-10 13:45:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 13:45:11 +0000 md5: Add missing references to sha384. Fixes: 4849767cb16a Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D40032 --- sbin/md5/md5.1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sbin/md5/md5.1 b/sbin/md5/md5.1 index bd619587e7a9..b7eaf0813338 100644 --- a/sbin/md5/md5.1 +++ b/sbin/md5/md5.1 @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd April 12, 2023 +.Dd May 10, 2023 .Dt MD5 1 .Os .Sh NAME @@ -273,7 +273,8 @@ When verifying checksums, warn about malformed input. .El .Sh EXIT STATUS The -.Nm md5 , sha1 , sha224 , sha256 , sha512 , sha512t224 , sha512t256 , +.Nm md5 , sha1 , sha224 , sha256 , sha384 , sha512 , +.Nm sha512t224 , sha512t256 , .Nm rmd160 , skein256 , skein512 , and .Nm skein1024 @@ -284,7 +285,7 @@ and 2 if at least one file does not have the same hash as the option. .Pp The -.Nm md5sum , sha1sum , sha224sum , sha256sum , sha512sum , +.Nm md5sum , sha1sum , sha224sum , sha256sum , sha384sum , sha512sum , .Nm sha512t224sum , sha512t256sum , .Nm rmd160 , skein256 , skein512 , skein1024 and From nobody Wed May 10 13:46:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbsQ0X0lz49w0H; Wed, 10 May 2023 13:46:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGbsP6f91z3kjM; Wed, 10 May 2023 13:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4yU5W3RHaRX1RPXoc++j0eR7eaJVnum3SWgT/+Ngns=; b=pPl/jjGOJcWffKEPJUWNeDjpyMUGRxYykHwyiPzNLN+Q4/tubXOQM7ldTRY4vXNkUSJve0 pkd+fr/a6y+aF5AHd60Qk6AYjdgaBPJh/mHWOM7mHeouqx3E0Ssn82ZkQ8oThsq+s+EB+x zjjWD5d4R9HFGm9ZMS/nnsxt173FBR4Gm8QfJF48hi5V1DimU+Fosk7/jq1A5rcrMPcQbt +mnMDo4Zr+BysDTccExNYzI7ruFdRad9C2jx7b7IWvLEK0dFNvhGhN2cA3t8V4lkyVhVr4 TLNlHz/+QlTI6BK24G43aWijLA6QXNoikKZB5OnE2NthIOsp2Mrl810UO/xaIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4yU5W3RHaRX1RPXoc++j0eR7eaJVnum3SWgT/+Ngns=; b=Mh8dKqSRfnpIbG4A0V2bUobvlSx1SJK//4j0id4UKrYryE2vH4A+XxwYHxLneQIQt5x4xd hlBepJ/TMHh5stnBPegfgSndqMk/I+DYixCmw62Y8SWE+wpKqQ3twu4yOAPnGFdAMCJsZX gaMaDy2R3fj6QAH+8uYqdA38cJvLWoINiMRWuIxGyQVygOzVyJCZVuVMVlwR/VUeplUpXI fLZuRtnzD3S7Wpjq9ssEiFPXxcxEKWF0XGFOf+rQWOp2RVV+0ovXFgXKAUZ9hsOgFkjzj4 JceDHIpr8efLWTMfNrt273/jvN2qDUs/kZVShdgjfV7RNz3MlZJ/ZPNVPiz96w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683726377; a=rsa-sha256; cv=none; b=p5P2dvzL67xWXVECg5raOiFJp/oTvOlyfXdqIcrhOatqzMUYBemTF0DFKER+PZz4vGykZ8 1fxgNtmfcJBH6L/mfVLXhcjxtHBeZwLi9/RcqwIUydenj6stbD3WR0jPF1gswzJXJ83Hgu pgHNH7cFxtRm4Z4TaGB8bvrL2kRVfM7/IgtuQozZiTIey8nkvWI/CuaRkj/fmxAJyuHW7X EOfn1bAV+Y1DGQdpS67FVkL1eEMrD1pP+YKkhQ4b09jIEmaaT9HcNkOBqJg9SYsyEXjQWw UGebSdarDdzntymQyy7EznS7N6SugtSM1dbqqZw+LXzpy1Tpkei3fotdDYqejQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGbsP5jT0z1Bqd; Wed, 10 May 2023 13:46: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 34ADkHAA021334; Wed, 10 May 2023 13:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADkHZY021333; Wed, 10 May 2023 13:46:17 GMT (envelope-from git) Date: Wed, 10 May 2023 13:46:17 GMT Message-Id: <202305101346.34ADkHZY021333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: b55bc49e8694 - main - tsort: Replace bcopy() with memcpy(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b55bc49e8694d9226a82041ff23ad61a5c7a6a76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b55bc49e8694d9226a82041ff23ad61a5c7a6a76 commit b55bc49e8694d9226a82041ff23ad61a5c7a6a76 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-10 13:45:38 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 13:45:38 +0000 tsort: Replace bcopy() with memcpy(). Also fix an indentation error I introduced in the previous commit. Fixes: cb46f47c7969 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40042 --- usr.bin/tsort/tsort.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/tsort/tsort.c b/usr.bin/tsort/tsort.c index b2dbe9beb799..53c66e44c76a 100644 --- a/usr.bin/tsort/tsort.c +++ b/usr.bin/tsort/tsort.c @@ -183,8 +183,8 @@ main(int argc, char *argv[]) /* do the sort */ tsort(); - if (ferror(stdout) != 0 || fflush(stdout) != 0) - err(1, "stdout"); + if (ferror(stdout) != 0 || fflush(stdout) != 0) + err(1, "stdout"); exit(0); } @@ -251,7 +251,7 @@ get_node(char *name) switch ((*db->get)(db, &key, &data, 0)) { case 0: - bcopy(data.data, &n, sizeof(n)); + memcpy(&n, data.data, sizeof(n)); return (n); case 1: break; @@ -268,7 +268,7 @@ get_node(char *name) n->n_arcs = NULL; n->n_refcnt = 0; n->n_flags = 0; - bcopy(name, n->n_name, key.size); + memcpy(n->n_name, name, key.size); /* Add to linked list. */ if ((n->n_next = graph) != NULL) From nobody Wed May 10 13:46:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGbsR1M9dz49vnt; Wed, 10 May 2023 13:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGbsR05QGz3kZk; Wed, 10 May 2023 13:46:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAAaHFuOxN2JGZACESKKkRRTocbSE1sGBZXjtPu1tn4=; b=Lq5HCsbU8FS0+bcJ4g24m6EeigrGntCnhzE8sFrGRwdWrJb2zkyflHIYe7XEBdbyNvr2+m asIrBeYJd3BJLQV2kxLsiB0vgwHw0+pcmz+oiCXjEqWLtBZP/peC8r5j04Twu5xMRgDgGk VqNXmhuEfYlDPtHGJb3e99dYxsGo0DkxL7vieMFuoXFmT3wekuf+0O/bzNGkkeq74SOsS9 xeustdb2ctKmgbhyGdJ49zBp81S3pfd4POYOrwzkiJaCZJ8zrEc3yv84nN6anng9aELf0U eEnX6J3W5xs9Qi0bWjfbu11f9Uz42g1B/RPYAj791xNSnJSuMlDBdFSADcxoQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683726379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LAAaHFuOxN2JGZACESKKkRRTocbSE1sGBZXjtPu1tn4=; b=CTnPEwZfjuwxoqKNXfJEAx5Cy4X3b0ODd5PEmqqB7RKlzOwR/KlaPbkjl8SwadzUVh20yL BBUTogqI00TlXOrFI1rgyotSVez+3skCFkZdzYroIlF1lZzLyFpKSYpS21qo5RCgaeAlKf p+cFQDo9Qu9QA6j/+yDyY47yI35V+nPh1ZqKf11lg+isIj3C8FCzArLH9PedJR0bP3tfI1 TTinEgYcKJ6Ncr84y+tu6YKaqYd95HwFWW8NPBXwiJKVqjhRdZ2R9Gt33gwZ9NV1fADwag mBavz8sPJg2chKYnVd1YPNY6PsH7NirMBuZ1nzKh2tywRkOjS7NgIpTxaUDckA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683726379; a=rsa-sha256; cv=none; b=VWFo99YrqyKPVjvslXg0PKs2Oa50UIIQH1MWPXfPZgw/myJjea6fQ4FowIj1TEUIduzmiQ 2ut+TIohEyRO/HL3XDiWTc+KtTpy1ewnmir61V5YdEiU8DrJtLkQVIVQ5N5yFhsClxQx4a mJqnn0iORda4FH7F//Ikx9NC9+OS9HXmsf4VWBN4r3NnsdkCnm58tUETyID2n32qFyq90a iSOJonlbmnK75UZse7ns2EMuFiZP1cKp6yss0UB/RarC3Ai7ogmS6rnrOirPVFAbDUBAof VCJYX5Mmg4+asH8+EQi6tH2XphtutT3hfAeGd2t8Cb/scJYEXdfWjdSbsYVIuQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGbsQ6HDdz1CGG; Wed, 10 May 2023 13:46: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 34ADkI6n021361; Wed, 10 May 2023 13:46:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ADkIp8021360; Wed, 10 May 2023 13:46:18 GMT (envelope-from git) Date: Wed, 10 May 2023 13:46:18 GMT Message-Id: <202305101346.34ADkIp8021360@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 09aee570980b - main - tsort: Add unit tests. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09aee570980b7eca6e3c902a66f6db129b8c7376 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=09aee570980b7eca6e3c902a66f6db129b8c7376 commit 09aee570980b7eca6e3c902a66f6db129b8c7376 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-10 13:45:44 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 13:45:44 +0000 tsort: Add unit tests. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D40043 --- etc/mtree/BSD.tests.dist | 2 ++ usr.bin/tsort/Makefile | 5 +++ usr.bin/tsort/tests/Makefile | 6 ++++ usr.bin/tsort/tests/tsort_test.sh | 66 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index c9a13cec193e..5d99653100df 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1116,6 +1116,8 @@ .. truncate .. + tsort + .. units .. unifdef diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile index b0d353e4d8f7..c0933dac2de1 100644 --- a/usr.bin/tsort/Makefile +++ b/usr.bin/tsort/Makefile @@ -1,6 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/9/93 # $FreeBSD$ +.include + PROG= tsort +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests + .include diff --git a/usr.bin/tsort/tests/Makefile b/usr.bin/tsort/tests/Makefile new file mode 100644 index 000000000000..ab16c2842dd0 --- /dev/null +++ b/usr.bin/tsort/tests/Makefile @@ -0,0 +1,6 @@ +PACKAGE= tests + +ATF_TESTS_SH= tsort_test +BINDIR= ${TESTSDIR} + +.include diff --git a/usr.bin/tsort/tests/tsort_test.sh b/usr.bin/tsort/tests/tsort_test.sh new file mode 100755 index 000000000000..88d4efaf2b9f --- /dev/null +++ b/usr.bin/tsort/tests/tsort_test.sh @@ -0,0 +1,66 @@ +# +# Copyright (c) 2023 Klara, Inc. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +atf_test_case basic +basic_head() +{ + atf_set "descr" "Sort a basic graph" +} +basic_body() +{ + cat >input <output <input <output< Message-Id: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ In-Reply-To: <202305101327.34ADRu0P088510@gitrepo.freebsd.org> To: Mitchell Horne Date: Wed, 10 May 2023 07:19:41 -0700 (PDT) CC: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4QGcc64SzQz3q5t X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > The branch main has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d4c570dac939 > > commit 36db6b04962a01ff7b21592def02d4c570dac939 > Author: Mitchell Horne > AuthorDate: 2023-05-10 12:53:56 +0000 > Commit: Mitchell Horne > CommitDate: 2023-05-10 13:25:17 +0000 > > hier(7): document /home/ and /usr/home/ > > Reviewed by: imp > MFC after: 1 week > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D40002 > --- > share/man/man7/hier.7 | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 > index ff11289436a1..b6759dd6e65b 100644 > --- a/share/man/man7/hier.7 > +++ b/share/man/man7/hier.7 > @@ -90,6 +90,10 @@ file descriptor files; > see > .Xr \&fd 4 > .El > +.It Pa /home/ > +user HOME directories. > +This is a symlink to > +.Pa /usr/home/ /usr is "contains the majority of user utilities and applications" it should not contain home directories. I do not know when this move to usr came about it was traditionally /home. I do not know why /usr/home even exists, it is not needed by anything I am aware of. If we have a compatible link it should be, usr/home -> ../home and /home should be the directory. > .It Pa /etc/ > system configuration files and scripts > .Pp > @@ -214,6 +218,12 @@ and > .Xr bsdinstall 8 > .It Pa include/ > standard C include files > +.It Pa home/ > +users' HOME directories; > +the layout is not standardized, but a typical interactive user > +.Dv beastie > +might receive their own directory under > +.Pa /usr/home/beastie > .Pp > .It Pa lib/ > shared and archive > -- Rod Grimes rgrimes@freebsd.org From nobody Wed May 10 14:53:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGdMH3HHyz4B0wM; Wed, 10 May 2023 14:53:47 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGdMH2mW9z3tc5; Wed, 10 May 2023 14:53:47 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683730427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qr4N0O3fgT3YDQHOlfyDUBWpFD9Sicjb4tHsmbA81u4=; b=lkY0d9L3XWXTjICl01HTTyIBiDtxpemPNcIGUYLqO4nJjHmCkRamEXumdzSw0cNAAhfq9o CUqETCobfOTyMKMYiRD635RM7KwQ/AqMQfhbAUIJkmxUNN3p+djjczTSLs9q4BzhDLtv00 RxReZGCXsaJ0F9mw39qcbVEizE1j3CY7kPyDqCK2lmquY0I7SjbJU+ZVobaT8rJlAEvQqX J5PG1oUg0rTfcqvoOIf3Z0oVJdfx3Wni9yJZeLqXdFLXvNJ8mJNTNiKKf4BigXHlSkNgNX WNGjqV7B1gMm9Z9bj+SawK52e3+2un1LWQXFakRmWRV8v6mHQF1H0Io7KV4HTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683730427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Qr4N0O3fgT3YDQHOlfyDUBWpFD9Sicjb4tHsmbA81u4=; b=srxsKqTLxItt93P1Rzt1m3hKTsyZXKKFJR6Kj03vsoR8bqTJvnJ8yhanmlfX3UiDUZ3Y6x 0ICJL7pBnloywD1PyRRyoAKkr/8ELWe0ufix4ZB6bSFatPDeSh9hrBFxugMYYcz/2oEPfr YgIjIuTlgN27UisV4pwCrEhAZIzucPP7khYBS2tMimYrlyt+S7mTbEaGQRW6N8xeZaSIGv NYJVjMVGI0TPsc7beuK1El8yJaSPJp5G+Sq9mJVr7sGTyvs7lRDL5m+RZiAsDcf0XI5YIF 0RhUcUW+/j3/WQP+tCO0cbLj+V9sEDVRu+l9W+4rbBcGNiFWVlzGI/0dmAC6jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683730427; a=rsa-sha256; cv=none; b=SAXCwZM0BN5tF8KfFxrqd4KvdlH3Q1DmD8jtotCVGYmCJW+F2V3wr7VZPCEgSg/yoOPHxM DsUnUbnTwlpqTL8y4zdTiR/Y/u4YmofT/4MXm8eTCuoRpdC1CSI9itwk99L74pATf7PHZ5 7fv5nVXVJGvUmbtVfBZnPEDuZs8srh+NeqILzR2AfN2SyLg0POY/qRBS+/iglvrYD/PBpe uxfFZ7f8pNVi7PrSdGxn4L3emNL7j96HVmWYRn1trcJZL9Kx2gx0XwVPSD85TGlhrC73db DJ2K91nhrn/OBjpZXMe5gaQvAAAbkAX6SA0h93u4ZKIzFeFYKOFgqKKptWWxbg== Received: from [192.168.1.151] (host-173-212-76-127.public.eastlink.ca [173.212.76.127]) (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: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QGdMG70XdzsWZ; Wed, 10 May 2023 14:53:46 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: Date: Wed, 10 May 2023 11:53:45 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Content-Language: en-CA To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> From: Mitchell Horne In-Reply-To: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 5/10/23 11:19, Rodney W. Grimes wrote: >> The branch main has been updated by mhorne: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d4c570dac939 >> >> commit 36db6b04962a01ff7b21592def02d4c570dac939 >> Author: Mitchell Horne >> AuthorDate: 2023-05-10 12:53:56 +0000 >> Commit: Mitchell Horne >> CommitDate: 2023-05-10 13:25:17 +0000 >> >> hier(7): document /home/ and /usr/home/ >> >> Reviewed by: imp >> MFC after: 1 week >> Sponsored by: The FreeBSD Foundation >> Differential Revision: https://reviews.freebsd.org/D40002 >> --- >> share/man/man7/hier.7 | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 >> index ff11289436a1..b6759dd6e65b 100644 >> --- a/share/man/man7/hier.7 >> +++ b/share/man/man7/hier.7 >> @@ -90,6 +90,10 @@ file descriptor files; >> see >> .Xr \&fd 4 >> .El >> +.It Pa /home/ >> +user HOME directories. >> +This is a symlink to >> +.Pa /usr/home/ > > /usr is "contains the majority of user utilities and applications" > it should not contain home directories. > > I do not know when this move to usr came about it was traditionally /home. > I do not know why /usr/home even exists, it is not needed by > anything I am aware of. If we have a compatible link it > should be, usr/home -> ../home and /home should be the > directory. > I agree that /usr/home is strange, and is unique (?) to FreeBSD. The oldest commit in the output of `git log --grep '/usr/home'` is: commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd Author: David Nugent Date: Fri Jan 3 04:42:18 1997 +0000 Implemented /home -> /usr/home symlink kludge. If home basedir would be created in the root partition, create it under /usr instead, and symlink /basedir -> /usr/basedir. Notes: svn path=/head/; revision=21242 So it has been this way for 26 years at least. I do not know what to say about whether /usr "should" contain it, but it does. Cheers, Mitchell >> .It Pa /etc/ >> system configuration files and scripts >> .Pp >> @@ -214,6 +218,12 @@ and >> .Xr bsdinstall 8 >> .It Pa include/ >> standard C include files >> +.It Pa home/ >> +users' HOME directories; >> +the layout is not standardized, but a typical interactive user >> +.Dv beastie >> +might receive their own directory under >> +.Pa /usr/home/beastie >> .Pp >> .It Pa lib/ >> shared and archive >> > From nobody Wed May 10 15:13:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGdnn1Hjxz4B24H; Wed, 10 May 2023 15:13:17 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGdnm5RbVz3xgJ; Wed, 10 May 2023 15:13:16 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id wRWzpqOgs6NwhwlVEp7NIk; Wed, 10 May 2023 15:13:16 +0000 Received: from spqr.komquats.com ([70.66.148.124]) by cmsmtp with ESMTPA id wlVCp32ptHFsOwlVDpSRcE; Wed, 10 May 2023 15:13:16 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=645bb48c a=Cwc3rblV8FOMdVN/wOAqyQ==:117 a=Cwc3rblV8FOMdVN/wOAqyQ==:17 a=kj9zAlcOel0A:10 a=P0xRbXHiH_UA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=nNooUi5D4dnfFiwVUc8A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id E9726144; Wed, 10 May 2023 08:13:13 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 9E7A6111; Wed, 10 May 2023 08:13:13 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Mitchell Horne cc: rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ In-reply-to: References: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> Comments: In-reply-to Mitchell Horne message dated "Wed, 10 May 2023 11:53:45 -0300." List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Wed, 10 May 2023 08:13:13 -0700 Message-Id: <20230510151313.9E7A6111@slippy.cwsent.com> X-CMAE-Envelope: MS4xfKlYvE65zMJ/w1QZgo1lkatANhsuWl/JSNpcoELlfwEsjwKXtkwbM+8HPUs+4Mr3V1ECSAOjgvKUFHfayBvvWU6PNp9jZ3DJ/TwsVIcPSGhh8zD8TCBJ 8WxBbxYAegSFWbb4GP2fyuSdtZOk3AhplpgLqr8RUA42oGWNOuObDm7momwEYfxv5m4wzKkPayU+ovKkGvTUlBygOSxXXbsbcez98Gp90p5jJmtBohCOaV47 4Z+/dzWgmlHvLmW4f40gTNRF5wtYHdidxNlKW2vVpIK0ndV86+Yl413gvI5X+rnO7AdFDng6KophryyxLWkVPtvl16fTcbzFK38TgXJbi0ZdE+VJjlVJsKB4 VjsG34tm X-Rspamd-Queue-Id: 4QGdnm5RbVz3xgJ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N In message , Mitchell Horne w rites: > On 5/10/23 11:19, Rodney W. Grimes wrote: > >> The branch main has been updated by mhorne: > >> > >> URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d > 4c570dac939 > >> > >> commit 36db6b04962a01ff7b21592def02d4c570dac939 > >> Author: Mitchell Horne > >> AuthorDate: 2023-05-10 12:53:56 +0000 > >> Commit: Mitchell Horne > >> CommitDate: 2023-05-10 13:25:17 +0000 > >> > >> hier(7): document /home/ and /usr/home/ > >> > >> Reviewed by: imp > >> MFC after: 1 week > >> Sponsored by: The FreeBSD Foundation > >> Differential Revision: https://reviews.freebsd.org/D40002 > >> --- > >> share/man/man7/hier.7 | 10 ++++++++++ > >> 1 file changed, 10 insertions(+) > >> > >> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 > >> index ff11289436a1..b6759dd6e65b 100644 > >> --- a/share/man/man7/hier.7 > >> +++ b/share/man/man7/hier.7 > >> @@ -90,6 +90,10 @@ file descriptor files; > >> see > >> .Xr \&fd 4 > >> .El > >> +.It Pa /home/ > >> +user HOME directories. > >> +This is a symlink to > >> +.Pa /usr/home/ > > > > /usr is "contains the majority of user utilities and applications" > > it should not contain home directories. > > > I do not know when this move to usr came about it was traditionally > /home. > > I do not know why /usr/home even exists, it is not needed by > > anything I am aware of. If we have a compatible link it > > should be, usr/home -> ../home and /home should be the > > directory. > > > > I agree that /usr/home is strange, and is unique (?) to FreeBSD. > > The oldest commit in the output of `git log --grep '/usr/home'` is: > > commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd > Author: David Nugent > Date: Fri Jan 3 04:42:18 1997 +0000 > > Implemented /home -> /usr/home symlink kludge. > If home basedir would be created in the root partition, create > it under /usr instead, and symlink /basedir -> /usr/basedir. > > Notes: > svn path=/head/; revision=21242 > > > So it has been this way for 26 years at least. I do not know what to say > about whether /usr "should" contain it, but it does. Usually history matters. I can understand not changing it. On the flip side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /home -- albeit automounted from /export/home on localhost or some NFS server. In the Red Hat land at $JOB, /home is its own partition (actually an LVM volume). In both cases /home is not in /usr because end-users can fill /usr. This can be problematic operationally because it's yet another headache to deal with should someone fill the filesystem. Filling /usr is more serious than filling /home. As a point of interest, when I installed my first FreeBSD many moons ago I used the Solaris standard of /export/home, using amd (now automount) to serve my /home. I'm not advocating we do this, it's overkill, but /home should not live in /usr. It's a potential headache for any sysadmin. With ZFS the solution is easy. With UFS based systems there are a lot of other factors that go into how we install the "default" from the get-go. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Wed May 10 15:33:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGfFf6SXSz4B2w7; Wed, 10 May 2023 15:33:58 +0000 (UTC) (envelope-from mhorne@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGfFf5zsWz4132; Wed, 10 May 2023 15:33:58 +0000 (UTC) (envelope-from mhorne@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683732838; h=from:from:reply-to:subject: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=Oke5W90OtGZ47TwXOpKYotaVJjTFLvauBBLPAzOp1FQ=; b=Jd0bw8w+JjtOsxeXLWPMvzoLa3EwgVpXSw8psvI589y4BQyxckaMOjW0d3GTZ6PeDDpQXX iMNB9KLA8zlahAQOLzM2+nFwefvpeZKXeYCbJ39o5l6lnwPcgmGrOwsM7AzWAmheu9QzIh Ocg6lg6XaAnTQlq3iYLGRwIhlQyGq1e7s/AFKYGO6soTjMh6UZbLII1STbL8Dx72er9lt9 poD4o6kOah88RX2fUm3IUu3jLYdgNWTXQv3l7A7CxDo7svbbka5W/xd/nWuHiJDKduiv8G vp9RsrD1cz78MqClzalJzAA7A+TB4nui06UVtX0LsBdPgSLmE0fQVDezjaEUog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683732838; h=from:from:reply-to:subject: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=Oke5W90OtGZ47TwXOpKYotaVJjTFLvauBBLPAzOp1FQ=; b=B7geLFarn80PPmpi2SOXyJbCMXYSAp1lLYkNjdw0hi/+g3AdcEqAHXZ0tOZea/ajw2Akkb wG388lvUZVh6WKsKoDBKJCN9n5tK5UUMiWbaYvshIxQP5lmwTvOerFqDp4icJ2X1Jnt+bi pYpteBfcRxkalJ0zeTr/n2ZXrasiRAwxi/fs15s4tjKtrj8mwTM2BJQz2/0jC9u1FVxwIQ vPkvLIpycWp+Z4N+Cywq6XSPPUGa0lnlhIMkhexoEO/p2ZyvZMLy1XyCeM6tT9DAy2Cgh0 3Fvy+C64BUwjmMLzBOz4wKoO4WFNo65aLgPaLViXdjairzCWNaLIsZvhyu2o1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683732838; a=rsa-sha256; cv=none; b=Ve6mB4i+mivLxFRIl8a3xihDaUqaMMSoSkjWxfSE1PBkFHFKmfNFyq1DVlTxKf5T7lnQnV 6ThI0ZuzhJW/VYjqAUlXhmEUPk7H7evzQZEW4boTr4arMbaaZb1c6WyqtreLpgsfzuZpH0 DOP/xHV1c2wdVnzF+NSRYbT3EQjyO/4PuZh0gaBDA6fqmFLybpMM0pxioFR8Pf5dPJ4V3u hxpApxb7gsurl+emZ3H9okiW4LVKGG7JKoLZkXhMma18JV/p5t9K48JdyxIXzbPueDd6CB tz7C+40BUgpackvGuu7k5lPLxTmEjNncN8vg+yyv3ZH4DQrMM1WkuZgnYQ91/A== Received: from [192.168.1.151] (host-173-212-76-127.public.eastlink.ca [173.212.76.127]) (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: mhorne) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QGfFf3V8Kzst3; Wed, 10 May 2023 15:33:58 +0000 (UTC) (envelope-from mhorne@freebsd.org) Message-ID: Date: Wed, 10 May 2023 12:33:57 -0300 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: git: c3b611e153e0 - main - hier(7): drop list of /usr/include subdirectories Content-Language: en-CA From: Mitchell Horne To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202305101327.34ADRsNa088464@gitrepo.freebsd.org> In-Reply-To: <202305101327.34ADRsNa088464@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ThisMailContainsUnwantedMimeParts: N On 5/10/23 10:27, Mitchell Horne wrote: > The branch main has been updated by mhorne: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c3b611e153e0480a354559f82fe5dc4c455bad4e > > commit c3b611e153e0480a354559f82fe5dc4c455bad4e > Author: Mitchell Horne > AuthorDate: 2023-05-10 12:52:47 +0000 > Commit: Mitchell Horne > CommitDate: 2023-05-10 13:17:41 +0000 > > hier(7): drop list of /usr/include subdirectories > > It is nice to have, however, the location of this information means that > it will naturally be missed by developers adding or removing directories > to the layout, so it trends out-of-date and it is out-of-date. > > The target audience for hier(7) is users and administrators. It is not > expected to be a place that programmers should go to learn about the > purposes of the different C headers provided by FreeBSD. > > Program authors needing FreeBSD-specific interfaces or libraries > (#include , for instance) will either be following a more > detailed man page, or consulting the header contents directly. Folks > targeting standardized headers (#include ) will not need > hier(7) to tell them where those headers are under /usr/include. > > In other words, this is more detail than necessary for this document. > I'd go as far as to say that many of the existing entries in this list > do little more than parrot the name of the directory. > > With all this in mind, let's drop the maintenance burden. > > Reviewed by: imp, emaste > MFC after: 1 week > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D40000 > --- For these changes I forgot to include the related PR reference (sorry grahamperrin). PR: 261349 Mitchell From nobody Wed May 10 17:29:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGhqS4Fjzz4B9yX; Wed, 10 May 2023 17:29:56 +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 4QGhqS3n5Dz4Gd7; Wed, 10 May 2023 17:29:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683739796; h=from:from:reply-to:subject: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=gJYmeD8F3x8mu3BMsDW0FT59JvCTFjRu7CbUa5IVuxc=; b=bIyjxhsqtW8fufuKFwtVF3mIjdT8pJEBASj0wJUETF0AwpYUYrrHEa3PHoX36b/JAx2DZy SU1E+b4tdV4PkuNslKz9Ndh9Eyoq1qWtTWmb5rplk33zGq3QsuuYMDd6TJLlkblHFMqfbX WjOlrHmv68BokC3CL/mZgI12QSBurojtG0FZQBRV0T55jsCTBOCcKKwhMTy0kkxreG2F53 ZuXow9asbxr/iRElOAwSrdFv0vNTBhi6bPnsG+jxssWnc8JD0W7yu3hrX3NmntCy5hlO0/ VFPKMi3wOUR9PtKcl927BWwaMsl3ueSQsAe0plIeyWKL6/DW3tWkUKFSMO6MLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683739796; h=from:from:reply-to:subject: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=gJYmeD8F3x8mu3BMsDW0FT59JvCTFjRu7CbUa5IVuxc=; b=b6JXwC2Y1WbNtN8qWs/txJnGe0HBnWgDm0BTjGOCMmWvPtGC8V634B4WacR8RcKK0wJZ/E 7t8Wv4mrSduPXOp2tzfo6l9Cp5S9r2X0oBFUpvGKq0AUxGus5q2ryCgL2oAI+s8JGWCwbc n2Vivaupon/7GzqSKB0+1ar80LpeDXZl1faSEa7Ke0ldVmMzgQ6Ct02u67AJ0BWftLYBun RsfRn5xP0ZWF1R//U8uHkbMgGbchUACULptyxHxlpiV7HOxfJEnyZhoVDeVl7jOkYmCTBz JoxdvV7dipOTFaqfZD41sdoy83a3EEj320EUtoTuodXi84tVVN5efrk5WUR0TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683739796; a=rsa-sha256; cv=none; b=hdT2xhAuoqWTXOBL1FwMjrl0xY/AXsakOpDnMRzAQ0LnShE9dCIRBhGcwKE3VWWDtoRip+ nDxE+Y+fMin0Yv2LmMm5qtychfiklUOzxfVV/aHLXz4HFV3Tvp0o5FEZ7YiL7g54tbTcCz FjkaiY2FsRTIWRHaFA3RrredsMZ2EJl1Ono42qvZ8GaJOA8UYRTM2k8hZJM1B9X0HDylET wtpDj4LEdqnf+TjENMigMU+e9Y4W2NeXbUN/2qAIO/q9Vct3mccnmy1DVfX0XmLitPhSEZ Tr27uKP3xYWa+7BKxozsePlebKtz+yJN5p/70fex/hlnMcrLNvpnyUsv2DBU6Q== Received: from [IPV6:2601:648:8680:16b0:54fa:bf1a:4bcb:d53d] (unknown [IPv6:2601:648:8680:16b0:54fa:bf1a:4bcb:d53d]) (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 4QGhqR693MzvVG; Wed, 10 May 2023 17:29:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <077d3e1d-8d2a-5bf4-1f27-31d090e03731@FreeBSD.org> Date: Wed, 10 May 2023 10:29:53 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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.10.1 Subject: Re: git: 76887e84be97 - main - cpuset: increase userland maximum size to 1024 Content-Language: en-US To: =?UTF-8?Q?Corvin_K=c3=b6hne?= , Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202305081826.348IQm9N040108@gitrepo.freebsd.org> <0dadaa17917629e3399fe9acbab17eb60b63575d.camel@FreeBSD.org> <2f47388ab07eaeb820344e928adb96ff6f7a5916.camel@FreeBSD.org> <692e003e4b684c093b16048a4e12cc2dd8fc1fe0.camel@FreeBSD.org> From: John Baldwin In-Reply-To: <692e003e4b684c093b16048a4e12cc2dd8fc1fe0.camel@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 5/9/23 2:40 AM, Corvin Köhne wrote: > On Tue, 2023-05-09 at 09:43 +0200, Corvin Köhne wrote: >> On Tue, 2023-05-09 at 08:59 +0200, Corvin Köhne wrote: >>> On Mon, 2023-05-08 at 18:26 +0000, Ed Maste wrote: >>>> The branch main has been updated by emaste: >>>> >>>> URL: >>>> https://cgit.FreeBSD.org/src/commit/?id=76887e84be975698b14699d7d0dfb157d73e9990 >>>> >>>> commit 76887e84be975698b14699d7d0dfb157d73e9990 >>>> Author:     Ed Maste >>>> AuthorDate: 2023-05-02 20:57:12 +0000 >>>> Commit:     Ed Maste >>>> CommitDate: 2023-05-08 18:25:15 +0000 >>>> >>>>     cpuset: increase userland maximum size to 1024 >>>> >>>>     Hardware with more than 256 CPU cores is now available and >>>> will >>>> become >>>>     increasingly common.  Bump CPU_MAXSIZE (used for userland >>>> cpuset_t >>>>     sizing) to 1024 to define the ABI for FreeBSD 14. >>>> >>>>     PR:             269572, 271213 [exp-run] >>>>     Reviewed by:    mjg, jhb >>>>     Relnotes:       yes >>>>     Sponsored by:   The FreeBSD Foundation >>>>     Differential Revision: https://reviews.freebsd.org/D39941 >>>> --- >>>>  sys/sys/_cpuset.h | 2 +- >>>>  1 file changed, 1 insertion(+), 1 deletion(-) >>>> >>>> diff --git a/sys/sys/_cpuset.h b/sys/sys/_cpuset.h >>>> index b75ee595da3c..676f9855f384 100644 >>>> --- a/sys/sys/_cpuset.h >>>> +++ b/sys/sys/_cpuset.h >>>> @@ -40,7 +40,7 @@ >>>>  #define        CPU_SETSIZE     MAXCPU >>>>  #endif >>>> >>>> -#define        CPU_MAXSIZE     256 >>>> +#define        CPU_MAXSIZE     1024 >>>> >>>>  #ifndef        CPU_SETSIZE >>>>  #define        CPU_SETSIZE     CPU_MAXSIZE >>> >>> Hi Ed, >>> >>> this somehow breaks bhyve on my system. It immediately exits with >>> "vm_run error -1" on startup. >>> >>> >> >> Setting MAXCPU [1] to 1024 as well, solves the issue. Not sure if >> it's >> a regression of your commit or a bhyve bug. >> >> [1] >> https://github.com/freebsd/freebsd-src/blob/20d8d9809a8c0a3ddd1d0156e77ec53a1ed95747/sys/amd64/include/param.h#L68 >> >> > > vmm kernel module and bhyve userland are sharing a cpuset_t. So, this > commit introduces a mismatch in the ioctl signature of VM_RUN. Any > advice how to fix this properly, would be appreciated. The ioctl needs to change to follow the pattern all the syscalls that use cpuset_t do: take a pointer to the cpuset_t and a size instead of embedding the cpuset_t in the ioctl structure. We will have to define a COMPAT_FREEBSD13 structure and ioctl with the current structure with a hardcoded cpuset_t size (probably just inline cpuset_t member as an anonymous struct with the same members as cpuset_t but a constant for the array count) as well. -- John Baldwin From nobody Wed May 10 17:58:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGjS61jm0z4BCb2; Wed, 10 May 2023 17:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGjS61CRMz4JPl; Wed, 10 May 2023 17:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683741494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGzg1LFDk0PkIM1hqJdPZm0bavj5NVzd1EZTZTtvaN0=; b=mh1Pa9dfTox+3nslyGVtZQ/RWynKEIHQNtT659tjW2T1qZem+8XHSmI+eTGem9R1p2JqAV b9JHMunIqR8HJzXH0XmTEP6XpgzR25g8wc3XbmAC8M6Abziv8hNd7RuasWCT8+02BBg+Iy FV073+bmznKQpFPjEwWrsK4xwkVZOTSwOH6c/JmdL6lAQEWwyYP6COj40rla5H2aaFDihp 3gxnI6pdRMdbuVsbh7dMrJhjowcTrNMUfbL25BVD4tQ9YZkLCDIktwq7i6ZTpj2PwKS2Xu 57ETCHmFYvSxinht3vdpj400YkdIiR/MgdpWlIPVI4UFtooyzS3hSTE4bltkzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683741494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGzg1LFDk0PkIM1hqJdPZm0bavj5NVzd1EZTZTtvaN0=; b=WuGms/N8udRXGNSIjL1KSVmlzZPUZu8Zv/G87vSJuGCX5GAzY1h8zRKyZgAE3XHQNSawMJ 6w9IXShoX18AGz13NCh/UIwX4aPGnd/sgdFSJSnhlA/6THwobYzu3/SfEQzWKkAruaOako bYOMZ9Rwk7B9I0qVLasMwoB2wniQYciXBSac7EsKEIH3+ukZqBRH1t/3XqLasuh8QiOwhu T3kfRZfmUVRalywBywfcGZAOQ+Yzn8YWmJYd7ns6pYYY/8AgYcl90IHDeaz+Q0BxlTqQTT cf/x5XSMhGjnM/SIMLzC9tO+5bWFj4HpZyFtIvW07ACgp4uMSV3uWyCFU3TLdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683741494; a=rsa-sha256; cv=none; b=yU14Au19b229SgT6E1vd9fuIlZAoWOCtCtr0xJwhvwfGi3f9/q+f2R8SImw3uI1C3VuCbI vmA1mQoOON/b8AplgRlaCE47OfLcdRIWWViRoF2G9bOz94coQSe0jbVm92SmtBomZp55XK 5Dr9xttiSQOCKX4xe13uT1QiWtDJOpkEjkn3ty+5DzAeHKXnrmMaTfH6EZowarPxxNBPzs 0xH9cvt/fL3DIDuobt3TC6pcvXNm8KP34/Azgz71WGq7QffHHTK5qCtdM+h2HPKlWV6zLv MROZfBidnBhOwQBtx4rcVDapdghWE5dF3OHNYO6cUdYm7cRsgXQCY8yp5xmvWg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGjS60GWZzL1S; Wed, 10 May 2023 17:58: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 34AHwDgE032283; Wed, 10 May 2023 17:58:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34AHwDAI032282; Wed, 10 May 2023 17:58:13 GMT (envelope-from git) Date: Wed, 10 May 2023 17:58:13 GMT Message-Id: <202305101758.34AHwDAI032282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3d6a94db1010 - main - Install spleen vt(4) fonts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3d6a94db1010319dc65736100089d6dd5ff90e46 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6a94db1010319dc65736100089d6dd5ff90e46 commit 3d6a94db1010319dc65736100089d6dd5ff90e46 Author: Ed Maste AuthorDate: 2019-06-04 20:31:00 +0000 Commit: Ed Maste CommitDate: 2023-05-10 17:57:07 +0000 Install spleen vt(4) fonts From https://github.com/fcambus/spleen, imported into contrib in 0d66206fff44. Reviewed by: Frederic Cambus Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D20654 --- share/vt/fonts/INDEX.fonts | 12 ++++++++++++ share/vt/fonts/Makefile | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/share/vt/fonts/INDEX.fonts b/share/vt/fonts/INDEX.fonts index 97af022c7204..d6c46beab571 100644 --- a/share/vt/fonts/INDEX.fonts +++ b/share/vt/fonts/INDEX.fonts @@ -38,6 +38,18 @@ gallant.fnt:en:Gallant Character set, 12x22 gallant.fnt:da:Gallant-tegnsæt, 12x22 gallant.fnt:de:Gallant Zeichensatz, 12x22 +spleen-5x8.fnt:en:Spleen, 5x8 + +spleen-6x12.fnt:en:Spleen, 6x12 + +spleen-8x16.fnt:en:Spleen, 8x16 + +spleen-12x24.fnt:en:Spleen, 12x24 + +spleen-16x32.fnt:en:Spleen, 16x32 + +spleen-32x64.fnt:en:Spleen, 32x64 + terminus-b32.fnt:en:Terminus BSD Console, size 32 terminus-b32.fnt:da:Terminus BSD-konsol, størrelse 32 terminus-b32.fnt:de:Terminus BSD Console, Größe 32 diff --git a/share/vt/fonts/Makefile b/share/vt/fonts/Makefile index 2599d1d1ce1d..2fb39bff9852 100644 --- a/share/vt/fonts/Makefile +++ b/share/vt/fonts/Makefile @@ -2,7 +2,15 @@ PACKAGE= vt-data +.PATH: ${SRCTOP}/contrib/spleen + FONTS= gallant.fnt \ + spleen-5x8.fnt \ + spleen-6x12.fnt \ + spleen-8x16.fnt \ + spleen-12x24.fnt \ + spleen-16x32.fnt \ + spleen-32x64.fnt \ terminus-b32.fnt \ tom-thumb.fnt \ vgarom-8x8.fnt \ From nobody Wed May 10 21:09:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGnhf6MBYz4BQQ3; Wed, 10 May 2023 21:09:22 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Received: from sdaoden.eu (sdaoden.eu [217.144.132.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGnhf38cSz3M2f; Wed, 10 May 2023 21:09:22 +0000 (UTC) (envelope-from steffen@sdaoden.eu) Authentication-Results: mx1.freebsd.org; none Date: Wed, 10 May 2023 23:09:11 +0200 Author: Steffen Nurpmeso From: Steffen Nurpmeso To: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 09aee570980b - main - tsort: Add unit tests. Message-ID: <20230510210911.Hkz2z%steffen@sdaoden.eu> In-Reply-To: <202305101346.34ADkIp8021360@gitrepo.freebsd.org> References: <202305101346.34ADkIp8021360@gitrepo.freebsd.org> Mail-Followup-To: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org User-Agent: s-nail v14.9.24-463-gc97cfe84c8 OpenPGP: id=EE19E1C1F2F7054F8D3954D8308964B51883A0DD; url=https://ftp.sdaoden.eu/steffen.asc; preference=signencrypt BlahBlahBlah: Any stupid boy can crush a beetle. But all the professors in the world can make no bugs. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QGnhf38cSz3M2f X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15987, ipnet:217.144.128.0/20, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Hello. Dag-Erling Sm=C3=B8rgrav wrote in <202305101346.34ADkIp8021360@gitrepo.freebsd.org>: |URL: https://cgit.FreeBSD.org/src/commit/?id=3D09aee570980b7eca6e3c902a66= f\ |6db129b8c7376 | |commit 09aee570980b7eca6e3c902a66f6db129b8c7376 |Author: Dag-Erling Sm=C3=B8rgrav |AuthorDate: 2023-05-10 13:45:44 +0000 |Commit: Dag-Erling Sm=C3=B8rgrav |CommitDate: 2023-05-10 13:45:44 +0000 | | tsort: Add unit tests. ... | Differential Revision: https://reviews.freebsd.org/D40043 ... |+cycle_body() |+{ |+ cat >input <output< A B > A F > B C > B D > D E > D A > _EOT tsort: -: input contains a loop: tsort: A tsort: B tsort: D A F B D C E #?1|kent:$ cat <<_EOT | busybox.static tsort A B A F B C B D D E D A _EOT tsort: cycle at A A F B D E C (Greetings to the island of happy red devils.) --steffen | |Der Kragenbaer, The moon bear, |der holt sich munter he cheerfully and one by one |einen nach dem anderen runter wa.ks himself off |(By Robert Gernhardt) |~~ |..and in spring, hear David Leonard sing.. | |The black bear, The black bear, |blithely holds his own holds himself at leisure |beating it, up and down tossing over his ups and downs with pleasure |~~ |Farewell, dear collar bear From nobody Wed May 10 21:48:12 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGpYY0sKlz4BSMC; Wed, 10 May 2023 21:48:17 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGpYX55pYz3P0R; Wed, 10 May 2023 21:48:16 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 34ALmDqt028430; Wed, 10 May 2023 16:48:13 -0500 (CDT) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1683755294; bh=006RAXHuawOWLd4F9HXLwM2hiMU32gSQO6rhdW/lRSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OXYo+5yM2OzJ8wfPda5yYIvvBRIiCeRYUmx2Adjy32j7VM6+fy64GlmpzuiRDG/Se OD6wFAv2uHwVLnRXdnbbgoViVZ0+7lDo38xDH34m4ooRg0KyhRDx6kWBW8Iue6azNw 0s5fZp1JmZjZw65Mq13FBDh1pSpzAmU1Khh0sxhayvRX1tHJeZxJgTcDb5JwIR7ofo 1GhiNTe2G6+XvzTCiq13nkMy7O1B87cvy0HIS785cnGVjuRRqj8bZqXXvn1iXyA5mB JpiBLfcupTL4s1DFXDxv43sffwbvpyXGvUE5PkOQrF4GmN4P2u2U3rzJX88fTF9qxt HT+bE8YjYO+QQ== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id w0T3Hx0RXGQMbwAAs/W3XQ (envelope-from ); Wed, 10 May 2023 16:48:13 -0500 From: Mike Karels To: Cy Schubert Cc: Mitchell Horne , rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Date: Wed, 10 May 2023 16:48:12 -0500 X-Mailer: MailMate (1.14r5964) Message-ID: <4367FD0A-76AC-4E98-A133-E50D8CF841C7@karels.net> In-Reply-To: <20230510151313.9E7A6111@slippy.cwsent.com> References: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> <20230510151313.9E7A6111@slippy.cwsent.com> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4QGpYX55pYz3P0R X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 10 May 2023, at 10:13, Cy Schubert wrote: > In message , Mitchell > Horne w > rites: >> On 5/10/23 11:19, Rodney W. Grimes wrote: >>>> The branch main has been updated by mhorne: >>>> >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d >> 4c570dac939 >>>> >>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 >>>> Author: Mitchell Horne >>>> AuthorDate: 2023-05-10 12:53:56 +0000 >>>> Commit: Mitchell Horne >>>> CommitDate: 2023-05-10 13:25:17 +0000 >>>> >>>> hier(7): document /home/ and /usr/home/ >>>> >>>> Reviewed by: imp >>>> MFC after: 1 week >>>> Sponsored by: The FreeBSD Foundation >>>> Differential Revision: https://reviews.freebsd.org/D40002 >>>> --- >>>> share/man/man7/hier.7 | 10 ++++++++++ >>>> 1 file changed, 10 insertions(+) >>>> >>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 >>>> index ff11289436a1..b6759dd6e65b 100644 >>>> --- a/share/man/man7/hier.7 >>>> +++ b/share/man/man7/hier.7 >>>> @@ -90,6 +90,10 @@ file descriptor files; >>>> see >>>> .Xr \&fd 4 >>>> .El >>>> +.It Pa /home/ >>>> +user HOME directories. >>>> +This is a symlink to >>>> +.Pa /usr/home/ >>> >>> /usr is "contains the majority of user utilities and applications" >>> it should not contain home directories. >>>> I do not know when this move to usr came about it was traditionally >> /home. >>> I do not know why /usr/home even exists, it is not needed by >>> anything I am aware of. If we have a compatible link it >>> should be, usr/home -> ../home and /home should be the >>> directory. >>> >> >> I agree that /usr/home is strange, and is unique (?) to FreeBSD. >> >> The oldest commit in the output of `git log --grep '/usr/home'` is: >> >> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd >> Author: David Nugent >> Date: Fri Jan 3 04:42:18 1997 +0000 >> >> Implemented /home -> /usr/home symlink kludge. >> If home basedir would be created in the root partition, create >> it under /usr instead, and symlink /basedir -> /usr/basedir. >> >> Notes: >> svn path=/head/; revision=21242 >> >> >> So it has been this way for 26 years at least. I do not know what to say >> about whether /usr "should" contain it, but it does. > > Usually history matters. I can understand not changing it. On the flip > side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /home -- > albeit automounted from /export/home on localhost or some NFS server. In > the Red Hat land at $JOB, /home is its own partition (actually an LVM > volume). In both cases /home is not in /usr because end-users can fill > /usr. This can be problematic operationally because it's yet another > headache to deal with should someone fill the filesystem. Filling /usr is > more serious than filling /home. > > As a point of interest, when I installed my first FreeBSD many moons ago I > used the Solaris standard of /export/home, using amd (now automount) to > serve my /home. I'm not advocating we do this, it's overkill, but /home > should not live in /usr. It's a potential headache for any sysadmin. > > With ZFS the solution is easy. With UFS based systems there are a lot of > other factors that go into how we install the "default" from the get-go. The situation is a fair mess. It took me a little while to figure out that the kludge referenced above is in the pw(8) command, which is used as the backend to adduser(8). Neither /home nor /usr/home is in the base package. adduser defaults to /home/user, and creates the parent directory (e.g. /home) if it does not exist, but if there is no internal slash, pw moves the parent to /usr. In this case, it makes the symlink from root. zfs is different, in that it includes a usr/home dataset already (created by bsdinstall). In this case, creating a user with /home/user causes the symlink to be added as a side effect. I’m sure the kludge was originally done when root and /usr were separate file systems by default, root was small, and there was no /home by default. However, we now default to a single large file system (with datasets, in the zfs case). All of this really is a horrible kludge, and it is a house of cards. I’m amazed that it doesn’t break more often. I’m tempted to remove the kludge and change the zfs setup to create a home dataset rather than usr/home. However, if zfs users explicitly configure a home directory under /usr/home, this would end up in the usr dataset. An alternative would be to remove the code from pw to create the parent directory entirely (which seems sensible), and create a /home directory for ufs installs. I don’t know how well known it is that adduser/pw will create parent directories for home directories though. This cleanup would change the default location for home directories to /home, which makes more sense. It would require documentation, e.g. in the release notes. The changes would only affect new installations, not upgrades. Thoughts? Mike From nobody Wed May 10 23:53:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGsLb5YgRz4BYtk; Wed, 10 May 2023 23:53: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 4QGsLb47sTz3n8F; Wed, 10 May 2023 23:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683762839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCCM9Y0zLiZvIuFKNmiiws23tQR376alagQVYr50gFU=; b=pk6DQ/BOgxEfJwgQOtROifJX9FqSmAPGQkbYZYJ3WjnTYbsgb805+Gs0ef7/9jU3I4fcsY OC2c4F+dmHw7vDQBMdHEzcPmtJoz2RIR6Xjllj+1xKvRSlD1iHF0ymK1lysOR+nXEE0wvY 2w2k972mRqc0rCrFYIp5d9mwFcbst6/d1juh2IQlzteOr8e4y0oY2JXmiRE/Xn6I9V7kqp YV5yldW4QLN8qWL3vlyA1wWx0K49+cynn4mOXaMQTOyErvRpLNILZieqVxHGscJ8LfCfcL o5qK02MfGHJEJAW/DgIh5PI8trPbrYMXBkhadJ4b1BWygaphLcu82tRICBjIWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683762839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kCCM9Y0zLiZvIuFKNmiiws23tQR376alagQVYr50gFU=; b=omlotivYJfO3yyXvPH/8x8CN6mVFdLSfkt8sGWFk7IibvwNRd5qYF8upXETxRrBrNYK3dO vu3nR9tfGAAmZjGFZiH9olCTyvGuANbRqUkX89OqlC2r26RwrpdIF25k8hPn3Dw99pxujN kJ/iK3kiBThlAFspr2+fTHjEzd9CtXB3pKJDZDsr86NHpBAIIqI15D/1n957IUT5rWdu55 Dgr4VN4tCeAnDqYFquC+ukR5iffZzpGWwzmkpiqpNsz8Ty3sZlGGTeUbCC38xeNKOztvpX OGcAChTrE18uYjLe5vivB9Qiv7ROhN6EKDrFEGFaEk3UVZTNpC+g/KdKh2ygyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683762839; a=rsa-sha256; cv=none; b=kL6ai8pqZbsJIS6AVJcrgNuGyDdqP3WiT3kP7VN9V7Vjyk8FoKmzbbl+OzNe+v4RDEARM9 1m0h/Ps1NFfEZ8BTQyQ/Wh6djn37qOa1Vzt0M+wFAymMZrc+Dg3S4xLj9PVP0cflTV41R3 tu+1dXPzgU4mwgAmTgCl/BSdbWke5rtiMkzmNt4rAV6fvw2vtBecQ4CatbClFhpjyGipeP O/u8oikQKZOpciByQyabog0qyNdE4IjigUGKrgdq2UaBpOZ66JxQMvrd59+1bsCoF7MnWU qWDwf3vjGYzGTcY6HwtqLQ0mTqP4MyHTZnK/D3OicEfJFqq23WGAOV0V/eayEA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGsLb3CRgzWDk; Wed, 10 May 2023 23:53: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 34ANrxi9022438; Wed, 10 May 2023 23:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34ANrxr9022437; Wed, 10 May 2023 23:53:59 GMT (envelope-from git) Date: Wed, 10 May 2023 23:53:59 GMT Message-Id: <202305102353.34ANrxr9022437@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b6d3a9644d5c - main - net/pfkeyv2.h: fix typo, meNber List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6d3a9644d5c73a1903dc39f79fe306b42b86b35 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b6d3a9644d5c73a1903dc39f79fe306b42b86b35 commit b6d3a9644d5c73a1903dc39f79fe306b42b86b35 Author: Konstantin Belousov AuthorDate: 2023-05-10 23:52:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-05-10 23:52:39 +0000 net/pfkeyv2.h: fix typo, meNber Sponsored by: NVidia networking MFC after: 3 days --- sys/net/pfkeyv2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h index 6ac14efaa850..cd9acda40e92 100644 --- a/sys/net/pfkeyv2.h +++ b/sys/net/pfkeyv2.h @@ -433,7 +433,7 @@ _Static_assert(sizeof(struct sadb_x_sa_replay) == 8, "struct size mismatch"); /* SPI size for PF_KEYv2 */ #define PFKEY_SPI_SIZE sizeof(u_int32_t) -/* Identifier for menber of lifetime structure */ +/* Identifier for member of lifetime structure */ #define SADB_X_LIFETIME_ALLOCATIONS 0 #define SADB_X_LIFETIME_BYTES 1 #define SADB_X_LIFETIME_ADDTIME 2 From nobody Thu May 11 04:11:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGz3R6hHQz49cQ7; Thu, 11 May 2023 04:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGz3R69VMz48ll; Thu, 11 May 2023 04:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683778275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ksQE+3IxSGKncD9rXn1bQ41jb6G/DbmY6h3dELeSC9Y=; b=DWLNq43S7Mp8+CDeQbIQG4dWI5vtqOWvq0cla9OoXargd9DdPHE7RqaxOCBRcN3C2hAcPT bAC4/xsqKrkIYjBs8UFHSGA/yzY+FNRw0uGcglDFZUm+wajzCSRryRiMPdFwtt/b7Qpelb IsRulnAtO5sYIGPbRSlC1ibiWYqCI0Q1rpcQBFCXbYbAsaHqeyv9Eo2DJmcqZq64C2CsqG Ywz/f9zuodSQolJIplUvEPawmOIfhPgBNZXOPrye5VXtEZF7+DVPxHcBbGaKz+enx9bvAw +H7dZX8H0ejtE6WweNVYwnlUv5CfMYey6nW+Qi/v0U+Qkdl+uINHyGrZbNoWGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683778275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ksQE+3IxSGKncD9rXn1bQ41jb6G/DbmY6h3dELeSC9Y=; b=HpkE9V6/60U7Y4AHKT6S5TPdXNs9a+XEubzmBRThAVDb1sEFHNuIE+kJNHf5CPq/1kJwJl vAuv+JegZb6uP8KQyTFdqGtiAKDdZgZciBwGIfaoGFAbJzzgfCoQXIW/vtG5XKLQrlqM00 qgr7TbefVk9SE2t1c+Y3Rmzd+gqR8DsCvRSw3Gxf0NveOGp/f3SUHdyxe/pQ4031+F5ka1 zjU54l0W9sniBgNY7XjYPHHn0tzMJ2z/ZE3kRPWBbf1KhT1Df4WqJ/d7uWqIvuZkwma+Qg a1UBGIgUhMjY9JqzV420f2rdYZmCkgdCSy19iOLqX+QcNvxkIzB8AG6Yh54zPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683778275; a=rsa-sha256; cv=none; b=DRVYHuIQkDujrHKe37egzLVcS1jfV2TD2CSWgEWpNXphXXoTgLZiSuqaTcvbevC0qTPKsI cO5mO5H9wZSEaPghCgYta6I87k9fYNVKrVMwvijztq/43Yd+0Za/XAPXXPrfygEve5/dBc O72Qfi3opzzjEE6iK4nHV8y72ufiKxUXs1kaHUKFuQVzeOcLBrYV0i/SKsp6ILKW1c6kIO d5uB1bJzVN0VSj5zan9Ro61cf+Cut+Ty4DRWANXeNTF2cWpTzYUcEZuSy1CPC1xduXnpDk /gJu76pMYTc62p0JK1CqDjkSg4qM8r2A3TD7OQl399DRlEYjZ5nzQPHpOaZV2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGz3R5F01zdbL; Thu, 11 May 2023 04:11: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 34B4BFen047147; Thu, 11 May 2023 04:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B4BFEE047146; Thu, 11 May 2023 04:11:15 GMT (envelope-from git) Date: Thu, 11 May 2023 04:11:15 GMT Message-Id: <202305110411.34B4BFEE047146@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 3cb2f5f369ec - main - lualoader: add support for .lua configuration files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3cb2f5f369ecfd6d15aeff2b47e21866551a20de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=3cb2f5f369ecfd6d15aeff2b47e21866551a20de commit 3cb2f5f369ecfd6d15aeff2b47e21866551a20de Author: Kyle Evans AuthorDate: 2023-05-11 04:10:53 +0000 Commit: Kyle Evans CommitDate: 2023-05-11 04:10:53 +0000 lualoader: add support for .lua configuration files If a file is specified in loader_conf_files that ends in '.lua', lualoader will now load and execute that file. These may be used in place of a traditional loader.conf to use more complicated logic, where some values may be set based on others or based on the environment that the C bits has left us with. Lua scripts are run in a limited environment. In particular, it does not get access to any modules or, in-fact, anything except environment variable. A config.buildenv hook has been added so that a local module can add whatever it may need to to the environment. When a global var is set in the lua script, it does not immediately alter the loader environment. Instead, the script's environment is initially empty and processed only if the whole script executes successfully. Effectively, a lua configuration file either takes effect or it does not, an error will not leave it in a half-baked state. Reviewed by: bcr (manpages), imp Differential Revision: https://reviews.freebsd.org/D28450 --- stand/defaults/loader.conf.5 | 3 ++ stand/lua/Makefile | 3 +- stand/lua/config.lua | 90 +++++++++++++++++++++++++++++++++++++++----- stand/lua/config.lua.8 | 8 ++++ stand/lua/hook.lua | 4 +- stand/lua/hook.lua.8 | 4 +- stand/lua/loader.conf.lua.5 | 77 +++++++++++++++++++++++++++++++++++++ 7 files changed, 175 insertions(+), 14 deletions(-) diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 23a65935c95a..53c69f0f673c 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -427,10 +427,13 @@ It is not available in the default Forth-based loader. default settings \(em do not change this file. .It Pa /boot/loader.conf user defined settings. +.It Pa /boot/loader.conf.lua +user defined settings written in lua. .It Pa /boot/loader.conf.local machine-specific settings for sites with a common loader.conf. .El .Sh SEE ALSO +.Xr loader.conf.lua 5 , .Xr rc.conf 5 , .Xr boot 8 , .Xr cpucontrol 8 , diff --git a/stand/lua/Makefile b/stand/lua/Makefile index fe6fd6f63c8e..bc7c294dfda0 100644 --- a/stand/lua/Makefile +++ b/stand/lua/Makefile @@ -2,7 +2,8 @@ .include -MAN= cli.lua.8 \ +MAN= loader.conf.lua.5 \ + cli.lua.8 \ color.lua.8 \ config.lua.8 \ core.lua.8 \ diff --git a/stand/lua/config.lua b/stand/lua/config.lua index 04d5cda1e704..36be2b6b121e 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -45,6 +45,7 @@ local MSG_FAILSETENV = "Failed to '%s' with value: %s" local MSG_FAILOPENCFG = "Failed to open config: '%s'" local MSG_FAILREADCFG = "Failed to read config: '%s'" local MSG_FAILPARSECFG = "Failed to parse config: '%s'" +local MSG_FAILEXECLUA = "Failed to execute lua conf '%s': '%s'" local MSG_FAILPARSEVAR = "Failed to parse variable '%s': %s" local MSG_FAILEXBEF = "Failed to execute '%s' before loading '%s'" local MSG_FAILEXAF = "Failed to execute '%s' after loading '%s'" @@ -244,13 +245,15 @@ end -- local pattern_table = { { + luaexempt = true, str = "(#.*)", process = function(_, _) end, groups = 1, }, -- module_load="value" { - str = MODULEEXPR .. "_load%s*=%s*$VALUE", + name = MODULEEXPR .. "_load%s*", + val = "%s*$VALUE", process = function(k, v) if modules[k] == nil then modules[k] = {} @@ -261,7 +264,8 @@ local pattern_table = { }, -- module_name="value" { - str = MODULEEXPR .. "_name%s*=%s*$VALUE", + name = MODULEEXPR .. "_name%s*", + val = "%s*$VALUE", process = function(k, v) setKey(k, "name", v) setEnv(k .. "_name", v) @@ -269,7 +273,8 @@ local pattern_table = { }, -- module_type="value" { - str = MODULEEXPR .. "_type%s*=%s*$VALUE", + name = MODULEEXPR .. "_type%s*", + val = "%s*$VALUE", process = function(k, v) setKey(k, "type", v) setEnv(k .. "_type", v) @@ -277,7 +282,8 @@ local pattern_table = { }, -- module_flags="value" { - str = MODULEEXPR .. "_flags%s*=%s*$VALUE", + name = MODULEEXPR .. "_flags%s*", + val = "%s*$VALUE", process = function(k, v) setKey(k, "flags", v) setEnv(k .. "_flags", v) @@ -285,7 +291,8 @@ local pattern_table = { }, -- module_before="value" { - str = MODULEEXPR .. "_before%s*=%s*$VALUE", + name = MODULEEXPR .. "_before%s*", + val = "%s*$VALUE", process = function(k, v) setKey(k, "before", v) setEnv(k .. "_before", v) @@ -293,7 +300,8 @@ local pattern_table = { }, -- module_after="value" { - str = MODULEEXPR .. "_after%s*=%s*$VALUE", + name = MODULEEXPR .. "_after%s*", + val = "%s*$VALUE", process = function(k, v) setKey(k, "after", v) setEnv(k .. "_after", v) @@ -301,7 +309,8 @@ local pattern_table = { }, -- module_error="value" { - str = MODULEEXPR .. "_error%s*=%s*$VALUE", + name = MODULEEXPR .. "_error%s*", + val = "%s*$VALUE", process = function(k, v) setKey(k, "error", v) setEnv(k .. "_error", v) @@ -309,7 +318,9 @@ local pattern_table = { }, -- exec="command" { - str = "exec%s*=%s*" .. QVALEXPR, + luaexempt = true, + name = "exec%s*", + val = "%s*" .. QVALEXPR, process = function(k, _) if cli_execute_unparsed(k) ~= 0 then print(MSG_FAILEXEC:format(k)) @@ -319,7 +330,8 @@ local pattern_table = { }, -- env_var="value" or env_var=[word|num] { - str = "([%w][%w%d-_.]*)%s*=%s*$VALUE", + name = "([%w][%w%d-_.]*)%s*", + val = "%s*$VALUE", process = function(k, v) local pv, msg = processEnvVar(v) if not pv then @@ -328,6 +340,8 @@ local pattern_table = { end if setEnv(k, pv) ~= 0 then print(MSG_FAILSETENV:format(k, v)) + else + return pv end end, }, @@ -486,6 +500,18 @@ local function checkNextboot() loader.setenv("nextboot_enable", "NO") end +local function processEnv(k, v) + for _, val in ipairs(pattern_table) do + if not val.luaexempt and val.name then + local matched = k:match(val.name) + + if matched then + return val.process(matched, v) + end + end + end +end + -- Module exports config.verbose = false @@ -511,7 +537,47 @@ function config.processFile(name, silent) return silent end - return config.parse(text) + if name:match(".lua$") then + local cfg_env = setmetatable({}, { + indices = {}, + __index = function(env, key) + if getmetatable(env).indices[key] then + return rawget(env, key) + end + + return loader.getenv(key) + end, + __newindex = function(env, key, val) + getmetatable(env).indices[key] = true + rawset(env, key, val) + end, + }) + + -- Give local modules a chance to populate the config + -- environment. + hook.runAll("config.buildenv", cfg_env) + local res, err = pcall(load(text, name, "t", cfg_env)) + if res then + for k, v in pairs(cfg_env) do + local t = type(v) + if t ~= "function" and t ~= "table" then + if t ~= "string" then + v = tostring(v) + end + local pval = processEnv(k, v) + if pval then + setEnv(k, pval) + end + end + end + else + print(MSG_FAILEXECLUA:format(name, err)) + end + + return res + else + return config.parse(text) + end end -- silent runs will not return false if we fail to open the file @@ -522,6 +588,9 @@ function config.parse(text) for line in text:gmatch("([^\n]+)") do if line:match("^%s*$") == nil then for _, val in ipairs(pattern_table) do + if val.str == nil then + val.str = val.name .. "=" .. val.val + end local pattern = '^%s*' .. val.str .. '%s*(.*)'; local cgroups = val.groups or 2 local k, v, c = checkPattern(line, pattern) @@ -805,6 +874,7 @@ function config.getModuleInfo() } end +hook.registerType("config.buildenv") hook.registerType("config.loaded") hook.registerType("config.reloaded") hook.registerType("kernel.loaded") diff --git a/stand/lua/config.lua.8 b/stand/lua/config.lua.8 index 4fc51c90045f..cf4316204008 100644 --- a/stand/lua/config.lua.8 +++ b/stand/lua/config.lua.8 @@ -217,11 +217,19 @@ as well as a representation of The following hooks are defined in .Nm : .Bl -tag -width "config.reloaded" -offset indent +.It Fn config.buildenv env .It Fn config.loaded .It Fn config.reloaded .It Fn kernel.loaded .It Fn modules.loaded .El +.Pp +Note that the +.Fn config.buildenv +hook is only invoked when an environment needs to be built to execute a lua +configuration file that has been specified in +.Ev loader_conf_files . +It will be invoked for each configuration file encountered. .Sh SEE ALSO .Xr loader.conf 5 , .Xr loader 8 , diff --git a/stand/lua/hook.lua b/stand/lua/hook.lua index 9c7e4deeb7e4..6826bcb5f7f1 100644 --- a/stand/lua/hook.lua +++ b/stand/lua/hook.lua @@ -60,7 +60,7 @@ end -- Takes a hooktype and runs all functions associated with that specific hook -- type in the order that they were registered in. This ordering should likely -- not be relied upon. -function hook.runAll(hooktype) +function hook.runAll(hooktype, data) local selected_hooks = registered_hooks[hooktype] if selected_hooks == nil then -- This message, and the print() above, should only be seen by @@ -74,7 +74,7 @@ function hook.runAll(hooktype) end if #selected_hooks > 0 then for _, func in ipairs(selected_hooks) do - func() + func(data) end end return #selected_hooks diff --git a/stand/lua/hook.lua.8 b/stand/lua/hook.lua.8 index 1bc9ca96b509..f53d643d79bd 100644 --- a/stand/lua/hook.lua.8 +++ b/stand/lua/hook.lua.8 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 9, 2018 +.Dd April 28, 2020 .Dt HOOK.LUA 8 .Os .Sh NAME @@ -39,6 +39,8 @@ Hooks are functions used to attach custom behaviors at pre-defined points in loader execution. These pre-defined points are what we refer to as .Dq hook types . +Hooks may also take an optional data parameter, which may or may not be +populated by the caller. .Pp Before using the functionality provided by .Nm , diff --git a/stand/lua/loader.conf.lua.5 b/stand/lua/loader.conf.lua.5 new file mode 100644 index 000000000000..5c8938c321f9 --- /dev/null +++ b/stand/lua/loader.conf.lua.5 @@ -0,0 +1,77 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause-FreeBSD +.\" +.\" Copyright (c) 2020 Kyle Evans +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd May 10, 2023 +.Dt LOADER.CONF.LUA 5 +.Os +.Sh NAME +.Nm loader.conf.lua +.Nd Lua-based system bootstrap configuration file +.Sh DESCRIPTION +When the lua-based +.Xr loader 8 +encounters a filename in +.Va loader_conf_files +that has a +.Dq .lua +suffix, it will be loaded and executed by the lua interpreter in a limited +environment. +.Pp +The limited environment does not contain the ability to reference or load other +lua modules. +Existing loader environment variables may be referenced as if they were already +defined global variables. +.Pp +A lua configuration file may set any global variable, which will subsequently +be processed and added to the environment after execution of the configuration +file has completed. +Other than the +.Ar exec +setting, all variables described in +.Xr loader.conf 5 +operate the same in the +.Nm +environment. +Note that the settings describing module options can only be set in the +environment; there is currently no way for a +.Pa loader.conf.lua +to fetch them. +At this time, global table and function values are ignored. +.Pp +The +.Fn config.buildenv +hook will be run with an empty environment provided to it that may be populated +by a custom +.Pa local.lua . +.Sh SEE ALSO +.Xr loader.conf 5 +.Sh AUTHORS +The mechanism for loading +.Nm +files was originally written by +.An Kyle Evans Aq Mt kevans@FreeBSD.org . From nobody Thu May 11 04:28:11 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGzQz29pQz49dXd; Thu, 11 May 2023 04: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 4QGzQz1yhwz4Clb; Thu, 11 May 2023 04: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=1683779291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Nu07GuLTa7R52fpelYE2dZ4i3Y2vXJVOZWmZ8hiv1I=; b=rudzmD57B9ZZCmfcEnngyRXgRfVd7Tstmbq4w3JPKcj9U5VObjtD4i9Lclq73I/pVAaLoP rbmbUcBkfkQANF/J0hMAFYhw2YlvwlERNYf9tqAUEFC7cahNNjDkDEyFvk40cqM1j9jClJ tRgjX1h8hN0sc6ZkuJBWUIWH+Pz6lEcT5ZvMRpVy4yEXUSvkzRXlqBfhCYwfYVz4SRmLRk Ksaj8eLsl9XL+reRoUoRyObSrZnYMD1O2YALpmtQHcxX5LgHqETlmo0nKJ50ZRoP4GQAq+ SYYkGwhQVSHUMVVBkQrwAoXcdgY903tVYj4HaoS+TgRQiN6eYzs2zVoqcuBeUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683779291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Nu07GuLTa7R52fpelYE2dZ4i3Y2vXJVOZWmZ8hiv1I=; b=hCrEd1lxoVCM5D0/zCJfLAAJJFT77EW4m6Sy4zvX1iSJbOjtnRm9EhEXorjB3AYgtrlQR+ 9w1jHWPdqldJptDUIqqvQ4zFJOOGa18ZmUChHCjb5N7AdaLTkqVZXeYDZHMOM2nPSRNXge HO32kbKCezlSoE+G+B1Af2XkJVmR7rTPmDKaOJU15QHxR5lAPyEPJkb++9j8WUPHWg+K7Q ndRDv5s8hX5rWkKLAIAUpJ+4HdgqJES3SgvKANULrU+glAqMNQrlmqGzWsAdSCzwJUzQ3W PwWC2ImrBsi+sWWvykDvY0LfMWJeHFQjll402SAzdkuhJ5A8hZIsP/+7Rce7Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683779291; a=rsa-sha256; cv=none; b=DckH2WIHoQu3U11ydilDxOaqXhJ0dsH4TEfr1V/uSC35imVebUM9Y+5AHsHB5IrSJDzsvQ lHuQQKQ2rr0n/jgUZSgLq9Zol+WgE5B4SwuUcfb2CMhmVsBp1cdmAr4gPKIsn6LgtgZwIN xhDrlHuOIgDHCJvCiOrxZYKR55awtM0p/vZ1NeEiQGdv/LoXZhckgUROU5g0RzVblG3rgR iLKeeNoKZcnEP5MgoppIflpXycrd22grzQgUW14iqwHvsTK/s8WUvneznuAL3Fg11kn0LI IJe2awvr1LGGjnLJG/eJJ4vV8NnfPLXMYgFSHXBhDpnJ8IDM8boLfwS9uDkyMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGzQz10qBzf5r; Thu, 11 May 2023 04: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 34B4SBoP069778; Thu, 11 May 2023 04: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 34B4SBRD069777; Thu, 11 May 2023 04:28:11 GMT (envelope-from git) Date: Thu, 11 May 2023 04:28:11 GMT Message-Id: <202305110428.34B4SBRD069777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 062a7b918fac - main - twe: Remove driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 062a7b918fac638e0cce0d8c087d7f2190c59b1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=062a7b918fac638e0cce0d8c087d7f2190c59b1e commit 062a7b918fac638e0cce0d8c087d7f2190c59b1e Author: Warner Losh AuthorDate: 2023-05-11 04:24:12 +0000 Commit: Warner Losh CommitDate: 2023-05-11 04:24:12 +0000 twe: Remove driver Sponsored by: Netflix --- sys/amd64/conf/GENERIC | 1 - sys/conf/NOTES | 5 - sys/conf/files | 2 - sys/dev/twe/twe.c | 1973 --------------------------------------------- sys/dev/twe/twe_compat.h | 127 --- sys/dev/twe/twe_freebsd.c | 1170 --------------------------- sys/dev/twe/twe_tables.h | 169 ---- sys/dev/twe/tweio.h | 106 --- sys/dev/twe/twereg.h | 496 ------------ sys/dev/twe/twevar.h | 274 ------- sys/modules/Makefile | 1 - sys/modules/twe/Makefile | 30 - 12 files changed, 4354 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index f3497ef91f63..8f2e5e9fccb4 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -195,7 +195,6 @@ device mlx # Mylex DAC960 family device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 -device twe # 3ware ATA RAID # NVM Express (NVMe) support device nvme # base NVMe driver diff --git a/sys/conf/NOTES b/sys/conf/NOTES index a6c3c42fc00e..8725d11a5434 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1646,11 +1646,6 @@ device mfip # LSI MegaRAID SAS passthrough, requires CAM options MFI_DEBUG device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s -# -# 3ware ATA RAID -# -device twe # 3ware ATA RAID - # # Serial ATA host controllers: # diff --git a/sys/conf/files b/sys/conf/files index 8c3d80c48b01..c0728504da5a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3171,8 +3171,6 @@ dev/syscons/warp/warp_saver.c optional warp_saver dev/tcp_log/tcp_log_dev.c optional tcp_blackbox inet | tcp_blackbox inet6 dev/tdfx/tdfx_pci.c optional tdfx pci dev/ti/if_ti.c optional ti pci -dev/twe/twe.c optional twe -dev/twe/twe_freebsd.c optional twe dev/tws/tws.c optional tws dev/tws/tws_cam.c optional tws dev/tws/tws_hdm.c optional tws diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c deleted file mode 100644 index 6d05ac7c2b95..000000000000 --- a/sys/dev/twe/twe.c +++ /dev/null @@ -1,1973 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2000 Michael Smith - * Copyright (c) 2003 Paul Saab - * Copyright (c) 2003 Vinod Kashyap - * Copyright (c) 2000 BSDi - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - -/* - * Driver for the 3ware Escalade family of IDE RAID controllers. - */ - -#include -#include -#include -#include -#define TWE_DEFINE_TABLES -#include - -/* - * Command submission. - */ -static int twe_get_param_1(struct twe_softc *sc, int table_id, int param_id, u_int8_t *result); -static int twe_get_param_2(struct twe_softc *sc, int table_id, int param_id, u_int16_t *result); -static int twe_get_param_4(struct twe_softc *sc, int table_id, int param_id, u_int32_t *result); -static void *twe_get_param(struct twe_softc *sc, int table_id, int parameter_id, size_t size, - void (* func)(struct twe_request *tr)); -#ifdef TWE_SHUTDOWN_NOTIFICATION -static int twe_set_param_1(struct twe_softc *sc, int table_id, int param_id, u_int8_t value); -#endif -#if 0 -static int twe_set_param_2(struct twe_softc *sc, int table_id, int param_id, u_int16_t value); -static int twe_set_param_4(struct twe_softc *sc, int table_id, int param_id, u_int32_t value); -#endif -static int twe_set_param(struct twe_softc *sc, int table_id, int param_id, int param_size, - void *data); -static int twe_init_connection(struct twe_softc *sc, int mode); -static int twe_wait_request(struct twe_request *tr); -static int twe_immediate_request(struct twe_request *tr, int usetmp); -static void twe_completeio(struct twe_request *tr); -static void twe_reset(struct twe_softc *sc); -static int twe_add_unit(struct twe_softc *sc, int unit); -static int twe_del_unit(struct twe_softc *sc, int unit); - -/* - * Command I/O to controller. - */ -static void twe_done(struct twe_softc *sc, int startio); -static void twe_complete(struct twe_softc *sc); -static int twe_wait_status(struct twe_softc *sc, u_int32_t status, int timeout); -static int twe_drain_response_queue(struct twe_softc *sc); -static int twe_check_bits(struct twe_softc *sc, u_int32_t status_reg); -static int twe_soft_reset(struct twe_softc *sc); - -/* - * Interrupt handling. - */ -static void twe_host_intr(struct twe_softc *sc); -static void twe_attention_intr(struct twe_softc *sc); -static void twe_command_intr(struct twe_softc *sc); - -/* - * Asynchronous event handling. - */ -static int twe_fetch_aen(struct twe_softc *sc); -static void twe_handle_aen(struct twe_request *tr); -static void twe_enqueue_aen(struct twe_softc *sc, u_int16_t aen); -static u_int16_t twe_dequeue_aen(struct twe_softc *sc); -static int twe_drain_aen_queue(struct twe_softc *sc); -static int twe_find_aen(struct twe_softc *sc, u_int16_t aen); - -/* - * Command buffer management. - */ -static int twe_get_request(struct twe_softc *sc, struct twe_request **tr); -static void twe_release_request(struct twe_request *tr); - -/* - * Debugging. - */ -static char *twe_format_aen(struct twe_softc *sc, u_int16_t aen); -static int twe_report_request(struct twe_request *tr); -static void twe_panic(struct twe_softc *sc, char *reason); - -/******************************************************************************** - ******************************************************************************** - Public Interfaces - ******************************************************************************** - ********************************************************************************/ - -/******************************************************************************** - * Initialise the controller, set up driver data structures. - */ -int -twe_setup(struct twe_softc *sc) -{ - struct twe_request *tr; - TWE_Command *cmd; - u_int32_t status_reg; - int i; - - debug_called(4); - - gone_in(14, "Please migrate to newer hardware"); - - /* - * Initialise request queues. - */ - twe_initq_free(sc); - twe_initq_bio(sc); - twe_initq_ready(sc); - twe_initq_busy(sc); - twe_initq_complete(sc); - sc->twe_wait_aen = -1; - - /* - * Allocate request structures up front. - */ - for (i = 0; i < TWE_Q_LENGTH; i++) { - if ((tr = twe_allocate_request(sc, i)) == NULL) - return(ENOMEM); - /* - * Set global defaults that won't change. - */ - cmd = TWE_FIND_COMMAND(tr); - cmd->generic.host_id = sc->twe_host_id; /* controller-assigned host ID */ - cmd->generic.request_id = i; /* our index number */ - sc->twe_lookup[i] = tr; - - /* - * Put command onto the freelist. - */ - TWE_IO_LOCK(sc); - twe_release_request(tr); - TWE_IO_UNLOCK(sc); - } - TWE_IO_LOCK(sc); - - /* - * Check status register for errors, clear them. - */ - status_reg = TWE_STATUS(sc); - twe_check_bits(sc, status_reg); - - /* - * Wait for the controller to come ready. - */ - if (twe_wait_status(sc, TWE_STATUS_MICROCONTROLLER_READY, 60)) { - TWE_IO_UNLOCK(sc); - twe_printf(sc, "microcontroller not ready\n"); - return(ENXIO); - } - - /* - * Disable interrupts from the card. - */ - twe_disable_interrupts(sc); - - /* - * Soft reset the controller, look for the AEN acknowledging the reset, - * check for errors, drain the response queue. - */ - for (i = 0; i < TWE_MAX_RESET_TRIES; i++) { - if (i > 0) - twe_printf(sc, "reset %d failed, trying again\n", i); - - if (!twe_soft_reset(sc)) - break; /* reset process complete */ - } - TWE_IO_UNLOCK(sc); - /* did we give up? */ - if (i >= TWE_MAX_RESET_TRIES) { - twe_printf(sc, "can't initialise controller, giving up\n"); - return(ENXIO); - } - - return(0); -} - -static int -twe_add_unit(struct twe_softc *sc, int unit) -{ - struct twe_drive *dr; - int table, error = 0; - u_int16_t dsize; - TWE_Param *drives = NULL, *param = NULL; - TWE_Array_Descriptor *ud; - - TWE_CONFIG_ASSERT_LOCKED(sc); - if (unit < 0 || unit > TWE_MAX_UNITS) - return (EINVAL); - - /* - * The controller is in a safe state, so try to find drives attached to it. - */ - TWE_IO_LOCK(sc); - if ((drives = twe_get_param(sc, TWE_PARAM_UNITSUMMARY, TWE_PARAM_UNITSUMMARY_Status, - TWE_MAX_UNITS, NULL)) == NULL) { - TWE_IO_UNLOCK(sc); - twe_printf(sc, "can't detect attached units\n"); - return (EIO); - } - - dr = &sc->twe_drive[unit]; - /* check that the drive is online */ - if (!(drives->data[unit] & TWE_PARAM_UNITSTATUS_Online)) { - TWE_IO_UNLOCK(sc); - error = ENXIO; - goto out; - } - - table = TWE_PARAM_UNITINFO + unit; - - if (twe_get_param_4(sc, table, TWE_PARAM_UNITINFO_Capacity, &dr->td_size)) { - TWE_IO_UNLOCK(sc); - twe_printf(sc, "error fetching capacity for unit %d\n", unit); - error = EIO; - goto out; - } - if (twe_get_param_1(sc, table, TWE_PARAM_UNITINFO_Status, &dr->td_state)) { - TWE_IO_UNLOCK(sc); - twe_printf(sc, "error fetching state for unit %d\n", unit); - error = EIO; - goto out; - } - if (twe_get_param_2(sc, table, TWE_PARAM_UNITINFO_DescriptorSize, &dsize)) { - TWE_IO_UNLOCK(sc); - twe_printf(sc, "error fetching descriptor size for unit %d\n", unit); - error = EIO; - goto out; - } - if ((param = twe_get_param(sc, table, TWE_PARAM_UNITINFO_Descriptor, dsize - 3, NULL)) == NULL) { - TWE_IO_UNLOCK(sc); - twe_printf(sc, "error fetching descriptor for unit %d\n", unit); - error = EIO; - goto out; - } - ud = (TWE_Array_Descriptor *)param->data; - dr->td_type = ud->configuration; - dr->td_stripe = ud->stripe_size; - - /* build synthetic geometry as per controller internal rules */ - if (dr->td_size > 0x200000) { - dr->td_heads = 255; - dr->td_sectors = 63; - } else { - dr->td_heads = 64; - dr->td_sectors = 32; - } - dr->td_cylinders = dr->td_size / (dr->td_heads * dr->td_sectors); - dr->td_twe_unit = unit; - TWE_IO_UNLOCK(sc); - - error = twe_attach_drive(sc, dr); - -out: - if (param != NULL) - free(param, M_DEVBUF); - if (drives != NULL) - free(drives, M_DEVBUF); - return (error); -} - -static int -twe_del_unit(struct twe_softc *sc, int unit) -{ - int error; - - TWE_CONFIG_ASSERT_LOCKED(sc); - if (unit < 0 || unit >= TWE_MAX_UNITS) - return (ENXIO); - - if (sc->twe_drive[unit].td_disk == NULL) - return (ENXIO); - - error = twe_detach_drive(sc, unit); - return (error); -} - -/******************************************************************************** - * Locate disk devices and attach children to them. - */ -void -twe_init(struct twe_softc *sc) -{ - int i; - - /* - * Scan for drives - */ - TWE_CONFIG_LOCK(sc); - for (i = 0; i < TWE_MAX_UNITS; i++) - twe_add_unit(sc, i); - TWE_CONFIG_UNLOCK(sc); - - /* - * Initialise connection with controller. - */ - TWE_IO_LOCK(sc); - twe_init_connection(sc, TWE_INIT_MESSAGE_CREDITS); - -#ifdef TWE_SHUTDOWN_NOTIFICATION - /* - * Tell the controller we support shutdown notification. - */ - twe_set_param_1(sc, TWE_PARAM_FEATURES, TWE_PARAM_FEATURES_DriverShutdown, 1); -#endif - - /* - * Mark controller up and ready to run. - */ - sc->twe_state &= ~TWE_STATE_SHUTDOWN; - - /* - * Finally enable interrupts. - */ - twe_enable_interrupts(sc); - TWE_IO_UNLOCK(sc); -} - -/******************************************************************************** - * Stop the controller - */ -void -twe_deinit(struct twe_softc *sc) -{ - /* - * Mark the controller as shutting down, and disable any further interrupts. - */ - TWE_IO_ASSERT_LOCKED(sc); - sc->twe_state |= TWE_STATE_SHUTDOWN; - twe_disable_interrupts(sc); - -#ifdef TWE_SHUTDOWN_NOTIFICATION - /* - * Disconnect from the controller - */ - twe_init_connection(sc, TWE_SHUTDOWN_MESSAGE_CREDITS); -#endif -} - -/******************************************************************************* - * Take an interrupt, or be poked by other code to look for interrupt-worthy - * status. - */ -void -twe_intr(struct twe_softc *sc) -{ - u_int32_t status_reg; - - debug_called(4); - - /* - * Collect current interrupt status. - */ - status_reg = TWE_STATUS(sc); - twe_check_bits(sc, status_reg); - - /* - * Dispatch based on interrupt status - */ - if (status_reg & TWE_STATUS_HOST_INTERRUPT) - twe_host_intr(sc); - if (status_reg & TWE_STATUS_ATTENTION_INTERRUPT) - twe_attention_intr(sc); - if (status_reg & TWE_STATUS_COMMAND_INTERRUPT) - twe_command_intr(sc); - if (status_reg & TWE_STATUS_RESPONSE_INTERRUPT) - twe_done(sc, 1); -}; - -/******************************************************************************** - * Pull as much work off the softc's work queue as possible and give it to the - * controller. - */ -void -twe_startio(struct twe_softc *sc) -{ - struct twe_request *tr; - TWE_Command *cmd; - struct bio *bp; - int error; - - debug_called(4); - - TWE_IO_ASSERT_LOCKED(sc); - if (sc->twe_state & (TWE_STATE_CTLR_BUSY | TWE_STATE_FRZN)) - return; - - /* spin until something prevents us from doing any work */ - for (;;) { - /* try to get a command that's already ready to go */ - tr = twe_dequeue_ready(sc); - - /* build a command from an outstanding bio */ - if (tr == NULL) { - - /* get a command to handle the bio with */ - if (twe_get_request(sc, &tr)) - break; - - /* see if there's work to be done */ - if ((bp = twe_dequeue_bio(sc)) == NULL) { - twe_release_request(tr); - break; - } - - /* connect the bio to the command */ - tr->tr_complete = twe_completeio; - tr->tr_private = bp; - tr->tr_data = bp->bio_data; - tr->tr_length = bp->bio_bcount; - cmd = TWE_FIND_COMMAND(tr); - if (bp->bio_cmd == BIO_READ) { - tr->tr_flags |= TWE_CMD_DATAIN; - cmd->io.opcode = TWE_OP_READ; - } else if (bp->bio_cmd == BIO_WRITE) { - tr->tr_flags |= TWE_CMD_DATAOUT; - cmd->io.opcode = TWE_OP_WRITE; - } else { - twe_release_request(tr); - biofinish(bp, NULL, EOPNOTSUPP); - break; - } - - /* build a suitable I/O command (assumes 512-byte rounded transfers) */ - cmd->io.size = 3; - cmd->io.unit = *(int *)(bp->bio_driver1); - cmd->io.block_count = (tr->tr_length + TWE_BLOCK_SIZE - 1) / TWE_BLOCK_SIZE; - cmd->io.lba = bp->bio_pblkno; - } - - /* did we find something to do? */ - if (tr == NULL) - break; - - /* try to map and submit the command to controller */ - error = twe_map_request(tr); - - if (error != 0) { - if (error == EBUSY) - break; - tr->tr_status = TWE_CMD_ERROR; - if (tr->tr_private != NULL) { - bp = (struct bio *)(tr->tr_private); - bp->bio_error = error; - bp->bio_flags |= BIO_ERROR; - tr->tr_private = NULL; - twed_intr(bp); - twe_release_request(tr); - } else if (tr->tr_flags & TWE_CMD_SLEEPER) - wakeup_one(tr); /* wakeup the sleeping owner */ - } - } -} - -/******************************************************************************** - * Write blocks from memory to disk, for system crash dumps. - */ -int -twe_dump_blocks(struct twe_softc *sc, int unit, u_int32_t lba, void *data, int nblks) -{ - struct twe_request *tr; - TWE_Command *cmd; - int error; - - if (twe_get_request(sc, &tr)) - return(ENOMEM); - - tr->tr_data = data; - tr->tr_status = TWE_CMD_SETUP; - tr->tr_length = nblks * TWE_BLOCK_SIZE; - tr->tr_flags = TWE_CMD_DATAOUT; - - cmd = TWE_FIND_COMMAND(tr); - cmd->io.opcode = TWE_OP_WRITE; - cmd->io.size = 3; - cmd->io.unit = unit; - cmd->io.block_count = nblks; - cmd->io.lba = lba; - - error = twe_immediate_request(tr, 0); - if (error == 0) - if (twe_report_request(tr)) - error = EIO; - twe_release_request(tr); - return(error); -} - -/******************************************************************************** - * Handle controller-specific control operations. - */ -int -twe_ioctl(struct twe_softc *sc, u_long ioctlcmd, void *addr) -{ - struct twe_usercommand *tu = (struct twe_usercommand *)addr; - struct twe_paramcommand *tp = (struct twe_paramcommand *)addr; - struct twe_drivecommand *td = (struct twe_drivecommand *)addr; - union twe_statrequest *ts = (union twe_statrequest *)addr; - TWE_Param *param; - TWE_Command *cmd; - void *data; - u_int16_t *aen_code = (u_int16_t *)addr; - struct twe_request *tr; - u_int8_t srid; - int error; - size_t tr_length; - - error = 0; - switch(ioctlcmd) { - /* handle a command from userspace */ - case TWEIO_COMMAND: - /* - * if there's a data buffer, allocate and copy it in. - * Must be in multiplied of 512 bytes. - */ - tr_length = roundup2(tu->tu_size, 512); - if (tr_length > 0) { - data = malloc(tr_length, M_DEVBUF, M_WAITOK); - error = copyin(tu->tu_data, data, tu->tu_size); - if (error) { - free(data, M_DEVBUF); - break; - } - } else - data = NULL; - - /* get a request */ - TWE_IO_LOCK(sc); - while (twe_get_request(sc, &tr)) - mtx_sleep(sc, &sc->twe_io_lock, PPAUSE, "twioctl", hz); - - /* - * Save the command's request ID, copy the user-supplied command in, - * restore the request ID. - */ - cmd = TWE_FIND_COMMAND(tr); - srid = cmd->generic.request_id; - bcopy(&tu->tu_command, cmd, sizeof(TWE_Command)); - cmd->generic.request_id = srid; - - tr->tr_length = tr_length; - tr->tr_data = data; - if (tr->tr_length > 0) { - tr->tr_flags |= TWE_CMD_DATAIN | TWE_CMD_DATAOUT; - } - - /* run the command */ - error = twe_wait_request(tr); - TWE_IO_UNLOCK(sc); - if (error) - goto cmd_done; - - /* copy the command out again */ - bcopy(cmd, &tu->tu_command, sizeof(TWE_Command)); - - /* if there was a data buffer, copy it out */ - if (tr->tr_length > 0) - error = copyout(tr->tr_data, tu->tu_data, tu->tu_size); - - cmd_done: - /* free resources */ - if (tr->tr_data != NULL) - free(tr->tr_data, M_DEVBUF); - TWE_IO_LOCK(sc); - twe_release_request(tr); - TWE_IO_UNLOCK(sc); - - break; - - /* fetch statistics counter */ - case TWEIO_STATS: - switch (ts->ts_item) { -#ifdef TWE_PERFORMANCE_MONITOR - case TWEQ_FREE: - case TWEQ_BIO: - case TWEQ_READY: - case TWEQ_BUSY: - case TWEQ_COMPLETE: - TWE_IO_LOCK(sc); - bcopy(&sc->twe_qstat[ts->ts_item], &ts->ts_qstat, sizeof(struct twe_qstat)); - TWE_IO_UNLOCK(sc); - break; -#endif - default: - error = ENOENT; - break; - } - break; - - /* poll for an AEN */ - case TWEIO_AEN_POLL: - TWE_IO_LOCK(sc); - *aen_code = twe_dequeue_aen(sc); - TWE_IO_UNLOCK(sc); - break; - - /* wait for another AEN to show up */ - case TWEIO_AEN_WAIT: - TWE_IO_LOCK(sc); - while ((*aen_code = twe_dequeue_aen(sc)) == TWE_AEN_QUEUE_EMPTY) { - error = mtx_sleep(&sc->twe_aen_queue, &sc->twe_io_lock, PRIBIO | PCATCH, - "tweaen", 0); - if (error == EINTR) - break; - } - TWE_IO_UNLOCK(sc); - break; - - case TWEIO_GET_PARAM: - TWE_IO_LOCK(sc); - param = twe_get_param(sc, tp->tp_table_id, tp->tp_param_id, tp->tp_size, NULL); - TWE_IO_UNLOCK(sc); - if (param == NULL) { - twe_printf(sc, "TWEIO_GET_PARAM failed for 0x%x/0x%x/%d\n", - tp->tp_table_id, tp->tp_param_id, tp->tp_size); - error = EINVAL; - } else { - if (param->parameter_size_bytes > tp->tp_size) { - twe_printf(sc, "TWEIO_GET_PARAM parameter too large (%d > %d)\n", - param->parameter_size_bytes, tp->tp_size); - error = EFAULT; - } else { - error = copyout(param->data, tp->tp_data, param->parameter_size_bytes); - } - free(param, M_DEVBUF); - } - break; - - case TWEIO_SET_PARAM: - data = malloc(tp->tp_size, M_DEVBUF, M_WAITOK); - error = copyin(tp->tp_data, data, tp->tp_size); - if (error == 0) { - TWE_IO_LOCK(sc); - error = twe_set_param(sc, tp->tp_table_id, tp->tp_param_id, tp->tp_size, data); - TWE_IO_UNLOCK(sc); - } - free(data, M_DEVBUF); - break; - - case TWEIO_RESET: - TWE_IO_LOCK(sc); - twe_reset(sc); - TWE_IO_UNLOCK(sc); - break; - - case TWEIO_ADD_UNIT: - TWE_CONFIG_LOCK(sc); - error = twe_add_unit(sc, td->td_unit); - TWE_CONFIG_UNLOCK(sc); - break; - - case TWEIO_DEL_UNIT: - TWE_CONFIG_LOCK(sc); - error = twe_del_unit(sc, td->td_unit); - TWE_CONFIG_UNLOCK(sc); - break; - - /* XXX implement ATA PASSTHROUGH */ - - /* nothing we understand */ - default: - error = ENOTTY; - } - - return(error); -} - -/******************************************************************************** - * Enable the useful interrupts from the controller. - */ -void -twe_enable_interrupts(struct twe_softc *sc) -{ - sc->twe_state |= TWE_STATE_INTEN; - TWE_CONTROL(sc, - TWE_CONTROL_CLEAR_ATTENTION_INTERRUPT | - TWE_CONTROL_UNMASK_RESPONSE_INTERRUPT | - TWE_CONTROL_ENABLE_INTERRUPTS); -} - -/******************************************************************************** - * Disable interrupts from the controller. - */ -void -twe_disable_interrupts(struct twe_softc *sc) -{ - TWE_CONTROL(sc, TWE_CONTROL_DISABLE_INTERRUPTS); - sc->twe_state &= ~TWE_STATE_INTEN; -} - -/******************************************************************************** - ******************************************************************************** - Command Submission - ******************************************************************************** - ********************************************************************************/ - -/******************************************************************************** - * Read integer parameter table entries. - */ -static int -twe_get_param_1(struct twe_softc *sc, int table_id, int param_id, u_int8_t *result) -{ - TWE_Param *param; - - if ((param = twe_get_param(sc, table_id, param_id, 1, NULL)) == NULL) - return(ENOENT); - *result = *(u_int8_t *)param->data; - free(param, M_DEVBUF); - return(0); -} - -static int -twe_get_param_2(struct twe_softc *sc, int table_id, int param_id, u_int16_t *result) -{ - TWE_Param *param; - - if ((param = twe_get_param(sc, table_id, param_id, 2, NULL)) == NULL) - return(ENOENT); - *result = *(u_int16_t *)param->data; - free(param, M_DEVBUF); - return(0); -} - -static int -twe_get_param_4(struct twe_softc *sc, int table_id, int param_id, u_int32_t *result) -{ - TWE_Param *param; - - if ((param = twe_get_param(sc, table_id, param_id, 4, NULL)) == NULL) - return(ENOENT); - *result = *(u_int32_t *)param->data; - free(param, M_DEVBUF); - return(0); -} - -/******************************************************************************** - * Perform a TWE_OP_GET_PARAM command. If a callback function is provided, it - * will be called with the command when it's completed. If no callback is - * provided, we will wait for the command to complete and then return just the data. - * The caller is responsible for freeing the data when done with it. - */ -static void * -twe_get_param(struct twe_softc *sc, int table_id, int param_id, size_t param_size, - void (* func)(struct twe_request *tr)) -{ - struct twe_request *tr; - TWE_Command *cmd; - TWE_Param *param; - int error; - - debug_called(4); - - TWE_IO_ASSERT_LOCKED(sc); - tr = NULL; - param = NULL; - - /* get a command */ - if (twe_get_request(sc, &tr)) - goto err; - - /* get a buffer */ - if ((param = (TWE_Param *)malloc(TWE_SECTOR_SIZE, M_DEVBUF, M_NOWAIT)) == NULL) - goto err; - tr->tr_data = param; - tr->tr_length = TWE_SECTOR_SIZE; - tr->tr_flags = TWE_CMD_DATAIN | TWE_CMD_DATAOUT; - - /* build the command for the controller */ - cmd = TWE_FIND_COMMAND(tr); - cmd->param.opcode = TWE_OP_GET_PARAM; - cmd->param.size = 2; - cmd->param.unit = 0; - cmd->param.param_count = 1; - - /* fill in the outbound parameter data */ - param->table_id = table_id; - param->parameter_id = param_id; - param->parameter_size_bytes = param_size; - - /* submit the command and either wait or let the callback handle it */ - if (func == NULL) { - /* XXX could use twe_wait_request here if interrupts were enabled? */ - error = twe_immediate_request(tr, 1 /* usetmp */); - if (error == 0) { - if (twe_report_request(tr)) - goto err; - } else { - goto err; - } - twe_release_request(tr); - return(param); - } else { - tr->tr_complete = func; - error = twe_map_request(tr); - if ((error == 0) || (error == EBUSY)) - return(func); - } - - /* something failed */ -err: - debug(1, "failed"); - if (tr != NULL) - twe_release_request(tr); - if (param != NULL) - free(param, M_DEVBUF); - return(NULL); -} - -/******************************************************************************** - * Set integer parameter table entries. - */ -#ifdef TWE_SHUTDOWN_NOTIFICATION -static int -twe_set_param_1(struct twe_softc *sc, int table_id, int param_id, u_int8_t value) -{ - return(twe_set_param(sc, table_id, param_id, sizeof(value), &value)); -} -#endif - -#if 0 -static int -twe_set_param_2(struct twe_softc *sc, int table_id, int param_id, u_int16_t value) -{ - return(twe_set_param(sc, table_id, param_id, sizeof(value), &value)); -} - -static int -twe_set_param_4(struct twe_softc *sc, int table_id, int param_id, u_int32_t value) -{ - return(twe_set_param(sc, table_id, param_id, sizeof(value), &value)); -} -#endif - -/******************************************************************************** - * Perform a TWE_OP_SET_PARAM command, returns nonzero on error. - */ -static int -twe_set_param(struct twe_softc *sc, int table_id, int param_id, int param_size, void *data) -{ - struct twe_request *tr; - TWE_Command *cmd; - TWE_Param *param; - int error; - - debug_called(4); - - TWE_IO_ASSERT_LOCKED(sc); - tr = NULL; - param = NULL; - error = ENOMEM; - - /* get a command */ - if (twe_get_request(sc, &tr)) - goto out; - - /* get a buffer */ - if ((param = (TWE_Param *)malloc(TWE_SECTOR_SIZE, M_DEVBUF, M_NOWAIT)) == NULL) - goto out; - tr->tr_data = param; - tr->tr_length = TWE_SECTOR_SIZE; - tr->tr_flags = TWE_CMD_DATAIN | TWE_CMD_DATAOUT; - - /* build the command for the controller */ - cmd = TWE_FIND_COMMAND(tr); - cmd->param.opcode = TWE_OP_SET_PARAM; - cmd->param.size = 2; - cmd->param.unit = 0; - cmd->param.param_count = 1; - - /* fill in the outbound parameter data */ - param->table_id = table_id; - param->parameter_id = param_id; - param->parameter_size_bytes = param_size; - bcopy(data, param->data, param_size); - - /* XXX could use twe_wait_request here if interrupts were enabled? */ - error = twe_immediate_request(tr, 1 /* usetmp */); - if (error == 0) { - if (twe_report_request(tr)) - error = EIO; - } - -out: - if (tr != NULL) - twe_release_request(tr); - if (param != NULL) *** 3487 LINES SKIPPED *** From nobody Thu May 11 04:40:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QGzjC5F54z49fVn; Thu, 11 May 2023 04:40: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 4QGzjC2XVxz4Fpm; Thu, 11 May 2023 04:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683780031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1xTPystHV8kv3viAhMzpd8KlfqqR96EdQMbFKJBmerA=; b=mML1cAKJffXE1FgrYFdqZaFwV3d2gfyYQnJ12riFV7wSxZqwoyROoPtM5i8pMQiFFSWTC1 gZyOCu3U2yhFfVYuGpUmgr6oLgKpG+GuGxal1k41HSOMEgTPol+jnQhXXi5HeQH/q7n8dk Mo+YeJppkNP3NyRlCTgpHtFLSVBhQNwcNIewKuEC5ubhB3+9CSLJ+Drh8L+vPZqKxMzpv2 85FCIhCoidvR4bpz4nV1qXXtph41nPgg+kxhf50u6Lb6oYq3c5DAm5+coaT5bq+42Yt3bR +xc2Z8O5V6aSvcUnK58nBxKVWMDofOz4+yodjUcQ211yC28bgKwU4WzUWgSRyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683780031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1xTPystHV8kv3viAhMzpd8KlfqqR96EdQMbFKJBmerA=; b=ORA9sS41MMMxY6cwO2NbIcgir2UtuPQiINKRNAofowxs+3ikl3f2Lrxk2WOhheL30nWaBA vHBjvjctpHV34i4Ph/BgDXNI+QOtDhCmYh92866ls54rLzu1HLH8b94j0vm/aKQi5NsQ+a nRoQ0Wsxg0hH4CPOhsWOKbz6ZhN3n8Uh45C7OTrGn+pyggcjCtwvbmw2DqM9eqCY1MVDzk F4K8VChsc+hgxuTE8oPTSgQdZV4bCFDdvMq9eftBr9rQVOnYuaVF6grADBobGtsq724Udu Y86Dyu7rl8UrUpq7S6ntoU1gy6tw4CHZHJ++hEZuIR/kzP3xAad9Zvgt5tpRgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683780031; a=rsa-sha256; cv=none; b=TDqTEvEFMrqUfdgzE1noDsx017ni/41Cop4aaYToL8ULzXxJNL+0gESopNmhiTjaOm0Bnj UrxF2L+ClpFTGkhpc4RvgO6LmP2uXNGa27/Rw2+OlwcpzdyRbQr4r4c2Km99faZMKZihXX 3rcPJ1ky1HPjS5GlXh1YiklNFc8DJRyjFhSrJ2MGMrXZtuuDxLBm/3oaLg7dPtspjIVWm5 jXhjtxIPgm8EdYXMUMKftRbh+TJULOviLzYQbxsujodNdbOYImuXcocTLPqRWhGsNs7RAT w3ge+Y2BxUxoAQzI0IfWt2/l5vhHaZmqJR+EsGZXKk6Nw1D+FMZffj09dVKKCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QGzjC1c8SzfHs; Thu, 11 May 2023 04:40: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 34B4eVo7095474; Thu, 11 May 2023 04:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B4eVht095473; Thu, 11 May 2023 04:40:31 GMT (envelope-from git) Date: Thu, 11 May 2023 04:40:31 GMT Message-Id: <202305110440.34B4eVht095473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0661f93892a2 - main - rc: add support for cpuset(1) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0661f93892a2564a64c5650ffffa3d73417172a9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0661f93892a2564a64c5650ffffa3d73417172a9 commit 0661f93892a2564a64c5650ffffa3d73417172a9 Author: Miroslav Lachman <000.fbsd_quip.cz> AuthorDate: 2023-05-11 04:38:23 +0000 Commit: Kyle Evans CommitDate: 2023-05-11 04:40:18 +0000 rc: add support for cpuset(1) If ${name}_cpuset is specified (and /usr is mounted), cpuset(1) will be run to limit the service to the configured cpuset. PR: 142434 Reviewed by: kevans --- libexec/rc/rc.subr | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 1c01f1cfd071..9b5b3d8b37e7 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -52,6 +52,8 @@ ID="/usr/bin/id" IDCMD="if [ -x $ID ]; then $ID -un; fi" PS="/bin/ps -ww" JID=0 +CPUSET="/usr/bin/cpuset" + # rc_service provides the path to the service script that we are executing. # This is not being set here in an execution context, necessarily, so it's # really just a reasonable guess, and it will get overwritten later if @@ -777,6 +779,9 @@ startmsg() # ${name}_chdir n Directory to cd to before running ${command} # (if not using ${name}_chroot). # +# ${name}_cpuset n A list of CPUs to run ${command} on. +# Requires /usr to be mounted. +# # ${name}_flags n Arguments to call ${command} with. # NOTE: $flags from the parent environment # can be used to override this. @@ -963,6 +968,23 @@ run_rc_command() _pidcmd= _procname=${procname:-${command}} + eval _cpuset=\$${name}_cpuset + + # Loose validation of the configured cpuset; just make sure it starts + # with a number. There have also been cases in the past where a hyphen + # in a service name has caused eval errors, which trickle down into + # various variables; don't let a situation like that break a bunch of + # services just because of cpuset(1). + case "$_cpuset" in + [0-9]*) ;; + *) _cpuset="" ;; + esac + + _cpusetcmd= + if [ -n "$_cpuset" -a -x $CPUSET ]; then + _cpusetcmd="$CPUSET -l $_cpuset" + fi + # setup pid check command if [ -n "$_procname" ]; then if [ -n "$pidfile" ]; then @@ -1059,7 +1081,7 @@ run_rc_command() eval "export -- $_env" fi _run_rc_precmd || return 1 - _run_rc_doit "$_cmd $rc_extra_args" || return 1 + _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || return 1 _run_rc_postcmd return $_return fi @@ -1105,6 +1127,11 @@ run_rc_command() _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then echo "${name} is running as pid $rc_pid." + # for cpuset debug only, not committable (cut) + if [ -n "$_cpuset" -a -x $CPUSET ]; then + echo -n "on CPU(s)" + $CPUSET -g -p "$rc_pid" | cut -s -d: -f 2 + fi else echo "${name} is not running." return 1 @@ -1130,6 +1157,7 @@ run_rc_command() _cd= _doit="\ ${_nice:+nice -n $_nice }\ +$_cpusetcmd \ ${_fib:+setfib -F $_fib }\ ${_env:+env $_env }\ chroot ${_user:+-u $_user }${_group:+-g $_group }${_groups:+-G $_groups }\ @@ -1139,7 +1167,7 @@ $_chroot $command $rc_flags $command_args" _doit="\ ${_fib:+setfib -F $_fib }\ ${_env:+env $_env }\ -$command $rc_flags $command_args" +$_cpusetcmd $command $rc_flags $command_args" if [ -n "$_user" ]; then _doit="su -m $_user -c 'sh -c \"$_doit\"'" fi From nobody Thu May 11 05:41:21 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH13Q0P0Yz49kqy; Thu, 11 May 2023 05:41:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QH13P6pcZz4NFH; Thu, 11 May 2023 05:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683783682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UcDbksDWYA0qsxTYM1zP9fV7ex24+nIU6Z2l1a3Q0do=; b=lrcmCgCnr86+8624OGfM/31otLZHk9OvAEWCKWCL1aUWWDZiSPvTMeRvw6pdXwSB2k5Ds8 TZ37JZ6y/fXfPSW+M8VtxiSS5sAytn8R+3emDHF4F5L0nDhhFraqtKpVkTI+Vw+TSR/plR maswptT+PG5GKIzhWUV8k8kSU4mukQ3TQgJuFWDdxaZcUMXi3TomYPw+2FHJfD0AtX4LpF A7Vz87wnM9LOB+uXmTDrm51Q5E35bqB+skLG8jR1EZ+IGgo7H2I0AFPVrZUwM4UvcsrkyO tnvgNzGZxBRJO1JrylnTpqaMMuETEztFZwiDw6iu4Ou006zcM0H+gCJQeCcKiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683783682; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UcDbksDWYA0qsxTYM1zP9fV7ex24+nIU6Z2l1a3Q0do=; b=czIHUw6vC+i3zvR22x4nrqP0AJVh6jP4yCZbM7rQUvO4NgX9ssgbRkjZxyz59ZAnm6bnV2 BVz2Z2WKIkK1vBIDXaAJCeJ1QwbepK/kqYuMcOpwu+jbwmOJEs8nc9Kf8YkVhGWUuhv0SR TFHoxs5woy6IKSfhU7Byi9lkESUMin1heK3g+2Mb5P5rsodPYnBiAA2j1B5gUjx/Fw9KgH YvRrJPsCdv1ANCQfLISwkL2SIGUpHKGe/eg50jDm389/KRYbkw2AovwEjZuPMQX7mRGd1s NTxCjxyHK7/bxUbCRlhnYj3VEcokhtEn0dKqmv4uiclwtSvYn8OnvKVxV2VCNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683783682; a=rsa-sha256; cv=none; b=cCOmIKolsxqw7k83027NYXcoehXgmCc6b01H/U0tsvrvdJRXsJaSXyIRNR8rfOjg3H6xaK RMYu8KwfWgp8efGjIhjr06Ts53QGTyplK8MahKhpj2kNFCBATn5jlD0YLzoVgAzl/WTseh eGhznnfLvI9+jPve8oepzv8+/YrGvwy/e6epTbX6owiE4xIYHiX49x8FeTj03gKNux1D2v VT6yKGKIe2Vq2XS4wQA03wiY2nWJd4yK0Nu5ct/njwUWk9S/VC/G2C5KxF9S5nfTrt0qCg P+FbSn0hs7rlN1n1mMQPIKAHsuk9Y5J/gyMImJp+fHqZ0kPJs/HGH/DP3Daqxg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QH13P5tmFzgr0; Thu, 11 May 2023 05:41: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 34B5fL4q098369; Thu, 11 May 2023 05:41:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B5fLb0098368; Thu, 11 May 2023 05:41:21 GMT (envelope-from git) Date: Thu, 11 May 2023 05:41:21 GMT Message-Id: <202305110541.34B5fLb0098368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 4e9041a78690 - main - rc.subr(8): run `trailing-whitespace-fixer` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4e9041a78690b2c7ea35ab1c548412f2ac69da4d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=4e9041a78690b2c7ea35ab1c548412f2ac69da4d commit 4e9041a78690b2c7ea35ab1c548412f2ac69da4d Author: Enji Cooper AuthorDate: 2023-05-11 05:39:32 +0000 Commit: Enji Cooper CommitDate: 2023-05-11 05:39:32 +0000 rc.subr(8): run `trailing-whitespace-fixer` This change deletes benign trailing whitespace from rc.subr, making future non-stylistic changes easier to spot. MFC after: 1 week --- libexec/rc/rc.subr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 9b5b3d8b37e7..b2a7f45ccd4d 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -69,7 +69,7 @@ rc_service="$0" # list_vars pattern # List variables matching glob pattern. -# +# list_vars() { # Localize 'set' option below. @@ -444,7 +444,7 @@ sort_lite() local curitem curitem_orig curitem_mod curitem_haskey local dest dest_orig dest_mod dest_haskey local d gt n - local i=1 + local i=1 while [ $i -le $nitems ]; do curitem_haskey=1 # Assume sort field (-k POS) exists eval curitem=\"\$src_$i\" @@ -1093,19 +1093,19 @@ run_rc_command() echo "$desc" fi ;; - + extracommands) echo "$extra_commands" ;; enable) _out=$(/usr/sbin/sysrc -vs "$name" "$rcvar=YES") && - echo "$name enabled in ${_out%%:*}" + echo "$name enabled in ${_out%%:*}" ;; disable) _out=$(/usr/sbin/sysrc -vs "$name" "$rcvar=NO") && - echo "$name disabled in ${_out%%:*}" + echo "$name disabled in ${_out%%:*}" ;; delete) From nobody Thu May 11 06:24:09 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH20n4rrZz49mw8; Thu, 11 May 2023 06:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QH20n4Cs4z3Bww; Thu, 11 May 2023 06:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683786249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIJiuyNrpriWjhywpqAfFFzCJfiTTsAgAxYa8Pfg+nk=; b=KfOIR05vUWtIjoSlXGbgkxTePnosu2Dz8E/Xm1zgmQ2K/3hGPkp4xC7A84qGySmhv7X7Ql zTlkGt0FkiDP8q/juWn1RIbD+zfEXURznRhCp1T+2J3QnILKWlakFgDG0YMW1mNKFPwu38 DOrIkFsN8Tsm/kVDgJcpqoHahcH328FnUBhbyO9uuM5rxNq7xUdr3yczdn08JbdDJHXCVr fMyI8U1xoBEkoxw9ctPAdAOZ60jzKmBBV3kT0E/NijSnTKPkJ+8qXJIi2p2SctvQnOPBL/ SStOJ+u+BEnvGwRjw+4CSLfEJOwpTTuR8A/N5m28GA7Pkdk0KwEQQRbZNhe5BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683786249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FIJiuyNrpriWjhywpqAfFFzCJfiTTsAgAxYa8Pfg+nk=; b=dXnEpiKx7G6TUEovnw7G+ZspTRbj/cYYUqATrwAfm+tTIRKUosuMOvf9xtD19iewXLkeW9 6FMEcdlmJMbEKpsUyp690O8ovbqgHrdv26VEPhR0fsZxvkPbQaGQY2TC3rKKcFHo52oKGu z3KB6e6tBfI6AabeGCmLpt+eSbsPzvlY2vkt/nkwXWQqm9OiKzYQpJ8R9AhrQLdWrYJWPQ fVsn5nl9oa5Y9WKfMBHlnDsErB0CtloE7j+95hnfrtbQ/WDuTy0eTE3FeH85FDCw7QzDXn VT2+mrCL+yv5WrZcXkAN5c/e/B8QULgIwW6QpVaM+rMlCDaUuudhUELTtfeg1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683786249; a=rsa-sha256; cv=none; b=J/KG+AEMNV2AXoO121D7W3oUQwWV7SBzDE42txb9EpmRviTkyPc0XDx0Hf4llcCNcAd6Kb VqxceUWFysIPze/BZ7C71s+9iM5e3Liv2phP84Fytcovtkm2PqI6TwMHH+/ZCwe+4IdJ28 yCLLa7lEp5dyT+gQxEuXrUUs81HkrXXZNmVqPwz2KRMA9VuTVEBg+I0Am0JbiwQ3qNlWhg Rbam9wZZ41BdwnJgG6vGZDEJAUvymXL9kBBx/i0s883hWbC41dsL2Phwl55i13NmmPWwa2 f0nVSgaIb6DTBcZiRK8njUtL6JRMLYa0W1EeRleL25Mj03Rt+tmQ7xdIhK1VdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QH20n3H8Vzj5c; Thu, 11 May 2023 06:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34B6O9Fh067293; Thu, 11 May 2023 06:24:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B6O9nm067292; Thu, 11 May 2023 06:24:09 GMT (envelope-from git) Date: Thu, 11 May 2023 06:24:09 GMT Message-Id: <202305110624.34B6O9nm067292@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 27e74c8fff35 - main - md5: Add missing . List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27e74c8fff358c113b1afdd3abfc58dca902180c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=27e74c8fff358c113b1afdd3abfc58dca902180c commit 27e74c8fff358c113b1afdd3abfc58dca902180c Author: Dag-Erling Smørgrav AuthorDate: 2023-05-11 06:23:56 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-11 06:24:02 +0000 md5: Add missing . Sponsored by: Klara, Inc. Reviewed by: yuripv Differential Revision: https://reviews.freebsd.org/D40051 --- sbin/md5/md5.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 202cc830d4ed..459d364f8ca7 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -26,6 +26,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include From nobody Thu May 11 07:49:06 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH3tp3j7nz49tDF; Thu, 11 May 2023 07:49: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 4QH3tp3DWqz3M25; Thu, 11 May 2023 07:49:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683791346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwQD0sE7vKRZoHBFLXIyfm6qdwu4xl6te7zWLoVV1eU=; b=qa5xfB302WiTATrOgGM5BUbDQJwZthpzwSPLqQzzrQ+zMTW6NTjVsA1A29zktr9pzBe1Ht j71tN8WqrnMZB1Btha1QOOWroo3qtOoPqAszD4EnEJx/JFHD3OmcLsZoKSLeZG+KKYyuXr E1FKNOAGu2U+fSRCr5Jdd8afHClv4t/8mpziHQzkpZM9HJfoFH6xnnmN55JX2zPsyi+smf u2cI+QAC5CesG3Pjl2nJHCl8A+CXIYGKDZ5lFyXGkLXQoEC/QI7Ab2n53v397W0D4EvSTc aPJCqFchPi+dN2JCwMKuyAoz+5Qp6c5ijvwDBLnuNTigPoX23qkvABo6rRcCmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683791346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gwQD0sE7vKRZoHBFLXIyfm6qdwu4xl6te7zWLoVV1eU=; b=OE5edalTFi3G8cwtgaUh84Le+Vp/VlW05x8eXCKnoFOPUcwlRoRPN6FEeUVUGchZ4Cc/+N 0HqIIaHfZbP0zCKxleJnwxs4ayhNmyDTXFHBj3Eo2UwVYWKZCoRWTRSn9q9X/p6+JGufMY j5HY3/LWmImYVNlDxmv1IzLUtbV3rnkVmyD+JHBOzHdVVaHbYsGPFxzkuNoZWpXJDmjncq VKKhHc9Z2SsvhOBvYD5Ap5ktXdF0MXrzmSSCeyW6QgQmVCSKY3cznaK+kW3a7tjRVtGO+/ Q7Eigf9o3rHbC/yVpLrRMVsT+t/DaYJJfwy33VWa2w9w86feB7HayxIPlbfVBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683791346; a=rsa-sha256; cv=none; b=kczM1yButki2R9XpVh/t0zDU8cW3ZMh/HOP8YTkcH7rdpxP0plxlT180m1zUvwdJYbdPf+ M0AYrYLEy2d+kf9IsNoG1UNMy9fOUtOqWnLgrPfI3wox8M6vHuDznRHxeKb3kS1/yvWGSm cmLMuekA/F/jaBCmZfQqUPKJlBvqUj4lLigHk4wMIgAVwyT59EEtODRnJIpJ37TOOcwbVM I55xZStvgy60UpWH4zi4lQRrAbsjF8pOS0HY4/MJjTG9HkFOMlKFD/l5TgNdTivU3DvCop KEOq3Hz0a4zMs18MzqqLuHLQmE5w050USHjpiLUpORPc4I84sL9Snl3AmQIHOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QH3tp2GsWzkV9; Thu, 11 May 2023 07:49: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 34B7n6pI099985; Thu, 11 May 2023 07:49:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B7n6og099984; Thu, 11 May 2023 07:49:06 GMT (envelope-from git) Date: Thu, 11 May 2023 07:49:06 GMT Message-Id: <202305110749.34B7n6og099984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 0229fab2fe0e - main - e1000: fix VLAN 0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0229fab2fe0eed843ebec98fd31b7d49bb2e8438 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0229fab2fe0eed843ebec98fd31b7d49bb2e8438 commit 0229fab2fe0eed843ebec98fd31b7d49bb2e8438 Author: Kristof Provost AuthorDate: 2023-05-10 16:26:29 +0000 Commit: Kristof Provost CommitDate: 2023-05-11 07:48:50 +0000 e1000: fix VLAN 0 VLAN 0 essentially means "Treat as untagged, but with priority bits", and is used by some ISPs. On igb/em interfaces we did not receive packets with VLAN tag 0 unless vlanhwfilter was disabled. This can be fixed by explicitly listing VLAN 0 in the hardware VLAN filter (VFTA). Do this from em_setup_vlan_hw_support(), where we already (re-)write the VFTA. Reviewed by: kbowling Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40046 --- sys/dev/e1000/if_em.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 89186767bc60..0b664b155872 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -3681,8 +3681,10 @@ em_setup_vlan_hw_support(if_ctx_t ctx) /* * A soft reset zero's out the VFTA, so * we need to repopulate it now. + * We also insert VLAN 0 in the filter list, so we pass VLAN 0 tagged + * traffic through. This will write the entire table. */ - em_if_vlan_filter_write(sc); + em_if_vlan_register(ctx, 0); /* Enable the Filter Table */ em_if_vlan_filter_enable(sc); From nobody Thu May 11 08:30:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH4p05Cvtz49w95; Thu, 11 May 2023 08:30: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 4QH4p04pgNz3R4V; Thu, 11 May 2023 08:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683793800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZo8HLTIqbJHHpLuXnjaprTe5KtsalrMuhx/vuecP+c=; b=G2/OJ3wts0EwG65J2Ga7kpYCFBgyCf3HJftKG+xUlXBd4eVueLiPijsXZ6Bt3ubwV1EL9I J4N1O3k2exV08Ufvn75MZa4pBN2g0RXq0b48HL/iSaDRa5IssHl+dXrXQqRHnO9Mxehws1 sP9guSGRnHIdoVJWz5zddt8shsut+LmGRitsoDl/JD4T8bUMPMUhSDYBS0ekTU+q75gZm9 lmxrYJ5Hbms4opXID/ee71nXQy74S4ximUXE7exR1mxK0cDJfBkOtrEFIlr+AfXPvgp+Hi 9hn0MGO4H/7mFbcvwyq4K/+3zp/fdQpOmfXBY+wJRSgUeq3TOwMwhmSOJBP0EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683793800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pZo8HLTIqbJHHpLuXnjaprTe5KtsalrMuhx/vuecP+c=; b=Pa1xlNnU6akV6nq5PomKewMemgNWqKieLsunu2zLK4nJsgreW3dwc1lJjXvE5osOAhtCO4 DNGq8tjEjd6WOBXRjkZcfj0Uvpu4iblqP+9CtDLPPgHhlUQlyBnv7Lvis24dcfTUm8wxu3 roNPGPVLfZzSwcZiX8l/Ra4jDU6iLzXCg4jH0ig/S50rkVMHnOTQ1CGpyCLcaVqUIkzOGf xnVitu81ODShC0DPQY9g8x45C9k/nVAV8QwRGue1DXLYebMh4XoMwsDndMuPpxMv5cxNy/ aYYQaHhuPG224yE9ptsy452dBRG1Zn5NQkSPJwQXoren0QuoDTw3vlkBL0hWMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683793800; a=rsa-sha256; cv=none; b=EIYtKLiaofK9DAzvzznlK3oofA8IYfQdqzGbTpZiPZiSlJSZAGWjgIN+Jph7NpnCjKq+j0 wR51aeYHTLXxfg7Bl4w1oLz5gTITBuICAhbL1vaYSC2XmqA0KF2NA8t6rFLa4olAnIEcl3 kORti9DB8cik/55lTfxOxs4nGMxsIez9OltN9N9JxNWDGZ0I2F3X7x5EQbmzhgrmT4S1Uc 4jxJsOG8FGWbLXKSN4k/mQO1ZRpXEhmMBaO2Hg4lT9skc9KOb+RJtEyxNemwa1SLHZ2B0E 63ZfdWIY5QY6tIGglcRJLHiAMP1H6eMEx2go9Nm1RvXiL6j8px3/Lhl6nG+v9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QH4p03skPzlZ9; Thu, 11 May 2023 08:30: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 34B8U0HF067856; Thu, 11 May 2023 08:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B8U0FC067837; Thu, 11 May 2023 08:30:00 GMT (envelope-from git) Date: Thu, 11 May 2023 08:30:00 GMT Message-Id: <202305110830.34B8U0FC067837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: fec74220377a - main - Complete removing twe(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fec74220377aa31af80945782bcb5b30f32a0378 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=fec74220377aa31af80945782bcb5b30f32a0378 commit fec74220377aa31af80945782bcb5b30f32a0378 Author: Li-Wen Hsu AuthorDate: 2023-05-11 08:28:23 +0000 Commit: Li-Wen Hsu CommitDate: 2023-05-11 08:28:23 +0000 Complete removing twe(4) Fixes: 062a7b918fac twe: Remove driver --- sys/i386/conf/GENERIC | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 1bc278194597..105bc238cb7d 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -167,7 +167,6 @@ device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s device pst # Promise Supertrak SX6000 -device twe # 3ware ATA RAID # NVM Express (NVMe) support device nvme # base NVMe driver From nobody Thu May 11 08:40:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH52H2fwYz49wsn; Thu, 11 May 2023 08:40:39 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "Telekom Security ServerID OV Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QH52F58BMz3hnL; Thu, 11 May 2023 08:40:37 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1683794425; i=garyj@gmx.de; bh=t9QfCMRM87Fd2wFnQuNvsx5u5JmanoUTO9MJvP/SlT0=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References: Reply-To; b=XRtTknrlc1k5FTe693emJvL9S6e+ondkOBjr/OFwTTpoyiNDvjuTJ6NBntEVu9kVW OeWsWVw8Oun1QLSeFrc7VCyruLqOXJ24lBjlvyDUDS89M3kasjovQUlkB5InJ89Ghb uVAm6lbJigfeIZ7Imxv7Rlx8iQ/+eNrsVsaHwf5k5GcHW/a//USPW1vfXQSJrv8qBQ hqOWKmfGI7Tj9Vn6En4wKUCzP81FMw7bGUWk9t/ry2WFoIrKAM5Qgnw35m34FosR1J hxo6HaCMGu6CDnUyyI7KCr6PY9BCtxRKxn9SADUpN8SrFqF/iOkpGAdUL/GLRp6MrZ /9ueQCRADQqLQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([91.59.238.143]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N33ET-1qKIDc11Wn-013NTy; Thu, 11 May 2023 10:40:25 +0200 Date: Thu, 11 May 2023 08:40:01 +0000 From: Gary Jennejohn To: Mike Karels Cc: Cy Schubert , Mitchell Horne , rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Message-ID: <20230511104001.6b925848@ernst.home> In-Reply-To: <4367FD0A-76AC-4E98-A133-E50D8CF841C7@karels.net> References: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> <20230510151313.9E7A6111@slippy.cwsent.com> <4367FD0A-76AC-4E98-A133-E50D8CF841C7@karels.net> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:4mr6dSFQW/LwReTcJCeOey0lFOdqIuO5emX/JFePuxYdRyuiMvO kWywNsIqUUaYbQCppzzXsDsMIL5xyMvOOXCs6aD0a8Mktd/HSMOXPBI+6neg6BdTJloTj7+ 7Zen0K4eIoeTPLfQZsBoXdvJjDvCDJ8riCmBvzz40n+RkDsBnkQxar4Ra9sGco6XgDGabUk sgI7+lrf6IC5RzOZeQPag== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:kG7bTQyvwSc=;HpoPdQuKwUwN3PuKnAHxh3GWOZj tMFG0bBeAK/SMhWUY/KvPBssm2V+N1u8Uw5mGGoxeb6OiE5QLcKcBUpXkj/I/4y3/9qlFOWYG +NavtjYcXWNEykiLZJOm9MG1jII8vJQkemGEnui3MvZRAvUwThlwjjFh2+8KxCJtQzJNTkSO0 e5QmOSG83xyqaEyKqB4hFh3eXMWgsEffyi1A8cH74+SSJ78F3u0pKnT6jSC3UVVkLSUiS7YWy 3b+wH4u+ARjY6oPMJPNJYm+AX0mq8t8gUeFgdL8oN5e5soRD47gXPmQvgkEDaHEBrPoyusDQI 3WeJFsDirtr3IvtDV0V5oln8gKWB0+0j4Jx5kDy7gx1BBRV9ZL1YTc7SWCgxInAJCzlIa0vjD R7kVZbRvwN7i0iZg1R9g4JSs0C3w1n4iubAgqFjZftwlWBmKfZ4c1vahVVtV8m5HENLIYN+zi 0sQqwk2T33Rxhc9O5oARCKdjyo9Ft1c6f3BOqUKhv1zr7hgYt2QNZC6x9Gwerbc4CRtJKdnYR t/z3t9YH26qltkmCo6mH8AZI6DG3dxWv/fAu1H/Ksl02nJ0eT7xknLDUuJo7JM0dOSg9mBm/9 Fm88FjHd3ZJowH9uiA2s8vSrTCNu7gSr0OpWioWfppTyjAH20VkzTzif2aABD9bxDUrI1+oz7 FTXq1NWJgtmD9PNL/f+lLjH/c18NeS8JcdO/IX2GWnKEjeU0kQh3pHbL3jR2xpSdm5y0KKo7Q QcZS/b4sk+1jUbPEFWT99waUOZqYQROKRgWbqYPOhPNIMBQBv4nf3FD+PSXLukzm/rTtbbl16 3hW8UQK/IeniOkgCUU2LF7c8n/93h1Gc3oD6+C3x5m5QPUPMh68GyvU3FTTbvojU/1jOjK9IM R3CiSeKKfbcySKASjYTHJCRdJnMO4WjaFqud0tUmzJTaWC/k2tbFPtyfNBf4BmVgX2XTx1Ivj LkpKF2lHd0Sb1kAinPDWjbdot4A= X-Rspamd-Queue-Id: 4QH52F58BMz3hnL X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Wed, 10 May 2023 16:48:12 -0500 Mike Karels wrote: > On 10 May 2023, at 10:13, Cy Schubert wrote: > > > In message , Mitchel= l > > Horne w > > rites: > >> On 5/10/23 11:19, Rodney W. Grimes wrote: > >>>> The branch main has been updated by mhorne: > >>>> > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D36db6b04962a01ff7b21= 592def02d > >> 4c570dac939 > >>>> > >>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 > >>>> Author: Mitchell Horne > >>>> AuthorDate: 2023-05-10 12:53:56 +0000 > >>>> Commit: Mitchell Horne > >>>> CommitDate: 2023-05-10 13:25:17 +0000 > >>>> > >>>> hier(7): document /home/ and /usr/home/ > >>>> > >>>> Reviewed by: imp > >>>> MFC after: 1 week > >>>> Sponsored by: The FreeBSD Foundation > >>>> Differential Revision: https://reviews.freebsd.org/D40002 > >>>> --- > >>>> share/man/man7/hier.7 | 10 ++++++++++ > >>>> 1 file changed, 10 insertions(+) > >>>> > >>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 > >>>> index ff11289436a1..b6759dd6e65b 100644 > >>>> --- a/share/man/man7/hier.7 > >>>> +++ b/share/man/man7/hier.7 > >>>> @@ -90,6 +90,10 @@ file descriptor files; > >>>> see > >>>> .Xr \&fd 4 > >>>> .El > >>>> +.It Pa /home/ > >>>> +user HOME directories. > >>>> +This is a symlink to > >>>> +.Pa /usr/home/ > >>> > >>> /usr is "contains the majority of user utilities and applications" > >>> it should not contain home directories. > >>>> I do not know when this move to usr came about it was traditionally > >> /home. > >>> I do not know why /usr/home even exists, it is not needed by > >>> anything I am aware of. If we have a compatible link it > >>> should be, usr/home -> ../home and /home should be the > >>> directory. > >>> > >> > >> I agree that /usr/home is strange, and is unique (?) to FreeBSD. > >> > >> The oldest commit in the output of `git log --grep '/usr/home'` is: > >> > >> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd > >> Author: David Nugent > >> Date: Fri Jan 3 04:42:18 1997 +0000 > >> > >> Implemented /home -> /usr/home symlink kludge. > >> If home basedir would be created in the root partition, create > >> it under /usr instead, and symlink /basedir -> /usr/basedir. > >> > >> Notes: > >> svn path=3D/head/; revision=3D21242 > >> > >> > >> So it has been this way for 26 years at least. I do not know what to = say > >> about whether /usr "should" contain it, but it does. > > > > Usually history matters. I can understand not changing it. On the flip > > side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /home= -- > > albeit automounted from /export/home on localhost or some NFS server. = In > > the Red Hat land at $JOB, /home is its own partition (actually an LVM > > volume). In both cases /home is not in /usr because end-users can fill > > /usr. This can be problematic operationally because it's yet another > > headache to deal with should someone fill the filesystem. Filling /usr= is > > more serious than filling /home. > > > > As a point of interest, when I installed my first FreeBSD many moons a= go I > > used the Solaris standard of /export/home, using amd (now automount) t= o > > serve my /home. I'm not advocating we do this, it's overkill, but /hom= e > > should not live in /usr. It's a potential headache for any sysadmin. > > > > With ZFS the solution is easy. With UFS based systems there are a lot = of > > other factors that go into how we install the "default" from the get-g= o. > > The situation is a fair mess. It took me a little while to figure out t= hat > the kludge referenced above is in the pw(8) command, which is used as th= e > backend to adduser(8). Neither /home nor /usr/home is in the base packa= ge. > adduser defaults to /home/user, and creates the parent directory (e.g. /= home) > if it does not exist, but if there is no internal slash, pw moves the pa= rent > to /usr. In this case, it makes the symlink from root. zfs is differe= nt, > in that it includes a usr/home dataset already (created by bsdinstall). > In this case, creating a user with /home/user causes the symlink to be a= dded > as a side effect. > > I?m sure the kludge was originally done when root and /usr were separate > file systems by default, root was small, and there was no /home by defau= lt. > However, we now default to a single large file system (with datasets, in > the zfs case). > > All of this really is a horrible kludge, and it is a house of cards. I'= m > amazed that it doesn't break more often. I'm tempted to remove the klud= ge > and change the zfs setup to create a home dataset rather than usr/home. > However, if zfs users explicitly configure a home directory under /usr/h= ome, > this would end up in the usr dataset. An alternative would be to remove= the > code from pw to create the parent directory entirely (which seems sensib= le), > and create a /home directory for ufs installs. I don't know how well kn= own > it is that adduser/pw will create parent directories for home directorie= s > though. This cleanup would change the default location for home directo= ries > to /home, which makes more sense. It would require documentation, e.g. = in > the release notes. The changes would only affect new installations, not > upgrades. > > Thoughts? > Adding home would require a change to BSD.root.dist, since it's not currently in there. Only usr is present. IMHO changing pw would be a reasonable approach. =2D- Gary Jennejohn From nobody Thu May 11 09:11:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH5jh74G9z49yHx; Thu, 11 May 2023 09:11:20 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QH5jh6dX0z3lsq; Thu, 11 May 2023 09:11:20 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683796280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YbHmAab6HXpc3/gtzNMtZXXe1MYjJaA0xJLlszQA6w8=; b=QbofvDpXDlopB1CkX7aEezOqACg0LxqDekO32/JMZgAMHROvdY15TH1R1hYZjtttrutZ8X htwwF0Y7ElnOhi0kDHwHw21hN1aP+UZcnCO8aOrwrKXNLnO3mlbz646McFyhylqT9Cw6Hq /hQ/V5YcvZ08GMs3V+q59GPzwWNwwPf5WPaPtC9KRC9oinBmZLHrCbDHN53yM9AVgUo8E2 m4qNpYbccqqx+0Z6vOLK1kkP32T/dZFh75EV+tSaGUZeB55YBeDpyUHIr8hC139nqm7rd+ FuOcEko1G+bc1r+0vH9iMw4eRAVvjBEcMaOnW6wbTSmFtjgawPVFuIkBA8OLhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683796280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YbHmAab6HXpc3/gtzNMtZXXe1MYjJaA0xJLlszQA6w8=; b=vQddI9n9ex+SdN4k0oQnpe1IuVG9zqOofv+tQPhpFBfs5WIKwRRSFKHZ3nFkxPA5OWG4O1 55cBskyndKn1dh1PVl0cM4G0fQ5+qSXRh/0irZzxon4oOVFvu/V6koNN+5bmhyaxfpKUN7 ms5uR59WUjzFfWJ6U40it4k13uTuvwOz84WK7VeYj8NI75fu3fT+NTBgfmgbz7lzD2dmUv tqBQNE8mLi5EuY7uOPJmi2g7GYIfZeumwmKFmNFqpxR4kG6wajtcwP9o8IU+x6uayH6pLq 9FGpSc81ZDgtD5MjbAkk5jjbJm1pRk7O0jhmvXbPyUF0NHsQMT1E3SFx9e6Iqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683796280; a=rsa-sha256; cv=none; b=F+FiKCHgjaO1kDM8/goEeAWIslWVpnqO50pwZVmpJWIEYv+60xMjxfPLtSR/JIE8cNVDWV 3wcqrScF6uG2NX0YVFMnOywgFeAB+xwzlk0FIBkZLMjZ75Xlpu2I+qq61c3f/pZeD+zxd5 ltytAd0poUvruaDWT4zKHIUPcq9Ef4ZjmTdED8ZF3ThVxSMM+5NE0UrIZR4ezJ1UUVL2F1 4j/QT+FXW/b0bP9s8ggmCL9ai0Hqxd9RfIW+IZOHSJngPMmn9/+EUP3v4FfV9ZO5LM0ZQL yMEzX3n2PXZuwwzglwBlyOb/diesepO+wMs/3hFyQoE0jjBJIj70wvGr/8XxTg== Received: by freefall.freebsd.org (Postfix, from userid 1033) id D6109C891; Thu, 11 May 2023 09:11:20 +0000 (UTC) Date: Thu, 11 May 2023 09:11:20 +0000 From: Alexey Dokuchaev To: Mike Karels Cc: Cy Schubert , Mitchell Horne , rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Message-ID: References: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> <20230510151313.9E7A6111@slippy.cwsent.com> <4367FD0A-76AC-4E98-A133-E50D8CF841C7@karels.net> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4367FD0A-76AC-4E98-A133-E50D8CF841C7@karels.net> X-ThisMailContainsUnwantedMimeParts: N On Wed, May 10, 2023 at 04:48:12PM -0500, Mike Karels wrote: > ... > I'm sure the kludge was originally done when root and /usr were separate > file systems by default, root was small, and there was no /home by default. I think that's the idea, yes. FWIW, I still partition my drives this way: 2~4GB root with big /usr and /home (the latter lives on separate partition because it's encrypted). For non-encrypted setup, /home does not have to be a separate partition and can be a symlink to `usr/home'. I actually don't find this inconvenient or particularly kludgy. Surely it's nice to be able to encrypt one's data, but it's also nice not having to worry if you'd suddenly get ENOSPC while there's still plenty of room on adjacent partition. > However, we now default to a single large file system (with datasets, in > the ZFS case). ZFS makes it all easier of course, but at its present state is not usable on 13+, so I'm confined to UFS until ZoL guys can fix their sh^code. :( ./danfe From nobody Thu May 11 12:20:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QH9wR0CP8z4B9Qm; Thu, 11 May 2023 12:20: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 4QH9wQ6X28z44vf; Thu, 11 May 2023 12:20:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683807654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2O3rvfY9Q06ClVOKsPSkXgmzuabXIznzFtG7fCDm32M=; b=Lhceiuqt3OBHkkpbZsz4IFkPHVWs3094Yoj1R4ohC0FOU2l8UpDgxschPwlFl0LyYZW4ZY 9l034hUrWY/bn3dbI5/PkDj3rH4J4+sI1hFr+UWoQ1kUI/RDFLT59/L9HW3yDisxv777+d aWzwrp0PAIrQBAL8EYfO/oEMxvMrDRLijIbL9mZwgA4lF/jEmnMntSZ3sCe4wSvy4egyxk l2RUXG411BDfDxDdzWoq0fkDhJ5zQhKSAXMgLOmrf35wxJI+GVWQrQKjPwMh71pGKWOubu bhbM7wnoFh9eU86jo0pSqFXYJ1lchd4ZLqjKXjXZ9fTir01bmbIKiF3OJFSBSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683807654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2O3rvfY9Q06ClVOKsPSkXgmzuabXIznzFtG7fCDm32M=; b=JI/uzbAVQb41xG5x+1rDulOrYUsE9Xnjv1TlxtGlZPCcvrSImNj4gI0lh09jokhzrzFJZu THPyh98qL1pYbRHxgcvJ4uq7xe9AZhClTmsFw91H1y8UB3kJ7kSlbC2HfAyXGZpl760NsR L9rMmkrb2d+MKib0UI5DnbfXcuzJ9rkfD/jiEMF7HEDNSKYG3NAr/8RjlqBYzi2bXNKlH2 z8PwzUMyEPiUZANbvfnL+OCeMMyhzmpyWraUSbGlFhzQMxovXZXpc+dpRZpuX8Mmz9N8Wa a1FqTsxO3flrnYOd3z/qGARuDwtC4306K3x1E9OjzZG44MX3fxZuUwZFknxQBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683807654; a=rsa-sha256; cv=none; b=WRWynnREj3clFFw+6lg9hwehjJK9+2FYIODC0s1EyuaKc3NaPRjsIltslgcrhQSiAO3ya8 AcgIlN6+O+bz/W8JA/B5K9Cc15vutXfTObrYx69Bui3IQ7yZt9nFSRq5Gbtw2VNyzw+8YA oPJGe8GkL5J2VuoQWILVekXLPfS6xyu7t9yQ1iuMStt9sk24kaCXul4Ifps87gp02y3psY um8vCKIJmlxTq9pTDBUM/Vfve9SyP9qzvssqsBMi9hNlBdXnQJH+PPGyAxyjE+4tWgSZop hnt2w/X4Fzhf1K3O6UJOum1J9uj3YIJJEbKsCK8KJcMd7utefLLPus0UIZMn9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QH9wQ5Jp4zsc0; Thu, 11 May 2023 12:20: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 34BCKs03055499; Thu, 11 May 2023 12:20:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BCKsg6055498; Thu, 11 May 2023 12:20:54 GMT (envelope-from git) Date: Thu, 11 May 2023 12:20:54 GMT Message-Id: <202305111220.34BCKsg6055498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: ca14781c8170 - main - bhyve: add cmdline option for user defined fw_cfg items List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca14781c8170f3517ae79e198c0c880dbc3142dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=ca14781c8170f3517ae79e198c0c880dbc3142dd commit ca14781c8170f3517ae79e198c0c880dbc3142dd Author: Corvin Köhne AuthorDate: 2021-09-08 09:31:21 +0000 Commit: Corvin Köhne CommitDate: 2023-05-11 12:20:32 +0000 bhyve: add cmdline option for user defined fw_cfg items Some guest allow to configure themself by fw_cfg. E.g. Fedora CoreOs can be provisioned by adding a JSON file as fw_cfg item. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38338 --- usr.sbin/bhyve/bhyve.8 | 19 ++++++ usr.sbin/bhyve/bhyverun.c | 9 ++- usr.sbin/bhyve/qemu_fwcfg.c | 146 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/qemu_fwcfg.h | 1 + 4 files changed, 173 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 321c014395fb..38891ab33c40 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -45,6 +45,15 @@ .Op Cm ,threads= Ar n .Oc .Sm on +.Oo Fl f +.Sm off +.Ar name Cm \&, +.Oo +.Cm string No | Cm file +.Oc +.Cm \&= Ar data +.Sm on +.Oc .Oo .Sm off .Fl G\~ @@ -145,6 +154,16 @@ Force .Nm to exit when a guest issues an access to an I/O port that is not emulated. This is intended for debug purposes. +.It Fl f Ar name Ns Cm \&, Ns Oo Cm string Ns No | Ns Cm file Ns Oc Ns Cm \&= Ns Ar data +Add a fw_cfg file +.Ar name +to the fw_cfg interface. +If a +.Cm string +is specified, the fw_cfg file contains the string as data. +If a +.Cm file +is specified, bhyve reads the file and adds the file content as fw_cfg data. .It Fl G Xo .Sm off .Oo Ar w Oc diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 627a86d71e0e..5c5d4608b10d 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1259,9 +1259,9 @@ main(int argc, char *argv[]) progname = basename(argv[0]); #ifdef BHYVE_SNAPSHOT - optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:K:U:r:"; + optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:r:"; #else - optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:K:U:"; + optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:"; #endif while ((c = getopt(argc, argv, optstr)) != -1) { switch (c) { @@ -1289,6 +1289,11 @@ main(int argc, char *argv[]) case 'C': set_config_bool("memory.guest_in_core", true); break; + case 'f': + if (qemu_fwcfg_parse_cmdline_arg(optarg) != 0) { + errx(EX_USAGE, "invalid fwcfg item '%s'", optarg); + } + break; case 'G': parse_gdb_options(optarg); break; diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index af819dc4a952..73a10e0e61c9 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -7,13 +7,18 @@ #include #include +#include +#include #include #include #include +#include +#include #include #include +#include #include "acpi_device.h" #include "bhyverun.h" @@ -98,6 +103,15 @@ struct qemu_fwcfg_softc { static struct qemu_fwcfg_softc fwcfg_sc; +struct qemu_fwcfg_user_file { + STAILQ_ENTRY(qemu_fwcfg_user_file) chain; + uint8_t name[QEMU_FWCFG_MAX_NAME]; + uint32_t size; + void *data; +}; +static STAILQ_HEAD(qemu_fwcfg_user_file_list, + qemu_fwcfg_user_file) user_files = STAILQ_HEAD_INITIALIZER(user_files); + static int qemu_fwcfg_selector_port_handler(struct vmctx *const ctx __unused, const int in, const int port __unused, const int bytes, uint32_t *const eax, @@ -384,6 +398,22 @@ qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data) return (0); } +static int +qemu_fwcfg_add_user_files(void) +{ + const struct qemu_fwcfg_user_file *fwcfg_file; + int error; + + STAILQ_FOREACH(fwcfg_file, &user_files, chain) { + error = qemu_fwcfg_add_file(fwcfg_file->name, fwcfg_file->size, + fwcfg_file->data); + if (error) + return (error); + } + + return (0); +} + static const struct acpi_device_emul qemu_fwcfg_acpi_device_emul = { .name = QEMU_FWCFG_ACPI_DEVICE_NAME, .hid = QEMU_FWCFG_ACPI_HARDWARE_ID, @@ -458,6 +488,11 @@ qemu_fwcfg_init(struct vmctx *const ctx) } if ((error = qemu_fwcfg_add_item_file_dir()) != 0) { warnx("%s: Unable to add file_dir item", __func__); + } + + /* add user defined fwcfg files */ + if ((error = qemu_fwcfg_add_user_files()) != 0) { + warnx("%s: Unable to add user files", __func__); goto done; } @@ -468,3 +503,114 @@ done: return (error); } + +static void +qemu_fwcfg_usage(const char *opt) +{ + warnx("Invalid fw_cfg option \"%s\"", opt); + warnx("-f [name=],(string|file)="); +} + +/* + * Parses the cmdline argument for user defined fw_cfg items. The cmdline + * argument has the format: + * "-f [name=],(string|file)=" + * + * E.g.: "-f opt/com.page/example,string=Hello" + */ +int +qemu_fwcfg_parse_cmdline_arg(const char *opt) +{ + struct qemu_fwcfg_user_file *fwcfg_file; + struct stat sb; + const char *opt_ptr, *opt_end; + int fd; + + fwcfg_file = malloc(sizeof(*fwcfg_file)); + if (fwcfg_file == NULL) { + warnx("Unable to allocate fw_cfg_user_file"); + return (ENOMEM); + } + + /* get pointer to */ + opt_ptr = opt; + /* If [name=] is specified, skip it */ + if (strncmp(opt_ptr, "name=", sizeof("name=") - 1) == 0) { + opt_ptr += sizeof("name=") - 1; + } + + /* get the end of */ + opt_end = strchr(opt_ptr, ','); + if (opt_end == NULL) { + qemu_fwcfg_usage(opt); + return (EINVAL); + } + + /* check if is too long */ + if (opt_end - opt_ptr >= QEMU_FWCFG_MAX_NAME) { + warnx("fw_cfg name too long: \"%s\"", opt); + return (EINVAL); + } + + /* save */ + strncpy(fwcfg_file->name, opt_ptr, opt_end - opt_ptr); + fwcfg_file->name[opt_end - opt_ptr] = '\0'; + + /* set opt_ptr and opt_end to */ + opt_ptr = opt_end + 1; + opt_end = opt_ptr + strlen(opt_ptr); + + if (strncmp(opt_ptr, "string=", sizeof("string=") - 1) == 0) { + opt_ptr += sizeof("string=") - 1; + fwcfg_file->data = strdup(opt_ptr); + if (fwcfg_file->data == NULL) { + warnx("Can't duplicate fw_cfg_user_file string \"%s\"", + opt_ptr); + return (ENOMEM); + } + fwcfg_file->size = strlen(opt_ptr) + 1; + } else if (strncmp(opt_ptr, "file=", sizeof("file=") - 1) == 0) { + opt_ptr += sizeof("file=") - 1; + + fd = open(opt_ptr, O_RDONLY); + if (fd < 0) { + warn("Can't open fw_cfg_user_file file \"%s\"", + opt_ptr); + return (EINVAL); + } + + if (fstat(fd, &sb) < 0) { + warn("Unable to get size of file \"%s\"", opt_ptr); + close(fd); + return (-1); + } + + fwcfg_file->data = malloc(sb.st_size); + if (fwcfg_file->data == NULL) { + warnx( + "Can't allocate fw_cfg_user_file file \"%s\" (size: 0x%16lx)", + opt_ptr, sb.st_size); + close(fd); + return (ENOMEM); + } + fwcfg_file->size = read(fd, fwcfg_file->data, sb.st_size); + if ((ssize_t)fwcfg_file->size < 0) { + warn("Unable to read file \"%s\"", opt_ptr); + free(fwcfg_file->data); + close(fd); + return (-1); + } else if (fwcfg_file->size < sb.st_size) { + warnx("Only read %u bytes of file \"%s\"", + fwcfg_file->size, opt_ptr); + } + + close(fd); + } else { + qemu_fwcfg_usage(opt); + return (EINVAL); + } + + STAILQ_INSERT_TAIL(&user_files, fwcfg_file, chain); + + return (0); +} diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h index d318d0434285..98881b4ab79d 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.h +++ b/usr.sbin/bhyve/qemu_fwcfg.h @@ -23,3 +23,4 @@ struct qemu_fwcfg_item { int qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data); int qemu_fwcfg_init(struct vmctx *const ctx); +int qemu_fwcfg_parse_cmdline_arg(const char *opt); From nobody Thu May 11 12:30:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHB7Y4Wxhz4BB1P; Thu, 11 May 2023 12:30: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 4QHB7Y3xNTz469c; Thu, 11 May 2023 12:30:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683808233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZDItAFloYmbFxboK9m31w3e+bZKUpqRiZC1tK+yriw=; b=LDS2rAuoqWb5dccX0AVhsTLqffnSQ18hfWEpl/y+oK1OvfwhzIxejKIiTSCfA2590HFVcB 06TLhlnhdGmC/XCP+mCYcH5KtMsR/H9tBKisc6JCbjVBSSVtIxkR3WXkzJU0sXgdUA/Ipm pUh90Lj1eBHmuC9FkapJkrEkmNnYzQnVYBG7/dqjDgey4xX+JmD4TXB+5S6PJFEzbrymOV ei8aBlzMlXQgEv/0u7wM/zhXxT7Jt4UHCdXU3MUbsr28muf+hcCdzxLd/3N1J+Wp/VkBfJ GkKXTV8pX6bkLpS2PXJFa/YkSseeblajjKG+B7AFY2nV+qEvrVgI4w8jkLVJ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683808233; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yZDItAFloYmbFxboK9m31w3e+bZKUpqRiZC1tK+yriw=; b=ISLni6WxnrFm8UBwDh/eWXLU4maJhAbvAkn+RjXeOJqzJx5XZWao/p/qeTCtXtsvQysse1 rwNevt3NbgwvSPbtQaHmr4BuGwqkEl6wq9pBUjrdDhV5NPBWhbcX4V5NvV1dIx92iEUs7o 5l5Jw+oaPBBOR6wxaREqVf0f7lDn0KKUOKn5yGg9SJOgOmefrtZb4SS4yXfQ5dsVQKh+xQ QYhFnT5p+JRvqAbM27cpL/R5N2ifk1Jv1Gwk/tBnTuIaRh5RiW8c0OOkgYasNdpP/XfbPF 8Za/BA/m09RmFzoRfe9/RwipQokqoaalRdTljsBFy0h46BjTdptefpx+0G62Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683808233; a=rsa-sha256; cv=none; b=M1pRjvXJ7A/YIjtA0KRLfa8FD2XTL0wpkaI0+WTh3M1qRlRoNpPQxJXT+ldNYgzDgTt1Vz 2AB9uNODt7D62YdcM6PnH35+gi+9xiHZvGA+ML9vmKCaPTr8mfByJf+lvp/icG5gq1k+Sf Q1kZTXLUXi9zR9pRy8P97GmKLUbQ/tVNPQzwd6jhVB4Voh1QY0hKFp3R8TbmNDP0DIyzQK qsEyNse89V2u2wla5TuqVo9bacP8YFrwabiydAmKm0e0gAwYMj607aTO0QK5E5b7H0C7QO KKRcmC2RL01fPgL2vBevJn7aU+zecc1b09Gj8LqdJyapJuRdDVBPgYCpsga8vw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHB7Y312yzsp9; Thu, 11 May 2023 12:30: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 34BCUXSL070875; Thu, 11 May 2023 12:30:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BCUXps070874; Thu, 11 May 2023 12:30:33 GMT (envelope-from git) Date: Thu, 11 May 2023 12:30:33 GMT Message-Id: <202305111230.34BCUXps070874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 60793cee2799 - main - bhyve: make passthru sel public available List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60793cee27993048864f60e3c19039386e4a4ab0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=60793cee27993048864f60e3c19039386e4a4ab0 commit 60793cee27993048864f60e3c19039386e4a4ab0 Author: Corvin Köhne AuthorDate: 2023-05-10 10:19:49 +0000 Commit: Corvin Köhne CommitDate: 2023-05-11 12:30:19 +0000 bhyve: make passthru sel public available The GVT-d emulation requires access to this selector to read from the device. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40035 --- usr.sbin/bhyve/pci_passthru.c | 8 ++++++++ usr.sbin/bhyve/pci_passthru.h | 1 + 2 files changed, 9 insertions(+) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index b5c83f302f0e..054b284a2f27 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -660,6 +660,14 @@ done: return (error); } +struct pcisel * +passthru_get_sel(struct passthru_softc *sc) +{ + assert(sc != NULL); + + return (&sc->psc_sel); +} + int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler) diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index e999e84f85f2..79578a8496c4 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -24,5 +24,6 @@ int passthru_cfgread_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t *rv); int passthru_cfgwrite_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t val); +struct pcisel *passthru_get_sel(struct passthru_softc *sc); int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Thu May 11 12:40:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHBLb1WSZz4BBlx; Thu, 11 May 2023 12:40:07 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHBLZ6vrzz46s7; Thu, 11 May 2023 12:40:06 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 34BCe5Bb032664; Thu, 11 May 2023 07:40:05 -0500 (CDT) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1683808805; bh=XlHajpBgwacNqJ/jKyDTDsQZxJJRFd8yKX+SMtBbgFw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=J9ENM5mniNcuAmZST1awShb1ews96TfCie5akTxhKBltNZGA/qn9XZOR1X7TtQLx0 8/MPg0bqII2+E/oV1kDns0WMEnPPdwoHCIjs7XjLN5kbk5elkq6/ctH2t3eEswZAUE oiuYuvqhlSwGEgyL4FQVePydXqxVw6UfGMswnzD4fBebNlqqbBfnQG4gJTLU1BwPGR K2F2rqy4eGgzKhK0VWUTb3kq/YiSp/veWB9A/jhq/ixDzw6ly4sfhpuFPUPhF9/5p/ XlZ8mAnFnCSXT9KJkpKC9eDm7er+7ezAICMLtMb7Ba7d/PTZoszszG71r67AjjwQ8q 8nGbytwX9TsZQ== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id AjHXISXiXGSWfwAAs/W3XQ (envelope-from ); Thu, 11 May 2023 07:40:05 -0500 From: Mike Karels To: Alexey Dokuchaev Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Date: Thu, 11 May 2023 07:40:04 -0500 X-Mailer: MailMate (1.14r5964) Message-ID: In-Reply-To: References: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> <20230510151313.9E7A6111@slippy.cwsent.com> <4367FD0A-76AC-4E98-A133-E50D8CF841C7@karels.net> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 4QHBLZ6vrzz46s7 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 11 May 2023, at 4:11, Alexey Dokuchaev wrote: > On Wed, May 10, 2023 at 04:48:12PM -0500, Mike Karels wrote: >> ... >> I'm sure the kludge was originally done when root and /usr were separate >> file systems by default, root was small, and there was no /home by default. > > I think that's the idea, yes. FWIW, I still partition my drives this way: > 2~4GB root with big /usr and /home (the latter lives on separate partition > because it's encrypted). For non-encrypted setup, /home does not have to > be a separate partition and can be a symlink to `usr/home'. I actually > don't find this inconvenient or particularly kludgy. Surely it's nice to > be able to encrypt one's data, but it's also nice not having to worry if > you'd suddenly get ENOSPC while there's still plenty of room on adjacent > partition. For anyone using non-default partitioning (and that includes me), allocating space reasonably is up to them. It would certainly possible to use /usr/home; the easiest way is to simply specify home directories with /usr/home/user explicitly. Of course, it would be possible to replace a /home directory with a symlink manually. Mike >> However, we now default to a single large file system (with datasets, in >> the ZFS case). > > ZFS makes it all easier of course, but at its present state is not usable > on 13+, so I'm confined to UFS until ZoL guys can fix their sh^code. :( > > ./danfe From nobody Thu May 11 13:19:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHCCq6RDxz4BDbr; Thu, 11 May 2023 13:19:19 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHCCq4k79z4DZT; Thu, 11 May 2023 13:19:19 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-75773956860so283908785a.0; Thu, 11 May 2023 06:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683811158; x=1686403158; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=egcIxBjMCMJsgaBX1/+TNHzARjb404W+Ebd5ED7lHss=; b=CX/ytlhPhhM2GcNcF/A8KouToCflamV4LM3fzgEXCyu3FJB2RtWPiwIidxxHRLCad+ BLRroTSk+TXLLw+dpTxQaVqHM4wlk86VqmUtJzQTqX3Fu+e0Om42eWNf1Tyxrmq8s1pZ CH/4H9cqJN1+lv7Wj5kPcvMeaq7e8zTrwbNXN968YhQNRBN21lT8Wlm5lZf6r39hHkKT tbtVYCEXl8NMkMLTeCJn+DH9hgg7gI0Ykio59LN5ixroj5ZGp267waZQthCfePkvOvit 1XtgSl53+o2IyM5njhJqxLZxMTVAonGUaj4yWYyye4DqFVdm8qQ+L3+xIFXQPhimMVC+ Ltsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683811158; x=1686403158; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=egcIxBjMCMJsgaBX1/+TNHzARjb404W+Ebd5ED7lHss=; b=BmpKEb9gkWftIgPinI4HsoWygUNnj8re2uLIGd5IUWoXkad7M5LdxTWchYHlChCE1h +rzFufWbcB2erH7vU5YuA3qlALK2zGRa6pJXuAp/g3OQrgCdYL003DcQFVHlG4BXDH59 u1lbfDzxFeTMN3Xiu7xRjx7tT+PwTA0wHEeZ2WVKX8y19NpKl/0+4/rI3mLzDeDtsoIt f2crzUi4ODVcu2vTPl0MNpSqu67sPLNv4tuvZsLqlo2DRNclGh8BN6EIuZgeitfkZIxd FPjrOF4AF+eNkifpEbH5ZhXkooaaywf2UtAEoXvH3ZHvpopdRj2Ex5paS9D7klYCBs6t 1jtg== X-Gm-Message-State: AC+VfDyNpe2sSY2WyDkTKR/ttNohVK4oikQ7EPpzyC1tG3lmMhguh8Pz fhEBk6WYfyBVoS6MfpkP7wx7Oba+c7Q= X-Google-Smtp-Source: ACHHUZ7Eza3YjGBmCrB1Geqx40TNbEHrTvR333Dk4ySiGm+UNZj+JrGEx3uZS4ivNiSEV7MI9aKEWg== X-Received: by 2002:a05:622a:2c2:b0:3f0:ab44:5b09 with SMTP id a2-20020a05622a02c200b003f0ab445b09mr33470257qtx.0.1683811158024; Thu, 11 May 2023 06:19:18 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id a13-20020aed278d000000b003ef1586721dsm2225968qtd.26.2023.05.11.06.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 May 2023 06:19:17 -0700 (PDT) Date: Thu, 11 May 2023 09:19:15 -0400 From: Mark Johnston To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 3cb2f5f369ec - main - lualoader: add support for .lua configuration files Message-ID: References: <202305110411.34B4BFEE047146@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202305110411.34B4BFEE047146@gitrepo.freebsd.org> X-Rspamd-Queue-Id: 4QHCCq4k79z4DZT X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, May 11, 2023 at 04:11:15AM +0000, Kyle Evans wrote: > The branch main has been updated by kevans: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3cb2f5f369ecfd6d15aeff2b47e21866551a20de > > commit 3cb2f5f369ecfd6d15aeff2b47e21866551a20de > Author: Kyle Evans > AuthorDate: 2023-05-11 04:10:53 +0000 > Commit: Kyle Evans > CommitDate: 2023-05-11 04:10:53 +0000 > > lualoader: add support for .lua configuration files > > If a file is specified in loader_conf_files that ends in '.lua', lualoader > will now load and execute that file. These may be used in place of a > traditional loader.conf to use more complicated logic, where some values > may be set based on others or based on the environment that the C bits has > left us with. > > Lua scripts are run in a limited environment. In particular, it does not get > access to any modules or, in-fact, anything except environment variable. > > A config.buildenv hook has been added so that a local module can add > whatever it may need to to the environment. > > When a global var is set in the lua script, it does not immediately alter > the loader environment. Instead, the script's environment is initially > empty and processed only if the whole script executes successfully. > Effectively, a lua configuration file either takes effect or it does not, > an error will not leave it in a half-baked state. > > Reviewed by: bcr (manpages), imp > Differential Revision: https://reviews.freebsd.org/D28450 Should this be in RELNOTES? It seems like a very useful feature. From nobody Thu May 11 13:22:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHCJ70fY1z4BDyP for ; Thu, 11 May 2023 13:23:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHCJ665Lzz4FPL for ; Thu, 11 May 2023 13:23:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-953343581a4so1342911266b.3 for ; Thu, 11 May 2023 06:23:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1683811381; x=1686403381; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=NGKBBacg1IJsmR/esSasiQf1OjopprxS/1WyzmALvO0=; b=b6C+Cnrg07G86DCnSmkIhIa4i0xZ1RjgmR9tL1S0FesHYrmJUAMLKlBMaYgro1dpiU 3elpEKnP7d3QqFrJvO5Z8z4uCco/lk0b1EFm5ucwNOupP20nMw5sqWvue74OA3FPP0PD tL6nZT7LppBS8zw+cGaTuSofQyO+HhNIeig6Qu0EFzBkuHh3TpzvWBTcr+GadF88DvEc tp9DbRpIAKBwROJbqHhd03DHaTYFyH0PVt2dgnpfXgNZY23Jf8e/OmOTHzZ62CoI1Frm OCZ/y5UMyWn2Da4dGsqgryGaV5QTy7z9Yh65lAjmRiQy4EbXozrGT+fV2QRvZ5+ghJcY uylg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683811381; x=1686403381; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NGKBBacg1IJsmR/esSasiQf1OjopprxS/1WyzmALvO0=; b=UU0gPccVym/i13+K8sJ1Jm971J/0PtqcpJcnmJBq5H8xAk0V++uFeSZV3T38jvVOA0 NTI66NGxz4p1hTHdV/8k056D74EnbkJ0F8kNt8udYzVJBBcSsbQ0tovxIk11lVWPQt4N qQ+3U6bEmIlVkht/9w4ayYNes5wvFqPQI17ANFDbN0dgIUDt6Jk7YtjKBYKNGu6mO3/a B/CPPZmKFQ8gc26r9Pcv6t6Y79ZEaInQ/p+EnrqFzBmENVHMrR1clXjQ3uP0LvXMHgSx 9bOrS35J8ZuRu3/9aL3leXWLPskqHleo69hQvWK9O4lbgonpIYAMmV93AlUB56VdPyaM HorQ== X-Gm-Message-State: AC+VfDwzGSsN1Y86jCVTNdXw8f2HEoXRGwf0JaUg5wN5xM+1p9JvRExB 7eSJnWryPOsrChdg1kKrH93azINvtp3Oz4WyMvOgQ6ACwHerk5a4 X-Google-Smtp-Source: ACHHUZ4voqroGZ8xEarO6vVj7SqeNxkCpBMGizifBXo4UX+chdFiNOy7Z2v3Lp4QirKw0woRkYTC+8JfU7L2/5olkz0= X-Received: by 2002:a17:907:36c3:b0:96a:3811:f589 with SMTP id bj3-20020a17090736c300b0096a3811f589mr4630787ejc.10.1683811380870; Thu, 11 May 2023 06:23:00 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202305110411.34B4BFEE047146@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Thu, 11 May 2023 07:22:49 -0600 Message-ID: Subject: Re: git: 3cb2f5f369ec - main - lualoader: add support for .lua configuration files To: Mark Johnston Cc: Kyle Evans , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000039d63305fb6ae35c" X-Rspamd-Queue-Id: 4QHCJ665Lzz4FPL X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --00000000000039d63305fb6ae35c Content-Type: text/plain; charset="UTF-8" On Thu, May 11, 2023, 7:19 AM Mark Johnston wrote: > On Thu, May 11, 2023 at 04:11:15AM +0000, Kyle Evans wrote: > > The branch main has been updated by kevans: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3cb2f5f369ecfd6d15aeff2b47e21866551a20de > > > > commit 3cb2f5f369ecfd6d15aeff2b47e21866551a20de > > Author: Kyle Evans > > AuthorDate: 2023-05-11 04:10:53 +0000 > > Commit: Kyle Evans > > CommitDate: 2023-05-11 04:10:53 +0000 > > > > lualoader: add support for .lua configuration files > > > > If a file is specified in loader_conf_files that ends in '.lua', > lualoader > > will now load and execute that file. These may be used in place of a > > traditional loader.conf to use more complicated logic, where some > values > > may be set based on others or based on the environment that the C > bits has > > left us with. > > > > Lua scripts are run in a limited environment. In particular, it does > not get > > access to any modules or, in-fact, anything except environment > variable. > > > > A config.buildenv hook has been added so that a local module can add > > whatever it may need to to the environment. > > > > When a global var is set in the lua script, it does not immediately > alter > > the loader environment. Instead, the script's environment is > initially > > empty and processed only if the whole script executes successfully. > > Effectively, a lua configuration file either takes effect or it does > not, > > an error will not leave it in a half-baked state. > > > > Reviewed by: bcr (manpages), imp > > Differential Revision: https://reviews.freebsd.org/D28450 > > Should this be in RELNOTES? It seems like a very useful feature. > Yes.... unless Kyle objects :) Warner > --00000000000039d63305fb6ae35c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, May 11, 2023, 7:19 AM Mark Johnston <markj@freebsd.org> wrote:
On Thu, May 11, 2023 at 04:11:15AM +0000, Kyle= Evans wrote:
> The branch main has been updated by kevans:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D3cb2f5f369ecfd6d15aeff2b47e218= 66551a20de
>
> commit 3cb2f5f369ecfd6d15aeff2b47e21866551a20de
> Author:=C2=A0 =C2=A0 =C2=A0Kyle Evans <kevans@FreeBSD.org>
> AuthorDate: 2023-05-11 04:10:53 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Kyle Evans <kevans@FreeBSD.org>
> CommitDate: 2023-05-11 04:10:53 +0000
>
>=C2=A0 =C2=A0 =C2=A0lualoader: add support for .lua configuration files=
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0If a file is specified in loader_conf_files that en= ds in '.lua', lualoader
>=C2=A0 =C2=A0 =C2=A0will now load and execute that file. These may be u= sed in place of a
>=C2=A0 =C2=A0 =C2=A0traditional loader.conf to use more complicated log= ic, where some values
>=C2=A0 =C2=A0 =C2=A0may be set based on others or based on the environm= ent that the C bits has
>=C2=A0 =C2=A0 =C2=A0left us with.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Lua scripts are run in a limited environment. In pa= rticular, it does not get
>=C2=A0 =C2=A0 =C2=A0access to any modules or, in-fact, anything except = environment variable.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0A config.buildenv hook has been added so that a loc= al module can add
>=C2=A0 =C2=A0 =C2=A0whatever it may need to to the environment.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0When a global var is set in the lua script, it does= not immediately alter
>=C2=A0 =C2=A0 =C2=A0the loader environment. Instead, the script's e= nvironment is initially
>=C2=A0 =C2=A0 =C2=A0empty and processed only if the whole script execut= es successfully.
>=C2=A0 =C2=A0 =C2=A0Effectively, a lua configuration file either takes = effect or it does not,
>=C2=A0 =C2=A0 =C2=A0an error will not leave it in a half-baked state. >=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 bcr (manpages), imp
>=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 ht= tps://reviews.freebsd.org/D28450

Should this be in RELNOTES?=C2=A0 It seems like a very useful feature.
<= /blockquote>

Yes..= .. unless Kyle objects :)

Warner
--00000000000039d63305fb6ae35c-- From nobody Thu May 11 14:24:24 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHDgf1gtPz4BJ1m; Thu, 11 May 2023 14:25:02 +0000 (UTC) (envelope-from garyj@gmx.de) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mout.gmx.net", Issuer "Telekom Security ServerID OV Class 2 CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHDgd51Htz4P1T; Thu, 11 May 2023 14:25:01 +0000 (UTC) (envelope-from garyj@gmx.de) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1683815089; i=garyj@gmx.de; bh=ePAE3saah1Hs9irSsBnKgn85ziJ9i8V+FJXBJe+V8zI=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:In-Reply-To:References: Reply-To; b=IeZuOJv50oYhHX4vqSWQI3sy8Qss1VhT2vFlaC+hXZ9a0NZFcdyurddI+nETScrWQ tL8oAcpKw3YqPMK7HX7cQHMCVL+1kp6p+QL2zVkTYyCNMitXT0N4MwDj8L6jjsQfSL 1XWCPpjLnJ3XsmCWwMxcmcwf1ziV/KGY1ok5s4lwJvw3QVLu5dcMfhoJhjWXspiVdM XqP8xZOMPWwypKaUmXvlxf/p7oj9WGorGEuAaaGR2/yOJwPrmpFC9d7/fzOMA0SX8V 1oO5p8KggFHMNfqjxgHZ07SLFRwn9hrZMrQcsGRbWDjW+KkgeyjoSumvfc0OqxQbK/ t2k4OX/x3DXew== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from ernst.home ([91.59.238.143]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MCbEp-1q6hjG18vz-009cyf; Thu, 11 May 2023 16:24:49 +0200 Date: Thu, 11 May 2023 14:24:24 +0000 From: Gary Jennejohn To: Alexey Dokuchaev Cc: Mike Karels , Cy Schubert , Mitchell Horne , rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Message-ID: <20230511162424.3e8b3e55@ernst.home> In-Reply-To: References: <202305101419.34AEJf1x054239@gndrsh.dnsmgr.net> <20230510151313.9E7A6111@slippy.cwsent.com> <4367FD0A-76AC-4E98-A133-E50D8CF841C7@karels.net> Reply-To: garyj@gmx.de X-Mailer: Claws Mail 3.19.0 (GTK+ 2.24.33; amd64-portbld-freebsd14.0) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:ZvX3w5ursTGDs7l/jBIKxbcd4vA2poW8TahCBLLeJHijcd/oYF7 uJ+Xf4BbQedf4igcURJK+sKt14502ACzvoUkfZStGwW/gIIhp04LIrt6lfRyHwsFjus5Z6T l+tQCkySG0abJx7kjGaNRXv+FmXXLvDe65vtC4wn8FDff2TY2bjWQN1LsvH84ai9QjnOXxr Je4G0WxM0mStTHP57xYpQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Q3Iprm40mFk=;KJtzx2v+mQNIpeJ1B5fWs812Q4J DeK1cyyAEYLzlfq2sP5EacsQX1i1GgCwU8Nye9ZxQxQfNHaxKLuI/9F1D+qX6LDfkJgdxGNWL 0sRjOJLktn/AiDewQVP6a5zpK3BuN9IIC8pt2bV6ABR9qEPRifi9uIenNgH4B3NLA8gJIilzK petotT/xNIr7nlewyw1XXWOQrM5wIXuzI0wOLmdfH4hicCp9Alf53jAaZQ6fvKwnplDpnkaAJ r3B0eZTLzruyMn67PbpwyB3L86vctr2fTGmm93M4LNq7ebvCCm+T7+obEpTSAv1LfguWTVkCn jk70aMaOjeFkJlzmjp+7xJ2bawgkUsptDJC8Czdzf+0+sfzOTfrUIlOm0hCJd57GRJdaSW72U gIPoPxs0mW9rDM86xKUjZfwLnJegDuaszQcw4qSHjJMbHFf8u0bsljJm8TpwxZ8+mOXc6+0X1 pz7RxSB2Tch8rAQ/tUM8XhlIfF/tI8YOw/MlngWIY0KSFFQnU/ddVH47lpuZGu/vmV/TgH+zh bvyBYD2O/Gi3mtlfIqx4qb1a8kmn+wI6MDZxiG4W1z1XCg1VisDp5zkZZvT6ZRikXRF6OuzPT qGC3ckHE20odBxHhJbVs9td5taq0yViZP/YcXEIb0DbfTQOpyYxpS7aIo60jwL5q8N4jNyns6 Fu6lDvb8S1ZzwpvtIfPZWFoKA/IPkwPVIzmPjXvnkJX52eBci3mUOHcbjoJhWuXZiU60w5Vwm NjQZpOrGVwBr1+yURxqeTq3hNoNNYeiuRI689+NgpGG+DP6nXp4WBY5BqZ8SXwtB7wGm3ZnAb IQE7lkZ/wlmIauf7sS/UypOfta6d65uNGyA9Rb71SuLyT45gXniEGSVnGnMzPURN8pU0wyGGG 6MqcqXaEGCZkAqZMhEhrPzbiQRb0nMxdnjd1AE/a9XBX79V2YkwRHbUErhmyXMLOwhAtGxm4/ TyipKc3bolH5kk4S+LXNxt3JIqI= X-Rspamd-Queue-Id: 4QHDgd51Htz4P1T X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8560, ipnet:212.227.0.0/16, country:DE] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, 11 May 2023 09:11:20 +0000 Alexey Dokuchaev wrote: > On Wed, May 10, 2023 at 04:48:12PM -0500, Mike Karels wrote: > > ... > > I'm sure the kludge was originally done when root and /usr were separa= te > > file systems by default, root was small, and there was no /home by def= ault. > > I think that's the idea, yes. FWIW, I still partition my drives this wa= y: > 2~4GB root with big /usr and /home (the latter lives on separate partiti= on > because it's encrypted). For non-encrypted setup, /home does not have t= o > be a separate partition and can be a symlink to `usr/home'. I actually > don't find this inconvenient or particularly kludgy. Surely it's nice t= o > be able to encrypt one's data, but it's also nice not having to worry if > you'd suddenly get ENOSPC while there's still plenty of room on adjacent > partition. > This kind of setup is OK for a single-user system. But for an admin tryin= g to set up a system with many users it would be very problematical if /usr were to fill up. I personally have a 60G SSD for /usr and a 1TB SSD for /home. My /home has about 4 times more data on it than is on /usr. > > However, we now default to a single large file system (with datasets, = in > > the ZFS case). > > ZFS makes it all easier of course, but at its present state is not usabl= e > on 13+, so I'm confined to UFS until ZoL guys can fix their sh^code. :( > > ./danfe > =2D- Gary Jennejohn From nobody Thu May 11 14:31:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHDqY5PWCz4BJsG; Thu, 11 May 2023 14:31: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 4QHDqY4kbXz4QTJ; Thu, 11 May 2023 14:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683815513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQRHYP9N0RPWraMYRVipdDGIJe+RYYBkYVOC+Ea0ldA=; b=DdjJJZDV2pciS3e0Ar9gdQTWlp0gwOrRwWGGA0Ct4BUuPLK3aMjLimQofg8kqR2XnUaDDn SlTb8o2MgYiGEtCczbicaL4QtI1IixJ02i4L09oTwvL/3c9+NnEKB/YUvdrJZpikJq2vfO zUuYA5ASBGBOepIQF9uzDeKdKOUl42dZfahFZbxKBtzPWfzx1iKESgl+y8FDTUo11ocMXO J1a/9K6Zo/K4yC3VHwKM1s1ebcLZU+jhCqoeUQBQ4FE58shQc1x3mdCBmpQwVsyKLAFMQB 8m+srsvNmI1tK3gzEBdATsJhS1ZWbPdjr3FjtT3iH1LZ4eYo/lWFU8IqrWTm3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683815513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LQRHYP9N0RPWraMYRVipdDGIJe+RYYBkYVOC+Ea0ldA=; b=mHsKtopjE2Dm82CcwzpciG5EdcKaT+FTdcxgpY7V6O6rNLu1akWYUmFdYCLOOH51mrI/gg SKhKL0HUFv2k5xJ8qoV0WMw+gVS65lMs+EmDquK7c4PL/g1UwMYfgkjgt4nO14D0W2+NH3 vbK5FZ3/vY/3WAQBwSh0FZrkq0glKo4iEcFDKBoeRMfl+RdinoPwAUKSougnRmxKKJS5h/ 8XQRuMxqHdNWonTEmTSv3nugyVST8a5nZT9Av718DW9WFyuofzKB9Q2oG/qXTMXtnKiq+M ziZ1iGz9FGRii8MBgTDiZd23l8JMgxP8k2JwuRiUfdm7L8jOk+qHtfaes5HpDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683815513; a=rsa-sha256; cv=none; b=yr2NqX0h4vSecucE6XXtLgOe4UTz7HN/rb3LzLFVlFwnUzpimnJbJke0UZpqMO7lUP73ck LZOHCOXUdjPSHXsg7I/VZpFcaxw5QvAoML0X4nMBnmp0nyN2PBRKTbIaqPUsKHLOlLNkDw cpbMDs/6FRUOy85EVIaJFRfv23FA/KZwkmRvspHnWwxZt0DrRAmlGaUudlR7U+iwfbrKFl iAI9pm9JWOL6lnWuuyLfJvs+terYsmjH4gvHXr2/52MNRjnlcBCEdqehyAySBxmDspbG/e OLWFM9YYYDPhFhigI/9PxoPBMsUmHa5hGp9I0gESwdUjde3e5gkiojyDPwsLog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHDqY3qSQzwb4; Thu, 11 May 2023 14:31: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 34BEVrL4073190; Thu, 11 May 2023 14:31:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BEVrtp073189; Thu, 11 May 2023 14:31:53 GMT (envelope-from git) Date: Thu, 11 May 2023 14:31:53 GMT Message-Id: <202305111431.34BEVrtp073189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 74192f9b2d24 - main - ktls_test: specify OpenSSL 1.1 API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74192f9b2d240edbd72215b8ee770485502ce8ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=74192f9b2d240edbd72215b8ee770485502ce8ee commit 74192f9b2d240edbd72215b8ee770485502ce8ee Author: Pierre Pronchery AuthorDate: 2023-05-11 03:49:44 +0000 Commit: Ed Maste CommitDate: 2023-05-11 14:30:51 +0000 ktls_test: specify OpenSSL 1.1 API Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- tests/sys/kern/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index dec2384bc80b..931ec507885a 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -70,6 +70,7 @@ LIBADD.sys_getrandom+= pthread LIBADD.ptrace_test+= pthread LIBADD.unix_seqpacket_test+= pthread LIBADD.kcov+= pthread +CFLAGS.ktls_test+= -DOPENSSL_API_COMPAT=0x10100000L LIBADD.ktls_test+= crypto util LIBADD.sendfile_helper+= pthread LIBADD.fdgrowtable_test+= util pthread kvm procstat From nobody Thu May 11 14:58:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHFQL4ktwz4BLCS; Thu, 11 May 2023 14:58:34 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHFQK5pdcz4X3r; Thu, 11 May 2023 14:58:33 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Authentication-Results: mx1.freebsd.org; none Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 34BEwRt4058841; Thu, 11 May 2023 07:58:27 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 34BEwQR9058840; Thu, 11 May 2023 07:58:26 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202305111458.34BEwQR9058840@gndrsh.dnsmgr.net> Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ In-Reply-To: <20230511104001.6b925848@ernst.home> To: garyj@gmx.de Date: Thu, 11 May 2023 07:58:26 -0700 (PDT) CC: Mike Karels , Cy Schubert , Mitchell Horne , rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4QHFQK5pdcz4X3r X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On Wed, 10 May 2023 16:48:12 -0500 > Mike Karels wrote: > > > On 10 May 2023, at 10:13, Cy Schubert wrote: > > > > > In message , Mitchell > > > Horne w > > > rites: > > >> On 5/10/23 11:19, Rodney W. Grimes wrote: > > >>>> The branch main has been updated by mhorne: > > >>>> > > >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d > > >> 4c570dac939 > > >>>> > > >>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 > > >>>> Author: Mitchell Horne > > >>>> AuthorDate: 2023-05-10 12:53:56 +0000 > > >>>> Commit: Mitchell Horne > > >>>> CommitDate: 2023-05-10 13:25:17 +0000 > > >>>> > > >>>> hier(7): document /home/ and /usr/home/ > > >>>> > > >>>> Reviewed by: imp > > >>>> MFC after: 1 week > > >>>> Sponsored by: The FreeBSD Foundation > > >>>> Differential Revision: https://reviews.freebsd.org/D40002 > > >>>> --- > > >>>> share/man/man7/hier.7 | 10 ++++++++++ > > >>>> 1 file changed, 10 insertions(+) > > >>>> > > >>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 > > >>>> index ff11289436a1..b6759dd6e65b 100644 > > >>>> --- a/share/man/man7/hier.7 > > >>>> +++ b/share/man/man7/hier.7 > > >>>> @@ -90,6 +90,10 @@ file descriptor files; > > >>>> see > > >>>> .Xr \&fd 4 > > >>>> .El > > >>>> +.It Pa /home/ > > >>>> +user HOME directories. > > >>>> +This is a symlink to > > >>>> +.Pa /usr/home/ > > >>> > > >>> /usr is "contains the majority of user utilities and applications" > > >>> it should not contain home directories. > > >>>> I do not know when this move to usr came about it was traditionally > > >> /home. > > >>> I do not know why /usr/home even exists, it is not needed by > > >>> anything I am aware of. If we have a compatible link it > > >>> should be, usr/home -> ../home and /home should be the > > >>> directory. > > >>> > > >> > > >> I agree that /usr/home is strange, and is unique (?) to FreeBSD. > > >> > > >> The oldest commit in the output of `git log --grep '/usr/home'` is: > > >> > > >> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd > > >> Author: David Nugent > > >> Date: Fri Jan 3 04:42:18 1997 +0000 > > >> > > >> Implemented /home -> /usr/home symlink kludge. > > >> If home basedir would be created in the root partition, create > > >> it under /usr instead, and symlink /basedir -> /usr/basedir. > > >> > > >> Notes: > > >> svn path=/head/; revision=21242 > > >> > > >> > > >> So it has been this way for 26 years at least. I do not know what to say > > >> about whether /usr "should" contain it, but it does. > > > > > > Usually history matters. I can understand not changing it. On the flip > > > side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /home -- > > > albeit automounted from /export/home on localhost or some NFS server. In > > > the Red Hat land at $JOB, /home is its own partition (actually an LVM > > > volume). In both cases /home is not in /usr because end-users can fill > > > /usr. This can be problematic operationally because it's yet another > > > headache to deal with should someone fill the filesystem. Filling /usr is > > > more serious than filling /home. > > > > > > As a point of interest, when I installed my first FreeBSD many moons ago I > > > used the Solaris standard of /export/home, using amd (now automount) to > > > serve my /home. I'm not advocating we do this, it's overkill, but /home > > > should not live in /usr. It's a potential headache for any sysadmin. > > > > > > With ZFS the solution is easy. With UFS based systems there are a lot of > > > other factors that go into how we install the "default" from the get-go. > > First off, thank you Mike for looking at this closer. Add me to any reviews you might creat. > > The situation is a fair mess. It took me a little while to figure out that > > the kludge referenced above is in the pw(8) command, which is used as the > > backend to adduser(8). Neither /home nor /usr/home is in the base package. > > adduser defaults to /home/user, and creates the parent directory (e.g. /home) > > if it does not exist, but if there is no internal slash, pw moves the parent > > to /usr. In this case, it makes the symlink from root. zfs is different, > > in that it includes a usr/home dataset already (created by bsdinstall). > > In this case, creating a user with /home/user causes the symlink to be added > > as a side effect. > > > > I?m sure the kludge was originally done when root and /usr were separate > > file systems by default, root was small, and there was no /home by default. > > However, we now default to a single large file system (with datasets, in > > the zfs case). > > > > All of this really is a horrible kludge, and it is a house of cards. I'm > > amazed that it doesn't break more often. I'm tempted to remove the kludge > > and change the zfs setup to create a home dataset rather than usr/home. Or make it a menu option(s): if (zfs) "Create a user home dataset?" (default yes) if (ufs) "Create a user home directory?" (default yes) "User home location: /home" (This is default) As far as I am concerned the symlink can just die.... > > However, if zfs users explicitly configure a home directory under /usr/home, > > this would end up in the usr dataset. An alternative would be to remove the > > code from pw to create the parent directory entirely (which seems sensible), > > and create a /home directory for ufs installs. I don't know how well known > > it is that adduser/pw will create parent directories for home directories > > though. This cleanup would change the default location for home directories > > to /home, which makes more sense. It would require documentation, e.g. in > > the release notes. The changes would only affect new installations, not > > upgrades. > > > > Thoughts? > > > > Adding home would require a change to BSD.root.dist, since it's not > currently in there. Only usr is present. It should *not* be in the etc/mtree/BSD.*.dist files at all. And it is not on my 13.1R system. It would not need to be in BSD.root.dist either, this is a *post distribution* created directory/dataset. > > IMHO changing pw would be a reasonable approach. I am mixed on this.... it more or less does the right thing, and if a user specifies /tmp/foolishidea/home/$USER that is on them. No one said all users homes must be in the same location. > Gary Jennejohn -- Rod Grimes rgrimes@freebsd.org From nobody Thu May 11 14:59:13 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHFRM5LHKz4BLJM; Thu, 11 May 2023 14:59:27 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHFRL4Zykz4XTf; Thu, 11 May 2023 14:59:26 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-24df4ecdb87so6039106a91.0; Thu, 11 May 2023 07:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683817164; x=1686409164; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=AnBYqiy7UF583frCwe86xpUR6j1BTeBBwG8kP6eaeTI=; b=dV0hNIi5+9JIhQirHpQQh6cbeE2afCX+6vItAcp4CGpI98yFGpJTsv3t4C1Kmahltp x9QwM6aXWnPvestU6MFdTyWUaV0LZwb7/TciK4gGxRdhCZ1NluzI32tfY3EKRDumNc+6 MGgTdjDSq2Xlvv8C42xXd6X5byhrDrKMpCF1fjpUGXsHCejdRYEeUVRvbJYiwiUvdeDE dnqEjEeLS6JMZ4+QccwphLX11QrGW5GZpnKqW58ofHjxl/puXi9yqHea84rKOOGakhU9 a1CAAUpoHx+pY65T/ZFxPHnwX1QVz4UBLVfTOsOyxMFzxuKewWWAvcOiBYiEqFT470wv hsWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683817164; x=1686409164; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AnBYqiy7UF583frCwe86xpUR6j1BTeBBwG8kP6eaeTI=; b=hBSdd7+RDyC4vEB+4ptfS4TuGdb+QBQP0BCJ+3RKlFzhkra8ae2QSIDMdyhz19SPQ3 8AOu13LNRsu9frKh71DLC8HpNDfbRFaL1bB6sCYuo0X1ehaccWTBZMhm49LHNS6QanTR MyR43dYrjyHcg8nH8AkZthY+A91MFIj+TftudfdY+fSfIRsOrtF04iIrH0vvjKAIHt1G ccDzM6/HO5yA/UgqFw0gaG2JUehYdGI6qWBE1HckCfuFn52EHghiiTPGa/GIcnaXQ6qH R30DwB4DItk96jHmW+H9J66gkVk6QA/A47GVAWvZlqTPaCyp08A4twp6Ry5mdprIZnS2 jLoA== X-Gm-Message-State: AC+VfDzaEXWuCZLqKTDuiqYhLS2et73MuVOoPgWwpRzt0ivgDafbJjln 9wcUJsu55nKBZ+GPjdeIiNcf0R7uBec= X-Google-Smtp-Source: ACHHUZ5s7QJ9gNET9XX0eNbwweYvCAYwG7dbba6LxiohI7SqTLH5U3fh0U859F9VgihR8Y62kFFZDQ== X-Received: by 2002:a17:90a:f8d:b0:250:85ba:6c3d with SMTP id 13-20020a17090a0f8d00b0025085ba6c3dmr14063246pjz.6.1683817164372; Thu, 11 May 2023 07:59:24 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id s3-20020a170902988300b001ac7c725c1asm4104285plp.6.2023.05.11.07.59.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 11 May 2023 07:59:23 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable From: Enji Cooper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: 74192f9b2d24 - main - ktls_test: specify OpenSSL 1.1 API Date: Thu, 11 May 2023 07:59:13 -0700 Message-Id: References: <202305111431.34BEVrtp073189@gitrepo.freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Pierre Pronchery In-Reply-To: <202305111431.34BEVrtp073189@gitrepo.freebsd.org> To: Ed Maste X-Mailer: iPhone Mail (20D67) X-Rspamd-Queue-Id: 4QHFRL4Zykz4XTf X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On May 11, 2023, at 07:31, Ed Maste wrote: >=20 > =EF=BB=BFThe branch main has been updated by emaste: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3D74192f9b2d240edbd72215b8ee7= 70485502ce8ee >=20 > commit 74192f9b2d240edbd72215b8ee770485502ce8ee > Author: Pierre Pronchery > AuthorDate: 2023-05-11 03:49:44 +0000 > Commit: Ed Maste > CommitDate: 2023-05-11 14:30:51 +0000 >=20 > ktls_test: specify OpenSSL 1.1 API >=20 > Reviewed by: emaste > Sponsored by: The FreeBSD Foundation > --- > tests/sys/kern/Makefile | 1 + > 1 file changed, 1 insertion(+) >=20 > diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile > index dec2384bc80b..931ec507885a 100644 > --- a/tests/sys/kern/Makefile > +++ b/tests/sys/kern/Makefile > @@ -70,6 +70,7 @@ LIBADD.sys_getrandom+=3D pthread > LIBADD.ptrace_test+=3D pthread > LIBADD.unix_seqpacket_test+=3D pthread > LIBADD.kcov+=3D pthread > +CFLAGS.ktls_test+=3D -DOPENSSL_API_COMPAT=3D0x10100000L > LIBADD.ktls_test+=3D crypto util > LIBADD.sendfile_helper+=3D pthread > LIBADD.fdgrowtable_test+=3D util pthread kvm procstat Would there be any objections to me fixing these issues before we freeze for= 14.0-RELEASE? Also, are the issues being tracked somewhere in a wiki page o= r bugzilla? Thanks! -Enji= From nobody Thu May 11 15:46:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHGTj45CRz4BNWX; Thu, 11 May 2023 15:46: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 4QHGTj3rrhz4bgq; Thu, 11 May 2023 15:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683819993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJ3xW00xo/JHDVmKenU3oJqi79oPrIx/PE8mOz+3gqU=; b=DFqd2AHF5aNMe0xhaMX0S/SmNV7WIdJtMjjrEbz6wRyyHUP5BcqbiOcJGY7eKCgTFKYRuw d7ycoO2POOOK2yiH31S9JxRcyohv9RjknW3YzuJNmgsn/yglsOXyKsZdlOvAmralajsKfB tXo6xcll0xm0TQVLSkqTMvOhZ6oYY8j+9KSCWNMmcLIGqB3m6aKvExUUoSjCWj5X99YR8e M+0/O/fUPCpA+mN39Gtha/xEhxO/920esFt1lGrAytIGsCiwH7GwcCuZeMMKctk2rqMzSf RNuo4DgpG7FF1TnVQZFNxq42soPNVBnKWAbvSoEiEyZkJHJlbJPqMjx15BTCuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683819993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JJ3xW00xo/JHDVmKenU3oJqi79oPrIx/PE8mOz+3gqU=; b=fTaH8lLImn6cFmYsXJWakr72qOY9QPX/kjXgmY7H1pCdaA5Xd8m77ItKQH4refhq7c0xOd k0SBNYb6yxhYHB3Sf1xFzMP9oa2kWWxdMczBWj0GatjL/heXsZkAAQcQ4lz+o0GGKfwMk7 kGBkHs+oQItQB3KEO33FZYjEW/5CQNCjX+EL+lzRQQ6g5WRYBFFV1IRg52hetX5b73pG7Y xXutNdppWh+DMWVo2dpdmmLsx8Ij9Aqgy/TEK+K9AZ1Rw0KN0UFWjeShxMUAbGMffwWPMS b3TOeEV38yZl9s/spicUZSUBL9VEusn7CBZMQmHnb1wGOLF40jRe/4GprTs0Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683819993; a=rsa-sha256; cv=none; b=UxMRSqp58/Sj+KlQMUXIcXTJG5JMKdvHcqE8szK8xoDadCvZ9Y6f1ePRDdmA4MfA3C2F6r cQ0b3vSiAlL7aZ7AzILxNWiCGJYlMqGQseTGAQODcIu7AOSYquRqyNvKv4Cp2KtoDIyCAC 3NRvgySVZexCNxfGiDwqUy86zBR8MVhyWZSnw5T94apahmUXsScgEWq5V5MYlOehDZC/Se jrBkY59G0H/2SvOhHQm1Fb5XJJQV0GzqbMZAldhyGCx5Lzf+Gmq3nULZ/rlEOUaxZB5SIX ftedmLH480zDWo80RnWNq5DmSCaEVV99gmuGjWalKH/QoEwLjTHiZx6XNylVFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHGTj2vcQzyMj; Thu, 11 May 2023 15:46: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 34BFkX88091523; Thu, 11 May 2023 15:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BFkXw6091521; Thu, 11 May 2023 15:46:33 GMT (envelope-from git) Date: Thu, 11 May 2023 15:46:33 GMT Message-Id: <202305111546.34BFkXw6091521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Salychev Subject: git: 718bdb6a71ba - main - dpaa2: Simplify addresses translation with PHYS_TO_DMAP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dsl X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 718bdb6a71ba4ed1f557f89af1482a10f7b1cb74 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=718bdb6a71ba4ed1f557f89af1482a10f7b1cb74 commit 718bdb6a71ba4ed1f557f89af1482a10f7b1cb74 Author: Dmitry Salychev AuthorDate: 2023-05-02 12:17:04 +0000 Commit: Dmitry Salychev CommitDate: 2023-05-11 15:38:35 +0000 dpaa2: Simplify addresses translation with PHYS_TO_DMAP Approved by: bz (mentor) Reviewed by: bz (mentor), mhorne Differential Revision: https://reviews.freebsd.org/D39946 MFC after: 3 weeks --- sys/dev/dpaa2/dpaa2_ni.c | 210 ++++++++++++++------------------------------ sys/dev/dpaa2/dpaa2_ni.h | 2 +- sys/dev/dpaa2/dpaa2_swp.h | 57 ++++++++---- sys/dev/dpaa2/dpaa2_types.h | 2 + 4 files changed, 113 insertions(+), 158 deletions(-) diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c index d4e4de216736..1fd109a6edf3 100644 --- a/sys/dev/dpaa2/dpaa2_ni.c +++ b/sys/dev/dpaa2/dpaa2_ni.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright © 2021-2022 Dmitry Salychev + * Copyright © 2021-2023 Dmitry Salychev * Copyright © 2022 Mathew McBride * * Redistribution and use in source and binary forms, with or without @@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -146,14 +147,12 @@ __FBSDID("$FreeBSD$"); #define BUF_RX_HWA_SIZE 64 /* HW annotation size */ #define BUF_TX_HWA_SIZE 128 /* HW annotation size */ #define BUF_SIZE (MJUM9BYTES) -#define BUF_MAXADDR_49BIT 0x1FFFFFFFFFFFFul -#define BUF_MAXADDR (BUS_SPACE_MAXADDR) #define DPAA2_TX_BUFRING_SZ (4096u) #define DPAA2_TX_SEGLIMIT (16u) /* arbitrary number */ #define DPAA2_TX_SEG_SZ (4096u) #define DPAA2_TX_SEGS_MAXSZ (DPAA2_TX_SEGLIMIT * DPAA2_TX_SEG_SZ) -#define DPAA2_TX_SGT_SZ (512u) /* bytes */ +#define DPAA2_TX_SGT_SZ (PAGE_SIZE) /* bytes */ /* Size of a buffer to keep a QoS table key configuration. */ #define ETH_QOS_KCFG_BUF_SIZE 256 @@ -428,8 +427,8 @@ static int dpaa2_ni_set_dist_key(device_t, enum dpaa2_ni_dist_mode, uint64_t); /* Buffers and buffer pools */ static int dpaa2_ni_seed_buf_pool(struct dpaa2_ni_softc *, uint32_t); -static int dpaa2_ni_seed_rxbuf(struct dpaa2_ni_softc *, struct dpaa2_buf *, int); -static int dpaa2_ni_seed_txbuf(struct dpaa2_ni_softc *, struct dpaa2_buf *, int); +static int dpaa2_ni_seed_rxbuf(struct dpaa2_ni_softc *, struct dpaa2_buf *); +static int dpaa2_ni_seed_txbuf(struct dpaa2_ni_softc *, struct dpaa2_buf *); static int dpaa2_ni_seed_chan_storage(struct dpaa2_ni_softc *, struct dpaa2_ni_channel *); @@ -438,10 +437,6 @@ static int dpaa2_ni_build_fd(struct dpaa2_ni_softc *, struct dpaa2_ni_tx_ring *, struct dpaa2_buf *, bus_dma_segment_t *, int, struct dpaa2_fd *); static int dpaa2_ni_fd_err(struct dpaa2_fd *); static uint32_t dpaa2_ni_fd_data_len(struct dpaa2_fd *); -static int dpaa2_ni_fd_chan_idx(struct dpaa2_fd *); -static int dpaa2_ni_fd_buf_idx(struct dpaa2_fd *); -static int dpaa2_ni_fd_tx_idx(struct dpaa2_fd *); -static int dpaa2_ni_fd_txbuf_idx(struct dpaa2_fd *); static int dpaa2_ni_fd_format(struct dpaa2_fd *); static bool dpaa2_ni_fd_short_len(struct dpaa2_fd *); static int dpaa2_ni_fd_offset(struct dpaa2_fd *); @@ -1588,9 +1583,9 @@ dpaa2_ni_setup_tx_flow(device_t dev, struct dpaa2_ni_fq *fq) buf->tx.paddr = buf->tx.sgt_paddr = 0; buf->tx.vaddr = buf->tx.sgt_vaddr = NULL; buf->tx.m = NULL; - buf->tx.idx = 0; + buf->tx.idx = j; - error = dpaa2_ni_seed_txbuf(sc, buf, j); + error = dpaa2_ni_seed_txbuf(sc, buf); /* Add index of the Tx buffer to the ring. */ buf_ring_enqueue(tx->idx_br, (void *) j); @@ -2028,17 +2023,12 @@ dpaa2_ni_setup_dma(struct dpaa2_ni_softc *sc) KASSERT((sc->buf_align == BUF_ALIGN) || (sc->buf_align == BUF_ALIGN_V1), ("unexpected buffer alignment: %d\n", sc->buf_align)); - /* - * DMA tag to allocate buffers for buffer pool. - * - * NOTE: QBMan supports DMA addresses up to 49-bits maximum. - * Bits 63-49 are not used by QBMan. - */ + /* DMA tag to allocate buffers for Rx buffer pool. */ error = bus_dma_tag_create( bus_get_dma_tag(dev), sc->buf_align, 0, /* alignment, boundary */ - BUF_MAXADDR_49BIT, /* low restricted addr */ - BUF_MAXADDR, /* high restricted addr */ + BUS_SPACE_MAXADDR, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* high restricted addr */ NULL, NULL, /* filter, filterarg */ BUF_SIZE, 1, /* maxsize, nsegments */ BUF_SIZE, 0, /* maxsegsize, flags */ @@ -2054,8 +2044,8 @@ dpaa2_ni_setup_dma(struct dpaa2_ni_softc *sc) error = bus_dma_tag_create( bus_get_dma_tag(dev), sc->buf_align, 0, /* alignment, boundary */ - BUF_MAXADDR_49BIT, /* low restricted addr */ - BUF_MAXADDR, /* high restricted addr */ + BUS_SPACE_MAXADDR, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* high restricted addr */ NULL, NULL, /* filter, filterarg */ DPAA2_TX_SEGS_MAXSZ, /* maxsize */ DPAA2_TX_SEGLIMIT, /* nsegments */ @@ -2072,7 +2062,7 @@ dpaa2_ni_setup_dma(struct dpaa2_ni_softc *sc) error = bus_dma_tag_create( bus_get_dma_tag(dev), ETH_STORE_ALIGN, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* low restricted addr */ BUS_SPACE_MAXADDR, /* high restricted addr */ NULL, NULL, /* filter, filterarg */ ETH_STORE_SIZE, 1, /* maxsize, nsegments */ @@ -2089,7 +2079,7 @@ dpaa2_ni_setup_dma(struct dpaa2_ni_softc *sc) error = bus_dma_tag_create( bus_get_dma_tag(dev), PAGE_SIZE, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* low restricted addr */ BUS_SPACE_MAXADDR, /* high restricted addr */ NULL, NULL, /* filter, filterarg */ DPAA2_CLASSIFIER_DMA_SIZE, 1, /* maxsize, nsegments */ @@ -2105,7 +2095,7 @@ dpaa2_ni_setup_dma(struct dpaa2_ni_softc *sc) error = bus_dma_tag_create( bus_get_dma_tag(dev), PAGE_SIZE, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* low restricted addr */ BUS_SPACE_MAXADDR, /* high restricted addr */ NULL, NULL, /* filter, filterarg */ ETH_QOS_KCFG_BUF_SIZE, 1, /* maxsize, nsegments */ @@ -2121,7 +2111,7 @@ dpaa2_ni_setup_dma(struct dpaa2_ni_softc *sc) error = bus_dma_tag_create( bus_get_dma_tag(dev), PAGE_SIZE, 0, /* alignment, boundary */ - BUS_SPACE_MAXADDR_32BIT, /* low restricted addr */ + BUS_SPACE_MAXADDR, /* low restricted addr */ BUS_SPACE_MAXADDR, /* high restricted addr */ NULL, NULL, /* filter, filterarg */ DPAA2_TX_SGT_SZ, 1, /* maxsize, nsegments */ @@ -2259,7 +2249,7 @@ dpaa2_ni_set_buf_layout(device_t dev) * Frame Descriptor Rx buffer layout * * ADDR -> |---------------------| - * | SW FRAME ANNOTATION | 0 bytes + * | SW FRAME ANNOTATION | BUF_SWA_SIZE bytes * |---------------------| * | HW FRAME ANNOTATION | BUF_RX_HWA_SIZE bytes * |---------------------| @@ -2277,9 +2267,9 @@ dpaa2_ni_set_buf_layout(device_t dev) * NOTE: It's for a single buffer frame only. */ buf_layout.queue_type = DPAA2_NI_QUEUE_RX; - buf_layout.pd_size = 0; + buf_layout.pd_size = BUF_SWA_SIZE; buf_layout.fd_align = sc->buf_align; - buf_layout.head_size = sc->tx_data_off - BUF_RX_HWA_SIZE; + buf_layout.head_size = sc->tx_data_off - BUF_RX_HWA_SIZE - BUF_SWA_SIZE; buf_layout.tail_size = 0; buf_layout.pass_frame_status = true; buf_layout.pass_parser_result = true; @@ -3225,7 +3215,6 @@ dpaa2_ni_tx_locked(struct dpaa2_ni_softc *sc, struct dpaa2_ni_tx_ring *tx, idx = (uint64_t) pidx; buf = &tx->buf[idx]; buf->tx.m = m; - buf->tx.idx = idx; buf->tx.sgt_paddr = 0; } @@ -3272,10 +3261,8 @@ dpaa2_ni_tx_locked(struct dpaa2_ni_softc *sc, struct dpaa2_ni_tx_ring *tx, } } - bus_dmamap_sync(buf->tx.dmat, buf->tx.dmap, - BUS_DMASYNC_PREWRITE); - bus_dmamap_sync(buf->tx.sgt_dmat, buf->tx.sgt_dmap, - BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(buf->tx.dmat, buf->tx.dmap, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(buf->tx.sgt_dmat, buf->tx.sgt_dmap, BUS_DMASYNC_PREWRITE); if (rc != 1) { fq->chan->tx_dropped++; @@ -3352,24 +3339,21 @@ dpaa2_ni_rx(struct dpaa2_ni_channel *chan, struct dpaa2_ni_fq *fq, struct dpaa2_ni_softc *sc = device_get_softc(chan->ni_dev); struct dpaa2_bp_softc *bpsc; struct dpaa2_buf *buf; + struct dpaa2_fa *fa; if_t ifp = sc->ifp; struct mbuf *m; device_t bp_dev; bus_addr_t paddr = (bus_addr_t) fd->addr; bus_addr_t released[DPAA2_SWP_BUFS_PER_CMD]; void *buf_data; - int buf_idx, buf_len; - int error, released_n = 0; + int buf_len, error, released_n = 0; - /* - * Get buffer index from the ADDR_TOK (not used by QBMan) bits of the - * physical address. - */ - buf_idx = dpaa2_ni_fd_buf_idx(fd); - buf = &sc->buf[buf_idx]; + fa = (struct dpaa2_fa *) PHYS_TO_DMAP(paddr); + buf = fa->buf; + KASSERT(fa->magic == DPAA2_MAGIC, ("%s: wrong magic", __func__)); KASSERT(buf->type == DPAA2_BUF_RX, ("%s: not Rx buffer", __func__)); - if (paddr != buf->rx.paddr) { + if (__predict_false(paddr != buf->rx.paddr)) { panic("%s: unexpected physical address: fd(%#jx) != buf(%#jx)", __func__, paddr, buf->rx.paddr); } @@ -3398,8 +3382,7 @@ dpaa2_ni_rx(struct dpaa2_ni_channel *chan, struct dpaa2_ni_fq *fq, m = buf->rx.m; buf->rx.m = NULL; - bus_dmamap_sync(buf->rx.dmat, buf->rx.dmap, - BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(buf->rx.dmat, buf->rx.dmap, BUS_DMASYNC_POSTREAD); bus_dmamap_unload(buf->rx.dmat, buf->rx.dmap); buf_len = dpaa2_ni_fd_data_len(fd); @@ -3420,7 +3403,7 @@ dpaa2_ni_rx(struct dpaa2_ni_channel *chan, struct dpaa2_ni_fq *fq, if_input(ifp, m); /* Keep the buffer to be recycled. */ - chan->recycled[chan->recycled_n++] = paddr; + chan->recycled[chan->recycled_n++] = buf; KASSERT(chan->recycled_n <= DPAA2_SWP_BUFS_PER_CMD, ("%s: too many buffers to recycle", __func__)); @@ -3430,15 +3413,10 @@ dpaa2_ni_rx(struct dpaa2_ni_channel *chan, struct dpaa2_ni_fq *fq, taskqueue_enqueue(sc->bp_taskq, &sc->bp_task); for (int i = 0; i < chan->recycled_n; i++) { - paddr = chan->recycled[i]; - - /* Parse ADDR_TOK of the recycled buffer. */ - buf_idx = (paddr >> DPAA2_NI_BUF_IDX_SHIFT) - & DPAA2_NI_BUF_IDX_MASK; - buf = &sc->buf[buf_idx]; + buf = chan->recycled[i]; /* Seed recycled buffer. */ - error = dpaa2_ni_seed_rxbuf(sc, buf, buf_idx); + error = dpaa2_ni_seed_rxbuf(sc, buf); KASSERT(error == 0, ("%s: failed to seed recycled " "buffer: error=%d", __func__, error)); if (__predict_false(error != 0)) { @@ -3482,18 +3460,16 @@ dpaa2_ni_rx_err(struct dpaa2_ni_channel *chan, struct dpaa2_ni_fq *fq, struct dpaa2_ni_softc *sc = device_get_softc(chan->ni_dev); struct dpaa2_bp_softc *bpsc; struct dpaa2_buf *buf; + struct dpaa2_fa *fa; bus_addr_t paddr = (bus_addr_t) fd->addr; - int buf_idx, error; - - /* - * Get buffer index from the ADDR_TOK (not used by QBMan) bits of the - * physical address. - */ - buf_idx = dpaa2_ni_fd_buf_idx(fd); - buf = &sc->buf[buf_idx]; + int error; + + fa = (struct dpaa2_fa *) PHYS_TO_DMAP(paddr); + buf = fa->buf; + KASSERT(fa->magic == DPAA2_MAGIC, ("%s: wrong magic", __func__)); KASSERT(buf->type == DPAA2_BUF_RX, ("%s: not Rx buffer", __func__)); - if (paddr != buf->rx.paddr) { + if (__predict_false(paddr != buf->rx.paddr)) { panic("%s: unexpected physical address: fd(%#jx) != buf(%#jx)", __func__, paddr, buf->rx.paddr); } @@ -3520,45 +3496,30 @@ static int dpaa2_ni_tx_conf(struct dpaa2_ni_channel *chan, struct dpaa2_ni_fq *fq, struct dpaa2_fd *fd) { - struct dpaa2_ni_softc *sc = device_get_softc(chan->ni_dev); - struct dpaa2_ni_channel *buf_chan; struct dpaa2_ni_tx_ring *tx; struct dpaa2_buf *buf; - bus_addr_t paddr = (bus_addr_t) (fd->addr & BUF_MAXADDR_49BIT); - uint64_t buf_idx; - int chan_idx, tx_idx; - - /* - * Get channel, Tx ring and buffer indexes from the ADDR_TOK bits - * (not used by QBMan) of the physical address. - */ - chan_idx = dpaa2_ni_fd_chan_idx(fd); - tx_idx = dpaa2_ni_fd_tx_idx(fd); - buf_idx = (uint64_t) dpaa2_ni_fd_txbuf_idx(fd); - - KASSERT(tx_idx < DPAA2_NI_MAX_TCS, ("%s: invalid Tx ring index", - __func__)); - KASSERT(buf_idx < DPAA2_NI_BUFS_PER_TX, ("%s: invalid Tx buffer index", - __func__)); + struct dpaa2_fa *fa; + bus_addr_t paddr = (bus_addr_t) fd->addr; - buf_chan = sc->channels[chan_idx]; - tx = &buf_chan->txc_queue.tx_rings[tx_idx]; - buf = &tx->buf[buf_idx]; + fa = (struct dpaa2_fa *) PHYS_TO_DMAP(paddr); + buf = fa->buf; + tx = fa->tx; + KASSERT(fa->magic == DPAA2_MAGIC, ("%s: wrong magic", __func__)); KASSERT(buf->type == DPAA2_BUF_TX, ("%s: not Tx buffer", __func__)); if (paddr != buf->tx.paddr) { panic("%s: unexpected physical address: fd(%#jx) != buf(%#jx)", __func__, paddr, buf->tx.paddr); } - + bus_dmamap_sync(buf->tx.dmat, buf->tx.dmap, BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(buf->tx.sgt_dmat, buf->tx.sgt_dmap, BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(buf->tx.dmat, buf->tx.dmap); - if (buf->tx.sgt_paddr != 0) - bus_dmamap_unload(buf->tx.sgt_dmat, buf->tx.sgt_dmap); + bus_dmamap_unload(buf->tx.sgt_dmat, buf->tx.sgt_dmap); m_freem(buf->tx.m); /* Return Tx buffer index back to the ring. */ - buf_ring_enqueue(tx->idx_br, (void *) buf_idx); + buf_ring_enqueue(tx->idx_br, (void *) buf->tx.idx); return (0); } @@ -3620,9 +3581,10 @@ dpaa2_ni_seed_buf_pool(struct dpaa2_ni_softc *sc, uint32_t seedn) buf->rx.dmap = NULL; buf->rx.paddr = 0; buf->rx.vaddr = NULL; - error = dpaa2_ni_seed_rxbuf(sc, buf, i); - if (error) + error = dpaa2_ni_seed_rxbuf(sc, buf); + if (error != 0) { break; + } paddr[bufn] = buf->rx.paddr; bufn++; } @@ -3646,9 +3608,10 @@ dpaa2_ni_seed_buf_pool(struct dpaa2_ni_softc *sc, uint32_t seedn) * @brief Prepare Rx buffer to be released to the buffer pool. */ static int -dpaa2_ni_seed_rxbuf(struct dpaa2_ni_softc *sc, struct dpaa2_buf *buf, int idx) +dpaa2_ni_seed_rxbuf(struct dpaa2_ni_softc *sc, struct dpaa2_buf *buf) { struct mbuf *m; + struct dpaa2_fa *fa; bus_dmamap_t dmap; bus_dma_segment_t segs; int error, nsegs; @@ -3666,8 +3629,7 @@ dpaa2_ni_seed_rxbuf(struct dpaa2_ni_softc *sc, struct dpaa2_buf *buf, int idx) error = bus_dmamap_create(buf->rx.dmat, 0, &dmap); if (error) { device_printf(sc->dev, "%s: failed to create DMA map " - "for buffer: buf_idx=%d, error=%d\n", __func__, - idx, error); + "for buffer: error=%d\n", __func__, error); return (error); } buf->rx.dmap = dmap; @@ -3701,18 +3663,12 @@ dpaa2_ni_seed_rxbuf(struct dpaa2_ni_softc *sc, struct dpaa2_buf *buf, int idx) buf->rx.paddr = segs.ds_addr; buf->rx.vaddr = m->m_data; - /* - * Write buffer index to the ADDR_TOK (bits 63-49) which is not used by - * QBMan and is supposed to assist in physical to virtual address - * translation. - * - * NOTE: "lowaddr" and "highaddr" of the window which cannot be accessed - * by QBMan must be configured in the DMA tag accordingly. - */ - buf->rx.paddr = - ((uint64_t)(idx & DPAA2_NI_BUF_IDX_MASK) << - DPAA2_NI_BUF_IDX_SHIFT) | - (buf->rx.paddr & DPAA2_NI_BUF_ADDR_MASK); + /* Populate frame annotation for future use. */ + fa = (struct dpaa2_fa *) m->m_data; + fa->magic = DPAA2_MAGIC; + fa->buf = buf; + + bus_dmamap_sync(buf->rx.dmat, buf->rx.dmap, BUS_DMASYNC_PREREAD); return (0); } @@ -3721,7 +3677,7 @@ dpaa2_ni_seed_rxbuf(struct dpaa2_ni_softc *sc, struct dpaa2_buf *buf, int idx) * @brief Prepare Tx buffer to be added to the Tx ring. */ static int -dpaa2_ni_seed_txbuf(struct dpaa2_ni_softc *sc, struct dpaa2_buf *buf, int idx) +dpaa2_ni_seed_txbuf(struct dpaa2_ni_softc *sc, struct dpaa2_buf *buf) { bus_dmamap_t dmap; int error; @@ -3819,8 +3775,8 @@ dpaa2_ni_build_fd(struct dpaa2_ni_softc *sc, struct dpaa2_ni_tx_ring *tx, struct dpaa2_buf *buf, bus_dma_segment_t *txsegs, int txnsegs, struct dpaa2_fd *fd) { - struct dpaa2_ni_channel *chan = tx->fq->chan; struct dpaa2_sg_entry *sgt; + struct dpaa2_fa *fa; int i, error; KASSERT(txnsegs <= DPAA2_TX_SEGLIMIT, ("%s: too many segments, " @@ -3855,6 +3811,7 @@ dpaa2_ni_build_fd(struct dpaa2_ni_softc *sc, struct dpaa2_ni_tx_ring *tx, "error=%d\n", __func__, error); return (error); } + buf->tx.paddr = buf->tx.sgt_paddr; buf->tx.vaddr = buf->tx.sgt_vaddr; sc->tx_sg_frames++; /* for sysctl(9) */ @@ -3862,15 +3819,12 @@ dpaa2_ni_build_fd(struct dpaa2_ni_softc *sc, struct dpaa2_ni_tx_ring *tx, return (EINVAL); } - fd->addr = - ((uint64_t)(chan->flowid & DPAA2_NI_BUF_CHAN_MASK) << - DPAA2_NI_BUF_CHAN_SHIFT) | - ((uint64_t)(tx->txid & DPAA2_NI_TX_IDX_MASK) << - DPAA2_NI_TX_IDX_SHIFT) | - ((uint64_t)(buf->tx.idx & DPAA2_NI_TXBUF_IDX_MASK) << - DPAA2_NI_TXBUF_IDX_SHIFT) | - (buf->tx.paddr & DPAA2_NI_BUF_ADDR_MASK); + fa = (struct dpaa2_fa *) buf->tx.sgt_vaddr; + fa->magic = DPAA2_MAGIC; + fa->buf = buf; + fa->tx = tx; + fd->addr = buf->tx.paddr; fd->data_length = (uint32_t) buf->tx.m->m_pkthdr.len; fd->bpid_ivp_bmt = 0; fd->offset_fmt_sl = 0x2000u | sc->tx_data_off; @@ -3894,34 +3848,6 @@ dpaa2_ni_fd_data_len(struct dpaa2_fd *fd) return (fd->data_length); } -static int -dpaa2_ni_fd_chan_idx(struct dpaa2_fd *fd) -{ - return ((((bus_addr_t) fd->addr) >> DPAA2_NI_BUF_CHAN_SHIFT) & - DPAA2_NI_BUF_CHAN_MASK); -} - -static int -dpaa2_ni_fd_buf_idx(struct dpaa2_fd *fd) -{ - return ((((bus_addr_t) fd->addr) >> DPAA2_NI_BUF_IDX_SHIFT) & - DPAA2_NI_BUF_IDX_MASK); -} - -static int -dpaa2_ni_fd_tx_idx(struct dpaa2_fd *fd) -{ - return ((((bus_addr_t) fd->addr) >> DPAA2_NI_TX_IDX_SHIFT) & - DPAA2_NI_TX_IDX_MASK); -} - -static int -dpaa2_ni_fd_txbuf_idx(struct dpaa2_fd *fd) -{ - return ((((bus_addr_t) fd->addr) >> DPAA2_NI_TXBUF_IDX_SHIFT) & - DPAA2_NI_TXBUF_IDX_MASK); -} - static int dpaa2_ni_fd_format(struct dpaa2_fd *fd) { diff --git a/sys/dev/dpaa2/dpaa2_ni.h b/sys/dev/dpaa2/dpaa2_ni.h index 00215fdcefe5..523775a9365c 100644 --- a/sys/dev/dpaa2/dpaa2_ni.h +++ b/sys/dev/dpaa2/dpaa2_ni.h @@ -284,7 +284,7 @@ struct dpaa2_ni_channel { /* Recycled buffers to release back to the pool. */ uint32_t recycled_n; - bus_addr_t recycled[DPAA2_SWP_BUFS_PER_CMD]; + struct dpaa2_buf *recycled[DPAA2_SWP_BUFS_PER_CMD]; /* Frame queues */ uint32_t rxq_n; diff --git a/sys/dev/dpaa2/dpaa2_swp.h b/sys/dev/dpaa2/dpaa2_swp.h index 53a8b32ef185..986ade601149 100644 --- a/sys/dev/dpaa2/dpaa2_swp.h +++ b/sys/dev/dpaa2/dpaa2_swp.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright © 2021-2022 Dmitry Salychev + * Copyright © 2021-2023 Dmitry Salychev * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -28,6 +28,8 @@ #ifndef _DPAA2_SWP_H #define _DPAA2_SWP_H +#include +#include #include #include "dpaa2_types.h" @@ -195,6 +197,17 @@ #define DPAA2_SWP_STAT_EINVAL 0xFE /* Invalid argument */ #define DPAA2_SWP_STAT_ERR 0xFF /* General error */ +#define DPAA2_EQ_DESC_SIZE 32u /* Enqueue Command Descriptor */ +#define DPAA2_FDR_DESC_SIZE 32u /* Descriptor of the FDR */ +#define DPAA2_FD_SIZE 32u /* Frame Descriptor */ +#define DPAA2_FDR_SIZE 64u /* Frame Dequeue Response */ +#define DPAA2_SCN_SIZE 16u /* State Change Notification */ +#define DPAA2_FA_SIZE 64u /* SW Frame Annotation */ +#define DPAA2_SGE_SIZE 16u /* S/G table entry */ +#define DPAA2_DQ_SIZE 64u /* Dequeue Response */ +#define DPAA2_SWP_CMD_SIZE 64u /* SWP Command */ +#define DPAA2_SWP_RSP_SIZE 64u /* SWP Command Response */ + /* Opaque token for static dequeues. */ #define DPAA2_SWP_SDQCR_TOKEN 0xBBu /* Opaque token for static dequeues. */ @@ -221,8 +234,6 @@ enum dpaa2_fd_format { /** * @brief Enqueue command descriptor. - * - * NOTE: 32 bytes. */ struct dpaa2_eq_desc { uint8_t verb; @@ -239,11 +250,10 @@ struct dpaa2_eq_desc { uint8_t rspid; uint64_t rsp_addr; } __packed; +CTASSERT(sizeof(struct dpaa2_eq_desc) == DPAA2_EQ_DESC_SIZE); /** * @brief Frame Dequeue Response (FDR) descriptor. - * - * NOTE: 32 bytes. */ struct dpaa2_fdr_desc { uint8_t verb; @@ -258,11 +268,10 @@ struct dpaa2_fdr_desc { uint32_t fq_frm_cnt; uint64_t fqd_ctx; } __packed; +CTASSERT(sizeof(struct dpaa2_fdr_desc) == DPAA2_FDR_DESC_SIZE); /** * @brief State Change Notification Message (SCNM). - * - * NOTE: 16 bytes. */ struct dpaa2_scn { uint8_t verb; @@ -272,6 +281,7 @@ struct dpaa2_scn { uint32_t rid_tok; uint64_t ctx; } __packed; +CTASSERT(sizeof(struct dpaa2_scn) == DPAA2_SCN_SIZE); /** * @brief DPAA2 frame descriptor. @@ -290,8 +300,6 @@ struct dpaa2_scn { * structure. QMan may use the FLC field for 3 purposes: * stashing control, order definition point identification, * and enqueue replication control. - * - * NOTE: 32 bytes. */ struct dpaa2_fd { uint64_t addr; @@ -302,11 +310,29 @@ struct dpaa2_fd { uint32_t ctrl; uint64_t flow_ctx; } __packed; +CTASSERT(sizeof(struct dpaa2_fd) == DPAA2_FD_SIZE); + +/** + * @brief DPAA2 frame annotation. + */ +struct dpaa2_fa { + uint32_t magic; + struct dpaa2_buf *buf; + union { + struct { /* Tx frame annotation */ + struct dpaa2_ni_tx_ring *tx; + }; +#ifdef __notyet__ + struct { /* Rx frame annotation */ + uint64_t _notused; + }; +#endif + }; +} __packed; +CTASSERT(sizeof(struct dpaa2_fa) <= DPAA2_FA_SIZE); /** * @brief DPAA2 scatter/gather entry. - * - * NOTE: 16 bytes. */ struct dpaa2_sg_entry { uint64_t addr; @@ -314,21 +340,19 @@ struct dpaa2_sg_entry { uint16_t bpid; uint16_t offset_fmt; } __packed; +CTASSERT(sizeof(struct dpaa2_sg_entry) == DPAA2_SGE_SIZE); /** * @brief Frame Dequeue Response (FDR). - * - * NOTE: 64 bytes. */ struct dpaa2_fdr { struct dpaa2_fdr_desc desc; struct dpaa2_fd fd; } __packed; +CTASSERT(sizeof(struct dpaa2_fdr) == DPAA2_FDR_SIZE); /** * @brief Dequeue Response Message. - * - * NOTE: 64 bytes. */ struct dpaa2_dq { union { @@ -340,6 +364,7 @@ struct dpaa2_dq { struct dpaa2_scn scn; /* State Change Notification */ }; } __packed; +CTASSERT(sizeof(struct dpaa2_dq) == DPAA2_DQ_SIZE); /** * @brief Descriptor of the QBMan software portal. @@ -382,6 +407,7 @@ struct dpaa2_swp_desc { struct dpaa2_swp_cmd { uint64_t params[DPAA2_SWP_CMD_PARAMS_N]; }; +CTASSERT(sizeof(struct dpaa2_swp_cmd) == DPAA2_SWP_CMD_SIZE); /** * @brief Command response holds data received from the software portal. @@ -389,6 +415,7 @@ struct dpaa2_swp_cmd { struct dpaa2_swp_rsp { uint64_t params[DPAA2_SWP_RSP_PARAMS_N]; }; +CTASSERT(sizeof(struct dpaa2_swp_rsp) == DPAA2_SWP_RSP_SIZE); /** * @brief QBMan software portal. diff --git a/sys/dev/dpaa2/dpaa2_types.h b/sys/dev/dpaa2/dpaa2_types.h index b54afa358a28..5e7ccad15e1c 100644 --- a/sys/dev/dpaa2/dpaa2_types.h +++ b/sys/dev/dpaa2/dpaa2_types.h @@ -30,6 +30,8 @@ #include +#define DPAA2_MAGIC ((uint32_t) 0xD4AA2C0Du) + /** * @brief Types of the DPAA2 devices. */ From nobody Thu May 11 16:17:28 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHH9b3VGjz49R36; Thu, 11 May 2023 16:17:39 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHH9b31fpz4lP8; Thu, 11 May 2023 16:17:39 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683821859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jwEQRUQin50PRgCycGRbNjNyyCkdMwn1vlAmypt5b5M=; b=cpQPzfHDhW497bXQ03OyAScCED09kZJpGtr9O1qiW6musrT/e7GdBSRB58z8RmVs7tUTrj 9ZXv1yJT6myd0thbECU/+ABjFU2MGtJ/zRk1maeiY8U5vsG4QEpEL8jA4H2ht9M+7yvCpV VSekViDfl+Bm+Em+Xdsqt0JmB6f8I4YWDPQHKct7hRhDCrTQN71dB/sS0hFOLQ2/N0KBqJ 4AYxnif9mRWxHrZjczhZYXJUAejaHNGVdM6MSJk67UebUAjHSC/dZM7ZGDA5bLvJscXZMu 9ly4Z492ztAjeSMTyu+F8xW0x2wOMRHlaYjVqTJADdKlgYQJ+jjtcOZ0+RiOAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683821859; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jwEQRUQin50PRgCycGRbNjNyyCkdMwn1vlAmypt5b5M=; b=R02FOcm3wdCt327IT6sdENw95Dooz5tpZ/VjGEG6x4HtCZPmXjVJmbAUwgh+ZVIck+KOHD EU3k1EiRPeVrjVX+iI6lGyeD6eFB3KyVNgN08yC+V/JDC/kc6K39nkJ17NjAIrr18V2WYv A1tNhisoXg5goP1GqFphiNrS9hRtGlL7myB7M9sY4Yian8McJguAr6UsLpml5hxhP9aT3v Q+8JUBy4QKVPiTdRBpVzIj3EDLSev4HlrWIVNrT1Dr+URCq5LUMnKyPvhxoewz9XLk/VaX cVUr3odD6xb1YwP/pAqBtmnRjfFj3Mc9Uvy6okw9hQcN2M7OYPY1AdabERnprw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683821859; a=rsa-sha256; cv=none; b=htMLM0+DUiqds/8MUPquqIWJhW96JaB04XKsjQmHKWv6ca5jgMroB+dH6V9lJ2Hy3TAS1q XlU3wc6eRFNxiU5EGfRivnKKVu4kk4AqoBiHNTWrDUze3kBY+Sex5W3IHi2MdjATRKDhK+ QmcxsbRONvNKiJKOHbwOtrKMBeqHlxIf8LNNphEAHrM7puKzhkcb/kkSvtV+VoQpa61R+m nunMppFdWMlJQ8sDH2xIIkC5j0mEXAExLqLyo7fyso0ACziV99grO+lE/m0YljOrmbQREI XDFVAfAkAnlPIsJAHEQV9R6sdp1djAsieoQX4+WnIaZY4VCqCiaL+SsxaNeavg== Received: from mail-qv1-f41.google.com (mail-qv1-f41.google.com [209.85.219.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QHH9b1mtjzM9d; Thu, 11 May 2023 16:17:39 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qv1-f41.google.com with SMTP id 6a1803df08f44-61a4e03ccbcso79455476d6.2; Thu, 11 May 2023 09:17:39 -0700 (PDT) X-Gm-Message-State: AC+VfDxIUKw1eyuNT35dPe833ckw8jES2unDLt9LLqFyQTYbSQhRRSDR K/wosV2/CCnjRef9gQ3bvAi3Yq9WU6IBwqu9NLQ= X-Google-Smtp-Source: ACHHUZ4H7/fvrv2RKe6zfLtUOThIR041trpkKlZIEXnlbUIn1x2js9TRImKzOJxBQB2+NrcjQVixlXVQCpE5PwEHfuY= X-Received: by 2002:a05:6214:4111:b0:606:5103:9c98 with SMTP id kc17-20020a056214411100b0060651039c98mr29499737qvb.34.1683821858882; Thu, 11 May 2023 09:17:38 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202305110411.34B4BFEE047146@gitrepo.freebsd.org> In-Reply-To: From: Kyle Evans Date: Thu, 11 May 2023 11:17:28 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 3cb2f5f369ec - main - lualoader: add support for .lua configuration files To: Warner Losh Cc: Mark Johnston , src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N On Thu, May 11, 2023 at 8:23=E2=80=AFAM Warner Losh wrote: > > > > On Thu, May 11, 2023, 7:19 AM Mark Johnston wrote: >> >> On Thu, May 11, 2023 at 04:11:15AM +0000, Kyle Evans wrote: >> > The branch main has been updated by kevans: >> > >> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D3cb2f5f369ecfd6d15aeff2= b47e21866551a20de >> > >> > commit 3cb2f5f369ecfd6d15aeff2b47e21866551a20de >> > Author: Kyle Evans >> > AuthorDate: 2023-05-11 04:10:53 +0000 >> > Commit: Kyle Evans >> > CommitDate: 2023-05-11 04:10:53 +0000 >> > >> > lualoader: add support for .lua configuration files >> > >> > If a file is specified in loader_conf_files that ends in '.lua', l= ualoader >> > will now load and execute that file. These may be used in place of= a >> > traditional loader.conf to use more complicated logic, where some = values >> > may be set based on others or based on the environment that the C = bits has >> > left us with. >> > >> > Lua scripts are run in a limited environment. In particular, it do= es not get >> > access to any modules or, in-fact, anything except environment var= iable. >> > >> > A config.buildenv hook has been added so that a local module can a= dd >> > whatever it may need to to the environment. >> > >> > When a global var is set in the lua script, it does not immediatel= y alter >> > the loader environment. Instead, the script's environment is initi= ally >> > empty and processed only if the whole script executes successfully= . >> > Effectively, a lua configuration file either takes effect or it do= es not, >> > an error will not leave it in a half-baked state. >> > >> > Reviewed by: bcr (manpages), imp >> > Differential Revision: https://reviews.freebsd.org/D28450 >> >> Should this be in RELNOTES? It seems like a very useful feature. > > > Yes.... unless Kyle objects :) > Ah, yeah, that's a good idea. I wrote a pitch here: https://reviews.freebsd.org/D40066 From nobody Thu May 11 16:57:59 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHJ494wcKz49TJd; Thu, 11 May 2023 16:58:01 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHJ49361Dz3FTP; Thu, 11 May 2023 16:58:01 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 34BGw0V4036344; Thu, 11 May 2023 11:58:00 -0500 (CDT) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1683824280; bh=hitU77WqNNGS4LW6BJ+/ZgO+D2fCFEg+odIZWpa8dWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N5k0gneRas5fX09SPyt5eyZFSMFVc5uzfC053kp7s/JZktfe7VvTLse1mQlwlqcRG 0zn2dv/bof7ZoEcpcZhqkf435e+cXuwF208SWhiIU42ktiDSwrN+RYWWjg38r+4fUG vRLabZpmAe9uWdQnA36pgO9SgSF+hthD1GugZaa1GDrH6tla/a4JvPcKCjB7wAv0LV 3RmFd04KOlCuZCSg61pfsl/hmalhY+Dlef15un1Y+wL1t2cY/ATm7+QFPFIzaol2ae V82azLJZHpXKZ9HvJi0x2drv0KIElI2B66G6PCm0jO3+9VavUTZijxs3oIK0mAo9Ne uJC6kUmIn1azA== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id /MtvDJgeXWT2jQAAs/W3XQ (envelope-from ); Thu, 11 May 2023 11:58:00 -0500 From: Mike Karels To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Date: Thu, 11 May 2023 11:57:59 -0500 X-Mailer: MailMate (1.14r5964) Message-ID: <20A9CE7A-0859-4581-8445-60456B1A497B@karels.net> In-Reply-To: <202305111458.34BEwQR9058840@gndrsh.dnsmgr.net> References: <202305111458.34BEwQR9058840@gndrsh.dnsmgr.net> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QHJ49361Dz3FTP X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 11 May 2023, at 9:58, Rodney W. Grimes wrote: >> On Wed, 10 May 2023 16:48:12 -0500 >> Mike Karels wrote: >> >>> On 10 May 2023, at 10:13, Cy Schubert wrote: >>> >>>> In message , Mitch= ell >>>> Horne w >>>> rites: >>>>> On 5/10/23 11:19, Rodney W. Grimes wrote: >>>>>>> The branch main has been updated by mhorne: >>>>>>> >>>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D36db6b04962a01ff7b= 21592def02d >>>>> 4c570dac939 >>>>>>> >>>>>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 >>>>>>> Author: Mitchell Horne >>>>>>> AuthorDate: 2023-05-10 12:53:56 +0000 >>>>>>> Commit: Mitchell Horne >>>>>>> CommitDate: 2023-05-10 13:25:17 +0000 >>>>>>> >>>>>>> hier(7): document /home/ and /usr/home/ >>>>>>> >>>>>>> Reviewed by: imp >>>>>>> MFC after: 1 week >>>>>>> Sponsored by: The FreeBSD Foundation >>>>>>> Differential Revision: https://reviews.freebsd.org/D40002 >>>>>>> --- >>>>>>> share/man/man7/hier.7 | 10 ++++++++++ >>>>>>> 1 file changed, 10 insertions(+) >>>>>>> >>>>>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 >>>>>>> index ff11289436a1..b6759dd6e65b 100644 >>>>>>> --- a/share/man/man7/hier.7 >>>>>>> +++ b/share/man/man7/hier.7 >>>>>>> @@ -90,6 +90,10 @@ file descriptor files; >>>>>>> see >>>>>>> .Xr \&fd 4 >>>>>>> .El >>>>>>> +.It Pa /home/ >>>>>>> +user HOME directories. >>>>>>> +This is a symlink to >>>>>>> +.Pa /usr/home/ >>>>>> >>>>>> /usr is "contains the majority of user utilities and applications"= >>>>>> it should not contain home directories. >>>>>>> I do not know when this move to usr came about it was traditional= ly >>>>> /home. >>>>>> I do not know why /usr/home even exists, it is not needed by >>>>>> anything I am aware of. If we have a compatible link it >>>>>> should be, usr/home -> ../home and /home should be the >>>>>> directory. >>>>>> >>>>> >>>>> I agree that /usr/home is strange, and is unique (?) to FreeBSD. >>>>> >>>>> The oldest commit in the output of `git log --grep '/usr/home'` is:= >>>>> >>>>> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd >>>>> Author: David Nugent >>>>> Date: Fri Jan 3 04:42:18 1997 +0000 >>>>> >>>>> Implemented /home -> /usr/home symlink kludge. >>>>> If home basedir would be created in the root partition, create= >>>>> it under /usr instead, and symlink /basedir -> /usr/basedir. >>>>> >>>>> Notes: >>>>> svn path=3D/head/; revision=3D21242 >>>>> >>>>> >>>>> So it has been this way for 26 years at least. I do not know what t= o say >>>>> about whether /usr "should" contain it, but it does. >>>> >>>> Usually history matters. I can understand not changing it. On the fl= ip >>>> side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /ho= me -- >>>> albeit automounted from /export/home on localhost or some NFS server= =2E In >>>> the Red Hat land at $JOB, /home is its own partition (actually an LV= M >>>> volume). In both cases /home is not in /usr because end-users can fi= ll >>>> /usr. This can be problematic operationally because it's yet another= >>>> headache to deal with should someone fill the filesystem. Filling /u= sr is >>>> more serious than filling /home. >>>> >>>> As a point of interest, when I installed my first FreeBSD many moons= ago I >>>> used the Solaris standard of /export/home, using amd (now automount)= to >>>> serve my /home. I'm not advocating we do this, it's overkill, but /h= ome >>>> should not live in /usr. It's a potential headache for any sysadmin.= >>>> >>>> With ZFS the solution is easy. With UFS based systems there are a lo= t of >>>> other factors that go into how we install the "default" from the get= -go. >>> > > First off, thank you Mike for looking at this closer. Add me to any re= views > you might creat. > >>> The situation is a fair mess. It took me a little while to figure ou= t that >>> the kludge referenced above is in the pw(8) command, which is used as= the >>> backend to adduser(8). Neither /home nor /usr/home is in the base pa= ckage. >>> adduser defaults to /home/user, and creates the parent directory (e.g= =2E /home) >>> if it does not exist, but if there is no internal slash, pw moves the= parent >>> to /usr. In this case, it makes the symlink from root. zfs is diff= erent, >>> in that it includes a usr/home dataset already (created by bsdinstall= ). >>> In this case, creating a user with /home/user causes the symlink to b= e added >>> as a side effect. >>> >>> I?m sure the kludge was originally done when root and /usr were separ= ate >>> file systems by default, root was small, and there was no /home by de= fault. >>> However, we now default to a single large file system (with datasets,= in >>> the zfs case). >>> >>> All of this really is a horrible kludge, and it is a house of cards. = I'm >>> amazed that it doesn't break more often. I'm tempted to remove the k= ludge >>> and change the zfs setup to create a home dataset rather than usr/hom= e. > > Or make it a menu option(s): > if (zfs) "Create a user home dataset?" (default yes) > if (ufs) "Create a user home directory?" (default yes) Are you suggesting that bsdinstall should do this? For ufs, there is no need. > "User home location: /home" (This is default) Are you proposing that the default for pw should be set at this point? That doesn=E2=80=99t seem necessary, and I don=E2=80=99t know if it would= work from bsdinstall. > As far as I am concerned the symlink can just die.... I agree, but that requires a change to pw. It creates the symlink on the= first account creation using /home. >>> However, if zfs users explicitly configure a home directory under /us= r/home, >>> this would end up in the usr dataset. An alternative would be to rem= ove the >>> code from pw to create the parent directory entirely (which seems sen= sible), >>> and create a /home directory for ufs installs. I don't know how well= known >>> it is that adduser/pw will create parent directories for home directo= ries >>> though. This cleanup would change the default location for home dire= ctories >>> to /home, which makes more sense. It would require documentation, e.= g. in >>> the release notes. The changes would only affect new installations, = not >>> upgrades. >>> >>> Thoughts? >>> >> >> Adding home would require a change to BSD.root.dist, since it's not >> currently in there. Only usr is present. > > It should *not* be in the etc/mtree/BSD.*.dist files at all. > And it is not on my 13.1R system. It would not need to be > in BSD.root.dist either, this is a *post distribution* created > directory/dataset. I=E2=80=99m curious why you think this. But if pw retains the ability to= create the parent directory for the user directory (and I now think it should), there is no need for a /home by default. >> IMHO changing pw would be a reasonable approach. > > I am mixed on this.... it more or less does the right > thing, and if a user specifies /tmp/foolishidea/home/$USER > that is on them. No one said all users homes must be > in the same location. Except for moving parent directories with a single component under /usr, and creating a symlink for them... My current plan is to change pw not to move things under /usr, change the= zfs setup to use a home dataset rather than usr/home (corresponding to th= e pw default), and then change the various man pages that refer to /usr/hom= e. Does that seem reasonable? Mike From nobody Thu May 11 17:08:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHJHn08tcz49V13; Thu, 11 May 2023 17:08:05 +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 4QHJHm6SVNz3GWB; Thu, 11 May 2023 17:08:04 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683824884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HYVmS7tmlHBc+Q0D+y6RzbeJFVFL5l3vHMpevLJkKrs=; b=sLzMXDnJnnooL5ypemPh4XtXuN3nSsLXATljqbU9hDTJEHxoYkfJJh0sFA1vobtZ9JYD0K xRcVRt3RLpI3ixoMSa+Bc+Yf6m3T60XDGStcN3n5o7/fus+S4xrBcCZsVTjZAx/qaMGDgt OyA+TETHbKCg5BAG8fm0CVeRSwKEdsEJynF9YdgLVxbWt34hLF3C1nKznCFtXkaZoVku8w I6nL1wuw4+rkWx1yXt3x1tqVKjB08kgBF84v599tVvZcbOTEZkn18rJTCDblRf4VuG1SzR 6CM1/QtKjQPQzuv3B1wBNGwnqD43kdEoZw8v/S/JsPlaKZqmADhdnrjrEtQoHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683824884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HYVmS7tmlHBc+Q0D+y6RzbeJFVFL5l3vHMpevLJkKrs=; b=MK/E+7c3NwUUGnFyJn2zb5Vm3/8m0iKdlh9zYs/HkI5M2uCsiScscpHRVuFrBoBC9W92fP 34lVON+0deXkPRI6dMw4c+ZBvW+9iGAkMlS/aEioABzm24P3vGMm3MtPk64RZEWkOgaiv/ OaC6EihYSzlHx2cYjr3MCDUKfwv5MQdw9qkjZH50R5+L5GgK6M8Sxe2gUwqbJ+p74mh8D5 zooGwsm8eBX6LPI9g5WoHany0yTqJTe8U2iHYmyk6Si4ie/yIn0C77V4nBTyyGZlUuteWs GdAvUtMA5iinV1ZzCH1SwVjbeWsX7oMXiECJocuXdu45m2/4Za9ltF/Yfz4hVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683824884; a=rsa-sha256; cv=none; b=vivMApC1FWBM6gIiE0/Azc6c7xVxSreVw8d8F+/2+ShngCxJB/APpTDicKH7PtM8k/9/pD 62720WnHlle8mRU5snaIx5fAb0HX5Jz3Qjyjvsn3ROdn7j7JI81phDx3hh8k+o0RKBmzgR 4S5YXkgNTpHzCLgCBQ2ThDcSJewJZmxdfA0AkkHE02YXEEaMzrqtqkuQ7hy8dpJmQsE7jV IK3crUWFe45ZgHOIH4zy/KP4g2O6BhBjCN5XmugPpBqKUCR5lwc+OdtKcKR+H/jHkPias+ H1XMjnIlDJjwe8efkloW/QiHU2fE+YgjlWtEy877BoBvVyMXs+nwia5gVvmH2A== Received: from [IPV6:2601:648:8680:16b0:68c6:c580:9c72:9097] (unknown [IPv6:2601:648:8680:16b0:68c6:c580:9c72:9097]) (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 4QHJHm0G9rzNCs; Thu, 11 May 2023 17:08:03 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: Date: Thu, 11 May 2023 10:08:02 -0700 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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.10.1 Subject: Re: git: 74192f9b2d24 - main - ktls_test: specify OpenSSL 1.1 API Content-Language: en-US To: Enji Cooper , Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Pierre Pronchery References: <202305111431.34BEVrtp073189@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 5/11/23 7:59 AM, Enji Cooper wrote: > >> On May 11, 2023, at 07:31, Ed Maste wrote: >> >> The branch main has been updated by emaste: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=74192f9b2d240edbd72215b8ee770485502ce8ee >> >> commit 74192f9b2d240edbd72215b8ee770485502ce8ee >> Author: Pierre Pronchery >> AuthorDate: 2023-05-11 03:49:44 +0000 >> Commit: Ed Maste >> CommitDate: 2023-05-11 14:30:51 +0000 >> >> ktls_test: specify OpenSSL 1.1 API >> >> Reviewed by: emaste >> Sponsored by: The FreeBSD Foundation >> --- >> tests/sys/kern/Makefile | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile >> index dec2384bc80b..931ec507885a 100644 >> --- a/tests/sys/kern/Makefile >> +++ b/tests/sys/kern/Makefile >> @@ -70,6 +70,7 @@ LIBADD.sys_getrandom+= pthread >> LIBADD.ptrace_test+= pthread >> LIBADD.unix_seqpacket_test+= pthread >> LIBADD.kcov+= pthread >> +CFLAGS.ktls_test+= -DOPENSSL_API_COMPAT=0x10100000L >> LIBADD.ktls_test+= crypto util >> LIBADD.sendfile_helper+= pthread >> LIBADD.fdgrowtable_test+= util pthread kvm procstat > > Would there be any objections to me fixing these issues before we freeze for 14.0-RELEASE? Also, are the issues being tracked somewhere in a wiki page or bugzilla? I think we are happy to have them fixed, just in parallel to not hold up the import? I planned to look at some of these during BSDCan next week (in particular ktls_test and cryptocheck at least since I wrote the bulk of those). They really should just be using EVP already, but maybe they still use the HMAC() wrapper. -- John Baldwin From nobody Thu May 11 17:32:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHJqs0fNYz49WG3; Thu, 11 May 2023 17:32:25 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHJqr2Jycz3J46; Thu, 11 May 2023 17:32:23 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Authentication-Results: mx1.freebsd.org; none Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 34BHWKTv059417; Thu, 11 May 2023 10:32:20 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 34BHWKdw059416; Thu, 11 May 2023 10:32:20 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202305111732.34BHWKdw059416@gndrsh.dnsmgr.net> Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ In-Reply-To: <20A9CE7A-0859-4581-8445-60456B1A497B@karels.net> To: Mike Karels Date: Thu, 11 May 2023 10:32:20 -0700 (PDT) CC: rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4QHJqr2Jycz3J46 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On 11 May 2023, at 9:58, Rodney W. Grimes wrote: > > >> On Wed, 10 May 2023 16:48:12 -0500 > >> Mike Karels wrote: > >> > >>> On 10 May 2023, at 10:13, Cy Schubert wrote: > >>> > >>>> In message , Mitchell > >>>> Horne w > >>>> rites: > >>>>> On 5/10/23 11:19, Rodney W. Grimes wrote: > >>>>>>> The branch main has been updated by mhorne: > >>>>>>> > >>>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d > >>>>> 4c570dac939 > >>>>>>> > >>>>>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 > >>>>>>> Author: Mitchell Horne > >>>>>>> AuthorDate: 2023-05-10 12:53:56 +0000 > >>>>>>> Commit: Mitchell Horne > >>>>>>> CommitDate: 2023-05-10 13:25:17 +0000 > >>>>>>> > >>>>>>> hier(7): document /home/ and /usr/home/ > >>>>>>> > >>>>>>> Reviewed by: imp > >>>>>>> MFC after: 1 week > >>>>>>> Sponsored by: The FreeBSD Foundation > >>>>>>> Differential Revision: https://reviews.freebsd.org/D40002 > >>>>>>> --- > >>>>>>> share/man/man7/hier.7 | 10 ++++++++++ > >>>>>>> 1 file changed, 10 insertions(+) > >>>>>>> > >>>>>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 > >>>>>>> index ff11289436a1..b6759dd6e65b 100644 > >>>>>>> --- a/share/man/man7/hier.7 > >>>>>>> +++ b/share/man/man7/hier.7 > >>>>>>> @@ -90,6 +90,10 @@ file descriptor files; > >>>>>>> see > >>>>>>> .Xr \&fd 4 > >>>>>>> .El > >>>>>>> +.It Pa /home/ > >>>>>>> +user HOME directories. > >>>>>>> +This is a symlink to > >>>>>>> +.Pa /usr/home/ > >>>>>> > >>>>>> /usr is "contains the majority of user utilities and applications" > >>>>>> it should not contain home directories. > >>>>>>> I do not know when this move to usr came about it was traditionally > >>>>> /home. > >>>>>> I do not know why /usr/home even exists, it is not needed by > >>>>>> anything I am aware of. If we have a compatible link it > >>>>>> should be, usr/home -> ../home and /home should be the > >>>>>> directory. > >>>>>> > >>>>> > >>>>> I agree that /usr/home is strange, and is unique (?) to FreeBSD. > >>>>> > >>>>> The oldest commit in the output of `git log --grep '/usr/home'` is: > >>>>> > >>>>> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd > >>>>> Author: David Nugent > >>>>> Date: Fri Jan 3 04:42:18 1997 +0000 > >>>>> > >>>>> Implemented /home -> /usr/home symlink kludge. > >>>>> If home basedir would be created in the root partition, create > >>>>> it under /usr instead, and symlink /basedir -> /usr/basedir. > >>>>> > >>>>> Notes: > >>>>> svn path=/head/; revision=21242 > >>>>> > >>>>> > >>>>> So it has been this way for 26 years at least. I do not know what to say > >>>>> about whether /usr "should" contain it, but it does. > >>>> > >>>> Usually history matters. I can understand not changing it. On the flip > >>>> side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /home -- > >>>> albeit automounted from /export/home on localhost or some NFS server. In > >>>> the Red Hat land at $JOB, /home is its own partition (actually an LVM > >>>> volume). In both cases /home is not in /usr because end-users can fill > >>>> /usr. This can be problematic operationally because it's yet another > >>>> headache to deal with should someone fill the filesystem. Filling /usr is > >>>> more serious than filling /home. > >>>> > >>>> As a point of interest, when I installed my first FreeBSD many moons ago I > >>>> used the Solaris standard of /export/home, using amd (now automount) to > >>>> serve my /home. I'm not advocating we do this, it's overkill, but /home > >>>> should not live in /usr. It's a potential headache for any sysadmin. > >>>> > >>>> With ZFS the solution is easy. With UFS based systems there are a lot of > >>>> other factors that go into how we install the "default" from the get-go. > >>> > > > > First off, thank you Mike for looking at this closer. Add me to any reviews > > you might creat. > > > >>> The situation is a fair mess. It took me a little while to figure out that > >>> the kludge referenced above is in the pw(8) command, which is used as the > >>> backend to adduser(8). Neither /home nor /usr/home is in the base package. > >>> adduser defaults to /home/user, and creates the parent directory (e.g. /home) > >>> if it does not exist, but if there is no internal slash, pw moves the parent > >>> to /usr. In this case, it makes the symlink from root. zfs is different, > >>> in that it includes a usr/home dataset already (created by bsdinstall). I am proposing we fix this. More below. > >>> In this case, creating a user with /home/user causes the symlink to be added > >>> as a side effect. > >>> > >>> I?m sure the kludge was originally done when root and /usr were separate > >>> file systems by default, root was small, and there was no /home by default. > >>> However, we now default to a single large file system (with datasets, in > >>> the zfs case). > >>> > >>> All of this really is a horrible kludge, and it is a house of cards. I'm > >>> amazed that it doesn't break more often. I'm tempted to remove the kludge > >>> and change the zfs setup to create a home dataset rather than usr/home. > > > > Or make it a menu option(s): > > if (zfs) "Create a user home dataset?" (default yes) > > if (ufs) "Create a user home directory?" (default yes) > > Are you suggesting that bsdinstall should do this? For ufs, there is no > need. Yes I am suggesting that bsdinstall should have a knob to turn on (by default) and off the creation of a "home dataset/directory" as you well need that if you choose to add users during a bsdinstall run, or you may not want a /home at all (currently not possible) as you have other mechanisms for dealing with it. The need for this is just as valid for ufs as it is for zfs. > > > "User home location: /home" (This is default) > > Are you proposing that the default for pw should be set at this point? >From all I read the default for pw is already, and should remain /home. Man page bears that out. It has no mention of any symlink or usr/home. > That doesn?t seem necessary, and I don?t know if it would work from > bsdinstall. No, this has nothing to do with pw directly, this is simply the path of the dataset(zfs)/directory(ufs) that bsdinstall should create IFF you sayd yes to the create question. At present this is hardcoded into bsdinstall as: /usr/home /home -> /usr/home I am advocating that this should all be controllable from menu. > > > As far as I am concerned the symlink can just die.... > > I agree, but that requires a change to pw. It creates the symlink on the > first account creation using /home. I am missing something here, pw creates the symlink yuk. As far as I was aware the only think that created a symlink /home -> /usr/home was bsdinstall. > > >>> However, if zfs users explicitly configure a home directory under /usr/home, > >>> this would end up in the usr dataset. An alternative would be to remove the > >>> code from pw to create the parent directory entirely (which seems sensible), > >>> and create a /home directory for ufs installs. I don't know how well known > >>> it is that adduser/pw will create parent directories for home directories > >>> though. This cleanup would change the default location for home directories > >>> to /home, which makes more sense. It would require documentation, e.g. in > >>> the release notes. The changes would only affect new installations, not > >>> upgrades. > >>> > >>> Thoughts? > >>> > >> > >> Adding home would require a change to BSD.root.dist, since it's not > >> currently in there. Only usr is present. > > > > It should *not* be in the etc/mtree/BSD.*.dist files at all. > > And it is not on my 13.1R system. It would not need to be > > in BSD.root.dist either, this is a *post distribution* created > > directory/dataset. > > I?m curious why you think this. But if pw retains the ability to create > the parent directory for the user directory (and I now think it should), > there is no need for a /home by default. Because there is no need for /home in a base distribution until you add a user, and that is a site specific change. What in the base system *needs* /home? > >> IMHO changing pw would be a reasonable approach. > > > > I am mixed on this.... it more or less does the right > > thing, and if a user specifies /tmp/foolishidea/home/$USER > > that is on them. No one said all users homes must be > > in the same location. > > Except for moving parent directories with a single component under /usr, > and creating a symlink for them... > > My current plan is to change pw not to move things under /usr, change the > zfs setup to use a home dataset rather than usr/home (corresponding to the > pw default), and then change the various man pages that refer to /usr/home. > Does that seem reasonable? Yes, then the knobs can easily be added, or scripted install should just work to effect the knobs. > Mike -- Rod Grimes rgrimes@freebsd.org From nobody Thu May 11 17:55:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHKM26Kmrz49Xxk; Thu, 11 May 2023 17:55: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 4QHKM25FMcz3Kqc; Thu, 11 May 2023 17:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683827758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icokoyvmx+9GRXjzvHATO+TvITvhP9ayLbU/mDN6wyg=; b=X7TokrPQczazmWzhhVBy4yLNmvk9SCKiJIFuRkhmIzTROTXrX6ax8I6GLOskJS5YjgJsrJ E1ZCE2yc6f/XEVec8he2VCECgKrITkIW8vKpXZK6UOM9GqwhIgOYUJiKK5xHEF+lai1mav ZCmGDsedj+Kj2iVLmNz5X+1l4ZjYJPD8b2JwV22HfgpUNG7xTA4HxPfk3HjvEHQehf7AFH jqiQU5A4j97a2E/J0QRfVUppOwAYFYCKlxihsUHDZWE5EnhDBee57yfBpOYIS8ilcvULf0 y/GkDTltgL7rjopRHrDG7RKAnL4gKZauQZk0BAsXWlSqAYMsU/dfdAXsa1YoFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683827758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=icokoyvmx+9GRXjzvHATO+TvITvhP9ayLbU/mDN6wyg=; b=FuZ98cuSlmelsxysKR3DiT68L39ObivmtqWU6sQlnQXJQJ0lF15RG0ltHCTIZro7n9EbRJ QGlgVd6poe4x/6fyyoyHh2pQbgRgR+5SaWgO87fswfg979GYhKTYMzbO0HeP7ovn36pj9Y n2lQoKKoJsmxF9QSxO0gEnr8vrm4u+ez4knAqUPJ+QQbWO0RttI7aYuDtF2lk4D8MA7Xn8 quIk7bu7zEJ/BmoyRdZn2KohtQy6UHLmB5kpn+NtwSFb0V3I9VozoRXjcYxBusPELNC6c5 lWPSKNiOJq5mUexSmzd3jmuRgR34klPDLE+PCYn41NBKYHB9zG9/ISz7PSHP5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683827758; a=rsa-sha256; cv=none; b=e5HYFzOHbaxPmRoKUFU1fi41V3SXLAf0R8Mk/pKsoYcbpR5oX48Zj4YpzxNY4BfgXll8ka v+JO486/rZwPOBztKt9+sEF8j5a1GlDtIZ/+df0/0NjlO629zgXemvN7Guuex0F5VzqAfu otfQCOSLhqpi6M89J1BDkc2fgSms73KA/tbBU8lr05aDQq1iqRIeLKK0RlMAr9IbaTYNek RoFbTIYlNWHVvwPHCu0ucoO7/fYJ04i6Dd3oQcLH1nT+j636bJ5jpRE4RdVHK8fa23FHQ3 YNk8OQKXPr+JpzgToKlCHTN73B41viBq1jM4m7mID4iT71/kezXYZ1Qs5qugnQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHKM24DZxz12kt; Thu, 11 May 2023 17:55: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 34BHtw0q004732; Thu, 11 May 2023 17:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BHtwo7004731; Thu, 11 May 2023 17:55:58 GMT (envelope-from git) Date: Thu, 11 May 2023 17:55:58 GMT Message-Id: <202305111755.34BHtwo7004731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 90951695207f - main - fbt/x86: update FBT_AFRAMES to match the trap handlers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90951695207fb974ddc3493049812d5bf2131468 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=90951695207fb974ddc3493049812d5bf2131468 commit 90951695207fb974ddc3493049812d5bf2131468 Author: Chuck Silvers AuthorDate: 2023-05-11 01:22:15 +0000 Commit: Chuck Silvers CommitDate: 2023-05-11 17:50:15 +0000 fbt/x86: update FBT_AFRAMES to match the trap handlers Reviewed by: markj Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D40054 --- sys/cddl/dev/fbt/x86/fbt_isa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/cddl/dev/fbt/x86/fbt_isa.c b/sys/cddl/dev/fbt/x86/fbt_isa.c index 8c536335791c..e2f98fa47005 100644 --- a/sys/cddl/dev/fbt/x86/fbt_isa.c +++ b/sys/cddl/dev/fbt/x86/fbt_isa.c @@ -57,6 +57,8 @@ #define FBT_PATCHVAL 0xf0 #endif +#define FBT_AFRAMES 2 + int fbt_invop(uintptr_t addr, struct trapframe *frame, uintptr_t scratch __unused) { @@ -234,7 +236,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx, fbt = malloc(sizeof (fbt_probe_t), M_FBT, M_WAITOK | M_ZERO); fbt->fbtp_name = name; fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, - name, FBT_ENTRY, 3, fbt); + name, FBT_ENTRY, FBT_AFRAMES, fbt); fbt->fbtp_patchpoint = instr; fbt->fbtp_ctl = lf; fbt->fbtp_loadcnt = lf->loadcnt; @@ -328,7 +330,7 @@ again: if (retfbt == NULL) { fbt->fbtp_id = dtrace_probe_create(fbt_id, modname, - name, FBT_RETURN, 3, fbt); + name, FBT_RETURN, FBT_AFRAMES, fbt); } else { retfbt->fbtp_probenext = fbt; fbt->fbtp_id = retfbt->fbtp_id; From nobody Thu May 11 18:21:33 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHKwY3S89z49Zc6; Thu, 11 May 2023 18:21: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 4QHKwY31R9z3PZ2; Thu, 11 May 2023 18:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683829293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RgNqUk6n+dZR8//Dsq0Gou2V42Q4ohmfWkbyWCCxk0=; b=NoIvRnRinUZ+bOLXMPsx3xnbgrvfHxbJ6CFtvOv9E0Mz69KVyfEDRZeQIgcSByA7gEpRcv dgAJDshp+sDj7++wJdrS967rHl8NQxjrDjCjNZSCZsvx3vu6NOga8BwiRuQq+Yk4O8ZykU afpn7CxkOB94MTYDNBZ3b0lHfiYxsCLChBA2wNNWwRkrj1ApA87llNba23rAPu7ZUjqALX U2U1Aa9AFphIWQ0aDfF8YfaxVdg0aYRzrrApAZAdALRqmAM5tRsv1J5Md17/pR/j4grBt5 WKKF4FAWv6gVUuk4mM2JzYZ71HwKNpYYs7aX+pcRgD7rwNCVUw8FSAJBn9Awvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683829293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RgNqUk6n+dZR8//Dsq0Gou2V42Q4ohmfWkbyWCCxk0=; b=nNOFPl0NgkMoI1R13naw/dVZNdmJA7Ly7EGUzQI0LZr0e0F+20/7aMSd2QlVCzrhOfSlQK CB6XUYZUuiziGJeKzAB7kXeJsgCB2TG6Y9Mp8wk2YNdS8zUHKDsBxIqpezAzci9NPgxDM0 wrx7vK3fdx3CyywEpjA8YEB0u6Z3wv1NpcVM4YgwoL6MrNNXIAy8j4sBqaoh3nvCj+vtyU /Q+b4wNxgqpGhr26CSwXrZYXXFJ0nPcXvLMo7vOq7RNRNWnDaHUd/VSfjuaU0KR6FsDoof z7O8CqUGvly4UkbfM4zetg2FXvNQj+MEuID1w1dMYZQsxSX2delrfMYSvu8V6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683829293; a=rsa-sha256; cv=none; b=MzpqWSiy8S1inXb46pfg4w3QJpBSlR67hixOsd2jK7VymJdBd25dWs220ckVG6c+yEBQAt E1irABMnP7uzxEOawolsBdqOHhkLC50ZvG7mx+GY9vPmvuKZotDvaRUWuEbMmBPW/wyz3u M21FF+OINm/BwYCTo/jIIxg5KjDz21tBHUGUHF1oD6xpnkW4YNAs9JqaEOTtL+8z6fFKnx cQs5BFz/iadYw/41uKGw5ueSplplNBvNQFMaAsnpNZsoQZg9wYw09Xm3PDIVBxktvzvZbZ kos3NneuxVU2Tyf1YONp23Svs7V6GQywgk/s7TgRap8jz5XXhw9ZOqEDT2xu4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHKwY25Mgz133v; Thu, 11 May 2023 18:21: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 34BILXxJ048690; Thu, 11 May 2023 18:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BILXWI048689; Thu, 11 May 2023 18:21:33 GMT (envelope-from git) Date: Thu, 11 May 2023 18:21:33 GMT Message-Id: <202305111821.34BILXWI048689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9244506a1b31 - main - Cirrus-CI: hide manual tasks from official runs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9244506a1b314d9ad5bcb1bd5cc0b75939464174 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9244506a1b314d9ad5bcb1bd5cc0b75939464174 commit 9244506a1b314d9ad5bcb1bd5cc0b75939464174 Author: Ed Maste AuthorDate: 2023-05-11 15:16:51 +0000 Commit: Ed Maste CommitDate: 2023-05-11 18:20:43 +0000 Cirrus-CI: hide manual tasks from official runs Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 9d97ca74e75b..ea3683c1169d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -21,12 +21,14 @@ task: TARGET_ARCH: amd64 TOOLCHAIN_PKG: llvm15 - name: World and kernel arm64 build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: arm64 TARGET_ARCH: aarch64 TOOLCHAIN_PKG: llvm15 - name: World and kernel gcc12 amd64 build and boot smoke test (manual) + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual env: TARGET: amd64 From nobody Thu May 11 18:23:43 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHKz33BNWz49ZdD; Thu, 11 May 2023 18:23: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 4QHKz32XNFz3Q1p; Thu, 11 May 2023 18:23:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683829423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5MKX+ztBH3wc4BVv4MYKpmK/IVL2b3hL84GEVZx30rw=; b=lWs2liKXlizeT8MjECrDICZFDNHQvhpoSDQ/3OHFtky6h4SDhrbH3EZToV2BG6kyVc9gZO /0w2rqyWW8VsdbMIQbuEERkgwR32NDX6gAQyzXIHxHw3VqlpdJw/kGizPUeTr94HIz+pmD euJjkqjAYZvBGYLwH5v6n4+dZjFMqdzNrdcjkM1bCREQ+mHN+m4MCcR6zsvvY+qbbPCuRK pbzsnEwbgii6h8Vs9cByo++37mz23cS5QO8RXzOjPWp8z7JjuwryyMmifoxxXSPlxW2zz5 TV95lvUghzSPJtVUZqx7rROtlzblHnsLBTNN6XIzX0snoOZNS8ouqWxwcZodwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683829423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5MKX+ztBH3wc4BVv4MYKpmK/IVL2b3hL84GEVZx30rw=; b=neyqhoQgGiktfuq4zVT2tLp1tvCDoXbl3NuF9FCoRXDOnt6V3/ZL4eW55EIBNAwfhev73O 5A0DzJP1HfOpIWq1Vf6zn+/PwaVDSYpMquiTb4UBfiFkDw212iXHGlyoSMTH+zmYg1LV7m jocITCLkqzdD25Ju0dPoCbM80Etj74brUVlsNU2oQli6xtDQqhkkKFbxX2rFDAkW4nlpG6 p4/99/0jc91AD2/je+KdcvGzNMWFMPEqqiaZEEBZ5Z/XZFIZo1qt5qUHxc5NPJhE5yNrtx TtZlmYyLL2IR8I/VBCSydqrZZCwC61QQNDFRNYF0bS4Ngw8l4WkUdLw4RK1nKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683829423; a=rsa-sha256; cv=none; b=mLEITz6XelZP+dpbvP032Q939iy7QZ1F3M1XfTtno7nfPBUY88RvP2DGQao61rqYLfMGwm 6BKzSx7Aaemk8IA9BJMQubZQ18028b/7W2bRNHwNtgap22tOZE0RL11PABfWnpK3wvfjAM hnS4pswhITCK/MLH5jBnjUpGGpDV3N8Rd9qbNsOctnFylIEcBjZlsnGsq/fRIM2C9Q1NnR tmRUWu4UnVWDPsnIY5aqsqKZtbsytZSxeCP6ZgkUQ3OKtyHW2V97QZ/Es9frEwsyeHfBcK 0etVbRfSZ13HA05geyxOHNEMHjFXO7uZPenh0bXAeo5E3pOAtuazo7SjQW4hLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHKz31cc8z13JN; Thu, 11 May 2023 18:23: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 34BINhpo054798; Thu, 11 May 2023 18:23:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BINh7o054797; Thu, 11 May 2023 18:23:43 GMT (envelope-from git) Date: Thu, 11 May 2023 18:23:43 GMT Message-Id: <202305111823.34BINh7o054797@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 86c31aca33ff - main - arm64: add swapueword8/32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86c31aca33ff771b845acbbed3b3659fde7e710f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=86c31aca33ff771b845acbbed3b3659fde7e710f commit 86c31aca33ff771b845acbbed3b3659fde7e710f Author: Kyle Evans AuthorDate: 2023-05-11 18:23:03 +0000 Commit: Kyle Evans CommitDate: 2023-05-11 18:23:14 +0000 arm64: add swapueword8/32 Much like casueword*, except just a plain old swap. Maintains a similar interface to casu(9)- return value -1 (fault), 0 (success), or 1 (fail), and also both ll/sc and LSE variants are implemented. These will be used to implement 32-bit swp/swpb emulation on aarch64. Reveiwed by: andrew Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D39837 --- sys/arm64/arm64/support.S | 92 +++++++++++++++++++++++++++++++++++++++++ sys/arm64/arm64/support_ifunc.c | 24 +++++++++++ sys/arm64/include/md_var.h | 11 +++++ 3 files changed, 127 insertions(+) diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S index 28ac1d553fbc..f7e9abcd910c 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -55,6 +55,98 @@ fsu_fault_nopcb: ret END(fsu_fault) +/* + * int swapueword8_llsc(volatile uint8_t *, uint8_t *) + */ +ENTRY(swapueword8_llsc) + check_user_access 0, (VM_MAXUSER_ADDRESS-3), fsu_fault_nopcb + adr x6, fsu_fault /* Load the fault handler */ + SET_FAULT_HANDLER(x6, x4) /* And set it */ + ENTER_USER_ACCESS(w6, x4) + + ldrb w7, [x1] + + ldxrb w2, [x0] + stxrb w3, w7, [x0] + cbnz w3, 1f + + strb w2, [x1] /* Stash old value in *val */ + +1: EXIT_USER_ACCESS(w6) + SET_FAULT_HANDLER(xzr, x6) + mov w0, w3 + ret +END(swapueword8_llsc) + +/* + * int swapueword8_lse(volatile uint8_t *, uint8_t *) + */ +ENTRY(swapueword8_lse) + check_user_access 0, (VM_MAXUSER_ADDRESS-3), fsu_fault_nopcb + adr x6, fsu_fault /* Load the fault handler */ + SET_FAULT_HANDLER(x6, x4) /* And set it */ + ENTER_USER_ACCESS(w6, x4) + + ldrb w7, [x1] + + .arch_extension lse + swpb w7, w2, [x0] + .arch_extension nolse + + strb w2, [x1] /* Stash old value in *val */ + + EXIT_USER_ACCESS(w6) + SET_FAULT_HANDLER(xzr, x6) + mov w0, #0 + ret +END(swapueword8_lse) + +/* + * int swapueword32_llsc(volatile uint32_t *, uint32_t *) + */ +ENTRY(swapueword32_llsc) + check_user_access 0, (VM_MAXUSER_ADDRESS-3), fsu_fault_nopcb + adr x6, fsu_fault /* Load the fault handler */ + SET_FAULT_HANDLER(x6, x4) /* And set it */ + ENTER_USER_ACCESS(w6, x4) + + ldr w7, [x1] + + ldxr w2, [x0] /* Stash the old value in w2 */ + stxr w3, w7, [x0] /* Store new value */ + cbnz w3, 1f + + str w2, [x1] /* Stash old value in *val */ + +1: EXIT_USER_ACCESS(w6) + SET_FAULT_HANDLER(xzr, x6) + mov w0, w3 + ret +END(swapueword32_llsc) + +/* + * int swapueword32_lse(volatile uint32_t *, uint32_t *) + */ +ENTRY(swapueword32_lse) + check_user_access 0, (VM_MAXUSER_ADDRESS-3), fsu_fault_nopcb + adr x6, fsu_fault /* Load the fault handler */ + SET_FAULT_HANDLER(x6, x4) /* And set it */ + ENTER_USER_ACCESS(w6, x4) + + ldr w7, [x1] + + .arch_extension lse + swp w7, w2, [x0] + .arch_extension nolse + + str w2, [x1] /* Stash old value in *val */ + + EXIT_USER_ACCESS(w6) + SET_FAULT_HANDLER(xzr, x6) + mov w0, #0 + ret +END(swapueword32_llsc) + /* * int casueword32_llsc(volatile uint32_t *, uint32_t, uint32_t *, uint32_t) */ diff --git a/sys/arm64/arm64/support_ifunc.c b/sys/arm64/arm64/support_ifunc.c index 8abf3f3c75af..8cbe1c97b0a1 100644 --- a/sys/arm64/arm64/support_ifunc.c +++ b/sys/arm64/arm64/support_ifunc.c @@ -32,6 +32,8 @@ #include #include +#define _MD_WANT_SWAPWORD +#include int casueword32_llsc(volatile uint32_t *, uint32_t, uint32_t *, uint32_t); int casueword32_lse(volatile uint32_t *, uint32_t, uint32_t *, uint32_t); @@ -39,6 +41,12 @@ int casueword32_lse(volatile uint32_t *, uint32_t, uint32_t *, uint32_t); int casueword_llsc(volatile u_long *, u_long, u_long *, u_long); int casueword_lse(volatile u_long *, u_long, u_long *, u_long); +int swapueword8_llsc(volatile uint8_t *, uint8_t *); +int swapueword8_lse(volatile uint8_t *, uint8_t *); + +int swapueword32_llsc(volatile uint32_t *, uint32_t *); +int swapueword32_lse(volatile uint32_t *, uint32_t *); + DEFINE_IFUNC(, int, casueword32, (volatile uint32_t *base, uint32_t oldval, uint32_t *oldvalp, uint32_t newval)) { @@ -56,3 +64,19 @@ DEFINE_IFUNC(, int, casueword, (volatile u_long *base, u_long oldval, return (casueword_llsc); } + +DEFINE_IFUNC(, int, swapueword8, (volatile uint8_t *base, uint8_t *val)) +{ + if (lse_supported) + return (swapueword8_lse); + + return (swapueword8_llsc); +} + +DEFINE_IFUNC(, int, swapueword32, (volatile uint32_t *base, uint32_t *val)) +{ + if (lse_supported) + return (swapueword32_lse); + + return (swapueword32_llsc); +} diff --git a/sys/arm64/include/md_var.h b/sys/arm64/include/md_var.h index 6c78317c830c..d6c1b4ca2764 100644 --- a/sys/arm64/include/md_var.h +++ b/sys/arm64/include/md_var.h @@ -57,4 +57,15 @@ void generic_bs_poke_2(void) __asm(__STRING(generic_bs_poke_2)); void generic_bs_poke_4(void) __asm(__STRING(generic_bs_poke_4)); void generic_bs_poke_8(void) __asm(__STRING(generic_bs_poke_8)); +#ifdef _MD_WANT_SWAPWORD +/* + * XXX These are implemented primarily for swp/swpb emulation at the moment, and + * should be used sparingly with consideration -- they aren't implemented for + * any other platform. If we use them anywhere else, at a minimum they need + * KASAN/KMSAN interceptors added. + */ +int swapueword8(volatile uint8_t *base, uint8_t *val); +int swapueword32(volatile uint32_t *base, uint32_t *val); +#endif + #endif /* !_MACHINE_MD_VAR_H_ */ From nobody Thu May 11 18:25:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHL1g2Z2gz49ZY6; Thu, 11 May 2023 18:25:59 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHL1f4yX0z3QVN; Thu, 11 May 2023 18:25:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-4f139de8cefso47817394e87.0; Thu, 11 May 2023 11:25:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683829556; x=1686421556; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nhGLDYv7JXV8qWEobKe2wsILwIw4Z3SMRsQXw+UWWr4=; b=lrFqiBDs7uNddj19LoD6S/UIiV3nMuIgKdrtDmrwgFnmuZznmthfwxjdFABuB+M/hT qZdWL0ZhofCEae9ZMGRWkZkzLkpsa6sJAuYbv9KjTRUYN5U0h1ITORNKG56YMxvp2lr3 h0zeoOrpnvDwSXlsAbvtgYKT8C2cw5uxNc3u0Z+uIP8i2IfLGFbhu0vgwFpRIXcEAQFH W963dn4zOqxVhtoj3PvYqusvsCujMONiUF0/AuK1fVQLVNtdRCxSlX127JBvlBn1MD31 59DTq2ERxB8ZAlKPSi2sWV+pgohkD7jopk56rcxw1g+/Q4HcqczL2srGcwcCzYVNZxlX 5kfw== X-Gm-Message-State: AC+VfDzSeWYmSkvPZSjNPalJRZHg+c/UOS0xW66XD+mUTT7rtkH8Kk+Y H88KPyDh5bWjtUcooc5bxHyfcVRcNj/NYlaj0c2gXaHOwPU= X-Google-Smtp-Source: ACHHUZ6nK0TQ6pZuXKy7djGQGvj5j2keTj+KWhjRK0fUut+qSwfm7Pk/DQx4Tf+uT7IZwNHI+POwBFziAnmuK/b1X3o= X-Received: by 2002:a2e:94cf:0:b0:2a7:6b40:7ea2 with SMTP id r15-20020a2e94cf000000b002a76b407ea2mr3156218ljh.14.1683829555964; Thu, 11 May 2023 11:25:55 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202305111220.34BCKsg6055498@gitrepo.freebsd.org> In-Reply-To: <202305111220.34BCKsg6055498@gitrepo.freebsd.org> From: Ed Maste Date: Thu, 11 May 2023 14:25:44 -0400 Message-ID: Subject: Re: git: ca14781c8170 - main - bhyve: add cmdline option for user defined fw_cfg items To: =?UTF-8?Q?Corvin_K=C3=B6hne?= Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QHL1f4yX0z3QVN X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, 11 May 2023 at 08:21, Corvin K=C3=B6hne wrote= : > > The branch main has been updated by corvink: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dca14781c8170f3517ae79e198c= 0c880dbc3142dd > > commit ca14781c8170f3517ae79e198c0c880dbc3142dd > Author: Corvin K=C3=B6hne > AuthorDate: 2021-09-08 09:31:21 +0000 > Commit: Corvin K=C3=B6hne > CommitDate: 2023-05-11 12:20:32 +0000 > > bhyve: add cmdline option for user defined fw_cfg items Cirrus-CI gcc 12 task is now failing: https://cirrus-ci.com/task/6168069450498048 /tmp/cirrus-ci-build/usr.sbin/bhyve/qemu_fwcfg.c: In function 'qemu_fwcfg_parse_cmdline_arg': /tmp/cirrus-ci-build/usr.sbin/bhyve/qemu_fwcfg.c:597:47: error: comparison is always false due to limited range of data type [-Werror=3Dtype-limits] 597 | if ((ssize_t)fwcfg_file->size < 0) { From nobody Thu May 11 20:06:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNFy2HGVz49xRp; Thu, 11 May 2023 20: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 4QHNFy1gRyz3nNw; Thu, 11 May 2023 20:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b/+Vyqj+B9+l4EH12QrdbEUjJ8507Zc1F6QyoBaZjco=; b=BGG12mN7sRtCCqGgWeMomQMMXH8xFWzxPowKhbXfu0acJYcz5NzhfWmX3+SJRyiWhHuV8j 1nhE3w/TSYhGIhFCQHAbwfoVaPWdk8RqncT4l8W2qdkhmXbtv5Zq2mV9zbMOYHgjv/fVKy bBpzlolkGzSs7xlzClvSZC/xrCNxXLBPIGu0ZN35nIBEMpdfUJjJC1JWSIkLDjY+AgyNpc JgYbvJ0L2xhq3LqV2faBxjWfjal5LaXX5MxQDIPLCukWRBy6nfMzMjjWMknYr/2TCG0g+E huXVJjwlESyBbaZRcP/DqDZCJwvMtYkB+zVUnEcdvG/u3qO2RUSH+kuL8GfsAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b/+Vyqj+B9+l4EH12QrdbEUjJ8507Zc1F6QyoBaZjco=; b=ncyZs+mDFTz787U0DE/Vr9xfByqpVPZOZMckJGNoH/8vAPPqCvQcPbQu0R870uRDcEy5YY dluKN2BR2/lkoky5qEcFMtI4ow/8PjUbyA1lTvWlNCvD/f5A/R/VJtVzE73omxR8nyQ+h3 +TzXycQxH3zKSwe3eGO3q3f9nzlLkuD505mXBMJjJIX5ihlIPxMRpBgB9EBY7nAsJz8z3x bStl317hyiBg89ALmiSSuM9SE26u1UKRcOIZpqRxJaMLc4jms5scM5Rft0KP+lZi+wiJUo UroasWVoHDEMzalPBjYhpgf6mSK2L9EwkWMgLlSQLahv09fe6WduEAaoImW4KA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835606; a=rsa-sha256; cv=none; b=IGr90QDHL+iN3Z4mAormUqfZdUcVEW5Ts35NHFzK0OCAKyBSUsCeXNHMcm6Yo4jlMh6jar ynbCx3sldbg9JniN1AUrTIterwkyc3VqOn/6m/Wx/klDQKVyEwYwOm3IPdq4XHCexRjx/h AXDVzig0/FM+d2Jl7BninFsq1WdbswXAPWgpt988XoN4oRi+IA6ajNgEAd9hLPfGco0hLZ T7IWnB7Njs3gquoLvo36fYVmNcoE08/6nUiKUC9SeIvtht38+RUdcMtWCHoC3UzOKle5qL Hwu034kuQQwFppopH3XWPTauSW07y3zAReqKtmmZmPIH/KfInUnKP5oB5nws2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNFy0lzFz15rJ; Thu, 11 May 2023 20:06: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 34BK6krg019493; Thu, 11 May 2023 20:06:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6kPw019492; Thu, 11 May 2023 20:06:46 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:46 GMT Message-Id: <202305112006.34BK6kPw019492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2f131435bc22 - main - stand: efi create eficom console device. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f131435bc22540db2d3f6bf97e5f9fe7039f889 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2f131435bc22540db2d3f6bf97e5f9fe7039f889 commit 2f131435bc22540db2d3f6bf97e5f9fe7039f889 Author: Warner Losh AuthorDate: 2023-05-11 20:03:17 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: efi create eficom console device. Fix the 'renaming kludge' that we absolutely cannot do going forward (it's cost us days of engineering time). console=comconsole talks to the hardware directly. This is available only on amd64. It is not available anywhere else (and so requires changes for people doing comconsole on aarch64) console=eficom talks to the console via EFI protocols. It's available on amd64, aarch64 and riscv64. It's the first port that we find, though it can be overriden by efi_com_port (which should be set to the UID of the serial port, not the I/O port, despite the name). devinfo -v will give the UID to uartX mapping. This is an incompatible change for HYPER-V on amd64. It only works with eficom console, so you'll need to change your configuration in loader.conf. No compatibility hack will ever be provided for this (since it requires renamig, which the loader cannot reliably do). It's also an incompatible change for aarch64. comconsole will need to change to eficom. There might be a comconsole "shim" for this. All the interlock to keep only eficom and comconsole from both attaching have been removed. RelNotes: Yes Sponsored by: Netflix Discussed with: kevans Differential Revision: https://reviews.freebsd.org/D39982 --- stand/efi/loader/conf.c | 12 ++---- stand/efi/loader/efiserialio.c | 85 +++++++++++++++++------------------------ stand/i386/libi386/comconsole.c | 14 ------- 3 files changed, 39 insertions(+), 72 deletions(-) diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c index 051e1a3381d1..e9ae01d19270 100644 --- a/stand/efi/loader/conf.c +++ b/stand/efi/loader/conf.c @@ -80,22 +80,18 @@ struct netif_driver *netif_drivers[] = { }; extern struct console efi_console; -extern struct console comconsole; -#if defined(__amd64__) -extern struct console eficomconsole; -#endif +extern struct console eficom; #if defined(__amd64__) || defined(__i386__) +extern struct console comconsole; extern struct console nullconsole; extern struct console spinconsole; #endif struct console *consoles[] = { &efi_console, -#if defined(__amd64__) - &eficomconsole, -#endif - &comconsole, + &eficom, #if defined(__amd64__) || defined(__i386__) + &comconsole, &nullconsole, &spinconsole, #endif diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiserialio.c index 0f37ef8b87dd..de4d6b3e34c1 100644 --- a/stand/efi/loader/efiserialio.c +++ b/stand/efi/loader/efiserialio.c @@ -69,14 +69,9 @@ static int comc_speed_set(struct env_var *, int, const void *); static struct serial *comc_port; extern struct console efi_console; -bool efi_comconsole_avail = false; -#if defined(__amd64__) -#define comconsole eficomconsole -#endif - -struct console comconsole = { - .c_name = "comconsole", +struct console eficom = { + .c_name = "eficom", .c_desc = "serial port", .c_flags = 0, .c_probe = comc_probe, @@ -259,18 +254,6 @@ comc_probe(struct console *sc) char *env, *buf, *ep; size_t sz; -#if defined(__amd64__) - /* - * For x86-64, don't use this driver if not running in Hyper-V. - */ - env = getenv("smbios.bios.version"); - if (env == NULL || strncmp(env, "Hyper-V", 7) != 0) { - /* Disable being seen as "comconsole". */ - comconsole.c_name = "efiserialio"; - return; - } -#endif - if (comc_port == NULL) { comc_port = calloc(1, sizeof (struct serial)); if (comc_port == NULL) @@ -339,13 +322,9 @@ comc_probe(struct console *sc) env_setenv("efi_com_speed", EV_VOLATILE, value, comc_speed_set, env_nounset); - comconsole.c_flags = 0; + eficom.c_flags = 0; if (comc_setup()) { sc->c_flags = C_PRESENTIN | C_PRESENTOUT; - efi_comconsole_avail = true; - } else { - /* disable being seen as "comconsole" */ - comconsole.c_name = "efiserialio"; } } @@ -356,7 +335,7 @@ comc_init(int arg __unused) if (comc_setup()) return (CMD_OK); - comconsole.c_flags = 0; + eficom.c_flags = 0; return (CMD_ERROR); } @@ -522,35 +501,41 @@ comc_setup(void) if (comc_port->sio == NULL) return (false); - status = comc_port->sio->Reset(comc_port->sio); - if (EFI_ERROR(status)) - return (false); - - ev = getenv("smbios.bios.version"); - if (ev != NULL && strncmp(ev, "Hyper-V", 7) == 0) { - status = comc_port->sio->SetAttributes(comc_port->sio, - 0, 0, 0, DefaultParity, 0, DefaultStopBits); - } else { - status = comc_port->sio->SetAttributes(comc_port->sio, - comc_port->baudrate, comc_port->receivefifodepth, - comc_port->timeout, comc_port->parity, - comc_port->databits, comc_port->stopbits); + if (comc_port->sio->Reset != NULL) { + status = comc_port->sio->Reset(comc_port->sio); + if (EFI_ERROR(status)) + return (false); } - if (EFI_ERROR(status)) - return (false); + if (comc_port->sio->SetAttributes != NULL) { + ev = getenv("smbios.bios.version"); + if (ev != NULL && strncmp(ev, "Hyper-V", 7) == 0) { + status = comc_port->sio->SetAttributes(comc_port->sio, + 0, 0, 0, DefaultParity, 0, DefaultStopBits); + } else { + status = comc_port->sio->SetAttributes(comc_port->sio, + comc_port->baudrate, comc_port->receivefifodepth, + comc_port->timeout, comc_port->parity, + comc_port->databits, comc_port->stopbits); + } - status = comc_port->sio->GetControl(comc_port->sio, &control); - if (EFI_ERROR(status)) - return (false); - if (comc_port->rtsdtr_off) { - control &= ~(EFI_SERIAL_REQUEST_TO_SEND | - EFI_SERIAL_DATA_TERMINAL_READY); - } else { - control |= EFI_SERIAL_REQUEST_TO_SEND; + if (EFI_ERROR(status)) + return (false); + } + + if (comc_port->sio->GetControl != NULL && comc_port->sio->SetControl != NULL) { + status = comc_port->sio->GetControl(comc_port->sio, &control); + if (EFI_ERROR(status)) + return (false); + if (comc_port->rtsdtr_off) { + control &= ~(EFI_SERIAL_REQUEST_TO_SEND | + EFI_SERIAL_DATA_TERMINAL_READY); + } else { + control |= EFI_SERIAL_REQUEST_TO_SEND; + } + (void) comc_port->sio->SetControl(comc_port->sio, control); } - (void) comc_port->sio->SetControl(comc_port->sio, control); /* Mark this port usable. */ - comconsole.c_flags |= (C_PRESENTIN | C_PRESENTOUT); + eficom.c_flags |= (C_PRESENTIN | C_PRESENTOUT); return (true); } diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index 507cd0ec922f..6d48e876fa37 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -85,20 +85,6 @@ comc_probe(struct console *cp) int speed, port; uint32_t locator; -#if defined(__amd64__) - extern bool efi_comconsole_avail; - - if (efi_comconsole_avail) { - /* - * If EFI provides serial I/O, then don't use this legacy - * com driver to avoid conflicts with the firmware's driver. - * Change c_name so that it cannot be found in the lookup. - */ - comconsole.c_name = "xcomconsole"; - return; - } -#endif - if (comc_curspeed == 0) { comc_curspeed = COMSPEED; /* From nobody Thu May 11 20:06:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNFz4VTHz49xRr; Thu, 11 May 2023 20:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHNFz3Vc3z3njZ; Thu, 11 May 2023 20:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81nEfv/JdhDqObL+LA/RpDTwhLIrEvWRwENohQjj4Rs=; b=E20covy0fbPoM9/Eh7oU/erjevMe7VLdrnsUP9sHOl3/kAxGh1ZdqItBen9VZtj2sWjBwH wAxYvUCF19+myPvDfkA8WBOf9VRJV0wmpL2pD92LkUPyQ8JO+xFmTfvLTidI7k9dWS5TC3 4CM22+VO5WDySDhDO+tm/v7iX/vCb7x6ypq/fzr1jH+fxkWT9GIF7vHxu+uXf9UsczO+Ts bfCt5sA6JOmiY8sWA8s54+oYunp8VViNRvuqIxjLxTeeSXndtAFtDMOSO83Gpg+ztu1LH5 7yjI6vG4olDx9gVW9k867vH/DZhu7v/8ztexWqddPLNLSbyZ5lEriwu1te3avQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=81nEfv/JdhDqObL+LA/RpDTwhLIrEvWRwENohQjj4Rs=; b=HDPzg9EjumfeTx9om+eJ/GvHKdMKfYeBagRtn2kLfKZzu420ZYqHBAWW2i1U80rrWjp0Ej VewCUIsYnVxycJq3OMC6rLPa8Le1tzPb9qpceJINCqW0PtOLgFNHXyMtYpOB4lRl+tnjgg 0pugR1ckWS4OvrgU2exNXWRBfgQZaHSiYPdH9dv46uFcu8CSY0qEuzjOiI+bL6v6BiwaWQ 6tYrVM0Ou+ip+2TOc+H8TkT8C/klyd+oWKE9EpCr738Buqhs0lVjmO7kH9y2BddUmaiIKh zISqRM6xXK6v9Cqndu0Yq5lLBW+lp19A1avuPSBFpDkZAlfF/dJePXhLryeOfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835607; a=rsa-sha256; cv=none; b=Hyx2hzeReR0+jawJUVmsx/iQZpqXXNNv8THtvKb29wsrcxlr2NltHHCg45HunjlTWE4t47 xLN0es9R5g0UnGtKV7cloYM5mptDYQ/J0q6MZbFQWEWNvWgEym+FnvQm5UYjRiWlh3OhJo Xd7YIg8EUSJVvdR+HI7M/KknnFrz6BPbHCzC8dXW3AOdwr/bkq114/PainEMfQfCrOGUHa XEhNzqEIXFyD5iHXDpIYLZbBUDA69o3/lwhKhHygwdfSoilbob5+24/jpA4HlRchAwwfEf rFyXRO114kvrJAUOwId97ov+HvrhRJS7VSvpsjxBBBkTRYsJU/PkVyAlrAjP0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNFz1xbxz16Gm; Thu, 11 May 2023 20:06: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 34BK6lNF019513; Thu, 11 May 2023 20:06:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6lp5019512; Thu, 11 May 2023 20:06:47 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:47 GMT Message-Id: <202305112006.34BK6lp5019512@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f93416d67743 - main - stand: add comconsole backwards compatibility shim for aarch64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f93416d677432f3a713c71b79fb68e89162baca9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f93416d677432f3a713c71b79fb68e89162baca9 commit f93416d677432f3a713c71b79fb68e89162baca9 Author: Warner Losh AuthorDate: 2023-05-11 20:03:30 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: add comconsole backwards compatibility shim for aarch64 Add a compat shim for the "comconsole" name so that people with a "console=comconsole" in their loader.conf on aarch64 will continue to work (though with a warning). This is only aarch64: it will never be there for amd64 (where comconsole always means talk to the hardware directly). To do that is too hard. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39983 --- stand/efi/loader/conf.c | 7 +++++++ stand/efi/loader/efiserialio.c | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c index e9ae01d19270..e84d8b6c366d 100644 --- a/stand/efi/loader/conf.c +++ b/stand/efi/loader/conf.c @@ -81,6 +81,10 @@ struct netif_driver *netif_drivers[] = { extern struct console efi_console; extern struct console eficom; +#if defined(__aarch64__) && __FreeBSD_version < 1500000 +/* Hack for backward compatibility -- but only for a while */ +extern struct console comconsole; +#endif #if defined(__amd64__) || defined(__i386__) extern struct console comconsole; extern struct console nullconsole; @@ -90,6 +94,9 @@ extern struct console spinconsole; struct console *consoles[] = { &efi_console, &eficom, +#if defined(__aarch64__) && __FreeBSD_version < 1500000 + &comconsole, +#endif #if defined(__amd64__) || defined(__i386__) &comconsole, &nullconsole, diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/loader/efiserialio.c index de4d6b3e34c1..16f28080f80e 100644 --- a/stand/efi/loader/efiserialio.c +++ b/stand/efi/loader/efiserialio.c @@ -81,6 +81,20 @@ struct console eficom = { .c_ready = comc_ischar, }; +#if defined(__aarch64__) && __FreeBSD_version < 1500000 +static void comc_probe_compat(struct console *); +struct console comconsole = { + .c_name = "comconsole", + .c_desc = "serial port", + .c_flags = 0, + .c_probe = comc_probe_compat, + .c_init = comc_init, + .c_out = comc_putchar, + .c_in = comc_getchar, + .c_ready = comc_ischar, +}; +#endif + static EFI_STATUS efi_serial_init(EFI_HANDLE **handlep, int *nhandles) { @@ -328,6 +342,17 @@ comc_probe(struct console *sc) } } +#if defined(__aarch64__) && __FreeBSD_version < 1500000 +static void +comc_probe_compat(struct console *sc) +{ + comc_probe(sc); + if (sc->c_flags & (C_PRESENTIN | C_PRESENTOUT)) { + printf("comconsole: comconsole device name is deprecated, switch to eficom\n"); + } +} +#endif + static int comc_init(int arg __unused) { From nobody Thu May 11 20:06:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNG06Mb9z49xCF; Thu, 11 May 2023 20:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHNG03v2yz3nY5; Thu, 11 May 2023 20:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZumQpYGTmSk1I/VP8n2S36h37vQmtiHJ4TyjibbcNpc=; b=XgUpXdSgBr/XRr4TMnVO4jV7y121jJFG5fe7es7SOmGs8+e2ksQNGJ2OsSfT9No9yExsoE vEm4YFr9lTzRuzHQoVJQ4XkSL2zwj+KiA0N7dGvjOy8RwjVbDSb2w5stc+8oQAbBbZwhdL wRPrHssd1noPrtQGn0XiXuPiGUvmLqj+Nl1+e3iK4Sb6UFHI2eBUeA5WLqajZ93onIQPIm GVctyX1BUjAWn7IU33I73Q/aKM1rHVusyFMVSBiM16etPEW/fniT4EKNa+yqRWihTYXLIl TG/lZsdIXaHsqyg1W4i4M+yYJNFx0FhZK7u3J8kSxGjdKzIhtxN5SHL+DTyaHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZumQpYGTmSk1I/VP8n2S36h37vQmtiHJ4TyjibbcNpc=; b=eUDLSUq1yZyNVXzhE8HLT01UdYSQlHUl60ZGHGdCfBJnz/UVUc6P7FZCBUuHIxK9ge28Fa sCIM5GHwv/sqkEOy7DhskdTEApM5kkNyiTnYK1e9WHQRWtjm2yXUXV2BMGUATasb8xBDEX hlafTUiaGLNiptwFIsrlEvFnlFrHn6QyKgby9W2dLmXyw8143cSDhV/eHyvO3c48gynihy rwQmIpygNPMsVIma6l34Qtv3pucIE0Ytc+CAnqH4js/9qW/NowEvOA5OYfcS1290CvXIt9 kG3zsegLPVnESdU7ydIhLhE23zRlPrxCLMMEniskpnyZF6BS+zFIo6rO/J5H/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835608; a=rsa-sha256; cv=none; b=l/el5qksAbzupzicbMZwkV4fElDJ3b+jJeYMSviK+n/t7CtMFfh/euN/OfrTHPeEZk2ED0 rx4czTDM5FJbNheApdh4d81TMROIlAkiNHaJAXWrKeWB/iHC0lM37AZzEAuTla967pyY44 oOvXlQRPRlKsgkTIKroTpozvcBAVW8mrsMoUVL0O4kViMgQTvdY173Zf6ma5jm1ody3rqT YGZMu6xPmEQNHHQrWv0VB41Oh+Qwx5o/TXq6f3zfta+RB5iIEePC2KDsFJsQJbVNTjZ9Pj XZpvL3f8iQbtrDIF7CJWvfKAgqNkVXJUb/z8CGEdSsFz5pUTADrZXwfhYRTVPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNG02lCFz15l4; Thu, 11 May 2023 20:06: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 34BK6mDX019538; Thu, 11 May 2023 20:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6mPB019537; Thu, 11 May 2023 20:06:48 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:48 GMT Message-Id: <202305112006.34BK6mPB019537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 82cf061eba45 - main - stand: Make non-matching console names OKer List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82cf061eba45fa56b2ed97998e08943da8159f56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=82cf061eba45fa56b2ed97998e08943da8159f56 commit 82cf061eba45fa56b2ed97998e08943da8159f56 Author: Warner Losh AuthorDate: 2023-05-11 20:03:37 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: Make non-matching console names OKer Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39984 --- stand/common/console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/common/console.c b/stand/common/console.c index 0e8afb477ee8..ae1bb7c9f952 100644 --- a/stand/common/console.c +++ b/stand/common/console.c @@ -238,7 +238,7 @@ cons_check(const char *string) if (*curpos != '\0') { cons = cons_find(curpos); if (cons == -1) { - printf("console %s is invalid!\n", curpos); + printf("console %s is unavailable\n", curpos); failed++; } else { found++; @@ -251,7 +251,7 @@ cons_check(const char *string) if (found == 0) printf("no valid consoles!\n"); - if (found == 0 || failed != 0) { + if (found == 0 && failed != 0) { printf("Available consoles:\n"); for (cons = 0; consoles[cons] != NULL; cons++) printf(" %s\n", consoles[cons]->c_name); From nobody Thu May 11 20:06:49 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNG15sbFz49xCG; Thu, 11 May 2023 20:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHNG14pjZz3nbw; Thu, 11 May 2023 20:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NuSSlHMuiZnxjQ33RuqUJpnyyyVWZyf5YlGIj6olGPQ=; b=XNxnFJ25TuDgju7LoN+fiyzSTUSnkw6KP5csB+a4NR34L1k604CyAnLyQjtBdqxkhTCdeh 6JNMPdmta7AQpaWBRXZlnG2PJXFmLgzQ10nDybnM8mzE4pBgBvo/IT8e2wMCvr6ROzNg+5 QRE7Cahr//LLGrhBA+l09aT4oXK/5iNuKBWVMC1agV1J/Za8+VkafsqRN2n7i2Sus8ylQw kR4QL9vraQdn7b4Ha/TpiSteNj2ZUGevjBuxEwa75IhA107GMWcfDVkn9y2pB+MWZmlw91 gRDFaje5Kc4oZzvDtbef7n0MOKWX8qPPMnDW0HhwzWCNY7LYbGyCX+lKsw1UpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NuSSlHMuiZnxjQ33RuqUJpnyyyVWZyf5YlGIj6olGPQ=; b=MXSTQiadu48cE772Udgv6bqesEo5lliXgXJQbT/tmvv7OY1BCbRWeIj2uh3Ke9LRnMwh+T quMl6d1Kne92Ia1jRZAzDEgytlIUEcCtWoe9FIvSzaSwzfSCohlihDhvBxyFNiZiUjd4NO 80oCviM4fb9OpQESksLKm/KJ7FfDkpmDnuV0Fcu/0WbBCcQ8V9BcaEyFvoB0UOkMzr/hRp PfslDn/9Xa1+aDGD5L/dL+z4nwbj2VnwZstQKiL/3zKWZRefUDEFREyP12lXEPUmlSoLvN MTzboK+tGNTP8oJrGOgcxoZIb4kqY1Inv60CHVUlRyulBT297/+jMRV8bULupQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835609; a=rsa-sha256; cv=none; b=ggDWQsSlWqW0URbWWGYdqKyAVWvfox7GXwCjp21KtGs7qj2RWfzvFtq3jGxk9dnFIIUr3L lwR9k6Ia8UM6Dpo4UkwB2uFLgl+xnAEGNljNUebC4m9Ubu8elXMMLjwZtzzaf6qGCRLgH3 Ydd8C7wAG+YVcXri7Uy9B+V0BQjJT1LVyJcpZuPUGwpX3MmBLuohtuY9RaQKkgPMW1sTKk aAYBQW9hzvyYhBUBDje7TY6FgZXRpS80xlZiwa39wtStyLKiJrtVceKXAboTEVWDwq0d1n c70GelKkD2rNkbmySW0/iT/HN3HdJFGKixz94HVmq97oDJrCnwTB6Ok5DhuJWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNG13h9lz16Gn; Thu, 11 May 2023 20:06: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 34BK6ntW019559; Thu, 11 May 2023 20:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6nrv019558; Thu, 11 May 2023 20:06:49 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:49 GMT Message-Id: <202305112006.34BK6nrv019558@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bab80c12a852 - main - stand: Move eficom to libefi List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bab80c12a852928b572293f34210c5a19aeba17a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bab80c12a852928b572293f34210c5a19aeba17a commit bab80c12a852928b572293f34210c5a19aeba17a Author: Warner Losh AuthorDate: 2023-05-11 20:03:42 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: Move eficom to libefi Rename efiserialc to eficom.c and move it to libefi. Remove loader.efi.h, since it's not needed. It's architecture independent (though how we use it might vary). Drivers also belong in libfoo in the boot loader: all the BIOS drivers are in i386/libi386 and the console driver is in efi/libefi. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D40007 --- stand/efi/libefi/Makefile | 1 + stand/efi/{loader/efiserialio.c => libefi/eficom.c} | 2 -- stand/efi/loader/arch/amd64/Makefile.inc | 1 - stand/efi/loader/arch/arm/Makefile.inc | 1 - stand/efi/loader/arch/arm64/Makefile.inc | 1 - stand/efi/loader/arch/riscv/Makefile.inc | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile index 8f1a30d86900..51970397fd86 100644 --- a/stand/efi/libefi/Makefile +++ b/stand/efi/libefi/Makefile @@ -11,6 +11,7 @@ SRCS= delay.c \ efi_console.c \ efi_driver_utils.c \ efichar.c \ + eficom.c \ efienv.c \ efihttp.c \ efinet.c \ diff --git a/stand/efi/loader/efiserialio.c b/stand/efi/libefi/eficom.c similarity index 99% rename from stand/efi/loader/efiserialio.c rename to stand/efi/libefi/eficom.c index 16f28080f80e..67f29ad99ea8 100644 --- a/stand/efi/loader/efiserialio.c +++ b/stand/efi/libefi/eficom.c @@ -34,8 +34,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include "loader_efi.h" - static EFI_GUID serial = SERIAL_IO_PROTOCOL; #define COMC_TXWAIT 0x40000 /* transmit timeout */ diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc index bd89044bd6c7..0d9e2648cb59 100644 --- a/stand/efi/loader/arch/amd64/Makefile.inc +++ b/stand/efi/loader/arch/amd64/Makefile.inc @@ -5,7 +5,6 @@ SRCS+= amd64_tramp.S \ elf64_freebsd.c \ trap.c \ multiboot2.c \ - efiserialio.c \ exc.S .PATH: ${BOOTSRC}/i386/libi386 diff --git a/stand/efi/loader/arch/arm/Makefile.inc b/stand/efi/loader/arch/arm/Makefile.inc index 284e517bfbb8..74e6616e991b 100644 --- a/stand/efi/loader/arch/arm/Makefile.inc +++ b/stand/efi/loader/arch/arm/Makefile.inc @@ -1,7 +1,6 @@ # $FreeBSD$ SRCS+= exec.c \ - efiserialio.c \ start.S HAVE_FDT=yes diff --git a/stand/efi/loader/arch/arm64/Makefile.inc b/stand/efi/loader/arch/arm64/Makefile.inc index 9978d9c4ea9c..a71bcc2e1a1f 100644 --- a/stand/efi/loader/arch/arm64/Makefile.inc +++ b/stand/efi/loader/arch/arm64/Makefile.inc @@ -3,7 +3,6 @@ HAVE_FDT=yes SRCS+= exec.c \ - efiserialio.c \ start.S .PATH: ${BOOTSRC}/arm64/libarm64 diff --git a/stand/efi/loader/arch/riscv/Makefile.inc b/stand/efi/loader/arch/riscv/Makefile.inc index 333b789e935d..032c8a43bd51 100644 --- a/stand/efi/loader/arch/riscv/Makefile.inc +++ b/stand/efi/loader/arch/riscv/Makefile.inc @@ -3,5 +3,4 @@ HAVE_FDT=yes SRCS+= exec.c \ - efiserialio.c \ start.S From nobody Thu May 11 20:06:50 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNG262rgz49xTk; Thu, 11 May 2023 20:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHNG25cxFz3p1S; Thu, 11 May 2023 20:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59fdFKI6QYHMztZaOi+2qJrSl6Fu8YU3sVI/zTMw5Jo=; b=wcK7M6EY87ZJxI9AuqjPZyTlDfi4IwNhcEK0l2zwge53ee1wQCr81PP/QbmU8DnJV0XIdx 58KJ2ZpN3S1xs5gnodydfjywcnkv6I3lFfONfmvhENKajdyYOz8dK4IcTxlHQ9r2QjeG/3 brAhCN3Yzju81+g9Og/XbsjQzT/gs7aE3HCWIEXeE8ZdZeKESLLZwS2K0RDTkz72domHXz c4TMQHN7gaIi5Hu0HTGgjs8Mv4JhF1r5N2ScTCU7IZrAco/hwmyHWdcq8cpeBWfTDlk/EG hkDamRWqHwoYpJDb6VQLG8ucyy+rv9lDSWV/efKu+T71PZuxvt9xM1yDXOVE7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835610; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=59fdFKI6QYHMztZaOi+2qJrSl6Fu8YU3sVI/zTMw5Jo=; b=TPJlx+L9y3zi112MZtl/jxUzNJeRSeAthGxckB4/XO3NrTXN8BupSPieTa6pVZgKYYJ/i9 AMax6bk/32tEVPyVyuD/53k49pzYgOd6CDHI6qwNE/vehxkQj2KkY9q4tXGAqx6QOSAy3F 4LKYsMG89cG3QxaKnj9xaVr4f2kHFfEKy1fBtZAjBN0OVs2dkIauH/T4L5H5mKEkTFrt2X P4Oa4dwkWcNOsm24Mhv0c0qRs9mWwooA1ihwdibTVBCXAtwz/4zosqcZSnu3vycraRfXJG OyQwxu/tz7h4ExuRbK6Is25Y9Jv8ob+y/ZpGNIZQ+GSmdbkVhnkk2A++0l/Ztg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835610; a=rsa-sha256; cv=none; b=irMhOvbb4u5G4I53GmXCXR7NPeWsJ/ydiEDPXZofoesltt6wzuJY/1uJj4H3860aW5sHWp 4KrlQCospg67d1lilIPS6qiDrR5r/57Nq3oirW/ywxMgZ33KtfHEOSAWLeKcY109wTvrF7 8Sg//bsd+fZNj5kUxrKsO89hstEW+CABl2ECUNBAUx2AJrGLcA0cIfOVr0fCEo7F1nNZiv UUYmktzos+nvcOshERP62SmMmIENul6fvUEaeXRK/WSr9NnP9Y3zExXFCER4E67GrQpg4s zyQABILN0FGbQwSP7nMLM2b4+RZmWGqHXked3SbrdNg0GOAqK5KWBW21xoAR6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNG24cWLz16D2; Thu, 11 May 2023 20:06: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 34BK6o6g019581; Thu, 11 May 2023 20:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6oKC019580; Thu, 11 May 2023 20:06:50 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:50 GMT Message-Id: <202305112006.34BK6oKC019580@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 66826fd54ab1 - main - stand: eficom : remove unused ignore_cd List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66826fd54ab177dfe9f922da10124ea6ce6833be Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=66826fd54ab177dfe9f922da10124ea6ce6833be commit 66826fd54ab177dfe9f922da10124ea6ce6833be Author: Warner Losh AuthorDate: 2023-05-11 20:03:47 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: eficom : remove unused ignore_cd Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D40008 --- stand/efi/libefi/eficom.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index 67f29ad99ea8..8d14209f8484 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -47,7 +47,6 @@ struct serial { uint32_t databits; EFI_PARITY_TYPE parity; EFI_STOP_BITS_TYPE stopbits; - uint32_t ignore_cd; /* boolean */ uint32_t rtsdtr_off; /* boolean */ int ioaddr; /* index in handles array */ EFI_HANDLE currdev; /* current serial device */ @@ -276,7 +275,6 @@ comc_probe(struct console *sc) comc_port->databits = 8; comc_port->parity = DefaultParity; comc_port->stopbits = DefaultStopBits; - comc_port->ignore_cd = 1; /* ignore cd */ comc_port->rtsdtr_off = 0; /* rts-dtr is on */ handle = NULL; From nobody Thu May 11 20:06:51 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNG40rFBz49xCM; Thu, 11 May 2023 20:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHNG36fbDz3nsN; Thu, 11 May 2023 20:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhv1VlDcwGJOsJEThz4Uu8iMlwPvu3Kb1s70fsOJ2bQ=; b=AH+SE5/vNC/cmwoQbxO9b8MIbal4vqxKc4nO5VjQORipK9c9sBJiB0PIrfTvVz31H2Z7Nq hKizwYzvdBbMGvV3HtglPg8LEkptMaTcNsCKYfeJ1ndbNNbZ2wQ5a9eDQrhJye3FxcYUO1 rl1JYfcrLDaOXXsncWqWz0M/vVH33byGXvBX5JxxmZFYstgJW4FZHquJwFNWlaSrwIoV+L G1WDIbWCPK/STQZI65ux2OASCDLuXJmi6ZmBwXyE2nEQA5qNGLGztnDtLWwztBa47C9H1o FCKEHStbcdBSCavxCfsCYoikgSV+UN2DXt1ul18t+a0kmL5ZHGGWkjioiIBLmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhv1VlDcwGJOsJEThz4Uu8iMlwPvu3Kb1s70fsOJ2bQ=; b=VnFSBhjp64isHwX2RCpd8YYvlRMWSHKO+Se4hBFOmSa3U4kkCifxwDzOSfFkcT08ZAYKYr oWERVB3yZnL9ivpZdLvN/0lP5zrrcOqvBAROqjxBs3uIrApugndlgpb+t/g6hupgIkvJsC 1uazAnxFDICUNmwmGCmxgJNaJY8dMG2VYr8AXvXJpQVueJkzuEfdkbg6wSxTQMx77PcDvA SrLXMDQ+nz9IzMx4WxlWNiht7mvH/8xIA5upau6i7+zD0A5ssV7PNYyiCME7XAv2CLgTcH f9dIevcydPERbtmJeTkcW3ok/rY++ZHQ9cb1ntvhH+y4OESg2J2tUZFoRT1Oug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835611; a=rsa-sha256; cv=none; b=mURTLONHtEaQnMgLkHdMWxaE1NH54QQBQUlDTomiGggPlgE8wbPz+4rmsxYTyiPQVHDmVX KmUvBXKDsYcRnWVOm4iOlKDhV4AswTZm0o+ZouAZc7TSMaYkIcmArxcUsVtaQXEYk01MHE +fCwh1cwqOWSEyIxGo2Jj3nmO7fzNahGZndt/VxkWfn7bX7vUkqHvFKAEYpn2BlobfIU2O B2r0RONM9xW3zv5GBKElncB9xiHUQcJh1p++4xgb1v6haeBL1NJsfMUPPNwqekMpCkWa1W g9ra4EnCWtudvlAOG1decsMJNRGoCwc6YrNnHD76aZsDVgpiQn4xlEAsqnLOqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNG35YcVz15rK; Thu, 11 May 2023 20:06: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 34BK6p3G019601; Thu, 11 May 2023 20:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6ps6019600; Thu, 11 May 2023 20:06:51 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:51 GMT Message-Id: <202305112006.34BK6ps6019600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cb2da74905c1 - main - stand: eficom: Don't preemtively assume flow control List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb2da74905c1cf6e0cc1d91f347030fa1e12cc81 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2da74905c1cf6e0cc1d91f347030fa1e12cc81 commit cb2da74905c1cf6e0cc1d91f347030fa1e12cc81 Author: Warner Losh AuthorDate: 2023-05-11 20:03:51 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: eficom: Don't preemtively assume flow control Remove rtsdtr_off. It's basically unused. Expand its meaning, but put changing flow control to under an ifdef. We shouldn't set it unless we're sure we need to do so. UEFI normally initializes the device correctly, and we should avoid needless changes that aren't user requested. Sponsored by: Netflix Reviewed by: tsoome Differential Revision: https://reviews.freebsd.org/D40009 --- stand/efi/libefi/eficom.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index 8d14209f8484..b0fc0d8fbf6a 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -47,7 +47,6 @@ struct serial { uint32_t databits; EFI_PARITY_TYPE parity; EFI_STOP_BITS_TYPE stopbits; - uint32_t rtsdtr_off; /* boolean */ int ioaddr; /* index in handles array */ EFI_HANDLE currdev; /* current serial device */ EFI_HANDLE condev; /* EFI Console device */ @@ -275,7 +274,6 @@ comc_probe(struct console *sc) comc_port->databits = 8; comc_port->parity = DefaultParity; comc_port->stopbits = DefaultStopBits; - comc_port->rtsdtr_off = 0; /* rts-dtr is on */ handle = NULL; env = getenv("efi_com_port"); @@ -515,7 +513,6 @@ static bool comc_setup(void) { EFI_STATUS status; - UINT32 control; char *ev; /* port is not usable */ @@ -544,18 +541,17 @@ comc_setup(void) return (false); } +#ifdef EFI_FORCE_RTS if (comc_port->sio->GetControl != NULL && comc_port->sio->SetControl != NULL) { + UINT32 control; + status = comc_port->sio->GetControl(comc_port->sio, &control); if (EFI_ERROR(status)) return (false); - if (comc_port->rtsdtr_off) { - control &= ~(EFI_SERIAL_REQUEST_TO_SEND | - EFI_SERIAL_DATA_TERMINAL_READY); - } else { - control |= EFI_SERIAL_REQUEST_TO_SEND; - } + control |= EFI_SERIAL_REQUEST_TO_SEND; (void) comc_port->sio->SetControl(comc_port->sio, control); } +#endif /* Mark this port usable. */ eficom.c_flags |= (C_PRESENTIN | C_PRESENTOUT); return (true); From nobody Thu May 11 20:06:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNG50lvqz49xWy; Thu, 11 May 2023 20:06: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 4QHNG50F2zz3p0M; Thu, 11 May 2023 20:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usrcfwdBCef6XYURNQCFf/xhXMRTBx8qx10eQT29w1k=; b=xckmcW3XJzqJObmqRUkHp+/sm1wG0HXmJcrtYUjIno1xILbxYXYiGvO11MYTI8aQDeq9ef +uJKUBSsqjhDvJJdO9m+H8Hw+oyNzbnIxlpgbNZO2YCqT6qPPUyEgv8t7jbY0KEbzfwcQq LfImeuEYXPrbqH4ZwJKT/N+hfYatAxkHPA8Sx+AcZHZUAo4uR1GwuFtRd2wi5sauHs83uR y9gNeDgvcM/DsCmlWXckkj6sfsCsdDLCg743/mDemuxgSSte/SnThAPitoLHgciBI6RflH gpwPpiF5oiViC4J7CdYsyZHvQmhLLPc3KHn7kpw9v6WlRMFbjfzs/YbFfEyIkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=usrcfwdBCef6XYURNQCFf/xhXMRTBx8qx10eQT29w1k=; b=Qpe5wyX3LkvO+w+/NuRyztLn0FN3tumsgKNrBBuC7vaWrS77PhroluHyCX2dqoQ6sAGNKw ADehR5Lb8oN1JWIgalzMKZYKzdpuUDqQZubpKDVsj7Z96V3RkWzomTVEY+FdPwyrGgXKqS lTtJCfsW8VfB51bmfIz8rIGM1hDaMDomXEGusLwpbpxmVhB48YXo8zx8dazO+ZNP6rjROR T5dE87PLDPEDlhTporpxaC4sFKA00L+hjIHXcoKJGKmr3J3WE0K6ApBV5rHxgk0OuHey6z TLpyDNi5ECYSn1KfruFJ636ACutvlUt0amTbvKoUsfHi9zfS/XZr4460EHgxfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835613; a=rsa-sha256; cv=none; b=eTJ+lfRHdKoSLj3NMFFAr+HEcN5NFgrgw+lk42GqYqb652vmSJEQc9SMMdnFWxXbbMO4r5 mGQ5J6xBqmsN+IHhPc1X+x0PZmjPl7IBpmyVSK7R+HDQD4t1j57PQHG6cqRKV0RfgL4ng6 fcpicCLXqx0dkhjOIguC12ytRryOwX2IYvRRyd8L4NafyAwQagQI1hc9e5nLCt4iGhnTSm dSrB/DQfJvLEbIGQRB+PxMC45v6hs/JaliJ/w/Sg163rPuVlGfKXaijfcOottmxV+CEoHg vlUgGY1mNIsvSGXkcoxMbHbwGLmwVt2iV5T6Ywmivwa+byHvUFWF28LwY6ZPCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNG46SYKz16D5; Thu, 11 May 2023 20:06: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 34BK6qkX019620; Thu, 11 May 2023 20:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6q0Z019619; Thu, 11 May 2023 20:06:52 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:52 GMT Message-Id: <202305112006.34BK6q0Z019619@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8c3d6917c1f1 - main - stand: eficom: Only set baudrate when it changes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c3d6917c1f127f70719193959ff42f3f1ab8f5f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8c3d6917c1f127f70719193959ff42f3f1ab8f5f commit 8c3d6917c1f127f70719193959ff42f3f1ab8f5f Author: Warner Losh AuthorDate: 2023-05-11 20:04:00 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand: eficom: Only set baudrate when it changes Only set the baudrate when it is different than what the device has reported. In addition, pass in the args to effect no change to the other parameters to the serial port. Some EFI firmware gets cranky when you set them to the same value, so avoid doing so (we likely can remove the HyperV workaround with this fix, but I kept it in place). Add comments to the code for why we do this too. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D40010 --- stand/efi/libefi/eficom.c | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index b0fc0d8fbf6a..b1c84399a05d 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -41,6 +41,7 @@ static EFI_GUID serial = SERIAL_IO_PROTOCOL; #define PNP0501 0x501 /* 16550A-compatible COM port */ struct serial { + uint64_t newbaudrate; uint64_t baudrate; uint32_t timeout; uint32_t receivefifodepth; @@ -300,7 +301,8 @@ comc_probe(struct console *sc) if (EFI_ERROR(status)) { comc_port->sio = NULL; } else { - comc_port->baudrate = comc_port->sio->Mode->BaudRate; + comc_port->newbaudrate = + comc_port->baudrate = comc_port->sio->Mode->BaudRate; comc_port->timeout = comc_port->sio->Mode->Timeout; comc_port->receivefifodepth = comc_port->sio->Mode->ReceiveFifoDepth; @@ -322,7 +324,7 @@ comc_probe(struct console *sc) env = getenv("comconsole_speed"); if (comc_parse_intval(env, &val) == CMD_OK) - comc_port->baudrate = val; + comc_port->newbaudrate = val; if (env != NULL) unsetenv("efi_com_speed"); @@ -497,10 +499,9 @@ comc_speed_set(struct env_var *ev, int flags, const void *value) if (comc_parse_intval(value, &speed) != CMD_OK) return (CMD_ERROR); - comc_port->baudrate = speed; - (void) comc_setup(); - - env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); + comc_port->newbaudrate = speed; + if (comc_setup()) + env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); return (CMD_OK); } @@ -525,20 +526,24 @@ comc_setup(void) return (false); } - if (comc_port->sio->SetAttributes != NULL) { + /* + * Avoid setting the baud rate on Hyper-V. Also, only set the baud rate + * if the baud rate has changed from the default. And pass in '0' or + * DefaultFoo when we're not changing those values. Some EFI + * implementations get cranky when you set things to the values reported + * back even when they are unchanged. + */ + if (comc_port->sio->SetAttributes != NULL && + comc_port->newbaudrate != comc_port->baudrate) { ev = getenv("smbios.bios.version"); - if (ev != NULL && strncmp(ev, "Hyper-V", 7) == 0) { + if (ev != NULL && strncmp(ev, "Hyper-V", 7) != 0) { status = comc_port->sio->SetAttributes(comc_port->sio, - 0, 0, 0, DefaultParity, 0, DefaultStopBits); - } else { - status = comc_port->sio->SetAttributes(comc_port->sio, - comc_port->baudrate, comc_port->receivefifodepth, - comc_port->timeout, comc_port->parity, - comc_port->databits, comc_port->stopbits); + comc_port->newbaudrate, 0, 0, DefaultParity, 0, + DefaultStopBits); + if (EFI_ERROR(status)) + return (false); + comc_port->baudrate = comc_port->newbaudrate; } - - if (EFI_ERROR(status)) - return (false); } #ifdef EFI_FORCE_RTS From nobody Thu May 11 20:06:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNG62Bj9z49xG9; Thu, 11 May 2023 20:06: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 4QHNG60mnfz3p6Z; Thu, 11 May 2023 20:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykwxEd1cFRxIbzxnyHsQESXiDnlyxdz/YCBfAk/4qDU=; b=YOze75PcQ9dVGAfzP7EbhS4hgN8mbSy93eE1PFRlPNLWFq63/tbgZy0PYj+HuvhxicbTll JwSGd03R7NGSchnfjh/JepHo0mijUJCKdO8roUCADElFObFFP0CTN50ZFSLt5ue0ibYZwm Dyaw4JiqvYXOFtmbuf21hUN4wMSC6wsMQLmNc74s2YZ+76eAmfq9cxr/Mib7nD9DR6inVR F/kH+8vUY7vRTpfv97AKx5ixmnOE9alpBZsqVDSbPT6yQgeP4swAAznHZXHMJB8Mdd8gFb MKMJXtIGvcXFbcqkexYPE38kZprJ6wyORNGyyvAf4H9k5sXtj/Yv1quCLPcLlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ykwxEd1cFRxIbzxnyHsQESXiDnlyxdz/YCBfAk/4qDU=; b=rRvv6ZW/zvp1FOflOJyYizPo+Guovm5/g01TPuimNqxpon5V4eCUGq6qGfQP/8RK/kcvcJ nce/aUWNmuf4KPTml4mco/K7MIJF5s3BIc4lh76Q9dcI3Z+7OEMRAk2Dew/H3XxaIuIEhc ukQfK4TKJbHgyqJkaiK1G/n7PR+jNbr7IuGb18b5Xf1w/EObbaIUmMqvMAzK0leO1Kv4iX 2KDI9AwhkiIEjNvXv7drQIuO0X2NFUHwCtXgib8WXezfkgL4hSOmaDl1pWk7tFAK1U5kDy Mv4FSks/yJusbQH9tdaCxG+qYTb1tl6Ztv32unSQw65N0yAyGbOiFq2jCxvzVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835614; a=rsa-sha256; cv=none; b=c6DJjqYwPpApRIW42+cMjHUabX3y+dhTm9OerZT/WUafLzOEXLXfhgnVuq2cj1p8BZVs03 5xqLk3YCazXZDkprT/+4yvVnQOH0236BujYSzjq5xKy5YOykJry1ctjwOqbHd35Q4yxlCB kRqIIqQNo4KnK5b3ZOUdN4xJVpYnysxFSv3xHhLlYyZZzT5YF4B6zdaYKDBOw0i+GtSTRe /cBTS3ZaPO6d8wIVY46wuk9xTzgZjuimPJEShwCVwNRWlgitEPvopaE+8M4k4Addf7gZ09 otNS8+v3xiWNamyHwrgRUaVmDRX/wTSioc/FvIx00yxH0A3p+kRNPgqAzCYcuA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNG56x5Pz15l5; Thu, 11 May 2023 20:06: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 34BK6raW019640; Thu, 11 May 2023 20:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6r7M019639; Thu, 11 May 2023 20:06:53 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:53 GMT Message-Id: <202305112006.34BK6r7M019639@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ad9d10a859ac - main - efi: mark as broken on i386 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad9d10a859ac2c65076f532dcfcc3bf5328a8ab1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ad9d10a859ac2c65076f532dcfcc3bf5328a8ab1 commit ad9d10a859ac2c65076f532dcfcc3bf5328a8ab1 Author: Warner Losh AuthorDate: 2023-05-11 20:04:05 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 efi: mark as broken on i386 We're never going to support EFI booting on i386 (32-bit). Start to decommission it, since it's never worked. Sponsored by: Netflix Reviewed by: tsoome, emaste Differential Revision: https://reviews.freebsd.org/D40011 --- share/mk/src.opts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index c61ce50a7c4e..f828bdc0151b 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -296,8 +296,8 @@ __DEFAULT_YES_OPTIONS+=LIB32 .else BROKEN_OPTIONS+=LIB32 .endif -# EFI doesn't exist on powerpc (well, officially) -.if ${__T:Mpowerpc*} +# EFI doesn't exist on powerpc (well, officially) and doesn't work on i386 +.if ${__T:Mpowerpc*} || ${__T} == "i386" BROKEN_OPTIONS+=EFI .endif # OFW is only for powerpc, exclude others From nobody Thu May 11 20:06:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHNG71rVSz49x6Y; Thu, 11 May 2023 20:06: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 4QHNG71SpKz3nr5; Thu, 11 May 2023 20:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uSg6CUJNvo3nCRjrpt8epjSlvFClE+i27SFySX9okLw=; b=ZAB4gdPKJzhbaGmEWfd/LjJ143hUBGpWmTazTaPlav4m/YnTbQmrKqmwZibdJZ8ZCFS0ox Pr7C4sTdKvaU7+M3GQtfUleTNEqjTH3jQMzdBW2JqnvWZRxgn9zhQRcNGk8z5tbEjkn1PV VObBsOOnZs0FdRrH0aBuEQfnfRnfkmFUG8wc5oKunSGrf3Egv4Dd1FOFceh0SrMljhAJBc LlCNr3CZK29ACM48ODZvD3UE7zxrJHdH5Q4g2a9dX5Xd2jRAIBr6Sp8/BEgeqvHghWlL66 L4WITHJBx1GyjUWm8lyrsVdzQcqvuiek/4A6gvdpRlDvfWdMSnur2L36Sl7H5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683835615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uSg6CUJNvo3nCRjrpt8epjSlvFClE+i27SFySX9okLw=; b=XXZagRcqlT+d1cnd1YeplUFnjaX2Av5CpnSktNaVTw6SHreR4LAKFur7+broz30dnYxdkL 0gNGIgjZtxADWn/wVjsbe7ZHZlSmNKOTHsBiA25KrwYHx+HVC8N9Wy2Nu2MGmdEZO6QB1b Jrv79PzC+yh3iS7kDiIYhxKvUNuIH/oCVUulfShV1cefPuCKc6cWe/zWeDOYrF8cI5RK0s Cu+kqVdIuNaJu1e73+/7gx++brsf8Nhy824aB5wapqNwR1OJYKW0cIKMzt1BD12cWvCeaj WUA0IIe+NJVJNW3z2KfVutRgq/UadhBechZf1F6uMfvm3AYONn0Y+HCf2YWOsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683835615; a=rsa-sha256; cv=none; b=QShKCYxfq4Igr94nC4hh34xPzXgmZdXfmeA6Rh0g/20wqkxLYzoKwfPEKPPUGirA9uw8dD UcXvwd+7c7ohXbO0FKRn38Z4b/L+8IylXuU5tR+yJFo/s2gm1eLsx8J5zv2jLTkP6Dv1Ji podyLbobw16y1zVKRi+EP6kkkBRfJ4UTLThrlPg6Nb/0+2WHUwuk2Yc89KL4An613nAnOv 0U1q1WEtGzBi3E6UoziR/h7o1xMk/GXqLpsPmyBfI/fXNbigRxKWDUEUg3qj8i01u1oC2g TjfTHZTsU1fifaXo7fUuyzCyIyDAWq8f42NP7tEcxbrT5V+KPuPgvwiXl/ttLA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHNG706yxz15rL; Thu, 11 May 2023 20:06: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 34BK6svT019669; Thu, 11 May 2023 20:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BK6sca019665; Thu, 11 May 2023 20:06:54 GMT (envelope-from git) Date: Thu, 11 May 2023 20:06:54 GMT Message-Id: <202305112006.34BK6sca019665@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c16e08e5f324 - main - stand/efi: Retire i386 support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c16e08e5f324aa119c85e10eaabacbd2abdb40e0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c16e08e5f324aa119c85e10eaabacbd2abdb40e0 commit c16e08e5f324aa119c85e10eaabacbd2abdb40e0 Author: Warner Losh AuthorDate: 2023-05-11 20:04:12 +0000 Commit: Warner Losh CommitDate: 2023-05-11 20:06:03 +0000 stand/efi: Retire i386 support Remove the i386 ifdefs and files. It never worked. Sponsored by: Netflix Reviewed by: manu, tsoome, kevans Differential Revision: https://reviews.freebsd.org/D40012 --- stand/efi/Makefile.inc | 2 - stand/efi/boot1/Makefile | 7 +- stand/efi/libefi/Makefile | 2 +- stand/efi/loader/arch/i386/Makefile.inc | 13 ---- stand/efi/loader/arch/i386/elf32_freebsd.c | 103 ----------------------------- stand/efi/loader/arch/i386/exec.c | 49 -------------- stand/efi/loader/arch/i386/i386_copy.c | 58 ---------------- stand/efi/loader/arch/i386/ldscript.i386 | 77 --------------------- stand/efi/loader/arch/i386/start.S | 68 ------------------- stand/efi/loader/conf.c | 4 +- stand/efi/loader/copy.c | 17 ++--- 11 files changed, 12 insertions(+), 388 deletions(-) diff --git a/stand/efi/Makefile.inc b/stand/efi/Makefile.inc index c2d803ddc1ab..9077c7ddebf7 100644 --- a/stand/efi/Makefile.inc +++ b/stand/efi/Makefile.inc @@ -21,8 +21,6 @@ CFLAGS+= -fPIC .if ${MACHINE_CPUARCH} == "amd64" EFI_TARGET= efi-app-x86_64 -.elif ${MACHINE_CPUARCH} == "i386" -EFI_TARGET= efi-app-ia32 .else EFI_TARGET= binary .endif diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index daedc627e5dc..b4d1a1ed085e 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -74,7 +74,7 @@ LDFLAGS+= -Wl,--no-dynamic-linker .if ${MACHINE_CPUARCH} == "aarch64" CFLAGS+= -mgeneral-regs-only .endif -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" CFLAGS+= -fPIC LDFLAGS+= -Wl,-znocombreloc .endif @@ -82,9 +82,8 @@ LDFLAGS+= -Wl,-znocombreloc LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a # -# Add libsa for the runtime functions used by the compiler - for example -# __aeabi_* (arm) or __divdi3 (i386). -# as well as required string and memory functions for all platforms. +# Add libsa for the runtime functions used by the compiler as well as required +# string and memory functions for all platforms. # DPADD+= ${LIBEFI} ${LIBSA} LDADD+= ${LIBEFI} ${LIBSA} diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile index 51970397fd86..cf42e2b711f6 100644 --- a/stand/efi/libefi/Makefile +++ b/stand/efi/libefi/Makefile @@ -26,7 +26,7 @@ SRCS= delay.c \ .PATH: ${SYSDIR}/teken SRCS+= teken.c -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +.if ${MACHINE_CPUARCH} == "amd64" SRCS+= time.c .elif ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "riscv" SRCS+= time_event.c diff --git a/stand/efi/loader/arch/i386/Makefile.inc b/stand/efi/loader/arch/i386/Makefile.inc deleted file mode 100644 index fcdb6324b2f0..000000000000 --- a/stand/efi/loader/arch/i386/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -SRCS+= start.S \ - elf32_freebsd.c \ - exec.c - -.PATH: ${BOOTSRC}/i386/libi386 -SRCS+= nullconsole.c \ - comconsole.c \ - spinconsole.c - -CFLAGS+= -fPIC -LDFLAGS+= -Wl,-znocombreloc diff --git a/stand/efi/loader/arch/i386/elf32_freebsd.c b/stand/efi/loader/arch/i386/elf32_freebsd.c deleted file mode 100644 index 97d114f09610..000000000000 --- a/stand/efi/loader/arch/i386/elf32_freebsd.c +++ /dev/null @@ -1,103 +0,0 @@ -/*- - * Copyright (c) 1998 Michael Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#include "bootstrap.h" -#include "../libi386/libi386.h" -#include "../btx/lib/btxv86.h" - -extern void __exec(caddr_t addr, ...); -extern int bi_load(char *args, vm_offset_t *modulep, vm_offset_t *kernendp, - bool exit_bs); - -static int elf32_exec(struct preloaded_file *amp); -static int elf32_obj_exec(struct preloaded_file *amp); - -struct file_format i386_elf = { elf32_loadfile, elf32_exec }; -struct file_format i386_elf_obj = { elf32_obj_loadfile, elf32_obj_exec }; - -struct file_format *file_formats[] = { - &i386_elf, - &i386_elf_obj, - NULL -}; - -/* - * There is an ELF kernel and one or more ELF modules loaded. - * We wish to start executing the kernel image, so make such - * preparations as are required, and do so. - */ -static int -elf32_exec(struct preloaded_file *fp) -{ - struct file_metadata *md; - Elf_Ehdr *ehdr; - vm_offset_t entry, bootinfop, modulep, kernend; - int boothowto, err, bootdev; - - if ((md = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) - return(EFTYPE); - ehdr = (Elf_Ehdr *)&(md->md_data); - - efi_time_fini(); - - entry = ehdr->e_entry & 0xffffff; - - printf("Start @ 0x%x ...\n", entry); - - err = bi_load(fp->f_args, &modulep, &kernend, true); - if (err != 0) { - efi_time_init(); - return(err); - } - - /* At this point we've called ExitBootServices, so we can't call - * printf or any other function that uses Boot Services */ - - dev_cleanup(); - __exec((void *)entry, boothowto, bootdev, 0, 0, 0, bootinfop, modulep, kernend); - - panic("exec returned"); -} - -static int -elf32_obj_exec(struct preloaded_file *fp) -{ - return (EFTYPE); -} diff --git a/stand/efi/loader/arch/i386/exec.c b/stand/efi/loader/arch/i386/exec.c deleted file mode 100644 index 579f5593b24b..000000000000 --- a/stand/efi/loader/arch/i386/exec.c +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * Copyright (c) 2010 Rui Paulo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include "../btx/lib/btxv86.h" - -#include "../../common/bootstrap.h" - -uint32_t __base; -struct __v86 __v86; - -void -__v86int() -{ - printf("%s\n", __func__); - exit(1); -} - -void -__exec(caddr_t addr, ...) -{ -} diff --git a/stand/efi/loader/arch/i386/i386_copy.c b/stand/efi/loader/arch/i386/i386_copy.c deleted file mode 100644 index 2c4b0deb49cf..000000000000 --- a/stand/efi/loader/arch/i386/i386_copy.c +++ /dev/null @@ -1,58 +0,0 @@ -/*- - * Copyright (c) 1998 Michael Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD$"); - -/* - * MD primitives supporting placement of module data - * - * XXX should check load address/size against memory top. - */ -#include - -#include "libi386.h" -#include "btxv86.h" - -ssize_t -i386_copyin(const void *src, vm_offset_t dest, const size_t len) -{ - bcopy(src, PTOV(dest), len); - return(len); -} - -ssize_t -i386_copyout(const vm_offset_t src, void *dest, const size_t len) -{ - bcopy(PTOV(src), dest, len); - return(len); -} - -ssize_t -i386_readin(readin_handle_t fd, vm_offset_t dest, const size_t len) -{ - return (VECTX_READ(fd, PTOV(dest), len)); -} diff --git a/stand/efi/loader/arch/i386/ldscript.i386 b/stand/efi/loader/arch/i386/ldscript.i386 deleted file mode 100644 index e17212a1bddd..000000000000 --- a/stand/efi/loader/arch/i386/ldscript.i386 +++ /dev/null @@ -1,77 +0,0 @@ -/* $FreeBSD$ */ -OUTPUT_FORMAT("elf32-i386-freebsd", "elf32-i386-freebsd", "elf32-i386-freebsd") -OUTPUT_ARCH(i386) -ENTRY(_start) -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = 0; - ImageBase = .; - . = SIZEOF_HEADERS; - . = ALIGN(4096); - .text : { - *(.text .stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.plt) - } =0xCCCCCCCC - . = ALIGN(4096); - .data : { - *(.rodata .rodata.* .gnu.linkonce.r.*) - *(.rodata1) - *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) - *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) - *(.opd) - *(.data .data.* .gnu.linkonce.d.*) - *(.data1) - *(.plabel) - *(.dynbss) - *(.bss .bss.* .gnu.linkonce.b.*) - *(COMMON) - } - . = ALIGN(4096); - set_Xcommand_set : { - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; - } - set_Xficl_compile_set : { - __start_set_Xficl_compile_set = .; - *(set_Xficl_compile_set) - __stop_set_Xficl_compile_set = .; - } - . = ALIGN(4096); - __gp = .; - .sdata : { - *(.got.plt .got) - *(.sdata .sdata.* .gnu.linkonce.s.*) - *(dynsbss) - *(.sbss .sbss.* .gnu.linkonce.sb.*) - *(.scommon) - } - . = ALIGN(4096); - .dynamic : { *(.dynamic) } - . = ALIGN(4096); - .rel.dyn : { - *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) - *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) - *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) - *(.rel.got) - *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) - *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) - *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) - *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) - *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) - *(.rel.plt) - *(.relset_*) - *(.rel.dyn .rel.dyn.*) - } - . = ALIGN(4096); - .reloc : { *(.reloc) } - . = ALIGN(4096); - .hash : { *(.hash) } - . = ALIGN(4096); - .dynsym : { *(.dynsym) } - . = ALIGN(4096); - .dynstr : { *(.dynstr) } -} diff --git a/stand/efi/loader/arch/i386/start.S b/stand/efi/loader/arch/i386/start.S deleted file mode 100644 index b597f419d4a1..000000000000 --- a/stand/efi/loader/arch/i386/start.S +++ /dev/null @@ -1,68 +0,0 @@ -/*- - * Copyright (c) 2008-2010 Rui Paulo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ - */ - - .text - -#include - -#define EFI_SUCCESS 0 - -/* - * EFI entry point. - * _start(EFI_IMAGE image_handle, EFI_SYSTEM_TABLE *system_table); - * - * We calculate the base address along with _DYNAMIC, relocate us and finally - * pass control to efi_main. - */ - -ENTRY(_start) - pushl %ebp - movl %esp, %ebp - - pushl 12(%ebp) /* image_handle */ - pushl 8(%ebp) /* system_table */ - call 0f -0: popl %eax - movl %eax, %ebx - addl $ImageBase-0b, %eax - addl $_DYNAMIC-0b, %ebx - pushl %ebx /* dynamic */ - pushl %eax /* ImageBase */ - call self_reloc - popl %ebx /* remove ImageBase from the stack */ - popl %ebx /* remove dynamic from the stack */ - call efi_main -1: leave - ret -END(_start) - - .data - .section .reloc, "a" - .long 0 - .long 10 - .word 0 diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c index e84d8b6c366d..163b5835e4a7 100644 --- a/stand/efi/loader/conf.c +++ b/stand/efi/loader/conf.c @@ -85,7 +85,7 @@ extern struct console eficom; /* Hack for backward compatibility -- but only for a while */ extern struct console comconsole; #endif -#if defined(__amd64__) || defined(__i386__) +#if defined(__amd64__) extern struct console comconsole; extern struct console nullconsole; extern struct console spinconsole; @@ -97,7 +97,7 @@ struct console *consoles[] = { #if defined(__aarch64__) && __FreeBSD_version < 1500000 &comconsole, #endif -#if defined(__amd64__) || defined(__i386__) +#if defined(__amd64__) &comconsole, &nullconsole, &spinconsole, diff --git a/stand/efi/loader/copy.c b/stand/efi/loader/copy.c index d7ca5513516b..6a4e65f2dbc3 100644 --- a/stand/efi/loader/copy.c +++ b/stand/efi/loader/copy.c @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #define M(x) ((x) * 1024 * 1024) #define G(x) (1UL * (x) * 1024 * 1024 * 1024) -#if defined(__i386__) || defined(__amd64__) +#if defined(__amd64__) #include #include #include @@ -173,7 +173,7 @@ efi_verify_staging_size(unsigned long *nr_pages) out: free(map); } -#endif /* __i386__ || __amd64__ */ +#endif /* __amd64__ */ #if defined(__arm__) #define DEFAULT_EFI_STAGING_SIZE 32 @@ -284,7 +284,7 @@ command_staging_slop(int argc, char *argv[]) COMMAND_SET(staging_slop, "staging_slop", "set staging slop", command_staging_slop); -#if defined(__i386__) || defined(__amd64__) +#if defined(__amd64__) /* * The staging area must reside in the first 1GB or 4GB physical * memory: see elf64_exec() in @@ -295,11 +295,7 @@ get_staging_max(void) { EFI_PHYSICAL_ADDRESS res; -#if defined(__i386__) - res = G(1); -#elif defined(__amd64__) res = copy_staging == COPY_STAGING_ENABLE ? G(1) : G(4); -#endif return (res); } #define EFI_ALLOC_METHOD AllocateMaxAddress @@ -319,7 +315,7 @@ efi_copy_init(void) ess = DEFAULT_EFI_STAGING_SIZE; nr_pages = EFI_SIZE_TO_PAGES(M(1) * ess); -#if defined(__i386__) || defined(__amd64__) +#if defined(__amd64__) /* * We'll decrease nr_pages, if it's too big. Currently we only * apply this to FreeBSD VM running on Hyper-V. Why? Please see @@ -387,9 +383,8 @@ efi_check_space(vm_offset_t end) end += staging_slop; nr_pages = EFI_SIZE_TO_PAGES(end - staging_end); -#if defined(__i386__) || defined(__amd64__) +#if defined(__amd64__) /* - * i386 needs all memory to be allocated under the 1G boundary. * amd64 needs all memory to be allocated under the 1G or 4G boundary. */ if (end > get_staging_max()) @@ -435,7 +430,7 @@ expand: #if EFI_STAGING_2M_ALIGN nr_pages += M(2) / EFI_PAGE_SIZE; #endif -#if defined(__i386__) || defined(__amd64__) +#if defined(__amd64__) new_base = get_staging_max(); #endif status = BS->AllocatePages(EFI_ALLOC_METHOD, EfiLoaderCode, From nobody Thu May 11 21:07:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHPc44TfXz4B2Cp; Thu, 11 May 2023 21:07: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 4QHPc43rTwz43yt; Thu, 11 May 2023 21:07:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683839252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEClIMEWoaOk6lI91usodxn9EJbNNl33Tz1F1J6zPx4=; b=HIGZhfSTsoHBTG+PmLDbb6FJsrbyR+f0rzLOIieqhmyTBlIQ4WHQVGgPJLueBLbCp4cDqY x2H5OkOmS/srFPPbXs9TLLW3brjX1SXAFfkYtc4yQ2QIsEIyeZU4CHfZ/mbplDoTdfW94G V1jcoERbAOEFcWLeI1V54N7OeoUkxt1+DThidNV70w6Yo+AIJCWATl2n31SqXBFgRMkt+V UM1SI9dkW4V9akFl0mj9o4fAHI6Fo9WvZjoJLkuLmXJ55QxnNrXc5bOzDaiCWAt61QfNCZ TIPA02hZZtVoh1nXqciIduNVdhsV502RTJpA/k8rWUpypBHdmzadR5on8bHTlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683839252; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEClIMEWoaOk6lI91usodxn9EJbNNl33Tz1F1J6zPx4=; b=c8VKSBMSmKh4yL5s4H2KXY5ybHONYINOwfuAI6pCSAh7R1pRWwy74r+H0R/231P0zn4SKh eZs7iU547aUTPYYdJ8lZJOuqo5H+hhUCldxctOIUBL6bymjQD4Bh5aKKp1bkMBOSFhBe6i kF+qYFvuphBRmpZkK/wYJfXOnpOD+4N418xgdOTz8jFewdnhg70m+GDU1LP5eiyf1871qx eRANACJEQye80b6PPYL1tJoziyI3e+gEUs2CzkNpkVUN2uBKTfOmqKBVhiNzFBkZWVRnhl oqu6wjae7C5nc0v+OdN0d/t2TChR6gtLuuhu4IbquFEfYfWF1GBwMZwgv4jUtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683839252; a=rsa-sha256; cv=none; b=t7AIy4xvB+MBrZHzZnjGY8QHHn4q4Skyh5q/4GufrfZ72LwE+V0uqq4qc1MQ6nLPvK0gAH aA4CCm7Uy5yLCLG5y9PT78ftlB0DWpbRrUwuEfkV9e10tRxybNPGy5cdDsmZU53qaeeF1O lEMtQkgPOnOfprrA327wdXDXTSW9qhE4uzSd+xxiqdDJ3HYB6y7Zcev+ZHnTNus1j9xyfv q3X9O/zJjBVosv6ZOXYJ5UKXPUK34sX+TjgBi/VLwzIoplvKdJMlKb79GtIVg980KuOp35 GxJv09CgGb08k7d128AoKnvkftTy7lkW45L1nnOuK9LYCFNeOdJUlG9/oaS++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 4QHPc42qJ1z17Vv; Thu, 11 May 2023 21:07: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 34BL7Wf0018597; Thu, 11 May 2023 21:07:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BL7WG1018596; Thu, 11 May 2023 21:07:32 GMT (envelope-from git) Date: Thu, 11 May 2023 21:07:32 GMT Message-Id: <202305112107.34BL7WG1018596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ceri Davies Subject: git: 620b5bfaefc8 - main - rc.conf.5: document name_cpuset, introduced in rev 0661f93892a2 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ceri X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 620b5bfaefc835777754ca3839867005dc5e4767 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ceri: URL: https://cgit.FreeBSD.org/src/commit/?id=620b5bfaefc835777754ca3839867005dc5e4767 commit 620b5bfaefc835777754ca3839867005dc5e4767 Author: Ceri Davies AuthorDate: 2023-05-11 21:06:56 +0000 Commit: Ceri Davies CommitDate: 2023-05-11 21:06:56 +0000 rc.conf.5: document name_cpuset, introduced in rev 0661f93892a2 --- share/man/man5/rc.conf.5 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index fc4e1dbae895..fdf95a396015 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 11, 2023 +.Dd May 11, 2023 .Dt RC.CONF 5 .Os .Sh NAME @@ -197,6 +197,14 @@ services are enabled that utilize the force_depend check. .Pq Vt str .Xr chroot 8 to this directory before running the service. +.It Ao Ar name Ac Ns Va _cpuset +.Pq Vt str +A list of CPUs to run the service on. +Passed to +.Xr cpuset 1 +using the +.Fl l +flag. .It Ao Ar name Ac Ns Va _fib .Pq Vt int The @@ -4922,6 +4930,7 @@ these are the flags to pass to the .El .Sh SEE ALSO .Xr chmod 1 , +.Xr cpuset 1 , .Xr gdb 1 Pq Pa ports/devel/gdb , .Xr kbdcontrol 1 , .Xr limits 1 , From nobody Thu May 11 21:37:35 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHQGm0RY9z4B31S; Thu, 11 May 2023 21:37:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHQGl5dc2z4C99; Thu, 11 May 2023 21:37:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683841055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P7ajEJ4Zi6mU5FcVfWUnvhxroeUZij9sYuYussSFTKU=; b=DvsWmweZ0y47MktOuflvKt41RZWoLucT/ABtbCEPrhyaZO7leWc8w0h+mnMbWqhWg0LG6E BLCBhbDV5tHupscyTWupsCYc4kPuPe19e4UdzE+/Z/yFqQIWr9fGO0ddYxEJsOF83QVkJK M9rQo8u3GiCLW2Xw3hiBPYpnLDliFWiQwHDtcAm6VcJyCKSMQOx/bdGW76dX9oFOxx3pxK bnGQWPYm2TNQdJZNo0PWAkC+R8BCDAfFBOFbZP/c//5FwVKSBYfkHaIoP/2LXuEb39TMjg W8kjNqB0KnqzEiDNMFh3IO/eMbcLkU2o7IUCKc0CSyre0g/XUe3yvyuv+2/PcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683841055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P7ajEJ4Zi6mU5FcVfWUnvhxroeUZij9sYuYussSFTKU=; b=RPs1qWcL6MSRK9NdmDaiFGA9kGP7di9Dl/pURtOIoxd9o6nJXwVRsCrmdGtTfdzVF2o/7o P32HAJxBZQ3VjcrV2zAJHU+fh9LnGKFLlNKf3PxR6Sc4z+JlqbxiOhCjSsW6Y7uWFMVDIX QkpjsZyWPnlSRLIksLdhEneQ2+nDS9SZjUipd207h4eszZuS8yyJbKKCvST3EV/4Fk/2Gu 2LdK0BujmaUUk9v6P5Jdzv3dPwurBG7WyxuvtvVFMa6TVbm0jDNDGy+WNR871tvnCQCeWY 8QroEbN/7MLsMmYgAx5HZ/HXJJMud3kdij4bspAbP/kWeb8pqbET7klhHgTEUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683841055; a=rsa-sha256; cv=none; b=etTmnUw8Srzl+GAGOtfnv8dTbDyrRZbcnsVI9Ax6VjTmNtR2X4TYwat0YB9T9wRMCnlSi7 3K+iu4C+Xcdpbhen7uhaGVjwUUE2ObfyQng4w9FHHO7CFrgui6Wt87RGcYmuy2TwUbpwLi 7wrrms1WuHw10ARenWCqqdGyfSSOaxg0/4j/3W2B5BP40mztnJWwm8+kIMGSP3jCpwgXAk LG8f0AjCTzkXuszPH1faSA9QSHxIc1hIjr4T0K5sBAR1+tpwTBlFUvmoFdVYMNsm7miU8i /zdUgtZqNn//umxmR+7GlXvX3BIjy9WYZAfKltYzINQHqeayZyftR2YwzQIt9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHQGl4lV5z18Ng; Thu, 11 May 2023 21:37: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 34BLbZ6K067274; Thu, 11 May 2023 21:37:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BLbZfm067273; Thu, 11 May 2023 21:37:35 GMT (envelope-from git) Date: Thu, 11 May 2023 21:37:35 GMT Message-Id: <202305112137.34BLbZfm067273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 910a83438358 - main - LinuxKPI: 802.11: fix IEEE80211_TX_INFO_DRIVER_DATA_SIZE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 910a834383587fc6630225200cc66b7965d5102f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=910a834383587fc6630225200cc66b7965d5102f commit 910a834383587fc6630225200cc66b7965d5102f Author: Bjoern A. Zeeb AuthorDate: 2023-05-11 21:35:11 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-11 21:36:59 +0000 LinuxKPI: 802.11: fix IEEE80211_TX_INFO_DRIVER_DATA_SIZE Fix the sizing of IEEE80211_TX_INFO_DRIVER_DATA_SIZE so that it also works on 32bit platforms. Otherwise it triggers a compile-time assertion in ath10k for i386. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 77045f866e8b..9cef12d825d7 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -755,7 +755,7 @@ struct ieee80211_tx_info { bool is_valid_ack_signal; void *status_driver_data[16 / sizeof(void *)]; /* XXX TODO */ } status; -#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE (5 * sizeof(void *)) /* XXX TODO 5? */ +#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40 void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)]; }; }; From nobody Thu May 11 23:03:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHSBM1f3gz4B9M9; Thu, 11 May 2023 23:03: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 4QHSBM17Vkz3DgW; Thu, 11 May 2023 23:03:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RAwibsxNKn21dFipHxuR69xjpH2dR5MMaH7wyzzgtkg=; b=it0fwaOkEipHmeRgKAOC7I9S/PmGv5XenZi+RL2yhUmiOTBcfeaNqjDCS7A9CEarq6VaN1 V9KLlEgxlq/9M9n3qMmAJzkrjcy4k5MY0chFjYIUigXjuEtnTEA2ckPpMWsXqXwLLhcA17 dygaJDM53nkPG4Uvnl7D5kniVhq5XJjeh1nYsO/P4dSS7SEj6XjmlK9mk/NCBM/KJqvYTL WPo6FMWtbLJRyKpOjrwfhyyeteFEsrQMMiTsaRqf5MrRuOuqN/0iO44+rFpZTTxyh/xS24 QzJEZBW/KOOHm+BLE84FLQCF7SNDawD3XrT/vM1Q96SEEpYlQMSm4eaTYIAJ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RAwibsxNKn21dFipHxuR69xjpH2dR5MMaH7wyzzgtkg=; b=kj3i1j7V4TFWL53DzoAk5AYzobeO9NiFzeg7vV+12eummAGR5iDjXXzvvpgxp8/KDMzhOE DHjMD9EL2vYLSP4HwBq2cFrw/WvnFGHbvIpbr4C6oKZVHeYbNHf2cQkY5hjhA7j2bEFCeu lXi/2/xIMvQY2IJLdJcv3iJQv+ZEIotW/+3uZfYGQygufhcIBH9qywOdNKN5RDQ7o9Agt/ keT7XSQqhUDFKVTKLrUUk0hXTMYX9j3GU8+737bOf/q6kSO4t4GdVRIZzMbuNg180LEuF7 p5885NfFd1fIMh7trfnJ71j4R4WkCBgkOM/VZNaSD3c5FLaAe1pqnkvq2ziQvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683846235; a=rsa-sha256; cv=none; b=WeXQ4m+A0sedWBN/oXeLOoXuhwtQyl5gSDa6Lbh0yfYiuFCkea4+Vzfwr8FE34ijZGduZC QtwWGcnoLUN/jv/XF0oGlONA5Jz9bsEvSDFw+Co+JbuHce7BDmgysCRAl93bL7H2+Gn4qf Ru/pd7GeoqXEywaTgbUY+Rw1/hIbKisemQZ4w2kQ71NM7B8w+ZUcr5ge4OGq2P1jML6vvN rzpm6SA5pI23PGaXlDTQCsh7fzepWMHdCeRu2BycdYBhzlgtHKiFNKbXUNC+IDI95mrsbT Kp8F8lIhgFd1gMd87+nC3hn9lXeMcujqY46W8Bp0PKPhUP10LlXq4aOEo2ymfg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHSBM0BfTz1B2v; Thu, 11 May 2023 23:03: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 34BN3s95015537; Thu, 11 May 2023 23:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BN3sMb015536; Thu, 11 May 2023 23:03:54 GMT (envelope-from git) Date: Thu, 11 May 2023 23:03:54 GMT Message-Id: <202305112303.34BN3sMb015536@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 692b19255c5d - main - dma: use OpenSSL 1.1 init API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 692b19255c5d53a5f42ea49ad569284316315577 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=692b19255c5d53a5f42ea49ad569284316315577 commit 692b19255c5d53a5f42ea49ad569284316315577 Author: Ed Maste AuthorDate: 2023-05-11 14:44:05 +0000 Commit: Ed Maste CommitDate: 2023-05-11 23:03:34 +0000 dma: use OpenSSL 1.1 init API > The SSL_library_init() and OpenSSL_add_ssl_algorithms() functions were > deprecated in OpenSSL 1.1.0 by OPENSSL_init_ssl(). and > The ERR_load_crypto_strings(), SSL_load_error_strings(), and > ERR_free_strings() functions were deprecated in OpenSSL 1.1.0 by > OPENSSL_init_crypto() and OPENSSL_init_ssl() and should not be used. Reviewed by: ngie Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40065 --- contrib/dma/crypto.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contrib/dma/crypto.c b/contrib/dma/crypto.c index 368238b9d632..c87d23e66a7c 100644 --- a/contrib/dma/crypto.c +++ b/contrib/dma/crypto.c @@ -115,8 +115,7 @@ smtp_init_crypto(int fd, int feature, struct smtp_features* features) /* XXX clean up on error/close */ /* Init SSL library */ - SSL_library_init(); - SSL_load_error_strings(); + OPENSSL_init_ssl(0, NULL); // Allow any possible version #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) From nobody Thu May 11 23:03:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHSBN3N1Fz4B98f; Thu, 11 May 2023 23:03: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 4QHSBN22dyz3DkT; Thu, 11 May 2023 23:03:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gN0UwjHtCPWacCJfKFQHEkwgQMN7ueMdH47uruNH5tA=; b=JoYK6TYEDDvYpdXGPYIquQWcHpfhvFD4RAjZCGUGsgce6xAng2RGKPwviBcjJ2lj1MV6gJ TYIyRxG06S/8kU90vj7CI5KTxW4cpvI6OqzJYpcn623HFr/K8DLwEDaIGsN7WSno6TSK0o 1X5MY8d9SWJWleiiCfKLlK+T+1DOUwCfrHCy4vUdkSP3YVj3sqxu7XROBNzJXQX/uneN5b SO16/Ig6Zkm1biejiBhhgnOCmJTK4RGNMl1Oe9KsB8BJEZE+ZyI7Fec2aRzpSUD3Fb1EhX ROne3d2BuKiAtXW90TYAHDVetUa8WzyLpPx5ZfoHBcDXL0qaBU5OlgoJa8mHJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gN0UwjHtCPWacCJfKFQHEkwgQMN7ueMdH47uruNH5tA=; b=nzE/MHX4Jcd8f1NJzs+rL2YAOXYWell1+HhBTGZc6x+7tYqlV+njNzz8zZFspCUfzc3YU5 f0XHeT5VsRIkQNuNvRQM1t2LEcIyKNOAgdr5FX4CH0P4dNukOgQDiqzbUx0LqTMWBBkTZw zWGeKvEzeYVhJ042dlSVsygHPVQZwaIrvex4tZIZn/T2LdqpzgpkNWCnf2lgFPQO6ZbTUm E0U5ignrQU6vmy4Nx3uGDH7w8VEFg6pJSq62j4lKfd+/vC5xXb/N+X292P1qpwwWzOl/zH W+OkDGMqrmlw80mkYppsO3xXtgKhPQXlt0FjsMPmWdWmxC09ziQUD1TORif6Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683846236; a=rsa-sha256; cv=none; b=dekJMl7SHOngb+nop9e3qphEYuhVELFSs7vl0lKtWV/J6JWodpzBZUM+RI8UlkQOwkI/g7 3TGzLVV2vgFJqZKmmTfz4KjqBTB12LkZyIQaq08ToQ3dVz44tbAXk94MXUHvXvzCXI6zVq Y2P3t2KaY6FQiGVIf8Bf0t1bd9ZBegGXOMjwIcuUNmKRB2Y+iXMUejQmtdn+xQFlo5QyVF H53Lnk6QqrrG+37fERQfkkbc3ihw0bI3ZH1b0vBx8h4SprxYRlHXrbwRyXE6eD5sMuBhMG igfeLt/vRO0HfeHUMB707DO5ZFRr38AYDONmHP2FwgvGvY1Pq5WIVW5KLcRVSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHSBN167Cz19fT; Thu, 11 May 2023 23:03: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 34BN3u2F015558; Thu, 11 May 2023 23:03:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BN3u64015557; Thu, 11 May 2023 23:03:56 GMT (envelope-from git) Date: Thu, 11 May 2023 23:03:56 GMT Message-Id: <202305112303.34BN3u64015557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: bdf6dee2a910 - main - dma: specify OpenSSL 1.1 API List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bdf6dee2a9106c0d649d55c73e38954fc341d938 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bdf6dee2a9106c0d649d55c73e38954fc341d938 commit bdf6dee2a9106c0d649d55c73e38954fc341d938 Author: Pierre Pronchery AuthorDate: 2023-05-09 14:06:40 +0000 Commit: Ed Maste CommitDate: 2023-05-11 23:03:34 +0000 dma: specify OpenSSL 1.1 API Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- libexec/dma/dmagent/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index e5b504c96d93..0a17527f43f1 100644 --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -21,6 +21,7 @@ MAN8= dma.8 MLINKS= dma.8 dma.conf.5 CONFS= dma.conf CONFSDIR= ${CONFDIR}/dma +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L YFLAGS+= -i CLEANFILES= aliases_parse.i FILES= mailer.conf From nobody Thu May 11 23:16:25 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHSSn6MwQz4B9gJ; Thu, 11 May 2023 23:16: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 4QHSSn5kPTz3Hp0; Thu, 11 May 2023 23:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o2Ro9fSMAAmUAUHcqsss+DuCZMsZ/Cq9uG+sHWPl+qQ=; b=OXm0Qya0u1xNo5CLJPftKgPrt6I1gTIECkyeTv/k3zNrpV1H0VcjrzOd+koGoFRJUU7OVZ c3ifWyXflZfuRHhVNjl6uoWu/NsEhjAaC3tp3MHn3IJqifz5LdUZYOFKZyUujntaCxZACa e/G3sG+344tQ98j/3ZxQ4pPQIy5N/VibPCfPGxhSvEsfhbOM6nZx/vTUgc9W/wAR77k01t vOMBIFvqwgdW+Vntec+exVYGs3YmujBMEDeETm0dx+lNO2HjtCE5ccgxIHnExJ0hOmmaGq O87vU24VBtPKkQwZ5K9rmrIGdaJ7E/qITB5/DM9TkY+ockifsDruU9C8lSF/dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683846985; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=o2Ro9fSMAAmUAUHcqsss+DuCZMsZ/Cq9uG+sHWPl+qQ=; b=ZgLVLSGuH72xIDpMJgMAdsT0Yr8/8v7Bvclv5JxfV8G+r290Z/Q59sXbsE46e7dldOOYGR Y6l2GMJu5eadfp9+aoJgrVJudwtyTa16LosMSy1mn4WcCyRnlTXNPwPqXCsVFabc+j+yKh vEymTW939Ga38TAQ0DUCWj9ZfSpSi3htRoLny7KcWD09I3RcpgGUd4f8Rzf8s0FiYeo1eX Pj4UXxKespSNKxMARa1iuYbT5mt1hQKK1xgBNgqJS26gVDwcUyYlUwV/t4P5JtTPRM933U vsemQBtrlCsDII3SiRfSH7tQKORY+UjJ1eQlFSs3vMBZVQMqM9rYd/GWqkDL5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683846985; a=rsa-sha256; cv=none; b=fO+Tgmcq72ZFoxlA2Jw/Af4rbJMLcI5rE2yPmEKmpbayuSCGQfMiyXr1PAqUiXsV5HjiCY zDo7g2ytR01/vbaDrinvUm65tWgfGl9+TJTEafU4wK1mG3znDMYjMu5q4GAMYqxP9KZa8t Y5OMDBE1xaQ2vvBIwTJfnFevOj/+2FUlg8fN1vlUfgjWx257Z8PW8X+5omOzBYzgl5G3RB XM9i9i633rrXs286M8QgDmDuEBUHIfyt2XGdjaDgEP8N9yBim4BJYGbZqBUXPLPniUejXr SEKOw8ySwhVTQ18eu+sFvr+tRTmuzwQ5r1oIXt3YlTLynH95WUg7utRA5ZKarA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHSSn4ngTz1BYf; Thu, 11 May 2023 23:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34BNGPOd032399; Thu, 11 May 2023 23:16:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34BNGPYr032398; Thu, 11 May 2023 23:16:25 GMT (envelope-from git) Date: Thu, 11 May 2023 23:16:25 GMT Message-Id: <202305112316.34BNGPYr032398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: bee3d4bf8ed5 - main - Move DIRDEPS_BUILD settings to sys.dirdeps.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bee3d4bf8ed55260d8cfc6d168ffa1afb49ef6a8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=bee3d4bf8ed55260d8cfc6d168ffa1afb49ef6a8 commit bee3d4bf8ed55260d8cfc6d168ffa1afb49ef6a8 Author: Simon J. Gerraty AuthorDate: 2023-05-11 23:15:04 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-11 23:15:04 +0000 Move DIRDEPS_BUILD settings to sys.dirdeps.mk When originally implemented, there was no distinction between DIRDEPS_BUILD and META_MODE, they were one and the same. META_MODE however is useful by itself, but since meta.sys.mk had lots of settings related to DIRDEPS_BUILD its use was limited to DIRDEPS_BUILD. Move (most) DIRDEPS_BUILD related items to sys.dirdeps.mk so that meta.sys.mk can be used for just META_MODE. There is of course some bluring of the lines, so settings remain in meta.sys.mk Add MK_META_ERROR_TARGET to enable the META_MODE .ERROR target independent of DIRDEPS_BUILD, it copies failed .meta files to ${SB}/error to make it easier to identify the cause of build failures. Since sys.dirdeps.mk should be included first, most of local.meta.sys.mk becomes local.sys.dirdeps.mk and some other bits need to move to local.sys.dirdeps.env.mk Also fix dirdeps.mk to not add CURDIR to DIRDEPS when it is SRCTOP. Reviewed by: bdrewery Differential Revision: https://reviews.freebsd.org/D40053 --- share/mk/dirdeps.mk | 8 +- share/mk/local.meta.sys.env.mk | 29 +--- share/mk/local.sys.dirdeps.env.mk | 14 ++ .../mk/{local.meta.sys.mk => local.sys.dirdeps.mk} | 33 +--- share/mk/local.sys.env.mk | 6 + share/mk/meta.sys.mk | 114 +++---------- share/mk/src.sys.obj.mk | 5 - share/mk/sys.dependfile.mk | 18 +- share/mk/sys.dirdeps.mk | 183 +++++++++++++++++++++ share/mk/sys.mk | 21 +-- 10 files changed, 253 insertions(+), 178 deletions(-) diff --git a/share/mk/dirdeps.mk b/share/mk/dirdeps.mk index 83b620044aa5..aafa5ab47557 100644 --- a/share/mk/dirdeps.mk +++ b/share/mk/dirdeps.mk @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.158 2023/05/04 18:26:17 sjg Exp $ +# $Id: dirdeps.mk,v 1.160 2023/05/10 20:44:58 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -273,6 +273,10 @@ _machine_dependfiles := ${.MAKE.DEPENDFILE_PREFERENCE:T:M*${MACHINE}*} .endif .endif +# turn a list into a set of :N modifiers +# NskipFoo = ${Foo:${M_ListToSkip}} +M_ListToSkip ?= O:u:S,^,N,:ts: + # this is how we identify non-machine specific dependfiles N_notmachine := ${.MAKE.DEPENDFILE_PREFERENCE:E:N*${MACHINE}*:${M_ListToSkip}} @@ -661,7 +665,7 @@ _machines := ${_machines:${M_dep_qual_fixes:ts:}:O:u} # reset each time through _build_dirs = -.if ${DEP_RELDIR} == ${_DEP_RELDIR} +.if ${DEP_RELDIR} == ${_DEP_RELDIR} && ${_CURDIR} != ${SRCTOP} # pickup other machines for this dir if necessary _build_dirs += ${_machines:@m@${_CURDIR}.$m@} .endif diff --git a/share/mk/local.meta.sys.env.mk b/share/mk/local.meta.sys.env.mk index 6d0d493f1047..f109da4f39dd 100644 --- a/share/mk/local.meta.sys.env.mk +++ b/share/mk/local.meta.sys.env.mk @@ -4,12 +4,6 @@ # before we process TARGET_SPEC # we assume that MK_DIRDEPS_BUILD=yes -.if !defined(HOST_TARGET) || !defined(HOST_MACHINE) -# we need HOST_TARGET etc below. -.include -.export HOST_TARGET -.endif - # from src/Makefile (for universe) TARGET_ARCHES_arm?= arm armv6 armv7 TARGET_ARCHES_arm64?= aarch64 @@ -41,11 +35,6 @@ MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} MACHINE_ARCH:= ${MACHINE_ARCH} -# For universe we want to potentially -# build for multiple MACHINE_ARCH per MACHINE -# so we need more than MACHINE in TARGET_SPEC -TARGET_SPEC_VARS?= MACHINE MACHINE_ARCH - HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} .if ${REQUESTED_MACHINE:U${MACHINE}} == "host" @@ -74,17 +63,13 @@ PYTHON ?= /usr/local/bin/python .endif .endif -# this is sufficient for most of the tree. -.MAKE.DEPENDFILE_DEFAULT = ${.MAKE.DEPENDFILE_PREFIX} - -# but if we have a machine qualified file it should be used in preference -.MAKE.DEPENDFILE_PREFERENCE = \ - ${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \ - ${.MAKE.DEPENDFILE_PREFIX} - -.undef .MAKE.DEPENDFILE - -META_MODE+= missing-meta=yes +.if !defined(NO_META_MISSING) +META_MODE+= missing-meta=yes +.endif +# silent will hide command output if a .meta file is created. +.if !defined(NO_SILENT) +META_MODE+= silent=yes +.endif .if empty(META_MODE:Mnofilemon) META_MODE+= missing-filemon=yes .endif diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps.env.mk new file mode 100644 index 000000000000..ab22f4c9e7d9 --- /dev/null +++ b/share/mk/local.sys.dirdeps.env.mk @@ -0,0 +1,14 @@ + +# For universe we want to potentially +# build for multiple MACHINE_ARCH per MACHINE +# so we need more than MACHINE in TARGET_SPEC +TARGET_SPEC_VARS?= MACHINE MACHINE_ARCH + +# this is sufficient for most of the tree. +.MAKE.DEPENDFILE_DEFAULT = ${.MAKE.DEPENDFILE_PREFIX} + +# but if we have a machine qualified file it should be used in preference +.MAKE.DEPENDFILE_PREFERENCE = \ + ${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \ + ${.MAKE.DEPENDFILE_PREFIX} + diff --git a/share/mk/local.meta.sys.mk b/share/mk/local.sys.dirdeps.mk similarity index 85% rename from share/mk/local.meta.sys.mk rename to share/mk/local.sys.dirdeps.mk index 9d66e7295a0a..00030cb247bb 100644 --- a/share/mk/local.meta.sys.mk +++ b/share/mk/local.sys.dirdeps.mk @@ -6,39 +6,13 @@ # we need this until there is an alternative MK_INSTALL_AS_USER= yes +.-include +# previously only included for DIRDEPS_BUILD anyway .-include -# to be consistent with src/Makefile just concatenate with '.'s -TARGET_OBJ_SPEC:= ${TARGET_SPEC:S;,;.;g} -.if ${MACHINE} != "host" -OBJTOP:= ${OBJROOT}${TARGET_OBJ_SPEC} -.endif - -.if defined(MAKEOBJDIR) -.if ${MAKEOBJDIR:M/*} == "" -.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default: MAKEOBJDIR='${_default_makeobjdir}' -.endif -.endif - - -# we want to end up with a singe stage tree for all machines .if ${MK_STAGING} == "yes" -.if empty(STAGE_ROOT) -STAGE_ROOT?= ${OBJROOT}stage -.export STAGE_ROOT -.endif -.endif -.if ${MK_STAGING} == "yes" -.if ${MACHINE} == "host" -STAGE_MACHINE= ${HOST_TARGET} -.else -STAGE_MACHINE:= ${TARGET_OBJ_SPEC} -.endif -STAGE_OBJTOP:= ${STAGE_ROOT}/${STAGE_MACHINE} -STAGE_COMMON_OBJTOP:= ${STAGE_ROOT}/common STAGE_TARGET_OBJTOP:= ${STAGE_ROOT}/${TARGET_OBJ_SPEC} -STAGE_HOST_OBJTOP:= ${STAGE_ROOT}/${HOST_TARGET} # These are exported for hooking in out-of-tree builds. They will always # be overridden in sub-makes above when building in-tree. .if ${.MAKE.LEVEL} > 0 @@ -156,7 +130,6 @@ CFLAGS+= ${CROSS_TARGET_FLAGS} ACFLAGS+= ${CROSS_TARGET_FLAGS} .endif -.if ${MK_DIRDEPS_BUILD} == "yes" # we set these here, rather than local.gendirdeps.mk # so we can ensure any DEP_* values that might be used in # conditionals do not cause syntax errors when Makefile.depend @@ -185,5 +158,3 @@ $V?= ${${V:S,DEP_,,}} # some makefiles expect this BOOTSTRAPPING= 0 .endif - -.endif diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk index e3348537db41..e10bf58e14e8 100644 --- a/share/mk/local.sys.env.mk +++ b/share/mk/local.sys.env.mk @@ -50,3 +50,9 @@ ECHO_TRACE?= true .include "src.sys.env.mk" .-include + +.if !defined(HOST_TARGET) || !defined(HOST_MACHINE) +# we need HOST_TARGET etc below. +.include +.export HOST_TARGET +.endif diff --git a/share/mk/meta.sys.mk b/share/mk/meta.sys.mk index f580f4962be8..ba213dd49da4 100644 --- a/share/mk/meta.sys.mk +++ b/share/mk/meta.sys.mk @@ -1,7 +1,7 @@ -# $Id: meta.sys.mk,v 1.48 2023/05/04 16:41:10 sjg Exp $ +# $Id: meta.sys.mk,v 1.51 2023/05/11 20:05:32 sjg Exp $ # -# @(#) Copyright (c) 2010-2021, Simon J. Gerraty +# @(#) Copyright (c) 2010-2023, Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. @@ -17,56 +17,21 @@ # include this if you want to enable meta mode # for maximum benefit, requires filemon(4) driver. -.if ${MAKE_VERSION:U0} > 20100901 -.if !target(.ERROR) +# absolute path to what we are reading. +_PARSEDIR ?= ${.PARSEDIR:tA} .-include -# If TARGET_SPEC_VARS is other than just MACHINE -# it should be set by now. -# TARGET_SPEC must not contain any '.'s. -TARGET_SPEC_VARS ?= MACHINE - -.if !target(_meta_tspec_env_done_) -_meta_tspec_env_done_: .NOTMAIN -# Allow for local.meta.sys.env.mk to have done this - -.if ${TARGET_SPEC:Uno:M*,*} != "" -# deal with TARGET_SPEC from env -_tspec := ${TARGET_SPEC:S/,/ /g} -.for i in ${TARGET_SPEC_VARS:${M_RANGE:Urange}} -${TARGET_SPEC_VARS:[$i]} := ${_tspec:[$i]} -.endfor -# We need to stop that TARGET_SPEC affecting any submakes -TARGET_SPEC= -# so export but do not track -.export-env TARGET_SPEC -.export ${TARGET_SPEC_VARS} -.for v in ${TARGET_SPEC_VARS:O:u} -.if empty($v) -.undef $v -.endif -.endfor -.endif -.endif - -# Now make sure we know what TARGET_SPEC is -# as we may need it to find Makefile.depend* -.if ${MACHINE:Mhost*} != "" -# host is special -TARGET_SPEC = ${MACHINE} -.else -TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts,} -.endif - -# absolute path to what we are reading. -_PARSEDIR = ${.PARSEDIR:tA} - .if !defined(SYS_MK_DIR) SYS_MK_DIR := ${_PARSEDIR} .endif -META_MODE += meta verbose +.if !target(.ERROR) + +META_MODE += meta +.if empty(.MAKEFLAGS:M-s) +META_MODE += verbose +.endif .if ${MAKE_VERSION:U0} > 20130323 && empty(.MAKE.PATH_FILEMON) # we do not support filemon META_MODE += nofilemon @@ -102,19 +67,7 @@ META_MODE += silent=yes .endif .endif -# we use the pseudo machine "host" for the build host. -# this should be taken care of before we get here -.if ${OBJTOP:Ua} == ${HOST_OBJTOP:Ub} -MACHINE = host -.endif - -.if !defined(MACHINE0) -# it can be handy to know which MACHINE kicked off the build -# for example, if using Makefild.depend for multiple machines, -# allowing only MACHINE0 to update can keep things simple. -MACHINE0 := ${MACHINE} -.export MACHINE0 -.endif +.if ${MK_DIRDEPS_BUILD:Uno} == "yes" .if !defined(META2DEPS) .if defined(PYTHON) && exists(${PYTHON}) @@ -134,6 +87,11 @@ MAKE_PRINT_VAR_ON_ERROR += \ MAKEFILE \ .MAKE.MODE +MK_META_ERROR_TARGET = yes +.endif + +.if ${MK_META_ERROR_TARGET:Uno} == "yes" + .if !defined(SB) && defined(SRCTOP) SB = ${SRCTOP:H} .endif @@ -150,21 +108,12 @@ _metaError: .NOMETA .NOTMAIN echo "ERROR: log ${meta_error_log}" >&2; }; : .endif +.endif # Are we, after all, in meta mode? .if ${.MAKE.MODE:Uno:Mmeta*} != "" MKDEP_MK ?= meta.autodep.mk -.if ${.MAKE.MAKEFILES:M*sys.dependfile.mk} == "" -# this does all the smarts of setting .MAKE.DEPENDFILE -.-include -# check if we got anything sane -.if ${.MAKE.DEPENDFILE} == ".depend" -.undef .MAKE.DEPENDFILE -.endif -.MAKE.DEPENDFILE ?= Makefile.depend -.endif - # we can afford to use cookies to prevent some targets # re-running needlessly META_COOKIE_TOUCH?= touch ${COOKIE.${.TARGET}:U${.OBJDIR}/${.TARGET:T}} @@ -192,36 +141,13 @@ UPDATE_DEPENDFILE= NO .endif .endif -.if ${.MAKE.LEVEL} == 0 -.if ${MK_DIRDEPS_BUILD:Uyes} == "yes" -# make sure dirdeps target exists and do it first -all: dirdeps .WAIT -dirdeps: -.NOPATH: dirdeps - -.if defined(ALL_MACHINES) -# the first .MAIN: is what counts -# by default dirdeps is all we want at level0 -.MAIN: dirdeps -.endif -.endif +.else # in meta mode? -.else # level > 0 - -# Makefile.depend* get read at level 1+ -# and often refer to DEP_MACHINE etc, -# so ensure DEP_* (for TARGET_SPEC_VARS anyway) are set -.for V in ${TARGET_SPEC_VARS} -DEP_$V = ${$V} -.endfor - -.endif -.else META_COOKIE_TOUCH= # some targets need to be .PHONY in non-meta mode META_NOPHONY= .PHONY META_NOECHO= echo -.endif -.endif + +.endif # in meta mode? .-include diff --git a/share/mk/src.sys.obj.mk b/share/mk/src.sys.obj.mk index 3b48fc3c5514..3d2cf7043c96 100644 --- a/share/mk/src.sys.obj.mk +++ b/share/mk/src.sys.obj.mk @@ -220,11 +220,6 @@ OBJROOT= ${SRCTOP}/ .endif .endif # defined(NO_OBJ) -.if !defined(HOST_TARGET) -# we need HOST_TARGET etc below. -.include -.export HOST_TARGET -.endif HOST_OBJTOP?= ${OBJROOT}${HOST_TARGET} .endif # ${MK_DIRDEPS_BUILD} == "no" diff --git a/share/mk/sys.dependfile.mk b/share/mk/sys.dependfile.mk index 745873f6bfeb..49232646d569 100644 --- a/share/mk/sys.dependfile.mk +++ b/share/mk/sys.dependfile.mk @@ -1,20 +1,22 @@ -# $FreeBSD$ -# $Id: sys.dependfile.mk,v 1.7 2016/02/20 01:57:39 sjg Exp $ +# $Id: sys.dependfile.mk,v 1.10 2023/05/10 19:23:26 sjg Exp $ # -# @(#) Copyright (c) 2012, Simon J. Gerraty +# @(#) Copyright (c) 2012-2023, Simon J. Gerraty # # This file is provided in the hope that it will # be of use. There is absolutely NO WARRANTY. # Permission to copy, redistribute or otherwise -# use this file is hereby granted provided that +# use this file is hereby granted provided that # the above copyright notice and this notice are -# left intact. -# +# left intact. +# # Please send copies of changes and bug-fixes to: # sjg@crufty.net # -# This only makes sense in meta mode. +.if !target(__${.PARSEFILE}__) +__${.PARSEFILE}__: .NOTMAIN + +# This only makes sense for DIRDEPS_BUILD. # This allows a mixture of auto generated as well as manually edited # dependency files, which can be differentiated by their names. # As per dirdeps.mk we only require: @@ -58,3 +60,5 @@ MACHINE := ${_m} .endif .endif .MAKE.DEPENDFILE ?= ${.MAKE.DEPENDFILE_DEFAULT} + +.endif diff --git a/share/mk/sys.dirdeps.mk b/share/mk/sys.dirdeps.mk new file mode 100644 index 000000000000..845eda181b90 --- /dev/null +++ b/share/mk/sys.dirdeps.mk @@ -0,0 +1,183 @@ +# $Id: sys.dirdeps.mk,v 1.9 2023/05/11 20:05:42 sjg Exp $ +# +# @(#) Copyright (c) 2012-2023, Simon J. Gerraty +# +# This file is provided in the hope that it will +# be of use. There is absolutely NO WARRANTY. +# Permission to copy, redistribute or otherwise +# use this file is hereby granted provided that +# the above copyright notice and this notice are +# left intact. +# +# Please send copies of changes and bug-fixes to: +# sjg@crufty.net +# + +# Originally DIRDEPS_BUILD and META_MODE were the same thing. +# So, much of this was done in *meta.sys.mk and local*mk +# but properly belongs here. + +# Include from [local.]sys.mk - if doing DIRDEPS_BUILD +# we should not be here otherwise +MK_DIRDEPS_BUILD ?= yes +# these are all implied +MK_AUTO_OBJ ?= yes +MK_META_MODE ?= yes +MK_STAGING ?= yes + +_PARSEDIR ?= ${.PARSEDIR:tA} + +.-include + +.if ${.MAKE.LEVEL} == 0 +# make sure dirdeps target exists and do it first +dirdeps: +# first .MAIN is what counts +.MAIN: dirdeps +.NOPATH: dirdeps +all: dirdeps .WAIT +.endif + +.if empty(SRCTOP) +# fallback assumes share/mk! +SRCTOP := ${SB_SRC:U${.PARSEDIR:tA:H:H}} +.export SRCTOP +.endif + +# fake SB if not using mk wrapper +.if !defined(SB) +SB := ${SRCTOP:H} +.export SB +.endif + +.if empty(OBJROOT) +OBJROOT := ${SB_OBJROOT:U${MAKEOBJDIRPREFIX:U${SB}/obj}/} +.export OBJROOT +.endif + +.if empty(STAGE_ROOT) +STAGE_ROOT ?= ${OBJROOT}stage +.export STAGE_ROOT +.endif + +# We should be included before meta.sys.mk +# If TARGET_SPEC_VARS is other than just MACHINE +# it should be set by now. +# TARGET_SPEC must not contain any '.'s. +TARGET_SPEC_VARS ?= MACHINE + +.if !target(_tspec_env_done_) +_tspec_env_done_: .NOTMAIN + +.if ${TARGET_SPEC:Uno:M*,*} != "" +# deal with TARGET_SPEC from env +_tspec := ${TARGET_SPEC:S/,/ /g} +.for i in ${TARGET_SPEC_VARS:${M_RANGE:Urange}} +${TARGET_SPEC_VARS:[$i]} := ${_tspec:[$i]} +.endfor +# We need to stop that TARGET_SPEC affecting any submakes +TARGET_SPEC= +# so export but do not track +.export-env TARGET_SPEC +.export ${TARGET_SPEC_VARS} +.for v in ${TARGET_SPEC_VARS:O:u} +.if empty($v) +.undef $v +.endif +.endfor +.endif +.endif + +# Now make sure we know what TARGET_SPEC is +# as we may need it to find Makefile.depend* +.if ${MACHINE:Mhost*} != "" +# host is special +TARGET_SPEC = ${MACHINE} +.else +TARGET_SPEC = ${TARGET_SPEC_VARS:@v@${$v:U}@:ts,} +.endif + +.if ${TARGET_SPEC_VARS:[#]} > 1 +TARGET_OBJ_SPEC ?= ${TARGET_SPEC_VARS:@v@${$v:U}@:ts.} +.else +TARGET_OBJ_SPEC ?= ${MACHINE} +.endif + +MAKE_PRINT_VAR_ON_ERROR += ${TARGET_SPEC_VARS} + +.if !defined(MACHINE0) +# it can be handy to know which MACHINE kicked off the build +# for example, if using Makefild.depend for multiple machines, +# allowing only MACHINE0 to update can keep things simple. +MACHINE0 := ${MACHINE} +.export MACHINE0 +.endif + +.if ${MACHINE} == "host" +OBJTOP = ${HOST_OBJTOP} +.elif ${MACHINE} == "host32" +OBJTOP = ${HOST_OBJTOP32} +.endif + +MACHINE_OBJ.host = ${HOST_TARGET} +MACHINE_OBJ.host32 = ${HOST_TARGET32} +MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC} +MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}} +OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR} + +# we do not use MAKEOBJDIRPREFIX +.undef MAKEOBJDIRPREFIX +# we use this +MAKEOBJDIR ?= ${.CURDIR:S,${SRCTOP},${OBJTOP},} + +STAGE_MACHINE ?= ${MACHINE_OBJDIR} +STAGE_OBJTOP ?= ${STAGE_ROOT}/${STAGE_MACHINE} +STAGE_COMMON_OBJTOP ?= ${STAGE_ROOT}/common +STAGE_HOST_OBJTOP ?= ${STAGE_ROOT}/${HOST_TARGET} +STAGE_HOST_OBJTOP32 ?= ${STAGE_ROOT}/${HOST_TARGET32} + +STAGE_INCLUDEDIR ?= ${STAGE_OBJTOP}${INCLUDEDIR:U/usr/include} +STAGE_LIBDIR ?= ${STAGE_OBJTOP}${LIBDIR:U/lib} + +TIME_STAMP_FMT ?= @ %s [%Y-%m-%d %T] ${:U} +DATE_TIME_STAMP ?= `date '+${TIME_STAMP_FMT}'` +TIME_STAMP ?= ${TIME_STAMP_FMT:localtime} + +.if ${MK_TIME_STAMPS:Uyes} == "yes" +TRACER = ${TIME_STAMP} +ECHO_DIR = echo ${TIME_STAMP} +ECHO_TRACE = echo ${TIME_STAMP} +.endif + +.if ${.CURDIR} == ${SRCTOP} +RELDIR= . +RELTOP= . +.elif ${.CURDIR:M${SRCTOP}/*} +RELDIR:= ${.CURDIR:S,${SRCTOP}/,,} +.else +RELDIR:= ${.OBJDIR:S,${OBJTOP}/,,} +.endif +RELTOP?= ${RELDIR:C,[^/]+,..,g} +RELOBJTOP?= ${RELTOP} +RELSRCTOP?= ${RELTOP} + +# this does all the smarts of setting .MAKE.DEPENDFILE +.-include + +.-include + +# check if we got anything sane +.if ${.MAKE.DEPENDFILE} == ".depend" +.undef .MAKE.DEPENDFILE +.endif +# just in case +.MAKE.DEPENDFILE ?= Makefile.depend + +.if ${.MAKE.LEVEL} > 0 +# Makefile.depend* also get read at level 1+ +# and often refer to DEP_MACHINE etc, +# so ensure DEP_* (for TARGET_SPEC_VARS anyway) are set +.for V in ${TARGET_SPEC_VARS} +DEP_$V = ${$V} +.endfor +.endif diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 1ab0022ddc21..d585444a485f 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -33,6 +33,7 @@ __DEFAULT_NO_OPTIONS= \ __DEFAULT_DEPENDENT_OPTIONS= \ AUTO_OBJ/DIRDEPS_BUILD \ + META_ERROR_TARGET/DIRDEPS_BUILD \ META_MODE/DIRDEPS_BUILD \ STAGING/DIRDEPS_BUILD \ SYSROOT/DIRDEPS_BUILD @@ -57,27 +58,13 @@ MK_META_MODE= no .endif .if ${MK_DIRDEPS_BUILD} == "yes" -.sinclude -.elif ${MK_META_MODE} == "yes" -META_MODE+= meta -.if empty(.MAKEFLAGS:M-s) -# verbose will show .MAKE.META.PREFIX for each target. -META_MODE+= verbose -.endif -.if !defined(NO_META_MISSING) -META_MODE+= missing-meta=yes -.endif -# silent will hide command output if a .meta file is created. -.if !defined(NO_SILENT) -META_MODE+= silent=yes +.-include .endif +.if ${MK_META_MODE} == "yes" .if !exists(/dev/filemon) || defined(NO_FILEMON) META_MODE+= nofilemon .endif -# Require filemon data with bmake -.if empty(META_MODE:Mnofilemon) -META_MODE+= missing-filemon=yes -.endif +.-include .endif META_MODE?= normal .export META_MODE From nobody Fri May 12 07:47:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHgpn4nG3z4BgSX; Fri, 12 May 2023 07:47: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 4QHgpn47Gjz4P1d; Fri, 12 May 2023 07:47:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683877665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R84oHOHr+dAoQF0WgSQm7hn23bHy73gq6rZ++hr5F0s=; b=Pmncx+zXBEd2ibRxhU9YtGWhpA1X+VgDUf7XzX/ZYvn171UA+C+RYNxDKAYOKdfTexk+9L 9zRTKGVyPBCJ3ZxLynMRd7JhoqHeaERGRxCnLMQiKSoBHw7JsRxvyRv/MPsqtgoLvGb3Vt rXmHLvogvaqMYXPaR7Cs7RdaRDFoL24ARlCaup54eXyjb9kUSKc1WaL003U5FXTTbxH94g 6hyKUdjMbUU847U8XujB5YbTdyhCIXOkWA/7jizaN3toohqopIyjiOTfOUky55Ea3gqE2A sfFXNCwJ2OGuwgjWKc0T4C4CWscPc0cEfyOtr0aNil/G/200jKqFbCZKiGy/Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683877665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R84oHOHr+dAoQF0WgSQm7hn23bHy73gq6rZ++hr5F0s=; b=CgHNRe51s1v210s53bhjoOdJLXtN9PIBjbgyLEhdNOSGrvKwKihS3lgZhBL1tYkhs2gNwE 4LR9YDkglHWsExx4X9DPGqFMRmY+KN755KSMeLqNdNuiO7guR7OYgPO9lHGjAeWNjifVbp QfnHCgjBsVD6sZBouUuX3QGISxjS95+mgXVKj3qaql1YQkoRgoNLjzaJ7+JbgNmMrzolOt SDPx7DTpc+JYWYmzDrsl/8EE5jgQIfg0VF7J0c8fATOTTdO2X2xxqPMGl78tSeFptB8GYO /VR1AGj/TENZfP4RUhrSUHpBosc9z9F6f1cmKbPJmoxku+uW4UVymKHQgk/oTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683877665; a=rsa-sha256; cv=none; b=xwMND0makYBvqeKX3h9aM6rEmHsNEdBSkueTZ6dv1oaEbkZS/7Jc5LPTHXcHs71w6AZ5My 5Nzgoe9Y4B4xkM/Wff6hzWJwbgTE+pTIFyLLsfgwxMP6Cgj4LUoCUJ3K1ttGFt6YD1pw7o 25+FkA5FshnTLP7vLS5z8QskhJuc1fl0ezvyDC6BBoMVYd7WcnChz4iPTVAQgtm/nO6v/u Xs3IERO7Zi6hKyyx+ZN4WqRmYOdQfKZBlmTPp4MQ4dOzr59y/Z4ftZkPkQWE7iY/eTaq/o Gs0kamEJ8CklxmyGUIrgNomjTD9yhnM187NrfxLqB1apJuvMq3ID58J3JYU+mg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHgpn3Bz1zS2C; Fri, 12 May 2023 07:47: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 34C7lj6F073275; Fri, 12 May 2023 07:47:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34C7ljW2073274; Fri, 12 May 2023 07:47:45 GMT (envelope-from git) Date: Fri, 12 May 2023 07:47:45 GMT Message-Id: <202305120747.34C7ljW2073274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 99aeb28b2f7e - main - bhyve: don't panic if e820 finds no available memory List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99aeb28b2f7e28c516dd6434db63a9bc1c1f3218 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=99aeb28b2f7e28c516dd6434db63a9bc1c1f3218 commit 99aeb28b2f7e28c516dd6434db63a9bc1c1f3218 Author: Corvin Köhne AuthorDate: 2023-05-09 12:32:33 +0000 Commit: Corvin Köhne CommitDate: 2023-05-12 07:29:39 +0000 bhyve: don't panic if e820 finds no available memory The GVT-d emulation tries to allocate some specific memory. It could happen that this address doesn't exist. In that case, GVT-d will fall back to allocate any address. Nevertheless, this only works if the e820 fails with an error instead of exiting on an assertion. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40034 --- usr.sbin/bhyve/e820.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c index 6c43e6eda3a5..99a66645f70f 100644 --- a/usr.sbin/bhyve/e820.c +++ b/usr.sbin/bhyve/e820.c @@ -197,11 +197,17 @@ e820_add_entry(const uint64_t base, const uint64_t end, return (0); } - assert(element != NULL); - /* Non system memory should be allocated inside system memory. */ - assert(element->type == E820_TYPE_MEMORY); - /* New element should fit into existing system memory element. */ - assert(base >= element->base && end <= element->end); + /* + * If some one tries to allocate a specific address, it could happen, that + * this address is not allocatable. Therefore, do some checks. If the + * address is not allocatable, don't panic. The user may have a fallback and + * tries to allocate another address. This is true for the GVT-d emulation + * which tries to reuse the host address of the graphics stolen memory and + * falls back to allocating the highest address below 4 GB. + */ + if (element == NULL || element->type != E820_TYPE_MEMORY || + (base < element->base || end > element->end)) + return (ENOMEM); if (base == element->base) { /* From nobody Fri May 12 07:47:46 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHgpp6Sf4z4BgGg; Fri, 12 May 2023 07:47: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 4QHgpp5Ysjz4PQS; Fri, 12 May 2023 07:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683877666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6R/8dr5x316NdcJ/qanNw0hax6rqRsVSJP0DntWnH5E=; b=lp275JJ42/FRCdvbY9hM1thjhzZu7prFoCmxIVBzFuba+C2b0n4xjYkt7xGy716ZkdSqf8 6sFIkixIiCrNA82P/mfT7Q6W6RgV3tW1C0v8HfumBSQ+ouy0bXjJy4Yzi+PFIRGsAitzUp 8QOAuCTsA+cvMxccv2sGezMsY5VuAEhtcAax0mgZPBLfNEdYEhmCxTW8rikfKJ5qx0vshE lp/abWwHUu+xsJftf7XLM25nq30tIP/wqiHSQ2bUt4k6pmps96arKrLtyM87bZMhl6viIH IgTC5bw9xNbseFUHmu/tgE3jc2d99IY0JjG3nxTm0ZUP5ufSwI8Wmw607Y9jfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683877666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6R/8dr5x316NdcJ/qanNw0hax6rqRsVSJP0DntWnH5E=; b=Dxg7RA/ucvPAjZ4Z7mVRxIJueiYIjMmCs9ThmXheT8eqLsRNGfBMn5VZMjXOlviLyyrukp 87Vnbdc7gaCAA1NllCkU0Vpb4cWGT5Ta7YTSmxLCKiYkVyeuik4aGCpJX+SmVZMHlYV805 BsB8G3HPm/IAY5HIF0ZMc9YVX/zKBhte03Ua9W7iT5rVjHxh1omUMceROan5A21ydI1I0j cFwFjOPuRKT03NqvT1bIbNJkfcwo9SFgRwNpOqCfejHVZcoo3yQK+jYhLuaRDpQh3Nxs6i YmdX2GwSaNqgc3BiHl7//25KjFtWiK/FPP5jM2lfJqe+jQGiKX9VBnsj63f4+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683877666; a=rsa-sha256; cv=none; b=x3hSXse/LYVUZ6C/+ckwdweq3gXJZg30M2IQh5DmOxF9PF0ilr1lLHdzPjGUlcwElhkGin 9rzk+UL531MJHQise1QFAgCoouiqXC3bpewvVcH5ka0gvJjee+S7mZ78TAzhJKYr/CsHAs nGWHdlMttx+s1AQ9iIgC4vNIc8FuuHoaiV5heRuMzERI7LdbNfxlsVQDve3LueWPG5ZnCx cPFpuZaZtJREujzxAi1FLkI5gafuBn5/SuReW8Hn4npaJ0/gI5+Qr3HyaQAZFx5eoSlO2Z yBfcVbGWNRfx+8Gy0eguvLL4M0T3XArdcSVpFHKNNbey5c4QcwjMKWP5UJ0u/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 4QHgpp4MrkzRk0; Fri, 12 May 2023 07:47: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 34C7lk7p073300; Fri, 12 May 2023 07:47:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34C7lk3D073299; Fri, 12 May 2023 07:47:46 GMT (envelope-from git) Date: Fri, 12 May 2023 07:47:46 GMT Message-Id: <202305120747.34C7lk3D073299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: 93cf93179c50 - main - bhyve: add helper for passthru specific mmio ranges List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93cf93179c505cebbcdbeef196d523d36890ed4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=93cf93179c505cebbcdbeef196d523d36890ed4a commit 93cf93179c505cebbcdbeef196d523d36890ed4a Author: Corvin Köhne AuthorDate: 2023-05-10 10:22:33 +0000 Commit: Corvin Köhne CommitDate: 2023-05-12 07:29:44 +0000 bhyve: add helper for passthru specific mmio ranges Intel GPUs have two special memory regions. They are called Graphics Stolen Memory and OpRegion. bhyve has to emulate both of them. In order to keep track of those special regions, add generic mmio ranges to the passthru emulation. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40036 --- usr.sbin/bhyve/pci_passthru.c | 12 ++++++++++++ usr.sbin/bhyve/pci_passthru.h | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 054b284a2f27..0b7a0d362593 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -78,6 +78,8 @@ __FBSDID("$FreeBSD$"); #define MSIX_TABLE_COUNT(ctrl) (((ctrl) & PCIM_MSIXCTRL_TABLE_SIZE) + 1) #define MSIX_CAPLEN 12 +#define PASSTHRU_MMIO_MAX 2 + static int pcifd = -1; struct passthru_softc { @@ -94,6 +96,7 @@ struct passthru_softc { } psc_msix; struct pcisel psc_sel; + struct passthru_mmio_mapping psc_mmio_map[PASSTHRU_MMIO_MAX]; cfgread_handler psc_pcir_rhandler[PCI_REGMAX + 1]; cfgwrite_handler psc_pcir_whandler[PCI_REGMAX + 1]; }; @@ -660,6 +663,15 @@ done: return (error); } +struct passthru_mmio_mapping * +passthru_get_mmio(struct passthru_softc *sc, int num) +{ + assert(sc != NULL); + assert(num < PASSTHRU_MMIO_MAX); + + return (&sc->psc_mmio_map[num]); +} + struct pcisel * passthru_get_sel(struct passthru_softc *sc) { diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index 79578a8496c4..1ca10fa343e4 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -11,6 +11,14 @@ #include "pci_emul.h" +struct passthru_mmio_mapping { + vm_paddr_t gpa; /* guest physical address */ + void *gva; /* guest virtual address */ + vm_paddr_t hpa; /* host physical address */ + void *hva; /* guest virtual address */ + vm_paddr_t len; +}; + struct passthru_softc; typedef int (*cfgread_handler)(struct passthru_softc *sc, @@ -24,6 +32,8 @@ int passthru_cfgread_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t *rv); int passthru_cfgwrite_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t val); +struct passthru_mmio_mapping *passthru_get_mmio(struct passthru_softc *sc, + int num); struct pcisel *passthru_get_sel(struct passthru_softc *sc); int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Fri May 12 07:47:47 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHgpq6cChz4BgZ5; Fri, 12 May 2023 07:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHgpq5vl5z4PRJ; Fri, 12 May 2023 07:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683877667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gw03BfrOuWwrKaXbFNi4emYzg4awm+mQxmYjTfD1sZU=; b=luyxq8NO1/3diC3GcCzM8UWvVnPH+oQ8rmodB9eJRStEKqVnbQn/KXMvmZDwkkfAx9PG+v Y7vqQ10CixbARShzqxHBGlbtm9UdtdSM947xd0uXwimGOMCjPFK1ByNDCLuDCoBma9MNFS 80mHP0jnOvGLM5bWtsyXtOO0E0IWg/zZX6JZDU2fRAOrfOCogQKZ+Ce6wBw7eWU9Lco71A g0zZy3AM4M7HMymYVeM7uuOQlrxMEhpydN0zo0AdHTiYz/EPfO8vwoEVegAodBJa3+fIa6 zrLOItZbloGnd/auv95EpFEIsbcX1t6+EhdMRp6qXdlwSOHtEdfmQyRIQ5IfFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683877667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gw03BfrOuWwrKaXbFNi4emYzg4awm+mQxmYjTfD1sZU=; b=RHRFIuKhWYXy95fPeMXd+WynQLX+Lw4TsJtBhp59K76d9b4/RDrblWUYu3svdnezBhXNoo g69ojjK7ZIwlv8JJTBVFlasv33NFF6fKtpKCKIE6sNNFJtgmtBv63qoT9VVBazeUOLk2s6 fhQZX+LIIjG++gHeE7Xyes6AXjXhJKXkUO8S9455JgeHTliNibb5YhBO7SDWosqF82lOnp 3gKxN5Vs827ZtUQoStOVRbRcfmHRg3CSu3dnPZyME/0lAYsmNt5XUitIvhBxbQnavQVOGO WBSLLroi8y5B0+8FdfQKClYJDg6/FuKjBM0WxY5kOnTMtBAPIB6gg9UqcjFSaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683877667; a=rsa-sha256; cv=none; b=bWWD6UM8XLG627CEZr3l0AQxgQOY0IbeGoUu4mgcW8iHq9/helYkKAKoU0k9fkGTq/JzfL lyZ1fY1ZWMLbLzQ3JGE6FqbkCGwQeMBWMYDfvzZi1+TGzEwjocEsJpNCxIJOKsDbUAALkH n5mKOs/HvAXfNborUxPt+aSmxbIaWViu9TcVgjk0EfrSg0LeMk+I21QN9QN2nS7FT2pxqK 8Q6AvAm6i035eqIQO6OQbVrv2KeVigUS3SdqOewi2nr0DTjyC9x/jzRPuXok+r0Kz2To5K ADkBqxDYZYTqxONxOmonT9sGGxUGFXoBlwmtb8//ObdD4wH5LhHpehGotRZucA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHgpq51bMzRk1; Fri, 12 May 2023 07:47: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 34C7ll7C073330; Fri, 12 May 2023 07:47:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34C7llFX073329; Fri, 12 May 2023 07:47:47 GMT (envelope-from git) Date: Fri, 12 May 2023 07:47:47 GMT Message-Id: <202305120747.34C7llFX073329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Corvin=20K=C3=B6hne?= Subject: git: b67f0d360b87 - main - bhyve: import OpRegion definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b67f0d360b87d6e8a71ab5118a8acb350505c20a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b67f0d360b87d6e8a71ab5118a8acb350505c20a commit b67f0d360b87d6e8a71ab5118a8acb350505c20a Author: Corvin Köhne AuthorDate: 2023-05-10 10:25:19 +0000 Commit: Corvin Köhne CommitDate: 2023-05-12 07:29:51 +0000 bhyve: import OpRegion definitions Those definitions are required for the GVT-d emulation to parse the OpRegion. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40037 --- usr.sbin/bhyve/pci_gvt-d-opregion.h | 186 ++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/usr.sbin/bhyve/pci_gvt-d-opregion.h b/usr.sbin/bhyve/pci_gvt-d-opregion.h new file mode 100644 index 000000000000..f506f1449e48 --- /dev/null +++ b/usr.sbin/bhyve/pci_gvt-d-opregion.h @@ -0,0 +1,186 @@ +/** @file + IGD OpRegion definition from Intel Integrated Graphics Device OpRegion + Specification. + + https://01.org/sites/default/files/documentation/skl_opregion_rev0p5.pdf + + Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +/* + * See + * + */ + +#pragma once + +#include + +#define IGD_OPREGION_HEADER_SIGN "IntelGraphicsMem" +#define IGD_OPREGION_HEADER_MBOX1 BIT0 +#define IGD_OPREGION_HEADER_MBOX2 BIT1 +#define IGD_OPREGION_HEADER_MBOX3 BIT2 +#define IGD_OPREGION_HEADER_MBOX4 BIT3 +#define IGD_OPREGION_HEADER_MBOX5 BIT4 + +#define IGD_OPREGION_VBT_SIZE_6K (6 * 1024UL) + +/** + OpRegion structures: + Sub-structures define the different parts of the OpRegion followed by the + main structure representing the entire OpRegion. + @note These structures are packed to 1 byte offsets because the exact + data location is required by the supporting design specification due to + the fact that the data is used by ASL and Graphics driver code compiled + separately. +**/ + +/// +/// OpRegion Mailbox 0 Header structure. The OpRegion Header is used to +/// identify a block of memory as the graphics driver OpRegion. +/// Offset 0x0, Size 0x100 +/// +struct igd_opregion_header { + int8_t sign[0x10]; ///< Offset 0x00 OpRegion Signature + uint32_t size; ///< Offset 0x10 OpRegion Size + uint32_t over; ///< Offset 0x14 OpRegion Structure Version + uint8_t sver[0x20]; ///< Offset 0x18 System BIOS Build Version + uint8_t vver[0x10]; ///< Offset 0x38 Video BIOS Build Version + uint8_t gver[0x10]; ///< Offset 0x48 Graphic Driver Build Version + uint32_t mbox; ///< Offset 0x58 Supported Mailboxes + uint32_t dmod; ///< Offset 0x5C Driver Model + uint32_t pcon; ///< Offset 0x60 Platform Configuration + int16_t dver[0x10]; ///< Offset 0x64 GOP Version + uint8_t rm01[0x7C]; ///< Offset 0x84 Reserved Must be zero +} __packed; + +/// +/// OpRegion Mailbox 1 - Public ACPI Methods +/// Offset 0x100, Size 0x100 +/// +struct igd_opregion_mbox1 { + uint32_t drdy; ///< Offset 0x100 Driver Readiness + uint32_t csts; ///< Offset 0x104 Status + uint32_t cevt; ///< Offset 0x108 Current Event + uint8_t rm11[0x14]; ///< Offset 0x10C Reserved Must be Zero + uint32_t didl[8]; ///< Offset 0x120 Supported Display Devices ID List + uint32_t + cpdl[8]; ///< Offset 0x140 Currently Attached Display Devices List + uint32_t + cadl[8]; ///< Offset 0x160 Currently Active Display Devices List + uint32_t nadl[8]; ///< Offset 0x180 Next Active Devices List + uint32_t aslp; ///< Offset 0x1A0 ASL Sleep Time Out + uint32_t tidx; ///< Offset 0x1A4 Toggle Table Index + uint32_t chpd; ///< Offset 0x1A8 Current Hotplug Enable Indicator + uint32_t clid; ///< Offset 0x1AC Current Lid State Indicator + uint32_t cdck; ///< Offset 0x1B0 Current Docking State Indicator + uint32_t sxsw; ///< Offset 0x1B4 Display Switch Notification on Sx + ///< StateResume + uint32_t evts; ///< Offset 0x1B8 Events supported by ASL + uint32_t cnot; ///< Offset 0x1BC Current OS Notification + uint32_t NRDY; ///< Offset 0x1C0 Driver Status + uint8_t did2[0x1C]; ///< Offset 0x1C4 Extended Supported Devices ID + ///< List(DOD) + uint8_t + cpd2[0x1C]; ///< Offset 0x1E0 Extended Attached Display Devices List + uint8_t rm12[4]; ///< Offset 0x1FC - 0x1FF Reserved Must be zero +} __packed; + +/// +/// OpRegion Mailbox 2 - Software SCI Interface +/// Offset 0x200, Size 0x100 +/// +struct igd_opregion_mbox2 { + uint32_t scic; ///< Offset 0x200 Software SCI Command / Status / Data + uint32_t parm; ///< Offset 0x204 Software SCI Parameters + uint32_t dslp; ///< Offset 0x208 Driver Sleep Time Out + uint8_t rm21[0xF4]; ///< Offset 0x20C - 0x2FF Reserved Must be zero +} __packed; + +/// +/// OpRegion Mailbox 3 - BIOS/Driver Notification - ASLE Support +/// Offset 0x300, Size 0x100 +/// +struct igd_opregion_mbox3 { + uint32_t ardy; ///< Offset 0x300 Driver Readiness + uint32_t aslc; ///< Offset 0x304 ASLE Interrupt Command / Status + uint32_t tche; ///< Offset 0x308 Technology Enabled Indicator + uint32_t alsi; ///< Offset 0x30C Current ALS Luminance Reading + uint32_t bclp; ///< Offset 0x310 Requested Backlight Brightness + uint32_t pfit; ///< Offset 0x314 Panel Fitting State or Request + uint32_t cblv; ///< Offset 0x318 Current Brightness Level + uint16_t bclm[0x14]; ///< Offset 0x31C Backlight Brightness Levels Duty + ///< Cycle Mapping Table + uint32_t cpfm; ///< Offset 0x344 Current Panel Fitting Mode + uint32_t epfm; ///< Offset 0x348 Enabled Panel Fitting Modes + uint8_t plut[0x4A]; ///< Offset 0x34C Panel Look Up Table & Identifier + uint32_t pfmb; ///< Offset 0x396 PWM Frequency and Minimum Brightness + uint32_t ccdv; ///< Offset 0x39A Color Correction Default Values + uint32_t pcft; ///< Offset 0x39E Power Conservation Features + uint32_t srot; ///< Offset 0x3A2 Supported Rotation Angles + uint32_t iuer; ///< Offset 0x3A6 Intel Ultrabook(TM) Event Register + uint64_t fdss; ///< Offset 0x3AA DSS Buffer address allocated for IFFS + ///< feature + uint32_t fdsp; ///< Offset 0x3B2 Size of DSS buffer + uint32_t stat; ///< Offset 0x3B6 State Indicator + uint64_t rvda; ///< Offset 0x3BA Absolute/Relative Address of Raw VBT + ///< Data from OpRegion Base + uint32_t rvds; ///< Offset 0x3C2 Raw VBT Data Size + uint8_t rsvd2[0x3A]; ///< Offset 0x3C6 - 0x3FF Reserved Must be zero. + ///< Bug in spec 0x45(69) +} __packed; + +/// +/// OpRegion Mailbox 4 - VBT Video BIOS Table +/// Offset 0x400, Size 0x1800 +/// +struct igd_opregion_mbox4 { + uint8_t rvbt[IGD_OPREGION_VBT_SIZE_6K]; ///< Offset 0x400 - 0x1BFF Raw + ///< VBT Data +} __packed; + +/// +/// OpRegion Mailbox 5 - BIOS/Driver Notification - Data storage BIOS to Driver +/// data sync Offset 0x1C00, Size 0x400 +/// +struct igd_opregion_mbox5 { + uint32_t phed; ///< Offset 0x1C00 Panel Header + uint8_t bddc[0x100]; ///< Offset 0x1C04 Panel EDID (DDC data) + uint8_t rm51[0x2FC]; ///< Offset 0x1D04 - 0x1FFF Reserved Must be zero +} __packed; + +/// +/// IGD OpRegion Structure +/// +struct igd_opregion { + struct igd_opregion_header + header; ///< OpRegion header (Offset 0x0, Size 0x100) + struct igd_opregion_mbox1 mbox1; ///< Mailbox 1: Public ACPI Methods + ///< (Offset 0x100, Size 0x100) + struct igd_opregion_mbox2 mbox2; ///< Mailbox 2: Software SCI Interface + ///< (Offset 0x200, Size 0x100) + struct igd_opregion_mbox3 + mbox3; ///< Mailbox 3: BIOS to Driver Notification (Offset 0x300, + ///< Size 0x100) + struct igd_opregion_mbox4 mbox4; ///< Mailbox 4: Video BIOS Table (VBT) + ///< (Offset 0x400, Size 0x1800) + struct igd_opregion_mbox5 + mbox5; ///< Mailbox 5: BIOS to Driver Notification Extension (Offset + ///< 0x1C00, Size 0x400) +} __packed; + +/// +/// VBT Header Structure +/// +struct vbt_header { + uint8_t product_string[20]; + uint16_t version; + uint16_t header_size; + uint16_t table_size; + uint8_t checksum; + uint8_t reserved1; + uint32_t bios_data_offset; + uint32_t aim_data_offset[4]; +} __packed; From nobody Fri May 12 08:46:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHj6K6Dvbz4Bjw8; Fri, 12 May 2023 08:46: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 4QHj6K5KrFz3Fnc; Fri, 12 May 2023 08:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683881177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1eM8XBgBOeU7esO1x1AF0LakvSvYlNwH8c6i7mPy6KM=; b=kYjhnm/WL9ABrfVhC+pLnNNBOfMYdOfkBZ9TBZzPwzYIGSirUhWumNR4xQjlq58eYSb3Vt J+Nv2H5vRK1KPF4qIgHxHR2fDkyl/sFi+HQc88yvq5gmq8aRM+V5YnhJ+yv5DyvV9+wsY8 FKUdU5BTWXRgp+L6ZVyuFSqe2efYVwlTgD5IeKvVWy1FPBn5eNAuVKDR2RniCrNQSxU+0H BqwhfcB3jcV+YJSa60tNhIAqBGwfvPiVERpReaE0XEQOFq5diRdQUhv4D3CQ1Y8KtwRfhe dkRO3rBD2fHrG3qXN82gB3A7aU8t5glixrgMbjPt51UDFbY0BW25jVT1WyvIqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683881177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1eM8XBgBOeU7esO1x1AF0LakvSvYlNwH8c6i7mPy6KM=; b=ALWp5WeCJdbz2z4r/P7OC6UK6drVriPwjIYB8lOCwSFS1ZhjXM82MaHmmBrtFKyzwHzP+U lAYusgFol4k1SO1vY6c1GvwW37kSkbPVOqzCqHZLKazlRWYAFeMxBR02GS8jwSE7+ns9aP Yl1DU0CNdvSe2X9nCSF9XcT+jTnruyu/V3RIevs3F5vvna1epAHXAGd8kEsRorilL8wHL/ R5fbHsn3U+GNERv75yDMnBj/e6YnBVjpWRWKW8AkM/HYNRABV5VroFRiNPRlbMFPz4/lDC t2DuVj48GH7e3nVOz8TEC6kMCKfckF81slMc4Ka2qHIf05izAGgEteLe1Zkhsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683881177; a=rsa-sha256; cv=none; b=xZCx8V3rM9yEjEU1CidkNlPWzIRtLrSOGl2qUtLA4q5yr+E6hQ2VCLxXQnLlNDG17ZXZgU kXmMJLIrXNZFTo2i8jynGafV0SzGuDo/aLDcAhF9cf6jiCcT07sngEnGosCKVshM8HKu5L DWuP0b5xOo5NLxjcIU5BEqQC+xBq25IOkrAn0NcdQognwL47uBWhSRQmE4kP6ZjmDb2lGN CS9Jzv8DVOeihamrlE9/UTrAm7WjhUp0I12PzWvw6bo6CCuw237oYOEvKTr4KJ0dwrWXN7 LOC6MT9kxD8xivObAyp6+d0P3NOd7q9AlmmMXF7GSVPIUULXGSoJEgUmoyYSVQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHj6K4NjzzT4H; Fri, 12 May 2023 08:46: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 34C8kHwt071195; Fri, 12 May 2023 08:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34C8kHLJ071194; Fri, 12 May 2023 08:46:17 GMT (envelope-from git) Date: Fri, 12 May 2023 08:46:17 GMT Message-Id: <202305120846.34C8kHLJ071194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: cbe88c6f3c47 - main - arm64: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbe88c6f3c47e3d7731b6ec30bfc201970b20602 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=cbe88c6f3c47e3d7731b6ec30bfc201970b20602 commit cbe88c6f3c47e3d7731b6ec30bfc201970b20602 Author: Gordon Bergling AuthorDate: 2023-05-12 08:45:46 +0000 Commit: Gordon Bergling CommitDate: 2023-05-12 08:45:46 +0000 arm64: Fix a typo in a source code comment - s/inferface/interface/ MFC after: 3 days --- sys/arm64/iommu/smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index bd9889ede2d0..3316321bc41b 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -65,7 +65,7 @@ * Queues. * * Register interface and Memory-based circular buffer queues are used - * to inferface SMMU. + * to interface SMMU. * * These are a Command queue for commands to send to the SMMU and an Event * queue for event/fault reports from the SMMU. Optionally PRI queue is From nobody Fri May 12 10:04:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHkrZ3NmDz4Bp05; Fri, 12 May 2023 10:04: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 4QHkrZ2qvyz3M0Z; Fri, 12 May 2023 10:04:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683885870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vqd1pElul8eQV3cxyxpav44tV+Pseq+i6/7kD/lcqHA=; b=ICmqcMi1QNOvkK+nAliS3xBZuE2aTroSEf8DNznRFK0/KPIriV+MvSXbMMcZfVrxB4xC8G unSaKu62bqHI/FrAhNfS+3EhzrSwQwIFlhSrCsuISoou4cWGiIecjBZpbB+2l8Ylske81o 0sI9eH3aXFuprf8x5nclWY2Qe0aoqIV/+7d//VEU1F2o9EMNg8jNUU4Cs7F1Nxsonc1Le9 7cXPUoSnClFk/kbA9pAdz+AOlbeJEWapC7hmdIStaFCdxav1HMOS8BSpNSnrJneTSH5WMj 291nnVWIo9ey9fQxB2P+aIxUjnl7SdEd1UIe437QlLSYymxdQwWhoONq6Qe7xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683885870; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vqd1pElul8eQV3cxyxpav44tV+Pseq+i6/7kD/lcqHA=; b=dC9h2RwwKwlp4sJ5IzLSfVI6Flr8mD5GEfZUq3iRnVPo4UeVBSVmnZzNb2NxiioO/uxAqV IazPk5zUdZaRooxFLyzWmkxpJGhJfpAA0ks9tt0xdLHU4Fpngn7hWIFyoMj0jzmc9UqXU1 s1J483ah30ZgmLXG8QfmnYYm8CKAkkE1V4mCW0TAwIcAV+mdDtqi8CqCM/OyM0yY3Rena8 VPd0/3bRBrNEctrdsYyQJTev82QNoFQ+C9QfF5YNr+r7/UxRu8V4C3jodH7mPu+7y6kojU lEBvTBQV0pWgrrc6cnQqzSpToduRU4wp5diDGzoioueoxAgEJ8TZu8sgkMQScg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683885870; a=rsa-sha256; cv=none; b=vRP7KiQr3FUPcsGVFpB4//3CVjUpuiafuQWyoG39BLG/um6siIiI5M2BwGWhZPqR/Aw2IJ ook51N4cLJG9nftBmfYxZDb0XzvEnJt3hj1h5Ol19ULQulffslg9QBzoEO9rYaD7lAt5AC 6rEaTYXIuJkB/eTPfxUatj5vLsmOJLEmBXKiIjahbokAKt318Mqo+jaIavjW34+RQOGmWi 27x2o6bEqHNAWqTZBWloSC3DVDG++u9rn/kHTvbXbcS5p+OWgnsSe8SQd86jdNrtiGNHVZ 8qsKFQDosATjjGKZlwMRDt9/W3RC33dPlTKMJnN0QonPaIYlg3tkGg5A0NP9kQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHkrZ1vTNzWVn; Fri, 12 May 2023 10:04: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 34CA4U72002656; Fri, 12 May 2023 10:04:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CA4UFv002655; Fri, 12 May 2023 10:04:30 GMT (envelope-from git) Date: Fri, 12 May 2023 10:04:30 GMT Message-Id: <202305121004.34CA4UFv002655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 92c23f6d9c20 - main - vlan: fix setting flags on a QinQ interface List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92c23f6d9c2074f6deb0029d13a8c92b32797059 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=92c23f6d9c2074f6deb0029d13a8c92b32797059 commit 92c23f6d9c2074f6deb0029d13a8c92b32797059 Author: Kristof Provost AuthorDate: 2023-05-12 08:42:48 +0000 Commit: Kristof Provost CommitDate: 2023-05-12 09:12:51 +0000 vlan: fix setting flags on a QinQ interface Setting vlan flags needlessly takes the exclusive VLAN_XLOCK(). If we have stacked vlan devices (i.e. QinQ) and we set vlan flags (e.g. IFF_PROMISC) we call rtnl_handle_ifevent() to send a notification about the interface. This ends up calling SIOCGIFMEDIA, which requires the VLAN_SLOCK(). Trying to take that one with the VLAN_XLOCK() held deadlocks us. There's no need for the exclusive lock though, as we're only accessing parent/trunk information, not modifying it, so a shared lock is sufficient. While here also add a test case for this issue. Backtrace: shared lock of (sx) vlan_sx @ /usr/src/sys/net/if_vlan.c:2192 while exclusively locked from /usr/src/sys/net/if_vlan.c:2307 panic: excl->share cpuid = 29 time = 1683873033 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe015d4ad4b0 vpanic() at vpanic+0x152/frame 0xfffffe015d4ad500 panic() at panic+0x43/frame 0xfffffe015d4ad560 witness_checkorder() at witness_checkorder+0xcb5/frame 0xfffffe015d4ad720 _sx_slock_int() at _sx_slock_int+0x67/frame 0xfffffe015d4ad760 vlan_ioctl() at vlan_ioctl+0xf8/frame 0xfffffe015d4ad7c0 dump_iface() at dump_iface+0x12f/frame 0xfffffe015d4ad840 rtnl_handle_ifevent() at rtnl_handle_ifevent+0xab/frame 0xfffffe015d4ad8c0 if_setflag() at if_setflag+0xf6/frame 0xfffffe015d4ad930 ifpromisc() at ifpromisc+0x2a/frame 0xfffffe015d4ad960 vlan_setflags() at vlan_setflags+0x60/frame 0xfffffe015d4ad990 vlan_ioctl() at vlan_ioctl+0x216/frame 0xfffffe015d4ad9f0 if_setflag() at if_setflag+0xe4/frame 0xfffffe015d4ada60 ifpromisc() at ifpromisc+0x2a/frame 0xfffffe015d4ada90 bridge_ioctl_add() at bridge_ioctl_add+0x499/frame 0xfffffe015d4adb10 bridge_ioctl() at bridge_ioctl+0x328/frame 0xfffffe015d4adbc0 ifioctl() at ifioctl+0x972/frame 0xfffffe015d4adcc0 kern_ioctl() at kern_ioctl+0x1fe/frame 0xfffffe015d4add30 sys_ioctl() at sys_ioctl+0x154/frame 0xfffffe015d4ade00 amd64_syscall() at amd64_syscall+0x140/frame 0xfffffe015d4adf30 fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe015d4adf30 --- syscall (54, FreeBSD ELF64, ioctl), rip = 0x22b0f0ef8d8a, rsp = 0x22b0ec63f2c8, rbp = 0x22b0ec63f380 --- KDB: enter: panic [ thread pid 5715 tid 101132 ] Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_vlan.c | 4 ++-- tests/sys/net/if_vlan.sh | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index f5b401c446ed..6aa872a19364 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -2304,10 +2304,10 @@ vlan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) * We should propagate selected flags to the parent, * e.g., promiscuous mode. */ - VLAN_XLOCK(); + VLAN_SLOCK(); if (TRUNK(ifv) != NULL) error = vlan_setflags(ifp, 1); - VLAN_XUNLOCK(); + VLAN_SUNLOCK(); break; case SIOCADDMULTI: diff --git a/tests/sys/net/if_vlan.sh b/tests/sys/net/if_vlan.sh index 96426254bb6d..e4c737121bdb 100755 --- a/tests/sys/net/if_vlan.sh +++ b/tests/sys/net/if_vlan.sh @@ -221,6 +221,34 @@ qinq_dot_cleanup() vnet_cleanup } +atf_test_case "qinq_setflags" "cleanup" +qinq_setflags_head() +{ + atf_set descr 'Test setting flags on a QinQ device' + atf_set require.user root +} + +qinq_setflags_body() +{ + vnet_init + + epair=$(vnet_mkepair) + + ifconfig ${epair}a up + vlan1=$(ifconfig vlan create) + ifconfig $vlan1 vlan 1 vlandev ${epair}a + vlan2=$(ifconfig vlan create) + ifconfig $vlan2 vlan 2 vlandev $vlan1 + + # This panics, incorrect locking + ifconfig $vlan2 promisc +} + +qinq_setflags_cleanup() +{ + vnet_cleanup +} + atf_test_case "bpf_pcp" "cleanup" bpf_pcp_head() { @@ -273,5 +301,6 @@ atf_init_test_cases() atf_add_test_case "qinq_deep" atf_add_test_case "qinq_legacy" atf_add_test_case "qinq_dot" + atf_add_test_case "qinq_setflags" atf_add_test_case "bpf_pcp" } From nobody Fri May 12 11:13:58 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHmNs1f0Pz4Bs92; Fri, 12 May 2023 11:14: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 4QHmNs02lfz3kHv; Fri, 12 May 2023 11:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=exxTucru6vRFwV9z5YD6STzCRoPP3Swc3ta186QrDUQ=; b=oekBh1Oe79Kb1zKYVAVVkXDdFKwXG2senxeTiUy5oNiLSywLSAeGX+WBkeawXXVmsdl9lq I3Kv4/VbOg/PcScFnWml8/TxSyk4ExfvkRumaZ12qHfe2UCCfa+EO0lrZ69OJplaV9cSE+ yv553Pj8K/y0qkG6HS+UHG/L+t0FNA0rZa6CPqZyTwfJFCwQDwGbrpBBFcv0XTv+IojDsc g8HUmLA8NnIgQqo5USBn5GWW2M8hBjqq0s0jjGx8CNCo09tpdKXZgnRsgFpwQPllFH73fa T0JS/psgwaECzLWrueYRHra059Ate/+0Unqjb56b1+J8RUBnwv2UlzRWy9tZqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=exxTucru6vRFwV9z5YD6STzCRoPP3Swc3ta186QrDUQ=; b=A8NqkOjjiXP/Xpdvaz65YZh6O3xB9Dvx4YIEwuThg05Rmt4Zv6HixGTSFcJIuQTD9KhzA/ ftEOYYPYqhtB0fBbCFAUxdeTj+SvjEvC4oWNFFXDbIjE9ugisal22fjru8hnvN5PUJXwYV AJN0BY7KVuG1ijkIinaWgyIsJ+rj9DTYtuLwvTGmsmjfnKomGCXqnTWAcL28LovxdOaloV qWXI9IZ+YRjsE4ILZXVs8Np3YmE3ZuLmO8iEEiS5YDKoKJ8uQf28BQahehGB4BAD0+5bLB F/KpwChcZ9ExHruz0tVuAR1UNYHUbp7868WHPyIFXtQqLML6WNNvIQ8x2dJFxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683890045; a=rsa-sha256; cv=none; b=rc6BCIlUen1LoL+0EhXmhtqEAt9e0ohXXKefKIICuDq7SIGYJQNXOMP6ERv4I/kdVi1kOb mCR4z+Fh0lQ7clMZfCtd+SUhq30GvwWxQIQC6Jz6ViFS4lGZfHSxariQGVXz+yH5V3lVTE 10BE3JU1EZfq4Ki2D2DlzF5V1dr9HHV9HzflWmj+q57VuladixGJOEhjR3fdNejDd00stG Q9jd4qq6TkoZHtw1LsAsHaqYuU9OB+QOeD8BuUIuaODGHyijAJMaHciSdDWvxtLQbTnQY6 iXXmhYGdy0xdaWcpIw+C3wfhRbyWLYzVSgzuioOHBiFOKZb1XAfpLeZZpbNzgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHmNr6DCXzYKL; Fri, 12 May 2023 11:14: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 34CBE49u017886; Fri, 12 May 2023 11:14:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CBDwTF017867; Fri, 12 May 2023 11:13:58 GMT (envelope-from git) Date: Fri, 12 May 2023 11:13:58 GMT Message-Id: <202305121113.34CBDwTF017867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Martin Matuska Subject: git: e639e0d27cc8 - main - zfs: merge openzfs/zfs@e61076683 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e639e0d27cc863ba1b8de20e861e6b5d9b922a8e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=e639e0d27cc863ba1b8de20e861e6b5d9b922a8e commit e639e0d27cc863ba1b8de20e861e6b5d9b922a8e Merge: 92c23f6d9c20 e61076683850 Author: Martin Matuska AuthorDate: 2023-05-12 11:12:59 +0000 Commit: Martin Matuska CommitDate: 2023-05-12 11:13:33 +0000 zfs: merge openzfs/zfs@e61076683 Notable upstream pull request merges: #14744 Optimize check_filesystem() and process_error_log() #14773 Allow zhack label repair to restore detached devices #14794 zpool import -m also removing spare and cache when log device is missing #14805 Simplify and optimize random_int_between() #14813 Enable the head_errlog feature to remove errors #14816 Fix two abd_gang_add_gang() issues #14817 Verify block pointers before writing them out #14819 Add dmu_tx_hold_append() interface #14823 Remove single parent assertion from zio_nowait() #14824 Plug memory leak in zfsdev_state #14825 Block cloning dbuf fixes #14828 Remove duplicate code in l2arc_evict() #14837 Fixes in head_errlog feature with encryption #14839 Prevent panic during concurrent snapshot rollback and zvol read #14853 zil: Don't expect zio_shrink() to succeed Obtained from: OpenZFS OpenZFS commit: e6107668385044718b0a73330ed6423650806473 sys/contrib/openzfs/cmd/zdb/zdb.c | 19 +- sys/contrib/openzfs/cmd/zhack.c | 508 +++++++++++++++++---- .../openzfs/contrib/pam_zfs_key/pam_zfs_key.c | 13 +- sys/contrib/openzfs/include/sys/dbuf.h | 23 +- sys/contrib/openzfs/include/sys/dmu.h | 7 +- sys/contrib/openzfs/include/sys/dmu_tx.h | 1 + sys/contrib/openzfs/include/sys/spa.h | 3 +- sys/contrib/openzfs/include/sys/zio.h | 8 +- sys/contrib/openzfs/man/man1/zhack.1 | 23 +- sys/contrib/openzfs/man/man7/zpool-features.7 | 7 +- sys/contrib/openzfs/man/man8/zpool-status.8 | 3 + .../openzfs/module/os/freebsd/zfs/zvol_os.c | 2 + sys/contrib/openzfs/module/zfs/abd.c | 14 +- sys/contrib/openzfs/module/zfs/arc.c | 26 +- sys/contrib/openzfs/module/zfs/dbuf.c | 119 ++++- sys/contrib/openzfs/module/zfs/dmu.c | 51 ++- sys/contrib/openzfs/module/zfs/dmu_recv.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_tx.c | 105 +++++ sys/contrib/openzfs/module/zfs/dsl_scan.c | 3 +- sys/contrib/openzfs/module/zfs/spa.c | 12 +- sys/contrib/openzfs/module/zfs/spa_errlog.c | 389 ++++++++++------ sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 2 + sys/contrib/openzfs/module/zfs/zfs_vnops.c | 38 +- sys/contrib/openzfs/module/zfs/zil.c | 1 + sys/contrib/openzfs/module/zfs/zio.c | 94 ++-- sys/contrib/openzfs/tests/runfiles/common.run | 5 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 1 + .../openzfs/tests/zfs-tests/include/libtest.shlib | 14 +- .../openzfs/tests/zfs-tests/include/math.shlib | 11 +- .../openzfs/tests/zfs-tests/tests/Makefile.am | 7 +- .../zfs_receive/zfs_receive_corrective.ksh | 19 +- .../tests/functional/cli_root/zhack/library.kshlib | 361 +++++++++++++++ .../cli_root/zhack/zhack_label_checksum.ksh | 64 --- .../cli_root/zhack/zhack_label_repair_001.ksh | 30 ++ .../cli_root/zhack/zhack_label_repair_002.ksh | 31 ++ .../cli_root/zhack/zhack_label_repair_003.ksh | 33 ++ .../cli_root/zhack/zhack_label_repair_004.ksh | 30 ++ .../cli_root/zpool_import/import_log_missing.ksh | 75 +++ .../cli_root/zpool_status/zpool_status_005_pos.ksh | 6 +- .../cli_root/zpool_status/zpool_status_007_pos.ksh | 13 + .../functional/fault/auto_replace_001_pos.ksh | 5 +- .../zfs-tests/tests/functional/trim/trim_l2arc.ksh | 2 +- sys/modules/zfs/zfs_config.h | 4 +- sys/modules/zfs/zfs_gitrev.h | 2 +- 44 files changed, 1726 insertions(+), 460 deletions(-) diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/library.kshlib index 000000000000,880a78861630..880a78861630 mode 000000,100644..100644 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/library.kshlib +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/library.kshlib diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_001.ksh index 000000000000,2a511e9efcb6..2a511e9efcb6 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_001.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_001.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_002.ksh index 000000000000,4f1e61a39857..4f1e61a39857 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_002.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_002.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_003.ksh index 000000000000,7e82363d2f46..7e82363d2f46 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_003.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_003.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_004.ksh index 000000000000,0b739402b199..0b739402b199 mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_004.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zhack/zhack_label_repair_004.ksh diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_log_missing.ksh index 000000000000,f12cac78540f..f12cac78540f mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_log_missing.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_log_missing.ksh diff --cc sys/modules/zfs/zfs_config.h index f489f0b6c69a,000000000000..ec45185797b4 mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1087 -1,0 +1,1087 @@@ +/* + * $FreeBSD$ + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the `mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* struct shrink_control exists */ +/* #undef HAVE_SHRINK_CONTROL_STRUCT */ + +/* kernel_siginfo_t exists */ +/* #undef HAVE_SIGINFO */ + +/* signal_stop() exists */ +/* #undef HAVE_SIGNAL_STOP */ + +/* new shrinker callback wants 2 args */ +/* #undef HAVE_SINGLE_SHRINKER_CALLBACK */ + +/* cs->count_objects exists */ +/* #undef HAVE_SPLIT_SHRINKER_CALLBACK */ + +#if defined(__amd64__) || defined(__i386__) +/* Define if host toolchain supports SSE */ +#define HAVE_SSE 1 + +/* Define if host toolchain supports SSE2 */ +#define HAVE_SSE2 1 + +/* Define if host toolchain supports SSE3 */ +#define HAVE_SSE3 1 + +/* Define if host toolchain supports SSE4.1 */ +#define HAVE_SSE4_1 1 + +/* Define if host toolchain supports SSE4.2 */ +#define HAVE_SSE4_2 1 + +/* Define if host toolchain supports SSSE3 */ +#define HAVE_SSSE3 1 +#endif + +/* STACK_FRAME_NON_STANDARD is defined */ +/* #undef HAVE_STACK_FRAME_NON_STANDARD */ + +/* standalone exists */ +/* #undef HAVE_STANDALONE_LINUX_STDARG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* submit_bio is member of struct block_device_operations */ +/* #undef HAVE_SUBMIT_BIO_IN_BLOCK_DEVICE_OPERATIONS */ + +/* super_setup_bdi_name() exits */ +/* #undef HAVE_SUPER_SETUP_BDI_NAME */ + +/* super_block->s_user_ns exists */ +/* #undef HAVE_SUPER_USER_NS */ + +/* struct kobj_type has default_groups */ +/* #undef HAVE_SYSFS_DEFAULT_GROUPS */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* i_op->tmpfile() exists */ +/* #undef HAVE_TMPFILE */ + +/* i_op->tmpfile() uses old dentry signature */ +/* #undef HAVE_TMPFILE_DENTRY */ + +/* i_op->tmpfile() has mnt_idmap */ +/* #undef HAVE_TMPFILE_IDMAP */ + +/* i_op->tmpfile() has userns */ +/* #undef HAVE_TMPFILE_USERNS */ + +/* totalhigh_pages() exists */ +/* #undef HAVE_TOTALHIGH_PAGES */ + +/* kernel has totalram_pages() */ +/* #undef HAVE_TOTALRAM_PAGES_FUNC */ + +/* Define to 1 if you have the `udev_device_get_is_initialized' function. */ +/* #undef HAVE_UDEV_DEVICE_GET_IS_INITIALIZED */ + +/* kernel has __kernel_fpu_* functions */ +/* #undef HAVE_UNDERSCORE_KERNEL_FPU */ + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* iops->getattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_GETATTR */ + +/* iops->setattr() takes struct user_namespace* */ +/* #undef HAVE_USERNS_IOPS_SETATTR */ + +/* user_namespace->ns.inum exists */ +/* #undef HAVE_USER_NS_COMMON_INUM */ + +/* iops->getattr() takes a vfsmount */ +/* #undef HAVE_VFSMOUNT_IOPS_GETATTR */ + +/* aops->direct_IO() uses iovec */ +/* #undef HAVE_VFS_DIRECT_IO_IOVEC */ + +/* aops->direct_IO() uses iov_iter without rw */ +/* #undef HAVE_VFS_DIRECT_IO_ITER */ + +/* aops->direct_IO() uses iov_iter with offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_OFFSET */ + +/* aops->direct_IO() uses iov_iter with rw and offset */ +/* #undef HAVE_VFS_DIRECT_IO_ITER_RW_OFFSET */ + +/* filemap_dirty_folio exists */ +/* #undef HAVE_VFS_FILEMAP_DIRTY_FOLIO */ + +/* All required iov_iter interfaces are available */ +/* #undef HAVE_VFS_IOV_ITER */ + +/* fops->iterate() is available */ +/* #undef HAVE_VFS_ITERATE */ + +/* fops->iterate_shared() is available */ *** 226 LINES SKIPPED *** From nobody Fri May 12 11:17:17 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHmSZ29dTz4BsWB; Fri, 12 May 2023 11:17: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 4QHmSZ1SVvz3kg6; Fri, 12 May 2023 11:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJyWCtVGr83hvvKaA4bSDJV7iLi9BNV6zH+694Vvx74=; b=HNfu5waE6son3ZaTXBz0YQrhdWQmL966XwId8hwFqMj4u4Fd9/ToPj37aUXyhAs1s1D9JE Kh2xmt8TwaddnCiSv9evu84PKhn5//PZezrhuLCB+FjAHoLKVZPUfIHVEEK70VqYN9nQ/g wkfwbFAGL8PAvf1FsEjetZUONr+NIGZek468IKHb58ehdVHSaovTLnui0IpoBjd+3MjjKZ cIPfa2r9IZIo0huBbsC+bGIXRQt0IEUQ9gwi4cNILMTa11S0EHi1u9nLUrfnj/+Tnx7EnO oSa74icNlztoWEUNxNLF2lJTeWJqTGbvuUhjL+8r5IGPY5UqD+Cgi1He6kmoxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NJyWCtVGr83hvvKaA4bSDJV7iLi9BNV6zH+694Vvx74=; b=EZUiylGXYY/FB2e4VUKtoe9Z3Cd31Q/6PHgfUdMkRB1bK/0oZgVaUgaIxfJnXJjS8T7Gyh m9cF8Jshu7BtQO/KyvT/JhbHhhuCkvltohEAKOVEjkn36/Q4aptKSseTbmdgKH04kHcxuH 2yJjHO2XLxUniCmM4S7D7/+nM8ywcxuhEaoW2vvT3RR6xVvjPrFa8l7TqArxLI3x+h6RdK M6J7BwZuh24w4OxOZ890Uu1nVqbuMY8MJKzO2kNalhqutb54J+Q6xz7F1GTRCUSl9e6bBs bQo89pwtJyciF8kPGXse/pp4Nf4eSWRTlwgeW6Y9jGgYHQI4AZ9tOOVs72B73A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683890238; a=rsa-sha256; cv=none; b=iTINRtEy5+4F1YYKj3DVkv7oS3b0K7Gk7cFFZYCe5Szr6JopHEYyZ+gW14t/77Q0992gZ1 3DPv2aboKbF7hqSPEHoZJy7Bz+FXfxsdvPh/E5WzuBUqdKmigWUOcNtqUX9eqVxWkVskp3 QZaAoMiDc2Ld1Ew7z+486I1fmEa8Sc1uvdSJSUlZmxkKOeyoT+gQnFpnYU0pIAzDUqJhZL W9f9VBVK68E8J/RM2069RIQ5mk6O7AS23dXE4IDOENuQZZIX4aQXN4JgO5/8LKiiZ90oKu y0N9NBYop0KyQYa/xAmsVH6c8HtmXUR0KB58GWBzXAIzicQ54IICKMLTRWST3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHmSZ0TQbzYX2; Fri, 12 May 2023 11:17: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 34CBHHcf018421; Fri, 12 May 2023 11:17:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CBHHFJ018420; Fri, 12 May 2023 11:17:17 GMT (envelope-from git) Date: Fri, 12 May 2023 11:17:17 GMT Message-Id: <202305121117.34CBHHFJ018420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 721b44ba5f3f - main - amd64: pmap.h put a guard around a pcpu.h function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 721b44ba5f3fb711af5797eae6345295721e13dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=721b44ba5f3fb711af5797eae6345295721e13dd commit 721b44ba5f3fb711af5797eae6345295721e13dd Author: Bjoern A. Zeeb AuthorDate: 2023-05-12 11:14:54 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-12 11:14:54 +0000 amd64: pmap.h put a guard around a pcpu.h function pmap_get_pcid() calls zpcpu_get() which is defined in pcpu.h. It is unclear why we do not include that header but like right above the change add another guard around pmap_get_pcid(). This allows some LinuxKPI headers to compile again. Suggested by: markj MFC after: 10 days --- sys/amd64/include/pmap.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index cf41855a7c59..b61edf475b4b 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -534,6 +534,7 @@ pmap_invlpg(pmap_t pmap, vm_offset_t va) } #endif /* sys/pcpu.h && machine/cpufunc.h */ +#if defined(_SYS_PCPU_H_) /* Return pcid for the pmap pmap on current cpu */ static __inline uint32_t pmap_get_pcid(pmap_t pmap) @@ -544,6 +545,7 @@ pmap_get_pcid(pmap_t pmap) pcidp = zpcpu_get(pmap->pm_pcidp); return (pcidp->pm_pcid); } +#endif /* sys/pcpu.h */ #endif /* _KERNEL */ From nobody Fri May 12 11:21:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHmYP2Sm9z4BsZ2; Fri, 12 May 2023 11:21: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 4QHmYP1t1Nz3l0M; Fri, 12 May 2023 11:21:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVg1H0tn4aCLijYDLZgPCiWdRoe0+XhbKGOcfcDjCgU=; b=RDTT+bL2Ht3DFW+yaYGP6NDhxLYTl1Bn7taFkSxENT36QbwFUu8o+r+7rn4FE/VKICTnjv CTnfZc4dr4JUDz/NVR5pBJTOVh+eGS5Hlbud0RvxB1ITGQavBroXpczzD5hLs7y19HvEib vl0BTGVykUIE8cSyAwz/BwtsJ+5TkX0q69Q7QFSdtZcZWwTontLMIorEfjH7tr8OiG2FlO rw4Dp/bDjvLUGB05CpjWnCYKKEup5ZJW0MYgBq/1+NumMGUaaVNdutACYTsmB8Mof4rzmi YIYzeVxcywXDTlKfohwwMkSjFE2TqVM1FiS0hH7CxzITNMudtbgf7DaBns5K+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pVg1H0tn4aCLijYDLZgPCiWdRoe0+XhbKGOcfcDjCgU=; b=snKaN4SbnV6pznvuwWQz3HQRh7S/9ZViJLszUDS6boNu0kIyTKbOhdD8vFF+bCCuyEviqZ ZRvyyN6kk4BMHcpg2TUyX5mC4B3kjNuRLwukZMHb/YEB/Pqs3pxbFHEuLjDIzj5tXTNT4n 7IBs1Kn32ZfVvAp6sEnPFxN9nq70I4YWqXWiZOWpz7sZqOgYnlpsyFUMgTTrfgwfzBUGdA vEKm/uEHQmkOrXTu3SXmqLJ1116l2eSv4vtGUlpcMfL0eRwSzrao9rmclFdQpfAB66TqQ8 fMr/IKvPssDw4/nXbHaXgG8nvut1Wfnfhwb7lxMRsh9sU1iOFRp6Yo58lKVztw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683890489; a=rsa-sha256; cv=none; b=gU+YA9jAbz/MHMJ7lG2H9QJ+RHUKQGoOci5lQ8SJDopBUJtn2hzZ+g+tnozRNPuBY8SL1l BWSeQdFNDSneume1a1YHfS7L+gVKk9H4Vhypa/IueObKM8E8gS+6/wmp8juflA9gyhucOU yTuX9UQGgYUWzHoOzi5NBXAR8JIy+qUzfz9EHQOaLb/26xHbgq2+8089hpU9zg/zrr1Tzu HVRwWss9zkashboEfLnt3YVqYVF4oHIqxoDl00aMV3isK5pnu+/TP2sMxffbldmzBmi7Th 9+usmshI3KuBBfo3UeMRGoMGSyURfu9sIkuTsR1xkvIvcZmQh3Wj3e0ytPtNRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHmYP0xMTzYKY; Fri, 12 May 2023 11:21: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 34CBLTCj033976; Fri, 12 May 2023 11:21:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CBLTXV033975; Fri, 12 May 2023 11:21:29 GMT (envelope-from git) Date: Fri, 12 May 2023 11:21:29 GMT Message-Id: <202305121121.34CBLTXV033975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d544b53cb0b6 - main - LinuxKPI: add dummy hash.h and kernel_connect() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d544b53cb0b6bc25f2ba078bd9c07e611095bf29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d544b53cb0b6bc25f2ba078bd9c07e611095bf29 commit d544b53cb0b6bc25f2ba078bd9c07e611095bf29 Author: Bjoern A. Zeeb AuthorDate: 2023-05-11 22:19:57 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-12 11:21:10 +0000 LinuxKPI: add dummy hash.h and kernel_connect() Add crypto/hash.h and a dummy kernel_connect() needed to compile the ath11k wireless driver. While I hope we will not actually need the hash.h fallbacks, kernel_connect() we will have to deal with once we sort out more QMI bits. MFC after: 10 days --- sys/compat/linuxkpi/common/include/crypto/hash.h | 94 +++++++++++++++++++++++ sys/compat/linuxkpi/common/include/linux/socket.h | 11 +++ 2 files changed, 105 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/crypto/hash.h b/sys/compat/linuxkpi/common/include/crypto/hash.h new file mode 100644 index 000000000000..bf401691722a --- /dev/null +++ b/sys/compat/linuxkpi/common/include/crypto/hash.h @@ -0,0 +1,94 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2022 Bjoern A. Zeeb + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _LINUXKPI_CRYPTO_HASH_H +#define _LINUXKPI_CRYPTO_HASH_H + +#include /* for pr_debug */ + +struct crypto_shash { +}; + +struct shash_desc { + struct crypto_shash *tfm; +}; + +static inline struct crypto_shash * +crypto_alloc_shash(const char *algostr, int x, int y) +{ + + pr_debug("%s: TODO\n", __func__); + return (NULL); +} + +static inline void +crypto_free_shash(struct crypto_shash *csh) +{ + pr_debug("%s: TODO\n", __func__); +} + +static inline int +crypto_shash_init(struct shash_desc *desc) +{ + pr_debug("%s: TODO\n", __func__); + return (-ENXIO); +} + +static inline int +crypto_shash_final(struct shash_desc *desc, uint8_t *mic) +{ + pr_debug("%s: TODO\n", __func__); + return (-ENXIO); +} + +static inline int +crypto_shash_setkey(struct crypto_shash *csh, const uint8_t *key, size_t keylen) +{ + pr_debug("%s: TODO\n", __func__); + return (-ENXIO); +} + +static inline int +crypto_shash_update(struct shash_desc *desc, uint8_t *data, size_t datalen) +{ + pr_debug("%s: TODO\n", __func__); + return (-ENXIO); +} + +static inline void +shash_desc_zero(struct shash_desc *desc) +{ + + explicit_bzero(desc, sizeof(*desc)); +} + +/* XXX review this. */ +#define SHASH_DESC_ON_STACK(desc, tfm) \ + uint8_t ___ ## desc ## _desc[sizeof(struct shash_desc)]; \ + struct shash_desc *desc = (struct shash_desc *)___ ## desc ## _desc + +#endif /* _LINUXKPI_CRYPTO_HASH_H */ diff --git a/sys/compat/linuxkpi/common/include/linux/socket.h b/sys/compat/linuxkpi/common/include/linux/socket.h index 3afb9bdfe3ba..8818971fa4c7 100644 --- a/sys/compat/linuxkpi/common/include/linux/socket.h +++ b/sys/compat/linuxkpi/common/include/linux/socket.h @@ -33,6 +33,17 @@ #include +#define AF_QIPCRTR 42 + +static inline int +kernel_connect(int sd, struct sockaddr *sa, size_t salen, int flags) +{ + + /* kern_connectat()? It is used for sockaddr_qrtr by ath1xk/qmi. */ + pr_debug("%s: TODO\n", __func__); + return (-EINVAL); +} + #ifdef notyet static inline int memcpy_toiovec(struct iovec *v, unsigned char *kdata, int len) From nobody Fri May 12 11:21:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHmYQ6RnMz4BsZ3; Fri, 12 May 2023 11:21: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 4QHmYQ699Bz3l2f; Fri, 12 May 2023 11:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLairdh+As5I5yFVPMIRt/58fU34w/5aHWjSirfCDpY=; b=dhK5jVmqtc5o5uAYLcpoOiM7ThScU+pVgwGTS5Sz9Wu/Jfgk2bQny2WaILDestEeA9/uI6 lNh046yvv4kU7caLekkZ3G8i8tAeAxXlW2EspqhFnzP1/32r38mr5xoTOCxkj+eOvLlT5g 0AsBbuwGxQhsbpAPJeeBGI2M+oRTPUQTbdmOfnMCS2p6rAXvZv88ejzgQrRIhXK9571du8 AtHsj5qw6XUNURzbMR70oHP5G4a1JllxNhq5WMQLnHyhfsJijN3QMxPCgh2Lx3XsKnv4w9 vN+xnRcCUnGeW3HVfm36cxOerrO9UjmYK8vSFOulHZhjbwf+FnbjNH0Pr5NAJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683890490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vLairdh+As5I5yFVPMIRt/58fU34w/5aHWjSirfCDpY=; b=eDjQRS7GL099I4lRAM1tAm/YAzvGkwx07mTjitKrauiStqRQBzHoFf6Pml32ni4szgfAri 2LjUz+TIQHMF+sbMagMzY1pjWNInm97AQtA9sG03cBDgYz198Nqq36ijbuG/secol6Y34k +7RoOnWtlrNmwb1CI4rvcW85k7tb0lff/BT6299FVhZnYGwVzyiV+zsXulJg0LV41do+PW Lx2kxIQjSAY8vKiHueIhktmvhFdX3kREDlOio/s3Lu8zxuE4DNZca6qx+VVN038RXxUJVc GiENCSTBJeSbdkVX8LhLiCSONXA+0hUllXnFx1vx4qko5l3aD3Ah9BU/IwCtNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683890490; a=rsa-sha256; cv=none; b=SjWzZxX6nu3lZTFR6e2X6REKGaALTAwBeRVy6gkEX9Vvm+UgS95cP/npQO8Zyv2Ri+P/xl NAqx2Ra3JsZErqzCbyQpXmJ39j4vbEf4CgCfMuzK9NfC9NzJ/wy95LwGPkredk/tb5pv2b yG/d2g4bxg9ji53vtE3V8q/jZROMxv/T2a7hiYBhQetfDy0Etk4leYnelK5i4KR1AqlC8G AxF34S1CSujilQJu61Gr/frFVsdO1r8vNFFdSkmA64+MG70UpkW4wdI/lEwYpe11+uZlpn UlbJfv6WstpT6BAeNkOYMtDqNhe+426dUKZIAFjjhMSl/0s8BLfv0wdj8SmZwg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHmYQ5FspzY8y; Fri, 12 May 2023 11:21: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 34CBLUQw033998; Fri, 12 May 2023 11:21:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CBLUNB033995; Fri, 12 May 2023 11:21:30 GMT (envelope-from git) Date: Fri, 12 May 2023 11:21:30 GMT Message-Id: <202305121121.34CBLUNB033995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: dd4f32ae6242 - main - ath11k: import ath11k driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd4f32ae62426a10a84b4322756d82c06c202c4e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dd4f32ae62426a10a84b4322756d82c06c202c4e commit dd4f32ae62426a10a84b4322756d82c06c202c4e Author: Bjoern A. Zeeb AuthorDate: 2023-05-11 22:23:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-12 11:21:16 +0000 ath11k: import ath11k driver Import BSD-3-Clause-Clear ath11k driver assumed to be based on Linux kvalo/ath.git master at 6bae9de622d3ef4805aba40e763eb4b0975c4f6d. Complement the driver to make compile on FreeBSD using LinuxKPI with changes covered by #ifdef (__FreeBSD__). Further select updates were applied since the initial import in order to keep compiling along with other LinuxKPI based drivers. Add the module build framework but keep disconnected from the build for now. The current driver (or rather LinuxKPI) lacks support for some "qcom" bits needed in order to get things working. There was interest by various people to enhance support further. We initially only plan to support PCI parts but it would be great to further enhance qcom SoC support to run on several (cheap) APs. The firmware is provided by port net/wifi-firmware-ath11k-kmod. Given the lack of full license texts on most files this is imported under the draft policy for handling SPDX files (D29226) and with approval for BSD-3-Clause-Clear. [1] Approved by: core (jhb, 2023-05-11) [1] MFC after: 2 months --- sys/contrib/dev/athk/ath11k/Kconfig | 59 + sys/contrib/dev/athk/ath11k/Makefile | 35 + sys/contrib/dev/athk/ath11k/ahb.c | 808 +++ sys/contrib/dev/athk/ath11k/ahb.h | 21 + sys/contrib/dev/athk/ath11k/ce.c | 1091 +++ sys/contrib/dev/athk/ath11k/ce.h | 197 + sys/contrib/dev/athk/ath11k/core.c | 1488 ++++ sys/contrib/dev/athk/ath11k/core.h | 1079 +++ sys/contrib/dev/athk/ath11k/dbring.c | 392 + sys/contrib/dev/athk/ath11k/dbring.h | 86 + sys/contrib/dev/athk/ath11k/debug.c | 169 + sys/contrib/dev/athk/ath11k/debug.h | 68 + sys/contrib/dev/athk/ath11k/debugfs.c | 1160 +++ sys/contrib/dev/athk/ath11k/debugfs.h | 229 + sys/contrib/dev/athk/ath11k/debugfs_htt_stats.c | 4704 ++++++++++++ sys/contrib/dev/athk/ath11k/debugfs_htt_stats.h | 1950 +++++ sys/contrib/dev/athk/ath11k/debugfs_sta.c | 781 ++ sys/contrib/dev/athk/ath11k/debugfs_sta.h | 42 + sys/contrib/dev/athk/ath11k/dp.c | 1197 ++++ sys/contrib/dev/athk/ath11k/dp.h | 1709 +++++ sys/contrib/dev/athk/ath11k/dp_rx.c | 5662 +++++++++++++++ sys/contrib/dev/athk/ath11k/dp_rx.h | 102 + sys/contrib/dev/athk/ath11k/dp_tx.c | 1260 ++++ sys/contrib/dev/athk/ath11k/dp_tx.h | 43 + sys/contrib/dev/athk/ath11k/hal.c | 1418 ++++ sys/contrib/dev/athk/ath11k/hal.h | 965 +++ sys/contrib/dev/athk/ath11k/hal_desc.h | 2492 +++++++ sys/contrib/dev/athk/ath11k/hal_rx.c | 1244 ++++ sys/contrib/dev/athk/ath11k/hal_rx.h | 370 + sys/contrib/dev/athk/ath11k/hal_tx.c | 160 + sys/contrib/dev/athk/ath11k/hal_tx.h | 72 + sys/contrib/dev/athk/ath11k/hif.h | 137 + sys/contrib/dev/athk/ath11k/htc.c | 828 +++ sys/contrib/dev/athk/ath11k/htc.h | 312 + sys/contrib/dev/athk/ath11k/hw.c | 2149 ++++++ sys/contrib/dev/athk/ath11k/hw.h | 362 + sys/contrib/dev/athk/ath11k/mac.c | 8669 +++++++++++++++++++++++ sys/contrib/dev/athk/ath11k/mac.h | 175 + sys/contrib/dev/athk/ath11k/mhi.c | 650 ++ sys/contrib/dev/athk/ath11k/mhi.h | 42 + sys/contrib/dev/athk/ath11k/pci.c | 1707 +++++ sys/contrib/dev/athk/ath11k/pci.h | 107 + sys/contrib/dev/athk/ath11k/peer.c | 344 + sys/contrib/dev/athk/ath11k/peer.h | 51 + sys/contrib/dev/athk/ath11k/qmi.c | 3063 ++++++++ sys/contrib/dev/athk/ath11k/qmi.h | 500 ++ sys/contrib/dev/athk/ath11k/reg.c | 748 ++ sys/contrib/dev/athk/ath11k/reg.h | 36 + sys/contrib/dev/athk/ath11k/rx_desc.h | 1505 ++++ sys/contrib/dev/athk/ath11k/spectral.c | 1041 +++ sys/contrib/dev/athk/ath11k/spectral.h | 82 + sys/contrib/dev/athk/ath11k/testmode.c | 199 + sys/contrib/dev/athk/ath11k/testmode.h | 29 + sys/contrib/dev/athk/ath11k/testmode_i.h | 50 + sys/contrib/dev/athk/ath11k/thermal.c | 226 + sys/contrib/dev/athk/ath11k/thermal.h | 54 + sys/contrib/dev/athk/ath11k/trace.c | 10 + sys/contrib/dev/athk/ath11k/trace.h | 320 + sys/contrib/dev/athk/ath11k/wmi.c | 8286 ++++++++++++++++++++++ sys/contrib/dev/athk/ath11k/wmi.h | 5585 +++++++++++++++ sys/contrib/dev/athk/ath11k/wow.c | 73 + sys/contrib/dev/athk/ath11k/wow.h | 10 + sys/modules/ath11k/Makefile | 44 + 63 files changed, 68447 insertions(+) diff --git a/sys/contrib/dev/athk/ath11k/Kconfig b/sys/contrib/dev/athk/ath11k/Kconfig new file mode 100644 index 000000000000..ad5cc6cac05b --- /dev/null +++ b/sys/contrib/dev/athk/ath11k/Kconfig @@ -0,0 +1,59 @@ +# SPDX-License-Identifier: BSD-3-Clause-Clear +config ATH11K + tristate "Qualcomm Technologies 802.11ax chipset support" + depends on MAC80211 && HAS_DMA + depends on CRYPTO_MICHAEL_MIC + select ATH_COMMON + select QCOM_QMI_HELPERS + help + This module adds support for Qualcomm Technologies 802.11ax family of + chipsets. + + If you choose to build a module, it'll be called ath11k. + +config ATH11K_AHB + tristate "Atheros ath11k AHB support" + depends on ATH11K + depends on REMOTEPROC + help + This module adds support for AHB bus + +config ATH11K_PCI + tristate "Atheros ath11k PCI support" + depends on ATH11K && PCI + select MHI_BUS + select QRTR + select QRTR_MHI + help + This module adds support for PCIE bus + +config ATH11K_DEBUG + bool "QCA ath11k debugging" + depends on ATH11K + help + Enables debug support + + If unsure, say Y to make it easier to debug problems. + +config ATH11K_DEBUGFS + bool "QCA ath11k debugfs support" + depends on ATH11K && DEBUG_FS && MAC80211_DEBUGFS + help + Enable ath11k debugfs support + + If unsure, say Y to make it easier to debug problems. + +config ATH11K_TRACING + bool "ath11k tracing support" + depends on ATH11K && EVENT_TRACING + help + Select this to use ath11k tracing infrastructure. + +config ATH11K_SPECTRAL + bool "QCA ath11k spectral scan support" + depends on ATH11K_DEBUGFS + depends on RELAY + help + Enable ath11k spectral scan support + + Say Y to enable access to the FFT/spectral data via debugfs. diff --git a/sys/contrib/dev/athk/ath11k/Makefile b/sys/contrib/dev/athk/ath11k/Makefile new file mode 100644 index 000000000000..c1fce4159f1f --- /dev/null +++ b/sys/contrib/dev/athk/ath11k/Makefile @@ -0,0 +1,35 @@ +# SPDX-License-Identifier: BSD-3-Clause-Clear +obj-$(CONFIG_ATH11K) += ath11k.o +ath11k-y += core.o \ + hal.o \ + hal_tx.o \ + hal_rx.o \ + wmi.o \ + mac.o \ + reg.o \ + htc.o \ + qmi.o \ + dp.o \ + dp_tx.o \ + dp_rx.o \ + debug.o \ + ce.o \ + peer.o \ + dbring.o \ + hw.o \ + wow.o + +ath11k-$(CONFIG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o +ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o +ath11k-$(CONFIG_ATH11K_TRACING) += trace.o +ath11k-$(CONFIG_THERMAL) += thermal.o +ath11k-$(CONFIG_ATH11K_SPECTRAL) += spectral.o + +obj-$(CONFIG_ATH11K_AHB) += ath11k_ahb.o +ath11k_ahb-y += ahb.o + +obj-$(CONFIG_ATH11K_PCI) += ath11k_pci.o +ath11k_pci-y += mhi.o pci.o + +# for tracing framework to find trace.h +CFLAGS_trace.o := -I$(src) diff --git a/sys/contrib/dev/athk/ath11k/ahb.c b/sys/contrib/dev/athk/ath11k/ahb.c new file mode 100644 index 000000000000..f93686d0d25d --- /dev/null +++ b/sys/contrib/dev/athk/ath11k/ahb.c @@ -0,0 +1,808 @@ +// SPDX-License-Identifier: BSD-3-Clause-Clear +/* + * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. + */ + +#include +#include +#include +#include +#include +#include "ahb.h" +#include "debug.h" +#include "hif.h" +#include + +static const struct of_device_id ath11k_ahb_of_match[] = { + /* TODO: Should we change the compatible string to something similar + * to one that ath10k uses? + */ + { .compatible = "qcom,ipq8074-wifi", + .data = (void *)ATH11K_HW_IPQ8074, + }, + { .compatible = "qcom,ipq6018-wifi", + .data = (void *)ATH11K_HW_IPQ6018_HW10, + }, + { } +}; + +MODULE_DEVICE_TABLE(of, ath11k_ahb_of_match); + +static const struct ath11k_bus_params ath11k_ahb_bus_params = { + .mhi_support = false, + .m3_fw_support = false, + .fixed_bdf_addr = true, + .fixed_mem_region = true, +}; + +#define ATH11K_IRQ_CE0_OFFSET 4 + +static const char *irq_name[ATH11K_IRQ_NUM_MAX] = { + "misc-pulse1", + "misc-latch", + "sw-exception", + "watchdog", + "ce0", + "ce1", + "ce2", + "ce3", + "ce4", + "ce5", + "ce6", + "ce7", + "ce8", + "ce9", + "ce10", + "ce11", + "host2wbm-desc-feed", + "host2reo-re-injection", + "host2reo-command", + "host2rxdma-monitor-ring3", + "host2rxdma-monitor-ring2", + "host2rxdma-monitor-ring1", + "reo2ost-exception", + "wbm2host-rx-release", + "reo2host-status", + "reo2host-destination-ring4", + "reo2host-destination-ring3", + "reo2host-destination-ring2", + "reo2host-destination-ring1", + "rxdma2host-monitor-destination-mac3", + "rxdma2host-monitor-destination-mac2", + "rxdma2host-monitor-destination-mac1", + "ppdu-end-interrupts-mac3", + "ppdu-end-interrupts-mac2", + "ppdu-end-interrupts-mac1", + "rxdma2host-monitor-status-ring-mac3", + "rxdma2host-monitor-status-ring-mac2", + "rxdma2host-monitor-status-ring-mac1", + "host2rxdma-host-buf-ring-mac3", + "host2rxdma-host-buf-ring-mac2", + "host2rxdma-host-buf-ring-mac1", + "rxdma2host-destination-ring-mac3", + "rxdma2host-destination-ring-mac2", + "rxdma2host-destination-ring-mac1", + "host2tcl-input-ring4", + "host2tcl-input-ring3", + "host2tcl-input-ring2", + "host2tcl-input-ring1", + "wbm2host-tx-completions-ring3", + "wbm2host-tx-completions-ring2", + "wbm2host-tx-completions-ring1", + "tcl2host-status-ring", +}; + +/* enum ext_irq_num - irq numbers that can be used by external modules + * like datapath + */ +enum ext_irq_num { + host2wbm_desc_feed = 16, + host2reo_re_injection, + host2reo_command, + host2rxdma_monitor_ring3, + host2rxdma_monitor_ring2, + host2rxdma_monitor_ring1, + reo2host_exception, + wbm2host_rx_release, + reo2host_status, + reo2host_destination_ring4, + reo2host_destination_ring3, + reo2host_destination_ring2, + reo2host_destination_ring1, + rxdma2host_monitor_destination_mac3, + rxdma2host_monitor_destination_mac2, + rxdma2host_monitor_destination_mac1, + ppdu_end_interrupts_mac3, + ppdu_end_interrupts_mac2, + ppdu_end_interrupts_mac1, + rxdma2host_monitor_status_ring_mac3, + rxdma2host_monitor_status_ring_mac2, + rxdma2host_monitor_status_ring_mac1, + host2rxdma_host_buf_ring_mac3, + host2rxdma_host_buf_ring_mac2, + host2rxdma_host_buf_ring_mac1, + rxdma2host_destination_ring_mac3, + rxdma2host_destination_ring_mac2, + rxdma2host_destination_ring_mac1, + host2tcl_input_ring4, + host2tcl_input_ring3, + host2tcl_input_ring2, + host2tcl_input_ring1, + wbm2host_tx_completions_ring3, + wbm2host_tx_completions_ring2, + wbm2host_tx_completions_ring1, + tcl2host_status_ring, +}; + +static inline u32 ath11k_ahb_read32(struct ath11k_base *ab, u32 offset) +{ + return ioread32(ab->mem + offset); +} + +static inline void ath11k_ahb_write32(struct ath11k_base *ab, u32 offset, u32 value) +{ + iowrite32(value, ab->mem + offset); +} + +static void ath11k_ahb_kill_tasklets(struct ath11k_base *ab) +{ + int i; + + for (i = 0; i < ab->hw_params.ce_count; i++) { + struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i]; + + if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) + continue; + + tasklet_kill(&ce_pipe->intr_tq); + } +} + +static void ath11k_ahb_ext_grp_disable(struct ath11k_ext_irq_grp *irq_grp) +{ + int i; + + for (i = 0; i < irq_grp->num_irq; i++) + disable_irq_nosync(irq_grp->ab->irq_num[irq_grp->irqs[i]]); +} + +static void __ath11k_ahb_ext_irq_disable(struct ath11k_base *ab) +{ + int i; + + for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { + struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + + ath11k_ahb_ext_grp_disable(irq_grp); + + if (irq_grp->napi_enabled) { + napi_synchronize(&irq_grp->napi); + napi_disable(&irq_grp->napi); + irq_grp->napi_enabled = false; + } + } +} + +static void ath11k_ahb_ext_grp_enable(struct ath11k_ext_irq_grp *irq_grp) +{ + int i; + + for (i = 0; i < irq_grp->num_irq; i++) + enable_irq(irq_grp->ab->irq_num[irq_grp->irqs[i]]); +} + +static void ath11k_ahb_setbit32(struct ath11k_base *ab, u8 bit, u32 offset) +{ + u32 val; + + val = ath11k_ahb_read32(ab, offset); + ath11k_ahb_write32(ab, offset, val | BIT(bit)); +} + +static void ath11k_ahb_clearbit32(struct ath11k_base *ab, u8 bit, u32 offset) +{ + u32 val; + + val = ath11k_ahb_read32(ab, offset); + ath11k_ahb_write32(ab, offset, val & ~BIT(bit)); +} + +static void ath11k_ahb_ce_irq_enable(struct ath11k_base *ab, u16 ce_id) +{ + const struct ce_attr *ce_attr; + + ce_attr = &ab->hw_params.host_ce_config[ce_id]; + if (ce_attr->src_nentries) + ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_ADDRESS); + + if (ce_attr->dest_nentries) { + ath11k_ahb_setbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS); + ath11k_ahb_setbit32(ab, ce_id + CE_HOST_IE_3_SHIFT, + CE_HOST_IE_3_ADDRESS); + } +} + +static void ath11k_ahb_ce_irq_disable(struct ath11k_base *ab, u16 ce_id) +{ + const struct ce_attr *ce_attr; + + ce_attr = &ab->hw_params.host_ce_config[ce_id]; + if (ce_attr->src_nentries) + ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_ADDRESS); + + if (ce_attr->dest_nentries) { + ath11k_ahb_clearbit32(ab, ce_id, CE_HOST_IE_2_ADDRESS); + ath11k_ahb_clearbit32(ab, ce_id + CE_HOST_IE_3_SHIFT, + CE_HOST_IE_3_ADDRESS); + } +} + +static void ath11k_ahb_sync_ce_irqs(struct ath11k_base *ab) +{ + int i; + int irq_idx; + + for (i = 0; i < ab->hw_params.ce_count; i++) { + if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) + continue; + + irq_idx = ATH11K_IRQ_CE0_OFFSET + i; + synchronize_irq(ab->irq_num[irq_idx]); + } +} + +static void ath11k_ahb_sync_ext_irqs(struct ath11k_base *ab) +{ + int i, j; + int irq_idx; + + for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { + struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + + for (j = 0; j < irq_grp->num_irq; j++) { + irq_idx = irq_grp->irqs[j]; + synchronize_irq(ab->irq_num[irq_idx]); + } + } +} + +static void ath11k_ahb_ce_irqs_enable(struct ath11k_base *ab) +{ + int i; + + for (i = 0; i < ab->hw_params.ce_count; i++) { + if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) + continue; + ath11k_ahb_ce_irq_enable(ab, i); + } +} + +static void ath11k_ahb_ce_irqs_disable(struct ath11k_base *ab) +{ + int i; + + for (i = 0; i < ab->hw_params.ce_count; i++) { + if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) + continue; + ath11k_ahb_ce_irq_disable(ab, i); + } +} + +static int ath11k_ahb_start(struct ath11k_base *ab) +{ + ath11k_ahb_ce_irqs_enable(ab); + ath11k_ce_rx_post_buf(ab); + + return 0; +} + +static void ath11k_ahb_ext_irq_enable(struct ath11k_base *ab) +{ + int i; + + for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { + struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + + if (!irq_grp->napi_enabled) { + napi_enable(&irq_grp->napi); + irq_grp->napi_enabled = true; + } + ath11k_ahb_ext_grp_enable(irq_grp); + } +} + +static void ath11k_ahb_ext_irq_disable(struct ath11k_base *ab) +{ + __ath11k_ahb_ext_irq_disable(ab); + ath11k_ahb_sync_ext_irqs(ab); +} + +static void ath11k_ahb_stop(struct ath11k_base *ab) +{ + if (!test_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags)) + ath11k_ahb_ce_irqs_disable(ab); + ath11k_ahb_sync_ce_irqs(ab); + ath11k_ahb_kill_tasklets(ab); + del_timer_sync(&ab->rx_replenish_retry); + ath11k_ce_cleanup_pipes(ab); +} + +static int ath11k_ahb_power_up(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + int ret; + + ret = rproc_boot(ab_ahb->tgt_rproc); + if (ret) + ath11k_err(ab, "failed to boot the remote processor Q6\n"); + + return ret; +} + +static void ath11k_ahb_power_down(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + + rproc_shutdown(ab_ahb->tgt_rproc); +} + +static int ath11k_ahb_fwreset_from_cold_boot(struct ath11k_base *ab) +{ + int timeout; + + if (ath11k_cold_boot_cal == 0 || ab->qmi.cal_done || + ab->hw_params.cold_boot_calib == 0) + return 0; + + ath11k_dbg(ab, ATH11K_DBG_AHB, "wait for cold boot done\n"); + timeout = wait_event_timeout(ab->qmi.cold_boot_waitq, + (ab->qmi.cal_done == 1), + ATH11K_COLD_BOOT_FW_RESET_DELAY); + if (timeout <= 0) { + ath11k_cold_boot_cal = 0; + ath11k_warn(ab, "Coldboot Calibration failed timed out\n"); + } + + /* reset the firmware */ + ath11k_ahb_power_down(ab); + ath11k_ahb_power_up(ab); + + ath11k_dbg(ab, ATH11K_DBG_AHB, "exited from cold boot mode\n"); + return 0; +} + +static void ath11k_ahb_init_qmi_ce_config(struct ath11k_base *ab) +{ + struct ath11k_qmi_ce_cfg *cfg = &ab->qmi.ce_cfg; + + cfg->tgt_ce_len = ab->hw_params.target_ce_count; + cfg->tgt_ce = ab->hw_params.target_ce_config; + cfg->svc_to_ce_map_len = ab->hw_params.svc_to_ce_map_len; + cfg->svc_to_ce_map = ab->hw_params.svc_to_ce_map; + ab->qmi.service_ins_id = ab->hw_params.qmi_service_ins_id; +} + +static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab) +{ + int i, j; + + for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { + struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + + for (j = 0; j < irq_grp->num_irq; j++) + free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); + } +} + +static void ath11k_ahb_free_irq(struct ath11k_base *ab) +{ + int irq_idx; + int i; + + for (i = 0; i < ab->hw_params.ce_count; i++) { + if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) + continue; + irq_idx = ATH11K_IRQ_CE0_OFFSET + i; + free_irq(ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]); + } + + ath11k_ahb_free_ext_irq(ab); +} + +static void ath11k_ahb_ce_tasklet(struct tasklet_struct *t) +{ + struct ath11k_ce_pipe *ce_pipe = from_tasklet(ce_pipe, t, intr_tq); + + ath11k_ce_per_engine_service(ce_pipe->ab, ce_pipe->pipe_num); + + ath11k_ahb_ce_irq_enable(ce_pipe->ab, ce_pipe->pipe_num); +} + +static irqreturn_t ath11k_ahb_ce_interrupt_handler(int irq, void *arg) +{ + struct ath11k_ce_pipe *ce_pipe = arg; + + /* last interrupt received for this CE */ + ce_pipe->timestamp = jiffies; + + ath11k_ahb_ce_irq_disable(ce_pipe->ab, ce_pipe->pipe_num); + + tasklet_schedule(&ce_pipe->intr_tq); + + return IRQ_HANDLED; +} + +static int ath11k_ahb_ext_grp_napi_poll(struct napi_struct *napi, int budget) +{ + struct ath11k_ext_irq_grp *irq_grp = container_of(napi, + struct ath11k_ext_irq_grp, + napi); + struct ath11k_base *ab = irq_grp->ab; + int work_done; + + work_done = ath11k_dp_service_srng(ab, irq_grp, budget); + if (work_done < budget) { + napi_complete_done(napi, work_done); + ath11k_ahb_ext_grp_enable(irq_grp); + } + + if (work_done > budget) + work_done = budget; + + return work_done; +} + +static irqreturn_t ath11k_ahb_ext_interrupt_handler(int irq, void *arg) +{ + struct ath11k_ext_irq_grp *irq_grp = arg; + + /* last interrupt received for this group */ + irq_grp->timestamp = jiffies; + + ath11k_ahb_ext_grp_disable(irq_grp); + + napi_schedule(&irq_grp->napi); + + return IRQ_HANDLED; +} + +static int ath11k_ahb_ext_irq_config(struct ath11k_base *ab) +{ + struct ath11k_hw_params *hw = &ab->hw_params; + int i, j; + int irq; + int ret; + + for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { + struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + u32 num_irq = 0; + + irq_grp->ab = ab; + irq_grp->grp_id = i; + init_dummy_netdev(&irq_grp->napi_ndev); + netif_napi_add(&irq_grp->napi_ndev, &irq_grp->napi, + ath11k_ahb_ext_grp_napi_poll); + + for (j = 0; j < ATH11K_EXT_IRQ_NUM_MAX; j++) { + if (ab->hw_params.ring_mask->tx[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + wbm2host_tx_completions_ring1 - j; + } + + if (ab->hw_params.ring_mask->rx[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + reo2host_destination_ring1 - j; + } + + if (ab->hw_params.ring_mask->rx_err[i] & BIT(j)) + irq_grp->irqs[num_irq++] = reo2host_exception; + + if (ab->hw_params.ring_mask->rx_wbm_rel[i] & BIT(j)) + irq_grp->irqs[num_irq++] = wbm2host_rx_release; + + if (ab->hw_params.ring_mask->reo_status[i] & BIT(j)) + irq_grp->irqs[num_irq++] = reo2host_status; + + if (j < ab->hw_params.max_radios) { + if (ab->hw_params.ring_mask->rxdma2host[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + rxdma2host_destination_ring_mac1 - + ath11k_hw_get_mac_from_pdev_id(hw, j); + } + + if (ab->hw_params.ring_mask->host2rxdma[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + host2rxdma_host_buf_ring_mac1 - + ath11k_hw_get_mac_from_pdev_id(hw, j); + } + + if (ab->hw_params.ring_mask->rx_mon_status[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + ppdu_end_interrupts_mac1 - + ath11k_hw_get_mac_from_pdev_id(hw, j); + irq_grp->irqs[num_irq++] = + rxdma2host_monitor_status_ring_mac1 - + ath11k_hw_get_mac_from_pdev_id(hw, j); + } + } + } + irq_grp->num_irq = num_irq; + + for (j = 0; j < irq_grp->num_irq; j++) { + int irq_idx = irq_grp->irqs[j]; + + irq = platform_get_irq_byname(ab->pdev, + irq_name[irq_idx]); + ab->irq_num[irq_idx] = irq; + irq_set_status_flags(irq, IRQ_NOAUTOEN | IRQ_DISABLE_UNLAZY); + ret = request_irq(irq, ath11k_ahb_ext_interrupt_handler, + IRQF_TRIGGER_RISING, + irq_name[irq_idx], irq_grp); + if (ret) { + ath11k_err(ab, "failed request_irq for %d\n", + irq); + } + } + } + + return 0; +} + +static int ath11k_ahb_config_irq(struct ath11k_base *ab) +{ + int irq, irq_idx, i; + int ret; + + /* Configure CE irqs */ + for (i = 0; i < ab->hw_params.ce_count; i++) { + struct ath11k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i]; + + if (ath11k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) + continue; + + irq_idx = ATH11K_IRQ_CE0_OFFSET + i; + + tasklet_setup(&ce_pipe->intr_tq, ath11k_ahb_ce_tasklet); + irq = platform_get_irq_byname(ab->pdev, irq_name[irq_idx]); + ret = request_irq(irq, ath11k_ahb_ce_interrupt_handler, + IRQF_TRIGGER_RISING, irq_name[irq_idx], + ce_pipe); + if (ret) + return ret; + + ab->irq_num[irq_idx] = irq; + } + + /* Configure external interrupts */ + ret = ath11k_ahb_ext_irq_config(ab); + + return ret; +} + +static int ath11k_ahb_map_service_to_pipe(struct ath11k_base *ab, u16 service_id, + u8 *ul_pipe, u8 *dl_pipe) +{ + const struct service_to_pipe *entry; + bool ul_set = false, dl_set = false; + int i; + + for (i = 0; i < ab->hw_params.svc_to_ce_map_len; i++) { + entry = &ab->hw_params.svc_to_ce_map[i]; + + if (__le32_to_cpu(entry->service_id) != service_id) + continue; + + switch (__le32_to_cpu(entry->pipedir)) { + case PIPEDIR_NONE: + break; + case PIPEDIR_IN: + WARN_ON(dl_set); + *dl_pipe = __le32_to_cpu(entry->pipenum); + dl_set = true; + break; + case PIPEDIR_OUT: + WARN_ON(ul_set); + *ul_pipe = __le32_to_cpu(entry->pipenum); + ul_set = true; + break; + case PIPEDIR_INOUT: + WARN_ON(dl_set); + WARN_ON(ul_set); + *dl_pipe = __le32_to_cpu(entry->pipenum); + *ul_pipe = __le32_to_cpu(entry->pipenum); + dl_set = true; + ul_set = true; + break; + } + } + + if (WARN_ON(!ul_set || !dl_set)) + return -ENOENT; + + return 0; +} + +static const struct ath11k_hif_ops ath11k_ahb_hif_ops = { + .start = ath11k_ahb_start, + .stop = ath11k_ahb_stop, + .read32 = ath11k_ahb_read32, + .write32 = ath11k_ahb_write32, + .irq_enable = ath11k_ahb_ext_irq_enable, + .irq_disable = ath11k_ahb_ext_irq_disable, + .map_service_to_pipe = ath11k_ahb_map_service_to_pipe, + .power_down = ath11k_ahb_power_down, + .power_up = ath11k_ahb_power_up, +}; + +static int ath11k_core_get_rproc(struct ath11k_base *ab) +{ + struct ath11k_ahb *ab_ahb = ath11k_ahb_priv(ab); + struct device *dev = ab->dev; + struct rproc *prproc; + phandle rproc_phandle; + + if (of_property_read_u32(dev->of_node, "qcom,rproc", &rproc_phandle)) { + ath11k_err(ab, "failed to get q6_rproc handle\n"); + return -ENOENT; + } + + prproc = rproc_get_by_phandle(rproc_phandle); + if (!prproc) { + ath11k_err(ab, "failed to get rproc\n"); + return -EINVAL; + } + ab_ahb->tgt_rproc = prproc; + + return 0; +} + +static int ath11k_ahb_probe(struct platform_device *pdev) +{ + struct ath11k_base *ab; + const struct of_device_id *of_id; + struct resource *mem_res; + void __iomem *mem; + int ret; + + of_id = of_match_device(ath11k_ahb_of_match, &pdev->dev); + if (!of_id) { + dev_err(&pdev->dev, "failed to find matching device tree id\n"); + return -EINVAL; + } + + mem = devm_platform_get_and_ioremap_resource(pdev, 0, &mem_res); + if (IS_ERR(mem)) { + dev_err(&pdev->dev, "ioremap error\n"); + return PTR_ERR(mem); + } + + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (ret) { + dev_err(&pdev->dev, "failed to set 32-bit consistent dma\n"); + return ret; + } + + ab = ath11k_core_alloc(&pdev->dev, sizeof(struct ath11k_ahb), + ATH11K_BUS_AHB, + &ath11k_ahb_bus_params); + if (!ab) { + dev_err(&pdev->dev, "failed to allocate ath11k base\n"); + return -ENOMEM; + } + + ab->hif.ops = &ath11k_ahb_hif_ops; + ab->pdev = pdev; + ab->hw_rev = (enum ath11k_hw_rev)of_id->data; + ab->mem = mem; + ab->mem_len = resource_size(mem_res); + platform_set_drvdata(pdev, ab); + + ret = ath11k_core_pre_init(ab); + if (ret) + goto err_core_free; + + ret = ath11k_hal_srng_init(ab); + if (ret) + goto err_core_free; + + ret = ath11k_ce_alloc_pipes(ab); + if (ret) { + ath11k_err(ab, "failed to allocate ce pipes: %d\n", ret); + goto err_hal_srng_deinit; + } + + ath11k_ahb_init_qmi_ce_config(ab); + + ret = ath11k_core_get_rproc(ab); + if (ret) { + ath11k_err(ab, "failed to get rproc: %d\n", ret); + goto err_ce_free; + } + + ret = ath11k_core_init(ab); + if (ret) { + ath11k_err(ab, "failed to init core: %d\n", ret); + goto err_ce_free; + } + + ret = ath11k_ahb_config_irq(ab); + if (ret) { + ath11k_err(ab, "failed to configure irq: %d\n", ret); + goto err_ce_free; + } + + ath11k_ahb_fwreset_from_cold_boot(ab); + + return 0; + +err_ce_free: + ath11k_ce_free_pipes(ab); + +err_hal_srng_deinit: + ath11k_hal_srng_deinit(ab); + +err_core_free: + ath11k_core_free(ab); + platform_set_drvdata(pdev, NULL); + + return ret; +} + +static int ath11k_ahb_remove(struct platform_device *pdev) +{ + struct ath11k_base *ab = platform_get_drvdata(pdev); + unsigned long left; + + if (test_bit(ATH11K_FLAG_QMI_FAIL, &ab->dev_flags)) { + ath11k_ahb_power_down(ab); + ath11k_debugfs_soc_destroy(ab); + ath11k_qmi_deinit_service(ab); + goto qmi_fail; + } + + reinit_completion(&ab->driver_recovery); + + if (test_bit(ATH11K_FLAG_RECOVERY, &ab->dev_flags)) { + left = wait_for_completion_timeout(&ab->driver_recovery, + ATH11K_AHB_RECOVERY_TIMEOUT); + if (!left) + ath11k_warn(ab, "failed to receive recovery response completion\n"); + } *** 67943 LINES SKIPPED *** From nobody Fri May 12 12:33:15 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHp8D1x6jz49xyK; Fri, 12 May 2023 12:33: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 4QHp8D1RFMz3t3D; Fri, 12 May 2023 12:33:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683894796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgTWvxOYRKXSEmRrObA8XCixtgcw1rcqwrj09Y0t+n4=; b=btbb6dNBjSW5I7LnvHdngF+TRi7FF3wEnsx0sHkLRtRwWbnkt/xmtkYyq8STDLpz8fP+3B Xv2TpDUI/TAompigFZygb4WaSQBk0Ao9+ouwe9J1iAgW6xcdcMqvGzrqXEiNEAUytvliOa FaUX+fvbl2M4WaOD0sPpYRDPTbXyZifvuC/YPMnbyZe1eZRb5smX4FrHfJWwJwP+NAmJ5j oatrrFRRik9kO4EoJSIcoxWWB2VVIwpFdz9XOcPN+f1jIV9z4XqnEv5ZmsTX6G6p5keNv4 i2UjPg3Hl/JYggaKDYWJ4SgYTZgu8GEkEp40hdv/HxKZP3ch4MKEru8sK39++w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683894796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vgTWvxOYRKXSEmRrObA8XCixtgcw1rcqwrj09Y0t+n4=; b=COJjrJfqImOwQyj4uXIN1/eI3yyglfmWtD6a1UjQwPMgy5KbGINkUVQeWweo6zeFFos26f qkeVbEzEM58jenGlUSqx92rkaC0fNnwe+d4VUjxrLsIUtYM8O0e/kKbQgDXQ8vSYNPrzvf zhmYEXLZtlWVkTNPv7ND9i2z/7jUsfVQ9QGDWmIWhgmczsjdhPaV77XT1uGwhmOhpo/eF+ 9S1TRByyTujoHhH46xCt7kb5LGl05hI93EDFoFKIOjqSJU1JKUoz2dMFjd5ZkRouTTY3EY EANX9TA16RNkbHck6b5ENEdpGgaPuqQCVKH019ZMjp0GhPqHcks8lySKSb+myA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683894796; a=rsa-sha256; cv=none; b=YRTajYnJyK1lcKTt2SlXYdIZ7bt8V6rDaYzs74DLJRkaeYMzhOynEJPAG9x9l0txRTNyB0 81FWPjBWEhJeXAqZam/B+f8EggMuaod6xvCIQWXeKV3w4UyY4F+h+V3doeoh/KOZkPcJ+L CURqrv0n18+k4Yr4NbR/gJTpk/fT/pDj/DDmReb2S1/rjBiDwknc6Bir0cHD27BzG1I/3k eaOe43Q3qGQbZJ/AfOhiocfaVKEQf4Jn1OatDNQ/KfgiMNliH3x3VVwzu2wNF/hDnzViZM XEDCunksSxBZ+YKthCq1oau1FKv5DLyqLQypkcc+8UQK8dYll/0ZCt81x7Hisw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHp8D0VNxzbmg; Fri, 12 May 2023 12:33: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 34CCXFuY049710; Fri, 12 May 2023 12:33:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CCXF32049709; Fri, 12 May 2023 12:33:15 GMT (envelope-from git) Date: Fri, 12 May 2023 12:33:15 GMT Message-Id: <202305121233.34CCXF32049709@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: fa554de7746d - main - netlink: reduce default log levels List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa554de7746d88959738e4cb978608af8ce479c1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=fa554de7746d88959738e4cb978608af8ce479c1 commit fa554de7746d88959738e4cb978608af8ce479c1 Author: Kristof Provost AuthorDate: 2023-05-11 13:08:42 +0000 Commit: Kristof Provost CommitDate: 2023-05-12 12:32:57 +0000 netlink: reduce default log levels Reduce the default log level for netlink to LOG_INFO. This removes a number of messages such as > [nl_iface] dump_sa: unsupported family: 0, skipping or > [nl_iface] get_operstate_ether: error calling SIOCGIFMEDIA on vlan0: 22 that are useful for debugging, but not for most users. Reviewed by: melifaro Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D40062 --- sys/compat/linux/linux_netlink.c | 2 +- sys/netlink/netlink_domain.c | 2 +- sys/netlink/netlink_generic.c | 2 +- sys/netlink/netlink_generic_kpi.c | 2 +- sys/netlink/netlink_io.c | 2 +- sys/netlink/netlink_message_parser.c | 2 +- sys/netlink/netlink_message_writer.c | 2 +- sys/netlink/netlink_module.c | 2 +- sys/netlink/netlink_route.c | 2 +- sys/netlink/route/iface.c | 2 +- sys/netlink/route/iface_drivers.c | 2 +- sys/netlink/route/neigh.c | 2 +- sys/netlink/route/nexthop.c | 2 +- sys/netlink/route/rt.c | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 775a36994d2d..85c0e6ba33a0 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_linux #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); static bool valid_rta_size(const struct rtattr *rta, int sz) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 7538336bdc45..9138e3417cf6 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -56,7 +56,7 @@ #define DEBUG_MOD_NAME nl_domain #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); _Static_assert((NLP_MAX_GROUPS % 64) == 0, "NLP_MAX_GROUPS has to be multiple of 64"); diff --git a/sys/netlink/netlink_generic.c b/sys/netlink/netlink_generic.c index 4595b3074d50..32009e74e6a0 100644 --- a/sys/netlink/netlink_generic.c +++ b/sys/netlink/netlink_generic.c @@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_generic #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); static int dump_family(struct nlmsghdr *hdr, struct genlmsghdr *ghdr, const struct genl_family *gf, struct nl_writer *nw); diff --git a/sys/netlink/netlink_generic_kpi.c b/sys/netlink/netlink_generic_kpi.c index b64f6bd3f1b6..d64c53b1b3d6 100644 --- a/sys/netlink/netlink_generic_kpi.c +++ b/sys/netlink/netlink_generic_kpi.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_generic_kpi #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG3); +_DECLARE_DEBUG(LOG_INFO); /* diff --git a/sys/netlink/netlink_io.c b/sys/netlink/netlink_io.c index 9f5ecf63a07d..0961e6ae89d6 100644 --- a/sys/netlink/netlink_io.c +++ b/sys/netlink/netlink_io.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_io #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); /* * The logic below provide a p2p interface for receiving and diff --git a/sys/netlink/netlink_message_parser.c b/sys/netlink/netlink_message_parser.c index c6cd82260e5b..a1551d3f3a91 100644 --- a/sys/netlink/netlink_message_parser.c +++ b/sys/netlink/netlink_message_parser.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_parser #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); bool nlmsg_report_err_msg(struct nl_pstate *npt, const char *fmt, ...) diff --git a/sys/netlink/netlink_message_writer.c b/sys/netlink/netlink_message_writer.c index ef568ecbca07..dbbbec69d9fd 100644 --- a/sys/netlink/netlink_message_writer.c +++ b/sys/netlink/netlink_message_writer.c @@ -47,7 +47,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_writer #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); /* * The goal of this file is to provide convenient message writing KPI on top of diff --git a/sys/netlink/netlink_module.c b/sys/netlink/netlink_module.c index 6835c4a0e730..55df52fc85b6 100644 --- a/sys/netlink/netlink_module.c +++ b/sys/netlink/netlink_module.c @@ -52,7 +52,7 @@ FEATURE(netlink, "Netlink support"); #define DEBUG_MOD_NAME nl_mod #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); #define NL_MAX_HANDLERS 20 diff --git a/sys/netlink/netlink_route.c b/sys/netlink/netlink_route.c index ce0c0eb36dbc..1fd6d5da63a9 100644 --- a/sys/netlink/netlink_route.c +++ b/sys/netlink/netlink_route.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_route_core #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); #define HANDLER_MAX_NUM (NL_RTM_MAX + 10) static const struct rtnl_cmd_handler *rtnl_handler[HANDLER_MAX_NUM] = {}; diff --git a/sys/netlink/route/iface.c b/sys/netlink/route/iface.c index aaed11e637a2..adcf58b72e1b 100644 --- a/sys/netlink/route/iface.c +++ b/sys/netlink/route/iface.c @@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_iface #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); struct netlink_walkargs { struct nl_writer *nw; diff --git a/sys/netlink/route/iface_drivers.c b/sys/netlink/route/iface_drivers.c index 6f6adc323be6..cebbb07b5cac 100644 --- a/sys/netlink/route/iface_drivers.c +++ b/sys/netlink/route/iface_drivers.c @@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_iface_drivers #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); /* * Generic modification interface handler. diff --git a/sys/netlink/route/neigh.c b/sys/netlink/route/neigh.c index db72bc9bfd4e..ced2c74284e3 100644 --- a/sys/netlink/route/neigh.c +++ b/sys/netlink/route/neigh.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_neigh #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); static int lle_families[] = { AF_INET, AF_INET6 }; diff --git a/sys/netlink/route/nexthop.c b/sys/netlink/route/nexthop.c index 94cc6caf7d82..2a1585616e07 100644 --- a/sys/netlink/route/nexthop.c +++ b/sys/netlink/route/nexthop.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_nhop #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); /* * This file contains the logic to maintain kernel nexthops and diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index cbe9ee001dfd..01a7d7ed3e16 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #define DEBUG_MOD_NAME nl_route #define DEBUG_MAX_LEVEL LOG_DEBUG3 #include -_DECLARE_DEBUG(LOG_DEBUG); +_DECLARE_DEBUG(LOG_INFO); static unsigned char get_rtm_type(const struct nhop_object *nh) From nobody Fri May 12 14:58:02 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHsMH0LWCz4B6Wp; Fri, 12 May 2023 14:58: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 4QHsMG6dd5z47D9; Fri, 12 May 2023 14:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683903482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfCF+Uoh7bQS3bZdaoblmoSm6PeI7JXljtSGlyz343Q=; b=srgCzKS/wUVlnljd1VSMcx/9IuAZ0O2tTwq6BdBa7/8Lbd+cei3I0JQ7VJbKP+Q2vkFc8t 5xUPScNiVnJNC02CIPdhO9de6pJ4Gb4QC0w9dGuAwH7UOMbRbhMhRDDRugKhrml6miGkKS vhb8q/TLif4+f6eiTMjNnLN9pjnaQWmi9p9NJXtbC/KS1ClfSoBD9yhBqL4oFnetecLaCB 6kaBFfhM8IM3h3aPJwlSUhQB+/ZPx9w3H7r3mMVgwxqX2j8LLqTBKSXZd6uImOxQtkIjyY nVB2rF9aMjNKAFHQ3+lzFKcIlndHiT9HN4tjjxoBVM0cuGnBEq13udc6LTMY9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683903482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zfCF+Uoh7bQS3bZdaoblmoSm6PeI7JXljtSGlyz343Q=; b=VqSslATRUakwKzHSPkCNs6t1uN+9vV/q5Rd/6xJAB9bRRppydC5Bu2bk90R4v4Rnv3ss4e sr2kS5yhEKS21brDJ4zxFvNjPknljTBuLj0z680aB0IcwAFrZ4DmQK4EHgTvo6BPTFM28Y Mmmxsry5GFZYWyb5NfOkc6QhnQ8NAgcR+8rqbL4SFqsNI8GsDTxwBeQrHWW3L5J/omCZ8Y A5qd1QHfA+UFdngfd1Hj9CYUF40PeAfgslAklGcwcaC7PasEjWEPVkqt+TkvgzY2yETVd7 BQy1MxKCKWlNMMPF1x12ylQUr6/K5tozkDywuFe9WHeObjTbuGkiMOXj7LVGOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683903482; a=rsa-sha256; cv=none; b=GSUOPe2P31ixcCpPCumMQ+a9GRdmO379uDCX5RCxxf1/CZmefgUlo8eJ2N+mtUGNDhyPTO qVD8Aa5PQr5mVuU0uf8AfnwYfqC94acdfccZbLR62HPaLtcAD9+QN/qboKZHw5PY+4sf4G iv5Cj6vAclrQLaXy6Xp8mtvUNeEM9aB+MEwPdaJzCowFKDOFzqWYOlO3dLPBBNJfuz2SFv ry4i4q0iUvwP+JTQfEh5hSYbdZU6pDUlQaPrHDne2JLS4DNE+g4jCh3Ausci/NKrIMZ2Ke tjl7/szsGhyX3QMFzKJse29kyHvl39gikRMlTwbJeMQCE3fQJlULGZgcXYeTTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHsMG5jYRzgCZ; Fri, 12 May 2023 14:58: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 34CEw2lF081033; Fri, 12 May 2023 14:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CEw2A3081032; Fri, 12 May 2023 14:58:02 GMT (envelope-from git) Date: Fri, 12 May 2023 14:58:02 GMT Message-Id: <202305121458.34CEw2A3081032@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d1fdf357ae72 - main - src.conf.5: regen List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1fdf357ae72e9e43e2e897aaf6dedb434b3d5fc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d1fdf357ae72e9e43e2e897aaf6dedb434b3d5fc commit d1fdf357ae72e9e43e2e897aaf6dedb434b3d5fc Author: Ed Maste AuthorDate: 2023-05-12 14:53:11 +0000 Commit: Ed Maste CommitDate: 2023-05-12 14:55:08 +0000 src.conf.5: regen Fixes: ad9d10a859ac ("efi: mark as broken on i386") Fixes: bee3d4bf8ed5 ("Move DIRDEPS_BUILD settings to sys.dirdeps.mk") Sponsored by: The FreeBSD Foundation --- share/man/man5/src.conf.5 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 5a1bb730f957..83dd10f18164 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd May 1, 2023 +.Dd May 12, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -533,6 +533,10 @@ When set, it enforces these options: When set, these options are also in effect: .Pp .Bl -inset -compact +.It Va WITH_META_ERROR_TARGET +(unless +.Va WITHOUT_META_ERROR_TARGET +is set explicitly) .It Va WITH_META_MODE (unless .Va WITHOUT_META_MODE @@ -612,7 +616,7 @@ and .Xr efivar 8 . .Pp This is a default setting on -powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. +i386/i386, powerpc/powerpc, powerpc/powerpc64, powerpc/powerpc64le and riscv/riscv64. .It Va WITH_EFI Build .Xr efivar 3 @@ -620,7 +624,7 @@ and .Xr efivar 8 . .Pp This is a default setting on -amd64/amd64, arm/armv6, arm/armv7, arm64/aarch64 and i386/i386. +amd64/amd64, arm/armv6, arm/armv7 and arm64/aarch64. .It Va WITHOUT_ELFTOOLCHAIN_BOOTSTRAP Do not build ELF Tool Chain tools (addr2line, nm, size, strings and strip) From nobody Fri May 12 15:11:44 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHsg769nCz4B79X; Fri, 12 May 2023 15:11:47 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHsg73whKz49F0; Fri, 12 May 2023 15:11:47 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 34CFBj8J042062; Fri, 12 May 2023 10:11:45 -0500 (CDT) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1683904305; bh=LBkS06YnyQ0QJklwhuLjUgsVo2IOIqKuduEl/1qi9i0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=iEGnkv/t09CmXBICZ03wekhxcjyeLgkGk1+dTtxkZTZ0FiSYr6cCU6OAQ4wCFyPuf NPaMttzJYw2cSOmRt+y9ZUTtgNhGZRFuQx4Nn8KXxf5yWkRyVEtKLO3hx+7WOIwg1h so3yDbbOoUZa3mxEwawoYZ3oeuI/h7i0vCsYdLyynSdz3kDBUksEmnTJq/giuajK/y z2ENXF+8jGMYfbv+guVCEsnmdJpBebDFJWHQfRJFyq4pvQ5GqtPtcttHbc5rqeFXMA CeZkB1ojMlSEjptagJAHTd8L06WHifG/0dke5LuPT3wOEbwf629djjAiqlDqGoJ8+6 HTgx3gmA5PR0Q== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id Ty+wFzFXXmRMpAAAs/W3XQ (envelope-from ); Fri, 12 May 2023 10:11:45 -0500 From: Mike Karels To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Date: Fri, 12 May 2023 10:11:44 -0500 X-Mailer: MailMate (1.14r5964) Message-ID: <07DE4EFF-D9C3-4492-A599-66D72D5DEA8C@karels.net> In-Reply-To: <202305111732.34BHWKdw059416@gndrsh.dnsmgr.net> References: <202305111732.34BHWKdw059416@gndrsh.dnsmgr.net> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QHsg73whKz49F0 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Rod and I discussed this, and I=E2=80=99m top-posting a summary of a prop= osal that we both support. I=E2=80=99ll leave the last message from the list below= for reference. Our consensus is that the main problem is the code in pw(8) (used by adduser, and hence bsdinstall) that interprets /home as /usr/hom= e, installing a symlink for /home, and similarly for any other home director= y whose parent has a single component. We propose to remove that code, and= also modify bsdinstall=E2=80=99s zfs script to create a home dataset rath= er than usr/home. adduser presents a default home directory using /home, so this= will continue to agree. As Rod said at the start of this thread, home directories really don=E2=80=99t belong in /usr, and the only reason they= were there is because of the previous root + /usr partitioning. Now the defau= lt is one large partition. Of course, people who want to partition differen= tly can do whatever they want. It will still be possible for admins to create home directories in /usr/home, they will just have to do so explicitly for pw to create the directory, and manually create a /home symlink if desired. If they have a small root file system, they will want to put home directories elsewher= e. A followup change would be to change various man pages that refer to /usr/home. Mike On 11 May 2023, at 12:32, Rodney W. Grimes wrote: >> On 11 May 2023, at 9:58, Rodney W. Grimes wrote: >> >>>> On Wed, 10 May 2023 16:48:12 -0500 >>>> Mike Karels wrote: >>>> >>>>> On 10 May 2023, at 10:13, Cy Schubert wrote: >>>>> >>>>>> In message , Mit= chell >>>>>> Horne w >>>>>> rites: >>>>>>> On 5/10/23 11:19, Rodney W. Grimes wrote: >>>>>>>>> The branch main has been updated by mhorne: >>>>>>>>> >>>>>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D36db6b04962a01ff= 7b21592def02d >>>>>>> 4c570dac939 >>>>>>>>> >>>>>>>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 >>>>>>>>> Author: Mitchell Horne >>>>>>>>> AuthorDate: 2023-05-10 12:53:56 +0000 >>>>>>>>> Commit: Mitchell Horne >>>>>>>>> CommitDate: 2023-05-10 13:25:17 +0000 >>>>>>>>> >>>>>>>>> hier(7): document /home/ and /usr/home/ >>>>>>>>> >>>>>>>>> Reviewed by: imp >>>>>>>>> MFC after: 1 week >>>>>>>>> Sponsored by: The FreeBSD Foundation >>>>>>>>> Differential Revision: https://reviews.freebsd.org/D40002= >>>>>>>>> --- >>>>>>>>> share/man/man7/hier.7 | 10 ++++++++++ >>>>>>>>> 1 file changed, 10 insertions(+) >>>>>>>>> >>>>>>>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 >>>>>>>>> index ff11289436a1..b6759dd6e65b 100644 >>>>>>>>> --- a/share/man/man7/hier.7 >>>>>>>>> +++ b/share/man/man7/hier.7 >>>>>>>>> @@ -90,6 +90,10 @@ file descriptor files; >>>>>>>>> see >>>>>>>>> .Xr \&fd 4 >>>>>>>>> .El >>>>>>>>> +.It Pa /home/ >>>>>>>>> +user HOME directories. >>>>>>>>> +This is a symlink to >>>>>>>>> +.Pa /usr/home/ >>>>>>>> >>>>>>>> /usr is "contains the majority of user utilities and application= s" >>>>>>>> it should not contain home directories. >>>>>>>>> I do not know when this move to usr came about it was tradition= ally >>>>>>> /home. >>>>>>>> I do not know why /usr/home even exists, it is not needed by >>>>>>>> anything I am aware of. If we have a compatible link it >>>>>>>> should be, usr/home -> ../home and /home should be the >>>>>>>> directory. >>>>>>>> >>>>>>> >>>>>>> I agree that /usr/home is strange, and is unique (?) to FreeBSD. >>>>>>> >>>>>>> The oldest commit in the output of `git log --grep '/usr/home'` i= s: >>>>>>> >>>>>>> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd >>>>>>> Author: David Nugent >>>>>>> Date: Fri Jan 3 04:42:18 1997 +0000 >>>>>>> >>>>>>> Implemented /home -> /usr/home symlink kludge. >>>>>>> If home basedir would be created in the root partition, crea= te >>>>>>> it under /usr instead, and symlink /basedir -> /usr/basedir.= >>>>>>> >>>>>>> Notes: >>>>>>> svn path=3D/head/; revision=3D21242 >>>>>>> >>>>>>> >>>>>>> So it has been this way for 26 years at least. I do not know what= to say >>>>>>> about whether /usr "should" contain it, but it does. >>>>>> >>>>>> Usually history matters. I can understand not changing it. On the = flip >>>>>> side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /= home -- >>>>>> albeit automounted from /export/home on localhost or some NFS serv= er. In >>>>>> the Red Hat land at $JOB, /home is its own partition (actually an = LVM >>>>>> volume). In both cases /home is not in /usr because end-users can = fill >>>>>> /usr. This can be problematic operationally because it's yet anoth= er >>>>>> headache to deal with should someone fill the filesystem. Filling = /usr is >>>>>> more serious than filling /home. >>>>>> >>>>>> As a point of interest, when I installed my first FreeBSD many moo= ns ago I >>>>>> used the Solaris standard of /export/home, using amd (now automoun= t) to >>>>>> serve my /home. I'm not advocating we do this, it's overkill, but = /home >>>>>> should not live in /usr. It's a potential headache for any sysadmi= n. >>>>>> >>>>>> With ZFS the solution is easy. With UFS based systems there are a = lot of >>>>>> other factors that go into how we install the "default" from the g= et-go. >>>>> >>> >>> First off, thank you Mike for looking at this closer. Add me to any = reviews >>> you might creat. >>> >>>>> The situation is a fair mess. It took me a little while to figure = out that >>>>> the kludge referenced above is in the pw(8) command, which is used = as the >>>>> backend to adduser(8). Neither /home nor /usr/home is in the base = package. >>>>> adduser defaults to /home/user, and creates the parent directory (e= =2Eg. /home) >>>>> if it does not exist, but if there is no internal slash, pw moves t= he parent >>>>> to /usr. In this case, it makes the symlink from root. zfs is di= fferent, >>>>> in that it includes a usr/home dataset already (created by bsdinsta= ll). > > I am proposing we fix this. More below. > >>>>> In this case, creating a user with /home/user causes the symlink to= be added >>>>> as a side effect. >>>>> >>>>> I?m sure the kludge was originally done when root and /usr were sep= arate >>>>> file systems by default, root was small, and there was no /home by = default. >>>>> However, we now default to a single large file system (with dataset= s, in >>>>> the zfs case). >>>>> >>>>> All of this really is a horrible kludge, and it is a house of cards= =2E I'm >>>>> amazed that it doesn't break more often. I'm tempted to remove the= kludge >>>>> and change the zfs setup to create a home dataset rather than usr/h= ome. >>> >>> Or make it a menu option(s): >>> if (zfs) "Create a user home dataset?" (default yes) >>> if (ufs) "Create a user home directory?" (default yes) >> >> Are you suggesting that bsdinstall should do this? For ufs, there is = no >> need. > > Yes I am suggesting that bsdinstall should have a knob to turn > on (by default) and off the creation of a "home dataset/directory" > as you well need that if you choose to add users during a bsdinstall > run, or you may not want a /home at all (currently not possible) as you= > have other mechanisms for dealing with it. > > The need for this is just as valid for ufs as it is for zfs. > >> >>> "User home location: /home" (This is default) >> >> Are you proposing that the default for pw should be set at this point?= >> From all I read the default for pw is already, and should remain /home= =2E > Man page bears that out. It has no mention of any symlink or usr/home.= > >> That doesn?t seem necessary, and I don?t know if it would work from >> bsdinstall. > > No, this has nothing to do with pw directly, this is simply the path > of the dataset(zfs)/directory(ufs) that bsdinstall should create IFF > you sayd yes to the create question. At present this is hardcoded > into bsdinstall as: > /usr/home > /home -> /usr/home > > I am advocating that this should all be controllable from menu. > >> >>> As far as I am concerned the symlink can just die.... >> >> I agree, but that requires a change to pw. It creates the symlink on = the >> first account creation using /home. > > I am missing something here, pw creates the symlink yuk. > As far as I was aware the only think that created a symlink > /home -> /usr/home was bsdinstall. > >> >>>>> However, if zfs users explicitly configure a home directory under /= usr/home, >>>>> this would end up in the usr dataset. An alternative would be to r= emove the >>>>> code from pw to create the parent directory entirely (which seems s= ensible), >>>>> and create a /home directory for ufs installs. I don't know how we= ll known >>>>> it is that adduser/pw will create parent directories for home direc= tories >>>>> though. This cleanup would change the default location for home di= rectories >>>>> to /home, which makes more sense. It would require documentation, = e.g. in >>>>> the release notes. The changes would only affect new installations= , not >>>>> upgrades. >>>>> >>>>> Thoughts? >>>>> >>>> >>>> Adding home would require a change to BSD.root.dist, since it's not >>>> currently in there. Only usr is present. >>> >>> It should *not* be in the etc/mtree/BSD.*.dist files at all. >>> And it is not on my 13.1R system. It would not need to be >>> in BSD.root.dist either, this is a *post distribution* created >>> directory/dataset. >> >> I?m curious why you think this. But if pw retains the ability to crea= te >> the parent directory for the user directory (and I now think it should= ), >> there is no need for a /home by default. > > Because there is no need for /home in a base distribution until > you add a user, and that is a site specific change. What in > the base system *needs* /home? > >>>> IMHO changing pw would be a reasonable approach. >>> >>> I am mixed on this.... it more or less does the right >>> thing, and if a user specifies /tmp/foolishidea/home/$USER >>> that is on them. No one said all users homes must be >>> in the same location. >> >> Except for moving parent directories with a single component under /us= r, >> and creating a symlink for them... >> >> My current plan is to change pw not to move things under /usr, change = the >> zfs setup to use a home dataset rather than usr/home (corresponding to= the >> pw default), and then change the various man pages that refer to /usr/= home. >> Does that seem reasonable? > > Yes, then the knobs can easily be added, or scripted install should jus= t > work to effect the knobs. > >> Mike > > -- = > Rod Grimes rgrimes@free= bsd.org From nobody Fri May 12 15:14:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHsjz0S9Rz4B7Tw; Fri, 12 May 2023 15:14:15 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHsjy5l4xz49bf; Fri, 12 May 2023 15:14:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2ac89e6a5a1so98088071fa.0; Fri, 12 May 2023 08:14:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683904452; x=1686496452; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ngBZxu+FILosEE+z2929RwCSRKjRrwHFWbrPydOEVH4=; b=gfHltjEDPyqTsseeYKsKRl2OJSdq0T+kg8hLnMzJtbSWtGGe67NOD2QdXd6q0WJfl1 6bWLoHC40lf7SF6XU17s+Zx94G10hL+qDaXAuKrQRanAMvEwVIivajr4ZSqdUrIP1FT7 hTN8HtAm9xKxbdbl1PwWzqZzUWRwFzE1EJzlQ9Ej71VUVIuPODCY//+uFxW9k7LmCJ3f cAPeASBXyauLVshrDtLr+dA88dYPFHQNMrhFnZSWgicVVCyKs0OSOnt/YXsN5o+g5gH6 4fOSlHfVwbrLLAd2H84L0L0HqJsCkSfIX0LT10DNiYE3TPExfEQyxF8Ys8NDBhJvemeL YIsA== X-Gm-Message-State: AC+VfDyjMnXPPM667RL0WmywGiL0ScPikSZAUuXeDtiejUZkP6wnVtbA z4mE5eOUBAJbveX2bzh45mBvfKWBhXPAUD105qVcTV7/10o= X-Google-Smtp-Source: ACHHUZ7sFTaZNNamZulWCf9WCAeE3GGCDGBuA9zj/fMWCi3Xvdh+7l7BtzYGYJjeNqhm8sjslHOFVHtVv8PcyWi4wkE= X-Received: by 2002:a2e:9916:0:b0:2ac:689e:241b with SMTP id v22-20020a2e9916000000b002ac689e241bmr4653376lji.47.1683904452143; Fri, 12 May 2023 08:14:12 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202305112316.34BNGPYr032398@gitrepo.freebsd.org> In-Reply-To: <202305112316.34BNGPYr032398@gitrepo.freebsd.org> From: Ed Maste Date: Fri, 12 May 2023 11:14:00 -0400 Message-ID: Subject: Re: git: bee3d4bf8ed5 - main - Move DIRDEPS_BUILD settings to sys.dirdeps.mk To: "Simon J. Gerraty" Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4QHsjy5l4xz49bf X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Thu, 11 May 2023 at 19:16, Simon J. Gerraty wrote: > > The branch main has been updated by sjg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=bee3d4bf8ed55260d8cfc6d168ffa1afb49ef6a8 > > commit bee3d4bf8ed55260d8cfc6d168ffa1afb49ef6a8 > Author: Simon J. Gerraty > AuthorDate: 2023-05-11 23:15:04 +0000 > Commit: Simon J. Gerraty > CommitDate: 2023-05-11 23:15:04 +0000 > > Move DIRDEPS_BUILD settings to sys.dirdeps.mk The Cirrus-CI makeman check is now failing, due to no description found for WITH_META_ERROR_TARGET, skipping From nobody Fri May 12 16:11:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHv1J5lMWz4BBXv; Fri, 12 May 2023 16:12:36 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from mx0b-00273201.pphosted.com (mx0b-00273201.pphosted.com [67.231.152.164]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.pphosted.com", Issuer "Thawte RSA CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHv1J3z8tz4HMr; Fri, 12 May 2023 16:12:36 +0000 (UTC) (envelope-from sjg@juniper.net) Authentication-Results: mx1.freebsd.org; none Received: from pps.filterd (m0108163.ppops.net [127.0.0.1]) by mx0b-00273201.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34CFXoGO006892; Fri, 12 May 2023 09:12:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; h=to : cc : subject : in-reply-to : references : from : mime-version : content-type : content-id : date : message-id; s=PPS1017; bh=UoRbBW4Uga8d+nkHBojIdcT+mMpasP4/PEzWrE2ZydQ=; b=vxDIz8PGVeTgbL1iCC21c7NqOwQMfpedDididpfDNJLFL+8d3zE/Ex0VQmb18VIlBP/4 yvpNWgNWXjhd4aRkuOxRWdiEPmf6WazSx0dvQXwMSrmWIQkTyfJXwfznSlEyWY92D03h CCxztmJR8p1PnghzL7GRQ9mPFmvJQ9kbOEWi9BL7eEmoLBcwUq2mYxqGwg7k1OMBi1uj B/tJLZDb2Dv4qO4hxxZ+IAj0nw77sPglz0Djxi2a96M2LyrPkOs4fS2vXDGkmS8WARqE uyyEIReopTcTysszEitWgu9oyEEH9I3gSmvuhpQgzkE0bUsVHa/AvbIXhYIla+D3Y0ay eA== Received: from mw2pr02cu002.outbound.protection.outlook.com (mail-westus2azlp17013037.outbound.protection.outlook.com [40.93.10.37]) by mx0b-00273201.pphosted.com (PPS) with ESMTPS id 3qhdkq1hus-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 12 May 2023 09:12:34 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LZLvVEejpM04VuhPt2ozc2+dx31jckQApv2GoZMi6qVK2C8/6KhMuTt4G9zltU1S9hWz1QHrAnw0m/hf4D5D+xOV7znp46KtLNLQpBjaAYCKmwxCLnwZv1ng8QFn7VCavT3PQui//ITAVrIwPmOpjnN5XEATM6rD36EeSi2sTqw9wOd2hJhqAZ6+gYzoG7MvlaQEYcke1WS6E5bX27bETQr4eaT0b0TsYw9eAOsz5haxEDoCelW1wxmjwb4F7/CLmUFaQpGYzFhlTKHu7TL4qsHDgAJ/XckQjy6WyklKhif98m5SZ6NB+e3mdwhjWfctIyTOmrn9inauZBuyEsNCpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UoRbBW4Uga8d+nkHBojIdcT+mMpasP4/PEzWrE2ZydQ=; b=VTtqUYmcLJkNwT0Fk9us3Zuv6tidY7wbxJZzqk9YXLImPiO88V4cYaq+49cTF6lXx+JId6JHWWwfUsLnnl8rNhDcbQd8Ni9Pw2WvA7Wb2bOzVGkoDOCgUsTnvv8f9B8acd7kr+MXoj6XuyB4gDRXToOK172Qo557kHZWLr+iZRD+64wpBlfh4V2cXFOpm47J3WInuAS5d65Bp+Fdbc7aHEL7Sh+RT7e1FB5VIafPSGt5i5eNDUG68RO6LyzUAb5/UlORjQCPp1xypCZLzCXS4X2SmZKbhGaGzHTR3I80W0A/reRh4EOajt7iERX07waRD3mNw3a/A5qekqfBAu7dMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=softfail (sender ip is 66.129.239.14) smtp.rcpttodomain=freebsd.org smtp.mailfrom=juniper.net; dmarc=fail (p=reject sp=reject pct=100) action=oreject header.from=juniper.net; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juniper.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UoRbBW4Uga8d+nkHBojIdcT+mMpasP4/PEzWrE2ZydQ=; b=H1vn387PiM7V+F6uNZKepVZxXImHf/nbm+yDTlZ2m8AeghpJwncuOT8XLUE/zodXGZpjedhXcTLQ7NNyQXrJ68T/XKuG83Pl8YF/c+RiqDgHRuUihVnuDg2xFC2yxgtftju3LlKUw2QGsaeUnZZq5bjpYuO28D4KVQEGuTj2660= Received: from DS7PR05CA0012.namprd05.prod.outlook.com (2603:10b6:5:3b9::17) by SN6PR05MB5536.namprd05.prod.outlook.com (2603:10b6:805:b7::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.20; Fri, 12 May 2023 16:12:30 +0000 Received: from DM6NAM12FT019.eop-nam12.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::f6) by DS7PR05CA0012.outlook.office365.com (2603:10b6:5:3b9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.6 via Frontend Transport; Fri, 12 May 2023 16:12:30 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 66.129.239.14) smtp.mailfrom=juniper.net; dkim=none (message not signed) header.d=none;dmarc=fail action=oreject header.from=juniper.net; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning juniper.net discourages use of 66.129.239.14 as permitted sender) Received: from p-exchfe-eqx-01.jnpr.net (66.129.239.14) by DM6NAM12FT019.mail.protection.outlook.com (10.13.178.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6411.11 via Frontend Transport; Fri, 12 May 2023 16:12:30 +0000 Received: from p-exchbe-eqx-01.jnpr.net (10.104.9.14) by p-exchfe-eqx-01.jnpr.net (10.104.9.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.7; Fri, 12 May 2023 11:12:24 -0500 Received: from p-exchbe-eqx-01.jnpr.net (10.104.9.14) by p-exchbe-eqx-01.jnpr.net (10.104.9.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.7; Fri, 12 May 2023 11:12:24 -0500 Received: from p-mailhub01.juniper.net (10.104.20.6) by p-exchbe-eqx-01.jnpr.net (10.104.9.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.7 via Frontend Transport; Fri, 12 May 2023 11:12:24 -0500 Received: from kaos.jnpr.net (kaos.jnpr.net [172.23.255.201]) by p-mailhub01.juniper.net (8.14.4/8.11.3) with ESMTP id 34CGCNC6025296; Fri, 12 May 2023 09:12:24 -0700 (envelope-from sjg@juniper.net) Received: by kaos.jnpr.net (Postfix, from userid 1377) id 85BE38AF3D; Fri, 12 May 2023 09:11:30 -0700 (PDT) Received: from kaos.jnpr.net (localhost [127.0.0.1]) by kaos.jnpr.net (Postfix) with ESMTP id 84B0D8AFA7; Fri, 12 May 2023 09:11:30 -0700 (PDT) To: Ed Maste CC: , , , Subject: Re: git: bee3d4bf8ed5 - main - Move DIRDEPS_BUILD settings to sys.dirdeps.mk In-Reply-To: References: <202305112316.34BNGPYr032398@gitrepo.freebsd.org> Comments: In-reply-to: Ed Maste message dated "Fri, 12 May 2023 11:14:00 -0400." From: "Simon J. Gerraty" X-Mailer: MH-E 8.6+git; nmh 1.7.1; GNU Emacs 28.2 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <77397.1683907890.1@kaos.jnpr.net> Date: Fri, 12 May 2023 09:11:30 -0700 Message-ID: <81348.1683907890@kaos.jnpr.net> X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM12FT019:EE_|SN6PR05MB5536:EE_ X-MS-Office365-Filtering-Correlation-Id: 88f5d784-1b65-43d0-1416-08db5303afba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: govlS8a1hobbblthB3zsvGq79l4k71TEqri6vu13jpvIVxbZMI4fAPXVJCksE/IJJySsVuTuYoS7iiHtAfg63AEbRXayOQ8Uypc70pC8Br4RBP/4qUjUn1797FwhNH52RU7u1i816o1Mpq+ZsC4TRDnwZdsdW+GsvBbePv1fk9gacY+qnFirlW0ap1rISuonMwMor5aQCCSAJANMawoFKO2tDpan2Tkl+Zkbt9Ru6qVm1sgCHTSlb+ITmUubq/sxM7zdtpPz8iQCE6QBhPwsrsZ6bij66NMll6ndlKMbT5oSru4Sup8Sbl/pysgAzjjdEm/K3OSh3Lj9AQNc7Sst1kIO6N/o36VRxj7Jjcycwf/F6TMLfuDLzsfqRI8x3ZvVDhORdlSsRtSeTU78EjlCv6DIjRGaljDQ2zDf/UlEV9dRtj8IMBRjpXSwAMFgGVjE5qxM7xushKlLN9IgEjLl6ZJHr+jiyxRnuZ7+JcojSdIj43lMAK0gu7ppQmHBp1652zAZNAHrEfVN/qdoBLGG0/ZHl86PYEVfMbjycyy7N2/qXf011Ms/IxxjTcGVBO7qU7N1TqTW9AfFKhrIU0J5IP17mYNZdtgbhsSbL/iK2wMv8q1Xn3o9QT5lEBQM32qKMkfNNyj/wSZLhLlBMRufHsYOPT6U1+qkyh5skAJ7cw6O13xhyRIgUf2j3/Qpk4R+VOCqzr8vNGFnJ0Ca+KXz4QMtW4TYaQ1cAPQQfY5zPNgj4IM14izXCspK2kpGNvkBYEDg2MNzqFCNWkiiYml4rw== X-Forefront-Antispam-Report: CIP:66.129.239.14;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:p-exchfe-eqx-01.jnpr.net;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(4636009)(376002)(136003)(396003)(39860400002)(346002)(451199021)(46966006)(40470700004)(36840700001)(55016003)(40460700003)(2906002)(7126003)(47076005)(107886003)(336012)(36860700001)(7696005)(70206006)(70586007)(450100002)(54906003)(478600001)(9686003)(4326008)(6266002)(8936002)(186003)(8676002)(26005)(41300700001)(316002)(5660300002)(6916009)(40480700001)(82740400003)(86362001)(356005)(558084003)(81166007)(82310400005)(36900700001);DIR:OUT;SFP:1102; X-OriginatorOrg: juniper.net X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 May 2023 16:12:30.0334 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 88f5d784-1b65-43d0-1416-08db5303afba X-MS-Exchange-CrossTenant-Id: bea78b3c-4cdb-4130-854a-1d193232e5f4 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bea78b3c-4cdb-4130-854a-1d193232e5f4;Ip=[66.129.239.14];Helo=[p-exchfe-eqx-01.jnpr.net] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM12FT019.eop-nam12.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR05MB5536 X-Proofpoint-ORIG-GUID: Zf9uC5UbA5yiaf-7S4MoIwvpxP17Nkrx X-Proofpoint-GUID: Zf9uC5UbA5yiaf-7S4MoIwvpxP17Nkrx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-12_10,2023-05-05_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_spam_notspam policy=outbound_spam score=0 mlxscore=0 clxscore=1011 malwarescore=0 suspectscore=0 mlxlogscore=596 lowpriorityscore=0 bulkscore=0 spamscore=0 priorityscore=1501 phishscore=0 adultscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305120134 X-Rspamd-Queue-Id: 4QHv1J3z8tz4HMr X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:22843, ipnet:67.231.152.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Ed Maste wrote: > > Move DIRDEPS_BUILD settings to sys.dirdeps.mk > > The Cirrus-CI makeman check is now failing, due to > no description found for WITH_META_ERROR_TARGET, skipping Ah sorry. From nobody Fri May 12 16:15:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHv4G55gKz4BBcp; Fri, 12 May 2023 16:15: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 4QHv4G4c1nz4Hxs; Fri, 12 May 2023 16:15:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wo8iK1cj6tSxr4oIrKPbeZzDCClYu9wcMdogteod5qc=; b=h9RUnFeY8FsZp14zpaCQbgaFHfcnEixIhRPE4+s0tVeIn7dXXuwtwVnhzRHUOP2KflQkc9 U14bRyBju9uaWX9PASI7Q+EhjS8iwCjX9S/fA7g5hb8awVU1FfXPpcJ46txPsxoYAJoIhT aM19hiV79Md50+4f45gyj8hWA7FF2rTPPnkP7R2L7gD8NEh7sJrcD2kbSekDVp/rdIx+bq q908EgQMsO/G/F5we1u1YXcOoC9V9QqSDGjBYtoyYOuDqzadN6Z7A36GPnckyKBEB7bSzO mYOuIU3WgIuSHbb5QlIe2hbGOLPw6fsWnUwN2ahKrFehGZNrOahVoTe4daBoFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wo8iK1cj6tSxr4oIrKPbeZzDCClYu9wcMdogteod5qc=; b=VtsLvpKPwiNqcBIHPCeCBOEQinSVxrU4j9kmV0ePaQDnN+QnEa2kWQLZ+iK4iUZrw/8BjP VIDU6VtHhz5mFxck9j4qnyG7VOiCXyfy/1rAmJLjcTTEf6FNE+3C7MBixpkq088u6Z1W85 wo2CdETLaLmiCykH6heegnkjUpGpcJTQw0BXNKgyzJySA0blyZ9nWNs0/lGJFCER92EdN9 uE4yKLgo3x6j7Pob9/daZW0WxFmS/zHdN0Z1nj5sbK8c+3VMMmzlx7A3YJcc5ZcIK3Bosm NFvXB2EOWcSh3JBq1rCWT6S2anxw2mElwf6MvDY0K4E/2pM4ZVQ+RLozbQOfJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683908110; a=rsa-sha256; cv=none; b=SrSMeakjZHwCVsr++Z2vp4qJZV41kT6G0OU+ulh25+CpYkZWpBGbomtsCSwcpAbcQsHr7b eB7vwA4DBjuxOm+4S1Ke4Y9IKytyI/2VrlSJ4U2PMnbSLit/HcRnJT2zvhPnTeN8oLPwjR L8iaF/++QdgYy/CBPMcEmjHajo9/8W2Vm5YzS2ovvD6Ns73kl1bBA3Ay6j4xCQiovijI3l D+lnYaOuVh81v7J4w0FNCj4pQMDkNZBmOYPNCEPwXBELmLsa16pPnqDb4qKKDXjqVwsCVY 2CzTGtuiil8QwBQUPV9ywu47UmD/PGt9iCdCXM4S54IDYqY6wD4Nk2O8eF1Hew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHv4G3jX9zhpT; Fri, 12 May 2023 16:15: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 34CGFA2e012909; Fri, 12 May 2023 16:15:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGFAT5012908; Fri, 12 May 2023 16:15:10 GMT (envelope-from git) Date: Fri, 12 May 2023 16:15:10 GMT Message-Id: <202305121615.34CGFAT5012908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 74674fef3c12 - main - kern.opts.mk: rationalize i386 EFI default with src.opts.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74674fef3c123d2bcb054f8723ed1bd781972c79 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=74674fef3c123d2bcb054f8723ed1bd781972c79 commit 74674fef3c123d2bcb054f8723ed1bd781972c79 Author: Ed Maste AuthorDate: 2023-05-12 14:39:42 +0000 Commit: Ed Maste CommitDate: 2023-05-12 15:04:00 +0000 kern.opts.mk: rationalize i386 EFI default with src.opts.mk PR: 269994 Fixes: ad9d10a859a ("efi: mark as broken on i386") Sponsored by: The FreeBSD Foundation --- sys/conf/kern.opts.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 53992a31d07c..e61cf9686a76 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -89,8 +89,8 @@ BROKEN_OPTIONS+= OFED BROKEN_OPTIONS+= KERNEL_RETPOLINE .endif -# EFI doesn't exist on powerpc, or riscv -.if ${MACHINE:Mpowerpc} || ${MACHINE:Mriscv} +# EFI doesn't exist on powerpc or riscv and is broken on i386 +.if ${MACHINE:Mpowerpc} || ${MACHINE:Mriscv} || ${MACHINE} == "i386" BROKEN_OPTIONS+=EFI .endif From nobody Fri May 12 16:22:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvDk2pP7z4BBxP; Fri, 12 May 2023 16:22: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 4QHvDk27xHz4K1J; Fri, 12 May 2023 16:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrvvUTuz57pggAeKEy2Gq/SgzHBQHv7QH5iXICCVevY=; b=QRhbZyAaDNuSNKsCWuq0BLq/zcu6EACtZiJDfIAa7Ect9rJyMKeX4R9dIP6tOHEvYTRcHn qqxU3EBf0LHU4kJoJ7cheAnWTxpdyP0flPihQl5nY144iAoD/t8GXrjAjpaYuo35ea+2Jc IzlLHo1/dbBWTuDY4w6b5wm71AdZhjszRiOCNh/7OjIEPB99VX38pzaMfa3r7BDQiKQqzL l+/hoO7T4JrK/gN2aewb7WRlezz6nT3Q89BLYAAcCO0QCLgiUiwysvhFmhr7fgJbSELOBo W0pLs0ter6vcxPNEVxc8awHgS1g3ChsXML8ZOWDqmPsHtgNsZSR2hkvd9dK+DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683908550; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrvvUTuz57pggAeKEy2Gq/SgzHBQHv7QH5iXICCVevY=; b=SByUcgQU4VciAWx9K3mjjLmipnAqhBhjAve0+dHDyVDtbbEyPf8vWk5kP57/jKqxZBpmJ7 Fbv4AiEddJNGHIzvky9XowTC/OdsY6LkrZAmC2LOyS+AjfRwbAI+eHdg3U1OHho+1Rutv0 pVFaBpsZ2dhEoiLoSgo3g7HbeNEuxYhREK4yh9OuDFFGdPFcbEjgpjIbVqEp2UFNvSy2bB IQnjUDvur47sax3eTltej3f3srReUc33MoI3zXBKbjmHXLiWJX/GBhe91TBP8Air+rLsBX ekoUTAZDrMFnATs1po7wH499CJn5tdUJxz+2pdQDrsKlV/9TzOf3iqPk9ISJ1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683908550; a=rsa-sha256; cv=none; b=AhH09L+pvPGZwBSrgubbyBczD+jsvTzxtKGAY+u5eifC3TFcEuGJ38G9bgIaZoGWCJUKIg PQfC/MlssdSVl443exy3PFy8j/EkzbooCrXCcH7I00S6ISYqYWjvBXT5Q5BVcClTQsf1cb hqwoGArXprTg0mgJ4btygqRl3pUIb+qIwG3U+SNhG4T9MwFVdmoYNW44MKiZXbM+cwukZu A/xY6tURaylivlhn9AbInZKRjUZ7Bew5mjGqFMFAQH7KKAtGWBoVgMKWXSVEM+I0Bf63zt BHwA/cNZ5NI1Shc/6crTyxMAwdP1IDWz7oZb9i59vdEaf12TJIqgrNX9V3IDNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvDk1CXpzhqP; Fri, 12 May 2023 16:22: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 34CGMUgS028605; Fri, 12 May 2023 16:22:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGMUjo028594; Fri, 12 May 2023 16:22:30 GMT (envelope-from git) Date: Fri, 12 May 2023 16:22:30 GMT Message-Id: <202305121622.34CGMUjo028594@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: df9974197e46 - main - Add description of WITH_META_ERROR_TARGET List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df9974197e466b58d65b373fce1fecfcadbb99c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=df9974197e466b58d65b373fce1fecfcadbb99c2 commit df9974197e466b58d65b373fce1fecfcadbb99c2 Author: Simon J. Gerraty AuthorDate: 2023-05-12 16:21:30 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-12 16:21:30 +0000 Add description of WITH_META_ERROR_TARGET --- tools/build/options/WITH_META_ERROR_TARGET | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/build/options/WITH_META_ERROR_TARGET b/tools/build/options/WITH_META_ERROR_TARGET new file mode 100644 index 000000000000..069000a423cd --- /dev/null +++ b/tools/build/options/WITH_META_ERROR_TARGET @@ -0,0 +1,14 @@ +.\" $FreeBSD$ +Enable the META_MODE .ERROR target. +.Pp +This target will copy the meta file of a failed target +to +.Va ERROR_LOGDIR +(default is +.Ql ${SRCTOP:H}/error ) +to help with failure analysis. +Depends on +.Va WITH_META_MODE . +This default when +.Va WITH_DIRDEPS_BUILD +is set. From nobody Fri May 12 16:43:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvhm4z2qz4BDGr; Fri, 12 May 2023 16:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHvhm4Rdkz4N4l; Fri, 12 May 2023 16:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9p2Tw1bWsMfL3zzb3x8nVcMXkF4IHHSgt7Q1bt5j0s=; b=np+AlBL45KeSS4m+eXz1V1jb6Hjd3kLHwndnnQhYbzDx+EcSpmCO1GdjvJu+ktrMpKlbtH 0tqfSrRfLK26Lub7PVdH/eukAqeJkpPNlGy2fNLpkU+LoAFcblcfgZ46pabQYh8vHbYHt5 2+w1OA+R7lCTjuCFaXBKAKqK+DTK+zZBY1F4DrkZ/+3DrLGFDCKaiQ6ctjFaIjc/77UKmO eAqKvn9WcCkbqwLzmWN9wez59J3WEHc5UFDELde+ZRohdV26z1OxCt8IrBNKWWKQYMsIHM vtnZNIHSGPEW5F2Sl0Kskiz6Y1ExQSKoLz6JMPpB6AgLF6K0ENmYjcRshj56wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9p2Tw1bWsMfL3zzb3x8nVcMXkF4IHHSgt7Q1bt5j0s=; b=xyHYuhPaN5upf613hOiyK+7der2/5NRuZFKyNnQPvMQGshpOVBuVMDzIz+k4z5ffsYiaHm Wd+DutudEqHA88qdWZvjG6d9AV1ynVegu0134yjZFnYXbpDcE8c2Rc2NLC5lEPvdGHs8OA MUVs2cLexVs6w1KUxvFTHLRjW1wFzxTBSWJ3kIHZluQkE6Jog76IetplJhYuFx/RuOrtz3 SwCxPB7k/RfbU0T5DfYnRmYbk62DeSFJUTkC33v7b9hD/2Ko/aAWI+QJFLFLHw+9xPBkeW b3BZhIa1i4gEBpra6+SRID2VloDROBhk/GTnLqHpi9uU2i8vQnHXi7fCSEXuXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683909800; a=rsa-sha256; cv=none; b=vqvOQtZX7HBUi+Z1cLg1Q1P3VVP6Rmx6388UgyGi8zeTnfaz26eU5QlUkLOFIQFBbEbmwy jGIBq/Nzn46O/TfkntXQ/82VMh8GtzUkd256meqhCtemHNJtfEt+YCr8PkNzawBnEzwWtm 6wVsJkWZnOfZoRmyKQGgvZaHRINTJJcaR4f5UnxqvZltp/afBJ9KahGIKI+B3CFiBnA5vS /Hpwg/i8AvS15+nA818crKuG8i6zMt1al1MRhC8hPRielsAwpYLQM056GfhcI4o3pxMz8m 4JzUWRH6TvcmqT9gDI7iRYT2MZW8q7rbxOi19JcoZ/MHOSTA9XvnR8MljOO6QA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvhm3V7Hzjdd; Fri, 12 May 2023 16:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34CGhKN9061950; Fri, 12 May 2023 16:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGhKVr061949; Fri, 12 May 2023 16:43:20 GMT (envelope-from git) Date: Fri, 12 May 2023 16:43:20 GMT Message-Id: <202305121643.34CGhKVr061949@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 2b519b170709 - main - Update description of WITH_DIRDEPS_BUILD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b519b170709b9c2bb9f66641737d1d80a5d2538 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=2b519b170709b9c2bb9f66641737d1d80a5d2538 commit 2b519b170709b9c2bb9f66641737d1d80a5d2538 Author: Simon J. Gerraty AuthorDate: 2023-05-12 16:42:21 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-12 16:42:21 +0000 Update description of WITH_DIRDEPS_BUILD --- tools/build/options/WITH_DIRDEPS_BUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/build/options/WITH_DIRDEPS_BUILD b/tools/build/options/WITH_DIRDEPS_BUILD index 3086d136b580..98d3f6c44b1a 100644 --- a/tools/build/options/WITH_DIRDEPS_BUILD +++ b/tools/build/options/WITH_DIRDEPS_BUILD @@ -1,5 +1,5 @@ .\" $FreeBSD$ -This is an experimental build system. +This is an alternate build system. For details see https://www.crufty.net/sjg/docs/freebsd-meta-mode.htm. Build commands can be seen from the top-level with: @@ -33,4 +33,9 @@ The build hides commands executed unless is defined. .Pp Note that there is currently no mass install feature for this. +This build is designed for producing packages, that can then be installed +on a target system. .Pp +The implementation in FreeBSD is incomplete. +Competion would require leaf directories for building each kernel +and package so that their dependencies can be tracked. From nobody Fri May 12 16:44:48 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvkW3zkqz4BD77; Fri, 12 May 2023 16:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHvkW3R97z4NYM; Fri, 12 May 2023 16:44:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQkQNnvQWmPQ3uoKG7vVL4hKTCaomhWttPakgs0RyXg=; b=WX+NZd66/rwleqjIF9sRs4Nso13IjHCGRqSzRD//74utsNfJ9nKieahO/hdfqMlSG7WD+0 ri7jI9W6ryiXQN3yqL2K3HrpO1aS+s46q63XxcJZVe5T5Wx5dQ8oL5BbdFqikg3jAaNYZD 9Sn4/lpVbjUElGYIakZT73ErXKUTVPs629z5SBcBXVxXEALMBjLFAR51JxMrBlKIl3eZmE KSFQAwbyWUXojYPBPk7Qdf7/GNJPNb7Sj4WKH14kEYJCNy50Xl6X5bVJaILq9IQuv6Wit/ 03/ExqRl6XtykB8gzs8Qo9njKzo4VKtOCt7RaHPg/jGJf7/1naWHcdA7d35ahg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OQkQNnvQWmPQ3uoKG7vVL4hKTCaomhWttPakgs0RyXg=; b=KMwez1/K3bD+vDCMNhHsU6kZ1xfetLKm46R7hOsBnlRWApkh3xwW4ViMOApB8eUkiQDY92 PWyDj2YCGFYE9CivJ39jsaeqHVtKPG1oTNLM5TWJqbH44jzgalOACXQR9cga3yjH9Ujcc4 LyC6B1jDg8E/P/KbAECC+OSWJEOf3pouENpxYecbU9X1Yw2BvEwYb0BIj+yhXtUC4jjorv Qe2gVd2i7xACbp05cWWLaXHul9kqR3QixESXzNm1vDPE8X3FQ5TRFPsMBd2uRf5W2gH1x4 /1D4hKhpXw7jblg3JTvv/eXF+VC4fZ6PSzbfaI/xk45aDtMJdnXN1oSREL0JtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683909891; a=rsa-sha256; cv=none; b=bszioUSuen8/xzc6hY0aiXxFpho/ItaSGrLQDBvS2CMPl4+AOWmXOEy/Vmv5DUJ1OLHiA3 TMz97mUDSAFUfWUfGqI5c9Do9Dk3uLyC0/dUCoXVGXOVU9caCvUJYnRBh3AY9oIFHq5DZ5 U3UE8q1bVbUkBygQvrk/rQTTeBdd8ty355kEoRGDOnEQAAMpF7ovpMP59LOfqNh8ZN/o92 y9AAl/mJw+BLB7atrvlyxtoY6uzYkNlkbUAsUiN4dvfYbOXEojOO2r6V7lwGobCIbsubcH lGctxbvQyJ0mB931GIQJJpiCzmXWJhh/lpg9AqSdrVaoIde5sSlM5/N8X1SOXA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvkW2VHszjmZ; Fri, 12 May 2023 16:44: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 34CGipDV062360; Fri, 12 May 2023 16:44:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGimx9062352; Fri, 12 May 2023 16:44:48 GMT (envelope-from git) Date: Fri, 12 May 2023 16:44:48 GMT Message-Id: <202305121644.34CGimx9062352@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4d846d260e2b - main - spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d846d260e2b9a3d4d0a701462568268cbfe7a5b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4d846d260e2b9a3d4d0a701462568268cbfe7a5b commit 4d846d260e2b9a3d4d0a701462568268cbfe7a5b Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-05-12 16:44:03 +0000 spdx: The BSD-2-Clause-FreeBSD identifier is obsolete, drop -FreeBSD The SPDX folks have obsoleted the BSD-2-Clause-FreeBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix --- bin/cp/tests/cp_test.sh | 2 +- bin/timeout/timeout.1 | 2 +- include/bitstring.h | 2 +- include/complex.h | 2 +- include/cpio.h | 2 +- include/elf-hints.h | 2 +- include/elf.h | 2 +- include/fmtmsg.h | 2 +- include/inttypes.h | 2 +- include/iso646.h | 2 +- include/kenv.h | 2 +- include/langinfo.h | 2 +- include/malloc_np.h | 2 +- include/mk-osreldate.sh | 2 +- include/monetary.h | 2 +- include/mqueue.h | 2 +- include/nss.h | 2 +- include/printf.h | 2 +- include/proc_service.h | 2 +- include/rpc/rpcsec_gss.h | 2 +- include/semaphore.h | 2 +- include/spawn.h | 2 +- include/stdalign.h | 2 +- include/stdbool.h | 2 +- include/stdnoreturn.h | 2 +- include/strings.h | 2 +- include/tgmath.h | 2 +- include/uchar.h | 2 +- include/ulimit.h | 2 +- include/utmpx.h | 2 +- include/uuid.h | 2 +- include/varargs.h | 2 +- include/wordexp.h | 2 +- include/xlocale.h | 2 +- include/xlocale/_ctype.h | 2 +- include/xlocale/_inttypes.h | 2 +- include/xlocale/_langinfo.h | 2 +- include/xlocale/_locale.h | 2 +- include/xlocale/_monetary.h | 2 +- include/xlocale/_stdio.h | 2 +- include/xlocale/_stdlib.h | 2 +- include/xlocale/_string.h | 2 +- include/xlocale/_time.h | 2 +- include/xlocale/_uchar.h | 2 +- include/xlocale/_wchar.h | 2 +- kerberos5/lib/libgssapi_krb5/gss_krb5.c | 2 +- kerberos5/lib/libgssapi_krb5/pname_to_uid.c | 2 +- kerberos5/lib/libgssapi_krb5/prefix.c | 2 +- kerberos5/lib/libgssapi_ntlm/prefix.c | 2 +- kerberos5/lib/libgssapi_spnego/freebsd_compat.c | 2 +- lib/csu/amd64/crt1_c.c | 2 +- lib/csu/common/crtbrand.S | 2 +- lib/csu/common/csu_common.h | 2 +- lib/csu/common/feature_note.S | 2 +- lib/flua/libjail/jail.3lua | 2 +- lib/geom/cache/geom_cache.c | 2 +- lib/geom/concat/geom_concat.c | 2 +- lib/geom/eli/geom_eli.c | 2 +- lib/geom/journal/geom_journal.c | 2 +- lib/geom/journal/geom_journal.h | 2 +- lib/geom/journal/geom_journal_ufs.c | 2 +- lib/geom/label/geom_label.c | 2 +- lib/geom/mirror/geom_mirror.c | 2 +- lib/geom/mountver/geom_mountver.c | 2 +- lib/geom/multipath/geom_multipath.c | 2 +- lib/geom/nop/geom_nop.c | 2 +- lib/geom/part/geom_part.c | 2 +- lib/geom/raid/geom_raid.c | 2 +- lib/geom/raid3/geom_raid3.c | 2 +- lib/geom/shsec/geom_shsec.c | 2 +- lib/geom/stripe/geom_stripe.c | 2 +- lib/geom/union/geom_union.c | 2 +- lib/geom/virstor/geom_virstor.c | 2 +- lib/libarchive/config_freebsd.h | 2 +- lib/libbe/be.c | 2 +- lib/libbe/be.h | 2 +- lib/libbe/be_access.c | 2 +- lib/libbe/be_error.c | 2 +- lib/libbe/be_impl.h | 2 +- lib/libbe/be_info.c | 2 +- lib/libbe/libbe.3 | 2 +- lib/libbe/tests/be_create.sh | 2 +- lib/libbe/tests/target_prog.c | 2 +- lib/libbluetooth/bluetooth.c | 2 +- lib/libbluetooth/bluetooth.h | 2 +- lib/libbluetooth/dev.c | 2 +- lib/libbluetooth/hci.c | 2 +- lib/libbsdstat/bsdstat.c | 2 +- lib/libbsdstat/bsdstat.h | 2 +- lib/libc/aarch64/static_tls.h | 2 +- lib/libc/amd64/_fpmath.h | 2 +- lib/libc/amd64/gen/makecontext.c | 2 +- lib/libc/amd64/gen/signalcontext.c | 2 +- lib/libc/amd64/static_tls.h | 2 +- lib/libc/amd64/string/strcpy.c | 2 +- lib/libc/amd64/sys/amd64_get_fsbase.c | 2 +- lib/libc/amd64/sys/amd64_get_gsbase.c | 2 +- lib/libc/amd64/sys/amd64_set_fsbase.c | 2 +- lib/libc/amd64/sys/amd64_set_gsbase.c | 2 +- lib/libc/arm/_fpmath.h | 2 +- lib/libc/arm/aeabi/aeabi_atexit.c | 2 +- lib/libc/arm/aeabi/aeabi_double.c | 2 +- lib/libc/arm/aeabi/aeabi_float.c | 2 +- lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 2 +- lib/libc/arm/gen/flt_rounds.c | 2 +- lib/libc/arm/gen/getcontextx.c | 2 +- lib/libc/arm/gen/signalcontext.c | 2 +- lib/libc/arm/static_tls.h | 2 +- lib/libc/arm/sys/__vdso_gettc.c | 2 +- lib/libc/db/mpool/mpool-compat.c | 2 +- lib/libc/gdtoa/_hdtoa.c | 2 +- lib/libc/gdtoa/_hldtoa.c | 2 +- lib/libc/gdtoa/_ldtoa.c | 2 +- lib/libc/gdtoa/machdep_ldisQ.c | 2 +- lib/libc/gdtoa/machdep_ldisd.c | 2 +- lib/libc/gdtoa/machdep_ldisx.c | 2 +- lib/libc/gen/__getosreldate.c | 2 +- lib/libc/gen/_once_stub.c | 2 +- lib/libc/gen/_pthread_stubs.c | 2 +- lib/libc/gen/_thread_init.c | 2 +- lib/libc/gen/arc4random-compat.c | 2 +- lib/libc/gen/auxv.c | 2 +- lib/libc/gen/cap_sandboxed.c | 2 +- lib/libc/gen/clock_getcpuclockid.c | 2 +- lib/libc/gen/ctermid.c | 2 +- lib/libc/gen/dirfd.c | 2 +- lib/libc/gen/dlfcn.c | 2 +- lib/libc/gen/dup3.c | 2 +- lib/libc/gen/elf_utils.c | 2 +- lib/libc/gen/errno.c | 2 +- lib/libc/gen/fdevname.c | 2 +- lib/libc/gen/fmtmsg.c | 2 +- lib/libc/gen/fpclassify.c | 2 +- lib/libc/gen/frexp.c | 2 +- lib/libc/gen/ftok.c | 2 +- lib/libc/gen/getentropy.c | 2 +- lib/libc/gen/getgrent.c | 2 +- lib/libc/gen/getpagesizes.c | 2 +- lib/libc/gen/getpeereid.c | 2 +- lib/libc/gen/getpwent.c | 2 +- lib/libc/gen/getutxent.c | 2 +- lib/libc/gen/isinf.c | 2 +- lib/libc/gen/isnan.c | 2 +- lib/libc/gen/libc_dlopen.c | 2 +- lib/libc/gen/posix_spawn.c | 2 +- lib/libc/gen/pututxline.c | 2 +- lib/libc/gen/sem.c | 2 +- lib/libc/gen/sem_new.c | 2 +- lib/libc/gen/semctl.c | 2 +- lib/libc/gen/sysctlnametomib.c | 2 +- lib/libc/gen/tls.c | 2 +- lib/libc/gen/ulimit.c | 2 +- lib/libc/gen/unvis-compat.c | 2 +- lib/libc/gen/utxdb.c | 2 +- lib/libc/gen/utxdb.h | 2 +- lib/libc/gen/waitid.c | 2 +- lib/libc/gen/wordexp.c | 2 +- lib/libc/i386/_fpmath.h | 2 +- lib/libc/i386/gen/makecontext.c | 2 +- lib/libc/i386/gen/signalcontext.c | 2 +- lib/libc/i386/static_tls.h | 2 +- lib/libc/i386/sys/i386_clr_watch.c | 2 +- lib/libc/i386/sys/i386_get_fsbase.c | 2 +- lib/libc/i386/sys/i386_get_gsbase.c | 2 +- lib/libc/i386/sys/i386_get_ioperm.c | 2 +- lib/libc/i386/sys/i386_set_fsbase.c | 2 +- lib/libc/i386/sys/i386_set_gsbase.c | 2 +- lib/libc/i386/sys/i386_set_ioperm.c | 2 +- lib/libc/i386/sys/i386_set_watch.c | 2 +- lib/libc/i386/sys/i386_vm86.c | 2 +- lib/libc/iconv/__iconv.c | 2 +- lib/libc/iconv/__iconv_free_list.c | 2 +- lib/libc/iconv/__iconv_get_list.c | 2 +- lib/libc/iconv/citrus_lock.h | 2 +- lib/libc/iconv/iconv-internal.h | 2 +- lib/libc/iconv/iconv.c | 2 +- lib/libc/iconv/iconv_canonicalize.c | 2 +- lib/libc/iconv/iconv_close.c | 2 +- lib/libc/iconv/iconv_compat.c | 2 +- lib/libc/iconv/iconv_open.c | 2 +- lib/libc/iconv/iconv_open_into.c | 2 +- lib/libc/iconv/iconv_set_relocation_prefix.c | 2 +- lib/libc/iconv/iconvctl.c | 2 +- lib/libc/iconv/iconvlist.c | 2 +- lib/libc/include/compat.h | 2 +- lib/libc/include/errlst.h | 2 +- lib/libc/include/fpmath.h | 2 +- lib/libc/include/namespace.h | 2 +- lib/libc/include/nscache.h | 2 +- lib/libc/include/nscachedcli.h | 2 +- lib/libc/include/nss_tls.h | 2 +- lib/libc/include/reentrant.h | 2 +- lib/libc/include/un-namespace.h | 2 +- lib/libc/locale/btowc.c | 2 +- lib/libc/locale/c16rtomb.c | 2 +- lib/libc/locale/c32rtomb.c | 2 +- lib/libc/locale/cXXrtomb_iconv.h | 2 +- lib/libc/locale/collate.c | 2 +- lib/libc/locale/collate.h | 2 +- lib/libc/locale/collcmp.c | 2 +- lib/libc/locale/ctype.c | 2 +- lib/libc/locale/fix_grouping.c | 2 +- lib/libc/locale/gb18030.c | 2 +- lib/libc/locale/gb2312.c | 2 +- lib/libc/locale/ldpart.c | 2 +- lib/libc/locale/ldpart.h | 2 +- lib/libc/locale/lmessages.c | 2 +- lib/libc/locale/lmessages.h | 2 +- lib/libc/locale/lmonetary.c | 2 +- lib/libc/locale/lmonetary.h | 2 +- lib/libc/locale/lnumeric.c | 2 +- lib/libc/locale/lnumeric.h | 2 +- lib/libc/locale/mblen.c | 2 +- lib/libc/locale/mblocal.h | 2 +- lib/libc/locale/mbrlen.c | 2 +- lib/libc/locale/mbrtoc16.c | 2 +- lib/libc/locale/mbrtoc32.c | 2 +- lib/libc/locale/mbrtocXX_iconv.h | 2 +- lib/libc/locale/mbrtowc.c | 2 +- lib/libc/locale/mbsinit.c | 2 +- lib/libc/locale/mbsnrtowcs.c | 2 +- lib/libc/locale/mbsrtowcs.c | 2 +- lib/libc/locale/mbstowcs.c | 2 +- lib/libc/locale/mbtowc.c | 2 +- lib/libc/locale/nextwctype.c | 2 +- lib/libc/locale/nl_langinfo.c | 2 +- lib/libc/locale/rpmatch.c | 2 +- lib/libc/locale/runefile.h | 2 +- lib/libc/locale/setlocale.h | 2 +- lib/libc/locale/utf8.c | 2 +- lib/libc/locale/wcrtomb.c | 2 +- lib/libc/locale/wcsftime.c | 2 +- lib/libc/locale/wcsnrtombs.c | 2 +- lib/libc/locale/wcsrtombs.c | 2 +- lib/libc/locale/wcstod.c | 2 +- lib/libc/locale/wcstof.c | 2 +- lib/libc/locale/wcstold.c | 2 +- lib/libc/locale/wcstombs.c | 2 +- lib/libc/locale/wctob.c | 2 +- lib/libc/locale/wctomb.c | 2 +- lib/libc/locale/wctrans.c | 2 +- lib/libc/locale/wctype.c | 2 +- lib/libc/locale/xlocale.c | 2 +- lib/libc/locale/xlocale_private.h | 2 +- lib/libc/net/gethostbynis.c | 2 +- lib/libc/net/gethostnamadr.c | 2 +- lib/libc/net/getifmaddrs.c | 2 +- lib/libc/net/getnetbynis.c | 2 +- lib/libc/net/getnetnamadr.c | 2 +- lib/libc/net/netdb_private.h | 2 +- lib/libc/net/nscache.c | 2 +- lib/libc/net/nscachedcli.c | 2 +- lib/libc/net/nss_backends.h | 2 +- lib/libc/net/nss_compat.c | 2 +- lib/libc/net/ntoh.c | 2 +- lib/libc/net/sockatmark.c | 2 +- lib/libc/net/sourcefilter.c | 2 +- lib/libc/posix1e/acl_branding.c | 2 +- lib/libc/posix1e/acl_calc_mask.c | 2 +- lib/libc/posix1e/acl_cmp_np.c | 2 +- lib/libc/posix1e/acl_compat.c | 2 +- lib/libc/posix1e/acl_copy.c | 2 +- lib/libc/posix1e/acl_delete.c | 2 +- lib/libc/posix1e/acl_delete_entry.c | 2 +- lib/libc/posix1e/acl_entry.c | 2 +- lib/libc/posix1e/acl_equiv_mode_np.c | 2 +- lib/libc/posix1e/acl_extended_file_np.c | 2 +- lib/libc/posix1e/acl_flag.c | 2 +- lib/libc/posix1e/acl_free.c | 2 +- lib/libc/posix1e/acl_from_mode_np.c | 2 +- lib/libc/posix1e/acl_from_text.c | 2 +- lib/libc/posix1e/acl_from_text_nfs4.c | 2 +- lib/libc/posix1e/acl_get.c | 2 +- lib/libc/posix1e/acl_id_to_name.c | 2 +- lib/libc/posix1e/acl_init.c | 2 +- lib/libc/posix1e/acl_perm.c | 2 +- lib/libc/posix1e/acl_set.c | 2 +- lib/libc/posix1e/acl_strip.c | 2 +- lib/libc/posix1e/acl_support.c | 2 +- lib/libc/posix1e/acl_support.h | 2 +- lib/libc/posix1e/acl_support_nfs4.c | 2 +- lib/libc/posix1e/acl_to_text.c | 2 +- lib/libc/posix1e/acl_to_text_nfs4.c | 2 +- lib/libc/posix1e/acl_valid.c | 2 +- lib/libc/posix1e/extattr.c | 2 +- lib/libc/posix1e/mac.c | 2 +- lib/libc/posix1e/mac_exec.c | 2 +- lib/libc/powerpc/_fpmath.h | 2 +- lib/libc/powerpc/gen/makecontext.c | 2 +- lib/libc/powerpc/gen/signalcontext.c | 2 +- lib/libc/powerpc/static_tls.h | 2 +- lib/libc/powerpc/sys/__vdso_gettc.c | 2 +- lib/libc/powerpc64/_fpmath.h | 2 +- lib/libc/powerpc64/gen/fpsetround.c | 2 +- lib/libc/powerpc64/gen/makecontext.c | 2 +- lib/libc/powerpc64/gen/signalcontext.c | 2 +- lib/libc/powerpc64/static_tls.h | 2 +- lib/libc/powerpc64/sys/__vdso_gettc.c | 2 +- lib/libc/resolv/h_errno.c | 2 +- lib/libc/resolv/res_state.c | 2 +- lib/libc/riscv/static_tls.h | 2 +- lib/libc/rpc/mt_misc.h | 2 +- lib/libc/rpc/rpcsec_gss_stub.c | 2 +- lib/libc/stdio/dprintf.c | 2 +- lib/libc/stdio/fcloseall.c | 2 +- lib/libc/stdio/fgetwc.c | 2 +- lib/libc/stdio/fgetwln.c | 2 +- lib/libc/stdio/fgetws.c | 2 +- lib/libc/stdio/fmemopen.c | 2 +- lib/libc/stdio/fputwc.c | 2 +- lib/libc/stdio/fputws.c | 2 +- lib/libc/stdio/fwide.c | 2 +- lib/libc/stdio/fwprintf.c | 2 +- lib/libc/stdio/fwscanf.c | 2 +- lib/libc/stdio/getdelim.c | 2 +- lib/libc/stdio/getline.c | 2 +- lib/libc/stdio/getwc.c | 2 +- lib/libc/stdio/getwchar.c | 2 +- lib/libc/stdio/open_memstream.c | 2 +- lib/libc/stdio/open_wmemstream.c | 2 +- lib/libc/stdio/putwc.c | 2 +- lib/libc/stdio/putwchar.c | 2 +- lib/libc/stdio/swprintf.c | 2 +- lib/libc/stdio/swscanf.c | 2 +- lib/libc/stdio/ungetwc.c | 2 +- lib/libc/stdio/vdprintf.c | 2 +- lib/libc/stdio/vwprintf.c | 2 +- lib/libc/stdio/vwscanf.c | 2 +- lib/libc/stdio/wprintf.c | 2 +- lib/libc/stdio/wscanf.c | 2 +- lib/libc/stdio/xprintf_errno.c | 2 +- lib/libc/stdio/xprintf_hexdump.c | 2 +- lib/libc/stdio/xprintf_quote.c | 2 +- lib/libc/stdio/xprintf_vis.c | 2 +- lib/libc/stdlib/getenv.c | 2 +- lib/libc/stdlib/hcreate.c | 2 +- lib/libc/stdlib/imaxabs.c | 2 +- lib/libc/stdlib/imaxdiv.c | 2 +- lib/libc/stdlib/llabs.c | 2 +- lib/libc/stdlib/lldiv.c | 2 +- lib/libc/stdlib/ptsname.c | 2 +- lib/libc/stdlib/quick_exit.c | 2 +- lib/libc/stdlib/reallocf.c | 2 +- lib/libc/stdlib/strfmon.c | 2 +- lib/libc/stdlib/strtold.c | 2 +- lib/libc/stdtime/strptime.c | 2 +- lib/libc/stdtime/timelocal.c | 2 +- lib/libc/stdtime/timelocal.h | 2 +- lib/libc/string/mempcpy.c | 2 +- lib/libc/string/stpncpy.c | 2 +- lib/libc/string/strcoll.c | 2 +- lib/libc/string/strcspn.c | 2 +- lib/libc/string/strlen.c | 2 +- lib/libc/string/strnlen.c | 2 +- lib/libc/string/strspn.c | 2 +- lib/libc/string/strxfrm.c | 2 +- lib/libc/string/wcpncpy.c | 2 +- lib/libc/string/wcscasecmp.c | 2 +- lib/libc/string/wcscat.c | 2 +- lib/libc/string/wcschr.c | 2 +- lib/libc/string/wcscoll.c | 2 +- lib/libc/string/wcsdup.c | 2 +- lib/libc/string/wcsncasecmp.c | 2 +- lib/libc/string/wcsnlen.c | 2 +- lib/libc/string/wcsrchr.c | 2 +- lib/libc/string/wcsxfrm.c | 2 +- lib/libc/string/wmempcpy.c | 2 +- lib/libc/sys/__vdso_gettimeofday.c | 2 +- lib/libc/sys/brk.c | 2 +- lib/libc/sys/clock_gettime.c | 2 +- lib/libc/sys/closefrom.c | 2 +- lib/libc/sys/fcntl.c | 2 +- lib/libc/sys/fspacectl.2 | 2 +- lib/libc/sys/gettimeofday.c | 2 +- lib/libc/sys/shm_open.c | 2 +- lib/libc/sys/sigwait.c | 2 +- lib/libc/tests/gen/getentropy_test.c | 2 +- lib/libc/tests/gen/makecontext_test.c | 2 +- lib/libc/tests/gen/sigsetops_test.c | 2 +- lib/libc/tests/stdlib/clearenv_test.c | 2 +- lib/libc/tests/sys/brk_test.c | 2 +- lib/libc/uuid/uuid_compare.c | 2 +- lib/libc/uuid/uuid_create.c | 2 +- lib/libc/uuid/uuid_create_nil.c | 2 +- lib/libc/uuid/uuid_equal.c | 2 +- lib/libc/uuid/uuid_from_string.c | 2 +- lib/libc/uuid/uuid_hash.c | 2 +- lib/libc/uuid/uuid_is_nil.c | 2 +- lib/libc/uuid/uuid_stream.c | 2 +- lib/libc/uuid/uuid_to_string.c | 2 +- lib/libc/x86/gen/getcontextx.c | 2 +- lib/libc_nonshared/__stub.c | 2 +- lib/libcalendar/calendar.c | 2 +- lib/libcalendar/calendar.h | 2 +- lib/libcalendar/easter.c | 2 +- lib/libcam/camlib.c | 2 +- lib/libcam/camlib.h | 2 +- lib/libcasper/libcasper/libcasper.c | 2 +- lib/libcasper/libcasper/libcasper.h | 2 +- lib/libcasper/libcasper/libcasper_impl.c | 2 +- lib/libcasper/libcasper/libcasper_impl.h | 2 +- lib/libcasper/libcasper/libcasper_service.c | 2 +- lib/libcasper/libcasper/libcasper_service.h | 2 +- lib/libcasper/libcasper/service.c | 2 +- lib/libcasper/libcasper/zygote.c | 2 +- lib/libcasper/libcasper/zygote.h | 2 +- lib/libcasper/services/cap_dns/cap_dns.c | 2 +- lib/libcasper/services/cap_dns/tests/dns_test.c | 2 +- lib/libcasper/services/cap_fileargs/cap_fileargs.c | 2 +- lib/libcasper/services/cap_fileargs/cap_fileargs.h | 2 +- lib/libcasper/services/cap_grp/cap_grp.c | 2 +- lib/libcasper/services/cap_grp/tests/grp_test.c | 2 +- lib/libcasper/services/cap_net/cap_net.c | 2 +- lib/libcasper/services/cap_net/cap_net.h | 2 +- lib/libcasper/services/cap_netdb/cap_netdb.c | 2 +- lib/libcasper/services/cap_netdb/tests/netdb_test.c | 2 +- lib/libcasper/services/cap_pwd/cap_pwd.c | 2 +- lib/libcasper/services/cap_pwd/tests/pwd_test.c | 2 +- lib/libcasper/services/cap_sysctl/cap_sysctl.c | 2 +- lib/libcasper/services/cap_sysctl/tests/sysctl_test.c | 2 +- lib/libcasper/services/cap_syslog/cap_syslog.c | 2 +- lib/libcrypt/crypt-md5.c | 2 +- lib/libcrypt/crypt-nthash.c | 2 +- lib/libcrypt/crypt-sha256.c | 2 +- lib/libcrypt/crypt-sha512.c | 2 +- lib/libcrypt/crypt.c | 2 +- lib/libcrypt/crypt.h | 2 +- lib/libdevinfo/devinfo.c | 2 +- lib/libdevinfo/devinfo.h | 2 +- lib/libdevinfo/devinfo_var.h | 2 +- lib/libgeom/geom_util.c | 2 +- lib/libgssapi/context.h | 2 +- lib/libgssapi/cred.h | 2 +- lib/libgssapi/gss_accept_sec_context.c | 2 +- lib/libgssapi/gss_acquire_cred.c | 2 +- lib/libgssapi/gss_add_cred.c | 2 +- lib/libgssapi/gss_add_oid_set_member.c | 2 +- lib/libgssapi/gss_canonicalize_name.c | 2 +- lib/libgssapi/gss_compare_name.c | 2 +- lib/libgssapi/gss_context_time.c | 2 +- lib/libgssapi/gss_create_empty_oid_set.c | 2 +- lib/libgssapi/gss_decapsulate_token.c | 2 +- lib/libgssapi/gss_delete_sec_context.c | 2 +- lib/libgssapi/gss_display_name.c | 2 +- lib/libgssapi/gss_duplicate_name.c | 2 +- lib/libgssapi/gss_duplicate_oid.c | 2 +- lib/libgssapi/gss_encapsulate_token.c | 2 +- lib/libgssapi/gss_export_name.c | 2 +- lib/libgssapi/gss_export_sec_context.c | 2 +- lib/libgssapi/gss_get_mic.c | 2 +- lib/libgssapi/gss_import_name.c | 2 +- lib/libgssapi/gss_import_sec_context.c | 2 +- lib/libgssapi/gss_indicate_mechs.c | 2 +- lib/libgssapi/gss_init_sec_context.c | 2 +- lib/libgssapi/gss_inquire_context.c | 2 +- lib/libgssapi/gss_inquire_cred.c | 2 +- lib/libgssapi/gss_inquire_cred_by_mech.c | 2 +- lib/libgssapi/gss_inquire_mechs_for_name.c | 2 +- lib/libgssapi/gss_inquire_names_for_mech.c | 2 +- lib/libgssapi/gss_inquire_sec_context_by_oid.c | 2 +- lib/libgssapi/gss_krb5.c | 2 +- lib/libgssapi/gss_mech_switch.c | 2 +- lib/libgssapi/gss_names.c | 2 +- lib/libgssapi/gss_pname_to_uid.c | 2 +- lib/libgssapi/gss_process_context_token.c | 2 +- lib/libgssapi/gss_release_buffer.c | 2 +- lib/libgssapi/gss_release_cred.c | 2 +- lib/libgssapi/gss_release_name.c | 2 +- lib/libgssapi/gss_release_oid_set.c | 2 +- lib/libgssapi/gss_seal.c | 2 +- lib/libgssapi/gss_sign.c | 2 +- lib/libgssapi/gss_test_oid_set_member.c | 2 +- lib/libgssapi/gss_unseal.c | 2 +- lib/libgssapi/gss_unwrap.c | 2 +- lib/libgssapi/gss_utils.c | 2 +- lib/libgssapi/gss_verify.c | 2 +- lib/libgssapi/gss_verify_mic.c | 2 +- lib/libgssapi/gss_wrap.c | 2 +- lib/libgssapi/gss_wrap_size_limit.c | 2 +- lib/libgssapi/mech_switch.h | 2 +- lib/libgssapi/name.h | 2 +- lib/libgssapi/spnego.h | 2 +- lib/libgssapi/utils.h | 2 +- lib/libiscsiutil/chap.c | 2 +- lib/libiscsiutil/connection.c | 2 +- lib/libiscsiutil/keys.c | 2 +- lib/libiscsiutil/libiscsiutil.h | 2 +- lib/libiscsiutil/log.c | 2 +- lib/libiscsiutil/pdu.c | 2 +- lib/libiscsiutil/text.c | 2 +- lib/libiscsiutil/utils.c | 2 +- lib/libjail/jail.c | 2 +- lib/libjail/jail.h | 2 +- lib/libjail/jail_getid.c | 2 +- lib/libkiconv/kiconv_sysctl.c | 2 +- lib/libkiconv/quirks.c | 2 +- lib/libkiconv/quirks.h | 2 +- lib/libkiconv/xlat16_iconv.c | 2 +- lib/libkvm/kvm_getswapinfo.c | 2 +- lib/libkvm/kvm_minidump_amd64.c | 2 +- lib/libkvm/kvm_minidump_arm.c | 2 +- lib/libkvm/kvm_minidump_i386.c | 2 +- lib/libkvm/kvm_powerpc64.h | 2 +- lib/libkvm/kvm_vnet.c | 2 +- lib/libmemstat/memstat.c | 2 +- lib/libmemstat/memstat.h | 2 +- lib/libmemstat/memstat_all.c | 2 +- lib/libmemstat/memstat_internal.h | 2 +- lib/libmemstat/memstat_malloc.c | 2 +- lib/libmemstat/memstat_uma.c | 2 +- lib/libmp/mpasbn.c | 2 +- lib/libnetbsd/rmd160.h | 2 +- lib/libnetbsd/sha1.h | 2 +- lib/libnetbsd/sha2.h | 2 +- lib/libnetbsd/util.c | 2 +- lib/libnetmap/libnetmap.h | 2 +- lib/libnetmap/nmctx-pthreads.c | 2 +- lib/libnetmap/nmctx.c | 2 +- lib/libnetmap/nmport.c | 2 +- lib/libnetmap/nmreq.c | 2 +- lib/libnv/common_impl.h | 2 +- lib/libnv/msgio.c | 2 +- lib/libnv/msgio.h | 2 +- lib/libpam/libpam/security/pam_mod_misc.h | 2 +- lib/libpam/modules/pam_ksu/pam_ksu.c | 2 +- lib/libpam/modules/pam_permit/pam_permit.c | 2 +- lib/libpjdlog/pjdlog.c | 2 +- lib/libpjdlog/pjdlog.h | 2 +- lib/libpmc/libpmc.c | 2 +- lib/libpmc/libpmc_json.cc | 2 +- lib/libpmc/libpmc_pmu_util.c | 2 +- lib/libpmc/libpmcinternal.h | 2 +- lib/libpmc/pmc.h | 2 +- lib/libpmc/pmcformat.h | 2 +- lib/libpmc/pmclog.c | 2 +- lib/libpmc/pmclog.h | 2 +- lib/libproc/_libproc.h | 2 +- lib/libproc/libproc.h | 2 +- lib/libproc/proc_bkpt.c | 2 +- lib/libproc/proc_create.c | 2 +- lib/libproc/proc_regs.c | 2 +- lib/libproc/proc_rtld.c | 2 +- lib/libproc/proc_sym.c | 2 +- lib/libproc/proc_util.c | 2 +- lib/libprocstat/common_kvm.h | 2 +- lib/libprocstat/core.c | 2 +- lib/libprocstat/core.h | 2 +- lib/libprocstat/libprocstat.h | 2 +- lib/libprocstat/libprocstat_internal.h | 2 +- lib/libprocstat/smbfs.c | 2 +- lib/libprocstat/udf.c | 2 +- lib/libprocstat/zfs.c | 2 +- lib/libprocstat/zfs_defs.c | 2 +- lib/libprocstat/zfs_defs.h | 2 +- lib/libradius/radlib.c | 2 +- lib/libradius/radlib.h | 2 +- lib/libradius/radlib_private.h | 2 +- lib/libradius/radlib_vs.h | 2 +- lib/libregex/tests/libregex_test.sh | 2 +- lib/librpcsec_gss/rpcsec_gss_conf.c | 2 +- lib/librpcsec_gss/rpcsec_gss_misc.c | 2 +- lib/librt/aio.c | 2 +- lib/librt/mq.c | 2 +- lib/librt/sigev_thread.c | 2 +- lib/librt/sigev_thread.h | 2 +- lib/librt/timer.c | 2 +- lib/librtld_db/rtld_db.c | 2 +- lib/librtld_db/rtld_db.h | 2 +- lib/libsdp/sdp-int.h | 2 +- lib/libsdp/sdp.h | 2 +- lib/libsdp/search.c | 2 +- lib/libsdp/service.c | 2 +- lib/libsdp/session.c | 2 +- lib/libsdp/util.c | 2 +- lib/libstdbuf/stdbuf.c | 2 +- lib/libstdthreads/call_once.c | 2 +- lib/libstdthreads/cnd.c | 2 +- lib/libstdthreads/mtx.c | 2 +- lib/libstdthreads/thrd.c | 2 +- lib/libstdthreads/threads.h | 2 +- lib/libstdthreads/tss.c | 2 +- lib/libsysdecode/tests/sysdecode_test.c | 2 +- lib/libtacplus/taclib.c | 2 +- lib/libtacplus/taclib.h | 2 +- lib/libtacplus/taclib_private.h | 2 +- lib/libthr/arch/aarch64/include/pthread_tls.h | 2 +- lib/libthr/arch/amd64/include/pthread_md.h | 2 +- lib/libthr/arch/amd64/include/pthread_tls.h | 2 +- lib/libthr/arch/arm/include/pthread_md.h | 2 +- lib/libthr/arch/arm/include/pthread_tls.h | 2 +- lib/libthr/arch/i386/include/pthread_md.h | 2 +- lib/libthr/arch/i386/include/pthread_tls.h | 2 +- lib/libthr/arch/powerpc/include/pthread_tls.h | 2 +- lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S | 2 +- lib/libthr/arch/riscv/include/pthread_tls.h | 2 +- lib/libthr/thread/thr_affinity.c | 2 +- lib/libthr/thread/thr_barrier.c | 2 +- lib/libthr/thread/thr_barrierattr.c | 2 +- lib/libthr/thread/thr_cancel.c | 2 +- lib/libthr/thread/thr_cond.c | 2 +- lib/libthr/thread/thr_create.c | 2 +- lib/libthr/thread/thr_detach.c | 2 +- lib/libthr/thread/thr_event.c | 2 +- lib/libthr/thread/thr_getcpuclockid.c | 2 +- lib/libthr/thread/thr_getthreadid_np.c | 2 +- lib/libthr/thread/thr_join.c | 2 +- lib/libthr/thread/thr_kern.c | 2 +- lib/libthr/thread/thr_list.c | 2 +- lib/libthr/thread/thr_main_np.c | 2 +- lib/libthr/thread/thr_malloc.c | 2 +- lib/libthr/thread/thr_once.c | 2 +- lib/libthr/thread/thr_printf.c | 2 +- lib/libthr/thread/thr_private.h | 2 +- lib/libthr/thread/thr_pspinlock.c | 2 +- lib/libthr/thread/thr_rtld.c | 2 +- lib/libthr/thread/thr_rwlock.c | 2 +- lib/libthr/thread/thr_rwlockattr.c | 2 +- lib/libthr/thread/thr_sem.c | 2 +- lib/libthr/thread/thr_sig.c | 2 +- lib/libthr/thread/thr_sleepq.c | 2 +- lib/libthr/thread/thr_stack.c | 2 +- lib/libthr/thread/thr_umtx.c | 2 +- lib/libthr/thread/thr_umtx.h | 2 +- lib/libthread_db/arch/amd64/libpthread_md.c | 2 +- lib/libthread_db/arch/arm/libpthread_md.c | 2 +- lib/libthread_db/arch/i386/libpthread_md.c | 2 +- lib/libthread_db/arch/powerpc/libpthread_md.c | 2 +- lib/libthread_db/kse.h | 2 +- lib/libthread_db/libpthread_db.c | 2 +- lib/libthread_db/libpthread_db.h | 2 +- lib/libthread_db/libthr_db.c | 2 +- lib/libthread_db/thread_db.c | 2 +- lib/libthread_db/thread_db.h | 2 +- lib/libthread_db/thread_db_int.h | 2 +- lib/libufs/block.c | 2 +- lib/libufs/cgroup.c | 2 +- lib/libufs/inode.c | 2 +- lib/libufs/libufs.h | 2 +- lib/libufs/sblock.c | 2 +- lib/libufs/type.c | 2 +- lib/libugidfw/ugidfw.c | 2 +- lib/libugidfw/ugidfw.h | 2 +- lib/libulog/ulog.h | 2 +- lib/libulog/ulog_login.c | 2 +- lib/libulog/ulog_login_pseudo.c | 2 +- lib/libulog/utempter.c | 2 +- lib/libulog/utempter.h | 2 +- lib/libusb/libusb.h | 2 +- lib/libusb/libusb01.c | 2 +- lib/libusb/libusb10.c | 2 +- lib/libusb/libusb10.h | 2 +- lib/libusb/libusb10_desc.c | 2 +- lib/libusb/libusb10_io.c | 2 +- lib/libusb/libusb20.c | 2 +- lib/libusb/libusb20.h | 2 +- lib/libusb/libusb20_desc.c | 2 +- lib/libusb/libusb20_desc.h | 2 +- lib/libusb/libusb20_int.h | 2 +- lib/libusb/libusb20_ugen20.c | 2 +- lib/libusb/libusb_global_linux.h | 2 +- lib/libusb/usb.h | 2 +- lib/libutil/auth.c | 2 +- lib/libutil/expand_number.c | 2 +- lib/libutil/flopen.c | 2 +- lib/libutil/getlocalbase.3 | 2 +- lib/libutil/gr_util.c | 2 +- lib/libutil/humanize_number.c | 2 +- lib/libutil/kinfo_getallproc.c | 2 +- lib/libutil/kinfo_getproc.c | 2 +- lib/libutil/kld.c | 2 +- lib/libutil/login_crypt.c | 2 +- lib/libutil/pidfile.c | 2 +- lib/libutil/property.c | 2 +- lib/libutil/quotafile.c | 2 +- lib/libutil/realhostname.c | 2 +- lib/libutil/stub.c | 2 +- lib/libutil/trimdomain.c | 2 +- lib/libvmmapi/vmmapi.c | 2 +- lib/libvmmapi/vmmapi.h | 2 +- lib/libvmmapi/vmmapi_freebsd.c | 2 +- lib/liby/yyerror.h | 2 +- lib/libypclnt/ypclnt_passwd.c | 2 +- lib/msun/amd64/fenv.c | 2 +- lib/msun/arm/fenv.c | 2 +- lib/msun/arm/fenv.h | 2 +- lib/msun/i387/fenv.c | 2 +- lib/msun/i387/invtrig.c | 2 +- lib/msun/ld128/b_tgammal.c | 2 +- lib/msun/ld128/invtrig.c | 2 +- lib/msun/ld128/invtrig.h | 2 +- lib/msun/ld128/k_expl.h | 2 +- lib/msun/ld128/s_cexpl.c | 2 +- lib/msun/ld128/s_exp2l.c | 2 +- lib/msun/ld128/s_expl.c | 2 +- lib/msun/ld128/s_logl.c | 2 +- lib/msun/ld128/s_nanl.c | 2 +- lib/msun/ld80/invtrig.c | 2 +- lib/msun/ld80/invtrig.h | 2 +- lib/msun/ld80/k_expl.h | 2 +- lib/msun/ld80/s_cexpl.c | 2 +- lib/msun/ld80/s_exp2l.c | 2 +- lib/msun/ld80/s_expl.c | 2 +- lib/msun/ld80/s_logl.c | 2 +- lib/msun/ld80/s_nanl.c | 2 +- lib/msun/powerpc/fenv.c | 2 +- lib/msun/powerpc/fenv.h | 2 +- lib/msun/src/catrig.c | 2 +- lib/msun/src/catrigf.c | 2 +- lib/msun/src/e_remainderl.c | 2 +- lib/msun/src/e_sqrtl.c | 2 +- lib/msun/src/fenv-softfloat.h | 2 +- lib/msun/src/k_exp.c | 2 +- lib/msun/src/k_expf.c | 2 +- lib/msun/src/s_carg.c | 2 +- lib/msun/src/s_cargf.c | 2 +- lib/msun/src/s_cargl.c | 2 +- lib/msun/src/s_ccosh.c | 2 +- lib/msun/src/s_ccoshf.c | 2 +- lib/msun/src/s_cexp.c | 2 +- lib/msun/src/s_cexpf.c | 2 +- lib/msun/src/s_cimag.c | 2 +- lib/msun/src/s_cimagf.c | 2 +- lib/msun/src/s_cimagl.c | 2 +- lib/msun/src/s_conj.c | 2 +- lib/msun/src/s_conjf.c | 2 +- lib/msun/src/s_conjl.c | 2 +- lib/msun/src/s_copysignl.c | 2 +- lib/msun/src/s_cosl.c | 2 +- lib/msun/src/s_cproj.c | 2 +- lib/msun/src/s_cprojf.c | 2 +- lib/msun/src/s_cprojl.c | 2 +- lib/msun/src/s_creal.c | 2 +- lib/msun/src/s_crealf.c | 2 +- lib/msun/src/s_creall.c | 2 +- lib/msun/src/s_csinh.c | 2 +- lib/msun/src/s_csinhf.c | 2 +- lib/msun/src/s_csqrt.c | 2 +- lib/msun/src/s_csqrtf.c | 2 +- lib/msun/src/s_csqrtl.c | 2 +- lib/msun/src/s_ctanh.c | 2 +- lib/msun/src/s_ctanhf.c | 2 +- lib/msun/src/s_exp2.c | 2 +- lib/msun/src/s_exp2f.c | 2 +- lib/msun/src/s_fdim.c | 2 +- lib/msun/src/s_fma.c | 2 +- lib/msun/src/s_fmaf.c | 2 +- lib/msun/src/s_fmal.c | 2 +- lib/msun/src/s_fmax.c | 2 +- lib/msun/src/s_fmaxf.c | 2 +- lib/msun/src/s_fmaxl.c | 2 +- lib/msun/src/s_fmin.c | 2 +- lib/msun/src/s_fminf.c | 2 +- lib/msun/src/s_fminl.c | 2 +- lib/msun/src/s_frexpl.c | 2 +- lib/msun/src/s_isfinite.c | 2 +- lib/msun/src/s_isnan.c | 2 +- lib/msun/src/s_isnormal.c | 2 +- lib/msun/src/s_lrint.c | 2 +- lib/msun/src/s_lround.c | 2 +- lib/msun/src/s_modfl.c | 2 +- lib/msun/src/s_nan.c | 2 +- lib/msun/src/s_nearbyint.c | 2 +- lib/msun/src/s_rintl.c | 2 +- lib/msun/src/s_round.c | 2 +- lib/msun/src/s_roundf.c | 2 +- lib/msun/src/s_roundl.c | 2 +- lib/msun/src/s_scalbln.c | 2 +- lib/msun/src/s_signbit.c | 2 +- lib/msun/src/s_sinl.c | 2 +- lib/msun/src/s_tanl.c | 2 +- lib/msun/src/s_tgammaf.c | 2 +- lib/msun/x86/fenv.h | 2 +- libexec/atrun/gloadavg.h | 2 +- libexec/phttpget/phttpget.c | 2 +- libexec/pppoed/pppoed.c | 2 +- libexec/rc/tests/rc_subr_test.sh | 2 +- libexec/rtld-elf/amd64/reloc.c | 2 +- libexec/rtld-elf/amd64/rtld_machdep.h | 2 +- libexec/rtld-elf/arm/rtld_machdep.h | 2 +- libexec/rtld-elf/debug.c | 2 +- libexec/rtld-elf/debug.h | 2 +- libexec/rtld-elf/i386/reloc.c | 2 +- libexec/rtld-elf/i386/rtld_machdep.h | 2 +- libexec/rtld-elf/map_object.c | 2 +- libexec/rtld-elf/powerpc/rtld_machdep.h | 2 +- libexec/rtld-elf/powerpc64/rtld_machdep.h | 2 +- libexec/rtld-elf/rtld.c | 2 +- libexec/rtld-elf/rtld.h | 2 +- libexec/rtld-elf/rtld_lock.c | 2 +- libexec/rtld-elf/rtld_lock.h | 2 +- libexec/rtld-elf/rtld_malloc.h | 2 +- libexec/rtld-elf/rtld_printf.h | 2 +- libexec/rtld-elf/rtld_tls.h | 2 +- libexec/rtld-elf/tests/common.c | 2 +- libexec/rtld-elf/tests/common.h | 2 +- libexec/rtld-elf/tests/ld_preload_fds.c | 2 +- libexec/rtld-elf/xmalloc.c | 2 +- libexec/save-entropy/save-entropy.sh | 2 +- libexec/talkd/extern.h | 2 +- libexec/tftpd/tests/functional.c | 2 +- libexec/tftpd/tftp-file.c | 2 +- libexec/tftpd/tftp-file.h | 2 +- libexec/tftpd/tftp-io.c | 2 +- libexec/tftpd/tftp-io.h | 2 +- libexec/tftpd/tftp-options.c | 2 +- libexec/tftpd/tftp-options.h | 2 +- libexec/tftpd/tftp-transfer.c | 2 +- libexec/tftpd/tftp-transfer.h | 2 +- libexec/tftpd/tftp-utils.c | 2 +- libexec/tftpd/tftp-utils.h | 2 +- libexec/ulog-helper/ulog-helper.c | 2 +- sbin/adjkerntz/adjkerntz.c | 2 +- sbin/adjkerntz/pathnames.h | 2 +- sbin/bectl/bectl.8 | 2 +- sbin/bectl/bectl.c | 2 +- sbin/bectl/bectl.h | 2 +- sbin/bectl/bectl_jail.c | 2 +- sbin/bectl/bectl_list.c | 2 +- sbin/bectl/tests/bectl_test.sh | 2 +- sbin/camcontrol/fwdownload.c | 2 +- sbin/camcontrol/modeedit.c | 2 +- sbin/comcontrol/comcontrol.c | 2 +- sbin/conscontrol/conscontrol.c | 2 +- sbin/ddb/ddb.c | 2 +- sbin/ddb/ddb.h | 2 +- sbin/ddb/ddb_capture.c | 2 +- sbin/ddb/ddb_script.c | 2 +- sbin/devd/devd.cc | 2 +- sbin/devd/devd.h | 2 +- sbin/devd/devd.hh | 2 +- sbin/devd/parse.y | 2 +- sbin/devd/token.l | 2 +- sbin/devfs/devfs.c | 2 +- sbin/devfs/extern.h | 2 +- sbin/devfs/rule.c | 2 +- sbin/etherswitchcfg/etherswitchcfg.c | 2 +- sbin/fdisk/fdisk_mbr_enc.c | 2 +- sbin/fdisk/fdisk_mbr_enc.h | 2 +- sbin/fsck_ffs/fsck.h | 2 +- sbin/fsck_ffs/gjournal.c | 2 +- sbin/fsck_ffs/suj.c | 2 +- sbin/fsck_msdosfs/boot.c | 2 +- sbin/fsck_msdosfs/check.c | 2 +- sbin/fsck_msdosfs/dir.c | 2 +- sbin/fsck_msdosfs/dosfs.h | 2 +- sbin/fsck_msdosfs/ext.h | 2 +- sbin/fsirand/fsirand.c | 2 +- sbin/gbde/gbde.c | 2 +- sbin/geom/core/geom.c | 2 +- sbin/geom/core/geom.h | 2 +- sbin/geom/misc/subr.c | 2 +- sbin/geom/misc/subr.h | 2 +- sbin/ggate/ggatec/ggatec.c | 2 +- sbin/ggate/ggated/ggated.c | 2 +- sbin/ggate/ggatel/ggatel.c | 2 +- sbin/ggate/shared/ggate.c | 2 +- sbin/ggate/shared/ggate.h | 2 +- sbin/gvinum/gvinum.c | 2 +- sbin/hastctl/hastctl.c | 2 +- sbin/hastd/activemap.c | 2 +- sbin/hastd/activemap.h | 2 +- sbin/hastd/control.c | 2 +- sbin/hastd/control.h | 2 +- sbin/hastd/ebuf.c | 2 +- sbin/hastd/ebuf.h | 2 +- sbin/hastd/event.c | 2 +- sbin/hastd/event.h | 2 +- sbin/hastd/hast.h | 2 +- sbin/hastd/hast_checksum.c | 2 +- sbin/hastd/hast_checksum.h | 2 +- sbin/hastd/hast_compression.c | 2 +- sbin/hastd/hast_compression.h | 2 +- sbin/hastd/hast_proto.c | 2 +- sbin/hastd/hast_proto.h | 2 +- sbin/hastd/hastd.c | 2 +- sbin/hastd/hastd.h | 2 +- sbin/hastd/hooks.c | 2 +- sbin/hastd/hooks.h | 2 +- sbin/hastd/lzf.c | 2 +- sbin/hastd/lzf.h | 2 +- sbin/hastd/metadata.c | 2 +- sbin/hastd/metadata.h | 2 +- sbin/hastd/nv.c | 2 +- sbin/hastd/nv.h | 2 +- sbin/hastd/parse.y | 2 +- sbin/hastd/pjdlog.c | 2 +- sbin/hastd/pjdlog.h | 2 +- sbin/hastd/primary.c | 2 +- sbin/hastd/proto.c | 2 +- sbin/hastd/proto.h | 2 +- sbin/hastd/proto_common.c | 2 +- sbin/hastd/proto_impl.h | 2 +- sbin/hastd/proto_socketpair.c | 2 +- sbin/hastd/proto_tcp.c | 2 +- sbin/hastd/proto_uds.c | 2 +- sbin/hastd/rangelock.c | 2 +- sbin/hastd/rangelock.h | 2 +- sbin/hastd/refcnt.h | 2 +- sbin/hastd/secondary.c | 2 +- sbin/hastd/subr.c | 2 +- sbin/hastd/subr.h | 2 +- sbin/hastd/synch.h | 2 +- sbin/hastd/token.l | 2 +- sbin/ifconfig/af_nd6.c | 2 +- sbin/ifconfig/carp.c | 2 +- sbin/ifconfig/iffib.c | 2 +- sbin/ifconfig/ifgif.c | 2 +- sbin/ifconfig/ifgre.c | 2 +- sbin/ifconfig/ifgroup.c | 2 +- sbin/ifconfig/ifpfsync.c | 2 +- sbin/ipfw/nat64clat.c | 2 +- sbin/ipfw/nat64lsn.c | 2 +- sbin/ipfw/nat64stl.c | 2 +- sbin/kldconfig/kldconfig.c | 2 +- sbin/kldload/kldload.c | 2 +- sbin/kldstat/kldstat.c | 2 +- sbin/kldunload/kldunload.c | 2 +- sbin/ldconfig/elfhints.c | 2 +- sbin/ldconfig/ldconfig.h | 2 +- sbin/mdconfig/mdconfig.c | 2 +- sbin/mdmfs/mdmfs.c | 2 +- sbin/mount/extern.h | 2 +- sbin/mount_fusefs/mount_fusefs.c | 2 +- sbin/newfs_msdos/newfs_msdos.c | 2 +- sbin/nos-tun/nos-tun.c | 2 +- sbin/nvmecontrol/comnd.c | 2 +- sbin/nvmecontrol/comnd.h | 2 +- sbin/nvmecontrol/devlist.c | 2 +- sbin/nvmecontrol/firmware.c | 2 +- sbin/nvmecontrol/format.c | 2 +- sbin/nvmecontrol/identify.c | 2 +- sbin/nvmecontrol/identify_ext.c | 2 +- sbin/nvmecontrol/logpage.c | 2 +- sbin/nvmecontrol/modules/intel/intel.c | 2 +- sbin/nvmecontrol/modules/samsung/samsung.c | 2 +- sbin/nvmecontrol/nc_util.c | 2 +- sbin/nvmecontrol/ns.c | 2 +- sbin/nvmecontrol/nsid.c | 2 +- sbin/nvmecontrol/nvmecontrol.c | 2 +- sbin/nvmecontrol/nvmecontrol.h | 2 +- sbin/nvmecontrol/nvmecontrol_ext.h | 2 +- sbin/nvmecontrol/passthru.c | 2 +- sbin/nvmecontrol/perftest.c | 2 +- sbin/nvmecontrol/reset.c | 2 +- sbin/nvmecontrol/resv.c | 2 +- sbin/nvmecontrol/sanitize.c | 2 +- sbin/nvmecontrol/selftest.c | 2 +- sbin/nvmecontrol/tests/basic.sh | 2 +- sbin/pfilctl/pfilctl.c | 2 +- sbin/ping/main.c | 2 +- sbin/ping/main.h | 2 +- sbin/ping/ping.h | 2 +- sbin/ping/ping6.h | 2 +- sbin/ping/tests/in_cksum_test.c | 2 +- sbin/ping/tests/ping_test.sh | 2 +- sbin/ping/utils.h | 2 +- sbin/rcorder/rcorder.c | 2 +- sbin/reboot/nextboot.sh | 2 +- sbin/route/tests/basic.sh | 2 +- sbin/route/tests/utils.subr | 2 +- share/dtrace/ipfw.d | 2 +- share/examples/bhyve/vmrun.sh | 2 +- share/examples/hast/ucarp.sh | 2 +- share/examples/hast/ucarp_down.sh | 2 +- share/examples/hast/ucarp_up.sh | 2 +- share/examples/ipfw/change_rules.sh | 2 +- share/examples/kld/khelp/h_example.c | 2 +- share/examples/kld/random_adaptor/random_adaptor_example.c | 2 +- *** 67181 LINES SKIPPED *** From nobody Fri May 12 16:44:52 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvkX4zRBz4BDPP; Fri, 12 May 2023 16:44: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 4QHvkX4QRbz4NfX; Fri, 12 May 2023 16:44:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rjNCuLrKa2RhIWjGcwZJVimDMVv9wibRVAjXjvBfDT4=; b=fdOY1miB+fo6J169I6NzpPqBAvGZUvqyEr6K2xI7LJHBmtu1bYX3jPaH879TAWyWWETFMm bMvPLrPCYnk7Eu+fYv7R+HVpq7CQRs0VOCUMBzGI0nGOuCib192sXT+2Zzj0EphVmbGYNe xwj+4FKCaWSPEMUtlXmf313qRty4kbiEooH41KMuwlL++3LcjoYnghieQvrHrCgIdr4Jys 3gXmKSvRh2UbqBV3iw0hCI0X4OvweJi1PsZafq6/VjHzBTV621YWRwqEhVGoV/AT5VjvLq eI6H6PYeIGavCzQeijN8DNY/6meVJdXtt+lBFeCFBcfeKWxeO6Rbvn1GoxgJhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rjNCuLrKa2RhIWjGcwZJVimDMVv9wibRVAjXjvBfDT4=; b=RjANJbAmoE2YqT0S2Hx4wSAwjqy7ede7/6ANc2VtzNG8J2zCIYNgbncyvh+tZokoehltop Dtqc71gapU3Wx7sR7ssYyHzZlm9ZTbm5ni5Url7+2r4ACv0nHXQJ0t0My7WFyiAJDWFp7r UrhLqV90yefu0DK2JQxVVNZvJ9s7bTuCYv9mCqhh3eKNVhkLqgHtArU3fFJV6GfVmk7+m1 CAxkzvt89gRY/uZgqziL6dK4tR6IvIde2iymshveYk/UuxQ++9ag7Aq00hGdYxQQHBKBvo bjQgP/oWIV4cnh+C/ZlsLEaaXQ5rDEuGSnLMZNuntj2+9qAbE4+k9rNsZQa4RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683909892; a=rsa-sha256; cv=none; b=aZfUK7WsqF5y+r55+PVa9EGqFs/mGgTH6jU338BTM8yMMy8gDuzf0B3CQfC2fMXAvl7N3l c1uAkcwSVejDla9hqIhG0uwg7C57RYnEbPBDhWwP3AxChIh8DPS7DWaEo/yiFkH4YL2iOQ c2rGnvFuRS+GxfFtNW57eGnPY1RRZONFzK6k3eagghPE4aVJ+bVoRK1mSxfI43cJpn0fO5 +h6K5HsMw9avz4W/Tj8hwVBuzf5PHeT2CIe8vs1dirsmeLaGcF+HPBrACnZvFGPz3LqVmw bO8kZbQreLL2XbTnzsUL+1JRzXqUMtX/aHfFwEx83F27rFULzk7nnbEwnSXa8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvkX3PLpzjSj; Fri, 12 May 2023 16:44: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 34CGiqvH062386; Fri, 12 May 2023 16:44:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGiq42062385; Fri, 12 May 2023 16:44:52 GMT (envelope-from git) Date: Fri, 12 May 2023 16:44:52 GMT Message-Id: <202305121644.34CGiq42062385@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c87658aa7d1f - main - spdx: Remove duplicate lines List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c87658aa7d1fe09d3839b9ad1d6a9c0fef5afd94 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c87658aa7d1fe09d3839b9ad1d6a9c0fef5afd94 commit c87658aa7d1fe09d3839b9ad1d6a9c0fef5afd94 Author: Warner Losh AuthorDate: 2023-05-10 22:42:54 +0000 Commit: Warner Losh CommitDate: 2023-05-12 16:44:03 +0000 spdx: Remove duplicate lines Remove duplicated SPDX lines. Sponsored by: Netflix --- sys/dev/qlxge/qls_isr.c | 2 -- sys/xen/xenbus/xenbusb.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/dev/qlxge/qls_isr.c b/sys/dev/qlxge/qls_isr.c index d8fa21dc24eb..009d493520d1 100644 --- a/sys/dev/qlxge/qls_isr.c +++ b/sys/dev/qlxge/qls_isr.c @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause - * * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013-2014 Qlogic Corporation diff --git a/sys/xen/xenbus/xenbusb.h b/sys/xen/xenbus/xenbusb.h index 12f5201f70eb..f59af62a7c2c 100644 --- a/sys/xen/xenbus/xenbusb.h +++ b/sys/xen/xenbus/xenbusb.h @@ -1,6 +1,4 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause - * * Core definitions and data structures shareable across OS platforms. * * SPDX-License-Identifier: BSD-2-Clause From nobody Fri May 12 16:44:53 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvkZ0DFRz4BDPT; Fri, 12 May 2023 16:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHvkY63sFz4Nj1; Fri, 12 May 2023 16:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gU/Docjb4Bykdl2esk8oTn4dcZbWJl+s/7omWps/uFw=; b=Bd/lPBjlcrXASzq1HkHibSFFbk7OKQzTJZ5VU3JStW2gw5CeL9PnH43q9JQw8+a+kIh3mI Jp8dRTEbnrBFVSk+910weW3u598UZ1UexAy73xAmOeziil3zagJJvaBsTuUDCVDvt2YBPd ABQaavdVR0i9ijlA5mPAgcWQhjcXgv3eRQsUDkO9EaRp4KtJUIklxkvOCmGzDnSKzUqYaI ShkR03eSfZY73BBrWV6/KSvR5oEDakuqaTMLMbON/kP6XmG1Z6OBxoetNXUV2WY1mcg/vB buO1TztYiB8pRKTfjgMGdKTU+ZL2cdKSKkNLOMc/Tnwn9mo8KGz+qUJXdUL8zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gU/Docjb4Bykdl2esk8oTn4dcZbWJl+s/7omWps/uFw=; b=rQyCQx+3+qsonBhiMjgbmxG5fz+UIl0EbMmKvOYAB/y/ETUd+D8U85vn4cEF5LFGE4KEio uHrYdKsm2MJGqT3U8oP0LFiUrtMYwiWY4oDih1huqvUjizfGuAT2pfdzq/rJ/q1Z93dk9r XqWrj8JcCQhaCajojbe1p99ZjZ1RqecSsjf59sEYPXjTvKQETC02DjdUaSLmNd/2NyJhHK nDHUwtsuLy79LseICktg14GFfVqVdGmpEKI/XOP1zO5T7koKMcZma8z3qcZutaz2plRgsv qLRaTSrRj2dzzEl3uTL5JfSgqUmKfY2MH8kMJzV0UAexHLRiVtOXm1xtw7G7DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683909893; a=rsa-sha256; cv=none; b=er94eARc7aGcpOeFPAOcBc2Fd0mG9cjjt2ue5n3QmOzeIF9i+Ms/nmP1a+ipPKij7S74+h ZsTHHesGVCRKLkxD3S6wOS367W8Tl4/Lhxg/0trbBQ/Ijfq+o5HwNwYtYIx1qusm7lLplr nBxkpRXekvleft1lYi0+cIV+0WoCZ9GtqF1rromG2eoEP2+poqUDDr7ddiDjJ7rNFNa81x SZ+HNCX0nYf1pTGB2ZSb+N/T8LNzXIYw2ZaGFOT4J+9Bp0BZ1LfDHHG44nraWUXEKcfKEE X97hTvk3JRJDO1+p6lqwmWfpr3EzVGwU39/KQz3pB9wY03YKSOZtDrBXuhBAVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvkY4MsjzjSk; Fri, 12 May 2023 16:44: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 34CGirAO062405; Fri, 12 May 2023 16:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGir9K062404; Fri, 12 May 2023 16:44:53 GMT (envelope-from git) Date: Fri, 12 May 2023 16:44:53 GMT Message-Id: <202305121644.34CGir9K062404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b61a57301942 - main - spdx: The BSD-2-Clause-NetBSD identifier is obsolete, drop -NetBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b61a573019428cbdc38ed03be9ecd2482011ea66 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b61a573019428cbdc38ed03be9ecd2482011ea66 commit b61a573019428cbdc38ed03be9ecd2482011ea66 Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-05-12 16:44:04 +0000 spdx: The BSD-2-Clause-NetBSD identifier is obsolete, drop -NetBSD The SPDX folks have obsoleted the BSD-2-Clause-NetBSD identifier. Catch up to that fact and revert to their recommended match of BSD-2-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix --- bin/pkill/pkill.c | 2 +- include/getopt.h | 2 +- include/hesiod.h | 2 +- include/netconfig.h | 2 +- include/nl_types.h | 2 +- include/nsswitch.h | 2 +- include/stringlist.h | 2 +- include/wchar.h | 2 +- lib/libc/arm/gen/arm_initfini.c | 2 +- lib/libc/arm/gen/makecontext.c | 2 +- lib/libc/gen/fmtcheck.c | 2 +- lib/libc/gen/lockf.c | 2 +- lib/libc/net/nsdispatch.c | 2 +- lib/libc/net/nslexer.l | 2 +- lib/libc/net/nsparser.y | 2 +- lib/libc/powerpc/gen/fpgetmask.c | 2 +- lib/libc/powerpc/gen/fpgetround.c | 2 +- lib/libc/powerpc/gen/fpgetsticky.c | 2 +- lib/libc/powerpc/gen/fpsetmask.c | 2 +- lib/libc/powerpc/gen/fpsetround.c | 2 +- lib/libc/powerpc64/gen/flt_rounds.c | 2 +- lib/libc/powerpc64/gen/fpgetmask.c | 2 +- lib/libc/powerpc64/gen/fpgetround.c | 2 +- lib/libc/powerpc64/gen/fpgetsticky.c | 2 +- lib/libc/powerpc64/gen/fpsetmask.c | 2 +- lib/libc/softfloat/fpgetmask.c | 2 +- lib/libc/softfloat/fpgetround.c | 2 +- lib/libc/softfloat/fpgetsticky.c | 2 +- lib/libc/softfloat/fpsetmask.c | 2 +- lib/libc/softfloat/fpsetround.c | 2 +- lib/libc/softfloat/fpsetsticky.c | 2 +- lib/libnetbsd/stdlib.h | 2 +- lib/libnetbsd/strsuftoll.c | 2 +- lib/libusbhid/data.c | 2 +- lib/libusbhid/descr.c | 2 +- lib/libusbhid/descr_compat.c | 2 +- lib/libusbhid/parse.c | 2 +- lib/libusbhid/usage.c | 2 +- lib/libusbhid/usbhid.h | 2 +- lib/libusbhid/usbvar.h | 2 +- libexec/rpc.sprayd/sprayd.c | 2 +- libexec/rtld-elf/powerpc/reloc.c | 2 +- libexec/rtld-elf/powerpc64/reloc.c | 2 +- sbin/camcontrol/camcontrol.h | 2 +- sbin/camcontrol/progress.c | 2 +- sbin/camcontrol/progress.h | 2 +- sbin/ccdconfig/pathnames.h | 2 +- share/examples/kld/dyn_sysctl/dyn_sysctl.c | 2 +- share/examples/kld/firmware/fwconsumer/fw_consumer.c | 2 +- sys/arm/include/_inttypes.h | 2 +- sys/arm/include/_stdint.h | 2 +- sys/arm/include/bus_dma.h | 2 +- sys/arm/include/ucontext.h | 2 +- sys/compat/linux/linux_getcwd.c | 2 +- sys/compat/linux/linux_time.c | 2 +- sys/dev/bhnd/cores/usb/bhnd_ohci.c | 2 +- sys/dev/fxp/if_fxp.c | 2 +- sys/dev/fxp/if_fxpreg.h | 2 +- sys/dev/gem/if_gem.c | 2 +- sys/dev/gem/if_gem_pci.c | 2 +- sys/dev/gem/if_gemreg.h | 2 +- sys/dev/gem/if_gemvar.h | 2 +- sys/dev/hid/hid.c | 2 +- sys/dev/hid/hid.h | 2 +- sys/dev/hid/hidquirk.c | 2 +- sys/dev/hid/hidraw.c | 2 +- sys/dev/hid/hkbd.c | 2 +- sys/dev/iicbus/s35390a.c | 2 +- sys/dev/le/am7990.c | 2 +- sys/dev/le/am79900.c | 2 +- sys/dev/le/am79900reg.h | 2 +- sys/dev/le/am79900var.h | 2 +- sys/dev/le/am7990var.h | 2 +- sys/dev/le/if_le_isa.c | 2 +- sys/dev/le/if_le_pci.c | 2 +- sys/dev/le/lance.c | 2 +- sys/dev/le/lancereg.h | 2 +- sys/dev/le/lancevar.h | 2 +- sys/dev/mii/acphy.c | 2 +- sys/dev/mii/bmtphy.c | 2 +- sys/dev/mii/bmtphyreg.h | 2 +- sys/dev/mii/e1000phy.c | 2 +- sys/dev/mii/gentbi.c | 2 +- sys/dev/mii/icsphy.c | 2 +- sys/dev/mii/icsphyreg.h | 2 +- sys/dev/mii/lxtphy.c | 2 +- sys/dev/mii/lxtphyreg.h | 2 +- sys/dev/mii/mii.c | 2 +- sys/dev/mii/mii_bitbang.c | 2 +- sys/dev/mii/mii_bitbang.h | 2 +- sys/dev/mii/mii_physubr.c | 2 +- sys/dev/mii/miivar.h | 2 +- sys/dev/mii/mv88e151x.c | 2 +- sys/dev/mii/mv88e151xreg.h | 2 +- sys/dev/mii/nsphy.c | 2 +- sys/dev/mii/nsphyreg.h | 2 +- sys/dev/mii/nsphyter.c | 2 +- sys/dev/mii/nsphyterreg.h | 2 +- sys/dev/mii/qsphy.c | 2 +- sys/dev/mii/qsphyreg.h | 2 +- sys/dev/mii/ukphy.c | 2 +- sys/dev/mii/ukphy_subr.c | 2 +- sys/dev/ofw/ofw_pci.h | 2 +- sys/dev/qat_c2xxx/qat.c | 2 +- sys/dev/qat_c2xxx/qat_ae.c | 2 +- sys/dev/qat_c2xxx/qat_aevar.h | 2 +- sys/dev/qat_c2xxx/qat_c2xxx.c | 2 +- sys/dev/qat_c2xxx/qat_c2xxxreg.h | 2 +- sys/dev/qat_c2xxx/qat_hw15.c | 2 +- sys/dev/qat_c2xxx/qat_hw15reg.h | 2 +- sys/dev/qat_c2xxx/qat_hw15var.h | 2 +- sys/dev/qat_c2xxx/qatreg.h | 2 +- sys/dev/qat_c2xxx/qatvar.h | 2 +- sys/dev/sound/midi/midi.c | 2 +- sys/dev/sound/pci/cmireg.h | 2 +- sys/dev/sound/pci/via82c686.h | 2 +- sys/dev/sound/usb/uaudio.c | 2 +- sys/dev/sound/usb/uaudioreg.h | 2 +- sys/dev/stge/if_stge.c | 2 +- sys/dev/stge/if_stgereg.h | 2 +- sys/dev/usb/controller/ehci.h | 2 +- sys/dev/usb/controller/ehci_pci.c | 2 +- sys/dev/usb/controller/ehcireg.h | 2 +- sys/dev/usb/controller/ohci.h | 2 +- sys/dev/usb/controller/ohci_pci.c | 2 +- sys/dev/usb/input/uhid.c | 2 +- sys/dev/usb/input/ukbd.c | 2 +- sys/dev/usb/input/usbhid.c | 2 +- sys/dev/usb/quirk/usb_quirk.c | 2 +- sys/dev/usb/serial/ubsa.c | 2 +- sys/dev/usb/serial/ubser.c | 2 +- sys/dev/usb/serial/uchcom.c | 2 +- sys/dev/usb/serial/ufoma.c | 2 +- sys/dev/usb/serial/uftdi.c | 2 +- sys/dev/usb/serial/ugensa.c | 2 +- sys/dev/usb/serial/uipaq.c | 2 +- sys/dev/usb/serial/ulpt.c | 2 +- sys/dev/usb/serial/umodem.c | 2 +- sys/dev/usb/serial/uplcom.c | 2 +- sys/dev/usb/serial/usb_serial.c | 2 +- sys/dev/usb/serial/usb_serial.h | 2 +- sys/dev/usb/serial/uvisor.c | 2 +- sys/dev/usb/usb.h | 2 +- sys/dev/usb/usb_cdc.h | 2 +- sys/dev/usb/usb_hid.c | 2 +- sys/dev/usb/usb_hub.c | 2 +- sys/dev/usb/usb_hub_acpi.c | 2 +- sys/dev/usb/usb_hub_private.h | 2 +- sys/dev/usb/usbhid.h | 2 +- sys/dev/xl/xlphy.c | 2 +- sys/fs/tmpfs/tmpfs.h | 2 +- sys/fs/tmpfs/tmpfs_fifoops.c | 2 +- sys/fs/tmpfs/tmpfs_fifoops.h | 2 +- sys/fs/tmpfs/tmpfs_subr.c | 2 +- sys/fs/tmpfs/tmpfs_vfsops.c | 2 +- sys/fs/tmpfs/tmpfs_vnops.c | 2 +- sys/fs/tmpfs/tmpfs_vnops.h | 2 +- sys/geom/geom_ccd.c | 2 +- sys/net/bridgestp.c | 2 +- sys/net/ieee8023ad_lacp.c | 2 +- sys/net/ieee8023ad_lacp.h | 2 +- sys/netinet/ip_gre.c | 2 +- sys/powerpc/fpu/fpu_extern.h | 2 +- sys/powerpc/include/bat.h | 2 +- sys/powerpc/include/bus.h | 2 +- sys/sys/bus_dma.h | 2 +- sys/tools/miidevs2h.awk | 2 +- sys/tools/pccarddevs2h.awk | 2 +- sys/x86/include/_inttypes.h | 2 +- sys/x86/include/bus.h | 2 +- sys/x86/xen/pv.c | 2 +- usr.bin/gencat/gencat.c | 2 +- usr.bin/gzip/gzip.c | 2 +- usr.bin/gzip/unbzip2.c | 2 +- usr.bin/gzip/unxz.c | 2 +- usr.bin/nl/nl.c | 2 +- usr.bin/seq/seq.c | 2 +- usr.bin/stat/stat.c | 2 +- usr.bin/usbhidaction/usbhidaction.c | 2 +- usr.bin/usbhidctl/usbhid.c | 2 +- usr.bin/ypcat/ypcat.c | 2 +- usr.bin/ypmatch/ypmatch.c | 2 +- usr.bin/ypwhich/ypwhich.c | 2 +- usr.sbin/bluetooth/btpand/bnep.c | 2 +- usr.sbin/bluetooth/btpand/bnep.h | 2 +- usr.sbin/bluetooth/btpand/btpand.c | 2 +- usr.sbin/bluetooth/btpand/btpand.h | 2 +- usr.sbin/bluetooth/btpand/channel.c | 2 +- usr.sbin/bluetooth/btpand/packet.c | 2 +- usr.sbin/bluetooth/btpand/sdp.c | 2 +- usr.sbin/bluetooth/btpand/sdp.h | 2 +- usr.sbin/bluetooth/btpand/server.c | 2 +- usr.sbin/bluetooth/btpand/tap.c | 2 +- usr.sbin/makefs/cd9660.c | 2 +- usr.sbin/makefs/cd9660.h | 2 +- usr.sbin/makefs/cd9660/cd9660_conversion.c | 2 +- usr.sbin/makefs/cd9660/cd9660_debug.c | 2 +- usr.sbin/makefs/cd9660/cd9660_eltorito.c | 2 +- usr.sbin/makefs/cd9660/cd9660_eltorito.h | 2 +- usr.sbin/makefs/cd9660/cd9660_strings.c | 2 +- usr.sbin/makefs/cd9660/cd9660_write.c | 2 +- usr.sbin/makefs/cd9660/iso9660_rrip.c | 2 +- usr.sbin/makefs/cd9660/iso9660_rrip.h | 2 +- usr.sbin/makefs/ffs/ffs_bswap.c | 2 +- usr.sbin/makefs/ffs/newfs_extern.h | 2 +- usr.sbin/makefs/ffs/ufs_bswap.h | 2 +- usr.sbin/rpcbind/util.c | 2 +- usr.sbin/services_mkdb/extern.h | 2 +- usr.sbin/services_mkdb/services_mkdb.c | 2 +- usr.sbin/services_mkdb/uniq.c | 2 +- usr.sbin/ypset/ypset.c | 2 +- 211 files changed, 211 insertions(+), 211 deletions(-) diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c index 6d8f29147a04..93349ecdafee 100644 --- a/bin/pkill/pkill.c +++ b/bin/pkill/pkill.c @@ -1,7 +1,7 @@ /* $NetBSD: pkill.c,v 1.16 2005/10/10 22:13:20 kleink Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2005 Pawel Jakub Dawidek diff --git a/include/getopt.h b/include/getopt.h index 789b4d1d434c..4c0399db8545 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/hesiod.h b/include/hesiod.h index e8c38d84dccb..a06b69d32413 100644 --- a/include/hesiod.h +++ b/include/hesiod.h @@ -3,7 +3,7 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause-NetBSD AND ISC) + * SPDX-License-Identifier: (BSD-2-Clause AND ISC) * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/netconfig.h b/include/netconfig.h index b459e2ee0bf2..c4aec6a3e791 100644 --- a/include/netconfig.h +++ b/include/netconfig.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2004 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/nl_types.h b/include/nl_types.h index bf88144aefd4..c07352e24096 100644 --- a/include/nl_types.h +++ b/include/nl_types.h @@ -1,7 +1,7 @@ /* $NetBSD: nl_types.h,v 1.9 2000/10/03 19:53:32 sommerfeld Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/nsswitch.h b/include/nsswitch.h index 0db8a8118594..79f6bd2145e8 100644 --- a/include/nsswitch.h +++ b/include/nsswitch.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/include/stringlist.h b/include/stringlist.h index b570e631b526..a5177e235a5d 100644 --- a/include/stringlist.h +++ b/include/stringlist.h @@ -1,7 +1,7 @@ /* $NetBSD: stringlist.h,v 1.2 1997/01/17 06:11:36 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1994 Christos Zoulas * All rights reserved. diff --git a/include/wchar.h b/include/wchar.h index 78f2f010048f..147efb4dbf86 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause-NetBSD) + * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause) * * Copyright (c)1999 Citrus Project, * All rights reserved. diff --git a/lib/libc/arm/gen/arm_initfini.c b/lib/libc/arm/gen/arm_initfini.c index 4dabe6743c9f..a54646eb7907 100644 --- a/lib/libc/arm/gen/arm_initfini.c +++ b/lib/libc/arm/gen/arm_initfini.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 Andrew Turner diff --git a/lib/libc/arm/gen/makecontext.c b/lib/libc/arm/gen/makecontext.c index 421cf0dd3ed2..ad3f97184fd0 100644 --- a/lib/libc/arm/gen/makecontext.c +++ b/lib/libc/arm/gen/makecontext.c @@ -1,7 +1,7 @@ /* $NetBSD: makecontext.c,v 1.2 2003/01/18 11:06:24 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/gen/fmtcheck.c b/lib/libc/gen/fmtcheck.c index a772f50e51c8..42809bb04c58 100644 --- a/lib/libc/gen/fmtcheck.c +++ b/lib/libc/gen/fmtcheck.c @@ -1,7 +1,7 @@ /* $NetBSD: fmtcheck.c,v 1.8 2008/04/28 20:22:59 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/gen/lockf.c b/lib/libc/gen/lockf.c index 20f016dd1694..85110387fbe3 100644 --- a/lib/libc/gen/lockf.c +++ b/lib/libc/gen/lockf.c @@ -1,6 +1,6 @@ /* $NetBSD: lockf.c,v 1.3 2008/04/28 20:22:59 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/net/nsdispatch.c b/lib/libc/net/nsdispatch.c index ada7ac606e15..d2d9f08b6efa 100644 --- a/lib/libc/net/nsdispatch.c +++ b/lib/libc/net/nsdispatch.c @@ -1,7 +1,7 @@ /* $NetBSD: nsdispatch.c,v 1.9 1999/01/25 00:16:17 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/net/nslexer.l b/lib/libc/net/nslexer.l index 946aace3a8a8..bd3c02dcacf4 100644 --- a/lib/libc/net/nslexer.l +++ b/lib/libc/net/nslexer.l @@ -2,7 +2,7 @@ /* $NetBSD: nslexer.l,v 1.3 1999/01/25 00:16:17 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/net/nsparser.y b/lib/libc/net/nsparser.y index 6e90fc73d8c9..b05b30d26bd0 100644 --- a/lib/libc/net/nsparser.y +++ b/lib/libc/net/nsparser.y @@ -2,7 +2,7 @@ /* $NetBSD: nsparser.y,v 1.3 1999/01/25 00:16:18 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpgetmask.c b/lib/libc/powerpc/gen/fpgetmask.c index b8c813e8bb84..76820e6807d7 100644 --- a/lib/libc/powerpc/gen/fpgetmask.c +++ b/lib/libc/powerpc/gen/fpgetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpgetround.c b/lib/libc/powerpc/gen/fpgetround.c index 062a565cc570..b40016447246 100644 --- a/lib/libc/powerpc/gen/fpgetround.c +++ b/lib/libc/powerpc/gen/fpgetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpgetsticky.c b/lib/libc/powerpc/gen/fpgetsticky.c index e556123251ec..0c25a270f27e 100644 --- a/lib/libc/powerpc/gen/fpgetsticky.c +++ b/lib/libc/powerpc/gen/fpgetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpsetmask.c b/lib/libc/powerpc/gen/fpsetmask.c index f5d52eec5482..36c46f12dcd9 100644 --- a/lib/libc/powerpc/gen/fpsetmask.c +++ b/lib/libc/powerpc/gen/fpsetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc/gen/fpsetround.c b/lib/libc/powerpc/gen/fpsetround.c index d1cc134760a5..9a1956113c85 100644 --- a/lib/libc/powerpc/gen/fpsetround.c +++ b/lib/libc/powerpc/gen/fpsetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetround.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/flt_rounds.c b/lib/libc/powerpc64/gen/flt_rounds.c index 39af35c77e1c..885942a1389a 100644 --- a/lib/libc/powerpc64/gen/flt_rounds.c +++ b/lib/libc/powerpc64/gen/flt_rounds.c @@ -1,7 +1,7 @@ /* $NetBSD: flt_rounds.c,v 1.4.10.3 2002/03/22 20:41:53 nathanw Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996 Mark Brinicombe * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpgetmask.c b/lib/libc/powerpc64/gen/fpgetmask.c index b8c813e8bb84..76820e6807d7 100644 --- a/lib/libc/powerpc64/gen/fpgetmask.c +++ b/lib/libc/powerpc64/gen/fpgetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetmask.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpgetround.c b/lib/libc/powerpc64/gen/fpgetround.c index 062a565cc570..b40016447246 100644 --- a/lib/libc/powerpc64/gen/fpgetround.c +++ b/lib/libc/powerpc64/gen/fpgetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetround.c,v 1.3 2002/01/13 21:45:47 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpgetsticky.c b/lib/libc/powerpc64/gen/fpgetsticky.c index e556123251ec..0c25a270f27e 100644 --- a/lib/libc/powerpc64/gen/fpgetsticky.c +++ b/lib/libc/powerpc64/gen/fpgetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetsticky.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/powerpc64/gen/fpsetmask.c b/lib/libc/powerpc64/gen/fpsetmask.c index f5d52eec5482..36c46f12dcd9 100644 --- a/lib/libc/powerpc64/gen/fpsetmask.c +++ b/lib/libc/powerpc64/gen/fpsetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetmask.c,v 1.3 2002/01/13 21:45:48 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpgetmask.c b/lib/libc/softfloat/fpgetmask.c index 2fe4c12c589d..71ea2ac99621 100644 --- a/lib/libc/softfloat/fpgetmask.c +++ b/lib/libc/softfloat/fpgetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpgetround.c b/lib/libc/softfloat/fpgetround.c index 0f15f2ae4517..c5bc6f9b6735 100644 --- a/lib/libc/softfloat/fpgetround.c +++ b/lib/libc/softfloat/fpgetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpgetsticky.c b/lib/libc/softfloat/fpgetsticky.c index 8ac7b90e9647..349657e25eb3 100644 --- a/lib/libc/softfloat/fpgetsticky.c +++ b/lib/libc/softfloat/fpgetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpgetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpsetmask.c b/lib/libc/softfloat/fpsetmask.c index afbe64b2ee7f..42025e1de3c3 100644 --- a/lib/libc/softfloat/fpsetmask.c +++ b/lib/libc/softfloat/fpsetmask.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpsetround.c b/lib/libc/softfloat/fpsetround.c index 54df295000a4..8305e4302e2d 100644 --- a/lib/libc/softfloat/fpsetround.c +++ b/lib/libc/softfloat/fpsetround.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libc/softfloat/fpsetsticky.c b/lib/libc/softfloat/fpsetsticky.c index 33c17120d33d..b71475096d10 100644 --- a/lib/libc/softfloat/fpsetsticky.c +++ b/lib/libc/softfloat/fpsetsticky.c @@ -1,7 +1,7 @@ /* $NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libnetbsd/stdlib.h b/lib/libnetbsd/stdlib.h index b7bb875740d5..1ccc18b3ec49 100644 --- a/lib/libnetbsd/stdlib.h +++ b/lib/libnetbsd/stdlib.h @@ -1,7 +1,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 SRI International * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc. diff --git a/lib/libnetbsd/strsuftoll.c b/lib/libnetbsd/strsuftoll.c index 078bee0ace58..5b2d0978c083 100644 --- a/lib/libnetbsd/strsuftoll.c +++ b/lib/libnetbsd/strsuftoll.c @@ -1,6 +1,6 @@ /* $NetBSD: strsuftoll.c,v 1.6 2004/03/05 05:58:29 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2002,2004 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/lib/libusbhid/data.c b/lib/libusbhid/data.c index cad320562eee..944edbb60d64 100644 --- a/lib/libusbhid/data.c +++ b/lib/libusbhid/data.c @@ -1,7 +1,7 @@ /* $NetBSD: data.c,v 1.8 2000/04/02 11:10:53 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/descr.c b/lib/libusbhid/descr.c index 7cd6750ad322..c340fe1ef402 100644 --- a/lib/libusbhid/descr.c +++ b/lib/libusbhid/descr.c @@ -1,7 +1,7 @@ /* $NetBSD: descr.c,v 1.9 2000/09/24 02:13:24 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/descr_compat.c b/lib/libusbhid/descr_compat.c index 237319269a2c..fdcc7dbac061 100644 --- a/lib/libusbhid/descr_compat.c +++ b/lib/libusbhid/descr_compat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/parse.c b/lib/libusbhid/parse.c index 2913de594200..2f677172be02 100644 --- a/lib/libusbhid/parse.c +++ b/lib/libusbhid/parse.c @@ -1,7 +1,7 @@ /* $NetBSD: parse.c,v 1.11 2000/09/24 02:19:54 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999, 2001 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/usage.c b/lib/libusbhid/usage.c index fba9c668bd33..6317567248d0 100644 --- a/lib/libusbhid/usage.c +++ b/lib/libusbhid/usage.c @@ -1,7 +1,7 @@ /* $NetBSD: usage.c,v 1.8 2000/10/10 19:23:58 is Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/usbhid.h b/lib/libusbhid/usbhid.h index 971884ba8ee9..1b0676426ef9 100644 --- a/lib/libusbhid/usbhid.h +++ b/lib/libusbhid/usbhid.h @@ -1,7 +1,7 @@ /* $NetBSD: usb.h,v 1.8 2000/08/13 22:22:02 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/lib/libusbhid/usbvar.h b/lib/libusbhid/usbvar.h index 0dfd596e8bb0..32fcabd0ab39 100644 --- a/lib/libusbhid/usbvar.h +++ b/lib/libusbhid/usbvar.h @@ -1,7 +1,7 @@ /* $NetBSD: usbvar.h,v 1.2 1999/05/11 21:15:46 augustss Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 Lennart Augustsson * All rights reserved. diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index 5d015481a9e2..209d74af59af 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -1,7 +1,7 @@ /* $NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1994 Christos Zoulas * All rights reserved. diff --git a/libexec/rtld-elf/powerpc/reloc.c b/libexec/rtld-elf/powerpc/reloc.c index ab09b1536d80..27796cb18277 100644 --- a/libexec/rtld-elf/powerpc/reloc.c +++ b/libexec/rtld-elf/powerpc/reloc.c @@ -1,7 +1,7 @@ /* $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1998 Tsubai Masanari * All rights reserved. diff --git a/libexec/rtld-elf/powerpc64/reloc.c b/libexec/rtld-elf/powerpc64/reloc.c index 1dcdd2478403..2ca361168e0d 100644 --- a/libexec/rtld-elf/powerpc64/reloc.c +++ b/libexec/rtld-elf/powerpc64/reloc.c @@ -1,7 +1,7 @@ /* $NetBSD: ppc_reloc.c,v 1.10 2001/09/10 06:09:41 mycroft Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 1998 Tsubai Masanari * All rights reserved. diff --git a/sbin/camcontrol/camcontrol.h b/sbin/camcontrol/camcontrol.h index b84587df7a3e..53a0e1af4bf4 100644 --- a/sbin/camcontrol/camcontrol.h +++ b/sbin/camcontrol/camcontrol.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 Kenneth D. Merry. * All rights reserved. diff --git a/sbin/camcontrol/progress.c b/sbin/camcontrol/progress.c index 054b3f5391e7..c620b577416a 100644 --- a/sbin/camcontrol/progress.c +++ b/sbin/camcontrol/progress.c @@ -1,7 +1,7 @@ /* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997-2009 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sbin/camcontrol/progress.h b/sbin/camcontrol/progress.h index 1234c1136eaf..f49857f57de6 100644 --- a/sbin/camcontrol/progress.h +++ b/sbin/camcontrol/progress.h @@ -1,7 +1,7 @@ /* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997-2012 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sbin/ccdconfig/pathnames.h b/sbin/ccdconfig/pathnames.h index 85791ddbfcff..83392b665f44 100644 --- a/sbin/ccdconfig/pathnames.h +++ b/sbin/ccdconfig/pathnames.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/share/examples/kld/dyn_sysctl/dyn_sysctl.c b/share/examples/kld/dyn_sysctl/dyn_sysctl.c index c7ff6fb2c48c..2e455f468bb3 100644 --- a/share/examples/kld/dyn_sysctl/dyn_sysctl.c +++ b/share/examples/kld/dyn_sysctl/dyn_sysctl.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Andrzej Bialecki * All rights reserved. diff --git a/share/examples/kld/firmware/fwconsumer/fw_consumer.c b/share/examples/kld/firmware/fwconsumer/fw_consumer.c index d0b038c8339d..294d2fbb636f 100644 --- a/share/examples/kld/firmware/fwconsumer/fw_consumer.c +++ b/share/examples/kld/firmware/fwconsumer/fw_consumer.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006, Max Laier * All rights reserved. diff --git a/sys/arm/include/_inttypes.h b/sys/arm/include/_inttypes.h index d8c1ce8a6cb9..e3f9b52ed089 100644 --- a/sys/arm/include/_inttypes.h +++ b/sys/arm/include/_inttypes.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/arm/include/_stdint.h b/sys/arm/include/_stdint.h index 2032b7368143..e1803060e51a 100644 --- a/sys/arm/include/_stdint.h +++ b/sys/arm/include/_stdint.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001, 2002 Mike Barcroft * Copyright (c) 2001 The NetBSD Foundation, Inc. diff --git a/sys/arm/include/bus_dma.h b/sys/arm/include/bus_dma.h index d716f4f01a17..a4b59b6ed95d 100644 --- a/sys/arm/include/bus_dma.h +++ b/sys/arm/include/bus_dma.h @@ -1,7 +1,7 @@ /* $NetBSD: bus.h,v 1.11 2003/07/28 17:35:54 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/arm/include/ucontext.h b/sys/arm/include/ucontext.h index 2fdc5b68230b..969327d015d0 100644 --- a/sys/arm/include/ucontext.h +++ b/sys/arm/include/ucontext.h @@ -1,7 +1,7 @@ /* $NetBSD: mcontext.h,v 1.4 2003/10/08 22:43:01 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 1c893737f8a6..5628aa495593 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -1,7 +1,7 @@ /* $OpenBSD: linux_getcwd.c,v 1.2 2001/05/16 12:50:21 ho Exp $ */ /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 2015 The FreeBSD Foundation diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index 1a9f6cca22e0..0497fb98edb8 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -1,7 +1,7 @@ /* $NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/bhnd/cores/usb/bhnd_ohci.c b/sys/dev/bhnd/cores/usb/bhnd_ohci.c index 07b12a19e176..62ad2d047171 100644 --- a/sys/dev/bhnd/cores/usb/bhnd_ohci.c +++ b/sys/dev/bhnd/cores/usb/bhnd_ohci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 2010, Aleksandr Rybalko diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index f7d9dc641118..3c80e7b2e705 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1995, David Greenman * Copyright (c) 2001 Jonathan Lemon diff --git a/sys/dev/fxp/if_fxpreg.h b/sys/dev/fxp/if_fxpreg.h index 6b5f3d8b40a7..cf4e4277b73d 100644 --- a/sys/dev/fxp/if_fxpreg.h +++ b/sys/dev/fxp/if_fxpreg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1995, David Greenman * Copyright (c) 2001 Jonathan Lemon diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c index a976cb739b63..c05542ba69e9 100644 --- a/sys/dev/gem/if_gem.c +++ b/sys/dev/gem/if_gem.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2001 Eduardo Horvath. * Copyright (c) 2001-2003 Thomas Moestl diff --git a/sys/dev/gem/if_gem_pci.c b/sys/dev/gem/if_gem_pci.c index 17ad97fd886f..c910ee3cb574 100644 --- a/sys/dev/gem/if_gem_pci.c +++ b/sys/dev/gem/if_gem_pci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause-NetBSD + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (C) 2001 Eduardo Horvath. * Copyright (c) 2007 Marius Strobl diff --git a/sys/dev/gem/if_gemreg.h b/sys/dev/gem/if_gemreg.h index aaf5f8b11ef0..9ffe3bf96b49 100644 --- a/sys/dev/gem/if_gemreg.h +++ b/sys/dev/gem/if_gemreg.h @@ -1,5 +1,5 @@ *** 1862 LINES SKIPPED *** From nobody Fri May 12 16:44:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvkb0TbTz4BDJq; Fri, 12 May 2023 16:44: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 4QHvkZ6M0Zz4NjC; Fri, 12 May 2023 16:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2rr//0Nl9wsjr6atFjw4IHRytaOaxGUts9Cr/D6N8u0=; b=Z2/vHp4lFCzhi8UjogUVNMw1X8WKPq0sk6XOWtXpvo8GSXCMxUtb2ORyG9JfyusLyvA5Fi YeYsFB7faqdL6S1sleFDS5AgcpXUUkmLmSV0z/XmA+vH+yFInWMnzFeCeH3mll1yOxZgnh WsrdlWZTRjCHh3GFbueMo4IQZFm5NwtbhryfbKLp4dIkbh/+w8C9N6C8jazlQBVNF9Sw9A lPVxm8uKft+mMUl88p+j/TwR+IQ1t0AtDdOzQzZV6fhUKPOVk/cgAqWQJyDVQnfBm21Fs/ nRQRl5rgGNqtqWiQcvQHnwEkaIom2yBaenqw3SNy1IwQUrc8yuGieM8gYSRU3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2rr//0Nl9wsjr6atFjw4IHRytaOaxGUts9Cr/D6N8u0=; b=uL+LZbI2Le+jU0y2zIX1YNU/TxYSTGPKqoYbLhanJMZTivJdkXnOjJzPzr6V+bg84Z0aRN sqKxptRnaUDTWAGCzSFWFd0+pkSEMuCJbaq6LRJ95kUCSr8j4oDlCOr2R01+ZF/VhNjYxt 3eyniCDmxzitDw8e6qi90t/KwIx0wOzdo8MI8sy/odOL4cR5SNVFplXz80keitlb3uu3gx oWLzdnNKhU3zIu+u0FQBdHOG0Mefhk4v8VCoe6SM47CepYJ/VmV/0UvOjtQG5j7CObGUIM LUg7qDBzP3zbrIjPdUM44MQQ0kE2MdkWtGz1YOkgniMs4uuv2p+TcieFMBX1gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683909894; a=rsa-sha256; cv=none; b=tR2wMJFL5fzyq4T/83lk07Uj4zedQns+KSM0zrn+PVBHAEwu7RJrDDwlu3SuJzY3fIcZDu IWnZIcJ9OaIfVeTm5LXY8nVL5e27J5D8saGiYm/yTyHo5VFlkuKML3w6QdUfLDtzVIgkJT 3RJHoFGTNHD933UNZk+3ZnLBn0j/65e52mS4sS2KwDSOw7WfsIynZah/RULri29JBp+YcQ TXjhxnDkGF10KzSwgXjZHewdS48uPD8cqL8/musDiikOavYiM5hGRMa3BHSWvfSdEYgBNL Vm9erpLSQuIzzpEhyAl1WKLhSq0DUUVjDfLMN2TkqJ7TVMpiJGhdOBK5w8f2Hg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvkZ5RTgzjSl; Fri, 12 May 2023 16:44: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 34CGisp8062424; Fri, 12 May 2023 16:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGis6t062423; Fri, 12 May 2023 16:44:54 GMT (envelope-from git) Date: Fri, 12 May 2023 16:44:54 GMT Message-Id: <202305121644.34CGis6t062423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: eebd9d53665e - main - spdx: Simplify BSD-2-Clause AND BSD-2-Clause List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eebd9d53665e1b691ffada910b940b37b6f62cc4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eebd9d53665e1b691ffada910b940b37b6f62cc4 commit eebd9d53665e1b691ffada910b940b37b6f62cc4 Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-05-12 16:44:04 +0000 spdx: Simplify BSD-2-Clause AND BSD-2-Clause After removing the -FreeBSD and -NetBSD, we're left with a nuber of BSD-2-Clause AND BSD-2-Clause, so tidy that up. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix --- include/wchar.h | 2 +- sys/arm/freescale/imx/imx51_ccm.c | 2 +- sys/arm/freescale/imx/imx51_ccmreg.h | 2 +- sys/arm/freescale/imx/imx51_ccmvar.h | 2 +- sys/arm/freescale/imx/imx51_dpllreg.h | 2 +- sys/arm/freescale/imx/imx51_ipuv3reg.h | 2 +- sys/arm/freescale/imx/imx51_tzicreg.h | 2 +- sys/dev/iicbus/s35390a.c | 2 +- sys/dev/mfi/mfi.c | 2 +- sys/dev/mfi/mfi_pci.c | 2 +- sys/dev/mfi/mfireg.h | 2 +- sys/dev/mfi/mfivar.h | 2 +- sys/dev/mii/gentbi.c | 2 +- sys/dev/mii/nsphy.c | 2 +- sys/dev/mii/nsphyter.c | 2 +- sys/dev/mii/qsphy.c | 2 +- sys/dev/usb/serial/ubsa.c | 2 +- sys/dev/usb/serial/ubser.c | 2 +- sys/dev/usb/serial/uchcom.c | 2 +- sys/dev/usb/serial/ufoma.c | 2 +- sys/dev/usb/serial/umodem.c | 2 +- sys/dev/usb/serial/uplcom.c | 2 +- sys/dev/usb/serial/usb_serial.c | 2 +- sys/dev/usb/serial/usb_serial.h | 2 +- sys/dev/xl/xlphy.c | 2 +- sys/netgraph/ng_ppp.c | 2 +- sys/netinet/libalias/alias_smedia.c | 2 +- usr.sbin/bhyveload/bhyveload.c | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/wchar.h b/include/wchar.h index 147efb4dbf86..c0cf13c49a9e 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: (BSD-2-Clause AND BSD-2-Clause) + * SPDX-License-Identifier: (BSD-2-Clause) * * Copyright (c)1999 Citrus Project, * All rights reserved. diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c index 38555bba689c..8f52856991f5 100644 --- a/sys/arm/freescale/imx/imx51_ccm.c +++ b/sys/arm/freescale/imx/imx51_ccm.c @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ccm.c,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010, 2011, 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_ccmreg.h b/sys/arm/freescale/imx/imx51_ccmreg.h index 504c6e9ef126..d14289ac4fdb 100644 --- a/sys/arm/freescale/imx/imx51_ccmreg.h +++ b/sys/arm/freescale/imx/imx51_ccmreg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ccmreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_ccmvar.h b/sys/arm/freescale/imx/imx51_ccmvar.h index dc35f1bc7116..b58e78cb2c72 100644 --- a/sys/arm/freescale/imx/imx51_ccmvar.h +++ b/sys/arm/freescale/imx/imx51_ccmvar.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ccmvar.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_dpllreg.h b/sys/arm/freescale/imx/imx51_dpllreg.h index a98f255fb036..ca93934cbc86 100644 --- a/sys/arm/freescale/imx/imx51_dpllreg.h +++ b/sys/arm/freescale/imx/imx51_dpllreg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_dpllreg.h,v 1.1 2012/04/17 09:33:31 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_ipuv3reg.h b/sys/arm/freescale/imx/imx51_ipuv3reg.h index 16e52e405784..380e879e8f92 100644 --- a/sys/arm/freescale/imx/imx51_ipuv3reg.h +++ b/sys/arm/freescale/imx/imx51_ipuv3reg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_ipuv3reg.h,v 1.1 2012/04/17 10:19:57 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011, 2012 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/arm/freescale/imx/imx51_tzicreg.h b/sys/arm/freescale/imx/imx51_tzicreg.h index 3311dfffb3d5..ac36f2c5277f 100644 --- a/sys/arm/freescale/imx/imx51_tzicreg.h +++ b/sys/arm/freescale/imx/imx51_tzicreg.h @@ -1,6 +1,6 @@ /* $NetBSD: imx51_tzicreg.h,v 1.1 2010/11/13 07:11:03 bsh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2010 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. diff --git a/sys/dev/iicbus/s35390a.c b/sys/dev/iicbus/s35390a.c index c6df70acfc67..c282ca034b3a 100644 --- a/sys/dev/iicbus/s35390a.c +++ b/sys/dev/iicbus/s35390a.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2012 Yusuke Tanaka * All rights reserved. diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c index d5c6d7257202..a69fc5b2ac81 100644 --- a/sys/dev/mfi/mfi.c +++ b/sys/dev/mfi/mfi.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mfi/mfi_pci.c b/sys/dev/mfi/mfi_pci.c index 0de7ab759d6e..6dfba2c916d9 100644 --- a/sys/dev/mfi/mfi_pci.c +++ b/sys/dev/mfi/mfi_pci.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mfi/mfireg.h b/sys/dev/mfi/mfireg.h index dea3fce664b2..d649cc5aa9cb 100644 --- a/sys/dev/mfi/mfireg.h +++ b/sys/dev/mfi/mfireg.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mfi/mfivar.h b/sys/dev/mfi/mfivar.h index 72658d8a8aad..a3bb9a1bfdff 100644 --- a/sys/dev/mfi/mfivar.h +++ b/sys/dev/mfi/mfivar.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2006 IronPort Systems * All rights reserved. diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c index fcec0e9ede58..702012108283 100644 --- a/sys/dev/mii/gentbi.c +++ b/sys/dev/mii/gentbi.c @@ -1,7 +1,7 @@ /* $NetBSD: gentbi.c,v 1.15 2006/03/29 07:05:24 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c index 2eb26f615d4a..c0841369e524 100644 --- a/sys/dev/mii/nsphy.c +++ b/sys/dev/mii/nsphy.c @@ -1,7 +1,7 @@ /* $NetBSD: nsphy.c,v 1.18 1999/07/14 23:57:36 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c index 7fbb284163d1..887097c25ba1 100644 --- a/sys/dev/mii/nsphyter.c +++ b/sys/dev/mii/nsphyter.c @@ -1,7 +1,7 @@ /* $NetBSD: nsphyter.c,v 1.28 2008/01/20 07:58:19 msaitoh Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c index aa6a6e503adf..544ac8117c75 100644 --- a/sys/dev/mii/qsphy.c +++ b/sys/dev/mii/qsphy.c @@ -2,7 +2,7 @@ /* NetBSD: qsphy.c,v 1.19 2000/02/02 23:34:57 thorpej Exp */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/dev/usb/serial/ubsa.c b/sys/dev/usb/serial/ubsa.c index 3871beda091d..8c741ca07a16 100644 --- a/sys/dev/usb/serial/ubsa.c +++ b/sys/dev/usb/serial/ubsa.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2002, Alexander Kabaev . * All rights reserved. diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c index 3005342ad3e4..7365d4d615b7 100644 --- a/sys/dev/usb/serial/ubser.c +++ b/sys/dev/usb/serial/ubser.c @@ -8,7 +8,7 @@ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2002, Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/usb/serial/uchcom.c b/sys/dev/usb/serial/uchcom.c index 9b73ba8c4324..146022369139 100644 --- a/sys/dev/usb/serial/uchcom.c +++ b/sys/dev/usb/serial/uchcom.c @@ -1,7 +1,7 @@ /* $NetBSD: uchcom.c,v 1.1 2007/09/03 17:57:37 tshiozak Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2007, Takanori Watanabe * All rights reserved. diff --git a/sys/dev/usb/serial/ufoma.c b/sys/dev/usb/serial/ufoma.c index 8ed0381149ee..ba37de30544f 100644 --- a/sys/dev/usb/serial/ufoma.c +++ b/sys/dev/usb/serial/ufoma.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); #define UFOMA_HANDSFREE /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2005, Takanori Watanabe All rights reserved. * Copyright (c) 2003 M. Warner Losh diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c index e5131f21373b..8b8b36ec6c4a 100644 --- a/sys/dev/usb/serial/umodem.c +++ b/sys/dev/usb/serial/umodem.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2003 M. Warner Losh * diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c index b28d105eab12..96d3d036befa 100644 --- a/sys/dev/usb/serial/uplcom.c +++ b/sys/dev/usb/serial/uplcom.c @@ -4,7 +4,7 @@ __FBSDID("$FreeBSD$"); /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2003, 2005 Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index a6775be62c12..6179f69705ff 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -1,7 +1,7 @@ /* $NetBSD: ucom.c,v 1.40 2001/11/13 06:24:54 lukem Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2003, 2005, 2008 * Shunsuke Akiyama . diff --git a/sys/dev/usb/serial/usb_serial.h b/sys/dev/usb/serial/usb_serial.h index 306eb035c8cd..b2ec25141800 100644 --- a/sys/dev/usb/serial/usb_serial.h +++ b/sys/dev/usb/serial/usb_serial.h @@ -2,7 +2,7 @@ /* $FreeBSD$ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2001-2002, Shunsuke Akiyama . * All rights reserved. diff --git a/sys/dev/xl/xlphy.c b/sys/dev/xl/xlphy.c index 0abfc09e4baf..6fb622933d58 100644 --- a/sys/dev/xl/xlphy.c +++ b/sys/dev/xl/xlphy.c @@ -1,7 +1,7 @@ /* $NetBSD: exphy.c,v 1.16 1999/04/23 04:24:32 thorpej Exp $ */ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. * All rights reserved. diff --git a/sys/netgraph/ng_ppp.c b/sys/netgraph/ng_ppp.c index 866560c9c7c9..bcacf7f3220a 100644 --- a/sys/netgraph/ng_ppp.c +++ b/sys/netgraph/ng_ppp.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1996-2000 Whistle Communications, Inc. * All rights reserved. diff --git a/sys/netinet/libalias/alias_smedia.c b/sys/netinet/libalias/alias_smedia.c index e7a15afebc6d..a591bc079dc5 100644 --- a/sys/netinet/libalias/alias_smedia.c +++ b/sys/netinet/libalias/alias_smedia.c @@ -1,7 +1,7 @@ /*- * alias_smedia.c * - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000 Whistle Communications, Inc. * All rights reserved. diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c index d25715310cc7..d996a7a577a8 100644 --- a/usr.sbin/bhyveload/bhyveload.c +++ b/usr.sbin/bhyveload/bhyveload.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-2-Clause AND BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2011 NetApp, Inc. * All rights reserved. From nobody Fri May 12 16:44:55 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvkc21Nyz4BDTt; Fri, 12 May 2023 16:44: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 4QHvkc0gWPz4Nd7; Fri, 12 May 2023 16:44:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onnUk6QEvCfasH8zPU+LiQyfTdJxRjaEIfo+9vMvPWw=; b=gf0CnHxTci3jT3G3TV6sN66OFiVwOd2Beo7DWT5xh67FLoUN5yH+ByjhloKbQZ94znv3qF hkCS/6ciV9IkB1XSqn0ZQtl5ddzSGbi6nQ3SqKDwpO5J+6JN+EoM8XIv47Pl/0oA5jzWoX HRaW7hJF6500WqH1kbTN6UWVHJ7k49zRSTHa01hWOZy16FFsIVolKGd4OT7iLs9wGs4zGa SdUH7ZfRpvTj85obs8Pq7Yjon/3GcP61cQjtQLa9TZWsFD1y479ea26xDLfRu9B8i4D+lw U2ahlYNuyrbXQu802CqdLaeIY1spxkOg2Bvg0UNd4oHeeCRN/LEU2IBlZnh/MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onnUk6QEvCfasH8zPU+LiQyfTdJxRjaEIfo+9vMvPWw=; b=QVIhmL7i2FODLCFIgxy7p+Mp7q+QVg/20cF/+S0hNBIGl+XtZSQ2tU8Y4y2ewgmZoCRGWN QV9oUa1AEPiqMQRZJptSBLfU0gL5xgWvPopTDsCzzw+1a7bY6+Oyhj4EeC6PgC2Svg021U O2DxEUOuIBmF9mNVuS9zo5J49u4GD19quujgZrPmEEqSQ2GNnI1ad2GtIOYLKEMektBQqo CuBTPo16tTeJD+7iZyS1QvJ0vPrWA+gwiGPaqvAUz6eS624alnSAmtwy1EHy+q1cNCGKgQ vqyCc6WmOfSwjqklpdLAeEl5dzX40RnOExHtkgt5K2nODYj8/gXb5VafyrR4Kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683909896; a=rsa-sha256; cv=none; b=DjwYa3zRlwgvg5c6NbPPGluYxVBAXUFdVSTgnk1FfWrzjPWxgcb5DGhloHJWjEuduYAm/J VDTuiIXkJ2d7kRyu9z2CIuurv3HdwkWHeEFK4AWCtpxAnlg0JWr2mtczFJVPQ+vpqSweq6 45i940PYCAgFd3BpkYgIIS3AqaOG81zEUwS182gnfREkrEg0TbkOfBFwyzamsW39QwTgI4 QfecRdLeetb+Z2OftA+ccZr5Jlrb+wpvv19qxu0tUEf5W8lIiWMbsb9ZGy+Gxdx3U5IVlc KAfrfMHKim8ljJLviBZt8nnaGckdY+xPhD6VSMstzQm9Obi5+XtHRnD4vP/m6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvkb6LvzzjSm; Fri, 12 May 2023 16:44: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 34CGitSI062443; Fri, 12 May 2023 16:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGit7f062442; Fri, 12 May 2023 16:44:55 GMT (envelope-from git) Date: Fri, 12 May 2023 16:44:55 GMT Message-Id: <202305121644.34CGit7f062442@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ecfb43cb4198 - main - SPDX: It's spelled 'SPDX-License-Identifier' List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ecfb43cb419808a5e2f802f780cba66a49f473b7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ecfb43cb419808a5e2f802f780cba66a49f473b7 commit ecfb43cb419808a5e2f802f780cba66a49f473b7 Author: Warner Losh AuthorDate: 2023-05-11 16:03:59 +0000 Commit: Warner Losh CommitDate: 2023-05-12 16:44:04 +0000 SPDX: It's spelled 'SPDX-License-Identifier' Sponsored by: Netflix --- sys/netgraph/ng_vlan_rotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netgraph/ng_vlan_rotate.c b/sys/netgraph/ng_vlan_rotate.c index a9added7fb6d..cbc55e6f7a84 100644 --- a/sys/netgraph/ng_vlan_rotate.c +++ b/sys/netgraph/ng_vlan_rotate.c @@ -1,5 +1,5 @@ /*- - * Spdx-License-Identifier: BSD-2-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2019-2021 IKS Service GmbH * From nobody Fri May 12 16:44:56 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvkd2HQfz4BDRT; Fri, 12 May 2023 16:44: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 4QHvkd0z9Zz4Nqx; Fri, 12 May 2023 16:44:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tJChAloYqvXbmj9e4EYyXQPRA9FnnO/DCc5NDCnfBE=; b=euIZ1HxxGqy9JTpjA3gJRzJ7hWDKA0fLHBEl6EI93HwJ/LBtCguj3dLsAIL0+9eOcoZ+Fw VmPNtdJA/PXPxbHJSWzEOOG677ZtSfqL8MSvb7vjQW8JdFQbMzG+1DcUrN+tQ2JNeAaADs c+8/N95gUggGSvVt73uc916guwig00nx5TELRXsYmy8MX3GZqqftNrmDA2WyWiG1J8Af4d uZzkg5Us9f8ZkMVhZnZDF374LGDuOGGV0E8gW8n99JFnlvai7FEISZphN5XAr51cnddMNt I0YATK5rIbkbFwAnJY17gYCzUHfYV/a6uFjNXyWCSFt9VI2pi080LEgb5YGCCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683909897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0tJChAloYqvXbmj9e4EYyXQPRA9FnnO/DCc5NDCnfBE=; b=hsPFnDKcw9tufJAEgGx0RlmNkXMbg3gOO4bpUjRLNV51c3tIi1dhe0mjk5y5CTP115Xvhz ZIfGBPTk74sqra6oqq00kyDfIp4jYUQbHxfmaLSsxRL6wB8p8J/ZZyrDrwKNgJXC8D5vhk kSLfFHICN/UN8rtNQpX6+xIoaw00WVkBQ4LFQypPdj5nJ+9f1g0TtaMjng8PuK8USzyfGx Y3t3rWtUSCX/I3CytsLKE2KnrAAevlnUwSKnn/8XpI7FlpvXGNbMcbENV9xDhn0Vf1+Wss NyeCin7LU8JCa/Wvzy9zd53ML+AVCX91lgUNpf/Db+Z+bFMmkRStZtMsoLfKfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683909897; a=rsa-sha256; cv=none; b=PEiGhYyHpayU+ff2uNXHVz/UX+JvLNBlfBq/27Fl7bIWOt727/MfbidzkTs9v6xf5guYPK zxF8HJQu7TjKTO7HhErDPWsAs4BAFgNcgeRplYDncZ1AIWrYL22J/AL3TiPf+agyTffpHW DSxYzk/iBXVWerG3ww8whsdOE9OmvFUbGgJYMNgEQNOltLgtuamjW1y0h+HSRP5eDWM0pr 3eXaFOLt9Ww0eKE01fu5uYENDs/B97RKb64fFBSWF8XrxQqC2ucSMY53YxX7T09MdHv4WJ 40FUtyjwp8nhQu2TleioGHNVEO7muhWvKp3DdOuAo13ZI9E9dIP0O8OXcfpdJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvkc6tvVzjSn; Fri, 12 May 2023 16:44: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 34CGiu2D062464; Fri, 12 May 2023 16:44:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGiujN062463; Fri, 12 May 2023 16:44:56 GMT (envelope-from git) Date: Fri, 12 May 2023 16:44:56 GMT Message-Id: <202305121644.34CGiujN062463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: eb8f887758f3 - main - spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb8f887758f31f605829c995ce71a627dec0838a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8f887758f31f605829c995ce71a627dec0838a commit eb8f887758f31f605829c995ce71a627dec0838a Author: Warner Losh AuthorDate: 2023-05-10 15:40:58 +0000 Commit: Warner Losh CommitDate: 2023-05-12 16:44:04 +0000 spdx: The BSD-3-Clause-FreeBSD identifier never was, drop -FreeBSD There never was a BSD-3-Clause-FreeBSD SPDX identifier. Replace it with BSD-3-Clause. Discussed with: pfg MFC After: 3 days Sponsored by: Netflix --- lib/libgeom/geom_getxml.c | 2 +- lib/libgeom/geom_stats.c | 2 +- lib/libgeom/geom_xml2tree.c | 2 +- lib/libgeom/libgeom.h | 2 +- sbin/fsck_ffs/ea.c | 2 +- usr.sbin/gstat/gstat.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libgeom/geom_getxml.c b/lib/libgeom/geom_getxml.c index a6bb130fd5a7..a46a58328373 100644 --- a/lib/libgeom/geom_getxml.c +++ b/lib/libgeom/geom_getxml.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/geom_stats.c b/lib/libgeom/geom_stats.c index e8e2969e835f..80a29cb9148e 100644 --- a/lib/libgeom/geom_stats.c +++ b/lib/libgeom/geom_stats.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/geom_xml2tree.c b/lib/libgeom/geom_xml2tree.c index 52d21790101e..d75b8e53bcd0 100644 --- a/lib/libgeom/geom_xml2tree.c +++ b/lib/libgeom/geom_xml2tree.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/lib/libgeom/libgeom.h b/lib/libgeom/libgeom.h index 339a8d34729f..86d22b125287 100644 --- a/lib/libgeom/libgeom.h +++ b/lib/libgeom/libgeom.h @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c index f46d883e12ad..c64fb20ee9e8 100644 --- a/sbin/fsck_ffs/ea.c +++ b/sbin/fsck_ffs/ea.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2002 Poul-Henning Kamp * Copyright (c) 2002 Networks Associates Technology, Inc. diff --git a/usr.sbin/gstat/gstat.c b/usr.sbin/gstat/gstat.c index 65388c3002ff..cd44c740a3b4 100644 --- a/usr.sbin/gstat/gstat.c +++ b/usr.sbin/gstat/gstat.c @@ -1,5 +1,5 @@ /*- - * SPDX-License-Identifier: BSD-3-Clause-FreeBSD + * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2003 Poul-Henning Kamp * All rights reserved. From nobody Fri May 12 16:50:20 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHvrs2B1nz4BDdb; Fri, 12 May 2023 16:50: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 4QHvrs1K49z4R0t; Fri, 12 May 2023 16:50:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683910221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4VJiyVISIpEPn/JgYfvVE/De+s0aWPmNdgnzpcpvmI=; b=M0Yuh6+lx6jiKltSKZu4VI8U6pCBY1Rghyukj1gijukYsB4oqqP5Fte3LEy41U7N0/Kfgd E1HLev0vhFotG2Z0ayFtUHK0VXtZDWZxJ02nQtzezEjza0wC4TjeZGorVONq7QMwzWiHl5 c3ZxsDAlknrr9Ih43u24LVnaS39FH+PsA3VC/P9bfqgu9xVfLXpecdPaQDjgkjMd3jkzdN s0qCaWWr47uNCrZJ7kalP1qSgCvEXPQ+G9Cfyo8O8Wb/ajDLrLfnucv2Nj7pHqeXa/Y0tG MP858qH0SSfvVmldtJz1BOmPAFaNSwfwlc9LvNe26ZVsfBWH/0QjYcBVEX0lqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683910221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q4VJiyVISIpEPn/JgYfvVE/De+s0aWPmNdgnzpcpvmI=; b=eGd5Ak0T5/Xi53OWYg95biEV8sV6hO5wCjaD3FOohNaZyolfJfze5eSH01Pnm7CaYNqq5A IZcsM3NhBSC5y3VSrsz602lydCFpELM4HJn45+FirRQvK8HpJy7/VMLfC7tQHZ7OR3kr0n 17AkqbzZ2BkdtH3Ga50hz7s+pve5W4yqZW0vg9qO1TYo+ylHloCRJU7b8JkP/gjzTmfLsE BQ/2CJ23oNlpy+Vtl8YVrpuUmQfEjPl7YuPkqC2St5LM596iPNceUt5Qpiu6X9YMXJqf61 W95hZKCHeRDXrJrfG+QlXKsghtvFlleNrBb6/vSHWBhYLSM00bEXDh6PaqhxzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683910221; a=rsa-sha256; cv=none; b=lt9CAGJAsYYuWANZmDgn4FA2GWshr1o0jTTHGNgCQBI//A76ovcKYXi8f22E441q1LpHxD nNKjSRBmdTUzn10IWkzKcOqm5b4JaV+ZUwE2bLMkZn+bKHNjZCYmPEZZpIiNr1EXb78L+K wjdp/+BMyJ+2BoIVHPlj9nRqHRD85ik25ARRX+URNjHGBd6xwf7K5buRsqKCzc1SxEcLwG S6jcM2j4e6iTDoCkjTGLXZX1zSc6A/SPG0miZjA8LPhvNXUnm4pomcGeNFx5J898/y8NHL +dgdBMr/z1Aqg2kDvxGc4jednDf9+33e8xS4uM4/GkPcU1+hyQKKk2gFrrDL0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHvrs0LbVzj7l; Fri, 12 May 2023 16:50: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 34CGoKXZ071677; Fri, 12 May 2023 16:50:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGoKmV071676; Fri, 12 May 2023 16:50:20 GMT (envelope-from git) Date: Fri, 12 May 2023 16:50:20 GMT Message-Id: <202305121650.34CGoKmV071676@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 722cfce5f494 - main - Fix typo and use .Fx in WITH_DIRDEPS_BUILD List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 722cfce5f4943d0d3853d1438f886ba8ffe867b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=722cfce5f4943d0d3853d1438f886ba8ffe867b0 commit 722cfce5f4943d0d3853d1438f886ba8ffe867b0 Author: Simon J. Gerraty AuthorDate: 2023-05-12 16:49:03 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-12 16:49:21 +0000 Fix typo and use .Fx in WITH_DIRDEPS_BUILD --- tools/build/options/WITH_DIRDEPS_BUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/build/options/WITH_DIRDEPS_BUILD b/tools/build/options/WITH_DIRDEPS_BUILD index 98d3f6c44b1a..b4e13b78493a 100644 --- a/tools/build/options/WITH_DIRDEPS_BUILD +++ b/tools/build/options/WITH_DIRDEPS_BUILD @@ -36,6 +36,8 @@ Note that there is currently no mass install feature for this. This build is designed for producing packages, that can then be installed on a target system. .Pp -The implementation in FreeBSD is incomplete. -Competion would require leaf directories for building each kernel +The implementation in +.Fx +is incomplete. +Completion would require leaf directories for building each kernel and package so that their dependencies can be tracked. From nobody Fri May 12 17:25:00 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHwcs4Vctz4BGQP; Fri, 12 May 2023 17:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHwcr4rXDz4Xhf; Fri, 12 May 2023 17:25:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683912300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y/CgcOcos2iJoU0lZeWMIHKvMgw7eWojl29Oclr+wyw=; b=Oumpv65VoLM6FGlPjmEXayhohXSrJZ0lh9b3g+GlCD1dNwsymnvU6pjpkgFBWHV99YHTIu 1u1jiyEmhdwGMssPkmPr4dHBx0Yy4Fz5dTdJopGRTrHmLbiuorevY/Hfvfy9p87XM7vDMz GWeUylv1urA8njmYTXltXo3WhxL+52Yih+xl3jI/SZZncpYBykYDlGH8y0UwampAcdswhS PobcL+eIGhlgxUuUuiUWZdPEnwECn6R27oefFg7hzjTEII6ytRf4ai+qyoLu7BzS/CJZDF 9r92uC1QaVa44FuPVeAGijXGeMsGALdHg55X3qVXt3bA15u4Kdb+GzHzXeYgJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683912300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y/CgcOcos2iJoU0lZeWMIHKvMgw7eWojl29Oclr+wyw=; b=madmI8mtPoKNJFXnhF7GGwMdu0mB3h92cY9L7effQZrLBHyl3wNhD9fLnCl0nZ+ZSZbN6Q vWf1M2J8rGGgIhBrET5ExlyqPvPmxExHnKQ+VYKiwkO3GKD9R9n9dPDl+bMPrgMuxeAc7h pVuF64CiuZE0dt/CVvA4hU87uQRnHyxRLgGVIyvYDxHEGefIIkTxWE7oj0oItGbPQHQg9V cYlNIEYqUQWJxGYgeIsC3GM5ykzU9KIERxHO/igVW1i94ds3vZgawjD+kYs8ox8256Fc4N vvKzfQKHsMymxg3CsokG/vnK+xJcZbEEj4ia2Ou8WHfqFIoiDEvm0vWe/HisQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683912300; a=rsa-sha256; cv=none; b=S+vgLIYP0JbWTM9UOng8HT+ZbTc54JvuVlKQYmoFLcM8gwqeGaqXY9WxFhpmccbMChBF5k whoVrTN2yqSWeolBHa9B69Jhv4DKBd9HMaA0e7x/2HfhDrvW834wGyXEDMfs0TcJr6XDrd IQEtQOS0L9/LEuQw8ne3X7XbSgNOQTbtvzsczXq/7B0Yx9Q1I7AhUBC3WdpsujJywRBDcW u+R8DTWT7hWAKiIzTR9CGPpnZYbTUpWSu5T1a8xAJBWqdTFfUwA8RxIIAEvandRW9PKVtQ hc1Oqg+yIT6g+jLLILMlndKvRqr30C4XHvFz+Smebwjvoyv2pulZoyCPLH+PGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHwcr3jrVzkLK; Fri, 12 May 2023 17:25: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 34CHP07Q029076; Fri, 12 May 2023 17:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CHP0gS029075; Fri, 12 May 2023 17:25:00 GMT (envelope-from git) Date: Fri, 12 May 2023 17:25:00 GMT Message-Id: <202305121725.34CHP0gS029075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 48267a0a9263 - main - loader: restore userboot help file List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48267a0a92633a6248d3bf62f5d31aea593c685d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=48267a0a92633a6248d3bf62f5d31aea593c685d commit 48267a0a92633a6248d3bf62f5d31aea593c685d Author: Ed Maste AuthorDate: 2023-05-09 13:19:42 +0000 Commit: Ed Maste CommitDate: 2023-05-12 17:24:48 +0000 loader: restore userboot help file Commit e32fecd0c2c3 intended to skip installing all but one copy of each loader variant's help file, but accidentally skipped all copies for the userboot help file. (Other loaders install help files via the _simp variant, but there is is no userboot_simp.) PR: 271178 Fixes: e32fecd0c2c3 ("loader: install help files only once") Sponsored by: The FreeBSD Foundation --- stand/userboot/userboot_lua/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/stand/userboot/userboot_lua/Makefile b/stand/userboot/userboot_lua/Makefile index bba0f4a3fd71..d5b95c53641b 100644 --- a/stand/userboot/userboot_lua/Makefile +++ b/stand/userboot/userboot_lua/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ LOADER_INTERP=lua -INSTALL_LOADER_HELP_FILE=no .include "../userboot/Makefile" From nobody Fri May 12 22:49:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJ3qr1JdYz4BYHb; Fri, 12 May 2023 22:50: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 4QJ3qr0t41z3k8F; Fri, 12 May 2023 22:50:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683931800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ySWEUc1l3wjgtJ685lGLtvHXjVVWSiF33X0SwGoKo6k=; b=Pk4HrMFiSLpIXuqDKeNAWAEAM70MXC2ubcH1daKGHKNW0NGsrktcAx2ceQJnhyiItcfnXb mrIK2+bl/gWW7J43cENY3S+TYGobRC2rLiRn6fdgfKcHTnXdNLDb2v269m1nUSzzae8ASL TOomK+IzlDVRpcLYyQ6LroTOjW9J7gbatmn81FJxfCs4kbf+kxrg7bdgzy9gaUS+Z3fnH9 Q1PGkORHJumrwM9MK/6kcK3MR1giqbrmPDnM0pi3eLAA5jsYPUfvlcigCJth8BvXzYIX+6 5BAdgaiqSqrGOuJy4Y724XkvLulG4A5RumAUg3Gh5xQjcAXWCbCsVJWrYml+Tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683931800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ySWEUc1l3wjgtJ685lGLtvHXjVVWSiF33X0SwGoKo6k=; b=ORo7KMtTjC+0YdxCqwMPGNcXGqzbg+/J/Kmr0h6FasMG9K/R/kOuL0MzNZE3uaSiT0Pikr sylZ1tgzjlYZJGuycQXF+bpHBIQJO7KVugytp6QCW1IwXp7Oxv1ACRZH6mszka22P6Od3z rtThcWOBC3vu4C+vQuv2po5kc1a/gdKuSXGxdBFzn66MbvS6S1AkS+efxFIzYEX2s4AXSj MCjSY6CzV0cqdEbpy+S68QVCiudCirJPaoEr4RDyHvN1Ez9OhRywZTUxW+FpUlmAkl2hse h1daCWJMcv1aefhlJzEljf8Ga7dZK5OFkS0H5zL/kiIcrspRT+yJ2VziFDELig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683931800; a=rsa-sha256; cv=none; b=IO3WDJKVWguTiEL1y6zDkYYFHOK8scm5AiYrPQH7PI/22jMVydk//GSPk65Y/cmRraaDM2 n6+d2UefIWEHkP1fubXxAyGmeoHWINbTHCVuVMxv2OLm91D14onLK498PE3vPhutNlOjgD z0ep9JUF+3Tciz/6mu2+6LiEZxyO82yT0Rtuh1a2LslX6QK/T5scSU8Xxru+VRu0MKBMKP 4z9xNoO6hkcVoNyNnEDmB6THO+zbKokpOqQUG8LZvSllwA8meKkUrn2GsZE9MshQ0NqaK9 Xjg5XSDtPWyLl8d+y3s8cRySqZ0t2htWuSsoM1gscRi7RUX8gOBP1UyvI4Ds5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJ3qq70YWztHy; Fri, 12 May 2023 22:49: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 34CMnxYr055567; Fri, 12 May 2023 22:49:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CMnv3O055554; Fri, 12 May 2023 22:49:57 GMT (envelope-from git) Date: Fri, 12 May 2023 22:49:57 GMT Message-Id: <202305122249.34CMnv3O055554@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: b333cd44de6d - main - MFV: xz 5.4.3. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b333cd44de6db4d3182add2f80870c7a96d570d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=b333cd44de6db4d3182add2f80870c7a96d570d9 commit b333cd44de6db4d3182add2f80870c7a96d570d9 Merge: 48267a0a9263 ca6c9caa17b3 Author: Xin LI AuthorDate: 2023-05-12 22:49:34 +0000 Commit: Xin LI CommitDate: 2023-05-12 22:49:34 +0000 MFV: xz 5.4.3. Relnotes: yes MFC-after: 2 weeks contrib/xz/ChangeLog | 267 ++++++++++++++++++++++++++ contrib/xz/THANKS | 2 + contrib/xz/src/common/tuklib_integer.h | 12 +- contrib/xz/src/liblzma/api/lzma.h | 2 +- contrib/xz/src/liblzma/api/lzma/version.h | 2 +- contrib/xz/src/liblzma/common/alone_encoder.c | 11 -- contrib/xz/src/liblzma/common/memcmplen.h | 13 +- lib/liblzma/config.h | 6 +- 8 files changed, 295 insertions(+), 20 deletions(-) diff --cc lib/liblzma/config.h index cd5576aed027,000000000000..e0ff56d43a56 mode 100644,000000..100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@@ -1,618 -1,0 +1,618 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* How many MiB of RAM to assume if the real amount cannot be determined. */ +#define ASSUME_RAM 128 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* FreeBSD - disabled intentionally */ +/* #undef ENABLE_NLS */ + +/* Define to 1 if bswap_16 is available. */ +/* #undef HAVE_BSWAP_16 */ + +/* Define to 1 if bswap_32 is available. */ +/* #undef HAVE_BSWAP_32 */ + +/* Define to 1 if bswap_64 is available. */ +/* #undef HAVE_BSWAP_64 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if Capsicum is available. */ +#define HAVE_CAPSICUM 1 +#endif + +/* Define to 1 if the system has the type `CC_SHA256_CTX'. */ +/* #undef HAVE_CC_SHA256_CTX */ + +/* Define to 1 if you have the `CC_SHA256_Init' function. */ +/* #undef HAVE_CC_SHA256_INIT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* Define to 1 if crc32 integrity check is enabled. */ +#define HAVE_CHECK_CRC32 1 + +/* Define to 1 if crc64 integrity check is enabled. */ +#define HAVE_CHECK_CRC64 1 + +/* Define to 1 if sha256 integrity check is enabled. */ +#define HAVE_CHECK_SHA256 1 + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define to 1 if `CLOCK_MONOTONIC' is declared in . */ +#define HAVE_CLOCK_MONOTONIC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if any of HAVE_DECODER_foo have been defined. */ +#define HAVE_DECODERS 1 + +/* Define to 1 if arm decoder is enabled. */ +#define HAVE_DECODER_ARM 1 + +/* Define to 1 if arm64 decoder is enabled. */ +#define HAVE_DECODER_ARM64 1 + +/* Define to 1 if armthumb decoder is enabled. */ +#define HAVE_DECODER_ARMTHUMB 1 + +/* Define to 1 if delta decoder is enabled. */ +#define HAVE_DECODER_DELTA 1 + +/* Define to 1 if ia64 decoder is enabled. */ +#define HAVE_DECODER_IA64 1 + +/* Define to 1 if lzma1 decoder is enabled. */ +#define HAVE_DECODER_LZMA1 1 + +/* Define to 1 if lzma2 decoder is enabled. */ +#define HAVE_DECODER_LZMA2 1 + +/* Define to 1 if powerpc decoder is enabled. */ +#define HAVE_DECODER_POWERPC 1 + +/* Define to 1 if sparc decoder is enabled. */ +#define HAVE_DECODER_SPARC 1 + +/* Define to 1 if x86 decoder is enabled. */ +#define HAVE_DECODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ +#define HAVE_ENCODERS 1 + +/* Define to 1 if arm encoder is enabled. */ +#define HAVE_ENCODER_ARM 1 + +/* Define to 1 if arm64 encoder is enabled. */ +#define HAVE_ENCODER_ARM64 1 + +/* Define to 1 if armthumb encoder is enabled. */ +#define HAVE_ENCODER_ARMTHUMB 1 + +/* Define to 1 if delta encoder is enabled. */ +#define HAVE_ENCODER_DELTA 1 + +/* Define to 1 if ia64 encoder is enabled. */ +#define HAVE_ENCODER_IA64 1 + +/* Define to 1 if lzma1 encoder is enabled. */ +#define HAVE_ENCODER_LZMA1 1 + +/* Define to 1 if lzma2 encoder is enabled. */ +#define HAVE_ENCODER_LZMA2 1 + +/* Define to 1 if powerpc encoder is enabled. */ +#define HAVE_ENCODER_POWERPC 1 + +/* Define to 1 if sparc encoder is enabled. */ +#define HAVE_ENCODER_SPARC 1 + +/* Define to 1 if x86 encoder is enabled. */ +#define HAVE_ENCODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if __attribute__((__constructor__)) is supported for functions. + */ +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1 + +/* Define to 1 if you have the `futimens' function. */ +#define HAVE_FUTIMENS 1 + +/* Define to 1 if you have the `futimes' function. */ +/* #undef HAVE_FUTIMES */ + +/* Define to 1 if you have the `futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ + +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + +/* Define to 1 if you have the `getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_GETTEXT */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +/* FreeBSD - only with clang because the base gcc does not support it */ +#if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_IMMINTRIN_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if .lz (lzip) decompression support is enabled. */ +#define HAVE_LZIP_DECODER 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 to enable bt2 match finder. */ +#define HAVE_MF_BT2 1 + +/* Define to 1 to enable bt3 match finder. */ +#define HAVE_MF_BT3 1 + +/* Define to 1 to enable bt4 match finder. */ +#define HAVE_MF_BT4 1 + +/* Define to 1 to enable hc3 match finder. */ +#define HAVE_MF_HC3 1 + +/* Define to 1 to enable hc4 match finder. */ +#define HAVE_MF_HC4 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if getopt.h declares extern int optreset. */ +#define HAVE_OPTRESET 1 + +/* Define to 1 if you have the `pledge' function. */ +/* #undef HAVE_PLEDGE */ + +/* Define to 1 if you have the `posix_fadvise' function. */ +#define HAVE_POSIX_FADVISE 1 + +/* Define to 1 if `program_invocation_name' is declared in . */ +/* #undef HAVE_PROGRAM_INVOCATION_NAME */ + +/* Define to 1 if you have the `pthread_condattr_setclock' function. */ +#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + +/* Define to 1 if you have the `SHA256Init' function. */ +/* #undef HAVE_SHA256INIT */ + +/* Define to 1 if the system has the type `SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SHA256_H 1 + +/* Define to 1 if you have the `SHA256_Init' function. */ +#define HAVE_SHA256_INIT 1 + +/* Define to 1 if the system has the type `SHA2_CTX'. */ +/* #undef HAVE_SHA2_CTX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SHA2_H */ + +/* Define to 1 if optimizing for size. */ +/* #undef HAVE_SMALL */ + +/* Define to 1 if stdbool.h conforms to C99. */ +#define HAVE_STDBOOL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if `st_atimensec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMENSEC 1 + +/* Define to 1 if `st_atimespec.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC 1 + +/* Define to 1 if `st_atim.st__tim.tv_nsec' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC */ + +/* Define to 1 if `st_atim.tv_nsec' is a member of `struct stat'. */ +#define HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC 1 + +/* Define to 1 if `st_uatime' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_UATIME */ + +/* Define to 1 to if GNU/Linux-specific details are unconditionally wanted for + symbol versioning. Define to 2 to if these are wanted only if also PIC is + defined (allows building both shared and static liblzma at the same time + with Libtool if neither --with-pic nor --without-pic is used). This define + must be used together with liblzma_linux.map. */ +/* #undef HAVE_SYMBOL_VERSIONS_LINUX */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_BYTEORDER_H */ + +#ifndef WITHOUT_CAPSICUM +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CAPSICUM_H 1 +#endif + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_ENDIAN_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if the system has the type `uintptr_t'. */ +#define HAVE_UINTPTR_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if _mm_set_epi64x and _mm_clmulepi64_si128 are usable. See + configure.ac for details. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_USABLE_CLMUL 1 +#endif + +/* Define to 1 if you have the `utime' function. */ +/* #undef HAVE_UTIME */ + +/* Define to 1 if you have the `utimes' function. */ +/* #undef HAVE_UTIMES */ + +/* Define to 1 or 0, depending whether the compiler supports simple visibility + declarations. */ +#define HAVE_VISIBILITY 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_WCHAR_H 1 + +/* Define to 1 if you have the `wcwidth' function. */ +#define HAVE_WCWIDTH 1 + +/* Define to 1 if the system has the type `_Bool'. */ +#define HAVE__BOOL 1 + +/* Define to 1 if you have the `_futime' function. */ +/* #undef HAVE__FUTIME */ + +/* Define to 1 if _mm_movemask_epi8 is available. */ +#if defined(__FreeBSD__) && defined(__amd64__) +#define HAVE__MM_MOVEMASK_EPI8 1 +#endif + +/* Define to 1 if the GNU C extension __builtin_assume_aligned is supported. + */ +#define HAVE___BUILTIN_ASSUME_ALIGNED 1 + +/* Define to 1 if the GNU C extensions __builtin_bswap16/32/64 are supported. + */ +#define HAVE___BUILTIN_BSWAPXX 1 + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 when using POSIX threads (pthreads). */ +#define MYTHREAD_POSIX 1 + +/* Define to 1 when using Windows Vista compatible threads. This uses features + that are not available on Windows XP. */ +/* #undef MYTHREAD_VISTA */ + +/* Define to 1 when using Windows 95 (and thus XP) compatible threads. This + avoids use of features that were added in Windows Vista. */ +/* #undef MYTHREAD_WIN95 */ + +/* Define to 1 to disable debugging code. */ +#define NDEBUG 1 + +/* Name of package */ +#define PACKAGE "xz" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "xz@tukaani.org" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "XZ Utils" + +/* Define to the full name and version of this package. */ - #define PACKAGE_STRING "XZ Utils 5.4.2" ++#define PACKAGE_STRING "XZ Utils 5.4.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "xz" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "https://tukaani.org/xz/" + +/* Define to the version of this package. */ - #define PACKAGE_VERSION "5.4.2" ++#define PACKAGE_VERSION "5.4.3" + +/* Define to necessary symbol if this constant uses a non-standard name on + your system. */ +/* #undef PTHREAD_CREATE_JOINABLE */ + +/* The size of `size_t', as computed by sizeof. */ +#define SIZEOF_SIZE_T 8 + +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ +#define STDC_HEADERS 1 + +/* Define to 1 if the number of available CPU cores can be detected with + cpuset(2). */ +#define TUKLIB_CPUCORES_CPUSET 1 + +/* Define to 1 if the number of available CPU cores can be detected with + pstat_getdynamic(). */ +/* #undef TUKLIB_CPUCORES_PSTAT_GETDYNAMIC */ + +/* Define to 1 if the number of available CPU cores can be detected with + sched_getaffinity() */ +/* #undef TUKLIB_CPUCORES_SCHED_GETAFFINITY */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysconf(_SC_NPROCESSORS_ONLN) or sysconf(_SC_NPROC_ONLN). */ +/* #undef TUKLIB_CPUCORES_SYSCONF */ + +/* Define to 1 if the number of available CPU cores can be detected with + sysctl(). */ +/* #undef TUKLIB_CPUCORES_SYSCTL */ + +/* Define to 1 if the system supports fast unaligned access to 16-bit, 32-bit, + and 64-bit integers. */ +/* FreeBSD - derive from __NO_STRICT_ALIGNMENT */ +/* #undef TUKLIB_FAST_UNALIGNED_ACCESS */ + +/* Define to 1 if the amount of physical memory can be detected with + _system_configuration.physmem. */ +/* #undef TUKLIB_PHYSMEM_AIX */ + +/* Define to 1 if the amount of physical memory can be detected with + getinvent_r(). */ +/* #undef TUKLIB_PHYSMEM_GETINVENT_R */ + +/* Define to 1 if the amount of physical memory can be detected with + getsysinfo(). */ +/* #undef TUKLIB_PHYSMEM_GETSYSINFO */ + +/* Define to 1 if the amount of physical memory can be detected with + pstat_getstatic(). */ +/* #undef TUKLIB_PHYSMEM_PSTAT_GETSTATIC */ + +/* Define to 1 if the amount of physical memory can be detected with + sysconf(_SC_PAGESIZE) and sysconf(_SC_PHYS_PAGES). */ +#define TUKLIB_PHYSMEM_SYSCONF 1 + +/* Define to 1 if the amount of physical memory can be detected with sysctl(). + */ +/* #undef TUKLIB_PHYSMEM_SYSCTL */ + +/* Define to 1 if the amount of physical memory can be detected with Linux + sysinfo(). */ +/* #undef TUKLIB_PHYSMEM_SYSINFO */ + +/* Define to 1 to use unsafe type punning, e.g. char *x = ...; *(int *)x = + 123; which violates strict aliasing rules and thus is undefined behavior + and might result in broken code. */ +/* #undef TUKLIB_USE_UNSAFE_TYPE_PUNNING */ + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# define _DARWIN_C_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# define _HPUX_ALT_XOPEN_SOCKET_API 1 +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +/* # undef _MINIX */ +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# define _NETBSD_SOURCE 1 +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# define _OPENBSD_SOURCE 1 +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +/* # undef _POSIX_SOURCE */ +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +/* # undef _POSIX_1_SOURCE */ +#endif +/* Enable POSIX-compatible threading on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# define __STDC_WANT_IEC_60559_BFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# define __STDC_WANT_IEC_60559_DFP_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# define __STDC_WANT_IEC_60559_TYPES_EXT__ 1 +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# define __STDC_WANT_LIB_EXT2__ 1 +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# define __STDC_WANT_MATH_SPEC_FUNCS__ 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +/* # undef _XOPEN_SOURCE */ +#endif + + +/* Version number of package */ - #define VERSION "5.4.2" ++#define VERSION "5.4.3" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined(__FreeBSD__) +#include +#if defined(__NO_STRICT_ALIGNMENT) +#define TUKLIB_FAST_UNALIGNED_ACCESS 1 +#endif +#include +#if _BYTE_ORDER == _BIG_ENDIAN +# define WORDS_BIGENDIAN 1 +#endif +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +/* #undef _FILE_OFFSET_BITS */ + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define for Solaris 2.5.1 so the uint32_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT32_T */ + +/* Define for Solaris 2.5.1 so the uint64_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT64_T */ + +/* Define for Solaris 2.5.1 so the uint8_t typedef from , + , or is not used. If the typedef were allowed, the + #define below would cause a syntax error. */ +/* #undef _UINT8_T */ + +/* Define to rpl_ if the getopt replacement functions and variables should be + used. */ +/* #undef __GETOPT_PREFIX */ + +/* Define to the type of a signed integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int32_t */ + +/* Define to the type of a signed integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef int64_t */ + +/* Define to the type of an unsigned integer type of width exactly 16 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint16_t */ + +/* Define to the type of an unsigned integer type of width exactly 32 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint32_t */ + +/* Define to the type of an unsigned integer type of width exactly 64 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint64_t */ + +/* Define to the type of an unsigned integer type of width exactly 8 bits if + such a type exists and the standard includes do not define it. */ +/* #undef uint8_t */ + +/* Define to the type of an unsigned integer type wide enough to hold a + pointer, if such a type exists, and if the system does not define it. */ +/* #undef uintptr_t */ From nobody Sat May 13 00:42:45 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJ6Kx69kDz4BfMy; Sat, 13 May 2023 00:42: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 4QJ6Kx5F3Mz3s4l; Sat, 13 May 2023 00:42:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683938565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBMzJCz5njz3Zf0r6GVQnZWF/8xU2cw+gGAyQqvyCQQ=; b=F6qT4OmJEilbV3ozcotPQXW8dBf6gRngBEAhbDtTXX0VabZNCNEf8fmnvpkNEW1xTsWW/f 4xSWJfdw865028E3Cq6E+8AvHr40U7IcokSa/jh9I6T/4tJCzoMy0UDrDc0n1aml2xdU9T IAA2mbbDAW1B/CjWvDJT2ToO1KNdc519rzxqhxVhRi3xPadX9j5wk8Rpu6DEuGl3gyZJ3p JfbaDSf47zVx2SGqoqwNKIhNnLoxXjT2cAii977ECN6ikQOd0Iu9u73ULIMJKKqcAXG5sI SsWv5xQFMahHsz3cgGIKBN2mhiAujB7Xy3W8H5XpZil27TEN8xSF3ao7qif5hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683938565; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yBMzJCz5njz3Zf0r6GVQnZWF/8xU2cw+gGAyQqvyCQQ=; b=oBae/Clj+Nhtv8fShlZ/eM7GKYshhGe28BKMs7ZqXciVObIUTSj6+HrO9PwuapD0YDPCv9 DcvmD3GTIUDUMH8X8JPXjv61ITxYYk8SGj+Ct1aKLxBirxuYmq5tryv/kCr8mDry9PXHNi O383CJmnIyZRpuTDKLlcPwX9LicpKHPi+kywkQ8JS7DyX4h5TN0SB81w8UIOuN9GzqnU2S RpNrx2ZuLEh1sBL5o/qvARgEfHaKJA73mmpXWCM6AEeWsRZbsQe2We+1F36JPlt3/8JTHq Lci5EbQ47Hhh7G0B9W2K5ZVgJ4S0XNWz7Ll9uDCmw36Z5mY+h1fdpj7xghsa8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683938565; a=rsa-sha256; cv=none; b=E5t/6pmPjjjFFOvH8QK27IXD752zbjHYfQiu8D+X3/lduTsQYV2hRRZ7v7upyUDMHsnpkt aKmKd/V5purTN+pbB9N4YnW7vyNAGYXK+OiyVa2860broX5HP8wym2we2bAVveVzB9TOsN cJS8ORYvkMcBuwpWNH71HVkqxmTkwAnDTJ+FoU70WSJ7V//VApUnD7X3LGJYr4qskbrAZ3 WuPfvln52tLrSpB8nGMB4E+zj89Na7fIjEVa/2wd+YZYf/vjCQi/uOtJHX72NtW0dVV8oe CE+XpEScuu2uv85bWn59QJmQ76JvK5L9TRNapw4LX5X6S02+z82tT4sapUavQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJ6Kx4HQTzwbQ; Sat, 13 May 2023 00:42: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 34D0gjn4050930; Sat, 13 May 2023 00:42:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D0gjq4050929; Sat, 13 May 2023 00:42:45 GMT (envelope-from git) Date: Sat, 13 May 2023 00:42:45 GMT Message-Id: <202305130042.34D0gjq4050929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d1c8420702b7ad118ca909e9f7f39af8a6358e73 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d1c8420702b7ad118ca909e9f7f39af8a6358e73 commit d1c8420702b7ad118ca909e9f7f39af8a6358e73 Author: Simon J. Gerraty AuthorDate: 2023-05-13 00:40:37 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 00:40:37 +0000 Move more DIRDEPS_BUILD settings local.meta.sys.env.mk should now concern itself only with META_MODE. Move any DIRDEPS_BUILD settings to local.sys.dirdeps.env.mk --- share/mk/local.meta.sys.env.mk | 66 --------------------------------------- share/mk/local.sys.dirdeps.env.mk | 66 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/share/mk/local.meta.sys.env.mk b/share/mk/local.meta.sys.env.mk index f109da4f39dd..c0b17cec8f7e 100644 --- a/share/mk/local.meta.sys.env.mk +++ b/share/mk/local.meta.sys.env.mk @@ -1,68 +1,9 @@ # $FreeBSD$ # local configuration specific to meta mode -# before we process TARGET_SPEC -# we assume that MK_DIRDEPS_BUILD=yes - -# from src/Makefile (for universe) -TARGET_ARCHES_arm?= arm armv6 armv7 -TARGET_ARCHES_arm64?= aarch64 -TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le powerpcspe -TARGET_ARCHES_riscv?= riscv64 - -# some corner cases -BOOT_MACHINE_DIR.amd64 = boot/i386 -MACHINE_ARCH.host = ${_HOST_ARCH} - -# the list of machines we support -ALL_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv .-include -.for m in ${ALL_MACHINE_LIST:O:u} -MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_${m}:U$m} -MACHINE_ARCH.$m?= ${MACHINE_ARCH_LIST.$m:[1]} -BOOT_MACHINE_DIR.$m ?= boot/$m -.endfor - -.if empty(MACHINE_ARCH) -.if !empty(TARGET_ARCH) -MACHINE_ARCH= ${TARGET_ARCH} -.else -MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} -.endif -.endif -MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} -MACHINE_ARCH:= ${MACHINE_ARCH} - -HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} - -.if ${REQUESTED_MACHINE:U${MACHINE}} == "host" -MACHINE= host -.if ${TARGET_MACHINE:Uno} == ${HOST_TARGET} -# not what we want -TARGET_MACHINE= host -.endif -.endif -.if ${MACHINE} == "host" -OBJTOP := ${HOST_OBJTOP} -MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} -.endif - -.if ${.MAKE.LEVEL} == 0 || empty(PYTHON) -PYTHON ?= /usr/local/bin/python -.export PYTHON -# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to avoid -# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avoid -# problems. -.if ${MK_DIRDEPS_BUILD} == "yes" && ${.MAKE.LEVEL} == 0 -.MAIN: dirdeps -.if make(all) -.error DIRDEPS_BUILD: Please run '${MAKE}' instead of '${MAKE} all'. -.endif -.endif -.endif - .if !defined(NO_META_MISSING) META_MODE+= missing-meta=yes .endif @@ -78,10 +19,3 @@ META_MODE+= missing-filemon=yes # this does not need/want filemon UPDATE_DEPENDFILE= NO .endif - -.if ${MK_DIRDEPS_BUILD} == "yes" -.if ${.MAKE.OS} != "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} -# a pseudo option to indicate we need libegacy for host -MK_host_egacy= yes -.endif -.endif diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps.env.mk index ab22f4c9e7d9..3d45719ff292 100644 --- a/share/mk/local.sys.dirdeps.env.mk +++ b/share/mk/local.sys.dirdeps.env.mk @@ -12,3 +12,69 @@ TARGET_SPEC_VARS?= MACHINE MACHINE_ARCH ${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \ ${.MAKE.DEPENDFILE_PREFIX} +# before we process TARGET_SPEC +# we assume that MK_DIRDEPS_BUILD=yes + +# from src/Makefile (for universe) +# would be nice to have this sort of info in sys.machine.mk +TARGET_ARCHES_arm?= armv6 armv7 +TARGET_ARCHES_arm64?= aarch64 +TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le powerpcspe +TARGET_ARCHES_riscv?= riscv64 + +# some corner cases +BOOT_MACHINE_DIR.amd64 = boot/i386 +MACHINE_ARCH.host = ${_HOST_ARCH} + +# the list of machines we support +ALL_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv + +.-include + +.for m in ${ALL_MACHINE_LIST:O:u} +MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_${m}:U$m} +MACHINE_ARCH.$m?= ${MACHINE_ARCH_LIST.$m:[1]} +BOOT_MACHINE_DIR.$m ?= boot/$m +.endfor + +.if empty(MACHINE_ARCH) +.if !empty(TARGET_ARCH) +MACHINE_ARCH= ${TARGET_ARCH} +.else +MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} +.endif +.endif +MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} +MACHINE_ARCH:= ${MACHINE_ARCH} + +HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} + +.if ${REQUESTED_MACHINE:U${MACHINE}} == "host" +MACHINE= host +.if ${TARGET_MACHINE:Uno} == ${HOST_TARGET} +# not what we want +TARGET_MACHINE= host +.endif +.endif +.if ${MACHINE} == "host" +OBJTOP := ${HOST_OBJTOP} +MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} +.endif + + +.if ${.MAKE.LEVEL} == 0 || empty(PYTHON) +PYTHON ?= /usr/local/bin/python +.export PYTHON + +# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to avoid +# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avoid +# problems. +.if make(all) +.error DIRDEPS_BUILD: Please run '${MAKE}' instead of '${MAKE} all'. +.endif +.endif + +.if ${.MAKE.OS} != "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} +# a pseudo option to indicate we need libegacy for host +MK_host_egacy= yes +.endif From nobody Sat May 13 00:43:10 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJ6Lc2khSz4BfRt; Sat, 13 May 2023 00:43:20 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJ6Lb2qD3z3sNm; Sat, 13 May 2023 00:43:19 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Authentication-Results: mx1.freebsd.org; none Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 34D0hA2K065434; Fri, 12 May 2023 17:43:10 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 34D0hAMp065433; Fri, 12 May 2023 17:43:10 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202305130043.34D0hAMp065433@gndrsh.dnsmgr.net> Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ In-Reply-To: <07DE4EFF-D9C3-4492-A599-66D72D5DEA8C@karels.net> To: Mike Karels Date: Fri, 12 May 2023 17:43:10 -0700 (PDT) CC: rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4QJ6Lb2qD3z3sNm X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > Rod and I discussed this, and I?m top-posting a summary of a proposal that > we both support. I?ll leave the last message from the list below for > reference. Our consensus is that the main problem is the code in pw(8) > (used by adduser, and hence bsdinstall) that interprets /home as /usr/home, > installing a symlink for /home, and similarly for any other home directory > whose parent has a single component. We propose to remove that code, and > also modify bsdinstall?s zfs script to create a home dataset rather than Small nit, zfs already creates the data set as $POOL/usr/home, this would change to $POOL/home. > usr/home. adduser presents a default home directory using /home, so this > will continue to agree. As Rod said at the start of this thread, home > directories really don?t belong in /usr, and the only reason they were > there is because of the previous root + /usr partitioning. Now the default > is one large partition. Of course, people who want to partition differently > can do whatever they want. > > It will still be possible for admins to create home directories in > /usr/home, they will just have to do so explicitly for pw to create the > directory, and manually create a /home symlink if desired. If they have > a small root file system, they will want to put home directories elsewhere. > > A followup change would be to change various man pages that refer to > /usr/home. > > Mike > > On 11 May 2023, at 12:32, Rodney W. Grimes wrote: > > >> On 11 May 2023, at 9:58, Rodney W. Grimes wrote: > >> > >>>> On Wed, 10 May 2023 16:48:12 -0500 > >>>> Mike Karels wrote: > >>>> > >>>>> On 10 May 2023, at 10:13, Cy Schubert wrote: > >>>>> > >>>>>> In message , Mitchell > >>>>>> Horne w > >>>>>> rites: > >>>>>>> On 5/10/23 11:19, Rodney W. Grimes wrote: > >>>>>>>>> The branch main has been updated by mhorne: > >>>>>>>>> > >>>>>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d > >>>>>>> 4c570dac939 > >>>>>>>>> > >>>>>>>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 > >>>>>>>>> Author: Mitchell Horne > >>>>>>>>> AuthorDate: 2023-05-10 12:53:56 +0000 > >>>>>>>>> Commit: Mitchell Horne > >>>>>>>>> CommitDate: 2023-05-10 13:25:17 +0000 > >>>>>>>>> > >>>>>>>>> hier(7): document /home/ and /usr/home/ > >>>>>>>>> > >>>>>>>>> Reviewed by: imp > >>>>>>>>> MFC after: 1 week > >>>>>>>>> Sponsored by: The FreeBSD Foundation > >>>>>>>>> Differential Revision: https://reviews.freebsd.org/D40002 > >>>>>>>>> --- > >>>>>>>>> share/man/man7/hier.7 | 10 ++++++++++ > >>>>>>>>> 1 file changed, 10 insertions(+) > >>>>>>>>> > >>>>>>>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 > >>>>>>>>> index ff11289436a1..b6759dd6e65b 100644 > >>>>>>>>> --- a/share/man/man7/hier.7 > >>>>>>>>> +++ b/share/man/man7/hier.7 > >>>>>>>>> @@ -90,6 +90,10 @@ file descriptor files; > >>>>>>>>> see > >>>>>>>>> .Xr \&fd 4 > >>>>>>>>> .El > >>>>>>>>> +.It Pa /home/ > >>>>>>>>> +user HOME directories. > >>>>>>>>> +This is a symlink to > >>>>>>>>> +.Pa /usr/home/ > >>>>>>>> > >>>>>>>> /usr is "contains the majority of user utilities and applications" > >>>>>>>> it should not contain home directories. > >>>>>>>>> I do not know when this move to usr came about it was traditionally > >>>>>>> /home. > >>>>>>>> I do not know why /usr/home even exists, it is not needed by > >>>>>>>> anything I am aware of. If we have a compatible link it > >>>>>>>> should be, usr/home -> ../home and /home should be the > >>>>>>>> directory. > >>>>>>>> > >>>>>>> > >>>>>>> I agree that /usr/home is strange, and is unique (?) to FreeBSD. > >>>>>>> > >>>>>>> The oldest commit in the output of `git log --grep '/usr/home'` is: > >>>>>>> > >>>>>>> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd > >>>>>>> Author: David Nugent > >>>>>>> Date: Fri Jan 3 04:42:18 1997 +0000 > >>>>>>> > >>>>>>> Implemented /home -> /usr/home symlink kludge. > >>>>>>> If home basedir would be created in the root partition, create > >>>>>>> it under /usr instead, and symlink /basedir -> /usr/basedir. > >>>>>>> > >>>>>>> Notes: > >>>>>>> svn path=/head/; revision=21242 > >>>>>>> > >>>>>>> > >>>>>>> So it has been this way for 26 years at least. I do not know what to say > >>>>>>> about whether /usr "should" contain it, but it does. > >>>>>> > >>>>>> Usually history matters. I can understand not changing it. On the flip > >>>>>> side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /home -- > >>>>>> albeit automounted from /export/home on localhost or some NFS server. In > >>>>>> the Red Hat land at $JOB, /home is its own partition (actually an LVM > >>>>>> volume). In both cases /home is not in /usr because end-users can fill > >>>>>> /usr. This can be problematic operationally because it's yet another > >>>>>> headache to deal with should someone fill the filesystem. Filling /usr is > >>>>>> more serious than filling /home. > >>>>>> > >>>>>> As a point of interest, when I installed my first FreeBSD many moons ago I > >>>>>> used the Solaris standard of /export/home, using amd (now automount) to > >>>>>> serve my /home. I'm not advocating we do this, it's overkill, but /home > >>>>>> should not live in /usr. It's a potential headache for any sysadmin. > >>>>>> > >>>>>> With ZFS the solution is easy. With UFS based systems there are a lot of > >>>>>> other factors that go into how we install the "default" from the get-go. > >>>>> > >>> > >>> First off, thank you Mike for looking at this closer. Add me to any reviews > >>> you might creat. > >>> > >>>>> The situation is a fair mess. It took me a little while to figure out that > >>>>> the kludge referenced above is in the pw(8) command, which is used as the > >>>>> backend to adduser(8). Neither /home nor /usr/home is in the base package. > >>>>> adduser defaults to /home/user, and creates the parent directory (e.g. /home) > >>>>> if it does not exist, but if there is no internal slash, pw moves the parent > >>>>> to /usr. In this case, it makes the symlink from root. zfs is different, > >>>>> in that it includes a usr/home dataset already (created by bsdinstall). > > > > I am proposing we fix this. More below. > > > >>>>> In this case, creating a user with /home/user causes the symlink to be added > >>>>> as a side effect. > >>>>> > >>>>> I?m sure the kludge was originally done when root and /usr were separate > >>>>> file systems by default, root was small, and there was no /home by default. > >>>>> However, we now default to a single large file system (with datasets, in > >>>>> the zfs case). > >>>>> > >>>>> All of this really is a horrible kludge, and it is a house of cards. I'm > >>>>> amazed that it doesn't break more often. I'm tempted to remove the kludge > >>>>> and change the zfs setup to create a home dataset rather than usr/home. > >>> > >>> Or make it a menu option(s): > >>> if (zfs) "Create a user home dataset?" (default yes) > >>> if (ufs) "Create a user home directory?" (default yes) > >> > >> Are you suggesting that bsdinstall should do this? For ufs, there is no > >> need. > > > > Yes I am suggesting that bsdinstall should have a knob to turn > > on (by default) and off the creation of a "home dataset/directory" > > as you well need that if you choose to add users during a bsdinstall > > run, or you may not want a /home at all (currently not possible) as you > > have other mechanisms for dealing with it. > > > > The need for this is just as valid for ufs as it is for zfs. > > > >> > >>> "User home location: /home" (This is default) > >> > >> Are you proposing that the default for pw should be set at this point? > >> From all I read the default for pw is already, and should remain /home. > > Man page bears that out. It has no mention of any symlink or usr/home. > > > >> That doesn?t seem necessary, and I don?t know if it would work from > >> bsdinstall. > > > > No, this has nothing to do with pw directly, this is simply the path > > of the dataset(zfs)/directory(ufs) that bsdinstall should create IFF > > you sayd yes to the create question. At present this is hardcoded > > into bsdinstall as: > > /usr/home > > /home -> /usr/home > > > > I am advocating that this should all be controllable from menu. > > > >> > >>> As far as I am concerned the symlink can just die.... > >> > >> I agree, but that requires a change to pw. It creates the symlink on the > >> first account creation using /home. > > > > I am missing something here, pw creates the symlink yuk. > > As far as I was aware the only think that created a symlink > > /home -> /usr/home was bsdinstall. > > > >> > >>>>> However, if zfs users explicitly configure a home directory under /usr/home, > >>>>> this would end up in the usr dataset. An alternative would be to remove the > >>>>> code from pw to create the parent directory entirely (which seems sensible), > >>>>> and create a /home directory for ufs installs. I don't know how well known > >>>>> it is that adduser/pw will create parent directories for home directories > >>>>> though. This cleanup would change the default location for home directories > >>>>> to /home, which makes more sense. It would require documentation, e.g. in > >>>>> the release notes. The changes would only affect new installations, not > >>>>> upgrades. > >>>>> > >>>>> Thoughts? > >>>>> > >>>> > >>>> Adding home would require a change to BSD.root.dist, since it's not > >>>> currently in there. Only usr is present. > >>> > >>> It should *not* be in the etc/mtree/BSD.*.dist files at all. > >>> And it is not on my 13.1R system. It would not need to be > >>> in BSD.root.dist either, this is a *post distribution* created > >>> directory/dataset. > >> > >> I?m curious why you think this. But if pw retains the ability to create > >> the parent directory for the user directory (and I now think it should), > >> there is no need for a /home by default. > > > > Because there is no need for /home in a base distribution until > > you add a user, and that is a site specific change. What in > > the base system *needs* /home? > > > >>>> IMHO changing pw would be a reasonable approach. > >>> > >>> I am mixed on this.... it more or less does the right > >>> thing, and if a user specifies /tmp/foolishidea/home/$USER > >>> that is on them. No one said all users homes must be > >>> in the same location. > >> > >> Except for moving parent directories with a single component under /usr, > >> and creating a symlink for them... > >> > >> My current plan is to change pw not to move things under /usr, change the > >> zfs setup to use a home dataset rather than usr/home (corresponding to the > >> pw default), and then change the various man pages that refer to /usr/home. > >> Does that seem reasonable? > > > > Yes, then the knobs can easily be added, or scripted install should just > > work to effect the knobs. > > > >> Mike > > > > -- > > Rod Grimes rgrimes@freebsd.org > > -- Rod Grimes rgrimes@freebsd.org From nobody Sat May 13 01:12:57 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJ70t4f91z4Bh7K; Sat, 13 May 2023 01:13:02 +0000 (UTC) (envelope-from rpokala@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 4QJ70t3smBz3xPf; Sat, 13 May 2023 01:13:02 +0000 (UTC) (envelope-from rpokala@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683940382; h=from:from:reply-to:subject: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=It36FPVJPITX/ue+JYDAJ3pcmo2Zv7Ej98F1Dnr0QPA=; b=MpdfeTMAI2t6kCNm6lJ3koz/7GYjg4oWB0K9V0mi2gUTmq05hR3R92oFkHBQ05mWWPYIbH 67OL9yXkwJE5bS5y6v2r5g+D+GcOz6c4iKH1RlVLwYXkBepShpTToBjpUwbF0eL2oTrxqx Rfw/1esk9uujXG2Dsa5DBwvnkil6qttSHgI3KGieFrpe2AifIowD6+CaxWaclK9Ch6D7M9 cg7Ho2KcuIkwPkMA2jIpdyBR0nGiGUyY5wP6H/HqGPGAj3ZEk9rcTTjqCOOXYCfioM+E/3 LkRwTS4oMSXs+tLWk+KboGDnSxPwb+tujEhIu/+YgA4MBUQ6HCiZdbsNDIDO2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683940382; h=from:from:reply-to:subject: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=It36FPVJPITX/ue+JYDAJ3pcmo2Zv7Ej98F1Dnr0QPA=; b=TwqcgOpdtnohGxL38ETxQMNnwnXz594bL6uiiFAe5uWw9SzMn2D0TgODNvdQTy0FEdxkaT 3wY2+g0GhU7XpcVpnxzsImJsrU2gPZCFMuMqP+vchmUl1RKG6qVsNlpJEJETW8VlsqWR3W QK7KceRKOrzBwKJi4H6togD8D5ILxnfb/KFlsBTQr9r7mxPRn0tmZklIu/v/Te8i2JcmqP 8oh6DWKrw99xvMzJ5gIcbS8eF0XNZRlgfRjXpnbB/3Uw6yYtLdffEgOX6Wqkjc+r134HeP FIY8YRk3pGREvoBqaQYgrKpALvHUI3Jl8DCGu4CgYNFzNuVt9YqyVzvam/CgTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683940382; a=rsa-sha256; cv=none; b=gJctqpw3IfCF8VUrft7quY58n26dk8jS2aXUIBd9J3+kACV0/ZGasdgB4v55FXLr2z3k3e 4AQfYkQOfPBMPxhFZ2ORMmIldNmLHhNpNF7VuQrg7gMDQ31InXHW0jWd++iyNWY5bHq/YR rVC2u9IjFZbPk/Bp4iB1juYmyoC5YP0gaOxNRkcaECAfHUCDbOkU8Jfh0QwBQoq2b9Lbz2 41PEOGhcFk6ERPGRUUuWtwANj/L+Ve6QhIbwTZNC9JQ9CAc9DWGrM6d+9E4axDDdVuxOL5 Jt7VdwdvY/5r1BQPwrc1NRLOxlQD2D7dRm177mL4TAD+Y+JlGPHEubvRb4HrWg== Received: from [192.168.1.12] (unknown [98.42.164.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: rpokala) by smtp.freebsd.org (Postfix) with ESMTPSA id 4QJ70s6fcqz12RB; Sat, 13 May 2023 01:13:01 +0000 (UTC) (envelope-from rpokala@freebsd.org) User-Agent: Microsoft-MacOutlook/16.72.23042300 Date: Fri, 12 May 2023 18:12:57 -0700 Subject: Re: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings From: Ravi Pokala To: "Simon J. Gerraty" , , , Message-ID: Thread-Topic: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings References: <202305130042.34D0gjq4050929@gitrepo.freebsd.org> In-Reply-To: <202305130042.34D0gjq4050929@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-version: 1.0 Content-type: text/plain; charset="UTF-8" Content-transfer-encoding: quoted-printable X-ThisMailContainsUnwantedMimeParts: N This change also drops 'arm' from 'TARGET_ARCHES_arm' ; this was causing make -DWITH_META_MODE tinderbox to try to 'make buildworld' for arm:arm, which of course doesn't exist anym= ore. -Ravi (rpokala@) =EF=BB=BF-----Original Message----- From: > on behalf of "Simon J. Gerraty" > Date: Friday, May 12, 2023 at 17:42 To: >, >, > Subject: git: d1c8420702b7 - main - Move more DIRDEPS_BUILD settings The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=3Dd1c8420702b7ad118ca909e9f7f39a= f8a6358e73 commit d1c8420702b7ad118ca909e9f7f39af8a6358e73 Author: Simon J. Gerraty > AuthorDate: 2023-05-13 00:40:37 +0000 Commit: Simon J. Gerraty > CommitDate: 2023-05-13 00:40:37 +0000 Move more DIRDEPS_BUILD settings local.meta.sys.env.mk should now concern itself only with META_MODE. Move any DIRDEPS_BUILD settings to local.sys.dirdeps.env.mk --- share/mk/local.meta.sys.env.mk | 66 --------------------------------------- share/mk/local.sys.dirdeps.env.mk | 66 ++++++++++++++++++++++++++++++++++++= +++ 2 files changed, 66 insertions(+), 66 deletions(-) diff --git a/share/mk/local.meta.sys.env.mk b/share/mk/local.meta.sys.env.m= k index f109da4f39dd..c0b17cec8f7e 100644 --- a/share/mk/local.meta.sys.env.mk +++ b/share/mk/local.meta.sys.env.mk @@ -1,68 +1,9 @@ # $FreeBSD$ # local configuration specific to meta mode -# before we process TARGET_SPEC -# we assume that MK_DIRDEPS_BUILD=3Dyes - -# from src/Makefile (for universe) -TARGET_ARCHES_arm?=3D arm armv6 armv7 -TARGET_ARCHES_arm64?=3D aarch64 -TARGET_ARCHES_powerpc?=3D powerpc powerpc64 powerpc64le powerpcspe -TARGET_ARCHES_riscv?=3D riscv64 - -# some corner cases -BOOT_MACHINE_DIR.amd64 =3D boot/i386 -MACHINE_ARCH.host =3D ${_HOST_ARCH} - -# the list of machines we support -ALL_MACHINE_LIST?=3D amd64 arm arm64 i386 powerpc riscv .-include -.for m in ${ALL_MACHINE_LIST:O:u} -MACHINE_ARCH_LIST.$m?=3D ${TARGET_ARCHES_${m}:U$m} -MACHINE_ARCH.$m?=3D ${MACHINE_ARCH_LIST.$m:[1]} -BOOT_MACHINE_DIR.$m ?=3D boot/$m -.endfor - -.if empty(MACHINE_ARCH) -.if !empty(TARGET_ARCH) -MACHINE_ARCH=3D ${TARGET_ARCH} -.else -MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} -.endif -.endif -MACHINE_ARCH?=3D ${MACHINE_ARCH.${MACHINE}} -MACHINE_ARCH:=3D ${MACHINE_ARCH} - -HOST_OBJTOP ?=3D ${OBJROOT}${HOST_TARGET} - -.if ${REQUESTED_MACHINE:U${MACHINE}} =3D=3D "host" -MACHINE=3D host -.if ${TARGET_MACHINE:Uno} =3D=3D ${HOST_TARGET} -# not what we want -TARGET_MACHINE=3D host -.endif -.endif -.if ${MACHINE} =3D=3D "host" -OBJTOP :=3D ${HOST_OBJTOP} -MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} -.endif - -.if ${.MAKE.LEVEL} =3D=3D 0 || empty(PYTHON) -PYTHON ?=3D /usr/local/bin/python -.export PYTHON -# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to av= oid -# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avo= id -# problems. -.if ${MK_DIRDEPS_BUILD} =3D=3D "yes" && ${.MAKE.LEVEL} =3D=3D 0 -.MAIN: dirdeps -.if make(all) -.error DIRDEPS_BUILD: Please run '${MAKE}' instead of '${MAKE} all'. -.endif -.endif -.endif - .if !defined(NO_META_MISSING) META_MODE+=3D missing-meta=3Dyes .endif @@ -78,10 +19,3 @@ META_MODE+=3D missing-filemon=3Dyes # this does not need/want filemon UPDATE_DEPENDFILE=3D NO .endif - -.if ${MK_DIRDEPS_BUILD} =3D=3D "yes" -.if ${.MAKE.OS} !=3D "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} -# a pseudo option to indicate we need libegacy for host -MK_host_egacy=3D yes -.endif -.endif diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps= .env.mk index ab22f4c9e7d9..3d45719ff292 100644 --- a/share/mk/local.sys.dirdeps.env.mk +++ b/share/mk/local.sys.dirdeps.env.mk @@ -12,3 +12,69 @@ TARGET_SPEC_VARS?=3D MACHINE MACHINE_ARCH ${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \ ${.MAKE.DEPENDFILE_PREFIX} +# before we process TARGET_SPEC +# we assume that MK_DIRDEPS_BUILD=3Dyes + +# from src/Makefile (for universe) +# would be nice to have this sort of info in sys.machine.mk +TARGET_ARCHES_arm?=3D armv6 armv7 +TARGET_ARCHES_arm64?=3D aarch64 +TARGET_ARCHES_powerpc?=3D powerpc powerpc64 powerpc64le powerpcspe +TARGET_ARCHES_riscv?=3D riscv64 + +# some corner cases +BOOT_MACHINE_DIR.amd64 =3D boot/i386 +MACHINE_ARCH.host =3D ${_HOST_ARCH} + +# the list of machines we support +ALL_MACHINE_LIST?=3D amd64 arm arm64 i386 powerpc riscv + +.-include + +.for m in ${ALL_MACHINE_LIST:O:u} +MACHINE_ARCH_LIST.$m?=3D ${TARGET_ARCHES_${m}:U$m} +MACHINE_ARCH.$m?=3D ${MACHINE_ARCH_LIST.$m:[1]} +BOOT_MACHINE_DIR.$m ?=3D boot/$m +.endfor + +.if empty(MACHINE_ARCH) +.if !empty(TARGET_ARCH) +MACHINE_ARCH=3D ${TARGET_ARCH} +.else +MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} +.endif +.endif +MACHINE_ARCH?=3D ${MACHINE_ARCH.${MACHINE}} +MACHINE_ARCH:=3D ${MACHINE_ARCH} + +HOST_OBJTOP ?=3D ${OBJROOT}${HOST_TARGET} + +.if ${REQUESTED_MACHINE:U${MACHINE}} =3D=3D "host" +MACHINE=3D host +.if ${TARGET_MACHINE:Uno} =3D=3D ${HOST_TARGET} +# not what we want +TARGET_MACHINE=3D host +.endif +.endif +.if ${MACHINE} =3D=3D "host" +OBJTOP :=3D ${HOST_OBJTOP} +MACHINE_ARCH=3D ${MACHINE_ARCH.${MACHINE}} +.endif + + +.if ${.MAKE.LEVEL} =3D=3D 0 || empty(PYTHON) +PYTHON ?=3D /usr/local/bin/python +.export PYTHON + +# _SKIP_BUILD is not 100% as it requires wrapping all 'all:' targets to av= oid +# building in MAKELEVEL0. Just prohibit 'all' entirely in this case to avo= id +# problems. +.if make(all) +.error DIRDEPS_BUILD: Please run '${MAKE}' instead of '${MAKE} all'. +.endif +.endif + +.if ${.MAKE.OS} !=3D "FreeBSD" || ${_HOST_OSREL:R} < ${OS_REVISION:R} +# a pseudo option to indicate we need libegacy for host +MK_host_egacy=3D yes +.endif From nobody Sat May 13 02:50:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJ98w1Nhmz4BmVs; Sat, 13 May 2023 02:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJ98w0w22z4BGS; Sat, 13 May 2023 02:50:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683946208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zXPs4hHJK/0uCHn1qvIK3lCpWnwXoR9Ziv1Qy7BwtvA=; b=pxlqiA/rrhtgIAfZdrR1LB5FkFnBsw9x/IB+2/uwzbPI61reK3YFqgg34QGS7VcUe9yC9F 27xXt0ot8BViyLzKO1PSgHci4ctXdFNgOv6sFIkGj5CpIEVU3Rv9n9K+o4x0rVrCv9V9t2 naNpHtDs+Xq4vKJUHlHDhDEGuX10k0rD71Qad3dnTe48cUaZM9WKmRGZ4DWWi4AavO0ons ozCc0C3aAGcUimzEJMZHsEKkM8I0AcO9PPqcT+Hzh1LTlLo8EI/NYcZhDnekPALL3qKKb7 FV0ycRSmOc+hVWiDTP9gIKb0nz+41ga/lZbY8ije1y+gpu51wHZMExjVAAvrfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683946208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zXPs4hHJK/0uCHn1qvIK3lCpWnwXoR9Ziv1Qy7BwtvA=; b=oXOLyLsJ7Q146UpGg83mCmJPwDiHMH9w/oT8M5uZBiLaO/H9OgFSxYefF432vsPjET4qyd QYQLB+Nym1Z0UtP29N7MscQnbk/Fy6TaLEhDEZ7e/iSiEpzCSh1Ij1xx9x1v6s8LUaq5op uQqYw+0KzvgayjFv9kzyaBwe+RGASKuKr1mpFPUD2IMmhnH7J47ofi7G+TkjT4QBA5OB8t bMuhCIn7nvpz6lXSTwK6O/SZJvvfuIsbZVgr0QIOljqHyB1KmfCZZ3sQC944q17VcMR4sY E7VNhU+P3pbBjnnWfM8QG4la2elRs8zQThKb66oIXWrmATmqpPmOAbiT1QfTkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683946208; a=rsa-sha256; cv=none; b=aRPJ+AxQfGFpxbuhEuOGv4Jb8iZu1d2nAaDfQDd+BG/opd+qzpuW4z2jpPKmiaatTwLCJO 1KK974R5WX7J5zbWoAoNqii+gmKIVKZgIBc8Puz5SzwUvVUrX+J69onGc/+Q0soBo68pZ6 NHNWsSMdpkr3ET+6GbOZAEC6YQ2LZj7inKwEE/hZ4eNY+2aZ1Kel/2F8YpIh26cs8Gw34y u7WVCb2T9vEdUkXSC5cF7kR8anbjCfiWLSuxjuNGMODmmemygdRIKDtI6OXSWOelgjophs MVEkrpZku1nTBMzSYFs7n/dMjj8XBpaQtFI5QFh3yyuFB1PdvCLzFGvKYTXf4A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJ98v74ckz10dZ; Sat, 13 May 2023 02:50:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34D2o7gb053176; Sat, 13 May 2023 02:50:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34D2o7Pn053173; Sat, 13 May 2023 02:50:07 GMT (envelope-from git) Date: Sat, 13 May 2023 02:50:07 GMT Message-Id: <202305130250.34D2o7Pn053173@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 46f35bf28d0a - main - rc.subr(8): delete debug cpuset helper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46f35bf28d0af08ff799167f77967a3d07564f75 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=46f35bf28d0af08ff799167f77967a3d07564f75 commit 46f35bf28d0af08ff799167f77967a3d07564f75 Author: Enji Cooper AuthorDate: 2023-05-11 05:47:09 +0000 Commit: Enji Cooper CommitDate: 2023-05-13 02:50:00 +0000 rc.subr(8): delete debug cpuset helper Summary: The intention of the original author (I assume) was to add this logic for testing. This removes the debug statement so it no longer shows up in calls to `status`. MFC after: 2 weeks MFC with: 0661f9389 Reviewers: kevans Subscribers: imp Differential Revision: https://reviews.freebsd.org/D40055 --- libexec/rc/rc.subr | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index b2a7f45ccd4d..6a7f070f7f5b 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1127,11 +1127,6 @@ run_rc_command() _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then echo "${name} is running as pid $rc_pid." - # for cpuset debug only, not committable (cut) - if [ -n "$_cpuset" -a -x $CPUSET ]; then - echo -n "on CPU(s)" - $CPUSET -g -p "$rc_pid" | cut -s -d: -f 2 - fi else echo "${name} is not running." return 1 From nobody Sat May 13 12:20:22 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJPpt2mTfz4BKPr; Sat, 13 May 2023 12:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJPpt2BTQz3y5j; Sat, 13 May 2023 12:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683980422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAIKgdfS2doFb6YJNFvhRjR7//dK4vLLBLZrpgOqEnI=; b=dqHAMeavBKCg63AnTNioMVySzdwIdYSCctclBNDEGHfEzv0wCq9WVT6r0YxA4g6t8qiLOm UEV7KDT+DQJCTK1cbH97RBCDIFA7BX2HOO3aB/0+z1bzcQ35DX2AYq4ZPO37IVcZrDScW/ 7VVwVRsYEtonczOapGl9I0+ls3nAhV0ZlCycARxRGefn6CPqS/Igk+HtRghSJf5i+v6nel f2wOuLbwB3T+noCDWutkTtHjAHXHIdn+e6Ype3L9//2U18EBbVtvkN+OM3mBD3LqesuRyz BpmOmduBZGpr03+jl+KHYrboVZx5QEdi7RJ6VF3fr7u4VmQ9c0vdZAlRrUybow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683980422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gAIKgdfS2doFb6YJNFvhRjR7//dK4vLLBLZrpgOqEnI=; b=e4Tcv4Se+L4Lk0NTvBqvDyfrqJLwkf9eCvFe2cEmyTrwCMmT6Empg6lxCK8BTP6wf0c61f R19QiB0Ji3x+L0cK8pKa37Fhwpul4lRYr2LIuECoEFVK4NpDEcdcDzQWZdcfTCXjrcvGQH CN0N/gm1LSpHc3bRpnCjjYXAew60NJy8IiR+JMa/oKXjF1nvIjuLJw9dnUi/aFTTMhCmVR I5JN3RzxRZ+eZxTcKXB1IHeXRY+uvM/kBoa54Zh1KhqCKa8GOwyPutcgVcs79iMKiiw6DJ rC9rN1Mz0J/9+lvBv5iIqu8Lk7hlyPhOSulz0ouvLLjfOxIQHruML4XmlfDk4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683980422; a=rsa-sha256; cv=none; b=hD+SP5BOb+0CzaX9HJ37EXFi0ZfN+MablA0Bmo4AGk/ESpY4sY2dt8WkfK7eQcuOYv6XJr EtLqwCFr7ifDPQUc0/ROTq+AW+SODmih28ek78PSX1xvcbwBCrt8HfgyRI7skSezXrx8SD P+ObASgOmSkaK0sNmtq5oQhRxR2HCsydd+QCIWvml9C9sDUE/Owru5RJN9T1AQFyhmz4e0 Y488nAGAIvCtLdHJ9tXxisRYlRJS0wpjmRCNrAqIcPlTNEZ+7tiOM2VkvBupq6TNV0w34V CcROPPLC8ixYVZ6/soU60cLpPj9apuIG5df9BBBE6JPDI57rGcMqvq+Q4pFbzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJPpt0xntzGqn; Sat, 13 May 2023 12:20: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 34DCKMjF097030; Sat, 13 May 2023 12:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DCKM9V097029; Sat, 13 May 2023 12:20:22 GMT (envelope-from git) Date: Sat, 13 May 2023 12:20:22 GMT Message-Id: <202305131220.34DCKM9V097029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: f2b3bf5c4d4a - main - libefi: add efi_devpath_next_instance() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2b3bf5c4d4a391648e5b2740e81bccb85752ae5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=f2b3bf5c4d4a391648e5b2740e81bccb85752ae5 commit f2b3bf5c4d4a391648e5b2740e81bccb85752ae5 Author: Toomas Soome AuthorDate: 2023-05-12 15:41:14 +0000 Commit: Toomas Soome CommitDate: 2023-05-13 12:16:10 +0000 libefi: add efi_devpath_next_instance() UEFI device path may be path to one device, or concatenated list of instances to different devices (textually represented as comma separated list). Provide generic function to get next instance from device path. Returns next instance or end node. The use case is like: EFI_DEVICE_PATH *node = (EFI_DEVICE_PATH *)buf; while (!IsDevicePathEnd(node)) { process(node); node = efi_devpath_next_instance(node); } Where buf is pointing to either single device path or concatenated list of device paths (such as from ConIn or ConOut). Reviewers: imp Differential Revision: https://reviews.freebsd.org/D40081 --- stand/efi/include/efilib.h | 1 + stand/efi/libefi/devpath.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/stand/efi/include/efilib.h b/stand/efi/include/efilib.h index 1673ac97fdf2..df4ae6503760 100644 --- a/stand/efi/include/efilib.h +++ b/stand/efi/include/efilib.h @@ -97,6 +97,7 @@ void efi_close_devpath(EFI_HANDLE); EFI_HANDLE efi_devpath_handle(EFI_DEVICE_PATH *); EFI_DEVICE_PATH *efi_devpath_last_node(EFI_DEVICE_PATH *); EFI_DEVICE_PATH *efi_devpath_trim(EFI_DEVICE_PATH *); +EFI_DEVICE_PATH *efi_devpath_next_instance(EFI_DEVICE_PATH *); bool efi_devpath_match(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *); bool efi_devpath_match_node(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *); bool efi_devpath_is_prefix(EFI_DEVICE_PATH *, EFI_DEVICE_PATH *); diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c index c25ae73e463c..94bb07540376 100644 --- a/stand/efi/libefi/devpath.c +++ b/stand/efi/libefi/devpath.c @@ -575,6 +575,23 @@ efi_devpath_last_node(EFI_DEVICE_PATH *devpath) return (devpath); } +/* + * Walk device path nodes, return next instance or end node. + */ +EFI_DEVICE_PATH * +efi_devpath_next_instance(EFI_DEVICE_PATH *devpath) +{ + while (!IsDevicePathEnd(devpath)) { + devpath = NextDevicePathNode(devpath); + if (IsDevicePathEndType(devpath) && + devpath->SubType == END_INSTANCE_DEVICE_PATH_SUBTYPE) { + devpath = NextDevicePathNode(devpath); + break; + } + } + return (devpath); +} + EFI_DEVICE_PATH * efi_devpath_trim(EFI_DEVICE_PATH *devpath) { From nobody Sat May 13 13:41:54 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJRdF1ljhz4BPbQ; Sat, 13 May 2023 13:42:09 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJRdD1pvqz49br; Sat, 13 May 2023 13:42:08 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20221208 header.b=IUxA8zgB; spf=pass (mx1.freebsd.org: domain of yaneurabeya@gmail.com designates 2607:f8b0:4864:20::1030 as permitted sender) smtp.mailfrom=yaneurabeya@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-24ddf274039so7522977a91.1; Sat, 13 May 2023 06:42:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683985326; x=1686577326; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:from:to:cc:subject:date:message-id :reply-to; bh=2yIlK6199uNDYyO+FSU1mfixVnflWxVGqeBwNi26iT8=; b=IUxA8zgBF2vryMWDyRAOuoS+J0Vc1MmpilG7rEfkQVfyG0e9uNnqlJpZgxiv/7Wq8w rkoHGQYkKBbLN4INtrPA0mMTazI8k7QR+/Nsi9/4hRYll4MCwyDT6nPvHI3+h5vnNCNr r8QVilE3nP2AJZIJbcDKoP3KnZA6l42peiNl2wy/zas0hnu0Dz3LvQ24uaMOEiZaLodX 1xANoqyc0YTxN+9Anxu7FbxAGTMl/ccTe9ypF1Yr8oYhDCDgNtHFS8bowjS/rTuAqP+e dEfvqLs3OMREWefZD6G2MnGM83FM9hCJIe9QXmhb88ei8N+F98gV1Unh1uvXBFBw0sAP F1fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683985326; x=1686577326; h=to:in-reply-to:cc:references:message-id:date:subject:mime-version :from:content-transfer-encoding:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2yIlK6199uNDYyO+FSU1mfixVnflWxVGqeBwNi26iT8=; b=a6vS5UTvG7MMCBfWRSsTXDyGD1frxTEUps6RMBe5hYJ6nRAKB+jIiHsDXTzR/mWcpg nktLTZNViSoXTbP2A8XEMuntsvHSIE7LSz5GGveh9DT/lc2kY6irgHlXGUJE+E6duEfT UfmFdJAGM7eVmLVBkx4bV8lyy0kpgdL94b7a2TWvkdONntjYBgxKply2knrPU2IE8Gy6 OjuDW42SHq2aDZN5juAU6hdGIdLIY7pNhoIOoL6AkqDaPuSomMI0fYvSgMLqJFqEEPin jfozi5urDemyBSrLtHbzmyhuJAgDmIdmbsvjAVIpZ9qZ8GzzjhwT4evpWBR2VziBzuo9 +6cQ== X-Gm-Message-State: AC+VfDwZEgruhUxxIykYGqFiL/sHeoY3yB6jJPVEv3Tmr8LRkUNVu2z0 yQx6FIvV0Xz5h/CL7+KpAsHVa4wynZk= X-Google-Smtp-Source: ACHHUZ7H/mLDe0zyqeFXRtvKaRW7iR709ET9Uw/dHBNRHGLDfmDZZqs/LsZk8DoEk19LFpwbf00clQ== X-Received: by 2002:a17:90a:b401:b0:23b:2c51:6e7 with SMTP id f1-20020a17090ab40100b0023b2c5106e7mr27828539pjr.21.1683985326095; Sat, 13 May 2023 06:42:06 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id on16-20020a17090b1d1000b002467717fa60sm5248713pjb.16.2023.05.13.06.42.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 May 2023 06:42:05 -0700 (PDT) Content-Type: multipart/alternative; boundary=Apple-Mail-C1CF919A-BF8A-4EDB-BABD-2D6649509B4D Content-Transfer-Encoding: 7bit From: Enji Cooper List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (1.0) Subject: Re: git: e639e0d27cc8 - main - zfs: merge openzfs/zfs@e61076683 Date: Sat, 13 May 2023 06:41:54 -0700 Message-Id: References: <202305121113.34CBDwTF017867@gitrepo.freebsd.org> Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org In-Reply-To: <202305121113.34CBDwTF017867@gitrepo.freebsd.org> To: Martin Matuska X-Mailer: iPhone Mail (20D67) X-Spamd-Result: default: False [-3.48 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.998]; NEURAL_HAM_SHORT(-0.99)[-0.987]; MV_CASE(0.50)[]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20221208]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; BLOCKLISTDE_FAIL(0.00)[73.19.52.228:server fail,2607:f8b0:4864:20::1030:server fail]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; RCVD_TLS_LAST(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::1030:from]; RCVD_COUNT_THREE(0.00)[3]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org] X-Rspamd-Queue-Id: 4QJRdD1pvqz49br X-Spamd-Bar: --- X-ThisMailContainsUnwantedMimeParts: N --Apple-Mail-C1CF919A-BF8A-4EDB-BABD-2D6649509B4D Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > On May 12, 2023, at 04:14, Martin Matuska wrote: >=20 > =EF=BB=BFThe branch main has been updated by mm: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3De639e0d27cc863ba1b8de20e861= e6b5d9b922a8e >=20 > commit e639e0d27cc863ba1b8de20e861e6b5d9b922a8e > Merge: 92c23f6d9c20 e61076683850 > Author: Martin Matuska > AuthorDate: 2023-05-12 11:12:59 +0000 > Commit: Martin Matuska > CommitDate: 2023-05-12 11:13:33 +0000 >=20 > zfs: merge openzfs/zfs@e61076683 >=20 > Notable upstream pull request merges: > #14744 Optimize check_filesystem() and process_error_log() > #14773 Allow zhack label repair to restore detached devices > #14794 zpool import -m also removing spare and cache when log device > is missing > #14805 Simplify and optimize random_int_between() > #14813 Enable the head_errlog feature to remove errors > #14816 Fix two abd_gang_add_gang() issues > #14817 Verify block pointers before writing them out > #14819 Add dmu_tx_hold_append() interface > #14823 Remove single parent assertion from zio_nowait() > #14824 Plug memory leak in zfsdev_state > #14825 Block cloning dbuf fixes > #14828 Remove duplicate code in l2arc_evict() > #14837 Fixes in head_errlog feature with encryption > #14839 Prevent panic during concurrent snapshot rollback and zvol rea= d > #14853 zil: Don't expect zio_shrink() to succeed >=20 > Obtained from: OpenZFS > OpenZFS commit: e6107668385044718b0a73330ed642365080 Hi Martin, This change seems to have broken CI with gcc12 on amd64: https://ci.free= bsd.org/job/FreeBSD-main-amd64-gcc12_build/983/ -Enji= --Apple-Mail-C1CF919A-BF8A-4EDB-BABD-2D6649509B4D Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
On May 12, 2023, at 04:14,= Martin Matuska <mm@freebsd.org> wrote:

=EF=BB=BFThe branch main has be= en updated by mm:

URL: https://cgit.FreeBSD= .org/src/commit/?id=3De639e0d27cc863ba1b8de20e861e6b5d9b922a8e

commit e639e0d27cc863ba1b8de20e861e6b5d9b922a8eMerge: 92c23f6d9c20 e61076683850
Author:   = ;  Martin Matuska <mm@FreeBSD.org>
AuthorDat= e: 2023-05-12 11:12:59 +0000
Commit:     = ;Martin Matuska <mm@FreeBSD.org>
CommitDate: 2023-05-1= 2 11:13:33 +0000

   zfs: me= rge openzfs/zfs@e61076683

  &nbs= p;Notable upstream pull request merges:
   &= nbsp; #14744 Optimize check_filesystem() and process_error_log()=
     #14773 Allow zhack label repair to r= estore detached devices
     #1479= 4 zpool import -m also removing spare and cache when log device
            = ;is missing
     #14805 Simplify a= nd optimize random_int_between()
    &n= bsp;#14813 Enable the head_errlog feature to remove errors
&= nbsp;    #14816 Fix two abd_gang_add_gang() issues
     #14817 Verify block pointers befor= e writing them out
     #14819 Add= dmu_tx_hold_append() interface
    &nb= sp;#14823 Remove single parent assertion from zio_nowait()
&= nbsp;    #14824 Plug memory leak in zfsdev_state<= br>      #14825 Block cloning dbuf fixes
     #14828 Remove duplicate code in l= 2arc_evict()
     #14837 Fixes in h= ead_errlog feature with encryption
    =  #14839 Prevent panic during concurrent snapshot rollback and zvol read=
     #14853 zil: Don't expect zio= _shrink() to succeed

   Obt= ained from:  OpenZFS
   OpenZFS commit:= e6107668385044718b0a73330ed642365080

= Hi Martin,
    This change seems to have broken CI with g= cc12 on amd64: https:= //ci.freebsd.org/job/FreeBSD-main-amd64-gcc12_build/983/
-Enji=
= --Apple-Mail-C1CF919A-BF8A-4EDB-BABD-2D6649509B4D-- From nobody Sat May 13 14:02:39 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJS4y1XChz4BQNs; Sat, 13 May 2023 14:02:42 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-oo1-xc30.google.com (mail-oo1-xc30.google.com [IPv6:2607:f8b0:4864:20::c30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJS4x6yqWz4Cs5; Sat, 13 May 2023 14:02:41 +0000 (UTC) (envelope-from mjguzik@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-xc30.google.com with SMTP id 006d021491bc7-55239f43426so975428eaf.1; Sat, 13 May 2023 07:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683986560; x=1686578560; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=gefJ71QFDjUnCU87I69tda83S7egReRti655qE9/uBw=; b=HGmd0pLXcobAmk54YIq597Ff2RBK6h3HrjiMeiY6q+oxKrXA9w98OZoAruCz3qa8Q5 qeXCnfrKe+7XnBBqJZXnYgaWxOpTXOdIIKkML7s0zi6Ra7jZFQlJihAe+yS9K9UfbYkd Qj2yAtRBWuVFd13xVoFjCu5q1XEKN4L3EAYHuKDeBpkQSMwOjbaeC52fOSyqThtyce1D allUu8DWODe2l22CuKJHyoBg4tZDKI425z1cnmHNc6XJwl51QPt0N/b5FXnhyAHqivdY JB1JU+Zy1h6Vggp2herjtG2oTgyUYjBAqhf9186UZiMPthUxsCskBDpHMenTOEhb4rKS zjZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683986560; x=1686578560; h=content-transfer-encoding:cc:to:subject:message-id:date:from :references:in-reply-to:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gefJ71QFDjUnCU87I69tda83S7egReRti655qE9/uBw=; b=TI8xVbhKt92cFLqPGGGQFmr5LBxknOtrSYjvMJITy54ZRu5UqLEQr9SmMkptOqX7jT KpctGTrV536tnIFf7FSsJM/Lu07WpLfE3+fUdvl7IshbuYJubNPiHudQGVN6pZQ0K8de P01dBcfi3+SQhjsFttVmKEdn8A9e7Mg/gp6q6l3cumW74DHqGIdO6UwonNdaIAr138IM 3S5aioyUDxGcTmjy+kUivYdu+rbWHp5ty4jI5lwaXfK5teENNp7qPK0XOO2WnX7GZJ+L BEnWTUmHaZVQmfV1UuEyBMbTCZYIGx6gmsE4YOdB4s/U/OGlQRGwmVYjXVp526EB3I3f oVuQ== X-Gm-Message-State: AC+VfDxP30bojawkc0vLMouMN4ybk1aZ8YAw+G12+UQu9ASpfPTqWyqS hhRL3RLi0pmcGY9Zb5umsta0ERZ8VzHgQ2puk2Eejrrd X-Google-Smtp-Source: ACHHUZ7CYDtzbUm6nUUaIqpiOkNwJXIu5yEI1l7ECxI/P4EkQlRI7z8jQBL/WBz0IyQQXcRI/VjaxVsW5FdL0iMgg9M= X-Received: by 2002:a4a:3803:0:b0:550:9895:fe77 with SMTP id c3-20020a4a3803000000b005509895fe77mr4027311ooa.9.1683986560077; Sat, 13 May 2023 07:02:40 -0700 (PDT) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Received: by 2002:a8a:48:0:b0:4d4:94b:7266 with HTTP; Sat, 13 May 2023 07:02:39 -0700 (PDT) In-Reply-To: References: <202305121113.34CBDwTF017867@gitrepo.freebsd.org> From: Mateusz Guzik Date: Sat, 13 May 2023 16:02:39 +0200 Message-ID: Subject: Re: git: e639e0d27cc8 - main - zfs: merge openzfs/zfs@e61076683 To: Enji Cooper Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QJS4x6yqWz4Cs5 X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 5/13/23, Enji Cooper wrote: > >> On May 12, 2023, at 04:14, Martin Matuska wrote: >> >> =EF=BB=BFThe branch main has been updated by mm: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=3De639e0d27cc863ba1b8de20e861e6b= 5d9b922a8e >> >> commit e639e0d27cc863ba1b8de20e861e6b5d9b922a8e >> Merge: 92c23f6d9c20 e61076683850 >> Author: Martin Matuska >> AuthorDate: 2023-05-12 11:12:59 +0000 >> Commit: Martin Matuska >> CommitDate: 2023-05-12 11:13:33 +0000 >> >> zfs: merge openzfs/zfs@e61076683 >> >> Notable upstream pull request merges: >> #14744 Optimize check_filesystem() and process_error_log() >> #14773 Allow zhack label repair to restore detached devices >> #14794 zpool import -m also removing spare and cache when log devic= e >> is missing >> #14805 Simplify and optimize random_int_between() >> #14813 Enable the head_errlog feature to remove errors >> #14816 Fix two abd_gang_add_gang() issues >> #14817 Verify block pointers before writing them out >> #14819 Add dmu_tx_hold_append() interface >> #14823 Remove single parent assertion from zio_nowait() >> #14824 Plug memory leak in zfsdev_state >> #14825 Block cloning dbuf fixes >> #14828 Remove duplicate code in l2arc_evict() >> #14837 Fixes in head_errlog feature with encryption >> #14839 Prevent panic during concurrent snapshot rollback and zvol >> read >> #14853 zil: Don't expect zio_shrink() to succeed >> >> Obtained from: OpenZFS >> OpenZFS commit: e6107668385044718b0a73330ed642365080 > > Hi Martin, > This change seems to have broken CI with gcc12 on amd64: > https://ci.freebsd.org/job/FreeBSD-main-amd64-gcc12_build/983/ > -Enji i reported upstream https://github.com/openzfs/zfs/pull/14813#issuecomment-1546659802 --=20 Mateusz Guzik From nobody Sat May 13 15:17:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJTl11v4yz4BTGP; Sat, 13 May 2023 15:17: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 4QJTl11Q8wz4Lw7; Sat, 13 May 2023 15:17:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683991037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEWGTZdf2p1JhUuZcca/Jg26E6f+Goph7tpZHfax4x0=; b=Fxoowh07zl6XCpADnY6R+99Et0D1F9JIl3h1VSCiILy9MJ+CSzLzZkD2mbUqMRN/tiwxUz q50IpsWW1mO3cBx1VMBZ2uU9l0hzPIeVmWWHppUu6c6i/2Ffy2WYAMYKtsARotjY5Ur0tf H5dEK/ezayrR+MyMz2radeiFrhj4sUyg1WaJX/HOUOjYlGpJWa7Huuhh1UGbpXDjRzdkl/ bcNIpsSiYBTeysJ9MO1Z+TWmP5wZM0muVuOSpIvB/hybzseRr5+Xou435sG5l0BxooYXGn r+5CtonuS/VS8qwaUQ/oFBWp0mrUGIlsVVPdmTszW8FyPNzxkLun+P5I6iSGZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683991037; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GEWGTZdf2p1JhUuZcca/Jg26E6f+Goph7tpZHfax4x0=; b=nDgpMmSQkNGeJvLTmuoQQckVJN0G1AKczzK7sRaQ2N809HooB19zrurHRNdlp+1MV62FsJ lMmCnmluENp8FzcxaYg1MA5ae2Pv/b/LCN0z72H3gJeN06Esd385KQLhJ1Vrene0gPpkk/ 0+ZK1mEv4RA4kL8NG0CVh/sN3XOGeQLHveuCnAelr64TT0aIAaUp3IeJ2w5gtw5MlWGmYD fpp3/IIBMS3Iveju4hDVmPBTRHpR0LbCqppzdwwzAgpUVZHIEJsCUuoQtl02Do7kP7SP79 OW6JT0CX1PaV4aDecaB/hpqoLzsrdxLAJabN3ANEJ+RiDyV1TjiOgO9ZbWVC8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683991037; a=rsa-sha256; cv=none; b=M/4suTGpa+Mjpkzep+tM1ONrCpas/jBFTn5ngeL7N87mfUpmBBlrdswZl5T4cESrjjyFck frxN29GEtiG/l5TnRnjT4vm49Xbt/Uzz+Hn4J8VBQH4ySmxP680AzU6AGs5f003q17rK1P U2/ibVHqidVj6V/XlOM9KOMasGxmdqajFMg0JmO/JHZasxlMr1QAQFWX4U3+kcRuGE6MHM K+pDgWJc2ytKLAXnDarthlp3gbPYP1CPMw6/qRRUXLwWdFziKZUGhqndwKHWhziWudLItR NNZVQR6hbqJAV8hGaCOHQQn7Ok0wFVmDbDF2uudoktaQLaCVpGcLHLnUapZsAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJTl10P7jzMpx; Sat, 13 May 2023 15:17: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 34DFHGcN084097; Sat, 13 May 2023 15:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DFHGCq084096; Sat, 13 May 2023 15:17:16 GMT (envelope-from git) Date: Sat, 13 May 2023 15:17:16 GMT Message-Id: <202305131517.34DFHGCq084096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: da1ef2d61930 - main - Move MACHINE/MACHINE_ARCH handling to sys.machine.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da1ef2d6193036518d483a608f4b6ac753b78b96 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=da1ef2d6193036518d483a608f4b6ac753b78b96 commit da1ef2d6193036518d483a608f4b6ac753b78b96 Author: Simon J. Gerraty AuthorDate: 2023-05-13 15:15:49 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 15:15:49 +0000 Move MACHINE/MACHINE_ARCH handling to sys.machine.mk Rather than define the TARGETS and TARGET_ARCHES in src/Makefile put them in sys.machine.mk so they can also be leveraged by non-top-level builds. We have TARGET_MACHINE_LIST as the list of MACHINES we build for. For each MACHINE we have a MACHINE_ARCH_LIST_${MACHINE} and the first entry of each list is used as default for MACHINE_ARCH_${MACHINE} We can now remove a bunch of MACHINE_ARCH.* handling from local.sys.dirdeps*mk Reviewed by: imp Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D40083 --- Makefile | 8 ++------ share/mk/local.sys.dirdeps.env.mk | 30 +++--------------------------- share/mk/local.sys.env.mk | 2 ++ share/mk/sys.machine.mk | 23 +++++++++++++++++++++++ 4 files changed, 30 insertions(+), 33 deletions(-) diff --git a/Makefile b/Makefile index 0b2438a0cfc0..4658a75986f9 100644 --- a/Makefile +++ b/Makefile @@ -530,14 +530,10 @@ worlds: .PHONY # powerpcspe excluded from main list until clang fixed EXTRA_ARCHES_powerpc= powerpcspe .endif -TARGETS?=amd64 arm arm64 i386 powerpc riscv +TARGETS?= ${TARGET_MACHINE_LIST} _UNIVERSE_TARGETS= ${TARGETS} -TARGET_ARCHES_arm?= armv6 armv7 -TARGET_ARCHES_arm64?= aarch64 -TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc} -TARGET_ARCHES_riscv?= riscv64 .for target in ${TARGETS} -TARGET_ARCHES_${target}?= ${target} +TARGET_ARCHES_${target}= ${MACHINE_ARCH_LIST_${target}} .endfor .if defined(USE_GCC_TOOLCHAINS) diff --git a/share/mk/local.sys.dirdeps.env.mk b/share/mk/local.sys.dirdeps.env.mk index 3d45719ff292..fdc03cae29eb 100644 --- a/share/mk/local.sys.dirdeps.env.mk +++ b/share/mk/local.sys.dirdeps.env.mk @@ -12,41 +12,17 @@ TARGET_SPEC_VARS?= MACHINE MACHINE_ARCH ${.MAKE.DEPENDFILE_PREFIX}.${MACHINE} \ ${.MAKE.DEPENDFILE_PREFIX} -# before we process TARGET_SPEC -# we assume that MK_DIRDEPS_BUILD=yes - -# from src/Makefile (for universe) -# would be nice to have this sort of info in sys.machine.mk -TARGET_ARCHES_arm?= armv6 armv7 -TARGET_ARCHES_arm64?= aarch64 -TARGET_ARCHES_powerpc?= powerpc powerpc64 powerpc64le powerpcspe -TARGET_ARCHES_riscv?= riscv64 - # some corner cases BOOT_MACHINE_DIR.amd64 = boot/i386 -MACHINE_ARCH.host = ${_HOST_ARCH} - -# the list of machines we support -ALL_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv .-include +ALL_MACHINE_LIST?= ${TARGET_MACHINE_LIST} + .for m in ${ALL_MACHINE_LIST:O:u} -MACHINE_ARCH_LIST.$m?= ${TARGET_ARCHES_${m}:U$m} -MACHINE_ARCH.$m?= ${MACHINE_ARCH_LIST.$m:[1]} BOOT_MACHINE_DIR.$m ?= boot/$m .endfor -.if empty(MACHINE_ARCH) -.if !empty(TARGET_ARCH) -MACHINE_ARCH= ${TARGET_ARCH} -.else -MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} -.endif -.endif -MACHINE_ARCH?= ${MACHINE_ARCH.${MACHINE}} -MACHINE_ARCH:= ${MACHINE_ARCH} - HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET} .if ${REQUESTED_MACHINE:U${MACHINE}} == "host" @@ -58,7 +34,7 @@ TARGET_MACHINE= host .endif .if ${MACHINE} == "host" OBJTOP := ${HOST_OBJTOP} -MACHINE_ARCH= ${MACHINE_ARCH.${MACHINE}} +MACHINE_ARCH= ${MACHINE_ARCH_${MACHINE}} .endif diff --git a/share/mk/local.sys.env.mk b/share/mk/local.sys.env.mk index e10bf58e14e8..5444fd77652f 100644 --- a/share/mk/local.sys.env.mk +++ b/share/mk/local.sys.env.mk @@ -56,3 +56,5 @@ ECHO_TRACE?= true .include .export HOST_TARGET .endif + +.include diff --git a/share/mk/sys.machine.mk b/share/mk/sys.machine.mk new file mode 100644 index 000000000000..445aaa4b62fd --- /dev/null +++ b/share/mk/sys.machine.mk @@ -0,0 +1,23 @@ + +.-include + +PSEUDO_MACHINE_LIST?= common host +TARGET_MACHINE_LIST?= amd64 arm arm64 i386 powerpc riscv + +MACHINE_ARCH_host?= ${_HOST_ARCH} + +MACHINE_ARCH_LIST_arm?= armv6 armv7 +MACHINE_ARCH_LIST_arm64?= aarch64 +MACHINE_ARCH_LIST_powerpc?= powerpc powerpc64 powerpc64le ${EXTRA_ARCHES_powerpc} +MACHINE_ARCH_LIST_riscv?= riscv64 + +.for m in ${TARGET_MACHINE_LIST} +MACHINE_ARCH_LIST_$m?= $m +MACHINE_ARCH_$m?= ${MACHINE_ARCH_LIST_$m:[1]} +# for backwards comatability +MACHINE_ARCH.$m?= ${MACHINE_ARCH_$m} +.endfor + +.if empty(MACHINE_ARCH) +MACHINE_ARCH:= ${MACHINE_ARCH_${MACHINE}} +.endif From nobody Sat May 13 17:08:26 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJXCL23ZSz4BZY2; Sat, 13 May 2023 17:08: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 4QJXCL1ZVrz3Kmk; Sat, 13 May 2023 17:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683997710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6QVhP0NOhJnxrLhjiVAfBHE7tOSxtiKdJEHICbqC7mc=; b=BY/qgpX8Q6MYvLQbImIifekcKMM1dmPuHZ6QCx9lvtFa1bidICtzivMCl2FM6K8XwsZ+21 5C8s5eiMZTFOpnkbLFpLw6EUpFIoSRftLSHc7Xl5cDnK1G+07816n83/k1m6wmFSh0fl64 wjSaTHQ91llNhjSvqcWmmhgE6EucYZOd7w0uY2SZmFXy0UvVPtwgwBW8d/S0UKWugpf/DC scAaSqMGebI6BGKMvbYT2XbeCVDM6HZpd8Ym7xXkacZGdJ3deiMperzwmfSROKObquWoZD we3ecNDetNnmpk/9bwauw2+97LVWhBWKyrn8P/wCL6I8cClZB6mPpzbHlOdLAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683997710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6QVhP0NOhJnxrLhjiVAfBHE7tOSxtiKdJEHICbqC7mc=; b=Ny1oSaYKdX6ASPB2EArMN7vCx/bn12nRiPx3uC90sj4dTRgJtMESr5KtuOkjHUrzvzMBj3 ft+r12nCC7Jd7rIb3MQ5uWX2cqczmEXB+Fi6dM8Qmm67eP/6H3x65UyGN2wzvY6xsvVFq5 CAZ5HT6F7LjoqTsIwUEk816/QLPPvW+UwIU6Pt/J5RkvYS5PBETln/YGS2R/axpVAdvQHr ghmOZOD+HnBI98leirgIkgQjgNHes7BiQR/x/APdUhmFISZGmlayo5WyDoKpaCW59RrTDg cOYuHYkwcxrUOoTLYYQVuenP1PUSLPtIQflRWdPLwzfFbvpdep4eLxJEnTH8xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683997710; a=rsa-sha256; cv=none; b=trmpGpOZTlhWwxSiagClI/hOoGftv2zFZG93cda3cZWpRuSYdOYqFueWmiSDsPJnR4xGhT umu8sG+TSUA/pVQj5SDJ+gCloViZ7rPDq7bIDvhhxJ4yQx2FYbWWbmb+B9e9Too4TBnuzH UrA8ROSukxL1kEGpXk+0W+rHDz6o2h7gI3VgIPUq4BUQVnxRDZdG5m/kubXC6hQ6ZZEBj/ bUNE6klNTOcfFsM5oUV/UKQKs4yx2liBJn9AuSDfg6ACnOGSoaZHk2JIfNoxjAD0WFjgdF xEdSgcPJiWqUQdCGdjVxt5EvqVkYbR/bO8Ba7mn8lLf4q9PKCj3nB7jd2aOYBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJXCL0X9rzQ8Q; Sat, 13 May 2023 17:08: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 34DH8UpV065143; Sat, 13 May 2023 17:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DH8QmE065140; Sat, 13 May 2023 17:08:26 GMT (envelope-from git) Date: Sat, 13 May 2023 17:08:26 GMT Message-Id: <202305131708.34DH8QmE065140@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: c1d01b5fd681 - main - Merge bmake-20230510 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c1d01b5fd6811491ee6c05cf6982fd65343122c8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=c1d01b5fd6811491ee6c05cf6982fd65343122c8 commit c1d01b5fd6811491ee6c05cf6982fd65343122c8 Merge: da1ef2d61930 945078deae44 Author: Simon J. Gerraty AuthorDate: 2023-05-13 17:05:48 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 17:05:48 +0000 Merge bmake-20230510 Merge commit '945078deae448e0a13c34b3393d836087719fb16' contrib/bmake/ChangeLog | 24 ++ contrib/bmake/FILES | 4 +- contrib/bmake/VERSION | 2 +- contrib/bmake/bmake.1 | 33 +- contrib/bmake/bmake.cat1 | 17 +- contrib/bmake/compat.c | 6 +- contrib/bmake/for.c | 60 +++- contrib/bmake/make.1 | 33 +- contrib/bmake/mk/ChangeLog | 35 ++ contrib/bmake/mk/FILES | 2 + contrib/bmake/mk/dirdeps-targets.mk | 11 +- contrib/bmake/mk/dirdeps.mk | 16 +- contrib/bmake/mk/install-mk | 4 +- contrib/bmake/mk/jobs.mk | 17 +- contrib/bmake/mk/meta.autodep.mk | 6 +- contrib/bmake/mk/meta.sys.mk | 105 ++---- contrib/bmake/mk/mk-files.txt | 55 ++- contrib/bmake/mk/newlog.sh | 412 ++++++++++++++++++++++ contrib/bmake/mk/sys.dependfile.mk | 11 +- contrib/bmake/mk/sys.dirdeps.mk | 183 ++++++++++ contrib/bmake/mk/sys.mk | 5 +- contrib/bmake/parse.c | 27 +- contrib/bmake/unit-tests/Makefile | 6 +- contrib/bmake/unit-tests/cond-func.mk | 12 +- contrib/bmake/unit-tests/cond-late.mk | 15 +- contrib/bmake/unit-tests/dep-var.mk | 7 +- contrib/bmake/unit-tests/directive-for-errors.exp | 33 +- contrib/bmake/unit-tests/directive-for-errors.mk | 57 ++- contrib/bmake/unit-tests/directive-for-escape.exp | 84 ++--- contrib/bmake/unit-tests/directive-for-escape.mk | 62 +++- contrib/bmake/unit-tests/directive-for.exp | 63 ++-- contrib/bmake/unit-tests/directive-for.mk | 149 +++++--- contrib/bmake/unit-tests/forloop.exp | 20 -- contrib/bmake/unit-tests/forloop.mk | 53 --- contrib/bmake/unit-tests/parse.mk | 32 +- contrib/bmake/unit-tests/var-eval-short.exp | 8 +- contrib/bmake/unit-tests/var-eval-short.mk | 12 +- contrib/bmake/unit-tests/var-scope-local.exp | 54 ++- contrib/bmake/unit-tests/var-scope-local.mk | 101 ++++-- contrib/bmake/unit-tests/varmod-gmtime.exp | 20 +- contrib/bmake/unit-tests/varmod-gmtime.mk | 33 +- contrib/bmake/unit-tests/varmod-localtime.exp | 20 +- contrib/bmake/unit-tests/varmod-localtime.mk | 33 +- contrib/bmake/unit-tests/varmod-mtime.exp | 1 + contrib/bmake/unit-tests/varmod-mtime.mk | 30 ++ contrib/bmake/unit-tests/varmod-path.mk | 14 +- contrib/bmake/var.c | 119 ++++++- 47 files changed, 1547 insertions(+), 559 deletions(-) diff --cc contrib/bmake/mk/newlog.sh index 000000000000,526d1700d98f..526d1700d98f mode 000000,100755..100755 --- a/contrib/bmake/mk/newlog.sh +++ b/contrib/bmake/mk/newlog.sh diff --cc contrib/bmake/mk/sys.dirdeps.mk index 000000000000,845eda181b90..845eda181b90 mode 000000,100644..100644 --- a/contrib/bmake/mk/sys.dirdeps.mk +++ b/contrib/bmake/mk/sys.dirdeps.mk diff --cc contrib/bmake/unit-tests/varmod-mtime.exp index 000000000000,39a9383953dd..39a9383953dd mode 000000,100644..100644 --- a/contrib/bmake/unit-tests/varmod-mtime.exp +++ b/contrib/bmake/unit-tests/varmod-mtime.exp diff --cc contrib/bmake/unit-tests/varmod-mtime.mk index 000000000000,dd57ef3f0f31..dd57ef3f0f31 mode 000000,100644..100644 --- a/contrib/bmake/unit-tests/varmod-mtime.mk +++ b/contrib/bmake/unit-tests/varmod-mtime.mk From nobody Sat May 13 17:12:18 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJXHk5Q2zz4BZXQ; Sat, 13 May 2023 17:12: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 4QJXHk50sgz3LMH; Sat, 13 May 2023 17:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683997938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QqXq47zX+KTZrVo8JlaRsx9U4//GL0FofaJaBXQ0zRk=; b=Xi8BNFjssaORhvDn3Mo6eSAqdGes8tWALVZE0AGFMa8oTWS9E1NSgZpqrxB75cK0RqQ/oW QalJX30/FZvLT9PxJ0ERAPN7JS5zqzEGVzHhSopH2rze+a+qCeJSTIJ1DvvKl/UsQgUeSF TpWeBmuTdA82bjJJFBBY+K0UgiQN95uvBz68BT9nR97/fnA/Y4Zizo+bBcc/puvsMHthzZ RDONgnqgfpVbxGM/XRxgKamNiNwHZ4q5+t9JRYc+0M/qz40UyGtmzWBEEBH9qnbj/5l8tL YtZDXXY7KItCwbGplzbS4QjcF6ChzjP7o13i3AB/MZ4i/mjt+p02q5eFpy+4ZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683997938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QqXq47zX+KTZrVo8JlaRsx9U4//GL0FofaJaBXQ0zRk=; b=cWKGi4NlOp2raDmHJ6K+G1inxhuDfB8x0yRbR8mCk84yj3WELdtAJKhU9VbXHtPUTTT8aL rQQE1ffLCkC4Ve1z3FOKNg3Pv/bUCIzl/q1Qs70oo1jTbU6Gse/vvDZIYhwy5n4ADNIMI8 z6b5IqIcKDxXg536XZCMyrXFwA2yF1NWkT6KjxgsLoLngOMRgUBw6Sud7rQHvsLlVeEGZU 4oPABWS6h05irVum4V+wtskfZk98wpTKJM1MbrH+dfC5BcbaHIGV110b4/f2xlLlUCdfye aDxJHhPXVKkT8vB2TcTUu81/SczuizTCPDtYBLhdEYFuJqnTN5Dz6W/61ZThsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683997938; a=rsa-sha256; cv=none; b=FIuCsj7DRMFrMZhxy9H972Ie7ylv7Xbd6lQ8B5cd8AcxxM6bP2WKBSK7cXM8tKKKcuTtIo cOVaC02jlRz0zHle5Eb0FqYeS7bHKvLb8jB0f1iDQQW3J1BJvO4ju+iRVbGbuLOAFy42PE VpStEUwvh9Pi0AqRrW5jnJ58gijnxvqoTgTRwCp+DtFDZbu46Sm0+8r0WjWfVZyXfxvVF8 LYr3+jlxAfE1Ner+GsYIBkQzt1+b/nZKajfbBtDE86nq6XxFZnC53oqccdAwPZeIGpq9wY N662gWoonrlxw5Vz78AFhQnMhjJlLNda+5nOiWAwT5058wXw7UDru1MUSfOAgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJXHk447QzQQw; Sat, 13 May 2023 17:12: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 34DHCI8o080521; Sat, 13 May 2023 17:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DHCI7Z080520; Sat, 13 May 2023 17:12:18 GMT (envelope-from git) Date: Sat, 13 May 2023 17:12:18 GMT Message-Id: <202305131712.34DHCI7Z080520@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: e0e24ae5d658 - main - bmake forloop test was removed List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e0e24ae5d658a7dc059b252df79ef5ad24c8ff17 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=e0e24ae5d658a7dc059b252df79ef5ad24c8ff17 commit e0e24ae5d658a7dc059b252df79ef5ad24c8ff17 Author: Simon J. Gerraty AuthorDate: 2023-05-13 17:12:08 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 17:12:08 +0000 bmake forloop test was removed --- usr.bin/bmake/unit-tests/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index 6594bdd5cd81..1db1dcd87718 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -215,7 +215,6 @@ TESTS+= export TESTS+= export-all TESTS+= export-env TESTS+= export-variants -TESTS+= forloop TESTS+= forsubst TESTS+= gnode-submake TESTS+= hanoi-include From nobody Sat May 13 17:48:32 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJY5X4k3tz4BbgF; Sat, 13 May 2023 17:48: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 4QJY5X49wxz3NYs; Sat, 13 May 2023 17:48:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684000112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktwz0ovKn8fYKNRilG4o1+il6vLoN4UUceFxtPH20jY=; b=IdOOTcnzN66t8SfZf5rVpOUtqn4/Yf+TpmTAzFYd5O1qIJTQ9+3MimyiS8/q11lF4g0XIJ FPzybzw19RXrRyt1tGQN5nRKN6KCRngAKPOOs6gist2yoXAr0sLBdIHm0okWOUNH1p5v0U M4Lwtf0LQXcH0HKTWWVZIQHtEBgKgr+SJ7fttgs/Sg/xr7+OaERMOu7PdDVr4irqArqcq6 yqfO1qZHhs5PB5knmBdNNSP5747P3YoYoom3dQG3tlvnu0kX4OjVT93t5/EgI3D+3IJ/Y+ iF8Kp5+lfPeke9aur4Qn/qATP9cufYteHcdmA859ccjVXdBJPt5ssvjyFA4yXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684000112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ktwz0ovKn8fYKNRilG4o1+il6vLoN4UUceFxtPH20jY=; b=VvoiuR1FXH9sIwi3v3oSMZLIW5VIDquY/836eLhSL7ECPoDEKkpsVWiLllX/PUuxUy3eXX 1g2Cu9MaU4iqETOy8EyL27iT17rxyC810dYPpC+DpWvOH6dxi0H2ussaTSDu0glxz4gMbf RUSmjbAo6Q0fyk3ONj+f7CEuaULnr4NxsrJOkXi/dlO2ehOu/tKim8MkhEkCtuO6qvWu4n 1JvmZB+ezhKGxqVmavF/Anw50ksW+9Y3zy3jVd72zvO7neXyOnEBKr7t4VO9ehsGmu1PcM 1RM55V/njdzPiIGTsh4MCTfY7jZZ2Sl/UHS7tseKxwDVG/rRJAi7QpefJMswSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684000112; a=rsa-sha256; cv=none; b=O89C6BMDQc20R96hkEs47x1qdhbue7ey9mjuSCvwj/YdGEW5Z0WklHau9JPuurMmowUYx7 W6RejvAOMwHTQ7JNZa4HvQ2qyx0tRdecliPUE7SVfPWqehWEdJ2QDxjyjIj/sBs9Pr8413 UZk24/AQ0omW/y5GEw53Lo4YaWBrq6n/m5LmYAZ0mxt5FHMqJK6WzIiM/8q0IbYBnyG41i JiMu70pOhFVZ7NxE4fXRpoqYN8BmTWzE/QlWqnDkMlOKbaHhuTK1pTBycVhVTWApPqCpre lCezY3txaeRyFC6TZZ+LIUchvPEM1rXBI8lZt9d7/aQ/nIKSf2+h+z+qG0RTMQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJY5X3FZvzQhx; Sat, 13 May 2023 17:48: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 34DHmWQY030706; Sat, 13 May 2023 17:48:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DHmWo9030705; Sat, 13 May 2023 17:48:32 GMT (envelope-from git) Date: Sat, 13 May 2023 17:48:32 GMT Message-Id: <202305131748.34DHmWo9030705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 477f6e3c963b - main - sys.dirdeps.mk use ?= for OBJTOP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 477f6e3c963b472cf513ab8101ac05354301fcf8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=477f6e3c963b472cf513ab8101ac05354301fcf8 commit 477f6e3c963b472cf513ab8101ac05354301fcf8 Author: Simon J. Gerraty AuthorDate: 2023-05-13 17:46:24 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 17:46:24 +0000 sys.dirdeps.mk use ?= for OBJTOP This broke bmake's after-import step. --- contrib/bmake/mk/sys.dirdeps.mk | 2 +- share/mk/sys.dirdeps.mk | 2 +- usr.bin/bmake/Makefile.config | 2 +- usr.bin/bmake/unit-tests/Makefile | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/bmake/mk/sys.dirdeps.mk b/contrib/bmake/mk/sys.dirdeps.mk index 845eda181b90..2daf3681d8d0 100644 --- a/contrib/bmake/mk/sys.dirdeps.mk +++ b/contrib/bmake/mk/sys.dirdeps.mk @@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET} MACHINE_OBJ.host32 = ${HOST_TARGET32} MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC} MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}} -OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR} +OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR} # we do not use MAKEOBJDIRPREFIX .undef MAKEOBJDIRPREFIX diff --git a/share/mk/sys.dirdeps.mk b/share/mk/sys.dirdeps.mk index 845eda181b90..2daf3681d8d0 100644 --- a/share/mk/sys.dirdeps.mk +++ b/share/mk/sys.dirdeps.mk @@ -123,7 +123,7 @@ MACHINE_OBJ.host = ${HOST_TARGET} MACHINE_OBJ.host32 = ${HOST_TARGET32} MACHINE_OBJ.${MACHINE} ?= ${TARGET_OBJ_SPEC} MACHINE_OBJDIR = ${MACHINE_OBJ.${MACHINE}} -OBJTOP = ${OBJROOT}/${MACHINE_OBJDIR} +OBJTOP ?= ${OBJROOT}/${MACHINE_OBJDIR} # we do not use MAKEOBJDIRPREFIX .undef MAKEOBJDIRPREFIX diff --git a/usr.bin/bmake/Makefile.config b/usr.bin/bmake/Makefile.config index 60e86b185246..83920a75165b 100644 --- a/usr.bin/bmake/Makefile.config +++ b/usr.bin/bmake/Makefile.config @@ -7,7 +7,7 @@ SRCTOP?= ${.CURDIR:H:H} # things set by configure -_MAKE_VERSION?=20230414 +_MAKE_VERSION?=20230510 prefix?= /usr srcdir= ${SRCTOP}/contrib/bmake diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index 1db1dcd87718..cacf343d162f 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -2,9 +2,9 @@ # See contrib/bmake/bsd.after-import.mk # # $FreeBSD$ -# $Id: Makefile,v 1.193 2023/02/25 20:03:25 sjg Exp $ +# $Id: Makefile,v 1.195 2023/05/10 18:26:24 sjg Exp $ # -# $NetBSD: Makefile,v 1.333 2023/02/25 19:30:32 sjg Exp $ +# $NetBSD: Makefile,v 1.335 2023/05/10 13:03:06 rillig Exp $ # # Unit tests for make(1) # @@ -378,6 +378,7 @@ TESTS+= varmod-loop-delete TESTS+= varmod-loop-varname TESTS+= varmod-match TESTS+= varmod-match-escape +TESTS+= varmod-mtime TESTS+= varmod-no-match TESTS+= varmod-order TESTS+= varmod-order-numeric From nobody Sat May 13 20:06:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJc8C5tz8z4BkFc; Sat, 13 May 2023 20:06: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 4QJc8C4H7Hz3s2L; Sat, 13 May 2023 20:06:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684008363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0U0B2yTSHkC770RdrZKs2PzNJowJGuGkcwtgiPHC0w=; b=iWwMU6HsGnr8SkiGGpCajbq0p+1BQMTeOp6ZzKQbkcXP0uXf7iL4rqgDnLXdf6OugNqqKv GnAD4joAr96ZZLPu0rugaYYMYp0lNaTdMo1W4yQGSfa3BInW+7UskgX4N2Mu6et49/WCSw zvk63GWQ+pH0tvWS3TqzHKFqJhIroaLl8BI9TbjWU12tZ/kCEftuwjvpgtHBCfbB+Dsmq/ lIqP56whZFMHOBX5GFygspTiP57lVo4XWBBwtLeEQjE2yBHZY2ffFAsikZ6vFZht6Rx6yA 2j1LUXIBipkoNyljtpP5veeZltO41O04ZNCdPrUv0NhwO1OUuggXzaFRvRTKxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684008363; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v0U0B2yTSHkC770RdrZKs2PzNJowJGuGkcwtgiPHC0w=; b=ZZbjylrMXhfvGwo9AYOj3NiqV7p6YoaXTGFFrOJ9fX5kJVuk768euhApEy4qoKhD1828on Fej05Uz1cg55pu1QtLFgRaB0qaWFXGRuRhdWW8Wz9IPRUH/9DtoFUCWtUV1qQtq5JQxcHV cpVE90I+G8WwJ8KiZcHOcAohf3KPnld/4dkIxYeHd+o+Tx1aF7k/D9tBdU+QO64rNIQLpw Sj1Hef87eZeMADkoABinjsKoLJ5yjbqK3OTy5k6nIliDtiloj8ztdb/H4scqnOW+TxhLDS hTg7Da4jj3gQhA/7KcxpjAcCevQfjflkSNR43Ncqxw8EWT1k/hBC/rjxYWiaOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684008363; a=rsa-sha256; cv=none; b=fDPBCY17tuAr0giSxgmS3wV3iRiujkHLxeOeUARJz+UmzstvQ0zdvPP7O397Gc/jaHwXMk 9MapNjEKPBI4oOuN9s5IC+eYwrOrX+XDtxk6CH8wxJsen8JlBDeLjLEvnWWRGIHEJs/8Zb SU6GRRylR2lm2iwjPl1gm8Lryk5yYrpXd7XEOnK4MD54q8oGgjBAHN0Tz3l/05WJpL/+XX Qi9rEhMc6zQ4wnQF8LO8rmJVGd6E5Us4j8F4hp806fjygN4yfiEXd73bCSVt4XCwm7G33E vCgEBTWIW0MKwaL7HOucko8g6dGBkzOWKt+PunxRrWxEngDeVR3EugjQvJJkvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJc8C3NBDzVqZ; Sat, 13 May 2023 20:06: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 34DK631b060750; Sat, 13 May 2023 20:06:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DK63vi060749; Sat, 13 May 2023 20:06:03 GMT (envelope-from git) Date: Sat, 13 May 2023 20:06:03 GMT Message-Id: <202305132006.34DK63vi060749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 411942a70eb6 - main - GENERIC: remove a stray space character List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 411942a70eb686dc46b971d2553698b7d89eaa76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=411942a70eb686dc46b971d2553698b7d89eaa76 commit 411942a70eb686dc46b971d2553698b7d89eaa76 Author: Piotr Pawel Stefaniak AuthorDate: 2023-05-13 19:30:28 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-05-13 19:31:49 +0000 GENERIC: remove a stray space character --- sys/amd64/conf/GENERIC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 8f2e5e9fccb4..feec1d5dd3c8 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -375,7 +375,7 @@ device virtio_balloon # VirtIO Memory Balloon device device kvm_clock # KVM paravirtual clock driver # HyperV drivers and enhancement support -device hyperv # HyperV drivers +device hyperv # HyperV drivers # Xen HVM Guest Optimizations # NOTE: XENHVM depends on xenpci and xentimer. From nobody Sat May 13 20:06:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJc8D6VMDz4Bk8c; Sat, 13 May 2023 20:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJc8D5TwTz3rxJ; Sat, 13 May 2023 20:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684008364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/XqSLmCyRLiGWQGS4hYFNkroDdkidH8NoDpRVd857g0=; b=lEBCpgdn3abtNQNQfqAS/j39ZFZSElutGyQBlWgHKC4OKVOIWdxS/Eze5L9VnqtXHTDc9n xbvjTAcYeQW+oa70C5efvifXVHAAZCOsu9v7ndP95HaOQxyhjgBgXa2t1M+wnjosjtP0Gw 9TqY4a12cOqhL+TQVmP/wqrvVOl+PMZUYnGkd1yTcFMKLhw5uHIDmSUuGDk/jBlODy+aNc iFKf7QOhVPV6RuqFfH45vRWei0srLVvwtUW17T5EPswD0uZYFkinD80ZkeSZPmSCmIVqAd 1JziwOZF6QxoHJvsXl62ei7E/GXxILmOB0YOTrwSKZK1EhPXCKHwfdnLaClcHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684008364; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/XqSLmCyRLiGWQGS4hYFNkroDdkidH8NoDpRVd857g0=; b=X4mqd0GkJbw79+nmr7eZvfKVTZ8ZSBWfuB4lYHQc0cVBJMuknd4eig9YE0XwFMUIrnTt0W GeC/DHuUTeLJMGVz0RT+38V3r0KPgORS/J0f53IFWjKfmk79vT+7FbjYvGAsV3MHlB0imU V9c8R2jdaraG3j8nFxHtIoEYRyeMzSghBwO3UBoj9VA+1d1GVzUNWhaJwYGguwz85zKjfb c/6tAVd6BeIA7p9/GTUSNdC/nPx81Z0HiRTkDaw4E45Xqh6w+kKXszP3c5fgB4iPTtNZJi fBaNg+2jdySj/zLeP4yVVe+wd4H8xsi0fJY0CvoR1ZyLPOScmL7S0qmYftsxwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684008364; a=rsa-sha256; cv=none; b=A3Pe5rMZDPASTdmKBrsadkFixeTD3HDJUVdisAJkl1XWstr0LmHP9ScYS07UL8Q7Yheg59 k+31mANKKNO7sA+9Punc0pFQ+fKgG8x4ngJAQeR13WAnhp8kYSZD+9o8/5PnvIH7Vy4x5J zGz/+ifRD9vYXeAzNAUAC4LxfH13q96cI2Vd3Lc5znGScqnDU5TAY4f+Qh50KlDOCifJuD +pYan6DLUh1ot0XgqN/FjU0rHIu1YFhQfhtJReDJQe9X1CilrMrsMAktOyyF1lIs9WJoTP P4QBY8lezPeZMuVLO/sdsBkSXRwlNHZuCkZwmCPuV9Yy31grvj39TuRLYESfOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJc8D4YzkzW7s; Sat, 13 May 2023 20:06: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 34DK64DK060769; Sat, 13 May 2023 20:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DK64D3060768; Sat, 13 May 2023 20:06:04 GMT (envelope-from git) Date: Sat, 13 May 2023 20:06:04 GMT Message-Id: <202305132006.34DK64D3060768@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 43489c142e56 - main - sh: improve style List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pstef X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43489c142e5686ef92b632afa847f4aa4ce8a526 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=43489c142e5686ef92b632afa847f4aa4ce8a526 commit 43489c142e5686ef92b632afa847f4aa4ce8a526 Author: Piotr Pawel Stefaniak AuthorDate: 2023-04-29 20:42:15 +0000 Commit: Piotr Pawel Stefaniak CommitDate: 2023-05-13 19:57:27 +0000 sh: improve style --- bin/sh/histedit.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index db3b8bcfc1da..07a344ebd17b 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -589,15 +589,16 @@ static int comparator(const void *a, const void *b, void *thunk) { size_t curpos = (intptr_t)thunk; + return (strcmp(*(char *const *)a + curpos, *(char *const *)b + curpos)); } /* - * This function is passed to libedit's fn_complete2(). The library will - * use it instead of its standard function that finds matching files in - * current directory. If we're at the start of the line, we want to look - * for available commands from all paths in $PATH. + * This function is passed to libedit's fn_complete2(). The library will use + * it instead of its standard function that finds matching files in current + * directory. If we're at the start of the line, we want to look for + * available commands from all paths in $PATH. */ static char **sh_matches(const char *text, int start, int end) @@ -681,13 +682,13 @@ out: } matches[uniq + 1] = NULL; /* - * matches[0] is special: it's not a real matching file name but a common - * prefix for all matching names. It can't be null, unlike any other - * element of the array. When strings matches[0] and matches[1] compare - * equal and matches[2] is null that means to libedit that there is only - * a single match. It will then replace user input with possibly escaped - * string in matches[0] which is the reason to copy the full name of the - * only match. + * matches[0] is special: it's not a real matching file name but + * a common prefix for all matching names. It can't be null, unlike + * any other element of the array. When strings matches[0] and + * matches[1] compare equal and matches[2] is null that means to + * libedit that there is only a single match. It will then replace + * user input with possibly escaped string in matches[0] which is the + * reason to copy the full name of the only match. */ if (uniq == 1) matches[0] = strdup(matches[1]); From nobody Sat May 13 20:29:30 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJcgJ3zrVz4BlQp; Sat, 13 May 2023 20:29:32 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJcgJ21Tdz3vRG; Sat, 13 May 2023 20:29:32 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 34DKTVnW049084; Sat, 13 May 2023 15:29:31 -0500 (CDT) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1684009771; bh=SGH3BvxU5HRxF8NsaJpGM3JukiKDsJ2EfKreKhbNrbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=J+DyY1o/keFxnQWITAe0s9+PexjJ2iVCR9w9qnqcSqu/0pH5WZ+sskvpGknrutHhj 5nEzmDiHjLFxvEz8rBOb6J5iZpx+n5KRpbVkTq0UDrSObigwKv86tH4ms6jd32MZWx 95zdMch0rEtgcwP4kP9fzyunCgTYc5h88OKxW2PUyJyLlETBYsk9xVSoPGfORFKGVB mpVrdmeeiGl/6msxd9lPbEizZJnF6rOdxg6DesTo2s2D2VH6c8p+J2G73DIVeZ41RS CpvamCBtpfKUruLwcEiyxRrQRmNFEDSfwi3RFDiaPQdlGtBJ95c03kZ0UsuasaToDY 9xEaxPS893Hzg== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id bBHdBivzX2S6vwAAs/W3XQ (envelope-from ); Sat, 13 May 2023 15:29:31 -0500 From: Mike Karels To: rgrimes@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ Date: Sat, 13 May 2023 15:29:30 -0500 X-Mailer: MailMate (1.14r5964) Message-ID: <4DD6D2C9-9F3A-4265-92FA-1B09817634FB@karels.net> In-Reply-To: <202305130043.34D0hAMp065433@gndrsh.dnsmgr.net> References: <202305130043.34D0hAMp065433@gndrsh.dnsmgr.net> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4QJcgJ21Tdz3vRG X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16509, ipnet:3.16.0.0/14, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On 12 May 2023, at 19:43, Rodney W. Grimes wrote: >> Rod and I discussed this, and I?m top-posting a summary of a proposal = that >> we both support. I?ll leave the last message from the list below for >> reference. Our consensus is that the main problem is the code in pw(8= ) >> (used by adduser, and hence bsdinstall) that interprets /home as /usr/= home, >> installing a symlink for /home, and similarly for any other home direc= tory >> whose parent has a single component. We propose to remove that code, = and >> also modify bsdinstall?s zfs script to create a home dataset rather th= an > > Small nit, zfs already creates the data set as $POOL/usr/home, this > would change to $POOL/home. > >> usr/home. adduser presents a default home directory using /home, so t= his >> will continue to agree. As Rod said at the start of this thread, home= >> directories really don?t belong in /usr, and the only reason they were= >> there is because of the previous root + /usr partitioning. Now the de= fault >> is one large partition. Of course, people who want to partition diffe= rently >> can do whatever they want. >> >> It will still be possible for admins to create home directories in >> /usr/home, they will just have to do so explicitly for pw to create th= e >> directory, and manually create a /home symlink if desired. If they ha= ve >> a small root file system, they will want to put home directories elsew= here. >> >> A followup change would be to change various man pages that refer to >> /usr/home. The changes are now in review: https://reviews.freebsd.org/D40085 pw change to use the specified dir https://reviews.freebsd.org/D40086 bsdinstall change to create /home rather than /usr/home dataset on ZFS Mike >> On 11 May 2023, at 12:32, Rodney W. Grimes wrote: >> >>>> On 11 May 2023, at 9:58, Rodney W. Grimes wrote: >>>> >>>>>> On Wed, 10 May 2023 16:48:12 -0500 >>>>>> Mike Karels wrote: >>>>>> >>>>>>> On 10 May 2023, at 10:13, Cy Schubert wrote: >>>>>>> >>>>>>>> In message , M= itchell >>>>>>>> Horne w >>>>>>>> rites: >>>>>>>>> On 5/10/23 11:19, Rodney W. Grimes wrote: >>>>>>>>>>> The branch main has been updated by mhorne: >>>>>>>>>>> >>>>>>>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D36db6b04962a01= ff7b21592def02d >>>>>>>>> 4c570dac939 >>>>>>>>>>> >>>>>>>>>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 >>>>>>>>>>> Author: Mitchell Horne >>>>>>>>>>> AuthorDate: 2023-05-10 12:53:56 +0000 >>>>>>>>>>> Commit: Mitchell Horne >>>>>>>>>>> CommitDate: 2023-05-10 13:25:17 +0000 >>>>>>>>>>> >>>>>>>>>>> hier(7): document /home/ and /usr/home/ >>>>>>>>>>> >>>>>>>>>>> Reviewed by: imp >>>>>>>>>>> MFC after: 1 week >>>>>>>>>>> Sponsored by: The FreeBSD Foundation >>>>>>>>>>> Differential Revision: https://reviews.freebsd.org/D400= 02 >>>>>>>>>>> --- >>>>>>>>>>> share/man/man7/hier.7 | 10 ++++++++++ >>>>>>>>>>> 1 file changed, 10 insertions(+) >>>>>>>>>>> >>>>>>>>>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 >>>>>>>>>>> index ff11289436a1..b6759dd6e65b 100644 >>>>>>>>>>> --- a/share/man/man7/hier.7 >>>>>>>>>>> +++ b/share/man/man7/hier.7 >>>>>>>>>>> @@ -90,6 +90,10 @@ file descriptor files; >>>>>>>>>>> see >>>>>>>>>>> .Xr \&fd 4 >>>>>>>>>>> .El >>>>>>>>>>> +.It Pa /home/ >>>>>>>>>>> +user HOME directories. >>>>>>>>>>> +This is a symlink to >>>>>>>>>>> +.Pa /usr/home/ >>>>>>>>>> >>>>>>>>>> /usr is "contains the majority of user utilities and applicati= ons" >>>>>>>>>> it should not contain home directories. >>>>>>>>>>> I do not know when this move to usr came about it was traditi= onally >>>>>>>>> /home. >>>>>>>>>> I do not know why /usr/home even exists, it is not needed by >>>>>>>>>> anything I am aware of. If we have a compatible link it >>>>>>>>>> should be, usr/home -> ../home and /home should be the >>>>>>>>>> directory. >>>>>>>>>> >>>>>>>>> >>>>>>>>> I agree that /usr/home is strange, and is unique (?) to FreeBSD= =2E >>>>>>>>> >>>>>>>>> The oldest commit in the output of `git log --grep '/usr/home'`= is: >>>>>>>>> >>>>>>>>> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd >>>>>>>>> Author: David Nugent >>>>>>>>> Date: Fri Jan 3 04:42:18 1997 +0000 >>>>>>>>> >>>>>>>>> Implemented /home -> /usr/home symlink kludge. >>>>>>>>> If home basedir would be created in the root partition, cr= eate >>>>>>>>> it under /usr instead, and symlink /basedir -> /usr/basedi= r. >>>>>>>>> >>>>>>>>> Notes: >>>>>>>>> svn path=3D/head/; revision=3D21242 >>>>>>>>> >>>>>>>>> >>>>>>>>> So it has been this way for 26 years at least. I do not know wh= at to say >>>>>>>>> about whether /usr "should" contain it, but it does. >>>>>>>> >>>>>>>> Usually history matters. I can understand not changing it. On th= e flip >>>>>>>> side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was= /home -- >>>>>>>> albeit automounted from /export/home on localhost or some NFS se= rver. In >>>>>>>> the Red Hat land at $JOB, /home is its own partition (actually a= n LVM >>>>>>>> volume). In both cases /home is not in /usr because end-users ca= n fill >>>>>>>> /usr. This can be problematic operationally because it's yet ano= ther >>>>>>>> headache to deal with should someone fill the filesystem. Fillin= g /usr is >>>>>>>> more serious than filling /home. >>>>>>>> >>>>>>>> As a point of interest, when I installed my first FreeBSD many m= oons ago I >>>>>>>> used the Solaris standard of /export/home, using amd (now automo= unt) to >>>>>>>> serve my /home. I'm not advocating we do this, it's overkill, bu= t /home >>>>>>>> should not live in /usr. It's a potential headache for any sysad= min. >>>>>>>> >>>>>>>> With ZFS the solution is easy. With UFS based systems there are = a lot of >>>>>>>> other factors that go into how we install the "default" from the= get-go. >>>>>>> >>>>> >>>>> First off, thank you Mike for looking at this closer. Add me to an= y reviews >>>>> you might creat. >>>>> >>>>>>> The situation is a fair mess. It took me a little while to figur= e out that >>>>>>> the kludge referenced above is in the pw(8) command, which is use= d as the >>>>>>> backend to adduser(8). Neither /home nor /usr/home is in the bas= e package. >>>>>>> adduser defaults to /home/user, and creates the parent directory = (e.g. /home) >>>>>>> if it does not exist, but if there is no internal slash, pw moves= the parent >>>>>>> to /usr. In this case, it makes the symlink from root. zfs is = different, >>>>>>> in that it includes a usr/home dataset already (created by bsdins= tall). >>> >>> I am proposing we fix this. More below. >>> >>>>>>> In this case, creating a user with /home/user causes the symlink = to be added >>>>>>> as a side effect. >>>>>>> >>>>>>> I?m sure the kludge was originally done when root and /usr were s= eparate >>>>>>> file systems by default, root was small, and there was no /home b= y default. >>>>>>> However, we now default to a single large file system (with datas= ets, in >>>>>>> the zfs case). >>>>>>> >>>>>>> All of this really is a horrible kludge, and it is a house of car= ds. I'm >>>>>>> amazed that it doesn't break more often. I'm tempted to remove t= he kludge >>>>>>> and change the zfs setup to create a home dataset rather than usr= /home. >>>>> >>>>> Or make it a menu option(s): >>>>> if (zfs) "Create a user home dataset?" (default yes) >>>>> if (ufs) "Create a user home directory?" (default yes) >>>> >>>> Are you suggesting that bsdinstall should do this? For ufs, there i= s no >>>> need. >>> >>> Yes I am suggesting that bsdinstall should have a knob to turn >>> on (by default) and off the creation of a "home dataset/directory" >>> as you well need that if you choose to add users during a bsdinstall >>> run, or you may not want a /home at all (currently not possible) as y= ou >>> have other mechanisms for dealing with it. >>> >>> The need for this is just as valid for ufs as it is for zfs. >>> >>>> >>>>> "User home location: /home" (This is default) >>>> >>>> Are you proposing that the default for pw should be set at this poin= t? >>>> From all I read the default for pw is already, and should remain /ho= me. >>> Man page bears that out. It has no mention of any symlink or usr/hom= e. >>> >>>> That doesn?t seem necessary, and I don?t know if it would work from >>>> bsdinstall. >>> >>> No, this has nothing to do with pw directly, this is simply the path >>> of the dataset(zfs)/directory(ufs) that bsdinstall should create IFF >>> you sayd yes to the create question. At present this is hardcoded >>> into bsdinstall as: >>> /usr/home >>> /home -> /usr/home >>> >>> I am advocating that this should all be controllable from menu. >>> >>>> >>>>> As far as I am concerned the symlink can just die.... >>>> >>>> I agree, but that requires a change to pw. It creates the symlink o= n the >>>> first account creation using /home. >>> >>> I am missing something here, pw creates the symlink yuk. >>> As far as I was aware the only think that created a symlink >>> /home -> /usr/home was bsdinstall. >>> >>>> >>>>>>> However, if zfs users explicitly configure a home directory under= /usr/home, >>>>>>> this would end up in the usr dataset. An alternative would be to= remove the >>>>>>> code from pw to create the parent directory entirely (which seems= sensible), >>>>>>> and create a /home directory for ufs installs. I don't know how = well known >>>>>>> it is that adduser/pw will create parent directories for home dir= ectories >>>>>>> though. This cleanup would change the default location for home = directories >>>>>>> to /home, which makes more sense. It would require documentation= , e.g. in >>>>>>> the release notes. The changes would only affect new installatio= ns, not >>>>>>> upgrades. >>>>>>> >>>>>>> Thoughts? >>>>>>> >>>>>> >>>>>> Adding home would require a change to BSD.root.dist, since it's no= t >>>>>> currently in there. Only usr is present. >>>>> >>>>> It should *not* be in the etc/mtree/BSD.*.dist files at all. >>>>> And it is not on my 13.1R system. It would not need to be >>>>> in BSD.root.dist either, this is a *post distribution* created >>>>> directory/dataset. >>>> >>>> I?m curious why you think this. But if pw retains the ability to cr= eate >>>> the parent directory for the user directory (and I now think it shou= ld), >>>> there is no need for a /home by default. >>> >>> Because there is no need for /home in a base distribution until >>> you add a user, and that is a site specific change. What in >>> the base system *needs* /home? >>> >>>>>> IMHO changing pw would be a reasonable approach. >>>>> >>>>> I am mixed on this.... it more or less does the right >>>>> thing, and if a user specifies /tmp/foolishidea/home/$USER >>>>> that is on them. No one said all users homes must be >>>>> in the same location. >>>> >>>> Except for moving parent directories with a single component under /= usr, >>>> and creating a symlink for them... >>>> >>>> My current plan is to change pw not to move things under /usr, chang= e the >>>> zfs setup to use a home dataset rather than usr/home (corresponding = to the >>>> pw default), and then change the various man pages that refer to /us= r/home. >>>> Does that seem reasonable? >>> >>> Yes, then the knobs can easily be added, or scripted install should j= ust >>> work to effect the knobs. >>> >>>> Mike >>> >>> -- = >>> Rod Grimes rgrimes@fr= eebsd.org >> >> > > -- = > Rod Grimes rgrimes@free= bsd.org From nobody Sat May 13 21:06:04 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJdTS6S0sz4Bmpc; Sat, 13 May 2023 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJdTS60flz3y4V; Sat, 13 May 2023 21:06:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684011964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UorbuhhjQ6W6iUkTjuGINmCbfyLZuVuC2ApcwTp9Lyw=; b=sqHmkVlOl7Nch1W3VEGCEE+sbfrC74oUMovnJ59kfqfOMpbvcyxt/BbWokUYmustsbs+eS +OeHQdZxQYNPKaBuC33vQ8xLvNgxOnvN0i70pla8p5xGAFDVrqHCb1sv0YD3iSrAHAC9uX llzfRvMPlJ3BtvZC3iuL0eijrA63070CUUlOhD2isPg09LczScWyMd/M2WjO5AxbkYyO0t ymoyRgOMZ9zlFQOfMLjPQP0WbwMnxDPxUyK0vxI6grTI4SEC0+nb4WHYmdezWSP4XB/ebO QejrlqFc4sujozMBfQsv3iA7sm8L3lQrIMzE8DsVxQGj55C7qK9xIjD1lsplkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684011964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UorbuhhjQ6W6iUkTjuGINmCbfyLZuVuC2ApcwTp9Lyw=; b=OF9DRBQdtDw4EjxO3IDQx8e+MbKWBOPgiHQMz3ORpR1nzT4wtaCzHJ88VMyf1/7bAsmn10 MYN5+AQV6ePLhBsuOKJTb2JjnPXvZIklza5AnG/LNjbwiR18wFZZebTVEQctjdwotfibZs PzWiuvdPjLe+fGVAQ5lV29bUCILzVcWuOslRRAh9rERM/u/eZJcRRkvLJ3hO+LkFHBk7gQ M6gEEzTDQyNQZifIv2f7NUA+foIZPkvXRmu5a3R2NmU/Vp0iQFcYt9/dQqLIEe2VgvBEvx pkcj50QZxNWmE5K/jabybY4Fw/9FAnI3nnIp8Su8MT837KKyEe86k7JV9LjHSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684011964; a=rsa-sha256; cv=none; b=HdDI1Ui8FR6a0jOwYq11BXG0gNrs2qBE8WJNpgIMNteS3nfnCytqv72cKnGjzgKvaSdWYf RIMd5k9D+W1hS3ZqA5HmWtZwn+BSMIWB/QdAW6xvXobxlUSC7yVoA3MQ+ZPUIhz88u3iGM FSN4Awij+hli/VXVNmeEaKXyFkRH7y3SgwzfLhTQpBJkjLY2sek9GZcNxixBdAgLCuoZTV K/DOVBpAYxPckUYXXdbNHTj6M7V2CgGxPAnubIrids/UtFxjrhshJVSck1SaBJhrrPjDDU IwlhAM1dLu80bu6+pvUAI1e7P8f/bUiQj6bcuncAd0uyDVAcAVM9/rZ/eC7b6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJdTS53DpzXNc; Sat, 13 May 2023 21:06: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 34DL64OM060153; Sat, 13 May 2023 21:06:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DL64aP060152; Sat, 13 May 2023 21:06:04 GMT (envelope-from git) Date: Sat, 13 May 2023 21:06:04 GMT Message-Id: <202305132106.34DL64aP060152@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 41d638f203ca - main - Update dirdeps.mk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41d638f203caca728d9ba126241b3772155b7a8d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=41d638f203caca728d9ba126241b3772155b7a8d commit 41d638f203caca728d9ba126241b3772155b7a8d Author: Simon J. Gerraty AuthorDate: 2023-05-13 21:05:19 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 21:05:56 +0000 Update dirdeps.mk Ensure host build_dirs are not qualified. --- share/mk/dirdeps.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/share/mk/dirdeps.mk b/share/mk/dirdeps.mk index aafa5ab47557..da5350be480f 100644 --- a/share/mk/dirdeps.mk +++ b/share/mk/dirdeps.mk @@ -1,4 +1,4 @@ -# $Id: dirdeps.mk,v 1.160 2023/05/10 20:44:58 sjg Exp $ +# $Id: dirdeps.mk,v 1.161 2023/05/13 21:02:14 sjg Exp $ # SPDX-License-Identifier: BSD-2-Clause # @@ -717,7 +717,16 @@ _build_dirs += \ ${_machines:Nhost*:@m@${__unqual_depdirs:@d@$d.$m@}@} # qualify everything now -_build_dirs := ${_build_dirs:${M_dep_qual_fixes:ts:}:O:u} +.if ${_debug_reldir} +.info _build_dirs=${_build_dirs} +.endif +# make sure we do not mess with qualifying "host" entries +_build_dirs := ${_build_dirs:M*.host*} \ + ${_build_dirs:N*.host*:${M_dep_qual_fixes:ts:}} +_build_dirs := ${_build_dirs:O:u} +.if ${_debug_reldir} +.info _build_dirs=${_build_dirs} +.endif .endif # empty DIRDEPS From nobody Sat May 13 21:07:31 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJdW73sh3z4Bn8B; Sat, 13 May 2023 21:07: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 4QJdW72mNsz40QQ; Sat, 13 May 2023 21:07:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684012051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCh4LsNvxJWZMUraRsAIgbr1bpefOQxyzygHBCbQh8o=; b=k+JDHScUnO+6Z2tLGyDPeVlUEa7cudBAzP9yOlzbr7axGZgsb2ja4rOwumM7Au1GeI0IKn nxKNkNnNikAfT3lUdAYN/JLxNnCGbwR5XwklZUoMdRTtT7aga/IORsQ4yjx6hhpfonVZGz PE9KLOollD8HCqPNVm8JsneMSS0+nXBceBj8galoeQ0QOEOZgVRKhjki8+GoCtvI8R4+ux HDHlOZdtFFDwpci+5eJ7+bhnZAPb+HZmcQNyGH7AJJu5Q2iRBbPZBxYP3o3HRzFh7KsaXR sCpT+h4C8LYKVXCRB5S/WbZNUStkUtDyyz1lJ1UmocQBvcIu0V0SWU8Y2dI/Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684012051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CCh4LsNvxJWZMUraRsAIgbr1bpefOQxyzygHBCbQh8o=; b=hGpwIkNTTARNfuG3JrICtDJXxIumdCB45TVArd40rLW0KJ+geQnLs/RizJOIdywhZmheDb s5mGB11hr9147dl0wxBDd73eteoyspIrlLzSs76sXHCPCe5A5tUQ85d4UG+5ZPM5Hr3EO+ FaUjzS+wogdQ94xSH3MOg30KHKUixhtBKKffLXCeNi8SBERFwXCckhfOjyknm5TXDoWvDI sfCkrI03Ht+kb/wUiGibBKvXrebgbehvYP9YxOw1By9ZXv8xtMJjTGSiL+caqHZo9UIPat puv9niVsN0n5Oi7VWWKEz5fYY3aKnhUXby4ZudHhC1fvcysCiPw0b57lVgWWbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684012051; a=rsa-sha256; cv=none; b=TdoH3V7YiP2DJpbBLVx4qy/AG0v3S1AvRPGbOHfcuunnqgLWCQzdCrqFtn/1W1S4ikGe84 iKL/Eop9aiz7J10WvYn4sJ3um9vTTvBo+cXKnFMRW1MhulTA7mZt4+vijwI5bI/vLMorrk tgbXD+lCK0yAXp+IH/yIjHH6MRMM2bwN64tiOekydGn5hH2hSKhi5XKaXanuTYnEjnscnb NbNgXvktGD0tNtqbdFXF7lqRQmY+y89Zh/4XJBE657M9OS5hfZ6ZQtF/Xl/7TXEgnUrvrz UC0yLhpYtN0fXjwKtMyYN11QgLzbpUaTJwKGgXNZs2Xl3nnUDcaJ5ASBAS2HVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QJdW71qlczX72; Sat, 13 May 2023 21:07: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 34DL7VF1060584; Sat, 13 May 2023 21:07:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34DL7Vk3060583; Sat, 13 May 2023 21:07:31 GMT (envelope-from git) Date: Sat, 13 May 2023 21:07:31 GMT Message-Id: <202305132107.34DL7Vk3060583@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: d489b2a39d51 - main - local.dirdeps.mk no qual for PSEUDO_MACHINE_LIST List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d489b2a39d5138c23c69b860425bad40c5cd1e1b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=d489b2a39d5138c23c69b860425bad40c5cd1e1b commit d489b2a39d5138c23c69b860425bad40c5cd1e1b Author: Simon J. Gerraty AuthorDate: 2023-05-13 21:06:20 +0000 Commit: Simon J. Gerraty CommitDate: 2023-05-13 21:06:20 +0000 local.dirdeps.mk no qual for PSEUDO_MACHINE_LIST dirdeps.mk takes care of "host" but we still need to deal with other PSEUDO_MACHINE_LIST members --- share/mk/local.dirdeps.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index f2328d6cd99c..1bf81e72f363 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -13,7 +13,7 @@ DIRDEPS_FILTER+= N*.host .endif # pseudo machines get no qualification -.for m in host common +.for m in ${PSEUDO_MACHINE_LIST:Nhost*} M_dep_qual_fixes += C;($m),[^/.,]*$$;\1; .endfor #.info M_dep_qual_fixes=${M_dep_qual_fixes} From nobody Sat May 13 22:48:03 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QJglC6P1Mz4BsMW; Sat, 13 May 2023 22:48:07 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: from gndrsh.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4QJglC07N8z49Ym; Sat, 13 May 2023 22:48:06 +0000 (UTC) (envelope-from freebsd@gndrsh.dnsmgr.net) Authentication-Results: mx1.freebsd.org; none Received: from gndrsh.dnsmgr.net (localhost [127.0.0.1]) by gndrsh.dnsmgr.net (8.13.3/8.13.3) with ESMTP id 34DMm3Ci069554; Sat, 13 May 2023 15:48:03 -0700 (PDT) (envelope-from freebsd@gndrsh.dnsmgr.net) Received: (from freebsd@localhost) by gndrsh.dnsmgr.net (8.13.3/8.13.3/Submit) id 34DMm3Yu069553; Sat, 13 May 2023 15:48:03 -0700 (PDT) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <202305132248.34DMm3Yu069553@gndrsh.dnsmgr.net> Subject: Re: git: 36db6b04962a - main - hier(7): document /home/ and /usr/home/ In-Reply-To: <4DD6D2C9-9F3A-4265-92FA-1B09817634FB@karels.net> To: Mike Karels Date: Sat, 13 May 2023 15:48:03 -0700 (PDT) CC: rgrimes@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 4QJglC07N8z49Ym X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:13868, ipnet:69.59.192.0/19, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N > On 12 May 2023, at 19:43, Rodney W. Grimes wrote: > > >> Rod and I discussed this, and I?m top-posting a summary of a proposal that > >> we both support. I?ll leave the last message from the list below for > >> reference. Our consensus is that the main problem is the code in pw(8) > >> (used by adduser, and hence bsdinstall) that interprets /home as /usr/home, > >> installing a symlink for /home, and similarly for any other home directory > >> whose parent has a single component. We propose to remove that code, and > >> also modify bsdinstall?s zfs script to create a home dataset rather than > > > > Small nit, zfs already creates the data set as $POOL/usr/home, this > > would change to $POOL/home. > > > >> usr/home. adduser presents a default home directory using /home, so this > >> will continue to agree. As Rod said at the start of this thread, home > >> directories really don?t belong in /usr, and the only reason they were > >> there is because of the previous root + /usr partitioning. Now the default > >> is one large partition. Of course, people who want to partition differently > >> can do whatever they want. > >> > >> It will still be possible for admins to create home directories in > >> /usr/home, they will just have to do so explicitly for pw to create the > >> directory, and manually create a /home symlink if desired. If they have > >> a small root file system, they will want to put home directories elsewhere. > >> > >> A followup change would be to change various man pages that refer to > >> /usr/home. > > The changes are now in review: > > https://reviews.freebsd.org/D40085 pw change to use the specified dir > https://reviews.freebsd.org/D40086 bsdinstall change to create /home > rather than /usr/home dataset on ZFS > Mike Need one more to backout the changes to hier(7)? > > >> On 11 May 2023, at 12:32, Rodney W. Grimes wrote: > >> > >>>> On 11 May 2023, at 9:58, Rodney W. Grimes wrote: > >>>> > >>>>>> On Wed, 10 May 2023 16:48:12 -0500 > >>>>>> Mike Karels wrote: > >>>>>> > >>>>>>> On 10 May 2023, at 10:13, Cy Schubert wrote: > >>>>>>> > >>>>>>>> In message , Mitchell > >>>>>>>> Horne w > >>>>>>>> rites: > >>>>>>>>> On 5/10/23 11:19, Rodney W. Grimes wrote: > >>>>>>>>>>> The branch main has been updated by mhorne: > >>>>>>>>>>> > >>>>>>>>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=36db6b04962a01ff7b21592def02d > >>>>>>>>> 4c570dac939 > >>>>>>>>>>> > >>>>>>>>>>> commit 36db6b04962a01ff7b21592def02d4c570dac939 > >>>>>>>>>>> Author: Mitchell Horne > >>>>>>>>>>> AuthorDate: 2023-05-10 12:53:56 +0000 > >>>>>>>>>>> Commit: Mitchell Horne > >>>>>>>>>>> CommitDate: 2023-05-10 13:25:17 +0000 > >>>>>>>>>>> > >>>>>>>>>>> hier(7): document /home/ and /usr/home/ > >>>>>>>>>>> > >>>>>>>>>>> Reviewed by: imp > >>>>>>>>>>> MFC after: 1 week > >>>>>>>>>>> Sponsored by: The FreeBSD Foundation > >>>>>>>>>>> Differential Revision: https://reviews.freebsd.org/D40002 > >>>>>>>>>>> --- > >>>>>>>>>>> share/man/man7/hier.7 | 10 ++++++++++ > >>>>>>>>>>> 1 file changed, 10 insertions(+) > >>>>>>>>>>> > >>>>>>>>>>> diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 > >>>>>>>>>>> index ff11289436a1..b6759dd6e65b 100644 > >>>>>>>>>>> --- a/share/man/man7/hier.7 > >>>>>>>>>>> +++ b/share/man/man7/hier.7 > >>>>>>>>>>> @@ -90,6 +90,10 @@ file descriptor files; > >>>>>>>>>>> see > >>>>>>>>>>> .Xr \&fd 4 > >>>>>>>>>>> .El > >>>>>>>>>>> +.It Pa /home/ > >>>>>>>>>>> +user HOME directories. > >>>>>>>>>>> +This is a symlink to > >>>>>>>>>>> +.Pa /usr/home/ > >>>>>>>>>> > >>>>>>>>>> /usr is "contains the majority of user utilities and applications" > >>>>>>>>>> it should not contain home directories. > >>>>>>>>>>> I do not know when this move to usr came about it was traditionally > >>>>>>>>> /home. > >>>>>>>>>> I do not know why /usr/home even exists, it is not needed by > >>>>>>>>>> anything I am aware of. If we have a compatible link it > >>>>>>>>>> should be, usr/home -> ../home and /home should be the > >>>>>>>>>> directory. > >>>>>>>>>> > >>>>>>>>> > >>>>>>>>> I agree that /usr/home is strange, and is unique (?) to FreeBSD. > >>>>>>>>> > >>>>>>>>> The oldest commit in the output of `git log --grep '/usr/home'` is: > >>>>>>>>> > >>>>>>>>> commit f2400d465896a8e4f6fdc57eba840cf49b25bbbd > >>>>>>>>> Author: David Nugent > >>>>>>>>> Date: Fri Jan 3 04:42:18 1997 +0000 > >>>>>>>>> > >>>>>>>>> Implemented /home -> /usr/home symlink kludge. > >>>>>>>>> If home basedir would be created in the root partition, create > >>>>>>>>> it under /usr instead, and symlink /basedir -> /usr/basedir. > >>>>>>>>> > >>>>>>>>> Notes: > >>>>>>>>> svn path=/head/; revision=21242 > >>>>>>>>> > >>>>>>>>> > >>>>>>>>> So it has been this way for 26 years at least. I do not know what to say > >>>>>>>>> about whether /usr "should" contain it, but it does. > >>>>>>>> > >>>>>>>> Usually history matters. I can understand not changing it. On the flip > >>>>>>>> side, I cut my UNIX teeth on SunOS 4 and Solaris where /home was /home -- > >>>>>>>> albeit automounted from /export/home on localhost or some NFS server. In > >>>>>>>> the Red Hat land at $JOB, /home is its own partition (actually an LVM > >>>>>>>> volume). In both cases /home is not in /usr because end-users can fill > >>>>>>>> /usr. This can be problematic operationally because it's yet another > >>>>>>>> headache to deal with should someone fill the filesystem. Filling /usr is > >>>>>>>> more serious than filling /home. > >>>>>>>> > >>>>>>>> As a point of interest, when I installed my first FreeBSD many moons ago I > >>>>>>>> used the Solaris standard of /export/home, using amd (now automount) to > >>>>>>>> serve my /home. I'm not advocating we do this, it's overkill, but /home > >>>>>>>> should not live in /usr. It's a potential headache for any sysadmin. > >>>>>>>> > >>>>>>>> With ZFS the solution is easy. With UFS based systems there are a lot of > >>>>>>>> other factors that go into how we install the "default" from the get-go. > >>>>>>> > >>>>> > >>>>> First off, thank you Mike for looking at this closer. Add me to any reviews > >>>>> you might creat. > >>>>> > >>>>>>> The situation is a fair mess. It took me a little while to figure out that > >>>>>>> the kludge referenced above is in the pw(8) command, which is used as the > >>>>>>> backend to adduser(8). Neither /home nor /usr/home is in the base package. > >>>>>>> adduser defaults to /home/user, and creates the parent directory (e.g. /home) > >>>>>>> if it does not exist, but if there is no internal slash, pw moves the parent > >>>>>>> to /usr. In this case, it makes the symlink from root. zfs is different, > >>>>>>> in that it includes a usr/home dataset already (created by bsdinstall). > >>> > >>> I am proposing we fix this. More below. > >>> > >>>>>>> In this case, creating a user with /home/user causes the symlink to be added > >>>>>>> as a side effect. > >>>>>>> > >>>>>>> I?m sure the kludge was originally done when root and /usr were separate > >>>>>>> file systems by default, root was small, and there was no /home by default. > >>>>>>> However, we now default to a single large file system (with datasets, in > >>>>>>> the zfs case). > >>>>>>> > >>>>>>> All of this really is a horrible kludge, and it is a house of cards. I'm > >>>>>>> amazed that it doesn't break more often. I'm tempted to remove the kludge > >>>>>>> and change the zfs setup to create a home dataset rather than usr/home. > >>>>> > >>>>> Or make it a menu option(s): > >>>>> if (zfs) "Create a user home dataset?" (default yes) > >>>>> if (ufs) "Create a user home directory?" (default yes) > >>>> > >>>> Are you suggesting that bsdinstall should do this? For ufs, there is no > >>>> need. > >>> > >>> Yes I am suggesting that bsdinstall should have a knob to turn > >>> on (by default) and off the creation of a "home dataset/directory" > >>> as you well need that if you choose to add users during a bsdinstall > >>> run, or you may not want a /home at all (currently not possible) as you > >>> have other mechanisms for dealing with it. > >>> > >>> The need for this is just as valid for ufs as it is for zfs. > >>> > >>>> > >>>>> "User home location: /home" (This is default) > >>>> > >>>> Are you proposing that the default for pw should be set at this point? > >>>> From all I read the default for pw is already, and should remain /home. > >>> Man page bears that out. It has no mention of any symlink or usr/home. > >>> > >>>> That doesn?t seem necessary, and I don?t know if it would work from > >>>> bsdinstall. > >>> > >>> No, this has nothing to do with pw directly, this is simply the path > >>> of the dataset(zfs)/directory(ufs) that bsdinstall should create IFF > >>> you sayd yes to the create question. At present this is hardcoded > >>> into bsdinstall as: > >>> /usr/home > >>> /home -> /usr/home > >>> > >>> I am advocating that this should all be controllable from menu. > >>> > >>>> > >>>>> As far as I am concerned the symlink can just die.... > >>>> > >>>> I agree, but that requires a change to pw. It creates the symlink on the > >>>> first account creation using /home. > >>> > >>> I am missing something here, pw creates the symlink yuk. > >>> As far as I was aware the only think that created a symlink > >>> /home -> /usr/home was bsdinstall. > >>> > >>>> > >>>>>>> However, if zfs users explicitly configure a home directory under /usr/home, > >>>>>>> this would end up in the usr dataset. An alternative would be to remove the > >>>>>>> code from pw to create the parent directory entirely (which seems sensible), > >>>>>>> and create a /home directory for ufs installs. I don't know how well known > >>>>>>> it is that adduser/pw will create parent directories for home directories > >>>>>>> though. This cleanup would change the default location for home directories > >>>>>>> to /home, which makes more sense. It would require documentation, e.g. in > >>>>>>> the release notes. The changes would only affect new installations, not > >>>>>>> upgrades. > >>>>>>> > >>>>>>> Thoughts? > >>>>>>> > >>>>>> > >>>>>> Adding home would require a change to BSD.root.dist, since it's not > >>>>>> currently in there. Only usr is present. > >>>>> > >>>>> It should *not* be in the etc/mtree/BSD.*.dist files at all. > >>>>> And it is not on my 13.1R system. It would not need to be > >>>>> in BSD.root.dist either, this is a *post distribution* created > >>>>> directory/dataset. > >>>> > >>>> I?m curious why you think this. But if pw retains the ability to create > >>>> the parent directory for the user directory (and I now think it should), > >>>> there is no need for a /home by default. > >>> > >>> Because there is no need for /home in a base distribution until > >>> you add a user, and that is a site specific change. What in > >>> the base system *needs* /home? > >>> > >>>>>> IMHO changing pw would be a reasonable approach. > >>>>> > >>>>> I am mixed on this.... it more or less does the right > >>>>> thing, and if a user specifies /tmp/foolishidea/home/$USER > >>>>> that is on them. No one said all users homes must be > >>>>> in the same location. > >>>> > >>>> Except for moving parent directories with a single component under /usr, > >>>> and creating a symlink for them... > >>>> > >>>> My current plan is to change pw not to move things under /usr, change the > >>>> zfs setup to use a home dataset rather than usr/home (corresponding to the > >>>> pw default), and then change the various man pages that refer to /usr/home. > >>>> Does that seem reasonable? > >>> > >>> Yes, then the knobs can easily be added, or scripted install should just > >>> work to effect the knobs. > >>> > >>>> Mike > >>> > >>> -- > >>> Rod Grimes rgrimes@freebsd.org > >> > >> > > > > -- > > Rod Grimes rgrimes@freebsd.org > > -- Rod Grimes rgrimes@freebsd.org